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

Merge pull request 'master' (#284) from YanTheKaller/ubinstall-gtk:master into master

Browse Source 
Reviewed-on: #284
pull/287/head
Dmitry Razumov 2 months ago
parent ed2bdfe839 33d426a3d8
commit 574bcc4b62
22 changed files with 334 additions and 115 deletions
Show Stats Download Patch File Download Diff File

5
locale/groups-list_ru.po
Unescape View File

@ -132,7 +132,10 @@ msgid "Chromium and some plugins"
msgstr "Chromium и некоторые другие плагины" msgstr "Chromium и некоторые другие плагины"
msgid "Office" msgid "Office"
msgstr "Office" msgstr "Офис"
msgid "Office packet"
msgstr "Офисный пакет"
msgid "Browser" msgid "Browser"
msgstr "Браузер" msgstr "Браузер"

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

@ -33,13 +33,30 @@ int yon_bootloader_save(main_window *widgets){
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);
for (int i=0;i<size;i++){ for (int i=0;i<size;i++){
yon_config_remove_by_key(GRUB_PASSWORD_parameter(users[i])); char *parameter = yon_char_divide_search(users[i],"=",-1);
yon_config_remove_by_key(parameter);
free(parameter);
} }
yon_config_register(AUTOLOGINUSER_parameter,AUTOLOGINUSER_parameter_command,"yes"); yon_config_register(AUTOLOGINUSER_parameter,AUTOLOGINUSER_parameter_command,"yes");
yon_config_remove_by_key(GRUB_PASSWORD_parameter_all); yon_config_remove_by_key(GRUB_PASSWORD_parameter_all);
yon_config_remove_by_key(GRUB_SUPERUSERS_parameter); yon_config_remove_by_key(GRUB_SUPERUSERS_parameter);
yon_char_parsed_free(users,size);
} }
if (!main_config.configure_mode){
int user_size=0;
config_str users = yon_config_get_all_by_key(GRUB_PASSWORD_parameter_search,&user_size);
char *user_string = yon_char_parsed_to_string(users,user_size," ");
int size;
config_str parameters = yon_config_get_save_parameters_by_key(&size,GRUB_TIMEOUT_parameter,AUTOLOGINUSER_parameter,GRUB_SUPERUSERS_parameter,NULL);
if (parameters){
char *command_parameters = yon_char_parsed_to_string(parameters,size," -- ");
char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters, " ", user_string, NULL);
if (!system(yon_debug_output("%s\n",command))){}
free(command);
yon_char_parsed_free(parameters,size);
}
}
yon_bootloader_interface_update(widgets); yon_bootloader_interface_update(widgets);
return 1; return 1;
@ -447,6 +464,7 @@ void yon_bootloader_interface_update(main_window *widgets){
} }
void yon_bootloader_init(main_window *widgets){ void yon_bootloader_init(main_window *widgets){
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);
@ -471,7 +489,6 @@ void yon_bootloader_init(main_window *widgets){
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_list_store_clear(widgets->BootloadUsersList);
gtk_switch_set_active(GTK_SWITCH(widgets->BootloadNoPasswordSwitch),0); gtk_switch_set_active(GTK_SWITCH(widgets->BootloadNoPasswordSwitch),0);
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,",");

133
source/ubinstall-gtk-components.c
Unescape View File

@ -12,7 +12,9 @@ int yon_kernel_save(main_window *widgets){
overall_size++; overall_size++;
kernel_row *row = g_object_get_data(G_OBJECT(iter->data),"kernel_row"); kernel_row *row = g_object_get_data(G_OBJECT(iter->data),"kernel_row");
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(row->InstallCheck))){ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(row->InstallCheck))){
yon_config_append_element(packages_parameter,row->package,","); char *append_str = yon_char_replace(row->modules," ",",");
yon_config_append_element(packages_parameter,append_str,",");
free(append_str);
active_size++; active_size++;
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(row->EnableRadio))){ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(row->EnableRadio))){
enabled_module = row->package; enabled_module = row->package;
@ -26,25 +28,44 @@ int yon_kernel_save(main_window *widgets){
yon_config_remove_by_key(KERNEL_BOOT_parameter); yon_config_remove_by_key(KERNEL_BOOT_parameter);
} }
if (!main_config.configure_mode){
int size;
config_str parameters = yon_config_get_save_parameters_by_key(&size,packages_parameter, KERNEL_BOOT_parameter,NULL);
if (parameters){
char *command_parameters = yon_char_parsed_to_string(parameters,size," -- ");
char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters,NULL);
if (!system(yon_debug_output("%s\n",command))){}
free(command);
yon_char_parsed_free(parameters,size);
}
}
return 1; return 1;
} }
int yon_kernel_addon_save(main_window *widgets){ int yon_kernel_addon_save(main_window *widgets){
char *parameter = config(packages_parameter); char *parameter = config(packages_parameter);
GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->KernelAddonListBox)); GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->KernelAddonListBox));
char *install_modules = yon_char_new(parameter); if (yon_char_is_empty(parameter)){
yon_config_register(packages_parameter,packages_parameter_command,NULL);
}
for(GList *iter = list;iter;iter = iter->next){ for(GList *iter = list;iter;iter = iter->next){
kernel_addon_row *row = g_object_get_data(G_OBJECT(iter->data),"kernel_row"); 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))){ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(row->InstallCheck))){
char *temp = yon_char_append_element(install_modules,row->modules," "); yon_config_append_element(packages_parameter,row->modules," ");
if (!yon_char_is_empty(install_modules)) free(install_modules);
install_modules = temp;
} }
} }
if (!yon_char_is_empty(install_modules)){ if (!main_config.configure_mode){
yon_config_register(packages_parameter,packages_parameter_command,install_modules); int size;
free(install_modules); config_str parameters = yon_config_get_save_parameters_by_key(&size,packages_parameter, KERNEL_BOOT_parameter,NULL);
if (parameters){
char *command_parameters = yon_char_parsed_to_string(parameters,size," -- ");
char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters,NULL);
if (!system(yon_debug_output("%s\n",command))){}
free(command);
yon_char_parsed_free(parameters,size);
}
} }
return 1; return 1;
} }
@ -115,6 +136,17 @@ int yon_os_components_save(main_window *widgets){
yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),NOTHING_CHOSEN_LABEL,5,BACKGROUND_IMAGE_INFO_TYPE); yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),NOTHING_CHOSEN_LABEL,5,BACKGROUND_IMAGE_INFO_TYPE);
yon_ubl_status_highlight_incorrect(widgets->OSSoftwareListBox); yon_ubl_status_highlight_incorrect(widgets->OSSoftwareListBox);
} }
if (!main_config.configure_mode){
int size;
config_str parameters = yon_config_get_save_parameters_by_key(&size,modules_parameter,NULL);
if (parameters){
char *command_parameters = yon_char_parsed_to_string(parameters,size," -- ");
char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters,NULL);
if (!system(yon_debug_output("%s\n",command))){}
free(command);
yon_char_parsed_free(parameters,size);
}
}
return 1; return 1;
} }
@ -283,6 +315,53 @@ int yon_software_save(main_window *widgets){
} }
} }
g_list_free(list); g_list_free(list);
if (!main_config.configure_mode){
int size;
config_str parameters = yon_config_get_save_parameters_by_key(&size,packages_parameter,NULL);
if (parameters){
char *command_parameters = yon_char_parsed_to_string(parameters,size," -- ");
char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters,NULL);
if (!system(yon_debug_output("%s\n",command))){}
free(command);
yon_char_parsed_free(parameters,size);
}
}
return 1;
}
int yon_software_check_packages_size(GtkWidget *, main_window *widgets){
long pacman_size = 0;
{
GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->AdditionalComponentsList));
GList *listiter;
for (listiter=list;listiter;listiter=listiter->next){
os_row *row = g_object_get_data(G_OBJECT(listiter->data),"kernel_row");
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(row->InstallCheck))){
long cur_size = yon_packages_get_installed_size(YON_PACKAGES_ALL,row->name);
pacman_size += cur_size;
}
}
}
{
GtkTreeIter iter;
GtkTreeModel *model = GTK_TREE_MODEL(widgets->PacmanSoftwareChosenList);
for_iter(model, &iter){
char *name;
gtk_tree_model_get(model,&iter,1,&name,-1);
long size = yon_packages_get_installed_size(YON_PACKAGES_ALL,name);
pacman_size+=size;
}
char *overall_str = NULL;
if (pacman_size){
overall_str = yon_size_long_convert_automatic_to_string(pacman_size);
} else {
overall_str = yon_char_unite("0 ",yon_size_get_name_from_letter('K'),NULL);
}
gtk_label_set_text(GTK_LABEL(widgets->AdditionalComponentsOverallSizeLabel),overall_str);
if (!yon_char_is_empty(overall_str)) free(overall_str);
}
return 1; return 1;
} }
@ -290,6 +369,7 @@ gboolean yon_software_insert(struct row_data *row_input){
os_row *row = yon_os_row_new(); os_row *row = yon_os_row_new();
main_window *widgets = row_input->widgets; main_window *widgets = row_input->widgets;
g_signal_connect(G_OBJECT(row->InstallCheck),"toggled",G_CALLBACK(yon_software_check_packages_size),widgets);
gtk_list_box_insert(GTK_LIST_BOX(widgets->AdditionalComponentsList),row->row,-1); gtk_list_box_insert(GTK_LIST_BOX(widgets->AdditionalComponentsList),row->row,-1);
yon_os_row_setup(row,row_input->name,row_input->version,row_input->tags,_(row_input->description),NULL,row_input->size); yon_os_row_setup(row,row_input->name,row_input->version,row_input->tags,_(row_input->description),NULL,row_input->size);
@ -341,40 +421,35 @@ void yon_software_init(main_window *widgets){
row->widgets=widgets; row->widgets=widgets;
g_idle_add((GSourceFunc)yon_software_insert,row); g_idle_add((GSourceFunc)yon_software_insert,row);
} }
// GList *languages = yon_packages_search_all("ubm-.*");
// for (iter=languages;iter;iter=iter->next){
// char *name = (char*)iter->data;
// yon_packages_info *info_struct = yon_package(YON_PACKAGES_ALL,name);
// struct row_data *row = malloc(sizeof(struct row_data));
// row->version = info_struct->version;
// row->name = info_struct->package_name;
// row->tags = info_struct->groups;
// row->description = info_struct->description;
// row->widgets=widgets;
// g_idle_add((GSourceFunc)yon_software_insert,row);
// yon_packages_info_struct_free(info_struct);
// }
g_idle_add((GSourceFunc)yon_spinner_switch_off,widgets->OSSpinner); g_idle_add((GSourceFunc)yon_spinner_switch_off,widgets->OSSpinner);
yon_char_parsed_free(base,base_size); yon_char_parsed_free(base,base_size);
yon_software_check_packages_size(NULL,widgets);
return ; return ;
} }
int yon_pacman_software_save(main_window *widgets){ int yon_pacman_software_save(main_window *widgets){
if (!yon_installation_check_packages_size(widgets)) return 0;
GtkTreeIter iter; GtkTreeIter iter;
GtkTreeModel *model = GTK_TREE_MODEL(widgets->PacmanSoftwareChosenList); GtkTreeModel *model = GTK_TREE_MODEL(widgets->PacmanSoftwareChosenList);
int size; char *config_parameter = config(packages_parameter);
config_str parameters = NULL; if (yon_char_is_empty(config_parameter)){
yon_config_register(packages_parameter,packages_parameter_command,NULL);
}
for_iter(model,&iter){ for_iter(model,&iter){
char *target; char *target;
gtk_tree_model_get(model,&iter,1,&target,-1); gtk_tree_model_get(model,&iter,1,&target,-1);
yon_char_parsed_add_or_create_if_exists(parameters,&size,target); yon_config_append_element(packages_parameter,target,",");
} }
char *final = yon_char_parsed_to_string(parameters,size,","); if (!main_config.configure_mode){
int size;
config_str parameters = yon_config_get_save_parameters_by_key(&size,packages_parameter,NULL);
if (parameters){
char *command_parameters = yon_char_parsed_to_string(parameters,size," -- ");
char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters,NULL);
if (!system(yon_debug_output("%s\n",command))){}
free(command);
yon_char_parsed_free(parameters,size); yon_char_parsed_free(parameters,size);
if (!yon_char_is_empty(final)){ }
yon_config_register(packages_parameter,packages_parameter_command,final);
} else {
yon_config_remove_by_key(packages_parameter);
} }
return 1; return 1;
} }

