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

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

Browse Source 
Reviewed-on: #356
pull/358/head^2
Dmitry Razumov 1 month ago
parent 258ca4185a 4c141e495b
commit f605bc1ca0
18 changed files with 83 additions and 37 deletions
Show Stats Download Patch File Download Diff File

13
source/ubinstall-gtk-advanced.c
Unescape View File

@ -170,7 +170,7 @@ void yon_advanced_part_clean_config(){
yon_config_remove_by_key(part_format_parameter);
}
void yon_advanced_part_save_part(advanced_part_data *data){
gboolean yon_advanced_part_save_part(advanced_part_data *data){
if (!config(device_parameter)) yon_config_register(device_parameter,device_parameter_command,NULL);
if (!config(part_parameter)) yon_config_register(part_parameter,part_parameter_command,NULL);
if (!config(part_size_parameter)) yon_config_register(part_size_parameter,part_size_parameter_command,NULL);
@ -190,7 +190,7 @@ void yon_advanced_part_save_part(advanced_part_data *data){
yon_config_force_append_element(part_fs_label_parameter,"",",");
yon_config_force_append_element(part_crypt_parameter,"",",");
yon_config_force_append_element(part_format_parameter,"",",");
return;
return 0;
}
yon_config_force_append_element(device_parameter,data->device,",");
yon_config_force_append_element(part_parameter,data->partition,",");
@ -208,9 +208,10 @@ void yon_advanced_part_save_part(advanced_part_data *data){
yon_config_force_append_element(part_fs_label_parameter,data->fs_label,",");
yon_config_force_append_element(part_crypt_parameter,data->encryption,",");
yon_config_force_append_element(part_format_parameter,data->format,",");
return 1;
}
void yon_advanced_part_save(main_window *widgets){
gboolean yon_advanced_part_save(main_window *widgets){
GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->AdvancedPartitionAddBox));
advanced_part_data *data1 = NULL;
@ -226,13 +227,15 @@ void yon_advanced_part_save(main_window *widgets){
yon_advanced_part_to_data(part2,data2);
}
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(part1->SystemSectionToggle))){
yon_advanced_part_save_part(data1);
yon_advanced_part_save_part(data2);
if (!yon_advanced_part_save_part(data1)&&!yon_advanced_part_save_part(data2)){
return 0;
}
} else {
yon_advanced_part_save_part(data2);
yon_advanced_part_save_part(data1);
}
}
return 1;
}
int yon_advanced_save(main_window *widgets){

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

@ -449,7 +449,7 @@ void yon_bootloader_init(main_window *widgets){
int size = 0;
config_str users = yon_config_get_all_by_key(GRUB_PASSWORD_parameter_search,&size);
yon_config_remove_by_list(users,size);
yon_config_update_by_args(GRUB_TIMEOUT_parameter,GRUB_SUPERUSERS_parameter,NULL);
yon_config_update_by_args(main_config.config_load_path, GRUB_TIMEOUT_parameter,GRUB_SUPERUSERS_parameter,NULL);
yon_config_load_config(YON_CONFIG_CUSTOM,ubconfig_load_command(main_config.config_load_path),GRUB_PASSWORD_parameter_command_all,NULL);
}
gtk_list_store_clear(widgets->BootloadUsersList);

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

@ -320,7 +320,7 @@ void yon_modules_missed_func(main_window *widgets){
void yon_os_components_init(main_window *widgets){
if (!main_config.configure_mode){
yon_config_update_by_args(modules_parameter,NULL);
yon_config_update_by_args(main_config.config_load_path, modules_parameter,NULL);
}
// int size = 0;
GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->OSSoftwareListBox));
@ -474,7 +474,7 @@ gboolean yon_software_insert(struct row_data *row_input){
void yon_software_init(main_window *widgets){
on_status_update(NULL,widgets);
if (!main_config.configure_mode){
yon_config_update_by_args(packages_parameter,NULL);
yon_config_update_by_args(main_config.config_load_path, packages_parameter,NULL);
}
GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->AdditionalComponentsList));
GList *iter;
@ -550,7 +550,7 @@ int yon_pacman_software_save(main_window *widgets){
void yon_pacman_init(main_window *widgets){
on_status_update(NULL,widgets);
if (!main_config.configure_mode){
yon_config_update_by_args(packages_parameter,NULL);
yon_config_update_by_args(main_config.config_load_path, packages_parameter,NULL);
}
gtk_list_store_clear(widgets->PacmanSoftwareChosenList);
char *pacman_packages = config(packages_parameter);

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

@ -58,6 +58,7 @@ int yon_installation_check_packages_size(main_window *widgets){
} else {
char *part = config(part_parameter);
if (!yon_char_is_empty(part)){
for (int i=0;i<main_config.part_size;i++){
int parsed_size=0;
config_str parsed = yon_char_parse(main_config.partitions[i],&parsed_size,";");
@ -70,6 +71,7 @@ int yon_installation_check_packages_size(main_window *widgets){
yon_char_parsed_free(parsed,parsed_size);
}
}
}
long packages_size = 0;
long modules_size = 0;

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

@ -30,7 +30,7 @@ int yon_install_common_save(main_window *widgets){
}
if (!main_config.configure_mode){
yon_debug_output("%s\n",yon_config_save_args_simple(main_config.config_load_path,AUTOINSTALL_TYPE_INSTALL,device_parameter,part_label_parameter,part_fs_type_parameter,NULL));
yon_debug_output("%s\n",yon_config_save_args_simple(main_config.config_load_path,AUTOINSTALL_TYPE_INSTALL,device_parameter,part_parameter,part_size_parameter,part_label_parameter,part_fs_type_parameter,NULL));
}
return 1;
}
@ -317,7 +317,7 @@ void yon_userdata_password_open(GtkWidget *, main_window *widgets){
void yon_install_init(main_window *widgets, enum YON_PAGES page){
if (!main_config.configure_mode){
yon_config_update_by_args(AUTOINSTALL_TYPE_INSTALL,device_parameter,part_label_parameter,part_fs_type_parameter,NULL);
yon_config_update_by_args(main_config.config_load_path, AUTOINSTALL_TYPE_INSTALL,device_parameter,part_label_parameter,part_fs_type_parameter,NULL);
}
yon_devices_setup(widgets);

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

@ -189,7 +189,7 @@ void yon_kernel_addon_resize(main_window *widgets){
void yon_kernel_init(main_window *widgets){
on_status_update(NULL,widgets);
if (!main_config.configure_mode){
yon_config_update_by_args(packages_parameter,KERNEL_BOOT_parameter,NULL);
yon_config_update_by_args(main_config.config_load_path, packages_parameter,KERNEL_BOOT_parameter,NULL);
}
GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->KernelListBox));
GList *iter;

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

@ -56,7 +56,7 @@ int yon_keyboard_save(main_window *widgets){
void yon_keyboard_init(main_window *widgets){
if (!main_config.configure_mode){
yon_config_update_by_args(xkbmodel_parameter,num_lock_boot_parameter,NULL);
yon_config_update_by_args(main_config.config_load_path, xkbmodel_parameter,num_lock_boot_parameter,NULL);
}
g_signal_handlers_block_by_func(G_OBJECT(widgets->KeyboardModelCombo),G_CALLBACK(on_model_changed),widgets);
g_signal_handlers_block_by_func(G_OBJECT(widgets->KeyboardDefaultLayoutsSwitch),G_CALLBACK(on_layout_default_toggled),widgets);

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

@ -233,6 +233,16 @@ void on_language_default_toggled(GtkWidget *, int status, main_window *widgets){
}
}
void on_locale_selected(GtkTreeView *,main_window *widgets){
GtkTreeModel *model = NULL;
GtkTreeIter iter;
if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->LocaleTree)),&model,&iter)){
gtk_widget_set_sensitive(widgets->LocaleRemoveButton,1);
} else {
gtk_widget_set_sensitive(widgets->LocaleRemoveButton,0);
}
}
void on_locale_toggled(GtkCellRenderer *, gchar *path, main_window *widgets){
GtkTreeIter fiter;
GtkTreeIter iter;
@ -281,7 +291,7 @@ int yon_language_save(main_window *widgets){
void yon_language_init(main_window *widgets){
if (!main_config.configure_mode){
yon_config_update_by_args(lang_parameter, locale_parameter,NULL);
yon_config_update_by_args(main_config.config_load_path, lang_parameter, locale_parameter,NULL);
}
yon_language_update(widgets);
}

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

@ -320,7 +320,7 @@ void yon_network_init(main_window *widgets){
int size = 0;
config_str users = yon_config_get_all_by_key(NETWORK_parameter_search,&size);
yon_config_remove_by_list(users,size);
yon_config_update_by_args(DOMAIN_parameter,DOMAIN_admanger_parameter,NTPSERVERS_parameter,hostname_parameter,NULL);
yon_config_update_by_args(main_config.config_load_path, DOMAIN_parameter,DOMAIN_admanger_parameter,NTPSERVERS_parameter,hostname_parameter,NULL);
yon_config_load_config(YON_CONFIG_CUSTOM,ubconfig_load_command(main_config.config_load_path),NETWORK_parameter_all,NULL);
}
GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->NetworkConnectionsBox));

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

@ -69,7 +69,7 @@ GtkTreeIter *yon_subcategory_check(GtkTreeStore *target, GtkTreeIter *parent_ite
void yon_packages_tab_init(main_window *widgets){
on_status_update(NULL,widgets);
if (!main_config.configure_mode){
yon_config_update_by_args(packages_parameter,NULL);
yon_config_update_by_args(main_config.config_load_path, packages_parameter,NULL);
}
if (!main_config.configure_mode){
yon_config_remove_by_args(packages_parameter,NULL);

19
source/ubinstall-gtk-page-switch.c
Unescape View File

@ -183,6 +183,8 @@ void yon_navigation_buttons_set_sensetiveness(main_window *widgets){
case YON_PAGE_INSTALL_ERROR:
case YON_PAGE_CONFIGURE_SAVE:
case YON_PAGE_COMPLETION:
gtk_widget_set_sensitive(widgets->LoadLocalConfigurationMenuItem,0);
gtk_widget_set_sensitive(widgets->LoadExternalConfigurationMenuItem,0);
gtk_button_set_label(GTK_BUTTON(widgets->NextButton),RESTART_LABEL);
gtk_widget_hide(widgets->BackButton);
gtk_widget_set_sensitive(widgets->CancelInstallButton,1);
@ -195,6 +197,8 @@ void yon_navigation_buttons_set_sensetiveness(main_window *widgets){
gtk_widget_set_sensitive(widgets->BackButton,1);
gtk_widget_set_sensitive(widgets->NextButton,1);
gtk_widget_set_sensitive(widgets->CancelInstallButton,1);
gtk_widget_set_sensitive(widgets->LoadLocalConfigurationMenuItem,1);
gtk_widget_set_sensitive(widgets->LoadExternalConfigurationMenuItem,1);
gtk_button_set_label(GTK_BUTTON(widgets->CancelInstallButton),EXIT_LABEL);
if (!yon_char_is_empty(config(AUTOINSTALL_TYPE_INSTALL))&&!main_config.configure_mode){
gtk_widget_show(widgets->StartScenarioButton);
@ -202,6 +206,19 @@ void yon_navigation_buttons_set_sensetiveness(main_window *widgets){
gtk_widget_hide(widgets->StartScenarioButton);
}
break;
case YON_PAGE_INSTALL_COMMON:
case YON_PAGE_INSTALL_SEPARATE:
case YON_PAGE_INSTALL_SAME_PARTITION:
case YON_PAGE_INSTALL_ADVANCED:
case YON_PAGE_INSTALL_RECOVERY:
case YON_PAGE_RECOVERY_GRUB_INSTALL:
case YON_PAGE_RECOVERY_GRUB_UPDATE:
case YON_PAGE_RECOVERY_OS_ONLY:
case YON_PAGE_RECOVERY_USRDATA_ONLY:
{
gtk_widget_set_sensitive(widgets->LoadLocalConfigurationMenuItem,0);
gtk_widget_set_sensitive(widgets->LoadExternalConfigurationMenuItem,0);
} break;
default:
gtk_widget_set_sensitive(widgets->BackButton,1);
gtk_widget_set_sensitive(widgets->NextButton,1);
@ -317,6 +334,8 @@ int yon_page_save(main_window *widgets, enum YON_PAGES page){
return yon_install_options_save(widgets->UserdataDevicesTree,widgets->UserdataSysSectionTree,"data_only",widgets);
break;
case YON_PAGE_INSTALLATION_BEGIN:
yon_installation_start(widgets);
[[fallthrough]];
case YON_PAGE_CONFIGURE_END:
int status = yon_config_save(widgets);
if (status){

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

@ -196,7 +196,7 @@ void on_region_entry_changed(GtkWidget *, main_window *widgets){
void yon_region_init(main_window *widgets){
if (!main_config.configure_mode){
yon_config_update_by_args(zone_parameter,NULL);
yon_config_update_by_args(main_config.config_load_path, zone_parameter,NULL);
}
yon_timezone_init();
gtk_combo_box_text_remove_all(GTK_COMBO_BOX_TEXT(widgets->RegionCombo));

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

@ -19,6 +19,7 @@ void yon_load_proceed(YON_CONFIG_TYPE type){
main_config.startup_config = NULL;
yon_config_custom_load_config(&main_config.startup_config,config_get_command("system"),NULL);
main_config.config_load_path = yon_char_new("system");
main_config.config_save_path = main_config.config_load_path;
yon_config_load_config(type,config_get_command("system"),NULL);
break;
case YON_CONFIG_CUSTOM:
@ -27,6 +28,7 @@ void yon_load_proceed(YON_CONFIG_TYPE type){
path=yon_custom_config_init(GTK_FILE_CHOOSER_ACTION_OPEN);
if (!yon_char_is_empty(path)){
main_config.config_load_path = yon_char_new(path);
main_config.config_save_path = main_config.config_load_path;
yon_config_clean();
yon_config_load_config(type,config_get_command(path),NULL);
}
@ -57,12 +59,20 @@ void on_config_local_load(GtkWidget *,main_window *widgets){
}
void on_config_custom_load(GtkWidget *,main_window *){
char *temp_custom_path = NULL;
if (!yon_char_is_empty(main_config.config_load_path)){
free(main_config.config_load_path);
temp_custom_path = main_config.config_load_path;
main_config.config_load_path = NULL;
main_config.config_save_path = NULL;
}
yon_load_proceed(YON_CONFIG_CUSTOM);
if (!yon_char_is_empty(main_config.config_load_path)){
main_config.load_mode=YON_CONFIG_CUSTOM;
free(temp_custom_path);
} else {
main_config.config_load_path = temp_custom_path;
main_config.config_save_path = main_config.config_load_path;
}
}
void on_config_custom_load_last(GtkWidget *,main_window *){
@ -338,7 +348,7 @@ int yon_config_save(main_window *widgets){
yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),ERROR_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
return 0;
}
char *command = yon_debug_output("%s\n",ubconfig_set_command_full(main_config.config_save_path,"[autoinstall]",yon_char_parsed_to_string(parameters,size," ")));
char *command = yon_debug_output("%s\n",ubconfig_set_command_full(main_config.config_load_path,"[autoinstall]",yon_char_parsed_to_string(parameters,size," ")));
if (system(command)){
return 0;
}

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

@ -43,7 +43,7 @@ void on_startup_apps_remove(GtkWidget *self,main_window *widgets){
void yon_startup_apps_init(main_window *widgets){
if (!main_config.configure_mode){
yon_config_update_by_args(AUTOEXEC_parameter,NULL);
yon_config_update_by_args(main_config.config_load_path, AUTOEXEC_parameter,NULL);
}
GtkTreeIter iter;
gtk_list_store_clear(widgets->StartupAppsList);
@ -103,7 +103,7 @@ void yon_startup_apps_init(main_window *widgets){
if (parsed_size&&parsed){
for (int i=0;i<parsed_size;i++){
gtk_list_store_append(widgets->StartupAppsList,&iter);
gtk_list_store_set(widgets->StartupAppsList,&iter,0,1,2,parsed[i],-1);
gtk_list_store_set(widgets->StartupAppsList,&iter,0,1,2,parsed[i],4,1,-1);
}
}
yon_char_parsed_free(parsed,parsed_size);

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

@ -51,7 +51,7 @@ void on_startup_services_remove(GtkWidget *self,main_window *widgets){
void yon_startup_services_init(main_window *widgets){
if (!main_config.configure_mode){
yon_config_update_by_args(SERVICES_ENABLE_parameter,NULL);
yon_config_update_by_args(main_config.config_load_path, SERVICES_ENABLE_parameter,NULL);
}
GtkTreeIter iter;
gtk_list_store_clear(widgets->StartupList);

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

@ -101,12 +101,13 @@ int yon_user_save(yon_user_struct *user){
return 1;
}
void on_user_autoloin_switch(GtkWidget *, int status, main_window *){
gboolean on_user_autoloin_switch(GtkWidget *, int status, main_window *){
if (status){
yon_config_register(autologin_parameter,autologin_parameter_command,"yes");
} else {
yon_config_register(autologin_parameter,autologin_parameter_command,"no");
}
return 0;
}
void on_user_add(GtkWidget *,main_window *widgets){
@ -194,7 +195,7 @@ void yon_user_init(main_window *widgets){
}
}
yon_config_remove_by_list(users,size);
yon_config_update_by_args(autologin_parameter,root_password_parameter,NULL);
yon_config_update_by_args(main_config.config_load_path, autologin_parameter,root_password_parameter,NULL);
config_str parameters = yon_config_load(config_get_command(main_config.config_load_path),&size);
for (int i=0;i<size;i++){
if (strstr(parameters[i],USERADD_parameter_search)){

2
source/ubinstall-gtk.c
Unescape View File

@ -252,7 +252,6 @@ gboolean on_yon_exit(GtkWidget *,GdkEvent*, main_window *widgets){
return 1;
}
} else {
yon_config_restore(widgets);
on_exit_accepted(widgets);
gtk_main_quit();
}
@ -690,6 +689,7 @@ void yon_main_window_create(main_window *widgets){
g_signal_connect(G_OBJECT(widgets->LocaleRemoveButton),"clicked",G_CALLBACK(on_language_remove),widgets);
g_signal_connect(G_OBJECT(widgets->LocaleDefaultSwitch),"state-set",G_CALLBACK(on_language_default_toggled),widgets);
g_signal_connect(G_OBJECT(widgets->LocaleCell),"toggled",G_CALLBACK(on_locale_toggled),widgets);
g_signal_connect(G_OBJECT(widgets->LocaleTree),"cursor-changed",G_CALLBACK(on_locale_selected),widgets);
g_signal_connect(G_OBJECT(widgets->CancelInstallButton),"clicked",G_CALLBACK(on_page_cancel_clicked),widgets);
g_signal_connect(G_OBJECT(widgets->RegionCombo),"changed",G_CALLBACK(on_region_changed),widgets);

7
source/ubinstall-gtk.h
Unescape View File

@ -1602,10 +1602,10 @@ void on_advanced_part_content_changed(GtkWidget *, GtkWidget *, main_window *wid
gboolean on_keyboard_search_func(GtkTreeModel *model, gint, const char *key, GtkTreeIter *iter, main_window *);
void yon_update_part_sections(main_window *widgets);
void on_advanced_part_toggled(GtkWidget *self);
void yon_advanced_part_save(main_window *widgets);
gboolean yon_advanced_part_save(main_window *widgets);
void yon_advanced_part_clean_config();
void yon_advanced_part_to_data(advanced_part_widgets *part, advanced_part_data *data);
void yon_advanced_part_save_part(advanced_part_data *data);
gboolean yon_advanced_part_save_part(advanced_part_data *data);
void yon_advanced_part_remove_for_part(const char *part_name, main_window *widgets);
int yon_software_check_packages_size(GtkWidget *, main_window *widgets);
void yon_user_admin_check(GtkWidget *self, main_window *widgets);
@ -1619,4 +1619,5 @@ void on_status_update(GtkWidget *,main_window *widgets);
gboolean on_kernel_addon_menu_block(GObject *self, GdkEventButton *event);
void on_os_components_uncheck_all(GtkWidget *,main_window *widgets);
gboolean yon_os_components_load(main_window *widgets);
void on_user_autoloin_switch(GtkWidget *, int status, main_window *);
gboolean on_user_autoloin_switch(GtkWidget *, int status, main_window *);
void on_locale_selected(GtkTreeView *self,main_window *widgets);
Write Preview
Loading…
Cancel
Save