From 9a040065cf404f382781e7856f11b82a97dad051 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 8 Aug 2025 18:15:14 +0600 Subject: [PATCH] WIP loading --- source/ubinstall-gtk-components.c | 2 +- source/ubinstall-gtk-keyboard.c | 39 ++------------- source/ubinstall-gtk-region.c | 10 ++-- source/ubinstall-gtk-saving.c | 4 +- source/ubinstall-gtk-startup-services.c | 66 +++++++++++++++++++++---- source/ubinstall-gtk-users.c | 5 +- source/ubinstall-gtk.c | 13 ++--- source/ubinstall-gtk.h | 22 ++------- ubinstall-gtk-os-row.glade | 3 +- ubinstall-gtk.glade | 19 ++----- 10 files changed, 85 insertions(+), 98 deletions(-) diff --git a/source/ubinstall-gtk-components.c b/source/ubinstall-gtk-components.c index 8191083..f35182a 100644 --- a/source/ubinstall-gtk-components.c +++ b/source/ubinstall-gtk-components.c @@ -160,7 +160,7 @@ void yon_os_components_init(main_window *widgets){ if (yon_char_parsed_check_exist(parsed,parsed_size,target)>-1){ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(row->InstallCheck),1); } else { - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(row->InstallCheck),1); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(row->InstallCheck),0); } } yon_char_parsed_free(parsed,parsed_size); diff --git a/source/ubinstall-gtk-keyboard.c b/source/ubinstall-gtk-keyboard.c index 277a395..ad5d5e3 100644 --- a/source/ubinstall-gtk-keyboard.c +++ b/source/ubinstall-gtk-keyboard.c @@ -1,42 +1,14 @@ #include "ubinstall-gtk.h" -void on_layout_toggle_button_switch(GtkWidget *self, main_window *widgets){ - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(self))){ - gtk_widget_set_sensitive(widgets->DefaultLayoutRadio,1); - gtk_widget_set_sensitive(widgets->ManualLayoutRadio,1); - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->ManualLayoutRadio))){ - gtk_widget_set_sensitive(widgets->LayoutTree,1); - gtk_widget_set_sensitive(widgets->AddButton,1); - gtk_widget_set_sensitive(widgets->RemoveButton,1); - } else { - gtk_widget_set_sensitive(widgets->LayoutTree,0); - gtk_widget_set_sensitive(widgets->AddButton,0); - gtk_widget_set_sensitive(widgets->RemoveButton,0); - } - } else { - gtk_widget_set_sensitive(widgets->DefaultLayoutRadio,0); - gtk_widget_set_sensitive(widgets->ManualLayoutRadio,0); - gtk_widget_set_sensitive(widgets->LayoutTree,0); - gtk_widget_set_sensitive(widgets->AddButton,0); - gtk_widget_set_sensitive(widgets->RemoveButton,0); - - } -} - int yon_keyboard_save(main_window *widgets){ - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->ManualLayoutRadio))){ GtkTreeIter iter; if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(widgets->LayoutList),&iter)){ yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),LAYOUTS_CHOSEN_BUT_EMPTY_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); - yon_ubl_status_highlight_incorrect(widgets->ManualLayoutRadio); yon_ubl_status_highlight_incorrect(gtk_widget_get_parent(widgets->LayoutTree)); return 0; } - } char *layouts_list=""; - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->ManualLayoutRadio))&>k_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->LayoutSensitiveCheck))){ GtkTreeModel *layouts_model=GTK_TREE_MODEL(widgets->LayoutList); - GtkTreeIter iter; char *cur_layout=NULL; for_iter(layouts_model,&iter){ int chosen=0; @@ -44,14 +16,13 @@ int yon_keyboard_save(main_window *widgets){ if (chosen) layouts_list = yon_char_unite(layouts_list,yon_char_is_empty(layouts_list)?"":",",cur_layout,NULL); } - } - if (yon_char_is_empty(layouts_list)&>k_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->LayoutSensitiveCheck))) + if (yon_char_is_empty(layouts_list)) yon_config_register(xkblayout_parameter,xkblayout_parameter_command,layouts_list); else yon_config_remove_by_key(xkblayout_parameter); - if (gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->KeyboardModelCombo))&>k_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->KeyboardModelSensitiveCheck))){ + if (gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->KeyboardModelCombo))){ char *model = (char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(widgets->KeyboardModelCombo)); if (!yon_char_is_empty(model)) yon_config_register(xkbmodel_parameter,xkbmodel_parameter_command,model); @@ -59,7 +30,7 @@ int yon_keyboard_save(main_window *widgets){ yon_config_remove_by_key(xkbmodel_parameter); } - if (gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->LayoutBindingCombo))&>k_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->OptionsSensitiveCheck))){ + if (gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->LayoutBindingCombo))){ char *options = (char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(widgets->LayoutBindingCombo)); if (options){}; yon_config_register(xkboptions_parameter,xkboptions_parameter_command,options); @@ -311,8 +282,6 @@ void yon_keyboard_init(main_window *widgets){ } if (!yon_char_is_empty(layouts)){ - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->LayoutSensitiveCheck),1); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->ManualLayoutRadio),1); int parsed_size; config_str parsed = yon_char_parse(layouts,&parsed_size,","); @@ -329,7 +298,5 @@ void yon_keyboard_init(main_window *widgets){ } } else { - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->LayoutSensitiveCheck),0); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->DefaultLayoutRadio),1); } } \ No newline at end of file diff --git a/source/ubinstall-gtk-region.c b/source/ubinstall-gtk-region.c index 2d7dd90..a59aff6 100644 --- a/source/ubinstall-gtk-region.c +++ b/source/ubinstall-gtk-region.c @@ -24,19 +24,19 @@ int yon_region_save(main_window *widgets){ gtk_tree_model_get(model,&iter,2,&lang_code,-1); languages = yon_char_unite(languages,!yon_char_is_empty(languages)?",":"",lang_code,NULL); } - if (yon_char_is_empty(languages)||!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->MainLanguageSensitiveCheck))){ + if (yon_char_is_empty(languages)){ yon_config_remove_by_key(locale_parameter); } else { yon_config_register(locale_parameter,locale_parameter_command,languages); free(languages); } - if (gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->LanguagesCombo))==-1||!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->LanguagesSensitiveCheck))){ + if (gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->LanguagesCombo))==-1){ yon_config_remove_by_key(lang_parameter); } else { char *language = (char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(widgets->LanguagesCombo)); yon_config_register(lang_parameter,lang_parameter_command,language); } - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->RegionSensitiveCheck))){ + if (gtk_switch_get_active(GTK_SWITCH(widgets->RegionSensitiveSwitch))){ char *region = (char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(widgets->RegionCombo)); char *zone = (char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(widgets->ZoneCombo)); yon_debug_output("%s",region); @@ -113,12 +113,12 @@ void yon_region_init(main_window *widgets){ gtk_combo_box_set_active_id(GTK_COMBO_BOX(widgets->RegionCombo),timezone); while(gtk_events_pending()) gtk_main_iteration(); gtk_combo_box_set_active_id(GTK_COMBO_BOX(widgets->ZoneCombo),zone); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->RegionSensitiveCheck),1); + gtk_switch_set_active(GTK_SWITCH(widgets->RegionSensitiveSwitch),1); free(timezone); } else { gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->RegionCombo),0); gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->ZoneCombo),0); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->RegionSensitiveCheck),0); + gtk_switch_set_active(GTK_SWITCH(widgets->RegionSensitiveSwitch),0); } if (!yon_char_is_empty(locale)){ diff --git a/source/ubinstall-gtk-saving.c b/source/ubinstall-gtk-saving.c index ae7e979..f86481f 100644 --- a/source/ubinstall-gtk-saving.c +++ b/source/ubinstall-gtk-saving.c @@ -326,12 +326,12 @@ void on_config_custom_load(GtkWidget *,main_window *widgets){ // char *zone = config(zone_parameter); // char *region = NULL; // -// if (!yon_char_is_empty(zone)) region = yon_char_divide_search(zone,"/",-1); else {gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->RegionSensitiveCheck),0);} +// if (!yon_char_is_empty(zone)) region = yon_char_divide_search(zone,"/",-1); else {gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->RegionSensitiveSwitch),0);} // if (!yon_char_is_empty(region)){ // gtk_combo_box_set_active_id(GTK_COMBO_BOX(widgets->RegionCombo),region); // } else { // gtk_combo_box_set_active_id(GTK_COMBO_BOX(widgets->RegionCombo),"Europe"); -// gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->RegionSensitiveCheck),0); +// gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->RegionSensitiveSwitch),0); // } // if (!yon_char_is_empty(zone)){ // gtk_combo_box_set_active_id(GTK_COMBO_BOX(widgets->ZoneCombo),zone); diff --git a/source/ubinstall-gtk-startup-services.c b/source/ubinstall-gtk-startup-services.c index aaa0fbd..411a235 100644 --- a/source/ubinstall-gtk-startup-services.c +++ b/source/ubinstall-gtk-startup-services.c @@ -43,15 +43,63 @@ void on_startup_services_remove(GtkWidget *self,main_window *widgets){ } void yon_startup_services_setup(main_window *widgets){ - int size; - config_str services = yon_resource_open_file(services_list_path,&size); - for (int i=1;iStartupList,&iter); - gtk_list_store_set(widgets->StartupList,&iter,0,1,1,parsed[0],2,yon_char_return_if_exist(parsed[1],""),3,yon_char_return_if_exist(parsed[2],""),-1); + GtkTreeIter iter; + if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(widgets->StartupList),&iter)){ + int size; + config_str services = yon_resource_open_file(services_list_path,&size); + for (int i=1;iStartupList,&iter); + gtk_list_store_set(widgets->StartupList,&iter,0,1,1,parsed[0],2,yon_char_return_if_exist(parsed[1],""),3,yon_char_return_if_exist(parsed[2],""),-1); + } + } + } + char *startup = config(SERVICES_ENABLE_parameter); + if (!yon_char_is_empty(startup)){ + if (!strcmp(startup,"auto")){ + for_iter(GTK_TREE_MODEL(widgets->StartupList),&iter){ + gtk_list_store_set(widgets->StartupList,&iter,0,1,-1); + } + } else { + int parsed_size; + config_str parsed = yon_char_parse(startup,&parsed_size,","); + for_iter(GTK_TREE_MODEL(widgets->StartupList),&iter){ + char *target; + gtk_tree_model_get(GTK_TREE_MODEL(widgets->StartupList),&iter,2,&target,-1); + if (strstr(target,",")){ + int target_size; + config_str target_parsed = yon_char_parse(target,&target_size,","); + int found =0; + for (int i=0;i-1){ + found++; + parsed = yon_char_parsed_rip(parsed,&parsed_size,pos); + } + } + if (found == target_size){ + gtk_list_store_set(widgets->StartupList,&iter,0,1,-1); + } + yon_char_parsed_free(target_parsed,target_size); + } else { + int pos = yon_char_parsed_check_exist(parsed,parsed_size,target); + if (pos>-1){ + gtk_list_store_set(widgets->StartupList,&iter,0,1,-1); + parsed = yon_char_parsed_rip(parsed,&parsed_size,pos); + } else { + gtk_list_store_set(widgets->StartupList,&iter,0,0,-1); + } + } + } + if (parsed_size&&parsed){ + for (int i=0;iStartupList,&iter); + gtk_list_store_set(widgets->StartupList,&iter,0,1,2,parsed[i],-1); + } + } + yon_char_parsed_free(parsed,parsed_size); } } } diff --git a/source/ubinstall-gtk-users.c b/source/ubinstall-gtk-users.c index d49303c..e399ded 100644 --- a/source/ubinstall-gtk-users.c +++ b/source/ubinstall-gtk-users.c @@ -143,12 +143,13 @@ void yon_user_init(main_window *widgets){ char *parameter = yon_char_new(users[i]); char *parameter_name = yon_char_divide_search(parameter,"=",-1); char *key = yon_config_parameter_get_key(parameter_name); + char *login = yon_config_parameter_get_key(strstr(key,"USERADD[")); config_str parsed = yon_char_parse(parameter,&parsed_size,":"); - gtk_entry_set_text(GTK_ENTRY(user->LoginEntry),key); + gtk_entry_set_text(GTK_ENTRY(user->LoginEntry),login); if (parsed_size>0) gtk_entry_set_text(GTK_ENTRY(user->UsernameEntry),parsed[0]); - if (parsed_size>5){ + if (parsed_size>5&&!yon_char_is_empty(parsed[5])){ gtk_entry_set_text(GTK_ENTRY(user->PasswordEntry),parsed[5]); gtk_combo_box_set_active(GTK_COMBO_BOX(user->PasswordCombo),1); } diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c index 16e4812..bfc112c 100644 --- a/source/ubinstall-gtk.c +++ b/source/ubinstall-gtk.c @@ -423,17 +423,10 @@ main_window *yon_main_window_complete(){ widgets->LanguagesCombo=yon_gtk_builder_get_widget(builder,"LanguagesCombo"); widgets->KeyboardModelCombo=yon_gtk_builder_get_widget(builder,"KeyboardModelCombo"); widgets->LayoutBindingCombo=yon_gtk_builder_get_widget(builder,"LayoutBindingCombo"); - widgets->DefaultLayoutRadio=yon_gtk_builder_get_widget(builder,"DefaultLayoutRadio"); - widgets->ManualLayoutRadio=yon_gtk_builder_get_widget(builder,"ManualLayoutRadio"); widgets->LayoutTree=yon_gtk_builder_get_widget(builder,"LayoutTree"); widgets->AddButton=yon_gtk_builder_get_widget(builder,"AddButton"); widgets->RemoveButton=yon_gtk_builder_get_widget(builder,"RemoveButton"); - widgets->RegionSensitiveCheck = yon_gtk_builder_get_widget(builder,"RegionSensitiveCheck"); - widgets->LanguagesSensitiveCheck = yon_gtk_builder_get_widget(builder,"LanguagesSensitiveCheck"); - widgets->MainLanguageSensitiveCheck = yon_gtk_builder_get_widget(builder,"MainLanguageSensitiveCheck"); - widgets->KeyboardModelSensitiveCheck = yon_gtk_builder_get_widget(builder,"KeyboardModelSensitiveCheck"); - widgets->OptionsSensitiveCheck = yon_gtk_builder_get_widget(builder,"OptionsSensitiveCheck"); - widgets->LayoutSensitiveCheck = yon_gtk_builder_get_widget(builder,"LayoutSensitiveCheck"); + widgets->RegionSensitiveSwitch = yon_gtk_builder_get_widget(builder,"RegionSensitiveSwitch"); widgets->UserRootNameEntry=yon_gtk_builder_get_widget(builder,"UserRootNameEntry"); widgets->UserRootLoginEntry=yon_gtk_builder_get_widget(builder,"UserRootLoginEntry"); @@ -561,7 +554,8 @@ main_window *yon_main_window_complete(){ g_signal_connect(G_OBJECT(widgets->CancelInstallButton),"clicked",G_CALLBACK(on_page_cancel_clicked),widgets); g_signal_connect(G_OBJECT(widgets->AvailableLanguagesButton),"clicked",G_CALLBACK(on_language_clicked),widgets); g_signal_connect(G_OBJECT(widgets->RegionCombo),"changed",G_CALLBACK(on_region_changed),widgets); - g_signal_connect(G_OBJECT(widgets->LayoutSensitiveCheck),"toggled",G_CALLBACK(on_layout_toggle_button_switch),widgets); + g_signal_connect(G_OBJECT(widgets->RegionSensitiveSwitch),"state-set",G_CALLBACK(yon_gtk_widget_set_sensitive_from_switch),widgets->RegionCombo); + g_signal_connect(G_OBJECT(widgets->RegionSensitiveSwitch),"state-set",G_CALLBACK(yon_gtk_widget_set_sensitive_from_switch),widgets->ZoneCombo); g_signal_connect(G_OBJECT(widgets->AddButton),"clicked",G_CALLBACK(on_keyboard_clicked),widgets); g_signal_connect(G_OBJECT(widgets->RemoveButton),"clicked",G_CALLBACK(on_keyboard_removed),widgets); @@ -596,7 +590,6 @@ main_window *yon_main_window_complete(){ g_signal_connect(G_OBJECT(widgets->StartupServicesEditButton),"clicked",G_CALLBACK(on_startup_service_edit),widgets); g_signal_connect(G_OBJECT(widgets->StartupServicesRemoveButton),"clicked",G_CALLBACK(on_startup_services_remove),widgets); - g_signal_connect(G_OBJECT(widgets->ManualLayoutRadio),"toggled",G_CALLBACK(yon_gtk_widget_set_sensitive_from_toggle_button),gtk_widget_get_parent(gtk_widget_get_parent(widgets->AddButton))); g_signal_connect(G_OBJECT(widgets->AutoHostnameCheck),"toggled",G_CALLBACK(yon_gtk_widget_set_sensitive_from_toggle_button_inversed),widgets->HotnameEntry); diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h index 25ee006..4a54db1 100755 --- a/source/ubinstall-gtk.h +++ b/source/ubinstall-gtk.h @@ -193,7 +193,7 @@ layout && /description:/ {\ #define DOMAIN_admanger_parameter_command "ubconfig --source global get [autoinstall] AUTOINSTALL['ubconfig set [network] DOMAIN[admanger]']" #define USERADD_parameter_all "AUTOINSTALL[ubconfig set [users] USERADD[*]]" #define USERADD_parameter_search "AUTOINSTALL[ubconfig set [users] USERADD[" -#define USERADD_parameter(target) yon_char_unite("AUTOINSTALL[ubconfig set [users] USERADD[",target,"]']",NULL) +#define USERADD_parameter(target) yon_char_unite("AUTOINSTALL[ubconfig set [users] USERADD[",target,"]]",NULL) #define USERADD_parameter_command(target) yon_char_unite("ubconfig --source global get autoinstall AUTOINSTALL['ubconfig set [users] USERADD[",target,"]']",NULL) #define KERNEL_BOOT_parameter "AUTOINSTALL[ubconfig set [boot] KERNEL_BOOT]" #define KERNEL_BOOT_parameter_command "ubconfig --source global get autoinstall AUTOINSTALL['ubconfig set [boot] KERNEL_BOOT']" @@ -213,8 +213,8 @@ layout && /description:/ {\ #define AUTOLOGINUSER_parameter "AUTOINSTALL[ubconfig set [desktop] AUTOLOGINUSER]" #define AUTOLOGINUSER_parameter_command "ubconfig get autoinstall AUTOINSTALL['ubconfig set [boot] AUTOLOGINUSER']" #define NETWORK_parameter_search "AUTOINSTALL[ubconfig set [network] NETWORK[" -#define NETWORK_parameter(target) yon_char_unite("AUTOINSTALL[ubconfig set [network] NETWORK[",target,"@connmod]']",NULL) -#define NETWORK_devdown_parameter(target) yon_char_unite("AUTOINSTALL[ubconfig set [network] NETWORK[",target,"@devdown]']",NULL) +#define NETWORK_parameter(target) yon_char_unite("AUTOINSTALL[ubconfig set [network] NETWORK[",target,"@connmod]]",NULL) +#define NETWORK_devdown_parameter(target) yon_char_unite("AUTOINSTALL[ubconfig set [network] NETWORK[",target,"@devdown]]",NULL) #define NETWORK_parameter_command(target) yon_char_unite("ubconfig get autoinstall AUTOINSTALL['ubconfig set [network] NETWORK[",target,"@connmod]']",NULL) #define NETWORK_devdown_parameter_command(target) yon_char_unite("ubconfig get autoinstall AUTOINSTALL['ubconfig set [network] NETWORK[",target,"@devdown]']",NULL) #define NETWORK(target) yon_char_unite("NETWORK[",target,"@connmod]",NULL) @@ -388,9 +388,7 @@ extern config main_config; typedef struct { GtkWidget *CommonInstallationDevicesTree; GtkWidget *GpartedCommonButton; - GtkWidget *CommonFilesystemSensitiveCheck; GtkWidget *CommonInstallationFilesystemTypeCombo; - GtkWidget *CommonSectionSensitiveCheck; GtkWidget *CommonInstallationSectionNameEntry; GtkListStore *DevicesList; } install_common_page; @@ -439,8 +437,6 @@ typedef struct { GtkWidget *LanguagesCombo; GtkWidget *KeyboardModelCombo; GtkWidget *LayoutBindingCombo; - GtkWidget *DefaultLayoutRadio; - GtkWidget *ManualLayoutRadio; GtkWidget *LayoutTree; GtkWidget *AddButton; GtkWidget *RemoveButton; @@ -565,16 +561,7 @@ typedef struct { GList *slides_original; float region_height_mult; - GtkWidget *RegionSensitiveCheck; - GtkWidget *LanguagesSensitiveCheck; - GtkWidget *MainLanguageSensitiveCheck; - GtkWidget *KeyboardModelSensitiveCheck; - GtkWidget *OptionsSensitiveCheck; - GtkWidget *LayoutSensitiveCheck; - GtkWidget *UsernameSensitiveCheck; - GtkWidget *LoginSensitiveCheck; - GtkWidget *UserRootOnlyCheck; - GtkWidget *AutologinSensitiveCheck; + GtkWidget *RegionSensitiveSwitch; GtkWidget *HostnameSensitiveSwitch; GtkWidget *KernelListBox; @@ -953,7 +940,6 @@ void on_page_next_clicked(GtkWidget *, main_window *widgets); void on_page_prev_clicked(GtkWidget *, main_window *widgets); void yon_load_proceed(YON_CONFIG_TYPE type); void _yon_saving_threaded(char *final_command); -void on_layout_toggle_button_switch(GtkWidget *self, main_window *widgets); enum YON_PAGES yon_page_get_next(main_window *widgets,enum YON_PAGES page); enum YON_PAGES yon_page_get_prev(enum YON_PAGES page); enum YON_PAGES yon_sections_get_next_page(main_window *widgets); diff --git a/ubinstall-gtk-os-row.glade b/ubinstall-gtk-os-row.glade index 6bde8c2..b9ff25b 100644 --- a/ubinstall-gtk-os-row.glade +++ b/ubinstall-gtk-os-row.glade @@ -1,5 +1,5 @@ - + @@ -12,6 +12,7 @@ True True False + True True diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade index 3d461df..43d5ad2 100644 --- a/ubinstall-gtk.glade +++ b/ubinstall-gtk.glade @@ -1,5 +1,5 @@ - + @@ -2532,7 +2532,7 @@ and help you install UBLinux on your computer 10 5 - + True True @@ -2666,10 +2666,8 @@ and help you install UBLinux on your computer True - False False English, U.S.A.; Russian, Russia - True @@ -2680,7 +2678,6 @@ and help you install UBLinux on your computer True - False True True image6 @@ -2721,11 +2718,9 @@ and help you install UBLinux on your computer True - False True LanguagesFilter 2 - @@ -2841,13 +2836,11 @@ and help you install UBLinux on your computer True - False True 0 Default (Regular 105-key) - True @@ -2882,7 +2875,6 @@ and help you install UBLinux on your computer True - False True 0 @@ -2912,7 +2904,6 @@ and help you install UBLinux on your computer Scroll Lock Left Ctrl+Left Win - True @@ -2948,10 +2939,12 @@ and help you install UBLinux on your computer True - False True LayoutsFilter 0 + + + column @@ -3005,7 +2998,6 @@ and help you install UBLinux on your computer True - False True True Add layouts @@ -3023,7 +3015,6 @@ and help you install UBLinux on your computer True - False True True Remove layout