2
source/ubinstall-gtk-config-hub.c
Unescape View File

@ -273,6 +273,7 @@ void yon_flow_box_clear(GtkFlowBox *target){
void yon_configuration_hub_init(main_window *widgets){ void yon_configuration_hub_init(main_window *widgets){
gtk_combo_box_text_remove_all(GTK_COMBO_BOX_TEXT(widgets->ConfigHubRebootCombo)); gtk_combo_box_text_remove_all(GTK_COMBO_BOX_TEXT(widgets->ConfigHubRebootCombo));
gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widgets->ConfigHubRebootCombo),NULL,DEFAULT_LABEL); gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widgets->ConfigHubRebootCombo),NULL,DEFAULT_LABEL);
gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widgets->ConfigHubRebootCombo),"close",CLOSE_INSTALLER_LABEL);
gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widgets->ConfigHubRebootCombo),"reboot",REBOOT_LABEL); gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widgets->ConfigHubRebootCombo),"reboot",REBOOT_LABEL);
gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widgets->ConfigHubRebootCombo),"shutdown",SHUTDOWN_LABEL); gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widgets->ConfigHubRebootCombo),"shutdown",SHUTDOWN_LABEL);
char *finish_string = config(finish_parameter); char *finish_string = config(finish_parameter);
@ -282,7 +283,6 @@ void yon_configuration_hub_init(main_window *widgets){
} else { } else {
gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->ConfigHubRebootCombo),0); gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->ConfigHubRebootCombo),0);
} }
gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->ConfigHubRebootCombo),0);
yon_flow_box_clear(GTK_FLOW_BOX(widgets->HubPersonalListBox)); yon_flow_box_clear(GTK_FLOW_BOX(widgets->HubPersonalListBox));
yon_flow_box_clear(GTK_FLOW_BOX(widgets->HubSystemListBox)); yon_flow_box_clear(GTK_FLOW_BOX(widgets->HubSystemListBox));
yon_flow_box_clear(GTK_FLOW_BOX(widgets->HubPackagesListBox)); yon_flow_box_clear(GTK_FLOW_BOX(widgets->HubPackagesListBox));

