From 087d1337fd5ef89e62812612ae5cccae9b846629 Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Thu, 27 Nov 2025 18:07:27 +0600 Subject: [PATCH 1/3] Fixed main thene Misc filtering --- source/ubl-settings-manager-theme-main.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/source/ubl-settings-manager-theme-main.c b/source/ubl-settings-manager-theme-main.c index e05b20f..058e623 100644 --- a/source/ubl-settings-manager-theme-main.c +++ b/source/ubl-settings-manager-theme-main.c @@ -67,6 +67,18 @@ void on_main_activate(GtkFlowBox* , GtkFlowBoxChild* child, main_theme_struct *t void yon_main_section_setup_apps(main_section *cur_section, const char *target){ if (yon_char_is_empty(target)) return; apps *cur_app = yon_apps_get((char*)target); + { + if (cur_section->section->categories_size==1&&!strcmp(cur_section->section->categories[0],"X-UBL-SettingsManager")) { + int found_else = 0; + for (int i=0;icategories_size;i++){ + if (strstr(cur_app->Categories[i],"X-UBL-")&&strcmp(cur_app->Categories[i],"X-UBL-SettingsManager")){ + found_else = 1; + } + } + + if (found_else) return; + } + } GtkIconInfo *info = gtk_icon_theme_lookup_icon_for_scale(gtk_icon_theme_get_default(), !yon_char_is_empty(cur_app->Icon)?cur_app->Icon:icon_path, main_config.apps_icon_size,1,GTK_ICON_LOOKUP_FORCE_SIZE); GtkWidget *Image = NULL; if (info){ From e61af7f7c53bcdd10851517babaa7efcbc04e0af Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Thu, 4 Dec 2025 13:13:59 +0600 Subject: [PATCH 2/3] Main theme fixes; Settings menu item rename --- locale/ubl-settings-manager.pot | 2 +- locale/ubl-settings-manager_ru.po | 4 ++-- source/ubl-settings-manager-theme-main.c | 2 +- source/ubl-settings-manager.c | 2 +- source/ubl-strings.h | 6 +++--- ubl-settings-manager.glade | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/locale/ubl-settings-manager.pot b/locale/ubl-settings-manager.pot index 89c1fc1..602e274 100644 --- a/locale/ubl-settings-manager.pot +++ b/locale/ubl-settings-manager.pot @@ -56,7 +56,7 @@ msgid "Understood" msgstr "" #: source/ubl-strings.h:12 -msgid "Settings" +msgid "Manager settings" msgstr "" #: source/ubl-strings.h:13 diff --git a/locale/ubl-settings-manager_ru.po b/locale/ubl-settings-manager_ru.po index c80af04..f0ec278 100644 --- a/locale/ubl-settings-manager_ru.po +++ b/locale/ubl-settings-manager_ru.po @@ -58,8 +58,8 @@ msgid "Understood" msgstr "Понятно" #: source/ubl-strings.h:12 -msgid "Settings" -msgstr "Настройки" +msgid "Manager settings" +msgstr "Настройки диспетчера" #: source/ubl-strings.h:13 msgid "Apply" diff --git a/source/ubl-settings-manager-theme-main.c b/source/ubl-settings-manager-theme-main.c index 058e623..a4d3b1c 100644 --- a/source/ubl-settings-manager-theme-main.c +++ b/source/ubl-settings-manager-theme-main.c @@ -127,7 +127,7 @@ main_section *yon_main_section_new(){ g_object_set_data(G_OBJECT(cur_section->expander),"main_section",cur_section); int doubleclick=0; if (!yon_window_config_get_parameter(settings_section,double_click_parameter,&doubleclick,YON_TYPE_BOOLEAN)){ - gtk_flow_box_set_activate_on_single_click(GTK_FLOW_BOX(cur_section->AppsList),1); + gtk_flow_box_set_activate_on_single_click(GTK_FLOW_BOX(cur_section->AppsList),0); } else { gtk_flow_box_set_activate_on_single_click(GTK_FLOW_BOX(cur_section->AppsList),!doubleclick); } diff --git a/source/ubl-settings-manager.c b/source/ubl-settings-manager.c index 682d13b..bb71b54 100644 --- a/source/ubl-settings-manager.c +++ b/source/ubl-settings-manager.c @@ -207,7 +207,7 @@ main_window *yon_main_window_setup(){ yon_window_config_load(path); yon_ubl_settings_window_init(GTK_MENU(gtk_widget_get_parent(widgets->MainMenuItemAbout))); - + struct yon_configuration_window_custom_parameter *parameter = malloc(sizeof(struct yon_configuration_window_custom_parameter)); parameter->custom_parameter_create_func = yon_config_chooser_new; parameter->custom_parameter_save_value_func = yon_config_chooser_save; diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 0690c2e..4d5b07e 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -1,15 +1,15 @@ #define TITLE_LABEL _("Settings manager for the system") -#define TITLE_INFO_LABEL _("About UBLinux Settings Manager") +#define TITLE_INFO_LABEL _("About Settings manager for the system") #define WIKI_LINK _("https://wiki.ublinux.ru/software/programs_and_utilities/all/ubl-settings-manager") -#define ABOUT_PROJECT_COMMENTS_LABEL _("Settings manager for UBLinux") +#define ABOUT_PROJECT_COMMENTS_LABEL _("Settings manager for the system") #define BACK_TO_SETTINGS_LABEL _("Back to settings") #define CONFIG_LOAD_ERROR _("Config loading failed!\n") #define DOUBLE_CLICK_SELECTION_LABEL _("Double click selection") #define SECTIONS_MANAGEMENT_LABEL _("Sections management") #define UNDERSTOOD_LABEL _("Understood") -#define SETTINGS_LABEL _("Settings") +#define SETTINGS_LABEL _("Manager settings") #define APPLY_LABEL _("Apply") #define CLOSE_LABEL _("Close") #define CANCEL_LABEL _("Cancel") diff --git a/ubl-settings-manager.glade b/ubl-settings-manager.glade index 80275f2..7df0891 100644 --- a/ubl-settings-manager.glade +++ b/ubl-settings-manager.glade @@ -13,7 +13,7 @@ True False - Settings + Manager settings True