From ee41ac73c33c984e0e36bdb3314d127ca0621074 Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Fri, 30 Jan 2026 11:02:13 +0600 Subject: [PATCH 1/6] Wiki link change --- locale/ubl-settings-manager.pot | 3 +-- locale/ubl-settings-manager_ru.po | 6 ++---- source/ubl-strings.h | 2 +- ubl-settings-manager.desktop | 0 4 files changed, 4 insertions(+), 7 deletions(-) mode change 100644 => 100755 ubl-settings-manager.desktop diff --git a/locale/ubl-settings-manager.pot b/locale/ubl-settings-manager.pot index 602e274..112b442 100644 --- a/locale/ubl-settings-manager.pot +++ b/locale/ubl-settings-manager.pot @@ -27,8 +27,7 @@ msgstr "" #: source/ubl-strings.h:4 msgid "" -"https://wiki.ublinux.ru/software/programs_and_utilities/all/ubl-settings-" -"manager" +"https://wiki.ublinux.com/en/software/programs_and_utilities/all/ubl-settings-manager" msgstr "" #: source/ubl-strings.h:6 diff --git a/locale/ubl-settings-manager_ru.po b/locale/ubl-settings-manager_ru.po index 4309a65..1d14c78 100644 --- a/locale/ubl-settings-manager_ru.po +++ b/locale/ubl-settings-manager_ru.po @@ -27,11 +27,9 @@ msgstr "О приложении Диспетчер настроек" #: source/ubl-strings.h:4 msgid "" -"https://wiki.ublinux.ru/software/programs_and_utilities/all/ubl-settings-" -"manager" +"https://wiki.ublinux.com/en/software/programs_and_utilities/all/ubl-settings-manager" msgstr "" -"https://wiki.ublinux.ru/software/programs_and_utilities/all/ubl-settings-" -"manager" +"https://wiki.ublinux.com/ru/software/programs_and_utilities/all/ubl-settings-manager" #: source/ubl-strings.h:6 msgid "Settings manager for UBLinux" diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 84bf4c5..e7481c8 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -1,7 +1,7 @@ #define TITLE_LABEL _("Settings manager for the system") #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 WIKI_LINK _("https://wiki.ublinux.com/en/software/programs_and_utilities/all/ubl-settings-manager") #define ABOUT_PROJECT_COMMENTS_LABEL _("Settings manager for the system") #define BACK_TO_SETTINGS_LABEL _("Back to settings") diff --git a/ubl-settings-manager.desktop b/ubl-settings-manager.desktop old mode 100644 new mode 100755 From 1d713431691e64fb568cc6349e385e47241db656 Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Fri, 30 Jan 2026 13:18:34 +0600 Subject: [PATCH 2/6] Added main theme element labels wrapping --- source/ubl-settings-manager-theme-main.c | 14 ++++++++------ ubl-settings-manager-theme-main-section.glade | 3 ++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/source/ubl-settings-manager-theme-main.c b/source/ubl-settings-manager-theme-main.c index a4d3b1c..95206bc 100644 --- a/source/ubl-settings-manager-theme-main.c +++ b/source/ubl-settings-manager-theme-main.c @@ -88,8 +88,7 @@ void yon_main_section_setup_apps(main_section *cur_section, const char *target){ Image = gtk_image_new_from_pixbuf(gtk_icon_info_load_icon(info,NULL)); } - - char *name = yon_char_wrap_to_length_str(cur_app->Name,20); + char *name = cur_app->Name; GtkWidget *Row = gtk_flow_box_child_new(); GtkWidget *Box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,5); @@ -97,23 +96,26 @@ void yon_main_section_setup_apps(main_section *cur_section, const char *target){ GtkWidget *Icon = Image; gtk_box_pack_start(GTK_BOX(Box),Icon,0,0,0); - gtk_box_pack_start(GTK_BOX(Box),Label,0,0,0); + gtk_box_pack_start(GTK_BOX(Box),Label,1,1,0); gtk_container_add(GTK_CONTAINER(Row),Box); gtk_flow_box_insert(GTK_FLOW_BOX(cur_section->AppsList),Row,-1); gtk_widget_set_size_request(Row,50,50); - gtk_widget_set_halign(Box,GTK_ALIGN_START); + gtk_widget_set_halign(Box,GTK_ALIGN_FILL); gtk_widget_set_valign(Box,GTK_ALIGN_CENTER); - gtk_label_set_line_wrap_mode(GTK_LABEL(Label),PANGO_WRAP_WORD); + gtk_label_set_line_wrap_mode(GTK_LABEL(Label),PANGO_WRAP_WORD_CHAR); gtk_label_set_line_wrap(GTK_LABEL(Label),1); - gtk_label_set_xalign(GTK_LABEL(Label),0); + gtk_label_set_max_width_chars(GTK_LABEL(Label),15); + gtk_label_set_xalign(GTK_LABEL(Label), GTK_ALIGN_FILL); g_object_set_data(G_OBJECT(Row),"main_section",cur_section); g_object_set_data(G_OBJECT(Row),"apps",cur_app); g_object_set_data(G_OBJECT(Row),"Label",Label); + // gtk_style_context_add_class(gtk_widget_get_style_context(Row),"bggrey"); + gtk_widget_show_all(Row); } diff --git a/ubl-settings-manager-theme-main-section.glade b/ubl-settings-manager-theme-main-section.glade index 36f79fa..73c0024 100644 --- a/ubl-settings-manager-theme-main-section.glade +++ b/ubl-settings-manager-theme-main-section.glade @@ -1,5 +1,5 @@ - + @@ -15,6 +15,7 @@ True False vertical + 5 True From 9fcda370408143d725da597bc24b185434feb46b Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Fri, 30 Jan 2026 13:57:24 +0600 Subject: [PATCH 3/6] Test wayland socket fix --- source/ubl-settings-manager.c | 1 + 1 file changed, 1 insertion(+) diff --git a/source/ubl-settings-manager.c b/source/ubl-settings-manager.c index bb71b54..466d131 100644 --- a/source/ubl-settings-manager.c +++ b/source/ubl-settings-manager.c @@ -230,6 +230,7 @@ main_window *yon_main_window_setup(){ } int main(int argc, char *argv[]){ + g_setenv("GDK_BACKEND","x11",1); setlocale(LC_ALL, ""); textdomain (LocaleName); yon_ubl_connect_config((_template_config*)&main_config); From 203a2bb63939a09ef79dd93d5ce63b2106984fed Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Fri, 30 Jan 2026 16:54:31 +0600 Subject: [PATCH 4/6] Removed GDK_BACKEND environment variable --- source/ubl-settings-manager.c | 1 - 1 file changed, 1 deletion(-) diff --git a/source/ubl-settings-manager.c b/source/ubl-settings-manager.c index 466d131..bb71b54 100644 --- a/source/ubl-settings-manager.c +++ b/source/ubl-settings-manager.c @@ -230,7 +230,6 @@ main_window *yon_main_window_setup(){ } int main(int argc, char *argv[]){ - g_setenv("GDK_BACKEND","x11",1); setlocale(LC_ALL, ""); textdomain (LocaleName); yon_ubl_connect_config((_template_config*)&main_config); From 293717b9aacb740d9890e2cfd5372ba1fd307470 Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Mon, 2 Feb 2026 10:03:34 +0600 Subject: [PATCH 5/6] Added main theme elements borders --- source/ubl-settings-manager-theme-main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/ubl-settings-manager-theme-main.c b/source/ubl-settings-manager-theme-main.c index 95206bc..10db703 100644 --- a/source/ubl-settings-manager-theme-main.c +++ b/source/ubl-settings-manager-theme-main.c @@ -114,7 +114,7 @@ void yon_main_section_setup_apps(main_section *cur_section, const char *target){ g_object_set_data(G_OBJECT(Row),"apps",cur_app); g_object_set_data(G_OBJECT(Row),"Label",Label); - // gtk_style_context_add_class(gtk_widget_get_style_context(Row),"bggrey"); + gtk_style_context_add_class(gtk_widget_get_style_context(Row),"bggrey"); gtk_widget_show_all(Row); } From a975dd532eb29901bd7e457f3154f4e88e676d90 Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Fri, 6 Feb 2026 10:21:45 +0600 Subject: [PATCH 6/6] Fixed build --- source/ubl-settings-manager-settings.c | 2 +- source/ubl-settings-manager.c | 8 -------- source/ubl-settings-manager.h | 1 - 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/source/ubl-settings-manager-settings.c b/source/ubl-settings-manager-settings.c index 89d8f03..c40c73e 100644 --- a/source/ubl-settings-manager-settings.c +++ b/source/ubl-settings-manager-settings.c @@ -58,7 +58,7 @@ settings_window *yon_settings_window_new(){ int size; config_str themes = (config_str)g_hash_table_get_keys_as_array(main_config.themes,(guint*)&size); - qsort(themes,size,sizeof(char*),yon_char_parsed_compare); + qsort(themes,size,sizeof(char*),(__compar_fn_t)yon_char_parsed_compare); for (int i=0;iThemeCombo),themes[i],themes[i]); } diff --git a/source/ubl-settings-manager.c b/source/ubl-settings-manager.c index bb71b54..8e0dcd2 100644 --- a/source/ubl-settings-manager.c +++ b/source/ubl-settings-manager.c @@ -38,14 +38,6 @@ void yon_config_update(){ main_config.themes = g_hash_table_new(g_str_hash,g_str_equal); yon_theme_init(); } - -int yon_char_parsed_compare(const void *a, const void *b){ - const config_str str_a = (const config_str)a; - const config_str str_b = (const config_str)b; - - return strcmp(*str_a,*str_b); -} - void on_back_clicked(GtkWidget *, GtkWidget *socket){ gtk_widget_destroy(socket); } diff --git a/source/ubl-settings-manager.h b/source/ubl-settings-manager.h index 841daa7..2c31eba 100644 --- a/source/ubl-settings-manager.h +++ b/source/ubl-settings-manager.h @@ -228,7 +228,6 @@ char *yon_get_save_socket(); char *yon_get_load_socket(); GtkSocket *yon_sockets_init(GtkBox *socketBox); void on_plug_disconnected(GtkSocket *self, main_window *widgets); -int yon_char_parsed_compare(const void *a, const void *b); void yon_interface_update(main_window *widgets);