24
source/ubinstall-gtk-grub.c
Unescape View File

@ -20,6 +20,18 @@ int yon_grub_install_save(main_window *widgets){
yon_config_register(device_parameter,device_parameter_command,cur_device); yon_config_register(device_parameter,device_parameter_command,cur_device);
yon_config_register(part_parameter,part_parameter_command,partition); yon_config_register(part_parameter,part_parameter_command,partition);
yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_TYPE_INSTALL_command,"grub_install"); yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_TYPE_INSTALL_command,"grub_install");
if (!main_config.configure_mode){
int size;
config_str parameters = yon_config_get_save_parameters_by_key(&size,device_parameter,part_parameter,AUTOINSTALL_TYPE_INSTALL,NULL);
if (parameters){
char *command_parameters = yon_char_parsed_to_string(parameters,size," -- ");
char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters,NULL);
if (!system(yon_debug_output("%s\n",command))){}
free(command);
yon_char_parsed_free(parameters,size);
}
}
return 1; return 1;
} }
@ -43,5 +55,17 @@ int yon_grub_update_save(main_window *widgets){
yon_config_register(device_parameter,device_parameter_command,cur_device); yon_config_register(device_parameter,device_parameter_command,cur_device);
yon_config_register(part_parameter,part_parameter_command,partition); yon_config_register(part_parameter,part_parameter_command,partition);
yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_TYPE_INSTALL_command,"grub_update"); yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_TYPE_INSTALL_command,"grub_update");
if (!main_config.configure_mode){
int size;
config_str parameters = yon_config_get_save_parameters_by_key(&size,device_parameter,part_parameter,AUTOINSTALL_TYPE_INSTALL,NULL);
if (parameters){
char *command_parameters = yon_char_parsed_to_string(parameters,size," -- ");
char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters,NULL);
if (!system(yon_debug_output("%s\n",command))){}
free(command);
yon_char_parsed_free(parameters,size);
}
}
return 1; return 1;
} }

