Applications
/
ubinstall-gtk
10
0
Fork 1
Code Issues 41 Pull Requests Packages Projects Releases Wiki Activity

Fixes

Browse Source
pull/21/head
Ivan Dmitrievich Yartsev 1 year ago
parent 1ee62f20d0
commit 319c523218
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File

58
source/ubinstall-gtk.c
Unescape View File

@ -356,25 +356,25 @@ void yon_interface_update(main_window *widgets){
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->AutoHostnameCheck),1); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->AutoHostnameCheck),1);
} }
if (fs_type) free(fs_type); // if (fs_type) free(fs_type);
if (device_label) free(device_label); // if (device_label) free(device_label);
if (format) free(format); // if (format) free(format);
if (part_size) free(part_size); // if (part_size) free(part_size);
if (user_name) free(user_name); // if (user_name) free(user_name);
if (user_gecos) free(user_gecos); // if (user_gecos) free(user_gecos);
if (user_password) free(user_password); // if (user_password) free(user_password);
if (root_password) free(root_password); // if (root_password) free(root_password);
if (autologin) free(autologin); // if (autologin) free(autologin);
if (hostname) free(hostname); // if (hostname) free(hostname);
if (kbmodel) free(kbmodel); // if (kbmodel) free(kbmodel);
if (optinos) free(optinos); // if (optinos) free(optinos);
if (layout) free(layout); // if (layout) free(layout);
if (language) free(language); // if (language) free(language);
if (zone) free(zone); // if (zone) free(zone);
if (system_locale) free(system_locale); // if (system_locale) free(system_locale);
if (region) free(region); // if (region) free(region);
if (device) free(device); // if (device) free(device);
if (part) free(part); // if (part) free(part);
} }
void on_config_local_load(GtkWidget *,main_window *widgets); void on_config_local_load(GtkWidget *,main_window *widgets);
@ -1177,7 +1177,7 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){
} else { } else {
yon_config_remove_by_key(xkblayout_parameter); yon_config_remove_by_key(xkblayout_parameter);
} }
if (!gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->KeyboardModelCombo))&&gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->KeyboardModelSensitiveCheck))){ if (gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->KeyboardModelCombo))&&gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->KeyboardModelSensitiveCheck))){
char *model = (char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(widgets->KeyboardModelCombo)); char *model = (char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(widgets->KeyboardModelCombo));
// char *layout_switch; // char *layout_switch;
if (!yon_char_is_empty(model)) if (!yon_char_is_empty(model))
@ -1213,15 +1213,15 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){
gtk_tree_model_get(model,&iter,0,&device,-1); gtk_tree_model_get(model,&iter,0,&device,-1);
yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_TYPE_INSTALL_command,"fast"); yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_TYPE_INSTALL_command,"fast");
yon_config_register(AUTOINSTALL_DEVICE,AUTOINSTALL_DEVICE_command,device); yon_config_register(AUTOINSTALL_DEVICE,AUTOINSTALL_DEVICE_command,device);
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->LayoutSensitiveCheck))){ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->CommonSectionSensitiveCheck))){
yon_config_register(device_label_parameter,device_label_parameter_command,device_name); yon_config_register(device_label_parameter,device_label_parameter_command,device_name);
} else { } else {
yon_config_remove_by_key(device_label_parameter); yon_config_remove_by_key(device_label_parameter);
} }
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->CommonFilesystemSensitiveCheck))){ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->CommonFilesystemSensitiveCheck))){
yon_config_register(part_type_parameter,part_type_parameter_command,file_system_type); yon_config_register(part_type_parameter,part_type_parameter_command,file_system_type);
} else { } else {
yon_config_remove_by_key(device_label_parameter); yon_config_remove_by_key(part_type_parameter);
} }
if (!main_config.configure_mode) if (!main_config.configure_mode)
@ -1256,15 +1256,15 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){
} else yon_config_remove_by_key(part_size_parameter); } else yon_config_remove_by_key(part_size_parameter);
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->NextLabelSensitiveCheck))){ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->NextLabelSensitiveCheck))){
char *device_name = (char*)gtk_entry_get_text(GTK_ENTRY(widgets->NextInstallationSectionNameEntry)); char *device_name = (char*)gtk_entry_get_text(GTK_ENTRY(widgets->NextInstallationSectionNameEntry));
char *part;
gtk_tree_model_get(model,&iter,0,&part,-1);
yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_TYPE_INSTALL_command,"next");
yon_config_register(AUTOINSTALL_DEVICE,AUTOINSTALL_DEVICE_command,device);
yon_config_register(part_parameter,part_parameter_command,part);
yon_config_register(device_label_parameter,device_label_parameter_command,device_name); yon_config_register(device_label_parameter,device_label_parameter_command,device_name);
} else { } else {
yon_config_remove_by_key(device_label_parameter); yon_config_remove_by_key(device_label_parameter);
} }
char *part;
gtk_tree_model_get(model,&iter,0,&part,-1);
yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_TYPE_INSTALL_command,"next");
yon_config_register(AUTOINSTALL_DEVICE,AUTOINSTALL_DEVICE_command,device);
yon_config_register(part_parameter,part_parameter_command,part);
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->NextFSTypeSensitiveCheck))){ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->NextFSTypeSensitiveCheck))){
if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->NextInstallationFormatCheck))){ if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->NextInstallationFormatCheck))){
yon_config_register(device_format_parameter,device_format_parameter_command,"no"); yon_config_register(device_format_parameter,device_format_parameter_command,"no");

Write Preview
Loading…
Cancel
Save