From 5bcc8b63ba5948e351ebb360aeebc4e195d24720 Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Wed, 1 Apr 2026 09:54:09 +0600 Subject: [PATCH 1/2] Fixed kernel addon info title for modules --- locale/ubinstall-gtk.pot | 4 ++++ locale/ubinstall-gtk_ru.po | 4 ++++ source/ubinstall-gtk-kernel.c | 10 +++++----- source/ubl-strings.h | 1 + 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/locale/ubinstall-gtk.pot b/locale/ubinstall-gtk.pot index 9e4bdf8..7629e5a 100644 --- a/locale/ubinstall-gtk.pot +++ b/locale/ubinstall-gtk.pot @@ -813,6 +813,10 @@ msgstr "" msgid "Package information" msgstr "" +#: source/ubl-strings.h:230 +msgid "Module information" +msgstr "" + #: source/ubl-strings.h:231 msgid "Yes, I agree to the License Agreement" msgstr "" diff --git a/locale/ubinstall-gtk_ru.po b/locale/ubinstall-gtk_ru.po index fed9874..b4c473b 100644 --- a/locale/ubinstall-gtk_ru.po +++ b/locale/ubinstall-gtk_ru.po @@ -837,6 +837,10 @@ msgstr "Пакеты не найдены" msgid "Package information" msgstr "Информация о пакете" +#: source/ubl-strings.h:230 +msgid "Module information" +msgstr "Информация о модуле" + #: source/ubl-strings.h:231 msgid "Yes, I agree to the License Agreement" msgstr "Да, я согласен с лицензионным соглашением" diff --git a/source/ubinstall-gtk-kernel.c b/source/ubinstall-gtk-kernel.c index 800abd8..5707288 100644 --- a/source/ubinstall-gtk-kernel.c +++ b/source/ubinstall-gtk-kernel.c @@ -244,7 +244,7 @@ void yon_kernel_init(main_window *widgets){ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(row->InstallCheck),1); gtk_widget_set_sensitive(row->InstallCheck,0); } - if (!yon_char_is_empty(enabled)&&!strcmp(package,enabled)){ + if (!yon_char_is_empty(enabled)&&(!strcmp(package,enabled)||!yon_char_check_element(modules,enabled," "))){ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(row->EnableRadio),1); } yon_char_parsed_free(parsed,parsed_size); @@ -291,9 +291,9 @@ info_element *yon_package_info_element_new(){ return element; } -void on_kernel_addon_info(GtkLabel *self){ +void on_kernel_addon_info(GtkLabel *self, kernel_addon_row *row){ yon_window *window = yon_window_new(); - yon_gtk_window_setup(GTK_WINDOW(window->Window),NULL,PACKAGE_INFO_LABEL,icon_path,"info-label"); + yon_gtk_window_setup(GTK_WINDOW(window->Window),NULL,(GtkWidget*)self==row->PackageLabel?PACKAGE_INFO_LABEL:MODULE_INFO_LABEL,icon_path,"info-label"); char *package=NULL; package = yon_char_new(gtk_label_get_text(self)); int size=0; @@ -354,8 +354,8 @@ kernel_addon_row *yon_kernel_addon_row_new(){ row->package=NULL; g_signal_connect(G_OBJECT(row->InstallCheck),"toggled",G_CALLBACK(on_kernel_addon_install_enabled),row); - g_signal_connect(G_OBJECT(row->ModuleLabel),"activate-link",G_CALLBACK(on_kernel_addon_info),NULL); - g_signal_connect(G_OBJECT(row->PackageLabel),"activate-link",G_CALLBACK(on_kernel_addon_info),NULL); + g_signal_connect(G_OBJECT(row->ModuleLabel),"activate-link",G_CALLBACK(on_kernel_addon_info),row); + g_signal_connect(G_OBJECT(row->PackageLabel),"activate-link",G_CALLBACK(on_kernel_addon_info),row); g_signal_connect(G_OBJECT(row->PackageLabel),"button-press-event",G_CALLBACK(on_kernel_addon_menu_block),row); g_signal_connect(G_OBJECT(row->ModuleLabel),"button-press-event",G_CALLBACK(on_kernel_addon_menu_block),row); diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 2649b8b..7ab8b9e 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -220,6 +220,7 @@ NULL) #define ROOT_FORCE_CONFIGURATION_MODE_LABEL _("Warning! Application was launched without root. Only configuration mode is allowed.") #define PACKAGE_NOT_FOUND_LABEL _("Package were not found") #define PACKAGE_INFO_LABEL _("Package information") +#define MODULE_INFO_LABEL _("Module information") #define LICENCE_AGREE_LABEL _("Yes, I agree to the License Agreement") #define LICENCE_DISAGREE_LABEL _("No, I do not agree") #define ADD_LANGUAGE_TITLE_LABEL _("Add locales") From dbcab7784bd529e69b977063ea5595e3b91c5212 Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Wed, 1 Apr 2026 10:14:42 +0600 Subject: [PATCH 2/2] Active kernel loading fix --- source/ubinstall-gtk-components.c | 6 +++--- source/ubinstall-gtk-kernel.c | 2 +- source/ubinstall-gtk.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source/ubinstall-gtk-components.c b/source/ubinstall-gtk-components.c index b6246b1..e725c7b 100644 --- a/source/ubinstall-gtk-components.c +++ b/source/ubinstall-gtk-components.c @@ -20,9 +20,9 @@ int yon_kernel_save(main_window *widgets){ yon_config_append_elements(packages_parameter,append_str,","); free(append_str); active_size++; - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(row->EnableRadio))){ - enabled_module = row->package; - } + } + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(row->EnableRadio))){ + enabled_module = row->package; } } else { char *append_str = yon_char_replace(row->modules," ",","); diff --git a/source/ubinstall-gtk-kernel.c b/source/ubinstall-gtk-kernel.c index 5707288..b056a3a 100644 --- a/source/ubinstall-gtk-kernel.c +++ b/source/ubinstall-gtk-kernel.c @@ -244,7 +244,7 @@ void yon_kernel_init(main_window *widgets){ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(row->InstallCheck),1); gtk_widget_set_sensitive(row->InstallCheck,0); } - if (!yon_char_is_empty(enabled)&&(!strcmp(package,enabled)||!yon_char_check_element(modules,enabled," "))){ + if (!yon_char_is_empty(enabled)&&(!strcmp(package,enabled)||yon_char_check_element(modules,enabled," "))){ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(row->EnableRadio),1); } yon_char_parsed_free(parsed,parsed_size); diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h index 4904a72..8fff4ff 100755 --- a/source/ubinstall-gtk.h +++ b/source/ubinstall-gtk.h @@ -1470,7 +1470,7 @@ void *yon_maximize(main_window *widgets); kernel_addon_row *yon_kernel_addon_row_new(); void yon_kernel_addon_row_setup(kernel_addon_row *row, char *name, char *modules, char *package, char *description); void on_kernel_addon_install_enabled(GtkWidget *, kernel_addon_row *row); -void on_kernel_addon_info(GtkLabel *self); +void on_kernel_addon_info(GtkLabel *self, kernel_addon_row *row); void yon_license_init(main_window *widgets); void on_locale_toggle(GtkCellRenderer *, gchar *path, language_window *window); void on_locale_accept(GtkWidget *self, language_window *window);