56
source/ubinstall-gtk-installation.c
Unescape View File

@ -183,62 +183,6 @@ int yon_install_same_partition_save(main_window *widgets){
return 1; return 1;
} }
// int yon_advanced_sections_save(dictionary *dict){
// if (!dict) return 0;
// advanced_part_widgets *first_section = yon_dictionary_get_data(dict->first,advanced_part_widgets*);
// advanced_part_widgets *last_section = NULL;
// if (dict->first->next){
// last_section = yon_dictionary_get_data(dict->first->next,advanced_part_widgets*);
// }
// char *part_first = first_section->part;
// char *part_last = last_section?last_section->part:NULL;
// char *part = yon_char_unite(part_first,last_section?",":NULL,part_last,NULL);
// yon_config_register(part_parameter,part_parameter_command,part);
// int format_first_active = gtk_switch_get_active(GTK_SWITCH(first_section->FormatCombo));
// int format_last_active = gtk_switch_get_active(GTK_SWITCH(last_section->FormatCombo));
// char * format_first = format_first_active==1?"yes":format_first_active==2?"no":NULL;
// char * format_last = format_last_active==1?"yes":format_last_active==2?"no":NULL;
// char *format = yon_char_unite(format_first,part_last?",":NULL,format_last,NULL);
// yon_config_register(part_format_parameter,part_format_parameter_command,format);
// if (!yon_char_is_empty(format)){
// char *size_first = g_strdup_printf("%d%s",gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(first_section->SizeSpin)),yon_size_get_mod(gtk_combo_box_get_active(GTK_COMBO_BOX(first_section->SizeCombo))));
// char *size_last = last_section&&!strcmp(format_last,"yes")?g_strdup_printf("%d%s",gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(last_section->SizeSpin)),yon_size_get_mod(gtk_combo_box_get_active(GTK_COMBO_BOX(last_section->SizeCombo)))):NULL;
// char *size = yon_char_unite(size_first,size_last?",":NULL,size_last,NULL);
// yon_config_register(part_size_parameter,part_size_parameter_command,size);
// char *part_label_first = (char*)gtk_entry_get_text(GTK_ENTRY(first_section->PartLabelEntry));
// char *part_label_last = last_section&&!strcmp(format_last,"yes")?(char*)gtk_entry_get_text(GTK_ENTRY(last_section->PartLabelEntry)):NULL;
// char *part_label = yon_char_unite(part_label_first,part_label_last?",":NULL,part_label_last,NULL);
// yon_config_register(part_label_parameter,part_label_parameter_command,part_label);
// char *fs_label_first = (char*)gtk_entry_get_text(GTK_ENTRY(first_section->FileSystemLabelEntry));
// char *fs_label_last = last_section&&!strcmp(format_last,"yes")?(char*)gtk_entry_get_text(GTK_ENTRY(last_section->FileSystemLabelEntry)):NULL;
// char *fs_label = yon_char_unite(fs_label_first,fs_label_last?",":NULL,fs_label_last,NULL);
// yon_config_register(part_fs_label_parameter,part_fs_label_parameter_command,fs_label);
// char *fs_type_first = (char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(first_section->FileSystemTypeCombo));
// char *fs_type_last = last_section&&!strcmp(format_last,"yes")?(char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(last_section->FileSystemTypeCombo)):NULL;
// char *fs_type = yon_char_unite(fs_type_first,fs_type_last?",":NULL,fs_type_last,NULL);
// yon_config_register(part_fs_type_parameter,part_fs_type_parameter_command,fs_type);
// char *part_crypt_first = gtk_combo_box_get_active(GTK_COMBO_BOX(first_section->EncryptionCombo))?(char*)gtk_entry_get_text(GTK_ENTRY(first_section->EncryptionEntry)):NULL;
// char *part_crypt_last = last_section&&!strcmp(format_last,"yes")&&gtk_combo_box_get_active(GTK_COMBO_BOX(last_section->EncryptionCombo))?(char*)gtk_entry_get_text(GTK_ENTRY(first_section->EncryptionEntry)):NULL;
// char *part_crypt = NULL;
// if (part_crypt_first||part_crypt_last){
// part_crypt = yon_char_unite(part_crypt_first,part_crypt_last?",":NULL,part_crypt_last,NULL);
// }
// if (part_crypt){
// yon_config_register(part_crypt_parameter,part_crypt_parameter_command,part_crypt);
// } else {
// yon_config_remove_by_key(part_crypt_parameter);
// }
// }
// return 1;
// }
void yon_size_changed(GtkSpinButton *self, main_window *widgets){ void yon_size_changed(GtkSpinButton *self, main_window *widgets){
int cur_page = gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->Notebook)); int cur_page = gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->Notebook));
GtkWidget *tree = NULL; GtkWidget *tree = NULL;

