pull/35/head
parent 5800caf82e
commit f59f260ea2

@ -1138,6 +1138,36 @@ void on_log_closed(GtkWidget *, log_window *window){
window->Window=NULL;
}
void *on_save_system_configuration(void *data);
void *on_save_system_configuration(void * data){
main_window *widgets = (main_window*)data;
if (widgets){};
int size;
config_str all_parameters = yon_config_get_selection_by_key(&size,
user_gecos_parameter,
user_password_parameter,
root_password_parameter,
autologin_parameter,
xkbmodel_parameter,
xkblayout_parameter,
xkbvariant_parameter,
xkboptions_parameter,
hostname_parameter,
zone_parameter,
lang_parameter,
locale_parameter,
NULL);
if (all_parameters){
char *parameter_string = yon_char_parsed_to_string(all_parameters,size," ");
char *command = save_additional_config_command(parameter_string);
if (system(yon_debug_output("%s\n",command))){};
yon_char_parsed_free(all_parameters,size);
free(command);
if (parameter_string) free(parameter_string);
}
return NULL;
}
log_window *yon_log_window_new();
log_window *yon_log_window_new(){
log_window *window = malloc(sizeof(log_window));
@ -1498,7 +1528,7 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){
yon_config_register(user_gecos_parameter,user_gecos_parameter_command,username);
}
if (yon_char_is_empty(gtk_entry_get_text(GTK_ENTRY(widgets->LoginEntry)))||!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->UsernameSensitiveCheck))){
if (yon_char_is_empty(gtk_entry_get_text(GTK_ENTRY(widgets->LoginEntry)))||!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->LoginSensitiveCheck))){
yon_config_remove_by_key(user_name_parameter);
} else {
char *login = (char*)gtk_entry_get_text(GTK_ENTRY(widgets->LoginEntry));
@ -1605,6 +1635,9 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){
if (gtk_progress_bar_get_fraction(GTK_PROGRESS_BAR(widgets->InstallationProgress))>0.9){
pthread_t tid;
pthread_create(&tid,NULL,on_setup_system_configuration,widgets);
} else {
pthread_t tid;
pthread_create(&tid,NULL,on_save_system_configuration,widgets);
}
main_config.save_done=1;
yon_debug_output("Save changed to: %s\n",yon_char_from_int(main_config.save_done));

@ -116,6 +116,7 @@ NULL
#define save_config_command(parameters) yon_char_unite("pkexec bash -c 'ubconfig --target system set [autoinstall] AUTOINSTALL[log]=yes ",parameters, "; nice ubinstall2 --debug autoinstall'", NULL)
#define set_user_config_command(parameters) yon_char_unite("pkexec bash -c 'ubconfig --target system set [autoinstall] ",parameters,";nice ubinstall2 autoconfig'",NULL)
#define save_additional_config_command(parameters) yon_char_unite("pkexec bash -c 'ubconfig --target system set [autoinstall] ",parameters,"'",NULL)
#define open_gparted_command "gparted"

@ -2490,7 +2490,6 @@ and help you install UBLinux on your computer</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<signal name="toggled" handler="yon_gtk_toggle_button_set_inactive_from_toggle" object="AutologinSensitiveCheck" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@ -3718,7 +3717,6 @@ installed.</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<signal name="toggled" handler="yon_gtk_toggle_button_set_inactive_from_toggle" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>

Loading…
Cancel
Save