diff --git a/source/ubinstall-gtk-components.c b/source/ubinstall-gtk-components.c index 24fe7ee..f3aa8ff 100644 --- a/source/ubinstall-gtk-components.c +++ b/source/ubinstall-gtk-components.c @@ -68,26 +68,7 @@ int yon_software_save(main_window *widgets){ return 1; } -int yon_startup_save(main_window *widgets){ +int yon_pacman_software_save(main_window *){ - - GtkTreeIter iter; - GtkTreeModel *model = GTK_TREE_MODEL(widgets->StartupList); - int size = 0; - config_str modules = NULL; - for_iter(model,&iter){ - char *target; - int status; - gtk_tree_model_get(model,&iter,0,&status,1,&target,-1); - if (status){ - yon_char_parsed_add_or_create_if_exists(modules,&size,target); - } - } - if (size){ - // char *final = yon_char_parsed_to_string(modules,size,","); - // yon_config_register(modules_extra_parameter,modules_extra_parameter_command,final); - } else { - // yon_config_remove_by_key(modules_extra_parameter); - } return 1; } \ No newline at end of file diff --git a/source/ubinstall-gtk-page-switch.c b/source/ubinstall-gtk-page-switch.c index 7d6a366..6df3698 100644 --- a/source/ubinstall-gtk-page-switch.c +++ b/source/ubinstall-gtk-page-switch.c @@ -11,7 +11,8 @@ enum YON_PAGES yon_page_get_next(main_window *widgets, enum YON_PAGES page){ case YON_PAGE_OS_COMPONENTS: 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_SOFTWARE; break; + case YON_PAGE_KERNEL_ADDON: return YON_PAGE_PACMAN_SOFTWARE; break; + case YON_PAGE_PACMAN_SOFTWARE: return YON_PAGE_SOFTWARE; case YON_PAGE_SOFTWARE: return YON_PAGE_REGION; break; case YON_PAGE_REGION: return YON_PAGE_KEYBOARD; break; case YON_PAGE_KEYBOARD: return YON_PAGE_USERS; break; @@ -42,7 +43,8 @@ enum YON_PAGES yon_page_get_prev(enum YON_PAGES page){ case YON_PAGE_INSTALLATION_BEGIN: return YON_PAGE_SECTIONS; break; case YON_PAGE_KERNEL: return YON_PAGE_SECTIONS; break; case YON_PAGE_KERNEL_ADDON: return YON_PAGE_KERNEL; break; - case YON_PAGE_SOFTWARE: return YON_PAGE_KERNEL_ADDON; break; + case YON_PAGE_PACMAN_SOFTWARE: return YON_PAGE_KERNEL_ADDON; break; + case YON_PAGE_SOFTWARE: return YON_PAGE_PACMAN_SOFTWARE; break; case YON_PAGE_REGION: return YON_PAGE_SOFTWARE; break; case YON_PAGE_KEYBOARD: return YON_PAGE_REGION; break; case YON_PAGE_USERS: return YON_PAGE_KEYBOARD; break; @@ -118,6 +120,9 @@ int yon_page_save(main_window *widgets, enum YON_PAGES page){ case YON_PAGE_SOFTWARE: return yon_software_save(widgets); break; + case YON_PAGE_PACMAN_SOFTWARE: + return yon_pacman_software_save(widgets); + break; case YON_PAGE_REGION: return yon_region_save(widgets); break; @@ -168,6 +173,74 @@ int yon_page_save(main_window *widgets, enum YON_PAGES page){ return 1; } +void yon_switch_page_render(main_window *widgets){ + enum YON_PAGES page = yon_page_get_current(GTK_NOTEBOOK(widgets->Notebook)); + switch(page){ + case YON_PAGE_WELCOME: + page = 0; + break; + case YON_PAGE_LICENCE: + page = 1; + break; + case YON_PAGE_SECTIONS: + case YON_PAGE_OS_COMPONENTS: + case YON_PAGE_INSTALL_COMMON: + case YON_PAGE_INSTALL_SAME_PARTITION: + case YON_PAGE_INSTALL_SEPARATE: + case YON_PAGE_INSTALL_ADVANCED: + case YON_PAGE_INSTALL_RECOVERY: + case YON_PAGE_INSTALLATION_BEGIN: + case YON_PAGE_KERNEL: + case YON_PAGE_KERNEL_ADDON: + case YON_PAGE_SOFTWARE: + case YON_PAGE_PACMAN_SOFTWARE: + case YON_PAGE_RECOVERY_GRUB_INSTALL: + case YON_PAGE_RECOVERY_GRUB_UPDATE: + case YON_PAGE_RECOVERY_OS_ONLY: + case YON_PAGE_RECOVERY_USRDATA_ONLY: + page = 2; + break; + case YON_PAGE_REGION: + page = 3; + break; + case YON_PAGE_KEYBOARD: + page = 4; + break; + case YON_PAGE_USERS: + page = 5; + break; + case YON_PAGE_BOOTLOADER: + case YON_PAGE_STARTUP: + case YON_PAGE_NETWORK: + page = 6; + break; + case YON_PAGE_INSTALLATION: + page = 7; + break; + case YON_PAGE_COMPLETED: + case YON_PAGE_COMPLETION: + case YON_PAGE_INSTALL_ERROR: + case YON_PAGE_CONFIGURE_END: + case YON_PAGE_CONFIGURE_SAVE: + page=8; + break; + } + + if (widgets){}; + GtkContainer *parent = GTK_CONTAINER(gtk_widget_get_parent(widgets->UsersToggle)); + GList *list = gtk_container_get_children(parent); + for (guint i=0;iNotebook)); if (page==YON_PAGE_WELCOME){ diff --git a/source/ubinstall-gtk-startup-services.c b/source/ubinstall-gtk-startup-services.c index e904e6d..92005b4 100644 --- a/source/ubinstall-gtk-startup-services.c +++ b/source/ubinstall-gtk-startup-services.c @@ -132,4 +132,33 @@ void on_startup_service_edit(GtkWidget *, main_window *widgets){ gtk_widget_show(window->Window); } } +} + +int yon_startup_save(main_window *widgets){ + GtkTreeIter iter; + GtkTreeModel *model = GTK_TREE_MODEL(widgets->StartupList); + int size = 0; + int list_size=0; + config_str modules = NULL; + for_iter(model,&iter){ + list_size++; + char *target; + int status; + gtk_tree_model_get(model,&iter,0,&status,1,&target,-1); + if (status){ + yon_char_parsed_add_or_create_if_exists(modules,&size,target); + } + } + if (size){ + if (list_size==size){ + yon_config_register(SERVICES_ENABLE_parameter,SERVICES_ENABLE_parameter_command,"auto"); + } else { + char *final = yon_char_parsed_to_string(modules,size,","); + yon_config_register(SERVICES_ENABLE_parameter,SERVICES_ENABLE_parameter_command,final); + } + yon_char_parsed_free(modules,size); + } else { + yon_config_remove_by_key(SERVICES_ENABLE_parameter); + } + return 1; } \ No newline at end of file diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c index 8c7a951..6d3b1a4 100644 --- a/source/ubinstall-gtk.c +++ b/source/ubinstall-gtk.c @@ -6,6 +6,85 @@ int cur_slide=0; // //functions +void on_os_components_toggled(GtkWidget*, char *path, main_window *widgets){ + GtkTreeIter iter; + int status; + gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(widgets->OSSoftwareList),&iter,path); + gtk_tree_model_get(GTK_TREE_MODEL(widgets->OSSoftwareList),&iter,0,&status,-1); + gtk_list_store_set(widgets->OSSoftwareList,&iter,0,!status,-1); +} + +void on_pacman_software_all_toggled(GtkWidget *, char *path, main_window *widgets){ + GtkTreeIter iter; + char *name, *type, *description; + gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(widgets->PacmanSoftwareAllList),&iter,path); + gtk_tree_model_get(GTK_TREE_MODEL(widgets->PacmanSoftwareAllList),&iter,1,&name,2,&type,3,&description,-1); + gtk_list_store_remove(widgets->PacmanSoftwareAllList,&iter); + gtk_list_store_append(widgets->PacmanSoftwareChosenList,&iter); + gtk_list_store_set(widgets->PacmanSoftwareChosenList,&iter,0,1,1,name,2,type,3,description,-1); + +} + +void on_pacman_software_chosen_toggled(GtkWidget *, char *path, main_window *widgets){ + GtkTreeIter iter; + char *name, *type, *description; + gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(widgets->PacmanSoftwareChosenList),&iter,path); + gtk_tree_model_get(GTK_TREE_MODEL(widgets->PacmanSoftwareChosenList),&iter,1,&name,2,&type,3,&description,-1); + gtk_list_store_remove(widgets->PacmanSoftwareChosenList,&iter); + gtk_list_store_append(widgets->PacmanSoftwareAllList,&iter); + gtk_list_store_set(widgets->PacmanSoftwareAllList,&iter,0,0,1,name,2,type,3,description,-1); + +} + +gboolean yon_pacman_fill(struct pacman_struct *pacman){ + main_window *widgets = pacman->widgets; + config_str loaded = pacman->packages; + int size = pacman->packages_size; + + + for (int i=0;iPacmanSoftwareAllList,&iter); + gtk_list_store_set(widgets->PacmanSoftwareAllList,&iter,0,0,1,parsed[0],2,parsed[1],3,parsed[2],-1); + yon_char_parsed_free(parsed,parsed_size); + } + yon_char_parsed_free(loaded,size); + gtk_widget_set_sensitive(widgets->PacmanSoftwareSearchEntry,1); + gtk_widget_set_sensitive(widgets->PacmanSoftwareChosenPackagesTree,1); + gtk_widget_set_sensitive(widgets->PacmanSoftwareStatusButton,1); + g_object_ref(G_OBJECT(widgets->MainSpinner)); + gtk_container_remove(GTK_CONTAINER(widgets->PacmanLoadingOverlay),widgets->MainSpinner); + return G_SOURCE_REMOVE; +} + +void *yon_pacman_load(struct pacman_struct *pacman){ + const char *find_package = pacman->find_package; + char *command = get_local_module_info_command(find_package); + pacman->packages = yon_config_load(yon_debug_output("%s\n",command),&pacman->packages_size); + g_idle_add((GSourceFunc)yon_pacman_fill,pacman); + return NULL; +} + +void on_pacman_icon_press(GtkEntry *self,GtkEntryIconPosition icon_pos,GdkEvent* ,main_window *widgets){ + if(icon_pos != GTK_ENTRY_ICON_SECONDARY) return; + + gtk_list_store_clear(widgets->PacmanSoftwareAllList); + + const char *find_package = gtk_entry_get_text(self); + struct pacman_struct *pacman = new (struct pacman_struct); + pacman->widgets=widgets; + pacman->find_package=find_package; + gtk_widget_set_sensitive(widgets->PacmanSoftwareSearchEntry,0); + gtk_widget_set_sensitive(widgets->PacmanSoftwareChosenPackagesTree,0); + gtk_widget_set_sensitive(widgets->PacmanSoftwareStatusButton,0); + gtk_overlay_add_overlay(GTK_OVERLAY(widgets->PacmanLoadingOverlay),widgets->MainSpinner); + g_thread_new("pacman_modules_get_thread",(GThreadFunc)yon_pacman_load,pacman); +} + void on_toggle_button_switch_on(GtkWidget *, GtkToggleButton *toggle){ gtk_toggle_button_set_active(toggle,1); } @@ -49,29 +128,29 @@ double yon_size_long_convert_automatic(unsigned long bytes, char *size){ // * [RU] // * Функция инициализации всех параметров конфигурации // */ -// void config_init(){ -// main_config.always_open_documentation=0; -// main_config.socket_id=-1; -// main_config.save_socket_id=-1; -// main_config.load_socket_id=-1; -// main_config.lock_help=0; -// main_config.lock_help=0; -// main_config.lock_load_global=0; -// main_config.lock_save_global=0; -// main_config.lock_save_local=0; -// main_config.debug_mode=0; -// main_config.slider_thread=0; -// main_config.install_thread=0; -// main_config.progress_thread=0; -// main_config.install_complete=0; -// main_config.save_done=0; -// main_config.save_configured=0; -// main_config.configure_mode=0; -// main_config.load_mode=-1; -// main_config.log_progress_buzy=0; -// main_config.log_end=0; -// main_config.exit_accepted=0; -// } +void config_init(){ + main_config.always_open_documentation=0; + main_config.socket_id=-1; + main_config.save_socket_id=-1; + main_config.load_socket_id=-1; + main_config.lock_help=0; + main_config.lock_help=0; + main_config.lock_load_global=0; + main_config.lock_save_global=0; + main_config.lock_save_local=0; + main_config.debug_mode=0; + main_config.slider_thread=0; + main_config.install_thread=0; + main_config.progress_thread=0; + main_config.install_complete=0; + main_config.save_done=0; + main_config.save_configured=0; + main_config.configure_mode=0; + main_config.load_mode=-1; + main_config.log_progress_buzy=0; + main_config.log_end=0; + main_config.exit_accepted=0; +} // void on_root_get_root(char *argline){ // yon_launch(argline); @@ -102,73 +181,6 @@ double yon_size_long_convert_automatic(unsigned long bytes, char *size){ // return 1; // } -void yon_switch_page_render(main_window *widgets){ - - enum YON_PAGES page = yon_page_get_current(GTK_NOTEBOOK(widgets->Notebook)); - switch(page){ - case YON_PAGE_WELCOME: - page = 0; - break; - case YON_PAGE_LICENCE: - page = 1; - break; - case YON_PAGE_SECTIONS: - case YON_PAGE_OS_COMPONENTS: - case YON_PAGE_INSTALL_COMMON: - case YON_PAGE_INSTALL_SAME_PARTITION: - case YON_PAGE_INSTALL_SEPARATE: - case YON_PAGE_INSTALL_ADVANCED: - case YON_PAGE_INSTALL_RECOVERY: - case YON_PAGE_INSTALLATION_BEGIN: - case YON_PAGE_KERNEL: - case YON_PAGE_KERNEL_ADDON: - case YON_PAGE_SOFTWARE: - case YON_PAGE_RECOVERY_GRUB_INSTALL: - case YON_PAGE_RECOVERY_GRUB_UPDATE: - case YON_PAGE_RECOVERY_OS_ONLY: - case YON_PAGE_RECOVERY_USRDATA_ONLY: - page = 2; - break; - case YON_PAGE_REGION: - page = 3; - break; - case YON_PAGE_KEYBOARD: - page = 4; - break; - case YON_PAGE_USERS: - page = 5; - break; - case YON_PAGE_BOOTLOADER: - case YON_PAGE_STARTUP: - case YON_PAGE_NETWORK: - page = 6; - break; - case YON_PAGE_INSTALLATION: - page = 7; - break; - case YON_PAGE_COMPLETED: - case YON_PAGE_COMPLETION: - case YON_PAGE_INSTALL_ERROR: - case YON_PAGE_CONFIGURE_END: - case YON_PAGE_CONFIGURE_SAVE: - page=8; - break; - } - - if (widgets){}; - GtkContainer *parent = GTK_CONTAINER(gtk_widget_get_parent(widgets->UsersToggle)); - GList *list = gtk_container_get_children(parent); - for (guint i=0;iMainWindow=yon_gtk_builder_get_widget(builder,"MainWindow"); widgets->StatusBox = yon_gtk_builder_get_widget(builder,"StatusBox"); widgets->Notebook = yon_gtk_builder_get_widget(builder,"Notebook"); + widgets->MainSpinner=yon_gtk_builder_get_widget(builder,"MainSpinner"); widgets->DocumentationMenuItem = yon_ubl_menu_item_documentation_new(DOCUMENTATION_LABEL); widgets->AboutMenuItem = yon_ubl_menu_item_about_new(ABOUT_LABEL); @@ -449,6 +462,21 @@ main_window *yon_main_window_complete(){ widgets->OSSoftwareTree = yon_gtk_builder_get_widget(builder,"OSSoftwareTree"); widgets->OSSoftwareList = GTK_LIST_STORE(gtk_builder_get_object(builder,"OSSoftwareList")); + widgets->OSSoftwareCell = GTK_CELL_RENDERER(gtk_builder_get_object(builder,"OSSoftwareCell")); + + widgets->PacmanSoftwareSearchEntry = yon_gtk_builder_get_widget(builder,"PacmanSoftwareSearchEntry"); + widgets->PacmanSoftwareStatusImage = yon_gtk_builder_get_widget(builder,"PacmanSoftwareStatusImage"); + widgets->PacmanSoftwareStatusLabel = yon_gtk_builder_get_widget(builder,"PacmanSoftwareStatusLabel"); + widgets->PacmanSoftwareStatusButton = yon_gtk_builder_get_widget(builder,"PacmanSoftwareStatusButton"); + + widgets->PacmanLoadingOverlay = yon_gtk_builder_get_widget(builder,"PacmanLoadingOverlay"); + widgets->PacmanSoftwareAllPackagesTree = yon_gtk_builder_get_widget(builder,"PacmanSoftwareAllPackagesTree"); + widgets->PacmanSoftwareAllList = GTK_LIST_STORE(gtk_builder_get_object(builder,"PacmanSoftwareAllList")); + widgets->PacmanSoftwareAllCell = GTK_CELL_RENDERER(gtk_builder_get_object(builder,"PacmanSoftwareAllCell")); + + widgets->PacmanSoftwareChosenPackagesTree = yon_gtk_builder_get_widget(builder,"PacmanSoftwareChosenPackagesTree"); + widgets->PacmanSoftwareChosenList = GTK_LIST_STORE(gtk_builder_get_object(builder,"PacmanSoftwareChosenList")); + widgets->PacmanSoftwareChosenCell = GTK_CELL_RENDERER(gtk_builder_get_object(builder,"PacmanSoftwareChosenCell")); widgets->StartupServicesTree = yon_gtk_builder_get_widget(builder,"StartupServicesTree"); widgets->StartupServicesAddButton = yon_gtk_builder_get_widget(builder,"StartupServicesAddButton"); @@ -557,6 +585,10 @@ main_window *yon_main_window_complete(){ // g_signal_connect(G_OBJECT(widgets->HostnameSensitiveCheck),"toggled",G_CALLBACK(on_autohostname_sensitiveness_check),widgets); // g_signal_connect(G_OBJECT(widgets->AutoHostnameCheck),"toggled",G_CALLBACK(on_autohostname_check),widgets); // g_signal_connect(G_OBJECT(widgets->HotnameEntry),"changed",G_CALLBACK(on_hostname_entry_changed),widgets); + g_signal_connect(G_OBJECT(widgets->OSSoftwareCell),"toggled",G_CALLBACK(on_os_components_toggled),widgets); + g_signal_connect(G_OBJECT(widgets->PacmanSoftwareAllCell),"toggled",G_CALLBACK(on_pacman_software_all_toggled),widgets); + g_signal_connect(G_OBJECT(widgets->PacmanSoftwareChosenCell),"toggled",G_CALLBACK(on_pacman_software_chosen_toggled),widgets); + g_signal_connect(G_OBJECT(widgets->PacmanSoftwareSearchEntry),"icon-press",G_CALLBACK(on_pacman_icon_press),widgets); { @@ -711,7 +743,23 @@ main_window *yon_main_window_complete(){ } yon_char_parsed_free(parsed,size); } - + { + int base_size; + config_str base = yon_file_ls(system_base_modules_path,&base_size); + for (int i=0;iOSSoftwareList,&iter); + gtk_list_store_set(widgets->OSSoftwareList,&iter,0,0,1,base[i],-1); + } + int modules_size; + config_str modules = yon_file_ls(system_modules_path,&modules_size); + for (int i=0;iOSSoftwareList,&iter); + gtk_list_store_set(widgets->OSSoftwareList,&iter,0,0,1,modules[i],-1); + } + } + parsed = yon_resource_open_file(additional_software_path,&size); for (int i=1;i LayoutList - + + True + False + True + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -224,6 +253,11 @@ False com.ublinux.libublsettingsui-gtk3.increase-symbolic + + True + False + com.ublinux.libublsettingsui-gtk3.sync-symbolic + True False @@ -1356,15 +1390,16 @@ and help you install UBLinux on your computer True True - OSSorfwareList + OSSoftwareList 0 + both - + 0 @@ -2024,9 +2059,6 @@ and help you install UBLinux on your computer True AdditionalSoftwareList 0 - - - @@ -2106,6 +2138,343 @@ and help you install UBLinux on your computer False + + + True + False + vertical + 5 + + + True + False + Choose additional components + + + + + + + + False + True + 0 + + + + + True + False + 0.019999999552965164 + in + + + True + False + 5 + 5 + 5 + 5 + + + True + False + vertical + 5 + + + True + False + 5 + + + True + False + Package name: + + + False + True + 0 + + + + + True + True + com.ublinux.libublsettingsui-gtk3.zoom-symbolic + + + False + True + 1 + + + + + True + True + True + image26 + + + + False + True + end + 2 + + + + + True + False + Accessed + + + False + True + end + 3 + + + + + True + False + + + + False + True + end + 4 + + + + + True + False + Repository status: + + + False + True + end + 5 + + + + + False + True + 0 + + + + + True + False + + + True + True + in + + + True + True + PacmanSoftwareAllList + 0 + + + + + + + + + 0 + + + + + + + Module name + + + + 1 + + + + + + + Type + + + + 2 + + + + + + + Description + + + + 3 + + + + + + + + + -1 + + + + + True + True + 1 + + + + + + + + + True + False + Selecting additional software to install from the repository via the Internet + + + + + True + True + 1 + + + + + True + False + 0.019999999552965164 + in + + + True + False + 5 + 5 + 5 + 5 + + + True + True + in + + + True + True + PacmanSoftwareChosenList + 0 + + + + + + + + + 0 + + + + + + + Module name + + + + 1 + + + + + + + Type + + + + 2 + + + + + + + Description + + + + 3 + + + + + + + + + + + + + True + False + Selecting additional software to install from the repository via the Internet + + + + + True + True + 2 + + + + + 8 + + + + + True + False + Pacman software + + + 8 + False + + True @@ -2407,7 +2776,7 @@ and help you install UBLinux on your computer - 8 + 9 @@ -2417,7 +2786,7 @@ and help you install UBLinux on your computer Region - 8 + 9 False @@ -2805,7 +3174,7 @@ and help you install UBLinux on your computer - 9 + 10 @@ -2815,7 +3184,7 @@ and help you install UBLinux on your computer Keyboard - 9 + 10 False @@ -3158,7 +3527,7 @@ and help you install UBLinux on your computer - 10 + 11 @@ -3168,7 +3537,7 @@ and help you install UBLinux on your computer Users - 10 + 11 False @@ -3349,7 +3718,7 @@ and help you install UBLinux on your computer - 11 + 12 @@ -3359,7 +3728,7 @@ and help you install UBLinux on your computer Startup configuration - 11 + 12 False @@ -3708,7 +4077,7 @@ and help you install UBLinux on your computer - 12 + 13 @@ -3718,7 +4087,7 @@ and help you install UBLinux on your computer Bootloader - 12 + 13 False @@ -4050,7 +4419,7 @@ and help you install UBLinux on your computer - 13 + 14 @@ -4060,7 +4429,7 @@ and help you install UBLinux on your computer Network - 13 + 14 False @@ -4100,7 +4469,7 @@ and help you install UBLinux on your computer - 14 + 15 @@ -4110,7 +4479,7 @@ and help you install UBLinux on your computer Installation process - 14 + 15 False @@ -4187,7 +4556,7 @@ or continue working in the UBLinux Live environment. - 15 + 16 @@ -4197,7 +4566,7 @@ or continue working in the UBLinux Live environment. Completion - 15 + 16 False @@ -4272,7 +4641,7 @@ or continue working in the UBLinux Live environment. - 16 + 17 @@ -4282,7 +4651,7 @@ or continue working in the UBLinux Live environment. Completed - 16 + 17 False @@ -4357,7 +4726,7 @@ or continue working in the UBLinux Live environment. - 17 + 18 @@ -4367,7 +4736,7 @@ or continue working in the UBLinux Live environment. Configuration error - 17 + 18 False @@ -4442,7 +4811,7 @@ or continue working in the UBLinux Live environment. - 18 + 19 @@ -4452,7 +4821,7 @@ or continue working in the UBLinux Live environment. Configuration end - 18 + 19 False @@ -4527,7 +4896,7 @@ or continue working in the UBLinux Live environment. - 19 + 20 @@ -4537,7 +4906,7 @@ or continue working in the UBLinux Live environment. Configuration saved - 19 + 20 False @@ -4981,7 +5350,7 @@ or continue working in the UBLinux Live environment. - 20 + 21 @@ -4991,7 +5360,7 @@ or continue working in the UBLinux Live environment. Common Installation - 20 + 21 False @@ -5660,7 +6029,7 @@ installed. - 21 + 22 @@ -5670,7 +6039,7 @@ installed. Installation next to system - 21 + 22 False @@ -6297,7 +6666,7 @@ installed. - 22 + 23 @@ -6307,7 +6676,7 @@ installed. Installation on same partition - 22 + 23 False @@ -7158,7 +7527,7 @@ separately into the selected partition. - 23 + 24 @@ -7168,7 +7537,7 @@ separately into the selected partition. Advanced section - 23 + 24 False @@ -7634,7 +8003,7 @@ separately into the selected partition. - 24 + 25 @@ -7644,7 +8013,7 @@ separately into the selected partition. Recovery section - 24 + 25 False @@ -8015,7 +8384,7 @@ separately into the selected partition. - 25 + 26 @@ -8025,7 +8394,7 @@ separately into the selected partition. GRUB install - 25 + 26 False @@ -8383,7 +8752,7 @@ separately into the selected partition. - 26 + 27 @@ -8393,7 +8762,7 @@ separately into the selected partition. GRUB update - 26 + 27 False @@ -9110,7 +9479,7 @@ separately into the selected partition. - 27 + 28 @@ -9120,7 +9489,7 @@ separately into the selected partition. OS only - 27 + 28 False @@ -9841,7 +10210,7 @@ separately into the selected partition. - 28 + 29 @@ -9851,7 +10220,7 @@ separately into the selected partition. User data only - 28 + 29 False