6
source/ubinstall-gtk-kernel.c
Unescape View File

@ -105,12 +105,14 @@ void yon_kernel_row_setup(kernel_row *row, char *name, char *modules,char *packa
description_full = yon_char_parsed_to_string(description_wrapped,size,"\n"); description_full = yon_char_parsed_to_string(description_wrapped,size,"\n");
yon_char_parsed_free(description_wrapped,size); yon_char_parsed_free(description_wrapped,size);
} }
char *modules_parsed = yon_char_replace(modules," ","\n");
gtk_label_set_label(GTK_LABEL(row->NameLabel),name); gtk_label_set_label(GTK_LABEL(row->NameLabel),name);
gtk_label_set_label(GTK_LABEL(row->ModulesLabel),modules); gtk_label_set_label(GTK_LABEL(row->ModulesLabel),modules_parsed);
gtk_label_set_label(GTK_LABEL(row->DescriptionLabel),description_full); gtk_label_set_label(GTK_LABEL(row->DescriptionLabel),description_full);
yon_kernel_row_setup_tags(row,tags); yon_kernel_row_setup_tags(row,tags);
free(description_full); free(description_full);
free(modules_parsed);
} }
void yon_kernel_resize(main_window *widgets){ void yon_kernel_resize(main_window *widgets){
@ -193,7 +195,7 @@ void yon_kernel_setup(main_window *widgets){
int modules_size; int modules_size;
config_str modules_parsed = NULL; config_str modules_parsed = NULL;
if (!yon_char_is_empty(modules)){ if (!yon_char_is_empty(modules)){
modules_parsed = yon_char_parse(modules,&modules_size," "); modules_parsed = yon_char_parse(modules,&modules_size,",");
} }
int size; int size;

11
source/ubinstall-gtk-keyboard.c
Unescape View File

@ -43,6 +43,17 @@ int yon_keyboard_save(main_window *widgets){
break; break;
} }
yon_config_register(num_lock_boot_parameter,num_lock_boot_parameter_command,numlock); yon_config_register(num_lock_boot_parameter,num_lock_boot_parameter_command,numlock);
if (!main_config.configure_mode){
int size;
config_str parameters = yon_config_get_save_parameters_by_key(&size,xkbmodel_parameter,xkbmodel_parameter,num_lock_boot_parameter,NULL);
if (parameters){
char *command_parameters = yon_char_parsed_to_string(parameters,size," -- ");
char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters,NULL);
if (!system(yon_debug_output("%s\n",command))){}
free(command);
yon_char_parsed_free(parameters,size);
}
}
on_options_save(NULL,widgets); on_options_save(NULL,widgets);
return 1; return 1;
} }

11
source/ubinstall-gtk-language.c
Unescape View File

@ -274,6 +274,17 @@ int yon_language_save(main_window *widgets){
yon_config_remove_by_key(lang_parameter); yon_config_remove_by_key(lang_parameter);
yon_config_remove_by_key(locale_parameter); yon_config_remove_by_key(locale_parameter);
} }
if (!main_config.configure_mode){
int size;
config_str parameters = yon_config_get_save_parameters_by_key(&size,lang_parameter,locale_parameter,NULL);
if (parameters){
char *command_parameters = yon_char_parsed_to_string(parameters,size," -- ");
char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters,NULL);
if (!system(yon_debug_output("%s\n",command))){}
free(command);
yon_char_parsed_free(parameters,size);
}
}
return 1; return 1;
} }

2
source/ubinstall-gtk-log.c
Unescape View File

