From d6fecf5e70319161677afbc75fa059d13fd37256 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 13 Jan 2025 17:24:05 +0600 Subject: [PATCH 01/22] Fixed custom config loading --- source/ubl-settings-kernel.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c index 002f035..4b875d3 100644 --- a/source/ubl-settings-kernel.c +++ b/source/ubl-settings-kernel.c @@ -28,7 +28,9 @@ void on_save_done(main_window *, config_str output, int size){ } void yon_load_proceed(YON_CONFIG_TYPE type){ - yon_config_clean(); + if (type!=YON_CONFIG_CUSTOM){ + yon_config_clean(); + } if (!yon_char_is_empty(config_get_default_command)) yon_config_load_config(YON_CONFIG_DEFAULT,config_get_default_command,NULL); if (type==YON_CONFIG_GLOBAL){ @@ -57,6 +59,7 @@ void yon_load_proceed(YON_CONFIG_TYPE type){ } else { gtk_widget_destroy(dialog); } + yon_config_clean(); char *command = yon_config_get_custom_command(path); yon_config_load_config(type,command,NULL); } -- 2.35.1 From 43cfe514231c74c637fe2f32c81d076ce0fdfde8 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 5 Feb 2025 13:37:44 +0600 Subject: [PATCH 02/22] Fixed crash --- source/ubl-settings-kernel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c index 4b875d3..652416a 100644 --- a/source/ubl-settings-kernel.c +++ b/source/ubl-settings-kernel.c @@ -1535,6 +1535,8 @@ void yon_main_window_complete(main_window *widgets){ // yon_gtk_scrolled_window_set_horizontal_at_desired_size(widgets->Window,GTK_SCROLLED_WINDOW(gtk_widget_get_parent(gtk_widget_get_parent(widgets->KernelsPackageBox)))); // yon_gtk_scrolled_window_set_horizontal_at_desired_size(widgets->Window,GTK_SCROLLED_WINDOW(gtk_widget_get_parent(gtk_widget_get_parent(widgets->AdditionsPackageBox)))); + char *path = yon_char_unite(yon_ubl_user_get_home_directory(),"/.config/",LocaleName,"/",LocaleName,".conf",NULL); + yon_window_config_load(path); int paned_pos=0; if (yon_window_config_get_parameter("settings","paned_pos",&paned_pos,YON_TYPE_INT)) { gtk_paned_set_position(GTK_PANED(widgets->TerminalPaned),paned_pos); @@ -1577,8 +1579,6 @@ int main(int argc, char *argv[]){ gtk_init(&argc,&argv); template_main_window *widgets = yon_ubl_window_setup(); yon_main_window_complete((main_window*)widgets); - char *path = yon_char_unite(yon_ubl_user_get_home_directory(),"/.config/",LocaleName,"/",LocaleName,".conf",NULL); - yon_window_config_load(path); main_config.launch_arguments=yon_char_parsed_copy(argv,argc); main_config.launch_size=argc; if (getuid()!=0){ -- 2.35.1 From 80c79ccb6812b64d32847e8727a08939f556f632 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 27 Feb 2025 13:58:33 +0600 Subject: [PATCH 03/22] Crash fix --- source/ubl-settings-kernel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c index 652416a..e135d6c 100644 --- a/source/ubl-settings-kernel.c +++ b/source/ubl-settings-kernel.c @@ -265,7 +265,7 @@ gboolean yon_tab_create_tags(kernels_tab *tab){ yon_char_remove_last_symbol(boot_run[0],'\n'); } - if ((!(launched&&!strcmp(tab->package,launched))&&(strcmp(tab->package,boot_run[0])))){ + if ((!(launched&&!strcmp(tab->package,launched))&&(boot_run&&!yon_char_is_empty(boot_run[0])&&strcmp(tab->package,boot_run[0])))){ gtk_widget_show(tab->launch_button); } else { gtk_widget_hide(tab->launch_button); -- 2.35.1 From 43624b2a07ecfb890d983da05e87af5ff2b936d7 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 27 Feb 2025 14:57:44 +0600 Subject: [PATCH 04/22] Fixed 'Nothing to save' satus message was hidden by another message --- source/ubl-settings-kernel.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c index e135d6c..ee901c3 100644 --- a/source/ubl-settings-kernel.c +++ b/source/ubl-settings-kernel.c @@ -65,35 +65,31 @@ void yon_load_proceed(YON_CONFIG_TYPE type){ } } -void on_config_save(GtkWidget *, main_window *widgets){ +void on_config_save(GtkWidget *, main_window *){ main_config.save_config=2; template_saving_window *window = yon_save_proceed(NULL,YON_CONFIG_BOTH,yon_config_get_custom_command("global"),NULL); if (window){}; - on_update_clicked(NULL,widgets); } -void on_config_global_save(GtkWidget *, main_window *widgets){ +void on_config_global_save(GtkWidget *, main_window *){ main_config.save_config=0; template_saving_window *window = yon_save_proceed("global",YON_CONFIG_GLOBAL,yon_config_get_custom_command("global"),NULL); if (window){}; - on_update_clicked(NULL,widgets); } -void on_config_local_save(GtkWidget *, main_window *widgets){ +void on_config_local_save(GtkWidget *, main_window *){ main_config.save_config=1; template_saving_window *window = yon_save_proceed("system",YON_CONFIG_LOCAL,yon_config_get_custom_command("system"),NULL); if (window){}; - on_update_clicked(NULL,widgets); } -void on_config_custom_save(GtkWidget *, main_window *widgets){ +void on_config_custom_save(GtkWidget *, main_window *){ main_config.save_config=1; template_saving_window *window = yon_save_proceed(NULL,YON_CONFIG_CUSTOM,yon_config_get_custom_command("system"),NULL); if (window){}; - on_update_clicked(NULL,widgets); } @@ -600,8 +596,8 @@ void *yon_command_execute_async(char *command,main_window *widgets){ dictionary *dict = NULL; if (main_config.kernel_tabs){ for_dictionaries(dict,main_config.kernel_tabs){ - gtk_widget_set_sensitive(((kernels_tab*)dict->data)->update_module_button,0); - gtk_widget_set_sensitive(((kernels_tab*)dict->data)->update_package_button,0); + gtk_widget_set_sensitive(((kernels_tab*)dict->data)->update_module_button,1); + gtk_widget_set_sensitive(((kernels_tab*)dict->data)->update_package_button,1); gtk_widget_set_sensitive(((kernels_tab*)dict->data)->install_module_button,0); gtk_widget_set_sensitive(((kernels_tab*)dict->data)->install_package_button,0); gtk_widget_set_sensitive(((kernels_tab*)dict->data)->remove_module_button,0); @@ -610,8 +606,8 @@ void *yon_command_execute_async(char *command,main_window *widgets){ } if (main_config.addition_tabs){ for_dictionaries(dict,main_config.addition_tabs){ - gtk_widget_set_sensitive(((kernels_tab*)dict->data)->update_module_button,0); - gtk_widget_set_sensitive(((kernels_tab*)dict->data)->update_package_button,0); + gtk_widget_set_sensitive(((kernels_tab*)dict->data)->update_module_button,1); + gtk_widget_set_sensitive(((kernels_tab*)dict->data)->update_package_button,1); gtk_widget_set_sensitive(((kernels_tab*)dict->data)->install_module_button,0); gtk_widget_set_sensitive(((kernels_tab*)dict->data)->install_package_button,0); gtk_widget_set_sensitive(((kernels_tab*)dict->data)->remove_module_button,0); -- 2.35.1 From f6ed9d8919626e908b84004a92ab0c8a7fde2347 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 27 Feb 2025 15:00:26 +0600 Subject: [PATCH 05/22] Fixed visited links --- ubl-settings-kernel-additions-table-row.glade | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ubl-settings-kernel-additions-table-row.glade b/ubl-settings-kernel-additions-table-row.glade index be18cdd..e1fb0fa 100644 --- a/ubl-settings-kernel-additions-table-row.glade +++ b/ubl-settings-kernel-additions-table-row.glade @@ -95,6 +95,7 @@ False Module True + False 0 @@ -135,6 +136,7 @@ False Package True + False 0 -- 2.35.1 From 887599a65b85785fa4950ea5a9f6977e47a3377f Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 27 Feb 2025 15:24:55 +0600 Subject: [PATCH 06/22] Button sensitivity fixed when launched without root --- source/ubl-settings-kernel.c | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c index ee901c3..67db608 100644 --- a/source/ubl-settings-kernel.c +++ b/source/ubl-settings-kernel.c @@ -503,20 +503,24 @@ gboolean on_command_execute_success(GtkWidget *,gint status,main_window *widgets gtk_widget_set_sensitive(widgets->UpdateButton,1); dictionary *dict = NULL; for_dictionaries(dict,main_config.kernel_tabs){ - gtk_widget_set_sensitive(((kernels_tab*)dict->data)->update_module_button,1); - gtk_widget_set_sensitive(((kernels_tab*)dict->data)->update_package_button,1); - gtk_widget_set_sensitive(((kernels_tab*)dict->data)->install_module_button,1); - gtk_widget_set_sensitive(((kernels_tab*)dict->data)->install_package_button,1); - gtk_widget_set_sensitive(((kernels_tab*)dict->data)->remove_module_button,1); - gtk_widget_set_sensitive(((kernels_tab*)dict->data)->remove_package_button,1); + if (!getuid()){ + gtk_widget_set_sensitive(((kernels_tab*)dict->data)->update_module_button,1); + gtk_widget_set_sensitive(((kernels_tab*)dict->data)->update_package_button,1); + gtk_widget_set_sensitive(((kernels_tab*)dict->data)->install_module_button,1); + gtk_widget_set_sensitive(((kernels_tab*)dict->data)->install_package_button,1); + gtk_widget_set_sensitive(((kernels_tab*)dict->data)->remove_module_button,1); + gtk_widget_set_sensitive(((kernels_tab*)dict->data)->remove_package_button,1); + } } for_dictionaries(dict,main_config.addition_tabs){ - gtk_widget_set_sensitive(((kernels_tab*)dict->data)->update_module_button,1); - gtk_widget_set_sensitive(((kernels_tab*)dict->data)->update_package_button,1); - gtk_widget_set_sensitive(((kernels_tab*)dict->data)->install_module_button,1); - gtk_widget_set_sensitive(((kernels_tab*)dict->data)->install_package_button,1); - gtk_widget_set_sensitive(((kernels_tab*)dict->data)->remove_module_button,1); - gtk_widget_set_sensitive(((kernels_tab*)dict->data)->remove_package_button,1); + if (!getuid()){ + gtk_widget_set_sensitive(((kernels_tab*)dict->data)->update_module_button,1); + gtk_widget_set_sensitive(((kernels_tab*)dict->data)->update_package_button,1); + gtk_widget_set_sensitive(((kernels_tab*)dict->data)->install_module_button,1); + gtk_widget_set_sensitive(((kernels_tab*)dict->data)->install_package_button,1); + gtk_widget_set_sensitive(((kernels_tab*)dict->data)->remove_module_button,1); + gtk_widget_set_sensitive(((kernels_tab*)dict->data)->remove_package_button,1); + } } { gtk_button_set_label(GTK_BUTTON(widgets->MoreButton),MORE_LABEL); @@ -1251,6 +1255,14 @@ additions_kernels_tab *yon_additions_tab_row_new(GtkListBox *target, char *targe g_signal_connect(G_OBJECT(tab->module_label),"activate-link",G_CALLBACK(on_info_clicked),tab); g_signal_connect(G_OBJECT(tab->package_label),"activate-link",G_CALLBACK(on_info_clicked),tab); + if(getuid()){ + gtk_widget_set_sensitive(tab->launch_button,0); + gtk_widget_set_sensitive(tab->remove_module_button,0); + gtk_widget_set_sensitive(tab->install_module_button,0); + gtk_widget_set_sensitive(tab->remove_package_button,0); + gtk_widget_set_sensitive(tab->install_package_button,0); + } + gtk_list_box_insert(target,tab->main_box,-1); tab->name = yon_char_new(parsed[0]); -- 2.35.1 From f5fb8bb3ce9b89e5163f318dea62be363f6a1a6f Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 27 Feb 2025 18:02:19 +0600 Subject: [PATCH 07/22] Fixed crash --- source/ubl-settings-kernel.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c index 67db608..9cdf948 100644 --- a/source/ubl-settings-kernel.c +++ b/source/ubl-settings-kernel.c @@ -909,6 +909,9 @@ void on_module_remove_clicked(GtkWidget *self,dictionary *dict){ kernels_tab *tab = yon_dictionary_get_data(dict->first->next,kernels_tab*); int size; config_str cnf = yon_config_load(SAVE_MODE_GET_COMMAND,&size); + if (!cnf){ + cnf = yon_char_parsed_new(&size,"changes",NULL); + } yon_char_remove_last_symbol(cnf[0],'\n'); SAVE_MODE_TYPE type = yon_ubl_save_mode_get_type(cnf[0]); int installed_kernels=0; -- 2.35.1 From 49d997c71a5989a0d401d6140520da9931027cdd Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 27 Feb 2025 18:22:36 +0600 Subject: [PATCH 08/22] Update package buttons labels fix --- source/ubl-settings-kernel.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c index 9cdf948..261e2c4 100644 --- a/source/ubl-settings-kernel.c +++ b/source/ubl-settings-kernel.c @@ -600,8 +600,8 @@ void *yon_command_execute_async(char *command,main_window *widgets){ dictionary *dict = NULL; if (main_config.kernel_tabs){ for_dictionaries(dict,main_config.kernel_tabs){ - gtk_widget_set_sensitive(((kernels_tab*)dict->data)->update_module_button,1); - gtk_widget_set_sensitive(((kernels_tab*)dict->data)->update_package_button,1); + gtk_widget_set_sensitive(((kernels_tab*)dict->data)->update_module_button,0); + gtk_widget_set_sensitive(((kernels_tab*)dict->data)->update_package_button,0); gtk_widget_set_sensitive(((kernels_tab*)dict->data)->install_module_button,0); gtk_widget_set_sensitive(((kernels_tab*)dict->data)->install_package_button,0); gtk_widget_set_sensitive(((kernels_tab*)dict->data)->remove_module_button,0); @@ -610,8 +610,8 @@ void *yon_command_execute_async(char *command,main_window *widgets){ } if (main_config.addition_tabs){ for_dictionaries(dict,main_config.addition_tabs){ - gtk_widget_set_sensitive(((kernels_tab*)dict->data)->update_module_button,1); - gtk_widget_set_sensitive(((kernels_tab*)dict->data)->update_package_button,1); + gtk_widget_set_sensitive(((kernels_tab*)dict->data)->update_module_button,0); + gtk_widget_set_sensitive(((kernels_tab*)dict->data)->update_package_button,0); gtk_widget_set_sensitive(((kernels_tab*)dict->data)->install_module_button,0); gtk_widget_set_sensitive(((kernels_tab*)dict->data)->install_package_button,0); gtk_widget_set_sensitive(((kernels_tab*)dict->data)->remove_module_button,0); @@ -871,10 +871,14 @@ void on_package_install_clicked(GtkWidget *self,dictionary *dict){ yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window); if (gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))){ + gtk_label_set_text(GTK_LABEL(window->HeadLabel),self==tab->update_package_button?UPDATE_ADDITION_PACKAGE_TITLE_LABEL:INSTALL_ADDITION_PACKAGE_TITLE_LABEL); + gtk_label_set_text(GTK_LABEL(window->TopicLabel),ADDITION_PACKAGE_UPDATE_CONFIRMATION_LABEL(tab->package)); yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),self==tab->update_package_button?UPDATE_PACKAGE_TITLE_LABEL:INSTALL_PACKAGE_TITLE_LABEL,icon_path,"additions_dialog"); gtk_widget_hide(window->DependencesFrame); gtk_box_set_child_packing(GTK_BOX(gtk_widget_get_parent(window->DependencesFrame)),gtk_widget_get_parent(gtk_widget_get_parent(window->TopicLabel)),1,1,0,GTK_PACK_START); } else { + gtk_label_set_text(GTK_LABEL(window->HeadLabel),self==tab->update_package_button?UPDATE_PACKAGE_TITLE_LABEL:INSTALL_PACKAGE_TITLE_LABEL); + gtk_label_set_text(GTK_LABEL(window->TopicLabel),KERNEL_PACKAGE_UPDATE_CONFIRMATION_LABEL(tab->package)); yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),self==tab->update_package_button?UPDATE_PACKAGE_TITLE_LABEL:INSTALL_PACKAGE_TITLE_LABEL,icon_path,"dialog"); int size; config_str additions = yon_resource_open_file(kernels_addon_path,&size); -- 2.35.1 From 167aa1fe551f3d185617584958f92665334c1d34 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 28 Feb 2025 10:58:40 +0600 Subject: [PATCH 09/22] Fixed update windows --- source/ubl-settings-kernel.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c index 261e2c4..8dd612c 100644 --- a/source/ubl-settings-kernel.c +++ b/source/ubl-settings-kernel.c @@ -823,20 +823,24 @@ void on_module_install_clicked(GtkWidget *self,dictionary *dict){ gtk_widget_hide(window->DependencesFrame); gtk_box_set_child_packing(GTK_BOX(gtk_widget_get_parent(window->DependencesFrame)),gtk_widget_get_parent(gtk_widget_get_parent(window->TopicLabel)),1,1,0,GTK_PACK_START); } else { - int size; - config_str additions = yon_resource_open_file(kernels_addon_path,&size); - GtkTreeIter iter; - for (int i=0;imodule_requirements_size;i++){ - gtk_list_store_append(window->liststore1,&iter); - for (int j=1;jmodule_requirements[i])) - gtk_list_store_set(window->liststore1,&iter,1,parsed[1],2,parsed[3],4,1,-1); - yon_char_parsed_free(parsed,cur_size); + if (self!=tab->update_module_button){ + int size; + config_str additions = yon_resource_open_file(kernels_addon_path,&size); + GtkTreeIter iter; + for (int i=0;imodule_requirements_size;i++){ + gtk_list_store_append(window->liststore1,&iter); + for (int j=1;jmodule_requirements[i])) + gtk_list_store_set(window->liststore1,&iter,1,parsed[1],2,parsed[3],4,1,-1); + yon_char_parsed_free(parsed,cur_size); + } } + yon_char_parsed_free(additions,size); + } else { + gtk_widget_hide(window->DependencesFrame); } - yon_char_parsed_free(additions,size); } } @@ -880,6 +884,7 @@ void on_package_install_clicked(GtkWidget *self,dictionary *dict){ gtk_label_set_text(GTK_LABEL(window->HeadLabel),self==tab->update_package_button?UPDATE_PACKAGE_TITLE_LABEL:INSTALL_PACKAGE_TITLE_LABEL); gtk_label_set_text(GTK_LABEL(window->TopicLabel),KERNEL_PACKAGE_UPDATE_CONFIRMATION_LABEL(tab->package)); yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),self==tab->update_package_button?UPDATE_PACKAGE_TITLE_LABEL:INSTALL_PACKAGE_TITLE_LABEL,icon_path,"dialog"); + if (self!=tab->update_package_button){ int size; config_str additions = yon_resource_open_file(kernels_addon_path,&size); GtkTreeIter iter; @@ -895,6 +900,9 @@ void on_package_install_clicked(GtkWidget *self,dictionary *dict){ gtk_list_store_set(window->liststore1,&iter,0,1,1,tab->package_requirements[i],4,1,-1); } yon_char_parsed_free(additions,size); + } else { + gtk_widget_hide(window->DependencesFrame); + } } } -- 2.35.1 From bf62fc28d17e3dbeb57a1e929a3906d859e4b16a Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 28 Feb 2025 11:17:04 +0600 Subject: [PATCH 10/22] Fixed update window size and position saving --- source/ubl-settings-kernel.c | 65 +++++++++++++++++------------------- 1 file changed, 31 insertions(+), 34 deletions(-) diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c index 8dd612c..6c4a2ac 100644 --- a/source/ubl-settings-kernel.c +++ b/source/ubl-settings-kernel.c @@ -806,11 +806,11 @@ void on_module_install_clicked(GtkWidget *self,dictionary *dict){ } } else { if (!gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))){ - yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),self==tab->update_package_button?UPDATE_MODULE_TITLE_LABEL:INSTALL_MODULE_TITLE_LABEL,icon_path,"dialog"); + yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),self==tab->update_package_button?UPDATE_MODULE_TITLE_LABEL:INSTALL_MODULE_TITLE_LABEL,icon_path,self==tab->update_package_button?"update_dialog":"dialog"); action_text = KERNEL_MODULE_INSTALL_CONFIRMATION_LABEL(tab->name); gtk_label_set_text(GTK_LABEL(window->HeadLabel),INSTALL_MODULE_TITLE_LABEL); } else { - yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),self==tab->update_package_button?UPDATE_MODULE_TITLE_LABEL:INSTALL_MODULE_TITLE_LABEL,icon_path,"additions_dialog"); + yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),self==tab->update_package_button?UPDATE_MODULE_TITLE_LABEL:INSTALL_MODULE_TITLE_LABEL,icon_path,self==tab->update_package_button?"update_dialog":"additions_dialog"); action_text = ADDITION_MODULE_INSTALL_CONFIRMATION_LABEL(tab->name); gtk_label_set_text(GTK_LABEL(window->HeadLabel),INSTALL_ADDITION_MODULE_TITLE_LABEL); } @@ -819,28 +819,24 @@ void on_module_install_clicked(GtkWidget *self,dictionary *dict){ gtk_label_set_text(GTK_LABEL(window->TopicLabel),action_text); gtk_widget_show(window->Window); yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window); - if (gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))){ + if (gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))||self==tab->update_module_button){ gtk_widget_hide(window->DependencesFrame); gtk_box_set_child_packing(GTK_BOX(gtk_widget_get_parent(window->DependencesFrame)),gtk_widget_get_parent(gtk_widget_get_parent(window->TopicLabel)),1,1,0,GTK_PACK_START); } else { - if (self!=tab->update_module_button){ - int size; - config_str additions = yon_resource_open_file(kernels_addon_path,&size); - GtkTreeIter iter; - for (int i=0;imodule_requirements_size;i++){ - gtk_list_store_append(window->liststore1,&iter); - for (int j=1;jmodule_requirements[i])) - gtk_list_store_set(window->liststore1,&iter,1,parsed[1],2,parsed[3],4,1,-1); - yon_char_parsed_free(parsed,cur_size); - } + int size; + config_str additions = yon_resource_open_file(kernels_addon_path,&size); + GtkTreeIter iter; + for (int i=0;imodule_requirements_size;i++){ + gtk_list_store_append(window->liststore1,&iter); + for (int j=1;jmodule_requirements[i])) + gtk_list_store_set(window->liststore1,&iter,1,parsed[1],2,parsed[3],4,1,-1); + yon_char_parsed_free(parsed,cur_size); } - yon_char_parsed_free(additions,size); - } else { - gtk_widget_hide(window->DependencesFrame); } + yon_char_parsed_free(additions,size); } } @@ -883,24 +879,25 @@ void on_package_install_clicked(GtkWidget *self,dictionary *dict){ } else { gtk_label_set_text(GTK_LABEL(window->HeadLabel),self==tab->update_package_button?UPDATE_PACKAGE_TITLE_LABEL:INSTALL_PACKAGE_TITLE_LABEL); gtk_label_set_text(GTK_LABEL(window->TopicLabel),KERNEL_PACKAGE_UPDATE_CONFIRMATION_LABEL(tab->package)); - yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),self==tab->update_package_button?UPDATE_PACKAGE_TITLE_LABEL:INSTALL_PACKAGE_TITLE_LABEL,icon_path,"dialog"); if (self!=tab->update_package_button){ - int size; - config_str additions = yon_resource_open_file(kernels_addon_path,&size); - GtkTreeIter iter; - for (int i=0;ipackage_requirements_size;i++){ - gtk_list_store_append(window->liststore1,&iter); - for (int j=1;jpackage_requirements[i])) - gtk_list_store_set(window->liststore1,&iter,2,parsed[3],-1); - yon_char_parsed_free(parsed,cur_size); + yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),INSTALL_PACKAGE_TITLE_LABEL,icon_path,"dialog"); + int size; + config_str additions = yon_resource_open_file(kernels_addon_path,&size); + GtkTreeIter iter; + for (int i=0;ipackage_requirements_size;i++){ + gtk_list_store_append(window->liststore1,&iter); + for (int j=1;jpackage_requirements[i])) + gtk_list_store_set(window->liststore1,&iter,2,parsed[3],-1); + yon_char_parsed_free(parsed,cur_size); + } + gtk_list_store_set(window->liststore1,&iter,0,1,1,tab->package_requirements[i],4,1,-1); } - gtk_list_store_set(window->liststore1,&iter,0,1,1,tab->package_requirements[i],4,1,-1); - } - yon_char_parsed_free(additions,size); + yon_char_parsed_free(additions,size); } else { + yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),UPDATE_PACKAGE_TITLE_LABEL,icon_path,"update_dialog"); gtk_widget_hide(window->DependencesFrame); } -- 2.35.1 From d6f0d6e61300e0f2feecbe316d6b37b79bcef5f8 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 28 Feb 2025 12:14:41 +0600 Subject: [PATCH 11/22] Test fix for crash --- source/ubl-settings-kernel.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c index 6c4a2ac..355927f 100644 --- a/source/ubl-settings-kernel.c +++ b/source/ubl-settings-kernel.c @@ -280,8 +280,8 @@ gboolean yon_tab_create_tags(kernels_tab *tab){ gtk_widget_show(tab->changelog_button); } } - gtk_widget_set_sensitive(tab->update_module_button,!tab->module_updated); - gtk_widget_set_sensitive(tab->update_package_button,!tab->package_updated); + gtk_widget_set_sensitive(tab->update_module_button,tab->module_updated); + gtk_widget_set_sensitive(tab->update_package_button,tab->package_updated); } else { yon_tag_add(GTK_BOX(tab->install_tags_box),UNKNOWN_LABEL,"tag_grey",NULL); } @@ -681,8 +681,6 @@ void on_package_install_accept(GtkWidget *, dictionary *dict){ char *command = install_command(modules_to_install); yon_command_execute_async(command,widgets); tab->package_installed=1; - free(dict->first->next->next); - dict->first->next->next=NULL; on_subwindow_close(window->Window); } @@ -818,6 +816,10 @@ void on_module_install_clicked(GtkWidget *self,dictionary *dict){ gtk_label_set_text(GTK_LABEL(window->TopicLabel),action_text); gtk_widget_show(window->Window); + if (dict->first->next->next) { + yon_dictionary_free(dict->first->next->next); + dict->first->next->next=NULL; + } yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window); if (gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))||self==tab->update_module_button){ gtk_widget_hide(window->DependencesFrame); @@ -868,6 +870,10 @@ void on_package_install_clicked(GtkWidget *self,dictionary *dict){ gtk_label_set_markup(GTK_LABEL(window->TopicLabel),action_text); gtk_widget_show(window->Window); + if (dict->first->next->next) { + yon_dictionary_free(dict->first->next->next); + dict->first->next->next=NULL; + } yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window); if (gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))){ -- 2.35.1 From 81086814d262e9876151065b93920dcbd0c111cf Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 28 Feb 2025 14:58:14 +0600 Subject: [PATCH 12/22] Fixed launch button --- source/ubl-settings-kernel.c | 4 ++++ ubl-settings-kernel_ru.po | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c index 355927f..6789aa6 100644 --- a/source/ubl-settings-kernel.c +++ b/source/ubl-settings-kernel.c @@ -263,6 +263,10 @@ gboolean yon_tab_create_tags(kernels_tab *tab){ if ((!(launched&&!strcmp(tab->package,launched))&&(boot_run&&!yon_char_is_empty(boot_run[0])&&strcmp(tab->package,boot_run[0])))){ gtk_widget_show(tab->launch_button); + } + else if (launched&&(strcmp(tab->package,launched))&&(boot_run&&boot_run[0]&&!strcmp(tab->package,boot_run[0]))){ + gtk_widget_show(tab->launch_button); + yon_tag_add(GTK_BOX(tab->install_tags_box),RUNNING_LABEL,"tag_green",NULL); } else { gtk_widget_hide(tab->launch_button); if(!getuid()){ diff --git a/ubl-settings-kernel_ru.po b/ubl-settings-kernel_ru.po index dd85158..05a241e 100644 --- a/ubl-settings-kernel_ru.po +++ b/ubl-settings-kernel_ru.po @@ -231,7 +231,7 @@ msgstr "Вы хотите обновить пакет с модулем ядра #: source/ubl-strings.h:67 msgid "Are you sure want to update kernel package" -msgstr "Вы действительно хотите обновить пакет с ядром " +msgstr "Вы действительно хотите обновить пакет с ядром" #: source/ubl-strings.h:68 msgid "Are you sure want to remove kernel module" -- 2.35.1 From fc3b61dfe544939e638c511841b22edc039e4cec Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 28 Feb 2025 15:48:37 +0600 Subject: [PATCH 13/22] Fixed space --- ubl-settings-kernel_ru.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubl-settings-kernel_ru.po b/ubl-settings-kernel_ru.po index 05a241e..95df04d 100644 --- a/ubl-settings-kernel_ru.po +++ b/ubl-settings-kernel_ru.po @@ -227,7 +227,7 @@ msgstr "Вы хотите установить в систему пакет с #: source/ubl-strings.h:66 msgid "Are you sure want to update kernel module" -msgstr "Вы хотите обновить пакет с модулем ядра" +msgstr "Вы действительно хотите обновить пакет с модулем ядра" #: source/ubl-strings.h:67 msgid "Are you sure want to update kernel package" -- 2.35.1 From 07c7ed582ace55aaff13f4994c9191e74c045620 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 28 Feb 2025 17:16:19 +0600 Subject: [PATCH 14/22] Fixed launch button --- source/ubl-settings-kernel.c | 2 +- source/ubl-settings-kernel.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c index 6789aa6..3298e84 100644 --- a/source/ubl-settings-kernel.c +++ b/source/ubl-settings-kernel.c @@ -1113,7 +1113,7 @@ void on_launch_cliked(GtkWidget *self,dictionary *dict){ data->function = NULL; data->data = NULL; if (yon_confirmation_dialog_call(self,data) == GTK_RESPONSE_ACCEPT){ - yon_config_set(KERNEL_BOOT_parameter,tab->package); + yon_config_register(KERNEL_BOOT_parameter,KERNEL_BOOT_command,tab->package); on_update_clicked(NULL,widgets); } diff --git a/source/ubl-settings-kernel.h b/source/ubl-settings-kernel.h index e006606..f4ad367 100644 --- a/source/ubl-settings-kernel.h +++ b/source/ubl-settings-kernel.h @@ -69,6 +69,7 @@ #define config_get_local_only_parameters "" #define KERNEL_BOOT_parameter "KERNEL_BOOT" +#define KERNEL_BOOT_command "ubconfig --source global get boot KERNEL_BOOT" typedef char* string; string version_application; -- 2.35.1 From 8590877c8702b59ade79e33f4ab00b20e8294cec Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 28 Feb 2025 17:33:03 +0600 Subject: [PATCH 15/22] Module update window position and size saving and loading fix --- source/ubl-settings-kernel.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c index 3298e84..32704cd 100644 --- a/source/ubl-settings-kernel.c +++ b/source/ubl-settings-kernel.c @@ -798,6 +798,7 @@ void on_module_install_clicked(GtkWidget *self,dictionary *dict){ g_signal_connect(G_OBJECT(window->AcceptButton),"clicked",G_CALLBACK(on_module_install_accept),dict); if (self == tab->update_module_button){ + yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),UPDATE_MODULE_TITLE_LABEL,icon_path,"update_dialog"); if (!gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))){ action_text = KERNEL_MODULE_UPDATE_CONFIRMATION_LABEL(tab->name); gtk_label_set_text(GTK_LABEL(window->HeadLabel),UPDATE_MODULE_TITLE_LABEL); @@ -808,11 +809,11 @@ void on_module_install_clicked(GtkWidget *self,dictionary *dict){ } } else { if (!gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))){ - yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),self==tab->update_package_button?UPDATE_MODULE_TITLE_LABEL:INSTALL_MODULE_TITLE_LABEL,icon_path,self==tab->update_package_button?"update_dialog":"dialog"); + yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),INSTALL_MODULE_TITLE_LABEL,icon_path,"dialog"); action_text = KERNEL_MODULE_INSTALL_CONFIRMATION_LABEL(tab->name); gtk_label_set_text(GTK_LABEL(window->HeadLabel),INSTALL_MODULE_TITLE_LABEL); } else { - yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),self==tab->update_package_button?UPDATE_MODULE_TITLE_LABEL:INSTALL_MODULE_TITLE_LABEL,icon_path,self==tab->update_package_button?"update_dialog":"additions_dialog"); + yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),INSTALL_MODULE_TITLE_LABEL,icon_path,"additions_dialog"); action_text = ADDITION_MODULE_INSTALL_CONFIRMATION_LABEL(tab->name); gtk_label_set_text(GTK_LABEL(window->HeadLabel),INSTALL_ADDITION_MODULE_TITLE_LABEL); } -- 2.35.1 From 11a3808cca9ec3582c211435fed2736db533d92a Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 28 Feb 2025 17:41:40 +0600 Subject: [PATCH 16/22] Fixed update checking --- source/ubl-settings-kernel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c index 32704cd..f8d455a 100644 --- a/source/ubl-settings-kernel.c +++ b/source/ubl-settings-kernel.c @@ -284,8 +284,8 @@ gboolean yon_tab_create_tags(kernels_tab *tab){ gtk_widget_show(tab->changelog_button); } } - gtk_widget_set_sensitive(tab->update_module_button,tab->module_updated); - gtk_widget_set_sensitive(tab->update_package_button,tab->package_updated); + gtk_widget_set_sensitive(tab->update_module_button,!tab->module_updated); + gtk_widget_set_sensitive(tab->update_package_button,!tab->package_updated); } else { yon_tag_add(GTK_BOX(tab->install_tags_box),UNKNOWN_LABEL,"tag_grey",NULL); } -- 2.35.1 From 827f9f4fa19bc291e245e0f8b890c076fb697a94 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 28 Feb 2025 18:13:36 +0600 Subject: [PATCH 17/22] Fixed update windows text anign --- source/ubl-settings-kernel.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c index f8d455a..b3f0308 100644 --- a/source/ubl-settings-kernel.c +++ b/source/ubl-settings-kernel.c @@ -284,8 +284,8 @@ gboolean yon_tab_create_tags(kernels_tab *tab){ gtk_widget_show(tab->changelog_button); } } - gtk_widget_set_sensitive(tab->update_module_button,!tab->module_updated); - gtk_widget_set_sensitive(tab->update_package_button,!tab->package_updated); + gtk_widget_set_sensitive(tab->update_module_button,tab->module_updated); + gtk_widget_set_sensitive(tab->update_package_button,tab->package_updated); } else { yon_tag_add(GTK_BOX(tab->install_tags_box),UNKNOWN_LABEL,"tag_grey",NULL); } @@ -827,6 +827,7 @@ void on_module_install_clicked(GtkWidget *self,dictionary *dict){ } yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window); if (gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))||self==tab->update_module_button){ + gtk_widget_hide(window->DependencesFrame); gtk_box_set_child_packing(GTK_BOX(gtk_widget_get_parent(window->DependencesFrame)),gtk_widget_get_parent(gtk_widget_get_parent(window->TopicLabel)),1,1,0,GTK_PACK_START); } else { @@ -908,6 +909,7 @@ void on_package_install_clicked(GtkWidget *self,dictionary *dict){ } yon_char_parsed_free(additions,size); } else { + gtk_box_set_child_packing(GTK_BOX(gtk_widget_get_parent(window->DependencesFrame)),gtk_widget_get_parent(gtk_widget_get_parent(window->TopicLabel)),1,1,0,GTK_PACK_START); yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),UPDATE_PACKAGE_TITLE_LABEL,icon_path,"update_dialog"); gtk_widget_hide(window->DependencesFrame); } -- 2.35.1 From 3785bc924d2d43fa5213a9def4b6652e40d68c52 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 3 Mar 2025 11:23:04 +0600 Subject: [PATCH 18/22] Test fix for update window margin --- source/ubl-settings-kernel.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c index b3f0308..007026a 100644 --- a/source/ubl-settings-kernel.c +++ b/source/ubl-settings-kernel.c @@ -798,6 +798,7 @@ void on_module_install_clicked(GtkWidget *self,dictionary *dict){ g_signal_connect(G_OBJECT(window->AcceptButton),"clicked",G_CALLBACK(on_module_install_accept),dict); if (self == tab->update_module_button){ + gtk_widget_set_margin_start(gtk_widget_get_parent(window->TopicLabel),10); yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),UPDATE_MODULE_TITLE_LABEL,icon_path,"update_dialog"); if (!gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))){ action_text = KERNEL_MODULE_UPDATE_CONFIRMATION_LABEL(tab->name); @@ -856,7 +857,7 @@ void on_package_install_clicked(GtkWidget *self,dictionary *dict){ dialog_window *window = yon_dialog_window_new(); g_signal_connect(G_OBJECT(window->AcceptButton),"clicked",G_CALLBACK(on_package_install_accept),dict); - if (self == tab->update_module_button){ + if (self == tab->update_package_button){ if (!gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))){ action_text = KERNEL_PACKAGE_UPDATE_CONFIRMATION_LABEL(tab->name); gtk_label_set_text(GTK_LABEL(window->HeadLabel),UPDATE_PACKAGE_TITLE_LABEL); @@ -909,8 +910,9 @@ void on_package_install_clicked(GtkWidget *self,dictionary *dict){ } yon_char_parsed_free(additions,size); } else { - gtk_box_set_child_packing(GTK_BOX(gtk_widget_get_parent(window->DependencesFrame)),gtk_widget_get_parent(gtk_widget_get_parent(window->TopicLabel)),1,1,0,GTK_PACK_START); - yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),UPDATE_PACKAGE_TITLE_LABEL,icon_path,"update_dialog"); + gtk_widget_set_margin_start(gtk_widget_get_parent(window->TopicLabel),10); + gtk_box_set_child_packing(GTK_BOX(gtk_widget_get_parent(window->DependencesFrame)),gtk_widget_get_parent(gtk_widget_get_parent(window->TopicLabel)),1,1,0,GTK_PACK_START); + yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),UPDATE_PACKAGE_TITLE_LABEL,icon_path,"update_dialog"); gtk_widget_hide(window->DependencesFrame); } @@ -1603,7 +1605,6 @@ int main(int argc, char *argv[]){ local=setlocale(LC_ALL, ""); textdomain (LocaleName); config_init(); - yon_ubl_connect_config((_template_config*)&main_config); yon_ubl_window_init(TITLE_LABEL,TITLE_INFO_LABEL,LocaleName,CssPath,LocaleName,version_application,WIKI_LINK); config_str unfound = NULL; -- 2.35.1 From 99d63a6855e732f96811f80681deaa8ed48fd851 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 3 Mar 2025 11:47:33 +0600 Subject: [PATCH 19/22] Chagned update window title label spacing --- source/ubl-settings-kernel.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c index 007026a..5f7a5cc 100644 --- a/source/ubl-settings-kernel.c +++ b/source/ubl-settings-kernel.c @@ -798,6 +798,7 @@ void on_module_install_clicked(GtkWidget *self,dictionary *dict){ g_signal_connect(G_OBJECT(window->AcceptButton),"clicked",G_CALLBACK(on_module_install_accept),dict); if (self == tab->update_module_button){ + gtk_box_set_spacing(GTK_BOX(gtk_widget_get_parent(window->TopicLabel)),25); gtk_widget_set_margin_start(gtk_widget_get_parent(window->TopicLabel),10); yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),UPDATE_MODULE_TITLE_LABEL,icon_path,"update_dialog"); if (!gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))){ @@ -911,6 +912,7 @@ void on_package_install_clicked(GtkWidget *self,dictionary *dict){ yon_char_parsed_free(additions,size); } else { gtk_widget_set_margin_start(gtk_widget_get_parent(window->TopicLabel),10); + gtk_box_set_spacing(GTK_BOX(gtk_widget_get_parent(window->TopicLabel)),25); gtk_box_set_child_packing(GTK_BOX(gtk_widget_get_parent(window->DependencesFrame)),gtk_widget_get_parent(gtk_widget_get_parent(window->TopicLabel)),1,1,0,GTK_PACK_START); yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),UPDATE_PACKAGE_TITLE_LABEL,icon_path,"update_dialog"); gtk_widget_hide(window->DependencesFrame); -- 2.35.1 From 991c391d4070efc15d368e771f312e147e1ed4d6 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 3 Mar 2025 11:58:42 +0600 Subject: [PATCH 20/22] Temporary update force on removal --- source/ubl-settings-kernel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c index 5f7a5cc..5cf610f 100644 --- a/source/ubl-settings-kernel.c +++ b/source/ubl-settings-kernel.c @@ -284,8 +284,8 @@ gboolean yon_tab_create_tags(kernels_tab *tab){ gtk_widget_show(tab->changelog_button); } } - gtk_widget_set_sensitive(tab->update_module_button,tab->module_updated); - gtk_widget_set_sensitive(tab->update_package_button,tab->package_updated); + gtk_widget_set_sensitive(tab->update_module_button,!tab->module_updated); + gtk_widget_set_sensitive(tab->update_package_button,!tab->package_updated); } else { yon_tag_add(GTK_BOX(tab->install_tags_box),UNKNOWN_LABEL,"tag_grey",NULL); } -- 2.35.1 From df3de459f772d425204517ed7e3022323a9d40d8 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 3 Mar 2025 12:37:37 +0600 Subject: [PATCH 21/22] Fixed boldness --- source/ubl-settings-kernel.c | 26 +++++++++++++------------- source/ubl-strings.h | 24 ++++++++++++------------ 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c index 5cf610f..0f6aba0 100644 --- a/source/ubl-settings-kernel.c +++ b/source/ubl-settings-kernel.c @@ -803,21 +803,21 @@ void on_module_install_clicked(GtkWidget *self,dictionary *dict){ yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),UPDATE_MODULE_TITLE_LABEL,icon_path,"update_dialog"); if (!gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))){ action_text = KERNEL_MODULE_UPDATE_CONFIRMATION_LABEL(tab->name); - gtk_label_set_text(GTK_LABEL(window->HeadLabel),UPDATE_MODULE_TITLE_LABEL); + gtk_label_set_markup(GTK_LABEL(window->HeadLabel),UPDATE_MODULE_TITLE_LABEL); } else { action_text = ADDITION_MODULE_UPDATE_CONFIRMATION_LABEL(tab->name); - gtk_label_set_text(GTK_LABEL(window->HeadLabel),UPDATE_ADDITION_MODULE_TITLE_LABEL); + gtk_label_set_markup(GTK_LABEL(window->HeadLabel),UPDATE_ADDITION_MODULE_TITLE_LABEL); } } else { if (!gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))){ yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),INSTALL_MODULE_TITLE_LABEL,icon_path,"dialog"); action_text = KERNEL_MODULE_INSTALL_CONFIRMATION_LABEL(tab->name); - gtk_label_set_text(GTK_LABEL(window->HeadLabel),INSTALL_MODULE_TITLE_LABEL); + gtk_label_set_markup(GTK_LABEL(window->HeadLabel),INSTALL_MODULE_TITLE_LABEL); } else { yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),INSTALL_MODULE_TITLE_LABEL,icon_path,"additions_dialog"); action_text = ADDITION_MODULE_INSTALL_CONFIRMATION_LABEL(tab->name); - gtk_label_set_text(GTK_LABEL(window->HeadLabel),INSTALL_ADDITION_MODULE_TITLE_LABEL); + gtk_label_set_markup(GTK_LABEL(window->HeadLabel),INSTALL_ADDITION_MODULE_TITLE_LABEL); } } @@ -861,18 +861,18 @@ void on_package_install_clicked(GtkWidget *self,dictionary *dict){ if (self == tab->update_package_button){ if (!gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))){ action_text = KERNEL_PACKAGE_UPDATE_CONFIRMATION_LABEL(tab->name); - gtk_label_set_text(GTK_LABEL(window->HeadLabel),UPDATE_PACKAGE_TITLE_LABEL); + gtk_label_set_markup(GTK_LABEL(window->HeadLabel),UPDATE_PACKAGE_TITLE_LABEL); } else { action_text = ADDITION_PACKAGE_UPDATE_CONFIRMATION_LABEL(tab->name); - gtk_label_set_text(GTK_LABEL(window->HeadLabel),UPDATE_ADDITION_PACKAGE_TITLE_LABEL); + gtk_label_set_markup(GTK_LABEL(window->HeadLabel),UPDATE_ADDITION_PACKAGE_TITLE_LABEL); } }else{ if (!gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))){ action_text = KERNEL_PACKAGE_INSTALL_CONFIRMATION_LABEL(tab->name); - gtk_label_set_text(GTK_LABEL(window->HeadLabel),INSTALL_PACKAGE_TITLE_LABEL); + gtk_label_set_markup(GTK_LABEL(window->HeadLabel),INSTALL_PACKAGE_TITLE_LABEL); } else { action_text = ADDITION_PACKAGE_INSTALL_CONFIRMATION_LABEL(tab->name); - gtk_label_set_text(GTK_LABEL(window->HeadLabel),INSTALL_ADDITION_PACKAGE_TITLE_LABEL); + gtk_label_set_markup(GTK_LABEL(window->HeadLabel),INSTALL_ADDITION_PACKAGE_TITLE_LABEL); } } @@ -886,13 +886,13 @@ void on_package_install_clicked(GtkWidget *self,dictionary *dict){ if (gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))){ gtk_label_set_text(GTK_LABEL(window->HeadLabel),self==tab->update_package_button?UPDATE_ADDITION_PACKAGE_TITLE_LABEL:INSTALL_ADDITION_PACKAGE_TITLE_LABEL); - gtk_label_set_text(GTK_LABEL(window->TopicLabel),ADDITION_PACKAGE_UPDATE_CONFIRMATION_LABEL(tab->package)); + gtk_label_set_markup(GTK_LABEL(window->TopicLabel),ADDITION_PACKAGE_UPDATE_CONFIRMATION_LABEL(tab->package)); yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),self==tab->update_package_button?UPDATE_PACKAGE_TITLE_LABEL:INSTALL_PACKAGE_TITLE_LABEL,icon_path,"additions_dialog"); gtk_widget_hide(window->DependencesFrame); gtk_box_set_child_packing(GTK_BOX(gtk_widget_get_parent(window->DependencesFrame)),gtk_widget_get_parent(gtk_widget_get_parent(window->TopicLabel)),1,1,0,GTK_PACK_START); } else { gtk_label_set_text(GTK_LABEL(window->HeadLabel),self==tab->update_package_button?UPDATE_PACKAGE_TITLE_LABEL:INSTALL_PACKAGE_TITLE_LABEL); - gtk_label_set_text(GTK_LABEL(window->TopicLabel),KERNEL_PACKAGE_UPDATE_CONFIRMATION_LABEL(tab->package)); + gtk_label_set_markup(GTK_LABEL(window->TopicLabel),KERNEL_PACKAGE_UPDATE_CONFIRMATION_LABEL(tab->package)); if (self!=tab->update_package_button){ yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),INSTALL_PACKAGE_TITLE_LABEL,icon_path,"dialog"); int size; @@ -974,7 +974,7 @@ void on_module_remove_clicked(GtkWidget *self,dictionary *dict){ action_text = ADDITION_MODULE_REMOVE_CONFIRMATION_LABEL(tab->name); gtk_widget_hide(window->DependencesFrame); gtk_box_set_child_packing(GTK_BOX(gtk_widget_get_parent(window->DependencesFrame)),gtk_widget_get_parent(gtk_widget_get_parent(window->TopicLabel)),1,1,0,GTK_PACK_START); - gtk_label_set_text(GTK_LABEL(window->HeadLabel),REMOVE_ADDITION_MODULE_TITLE_LABEL); + gtk_label_set_markup(GTK_LABEL(window->HeadLabel),REMOVE_ADDITION_MODULE_TITLE_LABEL); } else { yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),self==tab->update_package_button?UPDATE_MODULE_TITLE_LABEL:INSTALL_MODULE_TITLE_LABEL,icon_path,"dialog"); gtk_label_set_text(GTK_LABEL(window->HeadLabel),REMOVE_MODULE_TITLE_LABEL); @@ -1018,7 +1018,7 @@ void on_module_remove_clicked(GtkWidget *self,dictionary *dict){ } yon_char_parsed_free(additions,size); } - gtk_label_set_text(GTK_LABEL(window->TopicLabel),action_text); + gtk_label_set_markup(GTK_LABEL(window->TopicLabel),action_text); } @@ -1108,7 +1108,7 @@ void on_package_remove_clicked(GtkWidget *self,dictionary *dict){ } yon_char_parsed_free(additions,size); } - gtk_label_set_text(GTK_LABEL(window->TopicLabel),action_text); + gtk_label_set_markup(GTK_LABEL(window->TopicLabel),action_text); } diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 8f31399..ae58045 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -65,19 +65,19 @@ #define OPERATION_IN_PROGRESS_LABEL _("Terminal operation in process") #define PACKAGE_REMOVED_BUT_NOT_DISABLED_LABEL _("The package with the module has been removed, but the module is not disabled from the system, as it is used by other system programs. After rebooting, the module will be disabled and removed.") -#define KERNEL_MODULE_INSTALL_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to install kernel module")," ",target,"?",NULL) -#define KERNEL_PACKAGE_INSTALL_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to install kernel package")," ",target,"?\n",KERNEL_PACKAGE_INSTALL_ATTENTION_LABEL,"",NULL) -#define KERNEL_MODULE_UPDATE_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to update kernel module")," ",target,"?",NULL) -#define KERNEL_PACKAGE_UPDATE_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to update kernel package")," ",target,"?",NULL) -#define KERNEL_MODULE_REMOVE_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to remove kernel module")," ",target,"?",NULL) +#define KERNEL_MODULE_INSTALL_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to install kernel module")," ",target,"?",NULL) +#define KERNEL_PACKAGE_INSTALL_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to install kernel package")," ",target,"?\n",KERNEL_PACKAGE_INSTALL_ATTENTION_LABEL,"",NULL) +#define KERNEL_MODULE_UPDATE_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to update kernel module")," ",target,"?",NULL) +#define KERNEL_PACKAGE_UPDATE_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to update kernel package")," ",target,"?",NULL) +#define KERNEL_MODULE_REMOVE_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to remove kernel module")," ",target,"?",NULL) #define KERNEL_REMOVE_LAST_CONFIRMATION_LABEL(target) yon_char_unite(_("The kernel is the only one in the system. If you remove it, it will become impossible to boot. Do you really want to remove")," ",target,"?",NULL) -#define KERNEL_PACKAGE_REMOVE_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to remove kernel package")," ",target,"?",NULL) -#define ADDITION_MODULE_INSTALL_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to install module with addition package")," ",target,"?",NULL) -#define ADDITION_PACKAGE_INSTALL_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to install addition package")," ",target,"?",NULL) -#define ADDITION_MODULE_UPDATE_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to update kernel addition module")," ",target,"?",NULL) -#define ADDITION_PACKAGE_UPDATE_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to update kernel addition package")," ",target,"?",NULL) -#define ADDITION_MODULE_REMOVE_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to remove kernel addition module")," ",target,"?",NULL) -#define ADDITION_PACKAGE_REMOVE_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to remove kernel addition package")," ",target,"?",NULL) +#define KERNEL_PACKAGE_REMOVE_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to remove kernel package")," ",target,"?",NULL) +#define ADDITION_MODULE_INSTALL_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to install module with addition package")," ",target,"?",NULL) +#define ADDITION_PACKAGE_INSTALL_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to install addition package")," ",target,"?",NULL) +#define ADDITION_MODULE_UPDATE_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to update kernel addition module")," ",target,"?",NULL) +#define ADDITION_PACKAGE_UPDATE_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to update kernel addition package")," ",target,"?",NULL) +#define ADDITION_MODULE_REMOVE_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to remove kernel addition module")," ",target,"?",NULL) +#define ADDITION_PACKAGE_REMOVE_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to remove kernel addition package")," ",target,"?",NULL) #define LAUNCH_CONFIRMATION_LABEL(target) yon_char_unite(_("Are you sure want to launch")," ",target," ",_("for boot?\n\nChanges will be applied after system restart"),NULL) #define UPDATE_MODULE_LABEL _("Update module") -- 2.35.1 From ac57513adb6e0b67ea2d7cc23b26d13e6ef0b95b Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 3 Mar 2025 12:40:35 +0600 Subject: [PATCH 22/22] Fixed package update current package name in label --- source/ubl-settings-kernel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c index 0f6aba0..921d00e 100644 --- a/source/ubl-settings-kernel.c +++ b/source/ubl-settings-kernel.c @@ -886,13 +886,13 @@ void on_package_install_clicked(GtkWidget *self,dictionary *dict){ if (gtk_notebook_get_current_page(GTK_NOTEBOOK(widgets->MainNotebook))){ gtk_label_set_text(GTK_LABEL(window->HeadLabel),self==tab->update_package_button?UPDATE_ADDITION_PACKAGE_TITLE_LABEL:INSTALL_ADDITION_PACKAGE_TITLE_LABEL); - gtk_label_set_markup(GTK_LABEL(window->TopicLabel),ADDITION_PACKAGE_UPDATE_CONFIRMATION_LABEL(tab->package)); + gtk_label_set_markup(GTK_LABEL(window->TopicLabel),ADDITION_PACKAGE_UPDATE_CONFIRMATION_LABEL(tab->name)); yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),self==tab->update_package_button?UPDATE_PACKAGE_TITLE_LABEL:INSTALL_PACKAGE_TITLE_LABEL,icon_path,"additions_dialog"); gtk_widget_hide(window->DependencesFrame); gtk_box_set_child_packing(GTK_BOX(gtk_widget_get_parent(window->DependencesFrame)),gtk_widget_get_parent(gtk_widget_get_parent(window->TopicLabel)),1,1,0,GTK_PACK_START); } else { gtk_label_set_text(GTK_LABEL(window->HeadLabel),self==tab->update_package_button?UPDATE_PACKAGE_TITLE_LABEL:INSTALL_PACKAGE_TITLE_LABEL); - gtk_label_set_markup(GTK_LABEL(window->TopicLabel),KERNEL_PACKAGE_UPDATE_CONFIRMATION_LABEL(tab->package)); + gtk_label_set_markup(GTK_LABEL(window->TopicLabel),KERNEL_PACKAGE_UPDATE_CONFIRMATION_LABEL(tab->name)); if (self!=tab->update_package_button){ yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window),INSTALL_PACKAGE_TITLE_LABEL,icon_path,"dialog"); int size; -- 2.35.1