From ce63a68f7fc403b86cd2cb33d343a1b2cd2a02a6 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 4 Apr 2025 10:13:33 +0600 Subject: [PATCH 1/4] Fixed labels --- source/ubl-settings-kernel.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c index 1d67995..868a473 100644 --- a/source/ubl-settings-kernel.c +++ b/source/ubl-settings-kernel.c @@ -857,7 +857,7 @@ void on_package_install_clicked(GtkWidget *self,dictionary *dict){ char *action_text = NULL; dialog_window *window = yon_dialog_window_new(); g_signal_connect(G_OBJECT(window->AcceptButton),"clicked",G_CALLBACK(on_package_install_accept),dict); - + gtk_tree_view_column_set_title(GTK_TREE_VIEW_COLUMN(gtk_tree_view_get_column(GTK_TREE_VIEW(window->DependencesTree),1)),PACKAGE_TAB_LABEL); 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); @@ -892,7 +892,7 @@ void on_package_install_clicked(GtkWidget *self,dictionary *dict){ 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->name)); + gtk_label_set_markup(GTK_LABEL(window->TopicLabel),self==tab->update_package_button?KERNEL_PACKAGE_UPDATE_CONFIRMATION_LABEL(tab->name):KERNEL_PACKAGE_INSTALL_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; @@ -903,7 +903,7 @@ void on_package_install_clicked(GtkWidget *self,dictionary *dict){ for (int j=1;jpackage_requirements[i])) + if (!strcmp(parsed[2],tab->package_requirements[i])) gtk_list_store_set(window->liststore1,&iter,2,parsed[3],-1); yon_char_parsed_free(parsed,cur_size); } From 54320acfd3b8fb65850e0848cfb117faef8b8f12 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 4 Apr 2025 10:22:41 +0600 Subject: [PATCH 2/4] Fixed dependenses table --- source/ubl-settings-kernel.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c index 868a473..7806bd3 100644 --- a/source/ubl-settings-kernel.c +++ b/source/ubl-settings-kernel.c @@ -990,8 +990,10 @@ void on_module_remove_clicked(GtkWidget *self,dictionary *dict){ char *target_depends = yon_package_dependent_get(tab->module); if (target_depends&&strcmp(target_depends,tab->package)&&strstr(target_depends," ")){ free(yon_char_divide_search(target_depends," ",-1)); + char *final = yon_char_replace(target_depends," ","\n"); gtk_list_store_append(window->liststore1,&itar); gtk_list_store_set(window->liststore1,&itar,0,1,1,target_depends,-1); + free(final); } for (int i=0;imodule_requirements_size;i++){ if (!system(get_package_is_installed_command(tab->module_requirements[i]))){ @@ -1080,8 +1082,10 @@ void on_package_remove_clicked(GtkWidget *self,dictionary *dict){ char *target_depends = yon_package_dependent_get(tab->package); if (target_depends&&strcmp(target_depends,tab->package)){ free(yon_char_divide_search(target_depends," ",-1)); + char *final = yon_char_replace(target_depends," ","\n"); gtk_list_store_append(window->liststore1,&itar); - gtk_list_store_set(window->liststore1,&itar,0,1,1,target_depends,-1); + gtk_list_store_set(window->liststore1,&itar,0,1,1,final,-1); + free(final); } config_str additions = yon_resource_open_file(kernels_addon_path,&size); for (int i=0;imodule_requirements_size;i++){ From 83b313462a5733c827c65cd0c973bae74765f039 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 4 Apr 2025 10:31:12 +0600 Subject: [PATCH 3/4] Fixes --- source/ubl-settings-kernel.c | 1 + ubl-settings-kernel-dialog.glade | 2 ++ 2 files changed, 3 insertions(+) diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c index 7806bd3..d1b0cf6 100644 --- a/source/ubl-settings-kernel.c +++ b/source/ubl-settings-kernel.c @@ -1051,6 +1051,7 @@ void on_package_remove_clicked(GtkWidget *self,dictionary *dict){ } dialog_window *window = yon_dialog_window_new(); + gtk_tree_view_column_set_title(GTK_TREE_VIEW_COLUMN(gtk_tree_view_get_column(GTK_TREE_VIEW(window->DependencesTree),1)),PACKAGE_TAB_LABEL); if (dict->first->next->next){ dict=dict->first; free(dict->first->next->next); diff --git a/ubl-settings-kernel-dialog.glade b/ubl-settings-kernel-dialog.glade index 7dea458..e91565c 100644 --- a/ubl-settings-kernel-dialog.glade +++ b/ubl-settings-kernel-dialog.glade @@ -18,6 +18,8 @@ + 550 + 350 False True 1 From 28255bf50e50a0ccd51b7de856b9e30eefc21a35 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 4 Apr 2025 11:26:59 +0600 Subject: [PATCH 4/4] Fixed kernel launching --- source/ubl-settings-kernel.c | 2 ++ source/ubl-strings.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c index d1b0cf6..5e644d4 100644 --- a/source/ubl-settings-kernel.c +++ b/source/ubl-settings-kernel.c @@ -267,6 +267,8 @@ gboolean yon_tab_create_tags(kernels_tab *tab){ 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 if (!launched){ + gtk_widget_show(tab->launch_button); } else { gtk_widget_hide(tab->launch_button); if(!getuid()){ diff --git a/source/ubl-strings.h b/source/ubl-strings.h index ae58045..fe62e08 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -78,7 +78,7 @@ #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 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") #define UPDATE_PACKAGE_LABEL _("Update package")