@ -89,7 +89,6 @@ void on_process_log_view(GtkWidget *,main_window *widgets){
g_object_set_data(G_OBJECT(window->Window),"widgets",widgets); g_object_set_data(G_OBJECT(window->Window),"widgets",widgets);
g_signal_connect(G_OBJECT(window->Window),"destroy",G_CALLBACK(on_log_closed),window); g_signal_connect(G_OBJECT(window->Window),"destroy",G_CALLBACK(on_log_closed),window);
gtk_widget_set_sensitive(widgets->ReadFullLogButton,0); gtk_widget_set_sensitive(widgets->ReadFullLogButton,0);
gtk_widget_set_sensitive(widgets->ReadShortLogButton,0);
yon_gtk_window_setup(GTK_WINDOW(window->Window),NULL,INSTALL_LOG_LABEL,icon_path,"log_viewer"); yon_gtk_window_setup(GTK_WINDOW(window->Window),NULL,INSTALL_LOG_LABEL,icon_path,"log_viewer");
window->command = yon_char_new(short_log_path); window->command = yon_char_new(short_log_path);
GFile *file = g_file_new_for_path(window->command); GFile *file = g_file_new_for_path(window->command);
@ -103,7 +102,6 @@ void on_summary_log_view(GtkWidget *,main_window *widgets){
log_window *window = yon_log_window_new(); log_window *window = yon_log_window_new();
g_object_set_data(G_OBJECT(window->Window),"widgets",widgets); g_object_set_data(G_OBJECT(window->Window),"widgets",widgets);
g_signal_connect(G_OBJECT(window->Window),"destroy",G_CALLBACK(on_log_closed),window); g_signal_connect(G_OBJECT(window->Window),"destroy",G_CALLBACK(on_log_closed),window);
gtk_widget_set_sensitive(widgets->ReadFullLogButton,0);
gtk_widget_set_sensitive(widgets->ReadShortLogButton,0); gtk_widget_set_sensitive(widgets->ReadShortLogButton,0);
yon_gtk_window_setup(GTK_WINDOW(window->Window),NULL,PROGRESS_LOG_LABEL,icon_path,"log_viewer"); yon_gtk_window_setup(GTK_WINDOW(window->Window),NULL,PROGRESS_LOG_LABEL,icon_path,"log_viewer");
window->command = yon_char_new(full_log_path); window->command = yon_char_new(full_log_path);

17
source/ubinstall-gtk-network.c
Unescape View File

@ -289,6 +289,23 @@ int yon_network_save(main_window *widgets){
} }
} }
if (!main_config.configure_mode){
int connect_size;
config_str connections = yon_config_get_all_by_key(NETWORK_parameter_search,&connect_size);
char *connections_string = yon_char_parsed_to_string(connections,connect_size," ");
yon_char_parsed_free(connections,connect_size);
int size;
config_str parameters = yon_config_get_save_parameters_by_key(&size,DOMAIN_parameter,DOMAIN_admanger_parameter,NTPSERVERS_parameter,hostname_parameter,NULL);
if (parameters){
char *command_parameters = yon_char_parsed_to_string(parameters,size," -- ");
char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters, " ", connections_string,NULL);
if (!system(yon_debug_output("%s\n",command))){}
free(command);
yon_char_parsed_free(parameters,size);
}
}
return 1; return 1;
} }

19
source/ubinstall-gtk-packages.c
Unescape View File

@ -15,11 +15,24 @@ int yon_packages_tab_save(main_window *widgets){
} else { } else {
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)){ 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); gtk_tree_model_get(GTK_TREE_MODEL(widgets->PackagesList),&packiter,0,&status,1,&package,3,&selectable,-1);
if (status){
yon_config_append_element(packages_parameter,package,","); yon_config_append_element(packages_parameter,package,",");
} }
} }
} }
} }
}
if (!main_config.configure_mode){
int size;
config_str parameters = yon_config_get_save_parameters_by_key(&size,packages_parameter,NULL);
if (parameters){
char *command_parameters = yon_char_parsed_to_string(parameters,size," -- ");
char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters,NULL);
if (!system(yon_debug_output("%s\n",command))){}
free(command);
yon_char_parsed_free(parameters,size);
}
}
return 1; return 1;
} }
@ -94,9 +107,9 @@ void yon_packages_tab_init(main_window *widgets){
GtkTreeIter catiter; GtkTreeIter catiter;
GtkTreeIter package_iter; GtkTreeIter package_iter;
gtk_tree_store_append(widgets->PackagesList,&catiter,NULL); gtk_tree_store_append(widgets->PackagesList,&catiter,NULL);
gtk_tree_store_set(widgets->PackagesList,&catiter,1,parsed[0],2,_(parsed[3]),3,0,-1); gtk_tree_store_set(widgets->PackagesList,&catiter,1,parsed[0],2,_(parsed[0]),3,0,-1);
gtk_tree_store_append(widgets->PackagesList,&subcategory_iter,&catiter); gtk_tree_store_append(widgets->PackagesList,&subcategory_iter,&catiter);
gtk_tree_store_set(widgets->PackagesList,&subcategory_iter,1,parsed[1],2,_(parsed[3]),3,0,-1); gtk_tree_store_set(widgets->PackagesList,&subcategory_iter,1,parsed[1],2,_(parsed[1]),3,0,-1);
gtk_tree_store_append(widgets->PackagesList,&package_iter,&subcategory_iter); gtk_tree_store_append(widgets->PackagesList,&package_iter,&subcategory_iter);
char *full_string = yon_char_unite("<b>",parsed[2],"</b>\n",_(parsed[3]),NULL); char *full_string = yon_char_unite("<b>",parsed[2],"</b>\n",_(parsed[3]),NULL);
gtk_tree_store_set(widgets->PackagesList,&package_iter,1,parsed[2],2,full_string,3,1,-1); gtk_tree_store_set(widgets->PackagesList,&package_iter,1,parsed[2],2,full_string,3,1,-1);
@ -105,7 +118,7 @@ void yon_packages_tab_init(main_window *widgets){
GtkTreeIter package_iter; GtkTreeIter package_iter;
GtkTreeIter catiter; GtkTreeIter catiter;
gtk_tree_store_append(widgets->PackagesList,&catiter,NULL); gtk_tree_store_append(widgets->PackagesList,&catiter,NULL);
gtk_tree_store_set(widgets->PackagesList,&catiter,1,parsed[0],2,_(parsed[3]),3,0,-1); gtk_tree_store_set(widgets->PackagesList,&catiter,1,parsed[0],2,_(parsed[0]),3,0,-1);
gtk_tree_store_append(widgets->PackagesList,&package_iter,&catiter); gtk_tree_store_append(widgets->PackagesList,&package_iter,&catiter);
char *full_string = yon_char_unite("<b>",parsed[2],"</b>\n",_(parsed[3]),NULL); char *full_string = yon_char_unite("<b>",parsed[2],"</b>\n",_(parsed[3]),NULL);
gtk_tree_store_set(widgets->PackagesList,&package_iter,0,0,1,parsed[2],2,full_string,3,1,-1); gtk_tree_store_set(widgets->PackagesList,&package_iter,0,0,1,parsed[2],2,full_string,3,1,-1);

11
source/ubinstall-gtk-region.c
Unescape View File

@ -18,6 +18,17 @@ int yon_region_save(main_window *widgets){
char *final = yon_char_unite(region,"/",zone,NULL); char *final = yon_char_unite(region,"/",zone,NULL);
yon_config_register(zone_parameter,zone_parameter_command,final); yon_config_register(zone_parameter,zone_parameter_command,final);
free(final); free(final);
if (!main_config.configure_mode){
int size;
config_str parameters = yon_config_get_save_parameters_by_key(&size,zone_parameter,NULL);
if (parameters){
char *command_parameters = yon_char_parsed_to_string(parameters,size," -- ");
char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters,NULL);
if (!system(yon_debug_output("%s\n",command))){}
free(command);
yon_char_parsed_free(parameters,size);
}
}
return 1; return 1;
} }

