diff --git a/source/ubinstall-gtk-bootloader.c b/source/ubinstall-gtk-bootloader.c index bedb05f..91e7178 100644 --- a/source/ubinstall-gtk-bootloader.c +++ b/source/ubinstall-gtk-bootloader.c @@ -7,12 +7,12 @@ int yon_bootloader_save(main_window *widgets){ } else { yon_config_remove_by_key(GRUB_TIMEOUT_parameter); } - if (!gtk_switch_get_active(GTK_SWITCH(widgets->BootloadNoPasswordSwitch))){ - yon_config_register(AUTOLOGINUSER_parameter,AUTOLOGINUSER_parameter_command,"no"); - } else { - yon_config_register(AUTOLOGINUSER_parameter,AUTOLOGINUSER_parameter_command,"yes"); + // if (!gtk_switch_get_active(GTK_SWITCH(widgets->BootloadNoPasswordSwitch))){ + // yon_config_register(AUTOLOGINUSER_parameter,AUTOLOGINUSER_parameter_command,"no"); + // } else { + // yon_config_register(AUTOLOGINUSER_parameter,AUTOLOGINUSER_parameter_command,"yes"); - } + // } { int size; config_str users = yon_config_get_all_by_key(GRUB_PASSWORD_parameter_search,&size); @@ -439,7 +439,6 @@ char *yon_bootloader_get_os_name(char *parameter){ void yon_bootloader_interface_update(main_window *widgets){ char *timeout = config(GRUB_TIMEOUT_parameter); char *admins = config(GRUB_SUPERUSERS_parameter); - char *autologin = config(AUTOLOGINUSER_parameter); char *os = config(GRUB_DEFAULT_parameter); int size; config_str users = yon_config_get_all_by_key(GRUB_PASSWORD_parameter_search,&size); @@ -452,9 +451,9 @@ void yon_bootloader_interface_update(main_window *widgets){ } else { gtk_entry_set_text(GTK_ENTRY(widgets->BootloadDefaultOSEntry),DEFAULT_MENU_ITEM_LABEL); } - if (!yon_char_is_empty(autologin)&&(!strcmp(autologin,"yes")||!strcmp(autologin,"enable"))){ - gtk_switch_set_active(GTK_SWITCH(widgets->BootloadNoPasswordSwitch),1); - } else { + // if (!yon_char_is_empty(autologin)&&(!strcmp(autologin,"yes")||!strcmp(autologin,"enable"))){ + // gtk_switch_set_active(GTK_SWITCH(widgets->BootloadNoPasswordSwitch),1); + // } else { int admins_size; config_str admins_parsed = yon_char_parse(admins,&admins_size,","); for (int i=0;iBootloadUsersList,&iter); gtk_list_store_set(widgets->BootloadUsersList,&iter,0,yon_char_parsed_check_exist(admins_parsed,admins_size,key),1,key,2,value,-1); } - } + // } } @@ -474,7 +473,7 @@ void yon_bootloader_init(main_window *widgets){ gtk_list_store_clear(widgets->BootloadUsersList); char *timeout = config(GRUB_TIMEOUT_parameter); char *os = config(GRUB_DEFAULT_parameter); - char *autologin = config(AUTOLOGINUSER_parameter); + // char *autologin = config(AUTOLOGINUSER_parameter); char *admins = config(GRUB_SUPERUSERS_parameter); int size; config_str users = yon_config_get_all_by_key(GRUB_PASSWORD_parameter_search,&size); @@ -495,13 +494,13 @@ void yon_bootloader_init(main_window *widgets){ } else { gtk_entry_set_text(GTK_ENTRY(widgets->BootloadDefaultOSEntry),DEFAULT_BOOTLOAD_MENU_ITEM_LABEL); } - if (!yon_char_is_empty(autologin)&&(!strcmp(autologin,"no")||!strcmp(autologin,"disable"))){ - gtk_switch_set_active(GTK_SWITCH(widgets->BootloadNoPasswordSwitch),0); + // if (!yon_char_is_empty(autologin)&&(!strcmp(autologin,"no")||!strcmp(autologin,"disable"))){ + // gtk_switch_set_active(GTK_SWITCH(widgets->BootloadNoPasswordSwitch),0); - } else { - gtk_switch_set_active(GTK_SWITCH(widgets->BootloadNoPasswordSwitch),1); + // } else { + // gtk_switch_set_active(GTK_SWITCH(widgets->BootloadNoPasswordSwitch),1); - } + // } { int admins_size; config_str admins_parsed = yon_char_parse(admins,&admins_size,","); diff --git a/source/ubinstall-gtk-install-start.c b/source/ubinstall-gtk-install-start.c index 05a970a..ee59796 100644 --- a/source/ubinstall-gtk-install-start.c +++ b/source/ubinstall-gtk-install-start.c @@ -9,9 +9,13 @@ void yon_quick_install(GtkWidget *self, main_window *widgets){ if (!yon_installation_check_packages_size(widgets)) return; main_config.save_configured=1; gtk_widget_hide(self); - gtk_widget_show(gtk_widget_get_parent(widgets->InstallationProgress)); - pthread_create(&main_config.install_thread,NULL,on_config_save,widgets); + gtk_widget_show(gtk_widget_get_parent(widgets->InstallationProgress)); + // pthread_create(&main_config.install_thread,NULL,on_config_save,widgets); gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALLATION); + if (!yon_char_is_empty(main_config.config_load_path)){ + char *command = quick_install_command(main_config.config_load_path); + yon_launch_app_with_arguments(command,NULL); + } yon_page_init(widgets,YON_PAGE_INSTALLATION); yon_page_update(widgets); } diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c index a2c1fb9..c6bc354 100644 --- a/source/ubinstall-gtk.c +++ b/source/ubinstall-gtk.c @@ -583,7 +583,7 @@ void yon_main_window_create(main_window *widgets){ widgets->BootloadTimerSpin = yon_gtk_builder_get_widget(builder,"BootloadTimerSpin"); widgets->BootloadDefaultOSEntry = yon_gtk_builder_get_widget(builder,"BootloadDefaultOSEntry"); widgets->BootloadDefaulOSButton = yon_gtk_builder_get_widget(builder,"BootloadDefaulOSButton"); - widgets->BootloadNoPasswordSwitch = yon_gtk_builder_get_widget(builder,"BootloadNoPasswordSwitch"); + // widgets->BootloadNoPasswordSwitch = yon_gtk_builder_get_widget(builder,"BootloadNoPasswordSwitch"); widgets->BootloadUserTree = yon_gtk_builder_get_widget(builder,"BootloadUserTree"); widgets->BootloadUserAddButton = yon_gtk_builder_get_widget(builder,"BootloadUserAddButton"); widgets->BootloadUserEditButton = yon_gtk_builder_get_widget(builder,"BootloadUserEditButton"); diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h index a498012..3347ac2 100755 --- a/source/ubinstall-gtk.h +++ b/source/ubinstall-gtk.h @@ -738,7 +738,7 @@ typedef struct GtkWidget *BootloadTimerSpin; GtkWidget *BootloadDefaultOSEntry; GtkWidget *BootloadDefaulOSButton; - GtkWidget *BootloadNoPasswordSwitch; + // GtkWidget *BootloadNoPasswordSwitch; GtkWidget *BootloadUserAddButton; GtkWidget *BootloadUserEditButton; GtkCellRenderer *BootloadAdminCheckCell; diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade index c5efbb9..65e8b7a 100644 --- a/ubinstall-gtk.glade +++ b/ubinstall-gtk.glade @@ -6297,12 +6297,10 @@ Select a different installation source. - True False 5 - True True