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

Removed 'Login without password request' button

Browse Source
pull/299/head
Ivan Dmitrievich Yartsev 2 months ago
parent f7d5c282a5
commit 448f5d4ba5
5 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File

31
source/ubinstall-gtk-bootloader.c
Unescape View File

@ -7,12 +7,12 @@ int yon_bootloader_save(main_window *widgets){
} else { } else {
yon_config_remove_by_key(GRUB_TIMEOUT_parameter); yon_config_remove_by_key(GRUB_TIMEOUT_parameter);
} }
if (!gtk_switch_get_active(GTK_SWITCH(widgets->BootloadNoPasswordSwitch))){ // if (!gtk_switch_get_active(GTK_SWITCH(widgets->BootloadNoPasswordSwitch))){
yon_config_register(AUTOLOGINUSER_parameter,AUTOLOGINUSER_parameter_command,"no"); // yon_config_register(AUTOLOGINUSER_parameter,AUTOLOGINUSER_parameter_command,"no");
} else { // } else {
yon_config_register(AUTOLOGINUSER_parameter,AUTOLOGINUSER_parameter_command,"yes"); // yon_config_register(AUTOLOGINUSER_parameter,AUTOLOGINUSER_parameter_command,"yes");
} // }
{ {
int size; int size;
config_str users = yon_config_get_all_by_key(GRUB_PASSWORD_parameter_search,&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){ void yon_bootloader_interface_update(main_window *widgets){
char *timeout = config(GRUB_TIMEOUT_parameter); char *timeout = config(GRUB_TIMEOUT_parameter);
char *admins = config(GRUB_SUPERUSERS_parameter); char *admins = config(GRUB_SUPERUSERS_parameter);
char *autologin = config(AUTOLOGINUSER_parameter);
char *os = config(GRUB_DEFAULT_parameter); char *os = config(GRUB_DEFAULT_parameter);
int size; int size;
config_str users = yon_config_get_all_by_key(GRUB_PASSWORD_parameter_search,&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 { } else {
gtk_entry_set_text(GTK_ENTRY(widgets->BootloadDefaultOSEntry),DEFAULT_MENU_ITEM_LABEL); gtk_entry_set_text(GTK_ENTRY(widgets->BootloadDefaultOSEntry),DEFAULT_MENU_ITEM_LABEL);
} }
if (!yon_char_is_empty(autologin)&&(!strcmp(autologin,"yes")||!strcmp(autologin,"enable"))){ // if (!yon_char_is_empty(autologin)&&(!strcmp(autologin,"yes")||!strcmp(autologin,"enable"))){
gtk_switch_set_active(GTK_SWITCH(widgets->BootloadNoPasswordSwitch),1); // gtk_switch_set_active(GTK_SWITCH(widgets->BootloadNoPasswordSwitch),1);
} else { // } else {
int admins_size; int admins_size;
config_str admins_parsed = yon_char_parse(admins,&admins_size,","); config_str admins_parsed = yon_char_parse(admins,&admins_size,",");
for (int i=0;i<size;i++){ for (int i=0;i<size;i++){
@ -466,7 +465,7 @@ void yon_bootloader_interface_update(main_window *widgets){
gtk_list_store_append(widgets->BootloadUsersList,&iter); gtk_list_store_append(widgets->BootloadUsersList,&iter);
gtk_list_store_set(widgets->BootloadUsersList,&iter,0,yon_char_parsed_check_exist(admins_parsed,admins_size,key),1,key,2,value,-1); 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); gtk_list_store_clear(widgets->BootloadUsersList);
char *timeout = config(GRUB_TIMEOUT_parameter); char *timeout = config(GRUB_TIMEOUT_parameter);
char *os = config(GRUB_DEFAULT_parameter); char *os = config(GRUB_DEFAULT_parameter);
char *autologin = config(AUTOLOGINUSER_parameter); // char *autologin = config(AUTOLOGINUSER_parameter);
char *admins = config(GRUB_SUPERUSERS_parameter); char *admins = config(GRUB_SUPERUSERS_parameter);
int size; int size;
config_str users = yon_config_get_all_by_key(GRUB_PASSWORD_parameter_search,&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 { } else {
gtk_entry_set_text(GTK_ENTRY(widgets->BootloadDefaultOSEntry),DEFAULT_BOOTLOAD_MENU_ITEM_LABEL); 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"))){ // if (!yon_char_is_empty(autologin)&&(!strcmp(autologin,"no")||!strcmp(autologin,"disable"))){
gtk_switch_set_active(GTK_SWITCH(widgets->BootloadNoPasswordSwitch),0); // gtk_switch_set_active(GTK_SWITCH(widgets->BootloadNoPasswordSwitch),0);
} else { // } else {
gtk_switch_set_active(GTK_SWITCH(widgets->BootloadNoPasswordSwitch),1); // gtk_switch_set_active(GTK_SWITCH(widgets->BootloadNoPasswordSwitch),1);
} // }
{ {
int admins_size; int admins_size;
config_str admins_parsed = yon_char_parse(admins,&admins_size,","); config_str admins_parsed = yon_char_parse(admins,&admins_size,",");

8
source/ubinstall-gtk-install-start.c
Unescape View File

@ -9,9 +9,13 @@ void yon_quick_install(GtkWidget *self, main_window *widgets){
if (!yon_installation_check_packages_size(widgets)) return; if (!yon_installation_check_packages_size(widgets)) return;
main_config.save_configured=1; main_config.save_configured=1;
gtk_widget_hide(self); gtk_widget_hide(self);
gtk_widget_show(gtk_widget_get_parent(widgets->InstallationProgress)); gtk_widget_show(gtk_widget_get_parent(widgets->InstallationProgress));
pthread_create(&main_config.install_thread,NULL,on_config_save,widgets); // pthread_create(&main_config.install_thread,NULL,on_config_save,widgets);
gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALLATION); 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_init(widgets,YON_PAGE_INSTALLATION);
yon_page_update(widgets); yon_page_update(widgets);
} }

2
source/ubinstall-gtk.c
Unescape View File

@ -583,7 +583,7 @@ void yon_main_window_create(main_window *widgets){
widgets->BootloadTimerSpin = yon_gtk_builder_get_widget(builder,"BootloadTimerSpin"); widgets->BootloadTimerSpin = yon_gtk_builder_get_widget(builder,"BootloadTimerSpin");
widgets->BootloadDefaultOSEntry = yon_gtk_builder_get_widget(builder,"BootloadDefaultOSEntry"); widgets->BootloadDefaultOSEntry = yon_gtk_builder_get_widget(builder,"BootloadDefaultOSEntry");
widgets->BootloadDefaulOSButton = yon_gtk_builder_get_widget(builder,"BootloadDefaulOSButton"); 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->BootloadUserTree = yon_gtk_builder_get_widget(builder,"BootloadUserTree");
widgets->BootloadUserAddButton = yon_gtk_builder_get_widget(builder,"BootloadUserAddButton"); widgets->BootloadUserAddButton = yon_gtk_builder_get_widget(builder,"BootloadUserAddButton");
widgets->BootloadUserEditButton = yon_gtk_builder_get_widget(builder,"BootloadUserEditButton"); widgets->BootloadUserEditButton = yon_gtk_builder_get_widget(builder,"BootloadUserEditButton");

2
source/ubinstall-gtk.h
Unescape View File

@ -738,7 +738,7 @@ typedef struct
GtkWidget *BootloadTimerSpin; GtkWidget *BootloadTimerSpin;
GtkWidget *BootloadDefaultOSEntry; GtkWidget *BootloadDefaultOSEntry;
GtkWidget *BootloadDefaulOSButton; GtkWidget *BootloadDefaulOSButton;
GtkWidget *BootloadNoPasswordSwitch; // GtkWidget *BootloadNoPasswordSwitch;
GtkWidget *BootloadUserAddButton; GtkWidget *BootloadUserAddButton;
GtkWidget *BootloadUserEditButton; GtkWidget *BootloadUserEditButton;
GtkCellRenderer *BootloadAdminCheckCell; GtkCellRenderer *BootloadAdminCheckCell;

2
ubinstall-gtk.glade
Unescape View File

@ -6297,12 +6297,10 @@ Select a different installation source.</property>
</child> </child>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="spacing">5</property> <property name="spacing">5</property>
<child> <child>
<object class="GtkSwitch" id="BootloadNoPasswordSwitch"> <object class="GtkSwitch" id="BootloadNoPasswordSwitch">
<property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
</object> </object>
<packing> <packing>

Write Preview
Loading…
Cancel
Save