22
source/ubinstall-gtk-saving.c
Unescape View File

@ -433,18 +433,14 @@ int yon_config_save(main_window *widgets){
void yon_config_restore(main_window *){ void yon_config_restore(main_window *){
yon_load_proceed(main_config.load_mode); yon_load_proceed(main_config.load_mode);
// switch(main_config.load_mode){
// case YON_CONFIG_GLOBAL:
// on_config_global_load(NULL,widgets);
// break;
// case YON_CONFIG_LOCAL:
// on_config_local_load(NULL,widgets);
// break;
// case YON_CONFIG_CUSTOM:
// on_config_custom_load_last(NULL,widgets);
// }
// on_config_global_load(NULL,widgets);
yon_launch("ubconfig --source system remove [autoinstall]"); yon_launch("ubconfig --source system remove [autoinstall]");
// yon_config_save_simple(YON_CONFIG_LOCAL,"system"); yon_config_to_default();
int size;
config_str parameters = yon_config_get_save_parameters(&size);
char *command_params = yon_char_parsed_to_string(parameters,size, " ");
char *command = ubconfig_set_command_full("system","",command_params);
yon_debug_output("%s\n",command);
yon_launch(command);
yon_char_parsed_free(parameters,size);
free(command);
} }

13
source/ubinstall-gtk-startup-apps.c
Unescape View File

@ -55,7 +55,7 @@ void yon_startup_apps_setup(main_window *widgets){
} }
} }
char *startup = config(SERVICES_ENABLE_parameter); char *startup = config(AUTOEXEC_parameter);
if (!yon_char_is_empty(startup)){ if (!yon_char_is_empty(startup)){
if (!strcmp(startup,"auto")){ if (!strcmp(startup,"auto")){
for_iter(GTK_TREE_MODEL(widgets->StartupAppsList),&iter){ for_iter(GTK_TREE_MODEL(widgets->StartupAppsList),&iter){
@ -210,5 +210,16 @@ int yon_startup_app_save(main_window *widgets){
} else { } else {
yon_config_remove_by_key(AUTOEXEC_parameter); yon_config_remove_by_key(AUTOEXEC_parameter);
} }
if (!main_config.configure_mode){
int size;
config_str parameters = yon_config_get_save_parameters_by_key(&size,AUTOEXEC_parameter,NULL);
if (parameters){
char *command_parameters = yon_char_parsed_to_string(parameters,size," -- ");
char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters,NULL);
if (!system(yon_debug_output("%s\n",command))){}
free(command);
yon_char_parsed_free(parameters,size);
}
}
return 1; return 1;
} }

11
source/ubinstall-gtk-startup-services.c
Unescape View File

@ -217,5 +217,16 @@ int yon_startup_save(main_window *widgets){
} else { } else {
yon_config_remove_by_key(SERVICES_ENABLE_parameter); yon_config_remove_by_key(SERVICES_ENABLE_parameter);
} }
if (!main_config.configure_mode){
int size;
config_str parameters = yon_config_get_save_parameters_by_key(&size,SERVICES_ENABLE_parameter,NULL);
if (parameters){
char *command_parameters = yon_char_parsed_to_string(parameters,size," -- ");
char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters,NULL);
if (!system(yon_debug_output("%s\n",command))){}
free(command);
yon_char_parsed_free(parameters,size);
}
}
return 1; return 1;
} }

