diff --git a/source/ubinstall-gtk-components.c b/source/ubinstall-gtk-components.c index e3a26ad..a6ff663 100644 --- a/source/ubinstall-gtk-components.c +++ b/source/ubinstall-gtk-components.c @@ -265,6 +265,9 @@ void yon_modules_missed_func(main_window *widgets){ void yon_os_components_init(main_window *widgets){ + yon_config_remove_by_args(modules_parameter,NULL); + char *command = yon_config_parameter_prepare_command(modules_parameter_command,main_config.config_load_path,NULL,NULL); + yon_config_load_config(YON_CONFIG_CUSTOM,command,NULL); int size = 0; GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->OSSoftwareListBox)); GList *iter; diff --git a/source/ubinstall-gtk-kernel.c b/source/ubinstall-gtk-kernel.c index feb0adb..50faa06 100644 --- a/source/ubinstall-gtk-kernel.c +++ b/source/ubinstall-gtk-kernel.c @@ -186,7 +186,7 @@ void yon_kernel_addon_resize(main_window *widgets){ g_list_free(list); } -void yon_kernel_setup(main_window *widgets){ +void yon_kernel_init(main_window *widgets){ GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->KernelListBox)); GList *iter; for (iter = list; iter; iter = iter->next){ @@ -391,7 +391,7 @@ void yon_kernel_addon_row_setup(kernel_addon_row *row, char *name, char *modules free(description_full); } -void yon_kernel_addon_setup(main_window *widgets){ +void yon_kernel_addon_init(main_window *widgets){ GList *list = gtk_container_get_children(GTK_CONTAINER(widgets->KernelAddonListBox)); GList *iter; for (iter = list; iter; iter = iter->next){ diff --git a/source/ubinstall-gtk-page-switch.c b/source/ubinstall-gtk-page-switch.c index 01ff02a..64ba4b9 100644 --- a/source/ubinstall-gtk-page-switch.c +++ b/source/ubinstall-gtk-page-switch.c @@ -429,10 +429,10 @@ void yon_page_init(main_window *widgets, enum YON_PAGES page){ yon_os_components_init(widgets); break; case YON_PAGE_KERNEL: - yon_kernel_setup(widgets); + yon_kernel_init(widgets); break; case YON_PAGE_KERNEL_ADDON: - yon_kernel_addon_setup(widgets); + yon_kernel_addon_init(widgets); break; case YON_PAGE_SOFTWARE: yon_software_init(widgets); @@ -453,10 +453,10 @@ void yon_page_init(main_window *widgets, enum YON_PAGES page){ yon_user_init(widgets); break; case YON_PAGE_STARTUP: - yon_startup_services_setup(widgets); + yon_startup_services_init(widgets); break; case YON_PAGE_APP_STARTUP: - yon_startup_apps_setup(widgets); + yon_startup_apps_init(widgets); break; case YON_PAGE_BOOTLOADER: yon_bootloader_init(widgets); diff --git a/source/ubinstall-gtk-startup-apps.c b/source/ubinstall-gtk-startup-apps.c index 65a42c9..48b5ad4 100644 --- a/source/ubinstall-gtk-startup-apps.c +++ b/source/ubinstall-gtk-startup-apps.c @@ -41,7 +41,7 @@ void on_startup_apps_remove(GtkWidget *self,main_window *widgets){ } } -void yon_startup_apps_setup(main_window *widgets){ +void yon_startup_apps_init(main_window *widgets){ GtkTreeIter iter; gtk_list_store_clear(widgets->StartupAppsList); int size; diff --git a/source/ubinstall-gtk-startup-services.c b/source/ubinstall-gtk-startup-services.c index df22c6b..a7e7b9d 100644 --- a/source/ubinstall-gtk-startup-services.c +++ b/source/ubinstall-gtk-startup-services.c @@ -49,7 +49,7 @@ void on_startup_services_remove(GtkWidget *self,main_window *widgets){ } } -void yon_startup_services_setup(main_window *widgets){ +void yon_startup_services_init(main_window *widgets){ GtkTreeIter iter; gtk_list_store_clear(widgets->StartupList); int size; diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c index c6bc354..fe82770 100644 --- a/source/ubinstall-gtk.c +++ b/source/ubinstall-gtk.c @@ -100,22 +100,6 @@ void yon_on_about(GtkWidget *, main_window *){ //functions -// //functions -// void yon_encryption_type_setup(GtkComboBoxText *target){ -// int size; -// config_str enc_types = yon_resource_open_file(encryptions_path,&size); -// for (int i=0;iStartScenarioButton=yon_gtk_builder_get_widget(builder,"StartScenarioButton"); widgets->SourceButton=yon_gtk_builder_get_widget(builder,"SourceButton"); - // widgets->SkipInstallationButton=yon_gtk_builder_get_widget(builder,"SkipInstallationButton"); widgets->InstallationRadio=yon_gtk_builder_get_widget(builder,"InstallationRadio"); widgets->InstallationNearRadio=yon_gtk_builder_get_widget(builder,"InstallationNearRadio"); @@ -469,7 +452,6 @@ void yon_main_window_create(main_window *widgets){ widgets->InstallerCountryList=GTK_LIST_STORE(gtk_builder_get_object(builder,"InstallerCountryList")); widgets->InstallerCountryFilter=GTK_TREE_MODEL(gtk_builder_get_object(builder,"InstallerCountryFilter")); widgets->InstallerLanguageList=GTK_LIST_STORE(gtk_builder_get_object(builder,"InstallerLanguageList")); - // widgets->LanguageCombo=yon_gtk_builder_get_widget(builder,"LanguageCombo"); widgets->RegionMapBox=yon_gtk_builder_get_widget(builder,"RegionMapBox"); widgets->RegionMapTarget=NULL; widgets->RegionCombo=yon_gtk_builder_get_widget(builder,"RegionCombo"); @@ -563,7 +545,6 @@ void yon_main_window_create(main_window *widgets){ widgets->PacmanSoftwareChosenList = GTK_LIST_STORE(gtk_builder_get_object(builder,"PacmanSoftwareChosenList")); widgets->PacmanSoftwareChosenCell = GTK_CELL_RENDERER(gtk_builder_get_object(builder,"PacmanSoftwareChosenCell")); - // widgets->StartupImage = yon_gtk_builder_get_widget(builder,"StartupImage"); widgets->StartupServicesTree = yon_gtk_builder_get_widget(builder,"StartupServicesTree"); widgets->StartupServicesAddButton = yon_gtk_builder_get_widget(builder,"StartupServicesAddButton"); widgets->StartupServicesEditButton = yon_gtk_builder_get_widget(builder,"StartupServicesEditButton"); @@ -578,12 +559,10 @@ void yon_main_window_create(main_window *widgets){ widgets->StartupAppsChosenCell = GTK_CELL_RENDERER(gtk_builder_get_object(builder,"StartupAppsChosenCell")); widgets->StartupAppsList = GTK_LIST_STORE(gtk_builder_get_object(builder,"StartupAppsList")); - // widgets->BootloaderImage = yon_gtk_builder_get_widget(builder,"BootloaderImage"); widgets->BootloadTimerSwitch = yon_gtk_builder_get_widget(builder,"BootloadTimerSwitch"); widgets->BootloadTimerSpin = yon_gtk_builder_get_widget(builder,"BootloadTimerSpin"); widgets->BootloadDefaultOSEntry = yon_gtk_builder_get_widget(builder,"BootloadDefaultOSEntry"); widgets->BootloadDefaulOSButton = yon_gtk_builder_get_widget(builder,"BootloadDefaulOSButton"); - // widgets->BootloadNoPasswordSwitch = yon_gtk_builder_get_widget(builder,"BootloadNoPasswordSwitch"); widgets->BootloadUserTree = yon_gtk_builder_get_widget(builder,"BootloadUserTree"); widgets->BootloadUserAddButton = yon_gtk_builder_get_widget(builder,"BootloadUserAddButton"); widgets->BootloadUserEditButton = yon_gtk_builder_get_widget(builder,"BootloadUserEditButton"); @@ -591,7 +570,6 @@ void yon_main_window_create(main_window *widgets){ widgets->BootloadUserRemoveButton = yon_gtk_builder_get_widget(builder,"BootloadUserRemoveButton"); widgets->BootloadUsersList = GTK_LIST_STORE(gtk_builder_get_object(builder,"BootloadUsersList")); - // widgets->NetworkImage = yon_gtk_builder_get_widget(builder,"NetworkImage"); widgets->NetworkDomainSwitch = yon_gtk_builder_get_widget(builder,"NetworkDomainSwitch"); widgets->NetworkDomainNameEntry = yon_gtk_builder_get_widget(builder,"NetworkDomainNameEntry"); widgets->NetworkDomainAdminEntry = yon_gtk_builder_get_widget(builder,"NetworkDomainAdminEntry"); @@ -663,7 +641,6 @@ void yon_main_window_create(main_window *widgets){ g_signal_connect(G_OBJECT(widgets->GrubInstallUpdateGpartedButton),"clicked",G_CALLBACK(on_gparted_update),widgets); g_signal_connect(G_OBJECT(widgets->AdvancedUpdateGpartedButton),"clicked",G_CALLBACK(on_gparted_update),widgets); - // g_signal_connect(G_OBJECT(widgets->MainWindow),"check-resize",G_CALLBACK(on_region_resized),widgets); g_signal_connect(G_OBJECT(widgets->NextButton),"clicked",G_CALLBACK(on_page_next_clicked),widgets); g_signal_connect(G_OBJECT(widgets->BackButton),"clicked",G_CALLBACK(on_page_prev_clicked),widgets); @@ -702,15 +679,9 @@ void yon_main_window_create(main_window *widgets){ g_signal_connect(G_OBJECT(widgets->UserdataDevicesTree),"cursor-changed",G_CALLBACK(on_device_selection_changed),widgets); g_signal_connect(G_OBJECT(widgets->AdditionalComponentsUncheckAllCheck),"toggled",G_CALLBACK(on_software_uncheck_all),widgets); - // g_signal_connect(G_OBJECT(gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(widgets->NextInstallationSizeSpin))),"value-changed",G_CALLBACK(yon_size_changed),widgets); g_signal_connect(G_OBJECT(widgets->NextInstallationSizeSpin),"value-changed",G_CALLBACK(yon_size_changed),widgets); g_signal_connect(G_OBJECT(widgets->UserdataFormatSizeSpin),"value-changed",G_CALLBACK(yon_size_changed),widgets); g_signal_connect(G_OBJECT(widgets->OSFormatSizeSpin),"value-changed",G_CALLBACK(yon_size_changed),widgets); - // g_signal_connect(G_OBJECT(widgets->SamePlacePartTree),"cursor-changed",G_CALLBACK(on_partition_changed),widgets); - // g_signal_connect(G_OBJECT(widgets->NextInstallationSysSectionTree),"cursor-changed",G_CALLBACK(on_partition_changed),widgets); - // g_signal_connect(G_OBJECT(widgets->NextInstallationSizeTypeSpin),"changed",G_CALLBACK(on_partition_size_changed),widgets); - // g_signal_connect(G_OBJECT(widgets->OSFormatSizeCombo),"changed",G_CALLBACK(on_partition_size_changed),widgets); - // g_signal_connect(G_OBJECT(widgets->UserdataFormatSizeCombo),"changed",G_CALLBACK(on_partition_size_changed),widgets); g_signal_connect(G_OBJECT(widgets->UserRootPasswordCombo),"changed",G_CALLBACK(yon_gtk_widget_set_sensitive_from_combo_box),widgets->UserRootPasswordEntry); g_signal_connect(G_OBJECT(widgets->UserRootPasswordCombo),"changed",G_CALLBACK(yon_gtk_widget_set_sensitive_from_combo_box),widgets->UserRootPasswordButton); @@ -720,7 +691,6 @@ void yon_main_window_create(main_window *widgets){ g_signal_connect(G_OBJECT(widgets->LanguagesTree),"cursor-changed",G_CALLBACK(on_locale_changed),widgets); g_signal_connect(G_OBJECT(widgets->CountryLanguagesTree),"row-activated",G_CALLBACK(on_installer_language_changed),widgets); - // g_signal_connect(G_OBJECT(widgets->LanguageCombo),"changed",G_CALLBACK(on_locale_changed),widgets); g_signal_connect(G_OBJECT(widgets->StartupServicesTree),"cursor-changed",G_CALLBACK(on_startup_services_selection_changed),widgets); g_signal_connect(G_OBJECT(widgets->StartupServicesAddButton),"clicked",G_CALLBACK(on_startup_service_add),widgets); @@ -761,9 +731,6 @@ void yon_main_window_create(main_window *widgets){ g_signal_connect(G_OBJECT(widgets->BootloadUserRemoveButton),"clicked",G_CALLBACK(on_bootloader_user_remove),widgets); g_signal_connect(G_OBJECT(widgets->BootloadTimerSwitch),"state-set",G_CALLBACK(yon_gtk_widget_set_sensitive_from_switch),widgets->BootloadTimerSpin); - // g_signal_connect(G_OBJECT(widgets->BootloadNoPasswordSwitch),"state-set",G_CALLBACK(yon_gtk_widget_set_sensitive_from_switch_inversed),widgets->BootloadUserRemoveButton); - // g_signal_connect(G_OBJECT(widgets->BootloadNoPasswordSwitch),"state-set",G_CALLBACK(yon_gtk_widget_set_sensitive_from_switch_inversed),widgets->BootloadUserAddButton); - // g_signal_connect(G_OBJECT(widgets->BootloadNoPasswordSwitch),"state-set",G_CALLBACK(yon_gtk_widget_set_sensitive_from_switch_inversed),widgets->BootloadUserTree); g_signal_connect(G_OBJECT(widgets->NetworkDomainSwitch),"state-set",G_CALLBACK(yon_gtk_widget_set_sensitive_from_switch),widgets->NetworkDomainNameEntry); g_signal_connect(G_OBJECT(widgets->NetworkDomainSwitch),"state-set",G_CALLBACK(yon_gtk_widget_set_sensitive_from_switch),widgets->NetworkDomainAdminEntry); @@ -945,9 +912,6 @@ void yon_main_window_create(main_window *widgets){ main_config.part_size_default = default_part_size[0]; } } - // if (main_config.autoinstall){ - - // } } gboolean yon_maximize_start(main_window *widgets){ @@ -985,7 +949,6 @@ main_window *yon_main_window_complete(){ int main(int argc, char *argv[]){ main_config.argv=argv; main_config.argc = argc; - // __attribute__((unused)) char *locale = setlocale(LC_ALL, "en_US.UTF-8"); config_str unfound = NULL; int size=0; opterr=0; diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h index 4222b30..060edfa 100755 --- a/source/ubinstall-gtk.h +++ b/source/ubinstall-gtk.h @@ -1326,22 +1326,22 @@ gboolean yon_on_revealer_switched(yon_menu_window *window); gboolean on_menu_clicked(GtkWidget *, GdkEventButton *event, yon_menu_window *window); yon_menu_window *yon_menu_window_open(GtkWidget *, main_window *widgets); void on_submenu_open(GtkWidget *, yon_menu_item *item); -void yon_kernel_setup(main_window *widgets); +void yon_kernel_init(main_window *widgets); void yon_kernel_row_setup(kernel_row *row, char *name, char *modules, char *package, char *tags, char *description); void yon_kernel_row_setup_tags(kernel_row *row, char *tags); int yon_tag_add(GtkBox *target, char *tag_label, char *tag_style, char *icon_name); kernel_row *yon_kernel_row_new(); void yon_kernel_resize(main_window *widgets); -void yon_kernel_addon_setup(main_window *widgets); +void yon_kernel_addon_init(main_window *widgets); void yon_kernel_addon_resize(main_window *widgets); -void yon_startup_services_setup(main_window *widgets); +void yon_startup_services_init(main_window *widgets); void on_srartup_services_toggled(GtkCellRenderer *, char *path, main_window *widgets); void on_startup_service_edit(GtkWidget *, main_window *widgets); void on_startup_service_add(GtkWidget *, main_window *widgets); startup_service_window *yon_startup_service_window_new(); void on_startup_edit_accept(GtkWidget *, main_window *widgets); void on_startup_add_accept(GtkWidget *, main_window *widgets); -void yon_startup_services_setup(main_window *widgets); +void yon_startup_services_init(main_window *widgets); void on_startup_services_remove(GtkWidget *self, main_window *widgets); void on_startup_services_selection_changed(GtkWidget *, main_window *widgets); void on_pacman_software_all_toggled(GtkWidget *, char *path, main_window *widgets); @@ -1493,7 +1493,7 @@ gboolean on_install_slider_slide(main_window *widgets); void on_srartup_apps_toggled(GtkWidget *, char *path, main_window *widgets); void on_startup_apps_selection_changed(GtkWidget *, main_window *widgets); void on_startup_apps_remove(GtkWidget *self, main_window *widgets); -void yon_startup_apps_setup(main_window *widgets); +void yon_startup_apps_init(main_window *widgets); void on_startup_app_add_accept(GtkWidget *self, main_window *widgets); void on_startup_app_edit_accept(GtkWidget *self, main_window *widgets); startup_service_window *yon_startup_app_window_new();