Navigation changes; Fixes

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);

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_SOFTWARE: return main_config.configure_mode? YON_PAGE_REGION : YON_PAGE_INSTALLATION_BEGIN; break;
-        case YON_PAGE_INSTALLATION_BEGIN: return YON_PAGE_KERNEL; break;
+        case YON_PAGE_INSTALLATION_BEGIN: return YON_PAGE_KEYBOARD; break;
-        case YON_PAGE_KERNEL: return YON_PAGE_KERNEL_ADDON; break;
+        case YON_PAGE_KERNEL: return YON_PAGE_PACKAGES_HUB; break;
-        case YON_PAGE_KERNEL_ADDON: return YON_PAGE_PACMAN_SOFTWARE; break;
+        case YON_PAGE_KERNEL_ADDON: return YON_PAGE_PACKAGES_HUB; break;
-        case YON_PAGE_PACMAN_SOFTWARE: return YON_PAGE_REGION;
+        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);

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);
     

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");

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,