From 1ed3b1550b6e8f03be91fd4db74281014d8f40e3 Mon Sep 17 00:00:00 2001
From: Igor Belitskiy <goga.belitskiy.00@mail.eu>
Date: Mon, 24 Apr 2023 17:38:21 +0600
Subject: [PATCH] =?UTF-8?q?=D0=A7=D0=B0=D1=81=D1=82=D1=8C=20=D0=BF=D0=B5?=
 =?UTF-8?q?=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D1=8B=D1=85=20=D0=B2=D1=8B?=
 =?UTF-8?q?=D0=BD=D0=B5=D1=81=D0=B5=D0=BD=D0=BE=20=D0=B2=20=D0=BE=D1=82?=
 =?UTF-8?q?=D0=B4=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B=D0=B9=20=D1=84=D0=B0=D0=B9?=
 =?UTF-8?q?=D0=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/CMakeLists.txt                  |  2 +-
 source/main.cc                         |  4 ++--
 source/{my_cmd.h => my_cmd_and_path.h} | 10 ++++++----
 source/ubl-settings-datetime.cc        |  6 ------
 source/ubl-settings-datetime.h         |  9 +--------
 5 files changed, 10 insertions(+), 21 deletions(-)
 rename source/{my_cmd.h => my_cmd_and_path.h} (86%)

diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 435f6a0..c9f07e6 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -34,7 +34,7 @@ set(SOURCE_FILES
         ubl-settings-datetime-cm.h
         ubl-util-standard.h
         ubl-util-standard.c
-        my_cmd.h
+        my_cmd_and_path.h
         main.cc 
         ubl-settings-datetime.cc 
         ubl-settings-datetime.h) 
diff --git a/source/main.cc b/source/main.cc
index 909431b..4e6c94d 100644
--- a/source/main.cc
+++ b/source/main.cc
@@ -21,7 +21,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 + "ubl-settings-datetime.glade");
+        auto builder = Gtk::Builder::create_from_file(path_glade);
         Glib::init();
         setlocale(LC_ALL, "");
         Glib::OptionContext context;
@@ -48,7 +48,7 @@ int main(int argc, char* argv[]) {
         int len_argv = 1;
         pars_flag(1, argc, argv);
         auto app = Gtk::Application::create(len_argv, argv, "org.gtkmm.example.plug");
-        auto builder = Gtk::Builder::create_from_file(path_glade + "ubl-settings-datetime.glade");
+        auto builder = Gtk::Builder::create_from_file(path_glade);
         MainWindow* wnd = nullptr;
         builder->get_widget_derived("window", wnd);
         auto r = app->run(*wnd);
diff --git a/source/my_cmd.h b/source/my_cmd_and_path.h
similarity index 86%
rename from source/my_cmd.h
rename to source/my_cmd_and_path.h
index 9db24c4..2dd328f 100644
--- a/source/my_cmd.h
+++ b/source/my_cmd_and_path.h
@@ -29,10 +29,12 @@
 #define icon_checked "com.ublinux.ubl-settings-datetime.checked"
 #define icon_warning "com.ublinux.ubl-settings-datetime.warning"
 #define get_global_defalult_HWCLOCK_SYNC "ubconfig --default --source global get clock HWCLOCK_SYNC"
-
-
-
-
+#define path_app "/usr/bin/"
+#define path_glade "/usr/share/ubl-settings-datetime/ui/ubl-settings-datetime.glade"
+#define app_name "ubl-settings-datetime"
+#define path_locale "/usr/share/locale/"
+#define path_css "/usr/share/ubl-settings-datetime/css/ubl-settings-datetime.css"
+#define path_img_head_background "/usr/share/ubl-settings-datetime/images/logo-background.png"
 #endif
 
 
diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc
index 227f8a6..19e62f3 100755
--- a/source/ubl-settings-datetime.cc
+++ b/source/ubl-settings-datetime.cc
@@ -2,12 +2,6 @@
 #include "ubl-settings-datetime.h"
 using namespace std;
 
-const string path_app = "/usr/bin/";
-const string path_glade = "/usr/share/ubl-settings-datetime/ui/";
-const string app_name = "ubl-settings-datetime";
-const string path_locale = "/usr/share/locale/";
-const string path_css = "/usr/share/ubl-settings-datetime/css/ubl-settings-datetime.css";
-const string path_img_head_background = "/usr/share/ubl-settings-datetime/images/logo-background.png";
 bool flag_datetime = false;
 bool flag_timezone = false;
 bool flag_ntp_mode = false;
diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h
index 98d2835..fe03a64 100644
--- a/source/ubl-settings-datetime.h
+++ b/source/ubl-settings-datetime.h
@@ -18,7 +18,7 @@
 #include <map>
 #include <pwd.h>
 #include "ubl-util-standard.c"
-#include "my_cmd.h"
+#include "my_cmd_and_path.h"
 #include "ubl-settings-datetime-cm.h"
 #include "my_localization.h"
 #ifdef WEBKIT_FOUND
@@ -27,13 +27,6 @@
 #endif
 
 using namespace std;
-
-extern const string path_app;
-extern const string path_glade;
-extern const string app_name;
-extern const string path_locale;
-extern const string path_css;
-extern const string path_img_head_background;
 extern bool flag_datetime;
 extern bool flag_timezone;
 extern bool flag_ntp_mode;