From 249f8ec9d3f97670cdf8611fece3bc7cebe4bda0 Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Tue, 25 Mar 2025 12:12:19 +0600
Subject: [PATCH] Fixed settings window title

---
 source/libublsettingsui-gtk3-config-window.c | 36 +++++++++++---------
 source/libublsettingsui-gtk3.c               |  2 +-
 source/libublsettingsui-gtk3.h               |  2 ++
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/source/libublsettingsui-gtk3-config-window.c b/source/libublsettingsui-gtk3-config-window.c
index 72a8501..9127dd4 100644
--- a/source/libublsettingsui-gtk3-config-window.c
+++ b/source/libublsettingsui-gtk3-config-window.c
@@ -90,6 +90,8 @@ ubl_settings_window *yon_ubl_settings_window_new(){
     window->WorkZoneBox = yon_gtk_builder_get_widget(builder,"WorkZoneBox");
     window->AcceptButton = yon_gtk_builder_get_widget(builder,"AcceptButton");
     window->CancelButton = yon_gtk_builder_get_widget(builder,"CancelButton");
+    gtk_window_set_title(GTK_WINDOW(window->window),template_app_information.app_title);
+    gtk_window_set_icon_name(GTK_WINDOW(window->window),yon_char_append("com.ublinux.",template_app_information.app_tech_name));
     return window;
 }
 
@@ -172,6 +174,23 @@ char *yon_settings_configuration_get(char *id){
 
 //signnals section
 
+void __yon_on_boolean_parameter_toggled(GtkToggleButton *self ,char *id){
+    yon_configuration_parameters *current = (yon_configuration_parameters*)yon_dictionary_get((dictionary**)&__yon_settings_parameters,id);
+    if (current){
+        current->data= gtk_toggle_button_get_active(self)?(void*)1:(void*)0;
+    }
+}
+
+void on_confuguration_combo_box_changed(GtkComboBox *self, char *id){
+    yon_configuration_parameters *cur = (yon_configuration_parameters*)yon_dictionary_get((dictionary**)&__yon_settings_parameters,id);
+    if (cur){
+        char *cur_value = yon_char_new((char*)gtk_combo_box_get_active_id(self));
+        if (yon_window_config_check_init()){
+            yon_window_config_add_instant_parameter(id,"settings",cur_value,YON_TYPE_STRING);
+        }
+    }
+}
+
 void __yon_on_ubl_settings_window_open(){
     if (!__yon_settings_parameters) return;
     ubl_settings_window *window = yon_ubl_settings_window_new();
@@ -201,23 +220,6 @@ void __yon_on_ubl_settings_window_open(){
     gtk_widget_show(window->window);
 }
 
-void __yon_on_boolean_parameter_toggled(GtkToggleButton *self ,char *id){
-    yon_configuration_parameters *current = (yon_configuration_parameters*)yon_dictionary_get((dictionary**)&__yon_settings_parameters,id);
-    if (current){
-        current->data= gtk_toggle_button_get_active(self)?(void*)1:(void*)0;
-    }
-}
-
-void on_confuguration_combo_box_changed(GtkComboBox *self, char *id){
-    yon_configuration_parameters *cur = (yon_configuration_parameters*)yon_dictionary_get((dictionary**)&__yon_settings_parameters,id);
-    if (cur){
-        char *cur_value = yon_char_new((char*)gtk_combo_box_get_active_id(self));
-        if (yon_window_config_check_init()){
-            yon_window_config_add_instant_parameter(id,"settings",cur_value,YON_TYPE_STRING);
-        }
-    }
-}
-
 //init section
 
 void yon_configuration_window_add_combo_box_parameter(enum CONFIGURATION_PARAMETER_TYPE type, char *id, char *label, GCallback func, gpointer data,...){
diff --git a/source/libublsettingsui-gtk3.c b/source/libublsettingsui-gtk3.c
index 67a81d5..bec248b 100644
--- a/source/libublsettingsui-gtk3.c
+++ b/source/libublsettingsui-gtk3.c
@@ -115,7 +115,7 @@ void on_about(GtkWidget *self, char *version_application){
     gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(window),template_app_information.app_title);
     gtk_about_dialog_set_logo_icon_name(GTK_ABOUT_DIALOG(window),yon_char_append("com.ublinux.",template_app_information.app_tech_name));
     gtk_window_set_icon_name(GTK_WINDOW(window),yon_char_append("com.ublinux.",template_app_information.app_tech_name));
-    gtk_window_set_title(GTK_WINDOW(window),template_app_information.app_title);
+    gtk_window_set_title(GTK_WINDOW(window),about_label(template_app_information.app_title));
     gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(window),template_app_information.app_tech_name);
     gtk_label_set_text(GTK_LABEL(title),template_app_information.app_title);
     g_signal_connect(G_OBJECT(window),"activate-link",G_CALLBACK(on_link),NULL);
diff --git a/source/libublsettingsui-gtk3.h b/source/libublsettingsui-gtk3.h
index 7d675e6..c815f99 100644
--- a/source/libublsettingsui-gtk3.h
+++ b/source/libublsettingsui-gtk3.h
@@ -315,6 +315,8 @@ char *yon_custom_config_init();
     #define template_ui_LocalePath "/usr/share/locale" 
     #define template_ui_LocaleName "libublsettingsui-gtk3"
 
+    #define about_label(target) yon_char_unite(_("About")," ",target,NULL)
+
     #define SUCCESS_LABEL _("Operation succeeded")
     #define ROOT_WARNING_LABEL _("Warning! Application was launched without root - root-dependent actions are locked")