16
source/ubinstall-gtk-users.c
Unescape View File

@ -32,6 +32,22 @@ int yon_users_save(main_window *widgets){
} }
} }
if (!main_config.configure_mode){
int users_size;
config_str users = yon_config_get_all_by_key(USERADD_parameter_search,&users_size);
char *parameter = yon_char_parsed_to_string(users,users_size," ");
yon_char_parsed_free(users,users_size);
int size;
config_str parameters = yon_config_get_save_parameters_by_key(&size,autologin_parameter,root_password_parameter,NULL);
if (parameters){
char *command_parameters = yon_char_parsed_to_string(parameters,size," -- ");
char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters," ",parameter,NULL);
if (!system(yon_debug_output("%s\n",command))){}
free(command);
yon_char_parsed_free(parameters,size);
}
}
yon_debug_output("%s\n",yon_config_get_all_info()); yon_debug_output("%s\n",yon_config_get_all_info());
return 1; return 1;
} }

1
source/ubinstall-gtk.c
Unescape View File

@ -513,6 +513,7 @@ void yon_main_window_create(main_window *widgets){
widgets->KeyboardNumLockCombo = yon_gtk_builder_get_widget(builder,"KeyboardNumLockCombo"); widgets->KeyboardNumLockCombo = yon_gtk_builder_get_widget(builder,"KeyboardNumLockCombo");
widgets->AdditionalComponentsList = yon_gtk_builder_get_widget(builder,"AdditionalComponentsList"); widgets->AdditionalComponentsList = yon_gtk_builder_get_widget(builder,"AdditionalComponentsList");
widgets->AdditionalComponentsOverallSizeLabel = yon_gtk_builder_get_widget(builder,"AdditionalComponentsOverallSizeLabel");
widgets->InstallationProgress = yon_gtk_builder_get_widget(builder,"InstallationProgress"); widgets->InstallationProgress = yon_gtk_builder_get_widget(builder,"InstallationProgress");
widgets->InstallationLabel = yon_gtk_builder_get_widget(builder,"InstallationLabel"); widgets->InstallationLabel = yon_gtk_builder_get_widget(builder,"InstallationLabel");

2
source/ubinstall-gtk.h
Unescape View File

@ -616,6 +616,7 @@ typedef struct
GtkWidget *DocumentationMenuItem; GtkWidget *DocumentationMenuItem;
GtkWidget *AdditionalComponentsList; GtkWidget *AdditionalComponentsList;
GtkWidget *AdditionalComponentsOverallSizeLabel;
GtkWidget *GrubInstallRadio; GtkWidget *GrubInstallRadio;
GtkWidget *GrubUpdateRadio; GtkWidget *GrubUpdateRadio;
@ -1557,3 +1558,4 @@ void yon_advanced_part_clean_config();
void yon_advanced_part_to_data(advanced_part_widgets *part, advanced_part_data *data); void yon_advanced_part_to_data(advanced_part_widgets *part, advanced_part_data *data);
void yon_advanced_part_save_part(advanced_part_data *data); void yon_advanced_part_save_part(advanced_part_data *data);
void yon_advanced_part_remove_for_part(const char *part_name, main_window *widgets); void yon_advanced_part_remove_for_part(const char *part_name, main_window *widgets);
int yon_software_check_packages_size(GtkWidget *, main_window *widgets);

1
source/ubl-strings.h
Unescape View File

@ -286,6 +286,7 @@ NULL)
#define LOAD_GLOBAL_LABEL yon_char_get_localised_from_lib("Load global configuration") #define LOAD_GLOBAL_LABEL yon_char_get_localised_from_lib("Load global configuration")
#define LOAD_LABEL yon_char_get_localised_from_lib("Load") #define LOAD_LABEL yon_char_get_localised_from_lib("Load")
#define CLOSE_INSTALLER_LABEL _("Close installer")
#define REBOOT_LABEL _("Reboot") #define REBOOT_LABEL _("Reboot")
#define SHUTDOWN_LABEL _("Shudown") #define SHUTDOWN_LABEL _("Shudown")
#define FINISH_ACTION_LABEL _("After successful installation:") #define FINISH_ACTION_LABEL _("After successful installation:")

3
ubinstall-gtk-kernel-row.glade
Unescape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.38.2 --> <!-- Generated with glade 3.40.0 -->
<interface domain="ubinstall-gtk"> <interface domain="ubinstall-gtk">
<requires lib="gtk+" version="3.24"/> <requires lib="gtk+" version="3.24"/>
<!-- interface-css-provider-path ubinstall-gtk.css --> <!-- interface-css-provider-path ubinstall-gtk.css -->
@ -135,6 +135,7 @@
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="margin-top">5</property> <property name="margin-top">5</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="yalign">0</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>

54
ubinstall-gtk.glade
Unescape View File

@ -3290,6 +3290,60 @@ Select a different installation source.</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="spacing">5</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="spacing">5</property>
<child>
<object class="GtkLabel" id="AdditionalComponentsOverallSizeLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack-type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label22">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Overall size:</property>
<property name="xalign">1</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack-type">end</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack-type">end</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object> </object>
<packing> <packing>
<property name="position">9</property> <property name="position">9</property>

Write Preview
Loading…
Cancel
Save