From 85c9f3b2eb28ec765005868fdb73845f6a761cc9 Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Thu, 10 Aug 2023 10:31:24 +0600
Subject: [PATCH 1/5] Fixed crash in settings manager, Fixed version and --help
 argument

---
 Makefile                        | 2 +-
 source/main.cc                  | 6 +++---
 source/ubl-settings-datetime.cc | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 935a97e..f2cc6a5 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ CMAKE_BUILD_DIR = $(MAKEFILE_PATH)compile
 DEPENDS = /bin/cmake
 PREFIX ?= /usr/local
 PKGNAME = $(MAKEFILE_DIR)
-FILE_VER = source/${PKGNAME}.h
+FILE_VER = source/${PKGNAME}.cc
 PKGIDENT = $(subst /,-,$(subst /usr,,${PREFIX}))
 
 default_target: all
diff --git a/source/main.cc b/source/main.cc
index 74d2ff0..b1d135b 100644
--- a/source/main.cc
+++ b/source/main.cc
@@ -10,8 +10,8 @@ int main(int argc, char* argv[]) {
     }  
     if (geteuid() != 0){
         string cmd = "";
-        cmd = cmd + "pkexec " + app_name + " " + str_cmd_argv;
-        return system(cmd.c_str());
+        // cmd = cmd + "pkexec " + app_name + " " + str_cmd_argv;
+        // return system(cmd.c_str());
     }
     setlocale(LC_ALL, "");
     bindtextdomain("ubl-settings-datetime", "/usr/share/locale/");
@@ -25,7 +25,7 @@ int main(int argc, char* argv[]) {
         
         pars_flag(3, argc, argv);
         auto app = Gtk::Application::create(argc, argv, "org.gtkmm.example.plug");
-        auto builder = Gtk::Builder::create_from_file(path_glade);
+        auto builder = Gtk::Builder::create_from_resource(path_glade);
         Glib::init();
         setlocale(LC_ALL, "");
         Glib::OptionContext context;
diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc
index edb22d4..4b9dfc1 100644
--- a/source/ubl-settings-datetime.cc
+++ b/source/ubl-settings-datetime.cc
@@ -13,7 +13,7 @@ bool flag_load_global = false;
 bool flag_sync_hwclock = false;
 int socket_ext_id_I = 0;
 int socket_trd_id_I = 0;
-string version_application = "";
+string version_application;
 MainWindow* obj_main;
 void wrapper_help_show(GtkWidget *self, char* link, gpointer user_data) {
     if (self && user_data) {}
-- 
2.35.1


From dd2ccf989aca742c2d6b325efcfd7adaae0f1d85 Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Thu, 10 Aug 2023 10:36:01 +0600
Subject: [PATCH 2/5] About window now shows in quickbar

---
 ubl-settings-datetime.glade | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade
index 21db2fa..9114162 100644
--- a/ubl-settings-datetime.glade
+++ b/ubl-settings-datetime.glade
@@ -91,7 +91,6 @@
     <property name="window-position">center</property>
     <property name="icon-name">com.ublinux.ubl-settings-datetime</property>
     <property name="type-hint">dialog</property>
-    <property name="skip-taskbar-hint">True</property>
     <property name="urgency-hint">True</property>
     <property name="program-name">ubl-settings-datetime</property>
     <property name="version">1.0</property>
-- 
2.35.1


From 3a2b1682673d49bde0bfdd3c3b1f3825fd4621a0 Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Thu, 10 Aug 2023 10:44:28 +0600
Subject: [PATCH 3/5] Fixed black windows bug

---
 ubl-settings-datetime.glade | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade
index 9114162..b532f72 100644
--- a/ubl-settings-datetime.glade
+++ b/ubl-settings-datetime.glade
@@ -1312,7 +1312,6 @@ Format: DD.MM.YYYY</property>
   </object>
   <object class="GtkWindow" id="windowMessDchp">
     <property name="can-focus">False</property>
-    <property name="valign">start</property>
     <property name="resizable">False</property>
     <child>
       <object class="GtkBox">
@@ -1414,8 +1413,6 @@ Format: DD.MM.YYYY</property>
   </object>
   <object class="GtkApplicationWindow" id="wndShowWeb">
     <property name="can-focus">False</property>
-    <property name="halign">start</property>
-    <property name="valign">start</property>
     <property name="resizable">False</property>
     <property name="default-width">450</property>
     <property name="default-height">250</property>
-- 
2.35.1


From 8236cada6974d51ccf1bbceec0e2944349fb9ccc Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Wed, 16 Aug 2023 16:24:45 +0600
Subject: [PATCH 4/5] Changed documentation confirmation window size

---
 ubl-settings-datetime.glade | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade
index b532f72..76e34da 100644
--- a/ubl-settings-datetime.glade
+++ b/ubl-settings-datetime.glade
@@ -1412,6 +1412,7 @@ Format: DD.MM.YYYY</property>
     </child>
   </object>
   <object class="GtkApplicationWindow" id="wndShowWeb">
+    <property name="width-request">450</property>
     <property name="can-focus">False</property>
     <property name="resizable">False</property>
     <property name="default-width">450</property>
-- 
2.35.1


From 871d2bf7f1b53e426d74641d7d26d3ec66f0a283 Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Wed, 16 Aug 2023 16:26:15 +0600
Subject: [PATCH 5/5] Changed documentation confirmation window size

---
 ubl-settings-datetime.glade | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade
index 76e34da..57cdd14 100644
--- a/ubl-settings-datetime.glade
+++ b/ubl-settings-datetime.glade
@@ -1414,9 +1414,6 @@ Format: DD.MM.YYYY</property>
   <object class="GtkApplicationWindow" id="wndShowWeb">
     <property name="width-request">450</property>
     <property name="can-focus">False</property>
-    <property name="resizable">False</property>
-    <property name="default-width">450</property>
-    <property name="default-height">250</property>
     <property name="icon-name">dialog-question-symbolic</property>
     <child>
       <object class="GtkBox">
-- 
2.35.1