diff --git a/source/ubinstall-gtk-components.c b/source/ubinstall-gtk-components.c
index ad413ef..915582c 100644
--- a/source/ubinstall-gtk-components.c
+++ b/source/ubinstall-gtk-components.c
@@ -49,7 +49,7 @@ int yon_kernel_addon_save(main_window *widgets){
GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->KernelAddonListBox));
char *install_modules = yon_char_new(parameter);
for(GList *iter = list;iter;iter = iter->next){
- kernel_row *row = g_object_get_data(G_OBJECT(iter->data),"kernel_row");
+ kernel_addon_row *row = g_object_get_data(G_OBJECT(iter->data),"kernel_row");
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(row->InstallCheck))){
char *temp = yon_char_append_element(install_modules,row->modules," ");
if (!yon_char_is_empty(install_modules)) free(install_modules);
diff --git a/source/ubinstall-gtk-page-switch.c b/source/ubinstall-gtk-page-switch.c
index 22b2787..d452c93 100644
--- a/source/ubinstall-gtk-page-switch.c
+++ b/source/ubinstall-gtk-page-switch.c
@@ -9,17 +9,18 @@ enum YON_PAGES yon_page_get_next(main_window *widgets, enum YON_PAGES page){
case YON_PAGE_LICENCE: return YON_PAGE_SECTIONS; break;
case YON_PAGE_SECTIONS: return yon_sections_get_next_page(widgets); break;
case YON_PAGE_OS_COMPONENTS: return YON_PAGE_SOFTWARE; break;
- case YON_PAGE_SOFTWARE: return main_config.configure_mode? YON_PAGE_KERNEL : YON_PAGE_INSTALLATION_BEGIN; break;
- case YON_PAGE_INSTALLATION_BEGIN: return YON_PAGE_KERNEL; break;
- case YON_PAGE_KERNEL: return YON_PAGE_KERNEL_ADDON; break;
- case YON_PAGE_KERNEL_ADDON: return YON_PAGE_PACMAN_SOFTWARE; break;
- case YON_PAGE_PACMAN_SOFTWARE: return YON_PAGE_REGION;
+ case YON_PAGE_SOFTWARE: return main_config.configure_mode? YON_PAGE_REGION : YON_PAGE_INSTALLATION_BEGIN; break;
+ case YON_PAGE_INSTALLATION_BEGIN: return YON_PAGE_KEYBOARD; break;
+ case YON_PAGE_KERNEL: return YON_PAGE_PACKAGES_HUB; break;
+ case YON_PAGE_KERNEL_ADDON: return YON_PAGE_PACKAGES_HUB; break;
+ case YON_PAGE_PACMAN_SOFTWARE: return YON_PAGE_PACKAGES_HUB; break;
case YON_PAGE_REGION: return YON_PAGE_KEYBOARD; break;
case YON_PAGE_KEYBOARD: return YON_PAGE_USERS; break;
case YON_PAGE_USERS: return YON_PAGE_STARTUP; break;
case YON_PAGE_STARTUP: return YON_PAGE_BOOTLOADER; break;
case YON_PAGE_BOOTLOADER: return YON_PAGE_NETWORK; break;
- case YON_PAGE_NETWORK: return main_config.configure_mode? YON_PAGE_CONFIGURE_END : YON_PAGE_INSTALLATION; break;
+ case YON_PAGE_NETWORK: return YON_PAGE_KERNEL; break;
+ case YON_PAGE_PACKAGES_HUB: return main_config.configure_mode? YON_PAGE_CONFIGURE_END : YON_PAGE_INSTALLATION;
case YON_PAGE_INSTALL_COMMON: return YON_PAGE_OS_COMPONENTS; break;
case YON_PAGE_INSTALL_SEPARATE: return YON_PAGE_OS_COMPONENTS; break;
case YON_PAGE_INSTALL_SAME_PARTITION: return YON_PAGE_OS_COMPONENTS; break;
@@ -52,10 +53,10 @@ enum YON_PAGES yon_page_get_prev(enum YON_PAGES page){
case YON_PAGE_OS_COMPONENTS: return YON_PAGE_SECTIONS; break;
case YON_PAGE_SOFTWARE: return YON_PAGE_OS_COMPONENTS; break;
case YON_PAGE_INSTALLATION_BEGIN: return YON_PAGE_SOFTWARE; break;
- case YON_PAGE_KERNEL: return YON_PAGE_SECTIONS; break;
+ case YON_PAGE_KERNEL: return YON_PAGE_NETWORK; break;
case YON_PAGE_KERNEL_ADDON: return YON_PAGE_KERNEL; break;
case YON_PAGE_PACMAN_SOFTWARE: return YON_PAGE_KERNEL_ADDON; break;
- case YON_PAGE_REGION: return YON_PAGE_PACMAN_SOFTWARE; break;
+ case YON_PAGE_REGION: return YON_PAGE_SECTIONS; break;
case YON_PAGE_KEYBOARD: return YON_PAGE_REGION; break;
case YON_PAGE_USERS: return YON_PAGE_KEYBOARD; break;
case YON_PAGE_STARTUP: return YON_PAGE_USERS; break;
@@ -264,6 +265,7 @@ void yon_switch_page_render(main_window *widgets){
case YON_PAGE_BOOTLOADER:
case YON_PAGE_STARTUP:
case YON_PAGE_NETWORK:
+ case YON_PAGE_PACKAGES_HUB:
page = 6;
break;
case YON_PAGE_INSTALLATION:
@@ -451,8 +453,13 @@ void on_system_setup_pass(GtkWidget *, main_window *widgets){
} else {
if (main_config.install_complete) {
gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_COMPLETION);
+ yon_page_init(widgets,YON_PAGE_COMPLETION);
+ yon_page_update(widgets);
} else {
gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALLATION);
+ yon_page_init(widgets,YON_PAGE_INSTALLATION);
+ yon_page_update(widgets);
+
}
}
yon_page_update(widgets);
diff --git a/source/ubinstall-gtk-region.c b/source/ubinstall-gtk-region.c
index 5a51c75..22a8af0 100644
--- a/source/ubinstall-gtk-region.c
+++ b/source/ubinstall-gtk-region.c
@@ -77,8 +77,6 @@ void yon_region_init(main_window *widgets){
GtkTreeIter iter;
gtk_list_store_clear(widgets->LanguagesList);
-
- yon_locale_init();
config_str languages = yon_config_load(languages_command,&size);
diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c
index 5c88d01..190c330 100644
--- a/source/ubinstall-gtk.c
+++ b/source/ubinstall-gtk.c
@@ -977,7 +977,6 @@ void yon_main_window_create(main_window *widgets){
widgets->AdditionalComponentsList = yon_gtk_builder_get_widget(builder,"AdditionalComponentsList");
-
widgets->InstallationProgress = yon_gtk_builder_get_widget(builder,"InstallationProgress");
widgets->InstallationLabel = yon_gtk_builder_get_widget(builder,"InstallationLabel");
widgets->ReadShortLogButton = yon_gtk_builder_get_widget(builder,"ReadShortLogButton");
diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h
index fb7f732..afac26a 100755
--- a/source/ubinstall-gtk.h
+++ b/source/ubinstall-gtk.h
@@ -356,6 +356,7 @@ enum YON_PAGES {
YON_PAGE_STARTUP,
YON_PAGE_BOOTLOADER,
YON_PAGE_NETWORK,
+ YON_PAGE_PACKAGES_HUB,
YON_PAGE_INSTALLATION,
YON_PAGE_COMPLETION,
YON_PAGE_COMPLETED,
diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade
index bb8bea3..d847ac4 100644
--- a/ubinstall-gtk.glade
+++ b/ubinstall-gtk.glade
@@ -4491,6 +4491,110 @@ agreement
0
+
+
+
+ False
+ True
+ 1
+
+
@@ -4571,7 +4675,7 @@ agreement
False
True
- 2
+ 3
@@ -4642,12 +4746,9 @@ agreement
False
True
- 3
+ 4
-
-
-
12
@@ -4688,6 +4789,110 @@ agreement
0
+
+
+
+ False
+ True
+ 1
+
+
@@ -5007,12 +5212,9 @@ agreement
False
True
- 2
+ 3
-
-
-
13
@@ -5053,31 +5255,8 @@ agreement
0
-
-
-
- True
- True
- 1
-
-
+
+
+
+ False
+ True
+ 2
+
+
+
+
+ False
+ True
+ 1
+
+
+
+
+
+ True
+ True
+ 2
+
+
+
+
+
+ False
+ True
+ 3
+
+
+
+
+ 14
+
+
+
+
+
+ 14
+ False
+
+
+
+
- 15
+ 16
@@ -5574,7 +6235,7 @@ agreement
Installation process
- 15
+ 16
False
@@ -5755,7 +6416,7 @@ or continue working in the environment, booted from the Live image.
- 16
+ 17
@@ -5765,7 +6426,7 @@ or continue working in the environment, booted from the Live image.
Completion
- 16
+ 17
False
@@ -5944,7 +6605,7 @@ or continue working in the environment, booted from the Live image.
- 17
+ 18
@@ -5954,7 +6615,7 @@ or continue working in the environment, booted from the Live image.
Completed
- 17
+ 18
False
@@ -6133,7 +6794,7 @@ or continue working in the environment, booted from the Live image.
- 18
+ 19
@@ -6143,7 +6804,7 @@ or continue working in the environment, booted from the Live image.
Configuration error
- 18
+ 19
False
@@ -6322,7 +6983,7 @@ or continue working in the environment, booted from the Live image.
- 19
+ 20
@@ -6332,7 +6993,7 @@ or continue working in the environment, booted from the Live image.
Configuration end
- 19
+ 20
False
@@ -6511,7 +7172,7 @@ or continue working in the environment, booted from the Live image.
- 20
+ 21
@@ -6521,7 +7182,7 @@ or continue working in the environment, booted from the Live image.
Configuration saved
- 20
+ 21
False
@@ -6975,7 +7636,7 @@ or continue working in the environment, booted from the Live image.
- 21
+ 22
@@ -6985,7 +7646,7 @@ or continue working in the environment, booted from the Live image.
Common Installation
- 21
+ 22
False
@@ -7649,7 +8310,7 @@ or continue working in the environment, booted from the Live image.
- 22
+ 23
@@ -7659,7 +8320,7 @@ or continue working in the environment, booted from the Live image.
Installation next to system
- 22
+ 23
False
@@ -8278,7 +8939,7 @@ or continue working in the environment, booted from the Live image.
- 23
+ 24
@@ -8288,7 +8949,7 @@ or continue working in the environment, booted from the Live image.
Installation on same partition
- 23
+ 24
False
@@ -9334,7 +9995,7 @@ separately into the selected partition.
- 24
+ 25
@@ -9344,7 +10005,7 @@ separately into the selected partition.
Advanced section
- 24
+ 25
False
@@ -9819,7 +10480,7 @@ separately into the selected partition.
- 25
+ 26
@@ -9829,7 +10490,7 @@ separately into the selected partition.
Recovery section
- 25
+ 26
False
@@ -10221,7 +10882,7 @@ separately into the selected partition.
- 26
+ 27
@@ -10231,7 +10892,7 @@ separately into the selected partition.
GRUB install
- 26
+ 27
False
@@ -10610,7 +11271,7 @@ separately into the selected partition.
- 27
+ 28
@@ -10620,7 +11281,7 @@ separately into the selected partition.
GRUB update
- 27
+ 28
False
@@ -11346,7 +12007,7 @@ separately into the selected partition.
- 28
+ 29
@@ -11356,7 +12017,7 @@ separately into the selected partition.
OS only
- 28
+ 29
False
@@ -12152,7 +12813,7 @@ separately into the selected partition.
- 29
+ 30
@@ -12162,7 +12823,7 @@ separately into the selected partition.
User data only
- 29
+ 30
False