diff --git a/source/ubinstall-gtk-components.c b/source/ubinstall-gtk-components.c index 94c5416..2a2cae3 100644 --- a/source/ubinstall-gtk-components.c +++ b/source/ubinstall-gtk-components.c @@ -15,12 +15,14 @@ int yon_kernel_save(main_window *widgets){ overall_size++; kernel_row *row = g_object_get_data(G_OBJECT(iter->data),"kernel_row"); if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(row->InstallCheck))){ - char *append_str = yon_char_replace(row->modules," ",","); - yon_config_append_elements(packages_parameter,append_str,","); - free(append_str); - active_size++; - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(row->EnableRadio))){ - enabled_module = row->package; + if (gtk_widget_get_sensitive(row->InstallCheck)){ + char *append_str = yon_char_replace(row->modules," ",","); + yon_config_append_elements(packages_parameter,append_str,","); + free(append_str); + active_size++; + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(row->EnableRadio))){ + enabled_module = row->package; + } } } else { char *append_str = yon_char_replace(row->modules," ",","); @@ -51,7 +53,9 @@ int yon_kernel_addon_save(main_window *widgets){ for(GList *iter = list;iter;iter = iter->next){ kernel_addon_row *row = g_object_get_data(G_OBJECT(iter->data),"kernel_row"); if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(row->InstallCheck))){ - yon_config_append_elements(packages_parameter,row->modules,","); + if (gtk_widget_get_sensitive(row->InstallCheck)){ + yon_config_append_elements(packages_parameter,row->modules,","); + } } else { char *append_str = yon_char_replace(row->modules," ",","); yon_config_remove_elements(packages_parameter,row->modules,","); @@ -368,7 +372,9 @@ int yon_software_save(main_window *widgets){ int status = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(row->InstallCheck)); if (status){ if (!yon_char_check_element(config_val,target,",")){ - yon_config_append_elements(packages_parameter,target,","); + if (gtk_widget_get_sensitive(row->InstallCheck)){ + yon_config_append_elements(packages_parameter,target,","); + } } } else{ char *append_str = yon_char_replace(target," ",","); @@ -637,7 +643,7 @@ gboolean yon_pacman_fill(struct pacman_struct *pacman){ for (int i=0;ipacmanchosen,loaded[i])) continue; + if (yon_char_is_empty(loaded[i])||g_hash_table_contains(widgets->pacmanchosen,loaded[i])) continue; char *version = yon_packages_get_version(YON_PACKAGES_SYNC,loaded[i]); char *description = yon_packages_get_description(YON_PACKAGES_SYNC,loaded[i]); GtkTreeIter iter; diff --git a/source/ubinstall-gtk-packages.c b/source/ubinstall-gtk-packages.c index 64a7e5f..e0f74a0 100644 --- a/source/ubinstall-gtk-packages.c +++ b/source/ubinstall-gtk-packages.c @@ -9,9 +9,11 @@ int yon_packages_tab_save(main_window *widgets){ for_iter(widgets->PackagesList,&parentiter){ for (int valid2 = gtk_tree_model_iter_children(GTK_TREE_MODEL(widgets->PackagesList),&subiter,&parentiter);valid2;valid2 = gtk_tree_model_iter_next(GTK_TREE_MODEL(widgets->PackagesList),&subiter)){ int selectable, status; + int sensitive=0; char *package; - gtk_tree_model_get(GTK_TREE_MODEL(widgets->PackagesList),&subiter,0,&status,1,&package,3,&selectable,-1); + gtk_tree_model_get(GTK_TREE_MODEL(widgets->PackagesList),&subiter,0,&status,1,&package,3,&selectable,4,&sensitive,-1); if (selectable&&status){ + yon_config_append_elements(packages_parameter,package,","); }else if (selectable&&!status){ yon_config_remove_elements(packages_parameter,package,","); @@ -19,7 +21,9 @@ int yon_packages_tab_save(main_window *widgets){ for (int valid3 = gtk_tree_model_iter_children(GTK_TREE_MODEL(widgets->PackagesList),&packiter,&subiter);valid3;valid3 = gtk_tree_model_iter_next(GTK_TREE_MODEL(widgets->PackagesList),&packiter)){ gtk_tree_model_get(GTK_TREE_MODEL(widgets->PackagesList),&packiter,0,&status,1,&package,3,&selectable,-1); if (status){ - yon_config_append_elements(packages_parameter,package,","); + if (sensitive){ + yon_config_append_elements(packages_parameter,package,","); + } } else { yon_config_remove_elements(packages_parameter,package,","); } diff --git a/source/ubinstall-gtk-users.c b/source/ubinstall-gtk-users.c index ead076f..9afbe30 100644 --- a/source/ubinstall-gtk-users.c +++ b/source/ubinstall-gtk-users.c @@ -62,6 +62,12 @@ int yon_user_save(yon_user_struct *user){ yon_ubl_status_highlight_incorrect(user->PasswordEntry); return 0; } + } else { + char *default_passwd = config(DEFAULTPASSWD_parameter); + if (yon_char_is_empty(default_passwd)){ + default_passwd = config(DEFAULTPASSWD_system_parameter); + } + password = default_passwd; } char *admin_uid = NULL; if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(user->AdminCheck))){ @@ -189,6 +195,12 @@ void yon_user_init(main_window *widgets){ if (!users_size){ char *default_user = config(DEFAULTUSER_parameter); char *default_passwd = config(DEFAULTPASSWD_parameter); + if (yon_char_is_empty(default_user)){ + default_user = config(DEFAULTUSER_system_parameter); + } + if (yon_char_is_empty(default_passwd)){ + default_passwd = config(DEFAULTPASSWD_system_parameter); + } yon_user_struct *user = yon_user_struct_new(); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(user->AdminCheck),1); g_signal_connect(G_OBJECT(user->AdminCheck),"clicked",G_CALLBACK(yon_user_admin_check),widgets); diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h index e42f0cf..a6aace0 100755 --- a/source/ubinstall-gtk.h +++ b/source/ubinstall-gtk.h @@ -269,8 +269,12 @@ layout && /description:/ {\ #define admuid_parameter_command "ubconfig --source global get [users] ADMUID" #define DEFAULTUSER_parameter "AUTOINSTALL[ubconfig set [users] DEFAULTUSER]" #define DEFAULTUSER_parameter_command "ubconfig --source global get [autoinstall] AUTOINSTALL['ubconfig set [users] DEFAULTUSER']" +#define DEFAULTUSER_system_parameter "DEFAULTUSER" +#define DEFAULTUSER_system_parameter_command "ubconfig --source global get [users] DEFAULTUSER" #define DEFAULTPASSWD_parameter "AUTOINSTALL[ubconfig set [users] DEFAULTPASSWD]" #define DEFAULTPASSWD_parameter_command "ubconfig --source global get [autoinstall] AUTOINSTALL['ubconfig set [users] DEFAULTPASSWD']" +#define DEFAULTPASSWD_system_parameter "DEFAULTPASSWD" +#define DEFAULTPASSWD_system_parameter_command "ubconfig --source global get [users] DEFAULTPASSWD" #define SYSTEM_LANG_parameter "AUTOINSTALL['ubconfig set [locale] LANG']" #define SYSTEM_LANG_parameter_command "ubconfig --source global get autoinstall AUTOINSTALL['ubconfig set [locale] LANG']" @@ -306,7 +310,7 @@ layout && /description:/ {\ #define config_get_command(target) yon_char_unite("ubconfig -ea --conarg --source ", target, " get [autoinstall] AUTOINSTALL[*] -- get [locale] LANG", NULL) -#define config_get_default_command "ubconfig -ea --noconarg --source default get [autoinstall] AUTOINSTALL[*] -- get [locale] LANG -- get [users] ADMUID" +#define config_get_default_command "ubconfig -ea --noconarg --source default get [autoinstall] AUTOINSTALL[*] -- get [locale] LANG -- get [users] ADMUID DEFAULTUSER DEFAULTPASSWD" #define config_get_global_only_parameters "" #define config_get_local_only_parameters "" diff --git a/ubinstall-gtk-user.glade b/ubinstall-gtk-user.glade index 5e3ebba..3c8c438 100644 --- a/ubinstall-gtk-user.glade +++ b/ubinstall-gtk-user.glade @@ -41,10 +41,11 @@ False 5 - + True False Account name: + 1 False @@ -93,11 +94,11 @@ False 5 - + True False Login: - 0 + 1 False @@ -144,11 +145,11 @@ False 5 - + True False Password: - 0 + 1 False @@ -230,4 +231,11 @@ + + + + + + + diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade index 57d060a..71a94da 100644 --- a/ubinstall-gtk.glade +++ b/ubinstall-gtk.glade @@ -5535,10 +5535,11 @@ Select a different installation source. False 5 - + True False Account name: + 1 False @@ -5573,11 +5574,11 @@ Select a different installation source. False 5 - + True False Login: - 0 + 1 False @@ -5612,11 +5613,11 @@ Select a different installation source. False 5 - + True False - Administrator password (root): - 0 + Password: + 1 False @@ -10325,6 +10326,9 @@ separately into the selected partition. True DevicesList 0 + + + @@ -13600,6 +13604,9 @@ separately into the selected partition. True DevicesList 0 + + + Device @@ -13700,6 +13707,9 @@ separately into the selected partition. True PartitionsList 0 + + + Section @@ -14627,6 +14637,13 @@ separately into the selected partition. + + + + + + +