From 1f24d1b9b765363f23d7efcc6a21cd66df3afc5b Mon Sep 17 00:00:00 2001
From: Igor Belitskiy <goga.belitskiy.00@mail.eu>
Date: Thu, 9 Mar 2023 15:28:44 +0600
Subject: [PATCH 01/27] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B7=D1=80=D0=B0?=
 =?UTF-8?q?=D1=87=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20HeadBa=20Cssr?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/ubl-settings-datetime.cc | 109 ++++++++++++--------------------
 style.css                       |  14 ++--
 2 files changed, 48 insertions(+), 75 deletions(-)

diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc
index b6a0353..0f4cd44 100644
--- a/source/ubl-settings-datetime.cc
+++ b/source/ubl-settings-datetime.cc
@@ -15,8 +15,8 @@ bool flag_save = false;
 bool flag_save_local = false;
 bool flag_save_global = false;
 bool flag_load_global = false;
-int socket_ext_id_I= 0;
-int socket_trd_id_I= 0;
+int socket_ext_id_I = 0;
+int socket_trd_id_I = 0;
 
 CmdArgParser::CmdArgParser(const std::string& p_name, const std::string& p_description, const std::string& p_help)
 : Glib::OptionGroup{p_name, p_description, p_help} {
@@ -97,7 +97,6 @@ void MainWindow::settings() {
         this->event();
         imgInfo->set("/usr/share/ubl-settings-datetime/images/checked.svg");
     }
-
 }
 
 
@@ -139,7 +138,6 @@ void MainWindow::lacalization() {
     lblHW->set_text(_("Synchronize hardware time:"));
     cbHw->append(_("Local time"));
     cbHw->append(_("UTC time"));
-    
 }
 
 void MainWindow::flag_block_gui() {
@@ -187,36 +185,20 @@ void MainWindow::add_CSS() {
     Glib::RefPtr<Gtk::StyleContext> styleContext = Gtk::StyleContext::create();
     Glib::RefPtr<Gdk::Screen> screen = Gdk::Screen::get_default();//get default screen
     styleContext->add_provider_for_screen(screen, cssProvider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);//add provider for screen in all application
-    Glib::RefPtr<Gtk::StyleContext> context = boxColor->get_style_context();
-    Glib::RefPtr<Gtk::StyleContext> context_lbl_head = lblHead->get_style_context();
-    context->add_class("cssboxColor1");
-    context_lbl_head->add_class("textHead");
-    /*
+    Glib::RefPtr<Gtk::StyleContext> boxColor_css = boxColor->get_style_context();
+    boxColor_css->add_class("cssboxColor1");
+    Glib::RefPtr<Gtk::StyleContext> lblHead_css = lblHead->get_style_context();
     Glib::RefPtr<Gtk::StyleContext> boxButton_css = boxButton->get_style_context();
     Glib::RefPtr<Gtk::StyleContext> boxSave_css = boxSave->get_style_context();
-    Glib::RefPtr<Gtk::StyleContext> btnDownload_css = btnDownload->get_style_context();
-    Glib::RefPtr<Gtk::StyleContext> lblDownload_css = lblDownload->get_style_context();
-    Glib::RefPtr<Gtk::StyleContext> imgDonwload_css = imgDonwload->get_style_context();
     Glib::RefPtr<Gtk::StyleContext> headerBar_css = headerBar->get_style_context();
-    headerBar_css->add_class("bkim");
-    imgDonwload_css->add_class("bkim");
-    lblDownload_css->add_class("bkim");
-    btnDownload_css->add_class("bkim");
-    boxButton_css->add_class("bkim");
-    boxSave_css->add_class("bkim");
-    double opacity= 1.0;
-    headerBar->set_opacity(opacity);
-    boxButton->set_opacity(opacity);
-    boxSave->set_opacity(opacity);
-    btnDownload->set_opacity(opacity);
-    lblDownload->set_opacity(opacity);
-    imgDonwload->set_opacity(opacity);
-    btnSave->set_opacity(opacity);
-    lblSave->set_opacity(opacity);
-    btnSettings->set_opacity(opacity);
-    imgSave->set_opacity(opacity);
-    imgSettings->set_opacity(opacity);
-    */
+    lblHead_css->add_class("textHead");
+    boxButton_css->add_class("bkimButton");
+    boxSave_css->add_class("bkimButton");
+    headerBar_css->add_class("bkimHeadBar");
+    //Glib::RefPtr<Gtk::StyleContext> w = this->get_style_context();
+    //w->add_class("bkim");
+
+
     
 }
 
@@ -244,22 +226,22 @@ void MainWindow::get_builder() {
     builder->get_widget("cldrDate", cldrDate);
     builder->get_widget("mess_dchp", mess_dchp);
     builder->get_widget("lblMessage", lblMessage);
-    builder->get_widget("lblDateTimeSetting",lblDateTimeSetting);
-    builder->get_widget("lblHead",lblHead);
-    builder->get_widget("lblTime",lblTime);
-    builder->get_widget("lblData",lblData);
-    builder->get_widget("lblTimeZone",lblTimeZone);
-    builder->get_widget("lblReg",lblReg);
-    builder->get_widget("lblZone",lblZone);
-    builder->get_widget("lblSynchronizebChkGLob",lblSynchronizebChkGLob);
-    builder->get_widget("lblSynchronizeBtn",lblSynchronizeBtn);
-    builder->get_widget("lblTimeBios",lblTimeBios);
+    builder->get_widget("lblDateTimeSetting", lblDateTimeSetting);
+    builder->get_widget("lblHead", lblHead);
+    builder->get_widget("lblTime", lblTime);
+    builder->get_widget("lblData", lblData);
+    builder->get_widget("lblTimeZone", lblTimeZone);
+    builder->get_widget("lblReg", lblReg);
+    builder->get_widget("lblZone", lblZone);
+    builder->get_widget("lblSynchronizebChkGLob", lblSynchronizebChkGLob);
+    builder->get_widget("lblSynchronizeBtn", lblSynchronizeBtn);
+    builder->get_widget("lblTimeBios", lblTimeBios);
     builder->get_widget("btnHardwareTime",btnHardwareTime);
     builder->get_widget("mess_sudo",mess_sudo);
-    builder->get_widget("lblMessageSudo",lblMessageSudo);
+    builder->get_widget("lblMessageSudo", lblMessageSudo);
     builder->get_widget("btnMessCloseSudo",btnMessCloseSudo);
-    builder->get_widget("lblSave",lblSave);
-    builder->get_widget("lblDownload",lblDownload);
+    builder->get_widget("lblSave", lblSave);
+    builder->get_widget("lblDownload", lblDownload);
     builder->get_widget("aboutWindows", aboutWindows);
     builder->get_widget("btnBoxAboutDialog", btnBoxAboutDialog);
     builder->get_widget("boxInfoError", boxInfoError);
@@ -290,7 +272,6 @@ void MainWindow::get_builder() {
     builder->get_widget("imgDonwload", imgDonwload);
     builder->get_widget("imgSettings", imgSettings);
     builder->get_widget("imgSave", imgSave);
-    
 }
 
 void MainWindow::gui_exit() {
@@ -322,7 +303,6 @@ void MainWindow::event() {
     btnSaveLocalGlob->signal_activate().connect([&]() {save_global_local_cfg();});
     btnSaveLocal->signal_activate().connect([&]() {save_local_cfg();});
     btnSaveGlob->signal_activate().connect([&]() {save_global_cfg();});
-
 }
 
 void MainWindow::synopsis_show() {
@@ -366,10 +346,10 @@ void MainWindow::save_local_cfg() {
     string cmd_default = "/usr/bin/ubconfig --target system set network NTPSERVERS=default";
     string cmd_dhcp = "/usr/bin/ubconfig --target system set network NTPSERVERS=dhcp";
     string cmd_set_ntp = "/usr/bin/ubconfig --target system set network NTPSERVERS=\"";
-    string remove = "/usr/bin/ubconfig --target system remove network NTPSERVERS";
-    this->save_Dhcp(cmd_default, cmd_dhcp, remove, cmd_set_ntp);
+    string remove_ntp = "/usr/bin/ubconfig --target system remove network NTPSERVERS";
+    this->save_Dhcp(cmd_default, cmd_dhcp, remove_ntp, cmd_set_ntp);
     string local = "/usr/bin/ubconfig --target system set clock HWCLOCK_SYNC=localtime";
-    string hw =    "/usr/bin/ubconfig --target system set clock HWCLOCK_SYNC=utc";
+    string hw = "/usr/bin/ubconfig --target system set clock HWCLOCK_SYNC=utc";
     this->hardware_clock_global(local, hw);
     info_warning_error(2);
 }
@@ -380,8 +360,8 @@ void MainWindow::save_global_cfg() {
     string cmd_default = "/usr/bin/ubconfig --target global set network NTPSERVERS=default";
     string cmd_dhcp = "/usr/bin/ubconfig --target global set network NTPSERVERS=dhcp";
     string cmd_set_ntp = "/usr/bin/ubconfig --target global set network NTPSERVERS=\"";
-    string remove = "/usr/bin/ubconfig --target global remove network NTPSERVERS";
-    this->save_Dhcp(cmd_default, cmd_dhcp, remove, cmd_set_ntp);
+    string remove_ntp = "/usr/bin/ubconfig --target global remove network NTPSERVERS";
+    this->save_Dhcp(cmd_default, cmd_dhcp, remove_ntp, cmd_set_ntp);
     string local = "/usr/bin/ubconfig --target global set clock HWCLOCK_SYNC=localtime";
     string hw = "/usr/bin/ubconfig --target global set clock HWCLOCK_SYNC=utc";
     this->hardware_clock_global(local, hw);
@@ -560,7 +540,6 @@ bool MainWindow::focus_ntp(string &cmd_set_ntp) {
                 mess_dchp->show();
             }
         }
-
     }
     return true;
 }
@@ -676,8 +655,6 @@ void MainWindow::event_entry_cbDhcp() {
         txtNtpServer->set_text("");
         btnUpdateDateTime->set_sensitive(false);
         txtNtpServer->set_sensitive(false);
-
-
     }
     else if (activ_index == 1) {
         btnUpdateDateTime->set_sensitive(false);
@@ -685,7 +662,7 @@ void MainWindow::event_entry_cbDhcp() {
         txtNtpServer->set_text("");
     }
     else if (activ_index == 2) {
-        if (flag_ntp_edit==false) {
+        if (flag_ntp_edit == false) {
             txtNtpServer->set_sensitive(true);
         }
     }
@@ -703,7 +680,6 @@ void MainWindow::save_Dhcp(string &cmd_default, string &cmd_dhcp, string &remove
     }
     else if (activ_index == 0) {
         wrapper_system(cmd_default, "&");
-        
     }
     else if (activ_index == 1) {
         wrapper_system(cmd_dhcp, "&");
@@ -761,7 +737,7 @@ void MainWindow::entry_dhcp_mess(string cmd_get_dhcp, string cmd_default_get_dhc
             else {
                 cbDhcp->set_active(2);
                 txtNtpServer->set_text(str_dhcp);
-                if (flag_ntp_edit==false) {
+                if (flag_ntp_edit ==false) {
                     txtNtpServer->set_sensitive(true);
                 }
             }
@@ -772,7 +748,7 @@ void MainWindow::entry_dhcp_mess(string cmd_get_dhcp, string cmd_default_get_dhc
         txtNtpServer->set_text("");
         txtNtpServer->set_sensitive(false);
         btnUpdateDateTime->set_sensitive(true);
-        warning_info-= 1;
+        warning_info -= 1;
     }
 }
 
@@ -846,8 +822,6 @@ void MainWindow::fill_in_reg_zone(string &cmd) {
     }
 }
 
-
-
 void MainWindow::get_config() {
     this->read_file();
     this->update_hour_minute();
@@ -872,7 +846,6 @@ array<string, 2> MainWindow::split_region_zone(string &read_reg_zon_cfg) {
         arr[1] = "";
     }
     return arr;
-
 }
 
 
@@ -957,7 +930,7 @@ void MainWindow::append_region_zone(string region, string zone, Gtk::ComboBoxTex
     string zone_mixing = "";
     string path_reg_zone = "";
     string zone_offest = "";
-    path_reg_zone=region + "/" + zone;
+    path_reg_zone = region + "/" + zone;
     zone_offest = this->zone_file_read(path_reg_zone) + _(zone.c_str());
     if (region == "") {
         tmpCbZone->append(" ");
@@ -1008,8 +981,7 @@ string MainWindow::call(string cmd) {
     status = pclose(fp);
     if (status == -1) {
         exit(1);
-    } 
-
+    }
     return path;
 }
 
@@ -1018,8 +990,8 @@ void MainWindow::append_zone() {
     int index = cbRegion->get_active_row_number();
     if (index!=-1) {
         string str_region = array_region[index];
-        string zone_mixing=  ""; 
-        string path_dir=  ""; 
+        string zone_mixing =  ""; 
+        string path_dir =  ""; 
         if(str_region.length() != 0) {
             for (const auto &_str_zone : time_reg_map_local.at(str_region)) {
                 cbZone->append(Glib::ustring(_str_zone));
@@ -1227,8 +1199,9 @@ void MainWindow::sort_zone(vector<string> *time_reg_map_local,vector<string> *ti
                     b = (*time_reg_map)[j];
                     (*time_reg_map)[j] = (*time_reg_map)[j + 1];
                     (*time_reg_map)[j + 1] = b;
-        }   }
-    }
+                } 
+            }
+        }
     }
 }
 
diff --git a/style.css b/style.css
index fadccb5..6467710 100644
--- a/style.css
+++ b/style.css
@@ -71,11 +71,11 @@
   margin-bottom:0px;
 }
 
-.bkim{
-  background-image: -gtk-gradient(linear,
-  left top, left bottom,
-  from(@entry_background_a),
-  color-stop(0.20, @entry_background_b),
-  color-stop(0.85, @entry_background_c),
-  to(@entry_background_d));
+.bkimHeadBar{
+  opacity:1.0;
+}
+
+.bkimButton{
+  background-color: transparent;
+  opacity:1.0;
 }
\ No newline at end of file

From 6f3df24a9205b9363c13a50dff7915cf46954353 Mon Sep 17 00:00:00 2001
From: Igor Belitskiy <goga.belitskiy.00@mail.eu>
Date: Thu, 9 Mar 2023 15:33:58 +0600
Subject: [PATCH 02/27] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20=D0=B4=D0=B8=D0=B7=D0=B0=D0=B9=D0=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade
index 6fdf5c9..ab264a4 100644
--- a/ubl-settings-datetime.glade
+++ b/ubl-settings-datetime.glade
@@ -971,6 +971,7 @@ Format: DD.MM.YYYY</property>
             <property name="margin-right">5</property>
             <property name="margin-start">5</property>
             <property name="margin-end">5</property>
+            <property name="margin-bottom">1</property>
             <property name="hexpand">False</property>
             <property name="label" translatable="yes">ubl-settings-datetime</property>
             <attributes>

From 6e26dca9b3feaa1226b839931fd5bfba2a74ce85 Mon Sep 17 00:00:00 2001
From: Igor Belitskiy <goga.belitskiy.00@mail.eu>
Date: Fri, 10 Mar 2023 16:04:48 +0600
Subject: [PATCH 03/27] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BB=D0=BE=D0=BA=D0=B0=D0=BB=D0=B8?=
 =?UTF-8?q?=D0=B7=D0=B0=D1=86=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/ubl-settings-datetime.cc |  5 -----
 source/ubl-util-standard.c      |  3 +++
 style.css                       |  5 +++++
 ubl-settings-datetime.glade     | 16 ++++++++--------
 ubl-settings-datetime_ru.po     | 18 +++++++++---------
 5 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc
index 0f4cd44..f26b5bd 100644
--- a/source/ubl-settings-datetime.cc
+++ b/source/ubl-settings-datetime.cc
@@ -195,11 +195,6 @@ void MainWindow::add_CSS() {
     boxButton_css->add_class("bkimButton");
     boxSave_css->add_class("bkimButton");
     headerBar_css->add_class("bkimHeadBar");
-    //Glib::RefPtr<Gtk::StyleContext> w = this->get_style_context();
-    //w->add_class("bkim");
-
-
-    
 }
 
 
diff --git a/source/ubl-util-standard.c b/source/ubl-util-standard.c
index 8cff122..df38341 100644
--- a/source/ubl-util-standard.c
+++ b/source/ubl-util-standard.c
@@ -52,6 +52,7 @@ inline void ubl_make_plugs(Gtk::Widget *LeftWidget, Gtk::Widget *RightWidget, in
         } else 
             gtk_container_add(GTK_CONTAINER(plug),GTK_WIDGET(toplug));
         gtk_widget_show(GTK_WIDGET(plug));
+        gtk_style_context_add_class(gtk_widget_get_style_context(plug),"bkimButtonPlug");
     }
     if (right_plug_id>0&&RightWidget){
         GtkWidget *plug=gtk_plug_new(right_plug_id);
@@ -64,6 +65,8 @@ inline void ubl_make_plugs(Gtk::Widget *LeftWidget, Gtk::Widget *RightWidget, in
         } else 
             gtk_container_add(GTK_CONTAINER(plug),GTK_WIDGET(toplug));
         gtk_widget_show(GTK_WIDGET(plug));
+        gtk_style_context_add_class(gtk_widget_get_style_context(plug),"bkimButtonPlug");
+        
     }
 }
 #endif
\ No newline at end of file
diff --git a/style.css b/style.css
index 6467710..a05efb2 100644
--- a/style.css
+++ b/style.css
@@ -78,4 +78,9 @@
 .bkimButton{
   background-color: transparent;
   opacity:1.0;
+}
+.bkimButtonPlug{
+  background-color: transparent;
+  color: rgb(0, 0, 0);
+  opacity:1.0;
 }
\ No newline at end of file
diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade
index ab264a4..f38bc75 100644
--- a/ubl-settings-datetime.glade
+++ b/ubl-settings-datetime.glade
@@ -56,10 +56,10 @@
     <property name="reserve-toggle-size">False</property>
     <property name="rect-anchor-dy">4</property>
     <child>
-      <object class="GtkMenuItem" id="btnDonwlodLocal">
+      <object class="GtkMenuItem" id="btnDonwlolGlob">
         <property name="visible">True</property>
         <property name="can-focus">False</property>
-        <property name="label" translatable="yes">Download local</property>
+        <property name="label" translatable="yes">Load global configuration</property>
         <property name="use-underline">True</property>
         <style>
           <class name="menuitemtop"/>
@@ -67,10 +67,10 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="btnDonwlolGlob">
+      <object class="GtkMenuItem" id="btnDonwlodLocal">
         <property name="visible">True</property>
         <property name="can-focus">False</property>
-        <property name="label" translatable="yes">Download global</property>
+        <property name="label" translatable="yes">Load local configuration</property>
         <property name="use-underline">True</property>
         <style>
           <class name="menuitembottom"/>
@@ -125,10 +125,10 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="btnSaveLocal">
+      <object class="GtkMenuItem" id="btnSaveGlob">
         <property name="visible">True</property>
         <property name="can-focus">False</property>
-        <property name="label" translatable="yes">Save to local configuration</property>
+        <property name="label" translatable="yes">Save global configuration</property>
         <property name="use-underline">True</property>
         <style>
           <class name="menuitemmiddle"/>
@@ -136,10 +136,10 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="btnSaveGlob">
+      <object class="GtkMenuItem" id="btnSaveLocal">
         <property name="visible">True</property>
         <property name="can-focus">False</property>
-        <property name="label" translatable="yes">Save to Global configuration</property>
+        <property name="label" translatable="yes">Save local configuration</property>
         <property name="use-underline">True</property>
         <style>
           <class name="menuitembottom"/>
diff --git a/ubl-settings-datetime_ru.po b/ubl-settings-datetime_ru.po
index 8dccb5f..de6b67a 100644
--- a/ubl-settings-datetime_ru.po
+++ b/ubl-settings-datetime_ru.po
@@ -1664,19 +1664,19 @@ msgid "Save"
 msgstr "Сохранить"
 
 msgid "Save to global and local configuration"
-msgstr "Сохранить в глобальную и локальную конфигурацию"
+msgstr "Сохранить глобальную и локальную конфигурацию"
 
-msgid "Save to Global configuration"
-msgstr "Сохранить в глобальную конфигурацию"
+msgid "Save global configuration"
+msgstr "Сохранить глобальную конфигурацию"
 
-msgid "Save to local configuration"
-msgstr "Сохранить в локальную конфигурацию"
+msgid "Save local configuration"
+msgstr "Сохранить локальную конфигурацию"
 
-msgid "Download global"
-msgstr "Загрузить глобально"
+msgid "Load global configuration"
+msgstr "Загрузить глобальную конфигурацию"
 
-msgid "Download local"
-msgstr "Загрузить локально"
+msgid "Load local configuration"
+msgstr "Загрузить локальную конфигурацию"
 
 msgid "Disabled"
 msgstr "Отключено"

From c9e83aae12408e74e8079f48d8ab310d054cea38 Mon Sep 17 00:00:00 2001
From: Igor Belitskiy <goga.belitskiy.00@mail.eu>
Date: Fri, 10 Mar 2023 16:17:57 +0600
Subject: [PATCH 04/27] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D0=B8=D0=BA=D0=BE=D0=BD=D0=BE=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Makefile b/Makefile
index 370b374..0dbc66e 100644
--- a/Makefile
+++ b/Makefile
@@ -116,8 +116,8 @@ install: check uninstall
 	@install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" "${pkgname}.svg"
 	@install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" "${pkgname}.png"
 	@install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" bg_top.png
-	@install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" checked.svg
-	@install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" warning.svg
+	@install -Dm644 -t /usr/share/icons/hicolor/scalable/status/ checked.svg
+	@install -Dm644 -t /usr/share/icons/hicolor/scalable/status/ warning.svg
 	@gtk-update-icon-cache -fiq /usr/share/icons/hicolor/
 	@update-desktop-database --quiet 2>/dev/null 
 	@touch /usr/share/applications
diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc
index f26b5bd..1ac9386 100644
--- a/source/ubl-settings-datetime.cc
+++ b/source/ubl-settings-datetime.cc
@@ -95,7 +95,7 @@ void MainWindow::settings() {
         lblDateTimeSetting->set_sensitive(false);
         btnBoxAboutDialog->set_visible(false);
         this->event();
-        imgInfo->set("/usr/share/ubl-settings-datetime/images/checked.svg");
+        imgInfo->set("checked.svg");
     }
 }
 
@@ -381,7 +381,7 @@ void MainWindow::save_global_local_cfg() {
 void MainWindow::info_warning_error(int mess) {
     if (error_info > 0 || warning_info > 0) {
         info_status_app("boxInfoMessError");
-        imgInfo->set("/usr/share/ubl-settings-datetime/images/warning.svg");
+        imgInfo->set("warning.svg");
         error_info = 0;
         warning_info = 0;
         if (mess == 0) {
@@ -402,7 +402,7 @@ void MainWindow::info_warning_error(int mess) {
     }
     else {
         info_status_app("boxInfoMessOK");
-        imgInfo->set("/usr/share/ubl-settings-datetime/images/checked.svg");
+        imgInfo->set("checked.svg");
         if (mess == 0) {
             lblWarning->set_text(_("Local configuration downloaded successfully"));
         }
diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade
index f38bc75..a614754 100644
--- a/ubl-settings-datetime.glade
+++ b/ubl-settings-datetime.glade
@@ -173,7 +173,7 @@
                     <property name="margin-end">5</property>
                     <property name="margin-top">6</property>
                     <property name="margin-bottom">6</property>
-                    <property name="stock">gtk-missing-image</property>
+                    <property name="stock">checked</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>

From d17d7bad1b225c94f298788fc36468d4096b6aa6 Mon Sep 17 00:00:00 2001
From: Igor Belitskiy <goga.belitskiy.00@mail.eu>
Date: Mon, 13 Mar 2023 10:42:12 +0600
Subject: [PATCH 05/27] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20=D0=B1=D0=B0=D0=B3=20=D1=81=20=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=BC=D0=B0=D0=BD=D0=B4=D0=B0=D0=BC=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/ubl-settings-datetime.cc | 80 ++++++++++++++++++++++-----------
 source/ubl-settings-datetime.h  |  2 +
 2 files changed, 55 insertions(+), 27 deletions(-)

diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc
index 1ac9386..1abc5f3 100644
--- a/source/ubl-settings-datetime.cc
+++ b/source/ubl-settings-datetime.cc
@@ -380,25 +380,45 @@ void MainWindow::save_global_local_cfg() {
 
 void MainWindow::info_warning_error(int mess) {
     if (error_info > 0 || warning_info > 0) {
+        if (cmd_error.length()!=0){
+            vector<int> vec_cmd_prob;
+            vec_cmd_prob = this->find_all(cmd_error, " ");
+            size_t size_vec_prob = vec_cmd_prob.size();
+            if (size_vec_prob > 1){
+                int index = size_vec_prob - 1;
+                index = vec_cmd_prob[index];
+                if (index){
+                    cmd_error = cmd_error.substr(index, cmd_error.length());
+                }
+            }
+        }
         info_status_app("boxInfoMessError");
         imgInfo->set("warning.svg");
         error_info = 0;
         warning_info = 0;
+        string mess_error = "";
         if (mess == 0) {
-            lblWarning->set_text(_("Local configuration reading error"));
+            mess_error = _("Local configuration reading error") + cmd_error;
+            lblWarning->set_text(mess_error);
         }
         else if (mess == 1) {
-            lblWarning->set_text(_("Global configuration read error"));
+            mess_error = _("Global configuration read error") + cmd_error;
+            lblWarning->set_text(mess_error);
         }
         else if (mess == 2) {
-            lblWarning->set_text(_("Local configuration write error"));
+            mess_error = _("Local configuration write error") + cmd_error;
+            lblWarning->set_text(mess_error);
         }
         else if (mess == 3) {
-            lblWarning->set_text(_("Global configuration write error"));
+            mess_error = _("Global configuration write error") + cmd_error;
+            lblWarning->set_text(mess_error);
         }
         else if (mess == 4) {
-            lblWarning->set_text(_("Error saved local and global configuration"));
+            mess_error = _("Error saved local and global configuration") + cmd_error;
+            lblWarning->set_text(mess_error);
         }
+        cmd_error = "";
+        cmd_error_write = "";
     }
     else {
         info_status_app("boxInfoMessOK");
@@ -423,12 +443,12 @@ void MainWindow::info_warning_error(int mess) {
 
 
 void MainWindow::wrapper_system(string cmd, string thread_str = "") {
-    cmd=cmd + " " + thread_str;
+    cmd = cmd + " " + thread_str;
     int response_cmd = system(cmd.c_str());
-    if (response_cmd!= 0) {
-        error_info+= 1;
+    if (response_cmd != 0) {
+        error_info += 1;
+        cmd_error_write = cmd;
     }
-
 }
 
 void MainWindow::hardware_clock_global(string &local, string &etc) {
@@ -610,7 +630,7 @@ bool MainWindow::check_ntp(string &str_ntp) {
 
 struct MainWindow::Result<string> MainWindow::wrapper_call(string cmd) {
     struct Result<string> obj_result;
-    string response=this->call(cmd);
+    string response = this->call(cmd);
     if ((response.find("(null)") == std::string::npos) && (response.length() != 0 )) {
         if (response.find("=") != std::string::npos) {
             if (response.find("\n") != std::string::npos) {
@@ -622,19 +642,22 @@ struct MainWindow::Result<string> MainWindow::wrapper_call(string cmd) {
             else {
                 obj_result.response = response;
                 obj_result.error = 1;
-                warning_info+= 1;
+                warning_info += 1;
+                cmd_error = cmd;
             }
         }
         else {
             obj_result.response = response;
             obj_result.error = 2;
-            warning_info+= 1;
+            warning_info += 1;
+            cmd_error = cmd;
         }
     }
     else {
         obj_result.response = response;
         obj_result.error = 3;
-        warning_info+= 1;
+        warning_info += 1;
+        cmd_error = cmd;
     }
     return obj_result;
 }
@@ -998,6 +1021,7 @@ void MainWindow::append_zone() {
 
 void MainWindow::update_time_date() {
     string cmd = "";
+    string response = "";
     if ((year != 0) && (month != 0) && (day != 0)) {
         string str_month = "";
         string str_day = "";
@@ -1045,22 +1069,24 @@ void MainWindow::update_time_date() {
 
 void MainWindow::post_entry_data() {
     string cmd = "";
-        string data = txtDate->get_text();
-        if (data.length() == 10) {
-            string str_day = data.substr(0,2);
-            string str_month = data.substr(3,2);
-            string str_year = data.substr(6,data.length());
-            cmd = "date +%Y%m%d -s \"" + str_year+
-            str_month+str_day+"\"";
-            string str_error_clock = this->call(cmd);
-            size_t index = str_error_clock.find("date: ");
-            if (index == std::string::npos) {  
-            }
-        }
-        else {
+    string data = txtDate->get_text();
+    if (data.length() == 10) {
+        string str_day = data.substr(0,2);
+        string str_month = data.substr(3,2);
+        string str_year = data.substr(6,data.length());
+        cmd = "date +%Y%m%d -s \"" + str_year+
+        str_month+str_day+"\"";
+        string str_error_clock = this->call(cmd);
+        size_t index = str_error_clock.find("date:");
+        if (index != std::string::npos) {
             lblMessage->set_text(_("Incorrect date format"));
-            mess_dchp->show();   
+            mess_dchp->show(); 
         }
+    }
+    else {
+        lblMessage->set_text(_("Incorrect date format"));
+        mess_dchp->show();   
+    }
 }
 
 void MainWindow::update_hour_minute() {
diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h
index ce4b60e..a44284c 100755
--- a/source/ubl-settings-datetime.h
+++ b/source/ubl-settings-datetime.h
@@ -120,6 +120,8 @@ class MainWindow : public Gtk::ApplicationWindow {
         string version_application = "1.3";
         int error_info = 0;
         int warning_info = 0;
+        string cmd_error = "";
+        string cmd_error_write = "";
         int hour;
         int minute;
         string str_region = "";

From 159b073c208cfab88d7fa19f4921db57251cd46c Mon Sep 17 00:00:00 2001
From: Igor Belitskiy <goga.belitskiy.00@mail.eu>
Date: Mon, 13 Mar 2023 10:54:43 +0600
Subject: [PATCH 06/27] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20=D1=80=D0=B5=D0=B6=D0=B8=D0=BC=20=D0=B1?=
 =?UTF-8?q?=D0=BB=D0=BE=D0=BA=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B8=20gui=20?=
 =?UTF-8?q?=D0=B1=D0=B5=D0=B7=20root?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/ubl-settings-datetime.cc | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc
index 1abc5f3..8b452e7 100644
--- a/source/ubl-settings-datetime.cc
+++ b/source/ubl-settings-datetime.cc
@@ -75,6 +75,10 @@ void MainWindow::settings() {
         this->download_local_cfg();  
     }
     else {
+        lblHW->set_sensitive(false);
+        cbHw->set_sensitive(false);
+        boxButton->set_sensitive(false);
+        boxSave->set_sensitive(false);
         btnDownload->set_sensitive(false);
         numTimeHrs->set_sensitive(false);
         numTimeMin->set_sensitive(false);
@@ -398,23 +402,23 @@ void MainWindow::info_warning_error(int mess) {
         warning_info = 0;
         string mess_error = "";
         if (mess == 0) {
-            mess_error = _("Local configuration reading error") + cmd_error;
+            mess_error = string(_("Local configuration reading error")) + " " + cmd_error;
             lblWarning->set_text(mess_error);
         }
         else if (mess == 1) {
-            mess_error = _("Global configuration read error") + cmd_error;
+            mess_error = string(_("Global configuration read error")) + " " + cmd_error;
             lblWarning->set_text(mess_error);
         }
         else if (mess == 2) {
-            mess_error = _("Local configuration write error") + cmd_error;
+            mess_error = string(_("Local configuration write error")) + " " + cmd_error;
             lblWarning->set_text(mess_error);
         }
         else if (mess == 3) {
-            mess_error = _("Global configuration write error") + cmd_error;
+            mess_error = string(_("Global configuration write error")) + " " + cmd_error;
             lblWarning->set_text(mess_error);
         }
         else if (mess == 4) {
-            mess_error = _("Error saved local and global configuration") + cmd_error;
+            mess_error = string(_("Error saved local and global configuration")) + " " + cmd_error;
             lblWarning->set_text(mess_error);
         }
         cmd_error = "";
@@ -465,10 +469,10 @@ void MainWindow::entry_hardware_clock_default(string &cmd_default) {
     int error = warning_info;
     struct Result<string> obj_result_default = this->wrapper_call(cmd_default);
     if (obj_result_default.error == 0) {
-        if (obj_result_default.response.find("localtime") !=string::npos) {
+        if (obj_result_default.response.find("localtime") != string::npos) {
             cbHw->set_active(0);
         }
-        else if (obj_result_default.response.find("utc") !=string::npos) {
+        else if (obj_result_default.response.find("utc") != string::npos) {
             cbHw->set_active(1);
             
         }
@@ -487,10 +491,10 @@ void MainWindow::entry_hardware_clock(string &cmd, string &cmd_default) {
     int error = warning_info;
     struct Result<string> obj_result = this->wrapper_call(cmd);
     if (obj_result.error == 0) {
-        if (obj_result.response.find("localtime") !=string::npos) {
+        if (obj_result.response.find("localtime") != string::npos) {
             cbHw->set_active(0);
         }
-        else if (obj_result.response.find("utc") !=string::npos) {
+        else if (obj_result.response.find("utc") != string::npos) {
             cbHw->set_active(1);
         }
         else {

From f7a7c96248ed3afb9641d38feef83aa5c3716c4d Mon Sep 17 00:00:00 2001
From: Igor Belitskiy <goga.belitskiy.00@mail.eu>
Date: Mon, 13 Mar 2023 11:01:27 +0600
Subject: [PATCH 07/27] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D0=BE=D0=BD?=
 =?UTF-8?q?=D0=B0=D0=BB=20=D0=B2=20=D0=B8=D0=BD=D1=84=D0=BE=D1=80=D0=BC?=
 =?UTF-8?q?=D0=B0=D1=86=D0=B8=D0=BE=D0=BD=D0=BD=D0=BE=D0=B5=20=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=BB=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/ubl-settings-datetime.cc | 4 +++-
 ubl-settings-datetime_ru.po     | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc
index 8b452e7..f865d09 100644
--- a/source/ubl-settings-datetime.cc
+++ b/source/ubl-settings-datetime.cc
@@ -99,7 +99,9 @@ void MainWindow::settings() {
         lblDateTimeSetting->set_sensitive(false);
         btnBoxAboutDialog->set_visible(false);
         this->event();
-        imgInfo->set("checked.svg");
+        imgInfo->set("warning.svg");
+        info_status_app("boxInfoMessError");
+        lblWarning->set_text(_("The program must be run with superuser privileges!"));
     }
 }
 
diff --git a/ubl-settings-datetime_ru.po b/ubl-settings-datetime_ru.po
index de6b67a..aa10928 100644
--- a/ubl-settings-datetime_ru.po
+++ b/ubl-settings-datetime_ru.po
@@ -55,6 +55,9 @@ msgstr "По умолчанию"
 msgid "The program must be run with \nsuperuser privileges!"
 msgstr "Программа должна быть запущена с правами \nсуперпользователя!"
 
+msgid "The program must be run with superuser privileges!"
+msgstr "Программа должна быть запущена с правами суперпользователя!"
+
 msgid "Manual"
 msgstr "Вручную"
 

From 7e25023e37ab323433f86bc168735a017c97eee9 Mon Sep 17 00:00:00 2001
From: Igor Belitskiy <goga.belitskiy.00@mail.eu>
Date: Mon, 13 Mar 2023 12:25:38 +0600
Subject: [PATCH 08/27] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=B2=20=D0=BE=D0=BA=D0=BD=D0=BE=20=D1=81?=
 =?UTF-8?q?=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=BE=D0=B1?=
 =?UTF-8?q?=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=D1=85=20=D0=B2=20=D0=BA?=
 =?UTF-8?q?=D0=B0=D0=BA=D0=BE=D0=BC=20=D0=BF=D0=BE=D0=BB=D0=B5=20=D0=BE?=
 =?UTF-8?q?=D1=88=D0=B8=D0=B1=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/ubl-settings-datetime.cc | 82 +++++++++++++++++++++++----------
 source/ubl-settings-datetime.h  |  5 +-
 ubl-settings-datetime_ru.po     | 11 ++++-
 3 files changed, 70 insertions(+), 28 deletions(-)

diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc
index f865d09..0f3375b 100644
--- a/source/ubl-settings-datetime.cc
+++ b/source/ubl-settings-datetime.cc
@@ -55,6 +55,32 @@ MainWindow::MainWindow(Glib::RefPtr<Gtk::Builder> const& builder) {
 }
 
 void MainWindow::settings() {
+    map_error["xdg-open https://wiki.ublinux.ru/ru/home"] = string(_(" : xdg-open"));
+    map_error["/usr/bin/ubconfig --default --source system get clock ZONE"] = string(_(" : Time Zone"));
+    map_error["hwclock --systohc"] = string(_(" : Hardware time"));
+    map_error["/usr/bin/ubconfig --default --source system get network NTPSERVERS"] = string(_(" : NTP"));
+    map_error["/usr/bin/ubconfig --source=default get NTPSERVERS_DEFAULT"] = string(_(" : NTP"));
+    map_error["/usr/bin/ubconfig --default --source system get clock HWCLOCK_SYNC"] = string(_(" : Hardware time"));
+    map_error["/usr/bin/ubconfig  --default --source global get network NTPSERVERS"] = string(_(" : NTP"));
+    map_error["/usr/bin/ubconfig --default --source global get clock ZONE"] = string(_(" : Time Zone"));
+    map_error["/usr/bin/ubconfig --default --source global get clock HWCLOCK_SYNC"] = string(_(" : Hardware time"));
+    map_error["/usr/bin/ubconfig --source global get clock HWCLOCK_SYNC"] = string(_(" : Hardware time"));
+    map_error["/usr/bin/ubconfig --target system set clock ZONE="] = string(_(" : Time Zone"));
+    map_error["/usr/bin/ubconfig --target system set network NTPSERVERS=default"] = string(_(" : NTP"));
+    map_error["/usr/bin/ubconfig --target system set network NTPSERVERS=dhcp"] = string(_(" : NTP"));
+    map_error["/usr/bin/ubconfig --target system set network NTPSERVERS=\""] = string(_(" : NTP"));
+    map_error["/usr/bin/ubconfig --target system remove network NTPSERVERS"] = string(_(" : NTP"));
+    map_error["/usr/bin/ubconfig --target system set clock HWCLOCK_SYNC=localtime"] = string(_(" : Hardware time"));
+    map_error["/usr/bin/ubconfig --target system set clock HWCLOCK_SYNC=utc"] = string(_(" : Hardware time"));
+    map_error["/usr/bin/ubconfig --target global set clock ZONE="] = string(_(" : Time Zone"));
+    map_error["/usr/bin/ubconfig --target global set network NTPSERVERS=default"] = string(_(" : NTP"));
+    map_error["/usr/bin/ubconfig --target global set network NTPSERVERS=dhcp"] = string(_(" : NTP"));
+    map_error["/usr/bin/ubconfig --target global set network NTPSERVERS=\""] = string(_(" : NTP"));
+    map_error["/usr/bin/ubconfig --target global remove network NTPSERVERS"] = string(_(" : NTP"));
+    map_error["/usr/bin/ubconfig --target global set clock HWCLOCK_SYNC=localtime"] = string(_(" : Hardware time"));
+    map_error["/usr/bin/ubconfig --target global set clock HWCLOCK_SYNC=utc"] = string(_(" : Hardware time"));
+    map_error["date +%Y%m%d -s \""] = string(_(" : Date"));
+    map_error["date +%T -s \""] = "";
     this->get_builder();
     this->add_CSS();
     ubl_make_plugs(boxSave,boxButton, socket_ext_id_I, socket_trd_id_I);
@@ -72,7 +98,7 @@ void MainWindow::settings() {
         btnBoxAboutDialog->set_visible(false);
         this->event();
         this->parse_text_date();
-        this->download_local_cfg();  
+        this->download_local_cfg();
     }
     else {
         lblHW->set_sensitive(false);
@@ -182,7 +208,6 @@ void MainWindow::flag_block_gui() {
     if (flag_save_global == true) {
         btnSaveGlob->set_sensitive(false);
     }
-    
 }
 
 void MainWindow::add_CSS() {
@@ -335,7 +360,7 @@ void MainWindow::download_globl_cfg() {
     this->entry_dhcp_mess(cmd_get_dhcp, cmd_default_get_dhcp);
     string cmd_zone = "/usr/bin/ubconfig --default --source global get clock ZONE";
     this->fill_in_reg_zone(cmd_zone);
-    string hw = "/usr/bin/ubconfig --default --source global get clock HWCLOCK_SYNC";
+    string hw = "/usr/bin/ubconfig --source global get clock HWCLOCK_SYNC";
     string hw_default = "/usr/bin/ubconfig --default --source global get clock HWCLOCK_SYNC";
     this->entry_hardware_clock(hw, hw_default);
     info_warning_error(1);
@@ -386,45 +411,32 @@ void MainWindow::save_global_local_cfg() {
 
 void MainWindow::info_warning_error(int mess) {
     if (error_info > 0 || warning_info > 0) {
-        if (cmd_error.length()!=0){
-            vector<int> vec_cmd_prob;
-            vec_cmd_prob = this->find_all(cmd_error, " ");
-            size_t size_vec_prob = vec_cmd_prob.size();
-            if (size_vec_prob > 1){
-                int index = size_vec_prob - 1;
-                index = vec_cmd_prob[index];
-                if (index){
-                    cmd_error = cmd_error.substr(index, cmd_error.length());
-                }
-            }
-        }
         info_status_app("boxInfoMessError");
         imgInfo->set("warning.svg");
         error_info = 0;
         warning_info = 0;
         string mess_error = "";
         if (mess == 0) {
-            mess_error = string(_("Local configuration reading error")) + " " + cmd_error;
+            mess_error = string(_("Local configuration reading error")) + cmd_error;
             lblWarning->set_text(mess_error);
         }
         else if (mess == 1) {
-            mess_error = string(_("Global configuration read error")) + " " + cmd_error;
+            mess_error = string(_("Global configuration read error")) + cmd_error;
             lblWarning->set_text(mess_error);
         }
         else if (mess == 2) {
-            mess_error = string(_("Local configuration write error")) + " " + cmd_error;
+            mess_error = string(_("Local configuration write error")) + cmd_error;
             lblWarning->set_text(mess_error);
         }
         else if (mess == 3) {
-            mess_error = string(_("Global configuration write error")) + " " + cmd_error;
+            mess_error = string(_("Global configuration write error")) + cmd_error;
             lblWarning->set_text(mess_error);
         }
         else if (mess == 4) {
-            mess_error = string(_("Error saved local and global configuration")) + " " + cmd_error;
+            mess_error = string(_("Error saved local and global configuration")) + cmd_error;
             lblWarning->set_text(mess_error);
         }
         cmd_error = "";
-        cmd_error_write = "";
     }
     else {
         info_status_app("boxInfoMessOK");
@@ -449,11 +461,27 @@ void MainWindow::info_warning_error(int mess) {
 
 
 void MainWindow::wrapper_system(string cmd, string thread_str = "") {
-    cmd = cmd + " " + thread_str;
-    int response_cmd = system(cmd.c_str());
+    string cmd_new = cmd + " " + thread_str;
+    int response_cmd = system(cmd_new.c_str());
     if (response_cmd != 0) {
         error_info += 1;
-        cmd_error_write = cmd;
+        this->log_mess_error(cmd);
+    }
+}
+
+void MainWindow::log_mess_error(string &cmd){
+    string key = "";
+    if (map_error.find(cmd) != map_error.end()){
+        cmd_error = map_error[cmd]; 
+    }
+    else {
+        for ( const auto &map_iter: map_error ) {
+        key = map_iter.first;
+        if (cmd.find(key) != std::string::npos){
+            cmd_error = map_iter.second;   
+            break;
+            }
+        }
     }
 }
 
@@ -649,7 +677,7 @@ struct MainWindow::Result<string> MainWindow::wrapper_call(string cmd) {
                 obj_result.response = response;
                 obj_result.error = 1;
                 warning_info += 1;
-                cmd_error = cmd;
+                this->log_mess_error(cmd);
             }
         }
         else {
@@ -657,6 +685,7 @@ struct MainWindow::Result<string> MainWindow::wrapper_call(string cmd) {
             obj_result.error = 2;
             warning_info += 1;
             cmd_error = cmd;
+            this->log_mess_error(cmd);
         }
     }
     else {
@@ -664,10 +693,13 @@ struct MainWindow::Result<string> MainWindow::wrapper_call(string cmd) {
         obj_result.error = 3;
         warning_info += 1;
         cmd_error = cmd;
+        this->log_mess_error(cmd);
     }
     return obj_result;
 }
 
+
+
 void MainWindow::event_entry_cbDhcp() {
     string str_dhcp = cbDhcp->get_active_text();
     string cmd = "";
diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h
index a44284c..f35ccef 100755
--- a/source/ubl-settings-datetime.h
+++ b/source/ubl-settings-datetime.h
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <unicode/timezone.h>
 #include <unicode/calendar.h>
+#include <map>
 #include "ubl-util-standard.c"
 
 
@@ -121,12 +122,10 @@ class MainWindow : public Gtk::ApplicationWindow {
         int error_info = 0;
         int warning_info = 0;
         string cmd_error = "";
-        string cmd_error_write = "";
         int hour;
         int minute;
         string str_region = "";
         string str_zone = "";
-        bool bool_close_banner_info = true;
         template<typename Type>
         struct Result{
             Type response;
@@ -134,11 +133,13 @@ class MainWindow : public Gtk::ApplicationWindow {
         };
         vector<string> array_region_local;
         vector<string> array_region;
+        std::map <string, string> map_error;
         
     public:
         MainWindow(BaseObjectType* obj, Glib::RefPtr<Gtk::Builder> const& builder);
         MainWindow(Glib::RefPtr<Gtk::Builder> const& builder);
         virtual ~MainWindow() = default;
+        void log_mess_error(string &cmd);
         void hardware_clock_global(string &local, string &etc);
         void info_warning_error(int mess);
         void synopsis_show();
diff --git a/ubl-settings-datetime_ru.po b/ubl-settings-datetime_ru.po
index aa10928..be9efbf 100644
--- a/ubl-settings-datetime_ru.po
+++ b/ubl-settings-datetime_ru.po
@@ -74,7 +74,7 @@ msgid "Successfully saved local and global configuration"
 msgstr "Успешно сохранена локальная и глобальная конфигурация"
 
 msgid "Error saved local and global configuration"
-msgstr "Ошибка сохранена локальной и глобальной конфигурации"
+msgstr "Ошибка сохранения локальной и глобальной конфигурации"
 
 msgid "Settings the date and time"
 msgstr "Настройки даты и времени"
@@ -1768,6 +1768,15 @@ msgstr "О программе"
 msgid "Help"
 msgstr "Справка"
 
+msgid " : Hardware time"
+msgstr " : Аппаратного времени"
+
+msgid " : Time Zone"
+msgstr " : Временной зоны "
+
+msgid " : Date"
+msgstr " : Даты "
+
 msgid "Local configuration reading error"
 msgstr "Ошибка чтения локальной конфигурации"
 

From 2df5eed208b8f039e6f82031fd29c07f863a1ee7 Mon Sep 17 00:00:00 2001
From: Igor Belitskiy <goga.belitskiy.00@mail.eu>
Date: Mon, 13 Mar 2023 15:02:34 +0600
Subject: [PATCH 09/27] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=BE=D0=BA=D0=BD=D0=BE=20=D0=BE=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B3=D1=80=D0=B0=D0=BC=D0=BC=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/ubl-settings-datetime.cc | 8 +++++++-
 ubl-settings-datetime_ru.po     | 6 ++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc
index 0f3375b..c6b48b7 100644
--- a/source/ubl-settings-datetime.cc
+++ b/source/ubl-settings-datetime.cc
@@ -142,7 +142,12 @@ int MainWindow::check_root() {
 }
 
 void MainWindow::lacalization() {
-    aboutWindows->set_comments(_("Setting the date and time"));
+    time_t now = time(0);
+    tm *ltm = localtime(&now);
+    unsigned int year = 1900+ ltm->tm_year;
+    string str_authors = string(_("Copyright © UBSoft LLC, 2022 - ")) + to_string(year); 
+    aboutWindows->set_copyright(str_authors);
+    aboutWindows->set_comments(_("Date and Time"));
     aboutWindows->set_website(_("https://wiki.ublinux.com"));
     aboutWindows->set_version(_(version_application.c_str()));
     aboutWindows->set_website_label(_("Project Home Page"));
@@ -1023,6 +1028,7 @@ void MainWindow::append_region_zone(string region, string zone, Gtk::ComboBoxTex
     }
     
 }
+
 string MainWindow::call(string cmd) {
     FILE *fp;
     int status;
diff --git a/ubl-settings-datetime_ru.po b/ubl-settings-datetime_ru.po
index be9efbf..a2a5d98 100644
--- a/ubl-settings-datetime_ru.po
+++ b/ubl-settings-datetime_ru.po
@@ -16,6 +16,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+msgid "Copyright © UBSoft LLC, 2022 - "
+msgstr "Авторские права © ООО \"Юбисофт\", 2022 - "
+
 msgid "Select the method of hardware time synchronization"
 msgstr "Выберите способ синхронизации аппаратного времени"
 
@@ -1768,6 +1771,9 @@ msgstr "О программе"
 msgid "Help"
 msgstr "Справка"
 
+msgid "Date and Time"
+msgstr "Дата и Время"
+
 msgid " : Hardware time"
 msgstr " : Аппаратного времени"
 

From 6df04e009ac2c3fda9ccb6a9bc0dbe5ae12e80d1 Mon Sep 17 00:00:00 2001
From: Igor Belitskiy <goga.belitskiy.00@mail.eu>
Date: Mon, 13 Mar 2023 16:38:23 +0600
Subject: [PATCH 10/27] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20=D0=B1=D0=B0=D0=BD=D0=BD=D0=B5=D1=80=20?=
 =?UTF-8?q?=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=BE?=
 =?UTF-8?q?=D0=B1=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/ubl-settings-datetime.cc | 55 +++++++++++++++++----------------
 ubl-settings-datetime_ru.po     | 12 +++----
 2 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc
index c6b48b7..343d406 100644
--- a/source/ubl-settings-datetime.cc
+++ b/source/ubl-settings-datetime.cc
@@ -55,32 +55,32 @@ MainWindow::MainWindow(Glib::RefPtr<Gtk::Builder> const& builder) {
 }
 
 void MainWindow::settings() {
-    map_error["xdg-open https://wiki.ublinux.ru/ru/home"] = string(_(" : xdg-open"));
-    map_error["/usr/bin/ubconfig --default --source system get clock ZONE"] = string(_(" : Time Zone"));
-    map_error["hwclock --systohc"] = string(_(" : Hardware time"));
-    map_error["/usr/bin/ubconfig --default --source system get network NTPSERVERS"] = string(_(" : NTP"));
-    map_error["/usr/bin/ubconfig --source=default get NTPSERVERS_DEFAULT"] = string(_(" : NTP"));
-    map_error["/usr/bin/ubconfig --default --source system get clock HWCLOCK_SYNC"] = string(_(" : Hardware time"));
-    map_error["/usr/bin/ubconfig  --default --source global get network NTPSERVERS"] = string(_(" : NTP"));
-    map_error["/usr/bin/ubconfig --default --source global get clock ZONE"] = string(_(" : Time Zone"));
-    map_error["/usr/bin/ubconfig --default --source global get clock HWCLOCK_SYNC"] = string(_(" : Hardware time"));
-    map_error["/usr/bin/ubconfig --source global get clock HWCLOCK_SYNC"] = string(_(" : Hardware time"));
-    map_error["/usr/bin/ubconfig --target system set clock ZONE="] = string(_(" : Time Zone"));
-    map_error["/usr/bin/ubconfig --target system set network NTPSERVERS=default"] = string(_(" : NTP"));
-    map_error["/usr/bin/ubconfig --target system set network NTPSERVERS=dhcp"] = string(_(" : NTP"));
-    map_error["/usr/bin/ubconfig --target system set network NTPSERVERS=\""] = string(_(" : NTP"));
-    map_error["/usr/bin/ubconfig --target system remove network NTPSERVERS"] = string(_(" : NTP"));
-    map_error["/usr/bin/ubconfig --target system set clock HWCLOCK_SYNC=localtime"] = string(_(" : Hardware time"));
-    map_error["/usr/bin/ubconfig --target system set clock HWCLOCK_SYNC=utc"] = string(_(" : Hardware time"));
-    map_error["/usr/bin/ubconfig --target global set clock ZONE="] = string(_(" : Time Zone"));
-    map_error["/usr/bin/ubconfig --target global set network NTPSERVERS=default"] = string(_(" : NTP"));
-    map_error["/usr/bin/ubconfig --target global set network NTPSERVERS=dhcp"] = string(_(" : NTP"));
-    map_error["/usr/bin/ubconfig --target global set network NTPSERVERS=\""] = string(_(" : NTP"));
-    map_error["/usr/bin/ubconfig --target global remove network NTPSERVERS"] = string(_(" : NTP"));
-    map_error["/usr/bin/ubconfig --target global set clock HWCLOCK_SYNC=localtime"] = string(_(" : Hardware time"));
-    map_error["/usr/bin/ubconfig --target global set clock HWCLOCK_SYNC=utc"] = string(_(" : Hardware time"));
-    map_error["date +%Y%m%d -s \""] = string(_(" : Date"));
-    map_error["date +%T -s \""] = "";
+    map_error["xdg-open https://wiki.ublinux.ru/ru/home"] = string(_(": \"xdg-open\""));
+    map_error["/usr/bin/ubconfig --default --source system get clock ZONE"] = string(_(": \"Time Zone\""));
+    map_error["hwclock --systohc"] = string(_(": \"Hardware time\""));
+    map_error["/usr/bin/ubconfig --default --source system get network NTPSERVERS"] = string(_(": \"NTP\""));
+    map_error["/usr/bin/ubconfig --source=default get NTPSERVERS_DEFAULT"] = string(_(": \"NTP\""));
+    map_error["/usr/bin/ubconfig --default --source system get clock HWCLOCK_SYNC"] = string(_(": \"Hardware time\""));
+    map_error["/usr/bin/ubconfig  --default --source global get network NTPSERVERS"] = string(_(": \"NTP\""));
+    map_error["/usr/bin/ubconfig --default --source global get clock ZONE"] = string(_(": \"Time Zone\""));
+    map_error["/usr/bin/ubconfig --default --source global get clock HWCLOCK_SYNC"] = string(_(": \"Hardware time\""));
+    map_error["/usr/bin/ubconfig --source global get clock HWCLOCK_SYNC"] = string(_(": \"Hardware time\""));
+    map_error["/usr/bin/ubconfig --target system set clock ZONE="] = string(_(": \"Time Zone\""));
+    map_error["/usr/bin/ubconfig --target system set network NTPSERVERS=default"] = string(_(": \"NTP\""));
+    map_error["/usr/bin/ubconfig --target system set network NTPSERVERS=dhcp"] = string(_(": \"NTP\""));
+    map_error["/usr/bin/ubconfig --target system set network NTPSERVERS=\""] = string(_(": \"NTP\""));
+    map_error["/usr/bin/ubconfig --target system remove network NTPSERVERS"] = string(_(": \"NTP\""));
+    map_error["/usr/bin/ubconfig --target system set clock HWCLOCK_SYNC=localtime"] = string(_(": \"Hardware time\""));
+    map_error["/usr/bin/ubconfig --target system set clock HWCLOCK_SYNC=utc"] = string(_(": \"Hardware time\""));
+    map_error["/usr/bin/ubconfig --target global set clock ZONE="] = string(_(": \"Time Zone\""));
+    map_error["/usr/bin/ubconfig --target global set network NTPSERVERS=default"] = string(_(": \"NTP\""));
+    map_error["/usr/bin/ubconfig --target global set network NTPSERVERS=dhcp"] = string(_(": \"NTP\""));
+    map_error["/usr/bin/ubconfig --target global set network NTPSERVERS=\""] = string(_(": \"NTP\""));
+    map_error["/usr/bin/ubconfig --target global remove network NTPSERVERS"] = string(_(": \"NTP\""));
+    map_error["/usr/bin/ubconfig --target global set clock HWCLOCK_SYNC=localtime"] = string(_(": \"Hardware time\""));
+    map_error["/usr/bin/ubconfig --target global set clock HWCLOCK_SYNC=utc"] = string(_(": \"Hardware time\""));
+    map_error["date +%Y%m%d -s \""] = string(_(": \"Date\""));
+    map_error["date +%T -s \""] = string(_(": \"Date\""));
     this->get_builder();
     this->add_CSS();
     ubl_make_plugs(boxSave,boxButton, socket_ext_id_I, socket_trd_id_I);
@@ -97,6 +97,9 @@ void MainWindow::settings() {
         this->flag_block_gui();
         btnBoxAboutDialog->set_visible(false);
         this->event();
+        string c = "/usr/bin/ubconfig --default --source global get clock ZONE";
+        this->log_mess_error(c);
+        error_info=1000;
         this->parse_text_date();
         this->download_local_cfg();
     }
diff --git a/ubl-settings-datetime_ru.po b/ubl-settings-datetime_ru.po
index a2a5d98..14cad13 100644
--- a/ubl-settings-datetime_ru.po
+++ b/ubl-settings-datetime_ru.po
@@ -1774,14 +1774,14 @@ msgstr "Справка"
 msgid "Date and Time"
 msgstr "Дата и Время"
 
-msgid " : Hardware time"
-msgstr " : Аппаратного времени"
+msgid ": \"Hardware time\""
+msgstr ": \"Аппаратное время\""
 
-msgid " : Time Zone"
-msgstr " : Временной зоны "
+msgid ": \"Time Zone\""
+msgstr ": \"Временная зона\""
 
-msgid " : Date"
-msgstr " : Даты "
+msgid ": \"Date\""
+msgstr ": \"Дата\""
 
 msgid "Local configuration reading error"
 msgstr "Ошибка чтения локальной конфигурации"

From c58ea3282531d0c195790e7202eaa26c6785e729 Mon Sep 17 00:00:00 2001
From: Igor Belitskiy <goga.belitskiy.00@mail.eu>
Date: Mon, 13 Mar 2023 17:05:39 +0600
Subject: [PATCH 11/27] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20=D0=B1=D0=B0=D0=B3=20=D1=81=20=D0=B7=D0=BD?=
 =?UTF-8?q?=D0=B0=D1=87=D0=BA=D0=BE=D0=BC=20=D1=81=D0=BE=D1=81=D1=82=D0=BE?=
 =?UTF-8?q?=D1=8F=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile                        | 2 ++
 source/ubl-settings-datetime.cc | 3 ---
 source/ubl-util-standard.c      | 4 ++++
 style.css                       | 3 +++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 0dbc66e..cf5354a 100644
--- a/Makefile
+++ b/Makefile
@@ -118,6 +118,8 @@ install: check uninstall
 	@install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" bg_top.png
 	@install -Dm644 -t /usr/share/icons/hicolor/scalable/status/ checked.svg
 	@install -Dm644 -t /usr/share/icons/hicolor/scalable/status/ warning.svg
+	@install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" checked.svg
+	@install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" warning.svg
 	@gtk-update-icon-cache -fiq /usr/share/icons/hicolor/
 	@update-desktop-database --quiet 2>/dev/null 
 	@touch /usr/share/applications
diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc
index 343d406..8f315bd 100644
--- a/source/ubl-settings-datetime.cc
+++ b/source/ubl-settings-datetime.cc
@@ -97,9 +97,6 @@ void MainWindow::settings() {
         this->flag_block_gui();
         btnBoxAboutDialog->set_visible(false);
         this->event();
-        string c = "/usr/bin/ubconfig --default --source global get clock ZONE";
-        this->log_mess_error(c);
-        error_info=1000;
         this->parse_text_date();
         this->download_local_cfg();
     }
diff --git a/source/ubl-util-standard.c b/source/ubl-util-standard.c
index df38341..f922043 100644
--- a/source/ubl-util-standard.c
+++ b/source/ubl-util-standard.c
@@ -53,6 +53,8 @@ inline void ubl_make_plugs(Gtk::Widget *LeftWidget, Gtk::Widget *RightWidget, in
             gtk_container_add(GTK_CONTAINER(plug),GTK_WIDGET(toplug));
         gtk_widget_show(GTK_WIDGET(plug));
         gtk_style_context_add_class(gtk_widget_get_style_context(plug),"bkimButtonPlug");
+        gtk_style_context_add_class(gtk_widget_get_style_context(plug),"noborder");
+        gtk_style_context_add_class(gtk_widget_get_style_context(plug),"primary-toolbar");
     }
     if (right_plug_id>0&&RightWidget){
         GtkWidget *plug=gtk_plug_new(right_plug_id);
@@ -66,6 +68,8 @@ inline void ubl_make_plugs(Gtk::Widget *LeftWidget, Gtk::Widget *RightWidget, in
             gtk_container_add(GTK_CONTAINER(plug),GTK_WIDGET(toplug));
         gtk_widget_show(GTK_WIDGET(plug));
         gtk_style_context_add_class(gtk_widget_get_style_context(plug),"bkimButtonPlug");
+        gtk_style_context_add_class(gtk_widget_get_style_context(plug),"noborder");
+        gtk_style_context_add_class(gtk_widget_get_style_context(plug),"primary-toolbar");
         
     }
 }
diff --git a/style.css b/style.css
index a05efb2..3fdf619 100644
--- a/style.css
+++ b/style.css
@@ -83,4 +83,7 @@
   background-color: transparent;
   color: rgb(0, 0, 0);
   opacity:1.0;
+}
+.noborder{
+  border:none;
 }
\ No newline at end of file

From 5289d5252d4daba33d4828d73f79143bb740f6bd Mon Sep 17 00:00:00 2001
From: Igor Belitskiy <goga.belitskiy.00@mail.eu>
Date: Tue, 14 Mar 2023 10:39:25 +0600
Subject: [PATCH 12/27] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20makefile?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Makefile b/Makefile
index cf5354a..c208f65 100644
--- a/Makefile
+++ b/Makefile
@@ -116,10 +116,10 @@ install: check uninstall
 	@install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" "${pkgname}.svg"
 	@install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" "${pkgname}.png"
 	@install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" bg_top.png
-	@install -Dm644 -t /usr/share/icons/hicolor/scalable/status/ checked.svg
-	@install -Dm644 -t /usr/share/icons/hicolor/scalable/status/ warning.svg
 	@install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" checked.svg
 	@install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" warning.svg
+	@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/status/" "checked.svg"
+	@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/status/" "warning.svg"
 	@gtk-update-icon-cache -fiq /usr/share/icons/hicolor/
 	@update-desktop-database --quiet 2>/dev/null 
 	@touch /usr/share/applications
diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc
index 8f315bd..02303c9 100644
--- a/source/ubl-settings-datetime.cc
+++ b/source/ubl-settings-datetime.cc
@@ -125,7 +125,7 @@ void MainWindow::settings() {
         lblDateTimeSetting->set_sensitive(false);
         btnBoxAboutDialog->set_visible(false);
         this->event();
-        imgInfo->set("warning.svg");
+        imgInfo->set("/usr/share/icons/hicolor/scalable/status/warning.svg");
         info_status_app("boxInfoMessError");
         lblWarning->set_text(_("The program must be run with superuser privileges!"));
     }
@@ -417,7 +417,7 @@ void MainWindow::save_global_local_cfg() {
 void MainWindow::info_warning_error(int mess) {
     if (error_info > 0 || warning_info > 0) {
         info_status_app("boxInfoMessError");
-        imgInfo->set("warning.svg");
+        imgInfo->set("/usr/share/icons/hicolor/scalable/status/warning.svg");
         error_info = 0;
         warning_info = 0;
         string mess_error = "";
@@ -445,7 +445,7 @@ void MainWindow::info_warning_error(int mess) {
     }
     else {
         info_status_app("boxInfoMessOK");
-        imgInfo->set("checked.svg");
+        imgInfo->set("/usr/share/icons/hicolor/scalable/status/checked.svg");
         if (mess == 0) {
             lblWarning->set_text(_("Local configuration downloaded successfully"));
         }

From 091c02af2f6fc36589da258d946c04e4296d6de4 Mon Sep 17 00:00:00 2001
From: Igor Belitskiy <goga.belitskiy.00@mail.eu>
Date: Tue, 14 Mar 2023 10:44:57 +0600
Subject: [PATCH 13/27] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BB=D0=BE=D0=BA=D0=B0=D0=BB=D0=B8?=
 =?UTF-8?q?=D0=B7=D0=B0=D1=86=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ubl-settings-datetime.glade | 2 +-
 ubl-settings-datetime_ru.po | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade
index a614754..fe7fea1 100644
--- a/ubl-settings-datetime.glade
+++ b/ubl-settings-datetime.glade
@@ -99,7 +99,7 @@
       <object class="GtkMenuItem" id="btnAbout">
         <property name="visible">True</property>
         <property name="can-focus">False</property>
-        <property name="label" translatable="yes">About the program</property>
+        <property name="label" translatable="yes">About</property>
         <property name="use-underline">True</property>
         <style>
           <class name="menuitembottom"/>
diff --git a/ubl-settings-datetime_ru.po b/ubl-settings-datetime_ru.po
index 14cad13..9285589 100644
--- a/ubl-settings-datetime_ru.po
+++ b/ubl-settings-datetime_ru.po
@@ -1765,7 +1765,7 @@ msgstr "Остров Пасхи"
 msgid "Andorra"
 msgstr "Андорра"
 
-msgid "About the program"
+msgid "About"
 msgstr "О программе"
 
 msgid "Help"

From 5e022ea002d06b07551b090055e820ccb14dd33d Mon Sep 17 00:00:00 2001
From: Igor Belitskiy <goga.belitskiy.00@mail.eu>
Date: Tue, 14 Mar 2023 18:01:24 +0600
Subject: [PATCH 14/27] =?UTF-8?q?=D0=A7=D0=B0=D1=81=D1=82=D0=B8=D1=87?=
 =?UTF-8?q?=D0=BD=D0=BE=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D1=8B=20=D0=B7=D0=B0=D0=BC=D0=B5=D1=87=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile                                |  8 ++--
 close.svg                               | 54 -------------------------
 source/ubl-settings-datetime.cc         | 10 ++---
 source/ubl-util-standard.c              | 10 ++++-
 style.css                               | 18 ++++++++-
 checked.svg => ubl-datetime-checked.svg |  0
 warning.svg => ubl-datetime-warning.svg |  0
 ubl-settings-datetime.glade             | 13 ------
 ubl-settings-datetime_ru.po             |  2 +-
 9 files changed, 33 insertions(+), 82 deletions(-)
 delete mode 100644 close.svg
 rename checked.svg => ubl-datetime-checked.svg (100%)
 rename warning.svg => ubl-datetime-warning.svg (100%)

diff --git a/Makefile b/Makefile
index c208f65..a4dbb21 100644
--- a/Makefile
+++ b/Makefile
@@ -115,11 +115,9 @@ install: check uninstall
 	@install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/css/" style.css 
 	@install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" "${pkgname}.svg"
 	@install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" "${pkgname}.png"
-	@install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" bg_top.png
-	@install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" checked.svg
-	@install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" warning.svg
-	@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/status/" "checked.svg"
-	@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/status/" "warning.svg"
+	@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/emblems/" "bg_top.png"
+	@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/status/" "ubl-datetime-checked.svg"
+	@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/status/" "ubl-datetime-warning.svg"
 	@gtk-update-icon-cache -fiq /usr/share/icons/hicolor/
 	@update-desktop-database --quiet 2>/dev/null 
 	@touch /usr/share/applications
diff --git a/close.svg b/close.svg
deleted file mode 100644
index d869d85..0000000
--- a/close.svg
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   viewBox="0 0 24 24"
-   id="svg2"
-   version="1.1"
-   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04, custom)"
-   sodipodi:docname="close.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1027"
-     id="namedview8"
-     showgrid="false"
-     inkscape:zoom="8"
-     inkscape:cx="6.875"
-     inkscape:cy="11.0625"
-     inkscape:window-x="1920"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     inkscape:pagecheckerboard="0" />
-  <path
-     d="M 3.8312451,0.00270105 C 6.6165637,2.6335365 9.2800785,5.3919927 12.002108,8.0876398 14.724116,5.3918531 17.387684,2.6337829 20.172977,0.00270105 l 3.827655,3.82765225 c -2.630952,2.7854245 -5.389244,5.4487758 -8.084944,8.1708607 2.695781,2.722007 5.453855,5.385575 8.084944,8.170866 l -3.827655,3.827648 c -2.78543,-2.630944 -5.448781,-5.389235 -8.170869,-8.084934 -2.7220013,2.695782 -5.3855699,5.453852 -8.1708629,8.084934 L 0.0035959,20.17208 C 2.634542,17.386651 5.3928334,14.723302 8.0885352,12.001214 5.3927504,9.2792119 2.6346777,6.6156425 0.0035959,3.8303533 Z"
-     style="fill:#ffffff;stroke-width:2.18155"
-     id="path6"
-     inkscape:connector-curvature="0" />
-</svg>
diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc
index 02303c9..f9c5ef9 100644
--- a/source/ubl-settings-datetime.cc
+++ b/source/ubl-settings-datetime.cc
@@ -125,16 +125,16 @@ void MainWindow::settings() {
         lblDateTimeSetting->set_sensitive(false);
         btnBoxAboutDialog->set_visible(false);
         this->event();
-        imgInfo->set("/usr/share/icons/hicolor/scalable/status/warning.svg");
+        imgInfo->set("ubl-datetime-warning");
         info_status_app("boxInfoMessError");
-        lblWarning->set_text(_("The program must be run with superuser privileges!"));
+        lblWarning->set_text(_("The program must be run as root"));
     }
 }
 
 
 int MainWindow::check_root() {
     if (geteuid() != 0) {
-        lblMessageSudo->set_text(_("The program must be run with \nsuperuser privileges!"));
+        lblMessageSudo->set_text(_("The program must be run as root"));
         mess_sudo->show();
         return 1;
     }
@@ -417,7 +417,7 @@ void MainWindow::save_global_local_cfg() {
 void MainWindow::info_warning_error(int mess) {
     if (error_info > 0 || warning_info > 0) {
         info_status_app("boxInfoMessError");
-        imgInfo->set("/usr/share/icons/hicolor/scalable/status/warning.svg");
+        imgInfo->set("ubl-datetime-warning");
         error_info = 0;
         warning_info = 0;
         string mess_error = "";
@@ -445,7 +445,7 @@ void MainWindow::info_warning_error(int mess) {
     }
     else {
         info_status_app("boxInfoMessOK");
-        imgInfo->set("/usr/share/icons/hicolor/scalable/status/checked.svg");
+        imgInfo->set("ubl-datetime-checked");
         if (mess == 0) {
             lblWarning->set_text(_("Local configuration downloaded successfully"));
         }
diff --git a/source/ubl-util-standard.c b/source/ubl-util-standard.c
index f922043..ef040bd 100644
--- a/source/ubl-util-standard.c
+++ b/source/ubl-util-standard.c
@@ -52,8 +52,11 @@ inline void ubl_make_plugs(Gtk::Widget *LeftWidget, Gtk::Widget *RightWidget, in
         } else 
             gtk_container_add(GTK_CONTAINER(plug),GTK_WIDGET(toplug));
         gtk_widget_show(GTK_WIDGET(plug));
-        gtk_style_context_add_class(gtk_widget_get_style_context(plug),"bkimButtonPlug");
+        gtk_style_context_remove_class(gtk_widget_get_style_context(plug),"bkimButton");
+        gtk_style_context_remove_class(gtk_widget_get_style_context(toplug),"bkimButton");
         gtk_style_context_add_class(gtk_widget_get_style_context(plug),"noborder");
+        gtk_style_context_add_class(gtk_widget_get_style_context(toplug),"button");
+        gtk_style_context_add_class(gtk_widget_get_style_context(plug),"button");
         gtk_style_context_add_class(gtk_widget_get_style_context(plug),"primary-toolbar");
     }
     if (right_plug_id>0&&RightWidget){
@@ -67,8 +70,11 @@ inline void ubl_make_plugs(Gtk::Widget *LeftWidget, Gtk::Widget *RightWidget, in
         } else 
             gtk_container_add(GTK_CONTAINER(plug),GTK_WIDGET(toplug));
         gtk_widget_show(GTK_WIDGET(plug));
-        gtk_style_context_add_class(gtk_widget_get_style_context(plug),"bkimButtonPlug");
+        gtk_style_context_remove_class(gtk_widget_get_style_context(plug),"bkimButton");
+        gtk_style_context_remove_class(gtk_widget_get_style_context(toplug),"bkimButton");
         gtk_style_context_add_class(gtk_widget_get_style_context(plug),"noborder");
+        gtk_style_context_add_class(gtk_widget_get_style_context(toplug),"button");
+        gtk_style_context_add_class(gtk_widget_get_style_context(plug),"button");
         gtk_style_context_add_class(gtk_widget_get_style_context(plug),"primary-toolbar");
         
     }
diff --git a/style.css b/style.css
index 3fdf619..65d31d4 100644
--- a/style.css
+++ b/style.css
@@ -2,7 +2,7 @@
     background-color: #ea9999;
 }
 .cssboxColor1{
-    background: url("/usr/share/ubl-settings-datetime/images/bg_top.png") no-repeat;
+    background: url("/usr/share/icons/hicolor/scalable/emblems/bg_top.png") no-repeat;
 }
 .boxInfoMessOK{
     background-color: #f3f0ac;
@@ -81,9 +81,23 @@
 }
 .bkimButtonPlug{
   background-color: transparent;
-  color: rgb(0, 0, 0);
   opacity:1.0;
 }
 .noborder{
   border:none;
+}
+.buttonPlug {
+  background-color: transparent;
+  background-repeat: no-repeat;
+  border: none;
+  outline: none;
+}
+
+.button {
+	background-image: -gtk-gradient(linear,
+  left top, left bottom,
+  from(@entry_background_a),
+  color-stop(0.20, @entry_background_b),
+  color-stop(0.85, @entry_background_c),
+  to(@entry_background_d));
 }
\ No newline at end of file
diff --git a/checked.svg b/ubl-datetime-checked.svg
similarity index 100%
rename from checked.svg
rename to ubl-datetime-checked.svg
diff --git a/warning.svg b/ubl-datetime-warning.svg
similarity index 100%
rename from warning.svg
rename to ubl-datetime-warning.svg
diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade
index fe7fea1..9db607c 100644
--- a/ubl-settings-datetime.glade
+++ b/ubl-settings-datetime.glade
@@ -60,7 +60,6 @@
         <property name="visible">True</property>
         <property name="can-focus">False</property>
         <property name="label" translatable="yes">Load global configuration</property>
-        <property name="use-underline">True</property>
         <style>
           <class name="menuitemtop"/>
         </style>
@@ -71,7 +70,6 @@
         <property name="visible">True</property>
         <property name="can-focus">False</property>
         <property name="label" translatable="yes">Load local configuration</property>
-        <property name="use-underline">True</property>
         <style>
           <class name="menuitembottom"/>
         </style>
@@ -89,7 +87,6 @@
         <property name="visible">True</property>
         <property name="can-focus">False</property>
         <property name="label" translatable="yes">Help</property>
-        <property name="use-underline">True</property>
         <style>
           <class name="menuitemtop"/>
         </style>
@@ -100,7 +97,6 @@
         <property name="visible">True</property>
         <property name="can-focus">False</property>
         <property name="label" translatable="yes">About</property>
-        <property name="use-underline">True</property>
         <style>
           <class name="menuitembottom"/>
         </style>
@@ -118,7 +114,6 @@
         <property name="visible">True</property>
         <property name="can-focus">False</property>
         <property name="label" translatable="yes">Save to global and local configuration</property>
-        <property name="use-underline">True</property>
         <style>
           <class name="menuitemtop"/>
         </style>
@@ -129,7 +124,6 @@
         <property name="visible">True</property>
         <property name="can-focus">False</property>
         <property name="label" translatable="yes">Save global configuration</property>
-        <property name="use-underline">True</property>
         <style>
           <class name="menuitemmiddle"/>
         </style>
@@ -140,7 +134,6 @@
         <property name="visible">True</property>
         <property name="can-focus">False</property>
         <property name="label" translatable="yes">Save local configuration</property>
-        <property name="use-underline">True</property>
         <style>
           <class name="menuitembottom"/>
         </style>
@@ -1045,9 +1038,6 @@ Format: DD.MM.YYYY</property>
                 <property name="position">0</property>
               </packing>
             </child>
-            <style>
-              <class name="primary-toolbar"/>
-            </style>
           </object>
           <packing>
             <property name="position">1</property>
@@ -1133,9 +1123,6 @@ Format: DD.MM.YYYY</property>
                 <property name="position">1</property>
               </packing>
             </child>
-            <style>
-              <class name="primary-toolbar"/>
-            </style>
           </object>
           <packing>
             <property name="pack-type">end</property>
diff --git a/ubl-settings-datetime_ru.po b/ubl-settings-datetime_ru.po
index 9285589..d423663 100644
--- a/ubl-settings-datetime_ru.po
+++ b/ubl-settings-datetime_ru.po
@@ -58,7 +58,7 @@ msgstr "По умолчанию"
 msgid "The program must be run with \nsuperuser privileges!"
 msgstr "Программа должна быть запущена с правами \nсуперпользователя!"
 
-msgid "The program must be run with superuser privileges!"
+msgid "The program must be run as root"
 msgstr "Программа должна быть запущена с правами суперпользователя!"
 
 msgid "Manual"

From 20ec428af7639eb527464aa05e2f3d0d204cc38d Mon Sep 17 00:00:00 2001
From: Igor Belitskiy <goga.belitskiy.00@mail.eu>
Date: Wed, 15 Mar 2023 09:14:44 +0600
Subject: [PATCH 15/27] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8?=
 =?UTF-8?q?=20=D0=B2=20=D0=B8=D0=BC=D0=B5=D0=BD=D0=B0=D1=85=20=D0=BF=D0=B5?=
 =?UTF-8?q?=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D1=8B=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 #ubl-settings-datetime.glade#   | 1350 +++++++++++++++++++++++++++++++
 source/ubl-settings-datetime.cc |   53 +-
 source/ubl-settings-datetime.h  |   18 +-
 ubl-settings-datetime.glade     |   17 +-
 ubl-settings-datetime_ru.po     |    2 +-
 5 files changed, 1395 insertions(+), 45 deletions(-)
 create mode 100644 #ubl-settings-datetime.glade#

diff --git a/#ubl-settings-datetime.glade# b/#ubl-settings-datetime.glade#
new file mode 100644
index 0000000..104ec18
--- /dev/null
+++ b/#ubl-settings-datetime.glade#
@@ -0,0 +1,1350 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.38.2 -->
+<interface>
+  <requires lib="gtk+" version="3.24"/>
+  <object class="GtkAboutDialog" id="aboutWindows">
+    <property name="can-focus">False</property>
+    <property name="title" translatable="yes">О Программе</property>
+    <property name="resizable">False</property>
+    <property name="modal">True</property>
+    <property name="window-position">center</property>
+    <property name="icon-name">ubl-settings-datetime</property>
+    <property name="type-hint">dialog</property>
+    <property name="urgency-hint">True</property>
+    <property name="program-name">ubl-settings-datetime</property>
+    <property name="version">1.2</property>
+    <property name="copyright" translatable="yes">Copyright © 2023 - UBSoft Software LLC</property>
+    <property name="comments" translatable="yes">Setting the date and time</property>
+    <property name="website">https://ublinux.ru/</property>
+    <property name="website-label" translatable="yes">Project Home Page</property>
+    <property name="license" translatable="yes">Это приложение распространяется без каких-либо гарантий.
+Подробнее в &lt;a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"&gt;GNU General Public License, версии 2 или позднее&lt;/a&gt;.</property>
+    <property name="authors">UBGroup</property>
+    <property name="artists">UBGroup</property>
+    <property name="logo-icon-name">ubl-settings-datetime</property>
+    <property name="wrap-license">True</property>
+    <property name="license-type">gpl-2-0</property>
+    <child internal-child="vbox">
+      <object class="GtkBox">
+        <property name="can-focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="btnBoxAboutDialog">
+            <property name="can-focus">False</property>
+            <property name="layout-style">end</property>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkMenu" id="menu">
+    <property name="visible">True</property>
+    <property name="can-focus">False</property>
+    <property name="take-focus">False</property>
+    <property name="reserve-toggle-size">False</property>
+    <property name="rect-anchor-dy">4</property>
+    <child>
+      <object class="GtkMenuItem" id="btnLoadGlob">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="label" translatable="yes">Load global configuration</property>
+        <style>
+          <class name="menuitemtop"/>
+        </style>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="btnLoadLocal">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="label" translatable="yes">Load local configuration</property>
+        <style>
+          <class name="menuitembottom"/>
+        </style>
+      </object>
+    </child>
+  </object>
+  <object class="GtkMenu" id="menu1">
+    <property name="visible">True</property>
+    <property name="can-focus">False</property>
+    <property name="take-focus">False</property>
+    <property name="reserve-toggle-size">False</property>
+    <property name="rect-anchor-dy">4</property>
+    <child>
+      <object class="GtkMenuItem" id="btnSynopsis">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="label" translatable="yes">Help</property>
+        <style>
+          <class name="menuitemtop"/>
+        </style>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="btnAbout">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="label" translatable="yes">About</property>
+        <style>
+          <class name="menuitembottom"/>
+        </style>
+      </object>
+    </child>
+  </object>
+  <object class="GtkMenu" id="menu2">
+    <property name="visible">True</property>
+    <property name="can-focus">False</property>
+    <property name="take-focus">False</property>
+    <property name="reserve-toggle-size">False</property>
+    <property name="rect-anchor-dy">4</property>
+    <child>
+      <object class="GtkMenuItem" id="btnSaveLocalGlob">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="label" translatable="yes">Save to global and local configuration</property>
+        <style>
+          <class name="menuitemtop"/>
+        </style>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="btnSaveGlob">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="label" translatable="yes">Save global configuration</property>
+        <style>
+          <class name="menuitemmiddle"/>
+        </style>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="btnSaveLocal">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="label" translatable="yes">Save local configuration</property>
+        <style>
+          <class name="menuitembottom"/>
+        </style>
+      </object>
+    </child>
+  </object>
+  <object class="GtkWindow" id="window">
+    <property name="can-focus">False</property>
+    <child>
+      <object class="GtkBox" id="plugBox">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkBox">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkBox" id="boxInfoError">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <child>
+                  <object class="GtkImage" id="imgInfo">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="margin-left">5</property>
+                    <property name="margin-right">5</property>
+                    <property name="margin-start">5</property>
+                    <property name="margin-end">5</property>
+                    <property name="margin-top">6</property>
+                    <property name="margin-bottom">6</property>
+                    <property name="stock">checked</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="lblWarning">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="margin-left">5</property>
+                    <property name="margin-right">5</property>
+                    <property name="margin-start">5</property>
+                    <property name="margin-end">5</property>
+                    <property name="margin-top">6</property>
+                    <property name="margin-bottom">6</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                      <attribute name="foreground" value="#000000000000"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox" id="standartHead">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkBox" id="boxColor">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <child>
+                      <object class="GtkImage">
+                        <property name="width-request">90</property>
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-left">5</property>
+                        <property name="margin-right">5</property>
+                        <property name="margin-start">5</property>
+                        <property name="margin-end">5</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="pixel-size">69</property>
+                        <property name="icon-name">ubl-settings-datetime</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <child>
+                          <object class="GtkBox">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <child>
+                              <object class="GtkBox">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="orientation">vertical</property>
+                                <child>
+                                  <object class="GtkLabel" id="lblHead">
+                                    <property name="width-request">255</property>
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="label" translatable="yes">Date and time settings</property>
+                                    <attributes>
+                                      <attribute name="font-desc" value="URW Gothic Semi-Bold 10"/>
+                                      <attribute name="weight" value="bold"/>
+                                      <attribute name="foreground" value="#000023233232"/>
+                                      <attribute name="size" value="15360"/>
+                                    </attributes>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkBox" id="boxDateTime">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <object class="GtkFrame">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-left">5</property>
+                        <property name="margin-right">5</property>
+                        <property name="margin-start">5</property>
+                        <property name="margin-end">5</property>
+                        <property name="label-xalign">0.019999999552965164</property>
+                        <property name="shadow-type">in</property>
+                        <child>
+                          <object class="GtkBox">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="margin-left">5</property>
+                            <property name="margin-start">5</property>
+                            <property name="margin-bottom">5</property>
+                            <property name="orientation">vertical</property>
+                            <child>
+                              <object class="GtkBox">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <child>
+                                  <object class="GtkLabel" id="lblTime">
+                                    <property name="width-request">0</property>
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="margin-left">5</property>
+                                    <property name="margin-right">5</property>
+                                    <property name="margin-start">5</property>
+                                    <property name="margin-end">5</property>
+                                    <property name="margin-top">6</property>
+                                    <property name="margin-bottom">6</property>
+                                    <property name="label" translatable="yes" context="Time" comments="Time">Time</property>
+                                    <property name="wrap">True</property>
+                                    <property name="xalign">0</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkSpinButton" id="numTimeHrs">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">True</property>
+                                    <property name="margin-left">5</property>
+                                    <property name="margin-right">5</property>
+                                    <property name="margin-start">5</property>
+                                    <property name="margin-end">5</property>
+                                    <property name="margin-top">6</property>
+                                    <property name="margin-bottom">6</property>
+                                    <property name="width-chars">2</property>
+                                    <property name="progress-pulse-step">0.099999999776482579</property>
+                                    <property name="numeric">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="label" translatable="yes">:</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkSpinButton" id="numTimeMin">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">True</property>
+                                    <property name="margin-left">5</property>
+                                    <property name="margin-right">5</property>
+                                    <property name="margin-start">5</property>
+                                    <property name="margin-end">5</property>
+                                    <property name="margin-top">6</property>
+                                    <property name="margin-bottom">6</property>
+                                    <property name="width-chars">2</property>
+                                    <property name="numeric">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">3</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="lblData">
+                                    <property name="width-request">20</property>
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="margin-left">5</property>
+                                    <property name="margin-right">5</property>
+                                    <property name="margin-start">5</property>
+                                    <property name="margin-end">5</property>
+                                    <property name="margin-top">6</property>
+                                    <property name="margin-bottom">6</property>
+                                    <property name="label" translatable="yes" context="Date" comments="Date">Date</property>
+                                    <property name="wrap">True</property>
+                                    <property name="xalign">0</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">4</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" id="txtDate">
+                                    <property name="width-request">-1</property>
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">True</property>
+                                    <property name="tooltip-text" translatable="yes" context="Date of&#10;Format: DD.MM.YYYY" comments="Date of&#10;Format: DD.MM.YYYY">Date
+Format: DD.MM.YYYY</property>
+                                    <property name="margin-left">5</property>
+                                    <property name="margin-right">5</property>
+                                    <property name="margin-start">5</property>
+                                    <property name="margin-end">5</property>
+                                    <property name="margin-top">6</property>
+                                    <property name="margin-bottom">6</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">5</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkButton" id="btnChooseDate">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">True</property>
+                                    <property name="receives-default">True</property>
+                                    <property name="tooltip-text" translatable="yes" context="Interactive date picker" comments="Interactive date picker">Интерактивный выбор даты</property>
+                                    <property name="margin-left">5</property>
+                                    <property name="margin-right">10</property>
+                                    <property name="margin-start">5</property>
+                                    <property name="margin-end">10</property>
+                                    <property name="margin-top">6</property>
+                                    <property name="margin-bottom">6</property>
+                                    <child>
+                                      <object class="GtkImage">
+                                        <property name="visible">True</property>
+                                        <property name="can-focus">False</property>
+                                        <property name="icon-name">x-office-calendar</property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">6</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkBox">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <child>
+                                  <object class="GtkButton" id="btnUpdateDateTime">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">True</property>
+                                    <property name="receives-default">True</property>
+                                    <property name="margin-left">7</property>
+                                    <property name="margin-right">5</property>
+                                    <property name="margin-start">7</property>
+                                    <property name="margin-end">5</property>
+                                    <property name="margin-top">6</property>
+                                    <property name="margin-bottom">6</property>
+                                    <child>
+                                      <object class="GtkBox">
+                                        <property name="visible">True</property>
+                                        <property name="can-focus">False</property>
+                                        <property name="halign">center</property>
+                                        <property name="valign">center</property>
+                                        <child>
+                                          <object class="GtkImage">
+                                            <property name="visible">True</property>
+                                            <property name="can-focus">False</property>
+                                            <property name="margin-left">5</property>
+                                            <property name="margin-right">5</property>
+                                            <property name="margin-start">5</property>
+                                            <property name="margin-end">5</property>
+                                            <property name="icon-name">media-playlist-repeat</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="lblSynchronizeBtn">
+                                            <property name="visible">True</property>
+                                            <property name="can-focus">False</property>
+                                            <property name="halign">center</property>
+                                            <property name="valign">center</property>
+                                            <property name="label" translatable="yes">Sync by</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">1</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">False</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">False</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkButton" id="btnHardwareTime">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">True</property>
+                                    <property name="receives-default">True</property>
+                                    <property name="margin-left">5</property>
+                                    <property name="margin-right">10</property>
+                                    <property name="margin-start">5</property>
+                                    <property name="margin-end">10</property>
+                                    <property name="margin-top">6</property>
+                                    <property name="margin-bottom">6</property>
+                                    <child>
+                                      <object class="GtkLabel" id="lblTimeBios">
+                                        <property name="visible">True</property>
+                                        <property name="can-focus">False</property>
+                                        <property name="halign">center</property>
+                                        <property name="valign">center</property>
+                                        <property name="label" translatable="yes">Synchronize hardware time</property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">3</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                        <child type="label">
+                          <object class="GtkLabel" id="lblDateTimeSetting">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="label" translatable="yes" context="Setting the date and time" comments="Setting the date and time">Current date and time</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <object class="GtkFrame">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-left">5</property>
+                        <property name="margin-right">5</property>
+                        <property name="margin-start">5</property>
+                        <property name="margin-end">5</property>
+                        <property name="label-xalign">0.019999999552965164</property>
+                        <property name="shadow-type">in</property>
+                        <child>
+                          <object class="GtkBox">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="margin-left">5</property>
+                            <property name="margin-start">5</property>
+                            <property name="margin-bottom">5</property>
+                            <property name="orientation">vertical</property>
+                            <child>
+                              <object class="GtkBox">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <child>
+                                  <object class="GtkComboBoxText" id="cbDhcp">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">False</property>
+                                    <property name="margin-left">5</property>
+                                    <property name="margin-right">5</property>
+                                    <property name="margin-start">5</property>
+                                    <property name="margin-end">5</property>
+                                    <property name="margin-top">6</property>
+                                    <property name="margin-bottom">6</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" id="txtNtpServer">
+                                    <property name="visible">True</property>
+                                    <property name="can-focus">True</property>
+                                    <property name="tooltip-text" translatable="yes">Enter the name of the ntp server or its ip address. When entering multiple addresses, separate them with spaces.</property>
+                                    <property name="valign">center</property>
+                                    <property name="margin-left">5</property>
+                                    <property name="margin-right">10</property>
+                                    <property name="margin-start">5</property>
+                                    <property name="margin-end">10</property>
+                                    <property name="margin-top">6</property>
+                                    <property name="margin-bottom">6</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">3</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                        <child type="label">
+                          <object class="GtkLabel" id="lblSynchronizebChkGLob">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="label" translatable="yes" context="Setting date and time in global configuration" comments="Setting date and time in global configuration">Synchronize via NTP:</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkFrame">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="margin-left">5</property>
+                    <property name="margin-right">5</property>
+                    <property name="margin-start">5</property>
+                    <property name="margin-end">5</property>
+                    <property name="margin-bottom">5</property>
+                    <property name="label-xalign">0.019999999552965164</property>
+                    <property name="shadow-type">in</property>
+                    <child>
+                      <object class="GtkBox">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="orientation">vertical</property>
+                        <child>
+                          <object class="GtkBox">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <child>
+                              <object class="GtkLabel" id="lblHW">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="halign">start</property>
+                                <property name="margin-left">8</property>
+                                <property name="margin-right">5</property>
+                                <property name="margin-start">8</property>
+                                <property name="margin-end">5</property>
+                                <property name="margin-top">6</property>
+                                <property name="margin-bottom">13</property>
+                                <property name="label" translatable="yes">Synchronize hardware time:</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="margin-end">55</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkComboBoxText" id="cbHw">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="margin-left">10</property>
+                                <property name="margin-right">5</property>
+                                <property name="margin-start">5</property>
+                                <property name="margin-end">10</property>
+                                <property name="margin-top">6</property>
+                                <property name="margin-bottom">10</property>
+                                <property name="hexpand">False</property>
+                                <property name="vexpand">False</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkBox">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="lblReg">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="margin-left">8</property>
+                                <property name="margin-right">5</property>
+                                <property name="margin-start">8</property>
+                                <property name="margin-end">5</property>
+                                <property name="margin-top">6</property>
+                                <property name="margin-bottom">13</property>
+                                <property name="label" translatable="yes" context="Region" comments="Region">Region</property>
+                                <property name="xalign">0</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkComboBoxText" id="cbRegion">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="margin-left">5</property>
+                                <property name="margin-right">5</property>
+                                <property name="margin-start">5</property>
+                                <property name="margin-end">5</property>
+                                <property name="margin-top">6</property>
+                                <property name="margin-bottom">10</property>
+                                <property name="hexpand">False</property>
+                                <property name="vexpand">False</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="lblZone">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="margin-left">5</property>
+                                <property name="margin-right">5</property>
+                                <property name="margin-start">5</property>
+                                <property name="margin-end">5</property>
+                                <property name="margin-top">6</property>
+                                <property name="margin-bottom">13</property>
+                                <property name="label" translatable="yes" context="Zone" comments="Zone">Area</property>
+                                <property name="xalign">0</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">4</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkComboBoxText" id="cbZone">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="margin-left">5</property>
+                                <property name="margin-right">5</property>
+                                <property name="margin-start">5</property>
+                                <property name="margin-end">5</property>
+                                <property name="margin-top">6</property>
+                                <property name="margin-bottom">10</property>
+                                <property name="hexpand">False</property>
+                                <property name="vexpand">False</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">5</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="width-request">5</property>
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">6</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">7</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" id="lblTimeZone">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="label" translatable="yes">Time Zone</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <child type="titlebar">
+      <object class="GtkHeaderBar" id="headerBar">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="show-close-button">True</property>
+        <child type="title">
+          <object class="GtkLabel" id="lblHeader">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="halign">start</property>
+            <property name="margin-left">5</property>
+            <property name="margin-right">5</property>
+            <property name="margin-start">5</property>
+            <property name="margin-end">5</property>
+            <property name="margin-bottom">1</property>
+            <property name="hexpand">False</property>
+            <property name="label" translatable="yes">ubl-settings-datetime</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+        </child>
+        <child>
+          <object class="GtkImage">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="margin-left">5</property>
+            <property name="margin-right">5</property>
+            <property name="margin-start">5</property>
+            <property name="margin-end">5</property>
+            <property name="pixel-size">32</property>
+            <property name="icon-name">ubl-settings-datetime</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkBox" id="boxButton">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <child>
+              <object class="GtkMenuButton" id="btnLoad">
+                <property name="visible">True</property>
+                <property name="can-focus">True</property>
+                <property name="focus-on-click">False</property>
+                <property name="receives-default">True</property>
+                <property name="draw-indicator">True</property>
+                <property name="popup">menu</property>
+                <property name="direction">none</property>
+                <child>
+                  <object class="GtkBox">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <child>
+                      <object class="GtkLabel" id="lblLoad">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-left">5</property>
+                        <property name="margin-right">5</property>
+                        <property name="margin-start">5</property>
+                        <property name="margin-end">5</property>
+                        <property name="label" translatable="yes">Load</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkImage" id="imgLoad">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="icon-name">pan-down-symbolic</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="boxSave">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <child>
+              <object class="GtkMenuButton" id="btnSave">
+                <property name="visible">True</property>
+                <property name="can-focus">True</property>
+                <property name="focus-on-click">False</property>
+                <property name="receives-default">True</property>
+                <property name="draw-indicator">True</property>
+                <property name="popup">menu2</property>
+                <property name="direction">none</property>
+                <child>
+                  <object class="GtkBox">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <child>
+                      <object class="GtkLabel" id="lblSave">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-left">5</property>
+                        <property name="margin-right">5</property>
+                        <property name="margin-start">5</property>
+                        <property name="margin-end">5</property>
+                        <property name="label" translatable="yes">Save</property>
+                        <style>
+                          <class name="toolbar"/>
+                        </style>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkImage" id="imgSave">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="icon-name">pan-down-symbolic</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkMenuButton" id="btnSettings">
+                <property name="visible">True</property>
+                <property name="can-focus">True</property>
+                <property name="focus-on-click">False</property>
+                <property name="receives-default">True</property>
+                <property name="draw-indicator">True</property>
+                <property name="popup">menu1</property>
+                <property name="direction">none</property>
+                <child>
+                  <object class="GtkImage" id="imgSettings">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="icon-name">open-menu-symbolic</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="pack-type">end</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkSizeGroup">
+    <property name="mode">both</property>
+    <property name="ignore-hidden">True</property>
+    <widgets>
+      <widget name="cbRegion"/>
+      <widget name="cbZone"/>
+    </widgets>
+  </object>
+  <object class="GtkSizeGroup">
+    <property name="mode">both</property>
+    <property name="ignore-hidden">True</property>
+    <widgets>
+      <widget name="btnUpdateDateTime"/>
+      <widget name="lblHW"/>
+    </widgets>
+  </object>
+  <object class="GtkSizeGroup">
+    <property name="mode">both</property>
+    <property name="ignore-hidden">True</property>
+    <widgets>
+      <widget name="cbHw"/>
+      <widget name="cbZone"/>
+    </widgets>
+  </object>
+  <object class="GtkPopover" id="popCalendar">
+    <property name="width-request">240</property>
+    <property name="height-request">185</property>
+    <property name="can-focus">False</property>
+    <property name="relative-to">btnChooseDate</property>
+    <property name="position">bottom</property>
+    <property name="constrain-to">none</property>
+    <child>
+      <object class="GtkCalendar" id="cldrDate">
+        <property name="visible">True</property>
+        <property name="can-focus">True</property>
+        <property name="margin-left">10</property>
+        <property name="margin-right">10</property>
+        <property name="margin-start">10</property>
+        <property name="margin-end">10</property>
+        <property name="margin-top">10</property>
+        <property name="margin-bottom">10</property>
+        <property name="year">2023</property>
+        <property name="month">1</property>
+        <property name="day">10</property>
+      </object>
+    </child>
+  </object>
+  <object class="GtkWindow" id="windowMessDchp">
+    <property name="can-focus">False</property>
+    <property name="title" translatable="yes">Внимание!</property>
+    <property name="type-hint">dialog</property>
+    <child>
+      <object class="GtkBox">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkBox">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="margin-left">5</property>
+            <property name="margin-right">5</property>
+            <property name="margin-start">5</property>
+            <property name="margin-end">5</property>
+            <child>
+              <object class="GtkImage">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="margin-right">5</property>
+                <property name="margin-start">5</property>
+                <property name="margin-end">5</property>
+                <property name="margin-top">6</property>
+                <property name="margin-bottom">6</property>
+                <property name="pixel-size">50</property>
+                <property name="icon-name">gtk-dialog-warning</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="lblMessage">
+                <property name="width-request">160</property>
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
+                <property name="margin-top">6</property>
+                <property name="margin-bottom">6</property>
+                <property name="label" translatable="yes">Enter DHCP !</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="btnMessClose">
+            <property name="label" translatable="yes">OK</property>
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">True</property>
+            <property name="margin-left">5</property>
+            <property name="margin-right">5</property>
+            <property name="margin-start">5</property>
+            <property name="margin-end">5</property>
+            <property name="margin-top">3</property>
+            <property name="margin-bottom">3</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkWindow" id="windowMessSudo">
+    <property name="can-focus">False</property>
+    <property name="type">popup</property>
+    <property name="title" translatable="yes">Внимание!</property>
+    <property name="window-position">center</property>
+    <property name="type-hint">dialog</property>
+    <child>
+      <object class="GtkBox">
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkBox">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="margin-left">5</property>
+            <property name="margin-right">5</property>
+            <property name="margin-start">5</property>
+            <property name="margin-end">5</property>
+            <child>
+              <object class="GtkImage">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="margin-right">5</property>
+                <property name="margin-start">5</property>
+                <property name="margin-end">5</property>
+                <property name="margin-top">6</property>
+                <property name="margin-bottom">6</property>
+                <property name="pixel-size">50</property>
+                <property name="icon-name">gtk-dialog-warning</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="lblMessageSudo">
+                <property name="width-request">160</property>
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
+                <property name="margin-left">5</property>
+                <property name="margin-right">5</property>
+                <property name="margin-start">5</property>
+                <property name="margin-end">5</property>
+                <property name="margin-top">6</property>
+                <property name="margin-bottom">6</property>
+                <property name="label" translatable="yes">Enter DHCP !</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="btnMessCloseSudo">
+            <property name="label" translatable="yes">OK</property>
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">True</property>
+            <property name="margin-left">5</property>
+            <property name="margin-right">5</property>
+            <property name="margin-start">5</property>
+            <property name="margin-end">5</property>
+            <property name="margin-top">3</property>
+            <property name="margin-bottom">3</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc
index f9c5ef9..9547664 100644
--- a/source/ubl-settings-datetime.cc
+++ b/source/ubl-settings-datetime.cc
@@ -98,14 +98,14 @@ void MainWindow::settings() {
         btnBoxAboutDialog->set_visible(false);
         this->event();
         this->parse_text_date();
-        this->download_local_cfg();
+        this->load_local_cfg();
     }
     else {
         lblHW->set_sensitive(false);
         cbHw->set_sensitive(false);
         boxButton->set_sensitive(false);
         boxSave->set_sensitive(false);
-        btnDownload->set_sensitive(false);
+        btnLoad->set_sensitive(false);
         numTimeHrs->set_sensitive(false);
         numTimeMin->set_sensitive(false);
         lblTime->set_sensitive(false);
@@ -135,7 +135,7 @@ void MainWindow::settings() {
 int MainWindow::check_root() {
     if (geteuid() != 0) {
         lblMessageSudo->set_text(_("The program must be run as root"));
-        mess_sudo->show();
+        windowMessSudo->show();
         return 1;
     }
     return 0;
@@ -152,7 +152,7 @@ void MainWindow::lacalization() {
     aboutWindows->set_version(_(version_application.c_str()));
     aboutWindows->set_website_label(_("Project Home Page"));
     lblSave->set_label(_("Save"));
-    lblDownload->set_label(_("Download"));
+    lblLoad->set_label(_("Load"));
     txtDate->set_tooltip_text(_("Date of\nFormat: DD.MM.YYYY"));
     txtNtpServer->set_tooltip_text(_("Enter the name of the ntp-server or its ip-address.\nWhen entering multiple addresses, separate them with commas."));
     lblSynchronizebChkGLob->set_text(_("Synchronize via NTP:"));
@@ -169,8 +169,8 @@ void MainWindow::lacalization() {
     lblZone->set_text(_("Zone"));
     lblSynchronizeBtn->set_text(_("Sync by"));
     lblHeader->set_text(_("ubl-settings-datetime"));
-    mess_sudo->set_title(_("Warning!"));
-    mess_dchp->set_title(_("Warning!"));
+    windowMessSudo->set_title(_("Warning!"));
+    windowMessDchp->set_title(_("Warning!"));
     lblTimeBios->set_text(_("Synchronize hardware time"));
     lblHW->set_text(_("Synchronize hardware time:"));
     cbHw->append(_("Local time"));
@@ -202,7 +202,7 @@ void MainWindow::flag_block_gui() {
         txtNtpServer->set_sensitive(false);
     }
     if (flag_load_global == true) {
-        btnDonwlolGlob->set_sensitive(false);
+        btnLoadGlob->set_sensitive(false);
     }
     if (flag_save == true) {
         btnSave->set_sensitive(false);
@@ -255,7 +255,7 @@ void MainWindow::get_builder() {
     builder->get_widget("cbZone", cbZone);
     builder->get_widget("txtNtpServer", txtNtpServer);
     builder->get_widget("cldrDate", cldrDate);
-    builder->get_widget("mess_dchp", mess_dchp);
+    builder->get_widget("windowMessDchp", windowMessDchp);
     builder->get_widget("lblMessage", lblMessage);
     builder->get_widget("lblDateTimeSetting", lblDateTimeSetting);
     builder->get_widget("lblHead", lblHead);
@@ -268,11 +268,11 @@ void MainWindow::get_builder() {
     builder->get_widget("lblSynchronizeBtn", lblSynchronizeBtn);
     builder->get_widget("lblTimeBios", lblTimeBios);
     builder->get_widget("btnHardwareTime",btnHardwareTime);
-    builder->get_widget("mess_sudo",mess_sudo);
+    builder->get_widget("windowMessSudo",windowMessSudo);
     builder->get_widget("lblMessageSudo", lblMessageSudo);
     builder->get_widget("btnMessCloseSudo",btnMessCloseSudo);
     builder->get_widget("lblSave", lblSave);
-    builder->get_widget("lblDownload", lblDownload);
+    builder->get_widget("lblLoad", lblLoad);
     builder->get_widget("aboutWindows", aboutWindows);
     builder->get_widget("btnBoxAboutDialog", btnBoxAboutDialog);
     builder->get_widget("boxInfoError", boxInfoError);
@@ -280,11 +280,11 @@ void MainWindow::get_builder() {
     builder->get_widget("imgInfo", imgInfo);
     builder->get_widget("btnSave", btnSave);
     builder->get_widget("btnSettings", btnSettings);
-    builder->get_widget("btnDownload", btnDownload);
+    builder->get_widget("btnLoad", btnLoad);
     builder->get_widget("btnSynopsis", btnSynopsis);
     builder->get_widget("btnAbout", btnAbout);
-    builder->get_widget("btnDonwlodLocal", btnDonwlodLocal);
-    builder->get_widget("btnDonwlolGlob", btnDonwlolGlob);
+    builder->get_widget("btnLoadLocal", btnLoadLocal);
+    builder->get_widget("btnLoadGlob", btnLoadGlob);
     builder->get_widget("btnSaveLocalGlob", btnSaveLocalGlob);
     builder->get_widget("btnSaveLocal", btnSaveLocal);
     builder->get_widget("btnSaveGlob", btnSaveGlob);
@@ -299,8 +299,7 @@ void MainWindow::get_builder() {
     builder->get_widget("standartHead", standartHead);
     builder->get_widget("plugBox", plugBox);
     builder->get_widget("window" ,window);
-    builder->get_widget("imgDonwload", imgDonwload);
-    builder->get_widget("imgDonwload", imgDonwload);
+    builder->get_widget("imgLoad", imgLoad);
     builder->get_widget("imgSettings", imgSettings);
     builder->get_widget("imgSave", imgSave);
 }
@@ -326,11 +325,11 @@ void MainWindow::event() {
     cbDhcp->signal_changed().connect(sigc::mem_fun(*this, &MainWindow::event_entry_cbDhcp));
     cbRegion->signal_changed().connect(sigc::mem_fun(*this, &MainWindow::append_zone));
     cldrDate->signal_day_selected_double_click().connect(sigc::mem_fun(*this, &MainWindow::get_calendar));
-    mess_sudo->signal_delete_event().connect(sigc::mem_fun(*this, &MainWindow::gui_exit_2));
+    windowMessSudo->signal_delete_event().connect(sigc::mem_fun(*this, &MainWindow::gui_exit_2));
     btnAbout->signal_activate().connect([&]() {aboutWindows->show();});
     btnSynopsis->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::synopsis_show));
-    btnDonwlodLocal->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::download_local_cfg));
-    btnDonwlolGlob->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::download_globl_cfg));
+    btnLoadLocal->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::load_local_cfg));
+    btnLoadGlob->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::load_globl_cfg));
     btnSaveLocalGlob->signal_activate().connect([&]() {save_global_local_cfg();});
     btnSaveLocal->signal_activate().connect([&]() {save_local_cfg();});
     btnSaveGlob->signal_activate().connect([&]() {save_global_cfg();});
@@ -345,7 +344,7 @@ void MainWindow::synopsis_show() {
     }
 }
 
-void MainWindow::download_local_cfg() {
+void MainWindow::load_local_cfg() {
     string cmd = "/usr/bin/ubconfig --default --source system get clock ZONE";
     this->fill_in_reg_zone(cmd);
     this->update_hour_minute();
@@ -359,7 +358,7 @@ void MainWindow::download_local_cfg() {
     info_warning_error(0);
 }
 
-void MainWindow::download_globl_cfg() {
+void MainWindow::load_globl_cfg() {
     string cmd_get_dhcp = "/usr/bin/ubconfig  --default --source global get network NTPSERVERS";
     string cmd_default_get_dhcp = "/usr/bin/ubconfig --source=default get NTPSERVERS_DEFAULT";
     this->entry_dhcp_mess(cmd_get_dhcp, cmd_default_get_dhcp);
@@ -555,13 +554,13 @@ void MainWindow::hardware_clock() {
 }
 
 void MainWindow::gui_mess_close() {
-    mess_dchp->hide();
+    windowMessDchp->hide();
 }
     
 bool MainWindow::focus_ntp(string &cmd_set_ntp) {
     if (txtNtpServer->get_text() == "" || txtNtpServer->get_text() == " ") {
         lblMessage->set_text(_("Enter DHCP!"));
-        mess_dchp->show();
+        windowMessDchp->show();
     }
     else {
         string cmd = "";
@@ -587,11 +586,11 @@ bool MainWindow::focus_ntp(string &cmd_set_ntp) {
         else {
             if (flag_error == true) {
                 lblMessage->set_text(_("An invalid character is entered"));
-                mess_dchp->show();
+                windowMessDchp->show();
             }
             else if (flag_error_check_ntp == true) {
                 lblMessage->set_text(_("Error in the ntp name"));
-                mess_dchp->show();
+                windowMessDchp->show();
             }
         }
     }
@@ -789,7 +788,7 @@ void MainWindow::entry_dhcp_mess(string cmd_get_dhcp, string cmd_default_get_dhc
             btnUpdateDateTime->set_sensitive(false);
             if (str_dhcp == "") {
                 lblMessage->set_text(_("Enter DHCP!"));
-                mess_dchp->show();
+                windowMessDchp->show();
             }
             else if (str_dhcp == "(null)") {
                 cbDhcp->set_active(0);
@@ -1124,12 +1123,12 @@ void MainWindow::post_entry_data() {
         size_t index = str_error_clock.find("date:");
         if (index != std::string::npos) {
             lblMessage->set_text(_("Incorrect date format"));
-            mess_dchp->show(); 
+            windowMessDchp->show(); 
         }
     }
     else {
         lblMessage->set_text(_("Incorrect date format"));
-        mess_dchp->show();   
+        windowMessDchp->show();   
     }
 }
 
diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h
index f35ccef..dd466a6 100755
--- a/source/ubl-settings-datetime.h
+++ b/source/ubl-settings-datetime.h
@@ -60,8 +60,8 @@ class MainWindow : public Gtk::ApplicationWindow {
         Gtk::Box *boxColor;
         Gtk::ComboBoxText *cbRegion;
         Gtk::ComboBoxText *cbZone;
-        Gtk::Window *mess_dchp;
-        Gtk::Window *mess_sudo;
+        Gtk::Window *windowMessDchp;
+        Gtk::Window *windowMessSudo;
         Gtk::Popover *popCalendar;
         Gtk::Calendar *cldrDate;
         Gtk::Label *lblMessage;
@@ -78,12 +78,12 @@ class MainWindow : public Gtk::ApplicationWindow {
         Gtk::Label *lblSynchronizeBtn;
         Gtk::Label *lblTimeBios;
         Gtk::Label *lblSave;
-        Gtk::Label *lblDownload;
+        Gtk::Label *lblLoad;
         Gtk::Button *btnHardwareTime;
         Gtk::CheckButton *cbxSynchronizeNtp;
         Gtk::Entry *txtNtpServer;
         Gtk::Entry *txtDate;
-        Gtk::Button *btnDownload;
+        Gtk::Button *btnLoad;
         Gtk::Button *btnSave;
         Gtk::Button *btnSettings; 
         Gtk::AboutDialog *aboutWindows;
@@ -97,8 +97,8 @@ class MainWindow : public Gtk::ApplicationWindow {
         Gtk::MenuItem *btnSaveLocalGlob;
         Gtk::MenuItem *btnSaveLocal;
         Gtk::MenuItem *btnSaveGlob;
-        Gtk::MenuItem *btnDonwlolGlob;
-        Gtk::MenuItem *btnDonwlodLocal;
+        Gtk::MenuItem *btnLoadGlob;
+        Gtk::MenuItem *btnLoadLocal;
         Gtk::MenuItem *btnAbout;
         Gtk::MenuItem *btnSynopsis;
         Gtk::HeaderBar *headerBar;
@@ -111,7 +111,7 @@ class MainWindow : public Gtk::ApplicationWindow {
         Gtk::Widget *standartHead;
         Gtk::Widget *plugBox;
         Gtk::Window *window;
-        Gtk::Image *imgDonwload;
+        Gtk::Image *imgLoad;
         Gtk::Image *imgSave;
         Gtk::Image *imgSettings;
        
@@ -147,11 +147,11 @@ class MainWindow : public Gtk::ApplicationWindow {
         void entry_hardware_clock_default(string &cmd_default);
         void save_global_local_cfg();
         void fill_in_reg_zone(string &cmd);
-        void download_globl_cfg();
+        void load_globl_cfg();
         void save_local_cfg();
         void save_global_cfg();
         void save_Dhcp(string &cmd_default, string &cmd_dhcp, string &remove, string &cmd_set_ntp);
-        void download_local_cfg();
+        void load_local_cfg();
         void post_entry_data();
         void lacalization();
         void settings();
diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade
index 9db607c..209863f 100644
--- a/ubl-settings-datetime.glade
+++ b/ubl-settings-datetime.glade
@@ -56,7 +56,7 @@
     <property name="reserve-toggle-size">False</property>
     <property name="rect-anchor-dy">4</property>
     <child>
-      <object class="GtkMenuItem" id="btnDonwlolGlob">
+      <object class="GtkMenuItem" id="btnLoadGlob">
         <property name="visible">True</property>
         <property name="can-focus">False</property>
         <property name="label" translatable="yes">Load global configuration</property>
@@ -66,7 +66,7 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="btnDonwlodLocal">
+      <object class="GtkMenuItem" id="btnLoadLocal">
         <property name="visible">True</property>
         <property name="can-focus">False</property>
         <property name="label" translatable="yes">Load local configuration</property>
@@ -989,7 +989,7 @@ Format: DD.MM.YYYY</property>
             <property name="visible">True</property>
             <property name="can-focus">False</property>
             <child>
-              <object class="GtkMenuButton" id="btnDownload">
+              <object class="GtkMenuButton" id="btnLoad">
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="focus-on-click">False</property>
@@ -1002,14 +1002,14 @@ Format: DD.MM.YYYY</property>
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
                     <child>
-                      <object class="GtkLabel" id="lblDownload">
+                      <object class="GtkLabel" id="lblLoad">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
                         <property name="margin-left">5</property>
                         <property name="margin-right">5</property>
                         <property name="margin-start">5</property>
                         <property name="margin-end">5</property>
-                        <property name="label" translatable="yes">Download</property>
+                        <property name="label" translatable="yes">Load</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -1018,7 +1018,7 @@ Format: DD.MM.YYYY</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkImage" id="imgDonwload">
+                      <object class="GtkImage" id="imgLoad">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
                         <property name="icon-name">pan-down-symbolic</property>
@@ -1179,7 +1179,7 @@ Format: DD.MM.YYYY</property>
       </object>
     </child>
   </object>
-  <object class="GtkWindow" id="mess_dchp">
+  <object class="GtkWindow" id="windowMessDchp">
     <property name="can-focus">False</property>
     <property name="title" translatable="yes">Внимание!</property>
     <property name="type-hint">dialog</property>
@@ -1260,8 +1260,9 @@ Format: DD.MM.YYYY</property>
       </object>
     </child>
   </object>
-  <object class="GtkWindow" id="mess_sudo">
+  <object class="GtkWindow" id="windowsMessSudo">
     <property name="can-focus">False</property>
+    <property name="type">popup</property>
     <property name="title" translatable="yes">Внимание!</property>
     <property name="window-position">center</property>
     <property name="type-hint">dialog</property>
diff --git a/ubl-settings-datetime_ru.po b/ubl-settings-datetime_ru.po
index d423663..7472b4e 100644
--- a/ubl-settings-datetime_ru.po
+++ b/ubl-settings-datetime_ru.po
@@ -1687,7 +1687,7 @@ msgstr "Загрузить локальную конфигурацию"
 msgid "Disabled"
 msgstr "Отключено"
 
-msgid "Download"
+msgid "Load"
 msgstr "Загрузить"
 
 msgid "Argument not recognized\n"

From 3468ec22d01467087a1fb69dbb633cc29e69edcb Mon Sep 17 00:00:00 2001
From: Igor Belitskiy <goga.belitskiy.00@mail.eu>
Date: Wed, 15 Mar 2023 09:18:20 +0600
Subject: [PATCH 16/27] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0?=
 =?UTF-8?q?=20=D0=B2=20=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 #ubl-settings-datetime.glade#   | 1350 -------------------------------
 source/ubl-settings-datetime.cc |    2 +-
 ubl-settings-datetime.glade     |    2 +-
 3 files changed, 2 insertions(+), 1352 deletions(-)
 delete mode 100644 #ubl-settings-datetime.glade#

diff --git a/#ubl-settings-datetime.glade# b/#ubl-settings-datetime.glade#
deleted file mode 100644
index 104ec18..0000000
--- a/#ubl-settings-datetime.glade#
+++ /dev/null
@@ -1,1350 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.2 -->
-<interface>
-  <requires lib="gtk+" version="3.24"/>
-  <object class="GtkAboutDialog" id="aboutWindows">
-    <property name="can-focus">False</property>
-    <property name="title" translatable="yes">О Программе</property>
-    <property name="resizable">False</property>
-    <property name="modal">True</property>
-    <property name="window-position">center</property>
-    <property name="icon-name">ubl-settings-datetime</property>
-    <property name="type-hint">dialog</property>
-    <property name="urgency-hint">True</property>
-    <property name="program-name">ubl-settings-datetime</property>
-    <property name="version">1.2</property>
-    <property name="copyright" translatable="yes">Copyright © 2023 - UBSoft Software LLC</property>
-    <property name="comments" translatable="yes">Setting the date and time</property>
-    <property name="website">https://ublinux.ru/</property>
-    <property name="website-label" translatable="yes">Project Home Page</property>
-    <property name="license" translatable="yes">Это приложение распространяется без каких-либо гарантий.
-Подробнее в &lt;a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"&gt;GNU General Public License, версии 2 или позднее&lt;/a&gt;.</property>
-    <property name="authors">UBGroup</property>
-    <property name="artists">UBGroup</property>
-    <property name="logo-icon-name">ubl-settings-datetime</property>
-    <property name="wrap-license">True</property>
-    <property name="license-type">gpl-2-0</property>
-    <child internal-child="vbox">
-      <object class="GtkBox">
-        <property name="can-focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="btnBoxAboutDialog">
-            <property name="can-focus">False</property>
-            <property name="layout-style">end</property>
-            <child>
-              <placeholder/>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-      </object>
-    </child>
-  </object>
-  <object class="GtkMenu" id="menu">
-    <property name="visible">True</property>
-    <property name="can-focus">False</property>
-    <property name="take-focus">False</property>
-    <property name="reserve-toggle-size">False</property>
-    <property name="rect-anchor-dy">4</property>
-    <child>
-      <object class="GtkMenuItem" id="btnLoadGlob">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="label" translatable="yes">Load global configuration</property>
-        <style>
-          <class name="menuitemtop"/>
-        </style>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="btnLoadLocal">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="label" translatable="yes">Load local configuration</property>
-        <style>
-          <class name="menuitembottom"/>
-        </style>
-      </object>
-    </child>
-  </object>
-  <object class="GtkMenu" id="menu1">
-    <property name="visible">True</property>
-    <property name="can-focus">False</property>
-    <property name="take-focus">False</property>
-    <property name="reserve-toggle-size">False</property>
-    <property name="rect-anchor-dy">4</property>
-    <child>
-      <object class="GtkMenuItem" id="btnSynopsis">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="label" translatable="yes">Help</property>
-        <style>
-          <class name="menuitemtop"/>
-        </style>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="btnAbout">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="label" translatable="yes">About</property>
-        <style>
-          <class name="menuitembottom"/>
-        </style>
-      </object>
-    </child>
-  </object>
-  <object class="GtkMenu" id="menu2">
-    <property name="visible">True</property>
-    <property name="can-focus">False</property>
-    <property name="take-focus">False</property>
-    <property name="reserve-toggle-size">False</property>
-    <property name="rect-anchor-dy">4</property>
-    <child>
-      <object class="GtkMenuItem" id="btnSaveLocalGlob">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="label" translatable="yes">Save to global and local configuration</property>
-        <style>
-          <class name="menuitemtop"/>
-        </style>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="btnSaveGlob">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="label" translatable="yes">Save global configuration</property>
-        <style>
-          <class name="menuitemmiddle"/>
-        </style>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="btnSaveLocal">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="label" translatable="yes">Save local configuration</property>
-        <style>
-          <class name="menuitembottom"/>
-        </style>
-      </object>
-    </child>
-  </object>
-  <object class="GtkWindow" id="window">
-    <property name="can-focus">False</property>
-    <child>
-      <object class="GtkBox" id="plugBox">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkBox">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <property name="orientation">vertical</property>
-            <child>
-              <object class="GtkBox" id="boxInfoError">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <child>
-                  <object class="GtkImage" id="imgInfo">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="margin-left">5</property>
-                    <property name="margin-right">5</property>
-                    <property name="margin-start">5</property>
-                    <property name="margin-end">5</property>
-                    <property name="margin-top">6</property>
-                    <property name="margin-bottom">6</property>
-                    <property name="stock">checked</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="lblWarning">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="halign">start</property>
-                    <property name="margin-left">5</property>
-                    <property name="margin-right">5</property>
-                    <property name="margin-start">5</property>
-                    <property name="margin-end">5</property>
-                    <property name="margin-top">6</property>
-                    <property name="margin-bottom">6</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"/>
-                      <attribute name="foreground" value="#000000000000"/>
-                    </attributes>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkBox" id="standartHead">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <property name="orientation">vertical</property>
-                <child>
-                  <object class="GtkBox" id="boxColor">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <child>
-                      <object class="GtkImage">
-                        <property name="width-request">90</property>
-                        <property name="visible">True</property>
-                        <property name="can-focus">False</property>
-                        <property name="margin-left">5</property>
-                        <property name="margin-right">5</property>
-                        <property name="margin-start">5</property>
-                        <property name="margin-end">5</property>
-                        <property name="margin-top">6</property>
-                        <property name="margin-bottom">6</property>
-                        <property name="pixel-size">69</property>
-                        <property name="icon-name">ubl-settings-datetime</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="can-focus">False</property>
-                        <child>
-                          <object class="GtkBox">
-                            <property name="visible">True</property>
-                            <property name="can-focus">False</property>
-                            <child>
-                              <object class="GtkBox">
-                                <property name="visible">True</property>
-                                <property name="can-focus">False</property>
-                                <property name="orientation">vertical</property>
-                                <child>
-                                  <object class="GtkLabel" id="lblHead">
-                                    <property name="width-request">255</property>
-                                    <property name="visible">True</property>
-                                    <property name="can-focus">False</property>
-                                    <property name="label" translatable="yes">Date and time settings</property>
-                                    <attributes>
-                                      <attribute name="font-desc" value="URW Gothic Semi-Bold 10"/>
-                                      <attribute name="weight" value="bold"/>
-                                      <attribute name="foreground" value="#000023233232"/>
-                                      <attribute name="size" value="15360"/>
-                                    </attributes>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel">
-                            <property name="visible">True</property>
-                            <property name="can-focus">False</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkBox">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <property name="orientation">vertical</property>
-                <child>
-                  <object class="GtkBox" id="boxDateTime">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="orientation">vertical</property>
-                    <child>
-                      <object class="GtkFrame">
-                        <property name="visible">True</property>
-                        <property name="can-focus">False</property>
-                        <property name="margin-left">5</property>
-                        <property name="margin-right">5</property>
-                        <property name="margin-start">5</property>
-                        <property name="margin-end">5</property>
-                        <property name="label-xalign">0.019999999552965164</property>
-                        <property name="shadow-type">in</property>
-                        <child>
-                          <object class="GtkBox">
-                            <property name="visible">True</property>
-                            <property name="can-focus">False</property>
-                            <property name="margin-left">5</property>
-                            <property name="margin-start">5</property>
-                            <property name="margin-bottom">5</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="GtkBox">
-                                <property name="visible">True</property>
-                                <property name="can-focus">False</property>
-                                <child>
-                                  <object class="GtkLabel" id="lblTime">
-                                    <property name="width-request">0</property>
-                                    <property name="visible">True</property>
-                                    <property name="can-focus">False</property>
-                                    <property name="margin-left">5</property>
-                                    <property name="margin-right">5</property>
-                                    <property name="margin-start">5</property>
-                                    <property name="margin-end">5</property>
-                                    <property name="margin-top">6</property>
-                                    <property name="margin-bottom">6</property>
-                                    <property name="label" translatable="yes" context="Time" comments="Time">Time</property>
-                                    <property name="wrap">True</property>
-                                    <property name="xalign">0</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkSpinButton" id="numTimeHrs">
-                                    <property name="visible">True</property>
-                                    <property name="can-focus">True</property>
-                                    <property name="margin-left">5</property>
-                                    <property name="margin-right">5</property>
-                                    <property name="margin-start">5</property>
-                                    <property name="margin-end">5</property>
-                                    <property name="margin-top">6</property>
-                                    <property name="margin-bottom">6</property>
-                                    <property name="width-chars">2</property>
-                                    <property name="progress-pulse-step">0.099999999776482579</property>
-                                    <property name="numeric">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel">
-                                    <property name="visible">True</property>
-                                    <property name="can-focus">False</property>
-                                    <property name="label" translatable="yes">:</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">2</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkSpinButton" id="numTimeMin">
-                                    <property name="visible">True</property>
-                                    <property name="can-focus">True</property>
-                                    <property name="margin-left">5</property>
-                                    <property name="margin-right">5</property>
-                                    <property name="margin-start">5</property>
-                                    <property name="margin-end">5</property>
-                                    <property name="margin-top">6</property>
-                                    <property name="margin-bottom">6</property>
-                                    <property name="width-chars">2</property>
-                                    <property name="numeric">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">3</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel" id="lblData">
-                                    <property name="width-request">20</property>
-                                    <property name="visible">True</property>
-                                    <property name="can-focus">False</property>
-                                    <property name="margin-left">5</property>
-                                    <property name="margin-right">5</property>
-                                    <property name="margin-start">5</property>
-                                    <property name="margin-end">5</property>
-                                    <property name="margin-top">6</property>
-                                    <property name="margin-bottom">6</property>
-                                    <property name="label" translatable="yes" context="Date" comments="Date">Date</property>
-                                    <property name="wrap">True</property>
-                                    <property name="xalign">0</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">4</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkEntry" id="txtDate">
-                                    <property name="width-request">-1</property>
-                                    <property name="visible">True</property>
-                                    <property name="can-focus">True</property>
-                                    <property name="tooltip-text" translatable="yes" context="Date of&#10;Format: DD.MM.YYYY" comments="Date of&#10;Format: DD.MM.YYYY">Date
-Format: DD.MM.YYYY</property>
-                                    <property name="margin-left">5</property>
-                                    <property name="margin-right">5</property>
-                                    <property name="margin-start">5</property>
-                                    <property name="margin-end">5</property>
-                                    <property name="margin-top">6</property>
-                                    <property name="margin-bottom">6</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">5</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkButton" id="btnChooseDate">
-                                    <property name="visible">True</property>
-                                    <property name="can-focus">True</property>
-                                    <property name="receives-default">True</property>
-                                    <property name="tooltip-text" translatable="yes" context="Interactive date picker" comments="Interactive date picker">Интерактивный выбор даты</property>
-                                    <property name="margin-left">5</property>
-                                    <property name="margin-right">10</property>
-                                    <property name="margin-start">5</property>
-                                    <property name="margin-end">10</property>
-                                    <property name="margin-top">6</property>
-                                    <property name="margin-bottom">6</property>
-                                    <child>
-                                      <object class="GtkImage">
-                                        <property name="visible">True</property>
-                                        <property name="can-focus">False</property>
-                                        <property name="icon-name">x-office-calendar</property>
-                                      </object>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">6</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkBox">
-                                <property name="visible">True</property>
-                                <property name="can-focus">False</property>
-                                <child>
-                                  <object class="GtkButton" id="btnUpdateDateTime">
-                                    <property name="visible">True</property>
-                                    <property name="can-focus">True</property>
-                                    <property name="receives-default">True</property>
-                                    <property name="margin-left">7</property>
-                                    <property name="margin-right">5</property>
-                                    <property name="margin-start">7</property>
-                                    <property name="margin-end">5</property>
-                                    <property name="margin-top">6</property>
-                                    <property name="margin-bottom">6</property>
-                                    <child>
-                                      <object class="GtkBox">
-                                        <property name="visible">True</property>
-                                        <property name="can-focus">False</property>
-                                        <property name="halign">center</property>
-                                        <property name="valign">center</property>
-                                        <child>
-                                          <object class="GtkImage">
-                                            <property name="visible">True</property>
-                                            <property name="can-focus">False</property>
-                                            <property name="margin-left">5</property>
-                                            <property name="margin-right">5</property>
-                                            <property name="margin-start">5</property>
-                                            <property name="margin-end">5</property>
-                                            <property name="icon-name">media-playlist-repeat</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">True</property>
-                                            <property name="position">0</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="lblSynchronizeBtn">
-                                            <property name="visible">True</property>
-                                            <property name="can-focus">False</property>
-                                            <property name="halign">center</property>
-                                            <property name="valign">center</property>
-                                            <property name="label" translatable="yes">Sync by</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">True</property>
-                                            <property name="position">1</property>
-                                          </packing>
-                                        </child>
-                                      </object>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel">
-                                    <property name="visible">True</property>
-                                    <property name="can-focus">False</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkLabel">
-                                    <property name="visible">True</property>
-                                    <property name="can-focus">False</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">2</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkButton" id="btnHardwareTime">
-                                    <property name="visible">True</property>
-                                    <property name="can-focus">True</property>
-                                    <property name="receives-default">True</property>
-                                    <property name="margin-left">5</property>
-                                    <property name="margin-right">10</property>
-                                    <property name="margin-start">5</property>
-                                    <property name="margin-end">10</property>
-                                    <property name="margin-top">6</property>
-                                    <property name="margin-bottom">6</property>
-                                    <child>
-                                      <object class="GtkLabel" id="lblTimeBios">
-                                        <property name="visible">True</property>
-                                        <property name="can-focus">False</property>
-                                        <property name="halign">center</property>
-                                        <property name="valign">center</property>
-                                        <property name="label" translatable="yes">Synchronize hardware time</property>
-                                      </object>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">3</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">3</property>
-                              </packing>
-                            </child>
-                          </object>
-                        </child>
-                        <child type="label">
-                          <object class="GtkLabel" id="lblDateTimeSetting">
-                            <property name="visible">True</property>
-                            <property name="can-focus">False</property>
-                            <property name="label" translatable="yes" context="Setting the date and time" comments="Setting the date and time">Current date and time</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkBox">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="orientation">vertical</property>
-                    <child>
-                      <object class="GtkFrame">
-                        <property name="visible">True</property>
-                        <property name="can-focus">False</property>
-                        <property name="margin-left">5</property>
-                        <property name="margin-right">5</property>
-                        <property name="margin-start">5</property>
-                        <property name="margin-end">5</property>
-                        <property name="label-xalign">0.019999999552965164</property>
-                        <property name="shadow-type">in</property>
-                        <child>
-                          <object class="GtkBox">
-                            <property name="visible">True</property>
-                            <property name="can-focus">False</property>
-                            <property name="margin-left">5</property>
-                            <property name="margin-start">5</property>
-                            <property name="margin-bottom">5</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="GtkBox">
-                                <property name="visible">True</property>
-                                <property name="can-focus">False</property>
-                                <child>
-                                  <object class="GtkComboBoxText" id="cbDhcp">
-                                    <property name="visible">True</property>
-                                    <property name="can-focus">False</property>
-                                    <property name="margin-left">5</property>
-                                    <property name="margin-right">5</property>
-                                    <property name="margin-start">5</property>
-                                    <property name="margin-end">5</property>
-                                    <property name="margin-top">6</property>
-                                    <property name="margin-bottom">6</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkEntry" id="txtNtpServer">
-                                    <property name="visible">True</property>
-                                    <property name="can-focus">True</property>
-                                    <property name="tooltip-text" translatable="yes">Enter the name of the ntp server or its ip address. When entering multiple addresses, separate them with spaces.</property>
-                                    <property name="valign">center</property>
-                                    <property name="margin-left">5</property>
-                                    <property name="margin-right">10</property>
-                                    <property name="margin-start">5</property>
-                                    <property name="margin-end">10</property>
-                                    <property name="margin-top">6</property>
-                                    <property name="margin-bottom">6</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">3</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                        </child>
-                        <child type="label">
-                          <object class="GtkLabel" id="lblSynchronizebChkGLob">
-                            <property name="visible">True</property>
-                            <property name="can-focus">False</property>
-                            <property name="label" translatable="yes" context="Setting date and time in global configuration" comments="Setting date and time in global configuration">Synchronize via NTP:</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkFrame">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="margin-left">5</property>
-                    <property name="margin-right">5</property>
-                    <property name="margin-start">5</property>
-                    <property name="margin-end">5</property>
-                    <property name="margin-bottom">5</property>
-                    <property name="label-xalign">0.019999999552965164</property>
-                    <property name="shadow-type">in</property>
-                    <child>
-                      <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="can-focus">False</property>
-                        <property name="orientation">vertical</property>
-                        <child>
-                          <object class="GtkBox">
-                            <property name="visible">True</property>
-                            <property name="can-focus">False</property>
-                            <child>
-                              <object class="GtkLabel" id="lblHW">
-                                <property name="visible">True</property>
-                                <property name="can-focus">False</property>
-                                <property name="halign">start</property>
-                                <property name="margin-left">8</property>
-                                <property name="margin-right">5</property>
-                                <property name="margin-start">8</property>
-                                <property name="margin-end">5</property>
-                                <property name="margin-top">6</property>
-                                <property name="margin-bottom">13</property>
-                                <property name="label" translatable="yes">Synchronize hardware time:</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel">
-                                <property name="visible">True</property>
-                                <property name="can-focus">False</property>
-                                <property name="margin-end">55</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkComboBoxText" id="cbHw">
-                                <property name="visible">True</property>
-                                <property name="can-focus">False</property>
-                                <property name="margin-left">10</property>
-                                <property name="margin-right">5</property>
-                                <property name="margin-start">5</property>
-                                <property name="margin-end">10</property>
-                                <property name="margin-top">6</property>
-                                <property name="margin-bottom">10</property>
-                                <property name="hexpand">False</property>
-                                <property name="vexpand">False</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkBox">
-                            <property name="visible">True</property>
-                            <property name="can-focus">False</property>
-                            <child>
-                              <object class="GtkLabel">
-                                <property name="visible">True</property>
-                                <property name="can-focus">False</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="lblReg">
-                                <property name="visible">True</property>
-                                <property name="can-focus">False</property>
-                                <property name="margin-left">8</property>
-                                <property name="margin-right">5</property>
-                                <property name="margin-start">8</property>
-                                <property name="margin-end">5</property>
-                                <property name="margin-top">6</property>
-                                <property name="margin-bottom">13</property>
-                                <property name="label" translatable="yes" context="Region" comments="Region">Region</property>
-                                <property name="xalign">0</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkComboBoxText" id="cbRegion">
-                                <property name="visible">True</property>
-                                <property name="can-focus">False</property>
-                                <property name="margin-left">5</property>
-                                <property name="margin-right">5</property>
-                                <property name="margin-start">5</property>
-                                <property name="margin-end">5</property>
-                                <property name="margin-top">6</property>
-                                <property name="margin-bottom">10</property>
-                                <property name="hexpand">False</property>
-                                <property name="vexpand">False</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">3</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="lblZone">
-                                <property name="visible">True</property>
-                                <property name="can-focus">False</property>
-                                <property name="margin-left">5</property>
-                                <property name="margin-right">5</property>
-                                <property name="margin-start">5</property>
-                                <property name="margin-end">5</property>
-                                <property name="margin-top">6</property>
-                                <property name="margin-bottom">13</property>
-                                <property name="label" translatable="yes" context="Zone" comments="Zone">Area</property>
-                                <property name="xalign">0</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">4</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkComboBoxText" id="cbZone">
-                                <property name="visible">True</property>
-                                <property name="can-focus">False</property>
-                                <property name="margin-left">5</property>
-                                <property name="margin-right">5</property>
-                                <property name="margin-start">5</property>
-                                <property name="margin-end">5</property>
-                                <property name="margin-top">6</property>
-                                <property name="margin-bottom">10</property>
-                                <property name="hexpand">False</property>
-                                <property name="vexpand">False</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">5</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel">
-                                <property name="width-request">5</property>
-                                <property name="visible">True</property>
-                                <property name="can-focus">False</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">6</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel">
-                                <property name="visible">True</property>
-                                <property name="can-focus">False</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">7</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                    <child type="label">
-                      <object class="GtkLabel" id="lblTimeZone">
-                        <property name="visible">True</property>
-                        <property name="can-focus">False</property>
-                        <property name="label" translatable="yes">Time Zone</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">3</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <child type="titlebar">
-      <object class="GtkHeaderBar" id="headerBar">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="show-close-button">True</property>
-        <child type="title">
-          <object class="GtkLabel" id="lblHeader">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <property name="halign">start</property>
-            <property name="margin-left">5</property>
-            <property name="margin-right">5</property>
-            <property name="margin-start">5</property>
-            <property name="margin-end">5</property>
-            <property name="margin-bottom">1</property>
-            <property name="hexpand">False</property>
-            <property name="label" translatable="yes">ubl-settings-datetime</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
-          </object>
-        </child>
-        <child>
-          <object class="GtkImage">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <property name="margin-left">5</property>
-            <property name="margin-right">5</property>
-            <property name="margin-start">5</property>
-            <property name="margin-end">5</property>
-            <property name="pixel-size">32</property>
-            <property name="icon-name">ubl-settings-datetime</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkBox" id="boxButton">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <child>
-              <object class="GtkMenuButton" id="btnLoad">
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="focus-on-click">False</property>
-                <property name="receives-default">True</property>
-                <property name="draw-indicator">True</property>
-                <property name="popup">menu</property>
-                <property name="direction">none</property>
-                <child>
-                  <object class="GtkBox">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <child>
-                      <object class="GtkLabel" id="lblLoad">
-                        <property name="visible">True</property>
-                        <property name="can-focus">False</property>
-                        <property name="margin-left">5</property>
-                        <property name="margin-right">5</property>
-                        <property name="margin-start">5</property>
-                        <property name="margin-end">5</property>
-                        <property name="label" translatable="yes">Load</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkImage" id="imgLoad">
-                        <property name="visible">True</property>
-                        <property name="can-focus">False</property>
-                        <property name="icon-name">pan-down-symbolic</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="boxSave">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <child>
-              <object class="GtkMenuButton" id="btnSave">
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="focus-on-click">False</property>
-                <property name="receives-default">True</property>
-                <property name="draw-indicator">True</property>
-                <property name="popup">menu2</property>
-                <property name="direction">none</property>
-                <child>
-                  <object class="GtkBox">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <child>
-                      <object class="GtkLabel" id="lblSave">
-                        <property name="visible">True</property>
-                        <property name="can-focus">False</property>
-                        <property name="margin-left">5</property>
-                        <property name="margin-right">5</property>
-                        <property name="margin-start">5</property>
-                        <property name="margin-end">5</property>
-                        <property name="label" translatable="yes">Save</property>
-                        <style>
-                          <class name="toolbar"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkImage" id="imgSave">
-                        <property name="visible">True</property>
-                        <property name="can-focus">False</property>
-                        <property name="icon-name">pan-down-symbolic</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkMenuButton" id="btnSettings">
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="focus-on-click">False</property>
-                <property name="receives-default">True</property>
-                <property name="draw-indicator">True</property>
-                <property name="popup">menu1</property>
-                <property name="direction">none</property>
-                <child>
-                  <object class="GtkImage" id="imgSettings">
-                    <property name="visible">True</property>
-                    <property name="can-focus">False</property>
-                    <property name="icon-name">open-menu-symbolic</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="pack-type">end</property>
-            <property name="position">3</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-  <object class="GtkSizeGroup">
-    <property name="mode">both</property>
-    <property name="ignore-hidden">True</property>
-    <widgets>
-      <widget name="cbRegion"/>
-      <widget name="cbZone"/>
-    </widgets>
-  </object>
-  <object class="GtkSizeGroup">
-    <property name="mode">both</property>
-    <property name="ignore-hidden">True</property>
-    <widgets>
-      <widget name="btnUpdateDateTime"/>
-      <widget name="lblHW"/>
-    </widgets>
-  </object>
-  <object class="GtkSizeGroup">
-    <property name="mode">both</property>
-    <property name="ignore-hidden">True</property>
-    <widgets>
-      <widget name="cbHw"/>
-      <widget name="cbZone"/>
-    </widgets>
-  </object>
-  <object class="GtkPopover" id="popCalendar">
-    <property name="width-request">240</property>
-    <property name="height-request">185</property>
-    <property name="can-focus">False</property>
-    <property name="relative-to">btnChooseDate</property>
-    <property name="position">bottom</property>
-    <property name="constrain-to">none</property>
-    <child>
-      <object class="GtkCalendar" id="cldrDate">
-        <property name="visible">True</property>
-        <property name="can-focus">True</property>
-        <property name="margin-left">10</property>
-        <property name="margin-right">10</property>
-        <property name="margin-start">10</property>
-        <property name="margin-end">10</property>
-        <property name="margin-top">10</property>
-        <property name="margin-bottom">10</property>
-        <property name="year">2023</property>
-        <property name="month">1</property>
-        <property name="day">10</property>
-      </object>
-    </child>
-  </object>
-  <object class="GtkWindow" id="windowMessDchp">
-    <property name="can-focus">False</property>
-    <property name="title" translatable="yes">Внимание!</property>
-    <property name="type-hint">dialog</property>
-    <child>
-      <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkBox">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <property name="margin-left">5</property>
-            <property name="margin-right">5</property>
-            <property name="margin-start">5</property>
-            <property name="margin-end">5</property>
-            <child>
-              <object class="GtkImage">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <property name="margin-right">5</property>
-                <property name="margin-start">5</property>
-                <property name="margin-end">5</property>
-                <property name="margin-top">6</property>
-                <property name="margin-bottom">6</property>
-                <property name="pixel-size">50</property>
-                <property name="icon-name">gtk-dialog-warning</property>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="lblMessage">
-                <property name="width-request">160</property>
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <property name="halign">start</property>
-                <property name="valign">center</property>
-                <property name="margin-top">6</property>
-                <property name="margin-bottom">6</property>
-                <property name="label" translatable="yes">Enter DHCP !</property>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkButton" id="btnMessClose">
-            <property name="label" translatable="yes">OK</property>
-            <property name="visible">True</property>
-            <property name="can-focus">True</property>
-            <property name="receives-default">True</property>
-            <property name="margin-left">5</property>
-            <property name="margin-right">5</property>
-            <property name="margin-start">5</property>
-            <property name="margin-end">5</property>
-            <property name="margin-top">3</property>
-            <property name="margin-bottom">3</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-  <object class="GtkWindow" id="windowMessSudo">
-    <property name="can-focus">False</property>
-    <property name="type">popup</property>
-    <property name="title" translatable="yes">Внимание!</property>
-    <property name="window-position">center</property>
-    <property name="type-hint">dialog</property>
-    <child>
-      <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkBox">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <property name="margin-left">5</property>
-            <property name="margin-right">5</property>
-            <property name="margin-start">5</property>
-            <property name="margin-end">5</property>
-            <child>
-              <object class="GtkImage">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <property name="margin-right">5</property>
-                <property name="margin-start">5</property>
-                <property name="margin-end">5</property>
-                <property name="margin-top">6</property>
-                <property name="margin-bottom">6</property>
-                <property name="pixel-size">50</property>
-                <property name="icon-name">gtk-dialog-warning</property>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="lblMessageSudo">
-                <property name="width-request">160</property>
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <property name="halign">start</property>
-                <property name="valign">center</property>
-                <property name="margin-left">5</property>
-                <property name="margin-right">5</property>
-                <property name="margin-start">5</property>
-                <property name="margin-end">5</property>
-                <property name="margin-top">6</property>
-                <property name="margin-bottom">6</property>
-                <property name="label" translatable="yes">Enter DHCP !</property>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkButton" id="btnMessCloseSudo">
-            <property name="label" translatable="yes">OK</property>
-            <property name="visible">True</property>
-            <property name="can-focus">True</property>
-            <property name="receives-default">True</property>
-            <property name="margin-left">5</property>
-            <property name="margin-right">5</property>
-            <property name="margin-start">5</property>
-            <property name="margin-end">5</property>
-            <property name="margin-top">3</property>
-            <property name="margin-bottom">3</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>
diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc
index 9547664..9bb8397 100644
--- a/source/ubl-settings-datetime.cc
+++ b/source/ubl-settings-datetime.cc
@@ -353,7 +353,7 @@ void MainWindow::load_local_cfg() {
     string cmd_default_get_dhcp = "/usr/bin/ubconfig --source=default get NTPSERVERS_DEFAULT";
     this->entry_dhcp_mess(cmd_get_dhcp, cmd_default_get_dhcp);
     string hw = "/usr/bin/ubconfig --default --source system get clock HWCLOCK_SYNC";
-    string hw_default = "/usr/bin/ubconfig --default --source system get clock HWCLOCK_SYNC";
+    string hw_default = "/usr/bin/ubconfig --source default get clock HWCLOCK_SYNC";
     this->entry_hardware_clock(hw, hw_default);
     info_warning_error(0);
 }
diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade
index 209863f..104ec18 100644
--- a/ubl-settings-datetime.glade
+++ b/ubl-settings-datetime.glade
@@ -1260,7 +1260,7 @@ Format: DD.MM.YYYY</property>
       </object>
     </child>
   </object>
-  <object class="GtkWindow" id="windowsMessSudo">
+  <object class="GtkWindow" id="windowMessSudo">
     <property name="can-focus">False</property>
     <property name="type">popup</property>
     <property name="title" translatable="yes">Внимание!</property>

From 3591d60e35a616b833c0457a22334ab4bf7582fc Mon Sep 17 00:00:00 2001
From: Igor Belitskiy <goga.belitskiy.00@mail.eu>
Date: Wed, 15 Mar 2023 09:48:00 +0600
Subject: [PATCH 17/27] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=20=D0=B7?=
 =?UTF-8?q?=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B8=20=D0=B8=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Makefile b/Makefile
index a4dbb21..5a2118a 100644
--- a/Makefile
+++ b/Makefile
@@ -118,7 +118,7 @@ install: check uninstall
 	@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/emblems/" "bg_top.png"
 	@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/status/" "ubl-datetime-checked.svg"
 	@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/status/" "ubl-datetime-warning.svg"
-	@gtk-update-icon-cache -fiq /usr/share/icons/hicolor/
+	@gtk-update-icon-cache -fiq /usr/share/icons/hicolor/ &>/dev/null
 	@update-desktop-database --quiet 2>/dev/null 
 	@touch /usr/share/applications
 	@echo "Install: OK"
diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc
index 9bb8397..a3441ba 100644
--- a/source/ubl-settings-datetime.cc
+++ b/source/ubl-settings-datetime.cc
@@ -125,7 +125,7 @@ void MainWindow::settings() {
         lblDateTimeSetting->set_sensitive(false);
         btnBoxAboutDialog->set_visible(false);
         this->event();
-        imgInfo->set("ubl-datetime-warning");
+        imgInfo->set_from_icon_name("ubl-datetime-warning", Gtk::ICON_SIZE_MENU);
         info_status_app("boxInfoMessError");
         lblWarning->set_text(_("The program must be run as root"));
     }
@@ -416,7 +416,7 @@ void MainWindow::save_global_local_cfg() {
 void MainWindow::info_warning_error(int mess) {
     if (error_info > 0 || warning_info > 0) {
         info_status_app("boxInfoMessError");
-        imgInfo->set("ubl-datetime-warning");
+        imgInfo->set_from_icon_name("ubl-datetime-warning", Gtk::ICON_SIZE_MENU);
         error_info = 0;
         warning_info = 0;
         string mess_error = "";
@@ -444,7 +444,7 @@ void MainWindow::info_warning_error(int mess) {
     }
     else {
         info_status_app("boxInfoMessOK");
-        imgInfo->set("ubl-datetime-checked");
+        imgInfo->set_from_icon_name("ubl-datetime-checked", Gtk::ICON_SIZE_MENU);//Gtk::IconSize::INHERIT);
         if (mess == 0) {
             lblWarning->set_text(_("Local configuration downloaded successfully"));
         }
diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade
index 104ec18..9cc55e3 100644
--- a/ubl-settings-datetime.glade
+++ b/ubl-settings-datetime.glade
@@ -166,7 +166,8 @@
                     <property name="margin-end">5</property>
                     <property name="margin-top">6</property>
                     <property name="margin-bottom">6</property>
-                    <property name="stock">checked</property>
+                    <property name="pixel-size">25</property>
+                    <property name="icon_size">1</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>

From d67109c0539025c1a2498b914c062a304c137152 Mon Sep 17 00:00:00 2001
From: Igor Belitskiy <goga.belitskiy.00@mail.eu>
Date: Wed, 15 Mar 2023 10:06:55 +0600
Subject: [PATCH 18/27] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20=D0=B1=D0=B0=D0=B3=20=D1=81=20=D0=B8=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=BD=D0=BA=D0=B0=D0=BC=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/ubl-settings-datetime.cc | 6 +++---
 ubl-settings-datetime.glade     | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc
index 9bb8397..a3441ba 100644
--- a/source/ubl-settings-datetime.cc
+++ b/source/ubl-settings-datetime.cc
@@ -125,7 +125,7 @@ void MainWindow::settings() {
         lblDateTimeSetting->set_sensitive(false);
         btnBoxAboutDialog->set_visible(false);
         this->event();
-        imgInfo->set("ubl-datetime-warning");
+        imgInfo->set_from_icon_name("ubl-datetime-warning", Gtk::ICON_SIZE_MENU);
         info_status_app("boxInfoMessError");
         lblWarning->set_text(_("The program must be run as root"));
     }
@@ -416,7 +416,7 @@ void MainWindow::save_global_local_cfg() {
 void MainWindow::info_warning_error(int mess) {
     if (error_info > 0 || warning_info > 0) {
         info_status_app("boxInfoMessError");
-        imgInfo->set("ubl-datetime-warning");
+        imgInfo->set_from_icon_name("ubl-datetime-warning", Gtk::ICON_SIZE_MENU);
         error_info = 0;
         warning_info = 0;
         string mess_error = "";
@@ -444,7 +444,7 @@ void MainWindow::info_warning_error(int mess) {
     }
     else {
         info_status_app("boxInfoMessOK");
-        imgInfo->set("ubl-datetime-checked");
+        imgInfo->set_from_icon_name("ubl-datetime-checked", Gtk::ICON_SIZE_MENU);//Gtk::IconSize::INHERIT);
         if (mess == 0) {
             lblWarning->set_text(_("Local configuration downloaded successfully"));
         }
diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade
index 104ec18..0acafd1 100644
--- a/ubl-settings-datetime.glade
+++ b/ubl-settings-datetime.glade
@@ -166,7 +166,9 @@
                     <property name="margin-end">5</property>
                     <property name="margin-top">6</property>
                     <property name="margin-bottom">6</property>
-                    <property name="stock">checked</property>
+                    <property name="stock">gtk-missing-image</property>
+                    <property name="pixel-size">25</property>
+                    <property name="icon_size">1</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>

From 621a4afab6143518de556464bfdd3100aedf77d7 Mon Sep 17 00:00:00 2001
From: Igor Belitskiy <goga.belitskiy.00@mail.eu>
Date: Wed, 15 Mar 2023 10:12:10 +0600
Subject: [PATCH 19/27] fix

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

diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade
index 75d0643..9cc55e3 100644
--- a/ubl-settings-datetime.glade
+++ b/ubl-settings-datetime.glade
@@ -166,10 +166,6 @@
                     <property name="margin-end">5</property>
                     <property name="margin-top">6</property>
                     <property name="margin-bottom">6</property>
-<<<<<<< HEAD
-                    <property name="stock">gtk-missing-image</property>
-=======
->>>>>>> develop
                     <property name="pixel-size">25</property>
                     <property name="icon_size">1</property>
                   </object>

From 3848e417791eb719e1791927076739ca01310e62 Mon Sep 17 00:00:00 2001
From: Igor Belitskiy <goga.belitskiy.00@mail.eu>
Date: Wed, 15 Mar 2023 10:15:22 +0600
Subject: [PATCH 20/27] fix

---
 source/ubl-settings-datetime.cc | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc
index a3441ba..a892754 100644
--- a/source/ubl-settings-datetime.cc
+++ b/source/ubl-settings-datetime.cc
@@ -24,17 +24,14 @@ CmdArgParser::CmdArgParser(const std::string& p_name, const std::string& p_descr
     socketIDArg.set_long_name("socket-id");
     socketIDArg.set_flags(Glib::OptionEntry::FLAG_IN_MAIN);
     socketIDArg.set_description("Settings manager socket");
-
     Glib::OptionEntry socketExtId;
     socketExtId.set_long_name("socket-ext-id");
     socketExtId.set_flags(Glib::OptionEntry::FLAG_IN_MAIN);
     socketExtId.set_description("Settings manager secondary socket");
-
     Glib::OptionEntry socketTrdId;
     socketTrdId.set_long_name("socket-trd-id");
     socketTrdId.set_flags(Glib::OptionEntry::FLAG_IN_MAIN);
     socketTrdId.set_description("Settings manager secondary socket");
-
     add_entry(socketIDArg, m_socketID);
     add_entry(socketExtId, socket_ext_id_I);
     add_entry(socketTrdId, socket_trd_id_I);
@@ -81,6 +78,7 @@ void MainWindow::settings() {
     map_error["/usr/bin/ubconfig --target global set clock HWCLOCK_SYNC=utc"] = string(_(": \"Hardware time\""));
     map_error["date +%Y%m%d -s \""] = string(_(": \"Date\""));
     map_error["date +%T -s \""] = string(_(": \"Date\""));
+    map_error["/usr/bin/ubconfig --source default get clock HWCLOCK_SYNC"] = string(_(": \"Hardware time\""));
     this->get_builder();
     this->add_CSS();
     ubl_make_plugs(boxSave,boxButton, socket_ext_id_I, socket_trd_id_I);

From cabfa962a62682c29db3f01ea31e582ffa944ac1 Mon Sep 17 00:00:00 2001
From: Igor Belitskiy <goga.belitskiy.00@mail.eu>
Date: Wed, 15 Mar 2023 11:12:40 +0600
Subject: [PATCH 21/27] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=B8=D0=BC=D0=B5=D0=BD=D0=B0=20?=
 =?UTF-8?q?=D0=B8=D0=BA=D0=BE=D0=BD=D0=BE=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile                                                    | 4 ++--
 ...etime-checked.svg => ru.ublinux.ubl-datetime-checked.svg | 0
 ...etime-warning.svg => ru.ublinux.ubl-datetime-warning.svg | 0
 source/ubl-settings-datetime.cc                             | 6 +++---
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename ubl-datetime-checked.svg => ru.ublinux.ubl-datetime-checked.svg (100%)
 rename ubl-datetime-warning.svg => ru.ublinux.ubl-datetime-warning.svg (100%)

diff --git a/Makefile b/Makefile
index 5a2118a..d0405a8 100644
--- a/Makefile
+++ b/Makefile
@@ -116,8 +116,8 @@ install: check uninstall
 	@install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" "${pkgname}.svg"
 	@install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" "${pkgname}.png"
 	@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/emblems/" "bg_top.png"
-	@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/status/" "ubl-datetime-checked.svg"
-	@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/status/" "ubl-datetime-warning.svg"
+	@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/status/" "ru.ublinux.ubl-datetime-checked.svg"
+	@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/status/" "ru.ublinux.ubl-datetime-warning.svg"
 	@gtk-update-icon-cache -fiq /usr/share/icons/hicolor/ &>/dev/null
 	@update-desktop-database --quiet 2>/dev/null 
 	@touch /usr/share/applications
diff --git a/ubl-datetime-checked.svg b/ru.ublinux.ubl-datetime-checked.svg
similarity index 100%
rename from ubl-datetime-checked.svg
rename to ru.ublinux.ubl-datetime-checked.svg
diff --git a/ubl-datetime-warning.svg b/ru.ublinux.ubl-datetime-warning.svg
similarity index 100%
rename from ubl-datetime-warning.svg
rename to ru.ublinux.ubl-datetime-warning.svg
diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc
index a892754..e7b1716 100644
--- a/source/ubl-settings-datetime.cc
+++ b/source/ubl-settings-datetime.cc
@@ -123,7 +123,7 @@ void MainWindow::settings() {
         lblDateTimeSetting->set_sensitive(false);
         btnBoxAboutDialog->set_visible(false);
         this->event();
-        imgInfo->set_from_icon_name("ubl-datetime-warning", Gtk::ICON_SIZE_MENU);
+        imgInfo->set_from_icon_name("ru.ublinux.ubl-settings-datetime.warning", Gtk::ICON_SIZE_MENU);
         info_status_app("boxInfoMessError");
         lblWarning->set_text(_("The program must be run as root"));
     }
@@ -414,7 +414,7 @@ void MainWindow::save_global_local_cfg() {
 void MainWindow::info_warning_error(int mess) {
     if (error_info > 0 || warning_info > 0) {
         info_status_app("boxInfoMessError");
-        imgInfo->set_from_icon_name("ubl-datetime-warning", Gtk::ICON_SIZE_MENU);
+        imgInfo->set_from_icon_name("ru.ublinux.ubl-settings-datetime.warning", Gtk::ICON_SIZE_MENU);
         error_info = 0;
         warning_info = 0;
         string mess_error = "";
@@ -442,7 +442,7 @@ void MainWindow::info_warning_error(int mess) {
     }
     else {
         info_status_app("boxInfoMessOK");
-        imgInfo->set_from_icon_name("ubl-datetime-checked", Gtk::ICON_SIZE_MENU);//Gtk::IconSize::INHERIT);
+        imgInfo->set_from_icon_name("ru.ublinux.ubl-datetime-checked", Gtk::ICON_SIZE_MENU);//Gtk::IconSize::INHERIT);
         if (mess == 0) {
             lblWarning->set_text(_("Local configuration downloaded successfully"));
         }

From b477d45885f3cb228ef13e0b5a2dcd648f7a67f6 Mon Sep 17 00:00:00 2001
From: Igor Belitskiy <goga.belitskiy.00@mail.eu>
Date: Wed, 15 Mar 2023 11:34:59 +0600
Subject: [PATCH 22/27] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20about?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/ubl-settings-datetime.cc | 4 ++--
 ubl-settings-datetime.glade     | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc
index e7b1716..b3a941a 100644
--- a/source/ubl-settings-datetime.cc
+++ b/source/ubl-settings-datetime.cc
@@ -909,13 +909,13 @@ array<string, 2> MainWindow::split_region_zone(string &read_reg_zon_cfg) {
 
 void MainWindow::enter_zone(string &cmd) {
     int activ_index_reg = cbRegion->get_active_row_number();
-    string reg_text=array_region[activ_index_reg];
+    string reg_text = array_region[activ_index_reg];
     int activ_index = cbZone->get_active_row_number();
     string zone_text = "";
     if(!(reg_text.empty())) {
         int index= 0;
         for (const auto &zone: time_reg_map.at(reg_text)) {
-            if (index==activ_index) {
+            if (index == activ_index) {
                 zone_text=zone;
             }
             index+= 1;
diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade
index 9cc55e3..459f6fa 100644
--- a/ubl-settings-datetime.glade
+++ b/ubl-settings-datetime.glade
@@ -11,6 +11,8 @@
     <property name="icon-name">ubl-settings-datetime</property>
     <property name="type-hint">dialog</property>
     <property name="urgency-hint">True</property>
+    <property name="accept-focus">False</property>
+    <property name="focus-on-map">False</property>
     <property name="program-name">ubl-settings-datetime</property>
     <property name="version">1.2</property>
     <property name="copyright" translatable="yes">Copyright © 2023 - UBSoft Software LLC</property>

From 8a24ab6af15b501dfe74981355dda7532d0ccce6 Mon Sep 17 00:00:00 2001
From: Igor Belitskiy <goga.belitskiy.00@mail.eu>
Date: Wed, 15 Mar 2023 12:57:29 +0600
Subject: [PATCH 23/27] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=B8=D0=BB=20=D0=B8=D0=BA=D0=BE=D0=BD=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile                                            |  12 ++++++------
 ...time.png => ru.ublinux.ubl-settings-datetime.png | Bin
 ...time.svg => ru.ublinux.ubl-settings-datetime.svg |   0
 ubl-settings-datetime.desktop                       |   2 +-
 ubl-settings-datetime.glade                         |   8 +++++---
 5 files changed, 12 insertions(+), 10 deletions(-)
 rename ubl-settings-datetime.png => ru.ublinux.ubl-settings-datetime.png (100%)
 rename ubl-settings-datetime.svg => ru.ublinux.ubl-settings-datetime.svg (100%)

diff --git a/Makefile b/Makefile
index d0405a8..970147d 100644
--- a/Makefile
+++ b/Makefile
@@ -74,8 +74,8 @@ uninstall:
 	    $(RM) "/usr/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \
 	done
 	@for SIZE in 16x16 32x32 48x48 scalable; do \
-	    $(RM) "/usr/share/icons/hicolor/$${SIZE}/apps/${pkgname}.svg"; \
-	    $(RM) "/usr/share/icons/hicolor/$${SIZE}/apps/${pkgname}.png"; \
+	    $(RM) "/usr/share/icons/hicolor/$${SIZE}/apps/ru.ublinux.${pkgname}.svg"; \
+	    $(RM) "/usr/share/icons/hicolor/$${SIZE}/apps/ru.ublinux.${pkgname}.png"; \
 	done	
 	@for FILE_SVG in $(wildcard *.svg); do \
 	    for SIZE in 16x16 32x32 48x48 scalable; do \
@@ -103,18 +103,18 @@ install: check uninstall
 	done
 	@for SIZE in 16 32 48; do \
 		install -dm755 "${pkgdir}/usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \
-		rsvg-convert -w $${SIZE} -h $${SIZE} -f png --keep-image-data ${pkgname}.svg -o "${pkgdir}/usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/${pkgname}.png"; \
+		rsvg-convert -w $${SIZE} -h $${SIZE} -f png --keep-image-data "ru.ublinux.${pkgname}.svg" -o "${pkgdir}/usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/ru.ublinux.${pkgname}.png"; \
 	done
 	@install -dm755 "${pkgdir}/usr/share/icons/hicolor/scalable/apps"
-	@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/apps/" "${pkgname}.svg"
+	@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/apps/" "ru.ublinux.${pkgname}.svg"
 	@install -Dm755 -t "${pkgdir}/usr/bin/" "${CMAKE_BUILD_DIR}/${pkgname}"
 	@install -Dm644 -t "${pkgdir}/usr/share/applications/" "${pkgname}.desktop"
 	@install -Dm644 -t "${pkgdir}/usr/share/polkit-1/actions/" "ru.ublinux.pkexec.${pkgname}.exec.policy"
 	@install -dm755 "${pkgdir}/usr/share/${pkgname}"/{ui,images,css}
 	@install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/ui/" "${pkgname}.glade"
 	@install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/css/" style.css 
-	@install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" "${pkgname}.svg"
-	@install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" "${pkgname}.png"
+	@install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" "ru.ublinux.${pkgname}.svg"
+	@install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" "ru.ublinux.${pkgname}.png"
 	@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/emblems/" "bg_top.png"
 	@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/status/" "ru.ublinux.ubl-datetime-checked.svg"
 	@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/status/" "ru.ublinux.ubl-datetime-warning.svg"
diff --git a/ubl-settings-datetime.png b/ru.ublinux.ubl-settings-datetime.png
similarity index 100%
rename from ubl-settings-datetime.png
rename to ru.ublinux.ubl-settings-datetime.png
diff --git a/ubl-settings-datetime.svg b/ru.ublinux.ubl-settings-datetime.svg
similarity index 100%
rename from ubl-settings-datetime.svg
rename to ru.ublinux.ubl-settings-datetime.svg
diff --git a/ubl-settings-datetime.desktop b/ubl-settings-datetime.desktop
index 6ed43e7..edc26a9 100644
--- a/ubl-settings-datetime.desktop
+++ b/ubl-settings-datetime.desktop
@@ -8,7 +8,7 @@ Comment=Date time settings
 Comment[ru]=Приложение для настройки даты и времени
 Type=Application
 Exec=pkexec ubl-settings-datetime
-Icon=ubl-settings-datetime
+Icon=ru.ublinux.ubl-settings-datetime
 Terminal=false
 X-XfcePluggable=true
 X-UBLPluggable=true
diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade
index 459f6fa..d179374 100644
--- a/ubl-settings-datetime.glade
+++ b/ubl-settings-datetime.glade
@@ -23,7 +23,7 @@
 Подробнее в &lt;a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"&gt;GNU General Public License, версии 2 или позднее&lt;/a&gt;.</property>
     <property name="authors">UBGroup</property>
     <property name="artists">UBGroup</property>
-    <property name="logo-icon-name">ubl-settings-datetime</property>
+    <property name="logo-icon-name">ru.ublinux.ubl-settings-datetime</property>
     <property name="wrap-license">True</property>
     <property name="license-type">gpl-2-0</property>
     <child internal-child="vbox">
@@ -227,7 +227,7 @@
                         <property name="margin-top">6</property>
                         <property name="margin-bottom">6</property>
                         <property name="pixel-size">69</property>
-                        <property name="icon-name">ubl-settings-datetime</property>
+                        <property name="icon-name">ru.ublinux.ubl-settings-datetime</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -984,7 +984,7 @@ Format: DD.MM.YYYY</property>
             <property name="margin-start">5</property>
             <property name="margin-end">5</property>
             <property name="pixel-size">32</property>
-            <property name="icon-name">ubl-settings-datetime</property>
+            <property name="icon-name">ru.ublinux.ubl-settings-datetime</property>
           </object>
         </child>
         <child>
@@ -1185,6 +1185,7 @@ Format: DD.MM.YYYY</property>
   <object class="GtkWindow" id="windowMessDchp">
     <property name="can-focus">False</property>
     <property name="title" translatable="yes">Внимание!</property>
+    <property name="icon-name">ru.ublinux.ubl-settings-datetime</property>
     <property name="type-hint">dialog</property>
     <child>
       <object class="GtkBox">
@@ -1268,6 +1269,7 @@ Format: DD.MM.YYYY</property>
     <property name="type">popup</property>
     <property name="title" translatable="yes">Внимание!</property>
     <property name="window-position">center</property>
+    <property name="icon-name">ru.ublinux.ubl-settings-datetime</property>
     <property name="type-hint">dialog</property>
     <child>
       <object class="GtkBox">

From f0b9702e41a469a2c7d52ccd5902908a1ab4108a Mon Sep 17 00:00:00 2001
From: Igor Belitskiy <goga.belitskiy.00@mail.eu>
Date: Wed, 15 Mar 2023 13:09:19 +0600
Subject: [PATCH 24/27] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=B8=D0=BC=D0=B5=D0=BD=D0=B0=20?=
 =?UTF-8?q?=D0=B8=D0=BA=D0=BE=D0=BD=D0=BE=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Makefile b/Makefile
index 970147d..0ba8841 100644
--- a/Makefile
+++ b/Makefile
@@ -85,7 +85,6 @@ uninstall:
 	@$(RM) "/usr/bin/${pkgname}"	
 	@$(RM) "/usr/share/applications/${pkgname}.desktop"
 	@$(RM) "/usr/share/polkit-1/actions/ru.ublinux.pkexec.${pkgname}.exec.policy"
-	@$(RM) -rd "/usr/share/${pkgname}"
 	@gtk-update-icon-cache -fiq /usr/share/icons/hicolor/ &>/dev/null
 	@update-desktop-database --quiet 2>/dev/null 
 	@touch /usr/share/applications
@@ -116,8 +115,8 @@ install: check uninstall
 	@install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" "ru.ublinux.${pkgname}.svg"
 	@install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" "ru.ublinux.${pkgname}.png"
 	@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/emblems/" "bg_top.png"
-	@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/status/" "ru.ublinux.ubl-datetime-checked.svg"
-	@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/status/" "ru.ublinux.ubl-datetime-warning.svg"
+	@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/status/" "ru.ublinux.ubl-settings-datetime.checked.svg"
+	@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/status/" "ru.ublinux.ubl-settings-datetime.warning.svg"
 	@gtk-update-icon-cache -fiq /usr/share/icons/hicolor/ &>/dev/null
 	@update-desktop-database --quiet 2>/dev/null 
 	@touch /usr/share/applications
diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc
index b3a941a..ee18714 100644
--- a/source/ubl-settings-datetime.cc
+++ b/source/ubl-settings-datetime.cc
@@ -442,7 +442,7 @@ void MainWindow::info_warning_error(int mess) {
     }
     else {
         info_status_app("boxInfoMessOK");
-        imgInfo->set_from_icon_name("ru.ublinux.ubl-datetime-checked", Gtk::ICON_SIZE_MENU);//Gtk::IconSize::INHERIT);
+        imgInfo->set_from_icon_name("ru.ublinux.ubl-settings-datetime.checked", Gtk::ICON_SIZE_MENU);//Gtk::IconSize::INHERIT);
         if (mess == 0) {
             lblWarning->set_text(_("Local configuration downloaded successfully"));
         }

From b7259665254364a3294ebe724936c79b04233a44 Mon Sep 17 00:00:00 2001
From: Igor Belitskiy <goga.belitskiy.00@mail.eu>
Date: Wed, 15 Mar 2023 13:10:51 +0600
Subject: [PATCH 25/27] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=B8=D0=BC=D0=B5=D0=BD=D0=B0=20?=
 =?UTF-8?q?=D0=B8=D0=BA=D0=BE=D0=BD=D0=BE=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...me-checked.svg => ru.ublinux.ubl-settings-datetime.checked.svg | 0
 ...me-warning.svg => ru.ublinux.ubl-settings-datetime.warning.svg | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename ru.ublinux.ubl-datetime-checked.svg => ru.ublinux.ubl-settings-datetime.checked.svg (100%)
 rename ru.ublinux.ubl-datetime-warning.svg => ru.ublinux.ubl-settings-datetime.warning.svg (100%)

diff --git a/ru.ublinux.ubl-datetime-checked.svg b/ru.ublinux.ubl-settings-datetime.checked.svg
similarity index 100%
rename from ru.ublinux.ubl-datetime-checked.svg
rename to ru.ublinux.ubl-settings-datetime.checked.svg
diff --git a/ru.ublinux.ubl-datetime-warning.svg b/ru.ublinux.ubl-settings-datetime.warning.svg
similarity index 100%
rename from ru.ublinux.ubl-datetime-warning.svg
rename to ru.ublinux.ubl-settings-datetime.warning.svg

From 5dc590b4b347e3384e46814859e29904ef714b9e Mon Sep 17 00:00:00 2001
From: Igor Belitskiy <goga.belitskiy.00@mail.eu>
Date: Wed, 15 Mar 2023 14:53:12 +0600
Subject: [PATCH 26/27] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20=D0=BB=D0=BE=D0=B3=D0=B8=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D0=B0=D0=BF=D0=BF=D0=B0=D1=80=D0=B0=D1=82=D0=BD=D1=8B=D1=85=20?=
 =?UTF-8?q?=D1=87=D0=B0=D1=81=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/ubl-settings-datetime.cc | 40 +++++----------------------------
 source/ubl-settings-datetime.h  |  3 +--
 2 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc
index ee18714..4bcbaa0 100644
--- a/source/ubl-settings-datetime.cc
+++ b/source/ubl-settings-datetime.cc
@@ -363,8 +363,7 @@ void MainWindow::load_globl_cfg() {
     string cmd_zone = "/usr/bin/ubconfig --default --source global get clock ZONE";
     this->fill_in_reg_zone(cmd_zone);
     string hw = "/usr/bin/ubconfig --source global get clock HWCLOCK_SYNC";
-    string hw_default = "/usr/bin/ubconfig --default --source global get clock HWCLOCK_SYNC";
-    this->entry_hardware_clock(hw, hw_default);
+    this->entry_hardware_clock(hw);
     info_warning_error(1);
 }
 
@@ -378,7 +377,7 @@ void MainWindow::save_local_cfg() {
     this->save_Dhcp(cmd_default, cmd_dhcp, remove_ntp, cmd_set_ntp);
     string local = "/usr/bin/ubconfig --target system set clock HWCLOCK_SYNC=localtime";
     string hw = "/usr/bin/ubconfig --target system set clock HWCLOCK_SYNC=utc";
-    this->hardware_clock_global(local, hw);
+    this->entry_hardware_clock(hw);
     info_warning_error(2);
 }
 
@@ -497,29 +496,7 @@ void MainWindow::hardware_clock_global(string &local, string &etc) {
     }
 }
 
-void MainWindow::entry_hardware_clock_default(string &cmd_default) {
-    int error = warning_info;
-    struct Result<string> obj_result_default = this->wrapper_call(cmd_default);
-    if (obj_result_default.error == 0) {
-        if (obj_result_default.response.find("localtime") != string::npos) {
-            cbHw->set_active(0);
-        }
-        else if (obj_result_default.response.find("utc") != string::npos) {
-            cbHw->set_active(1);
-            
-        }
-        
-    }
-    else if (obj_result_default.error == 3) {
-        if (error != warning_info) {
-            warning_info = error;
-        }
-        cbHw->set_active(-1);
-    }
-    
-}
-
-void MainWindow::entry_hardware_clock(string &cmd, string &cmd_default) {
+void MainWindow::entry_hardware_clock(string &cmd) {
     int error = warning_info;
     struct Result<string> obj_result = this->wrapper_call(cmd);
     if (obj_result.error == 0) {
@@ -530,18 +507,11 @@ void MainWindow::entry_hardware_clock(string &cmd, string &cmd_default) {
             cbHw->set_active(1);
         }
         else {
-            this->entry_hardware_clock_default(cmd_default);
+            cbHw->set_active(-1);
         }
     }
-    else if (obj_result.error == 3) {
-        if (error != warning_info) {
-            warning_info = error;
-        }
-        cbHw->set_active(-1);
-        this->entry_hardware_clock_default(cmd_default);
-    }
     else { 
-        this->entry_hardware_clock_default(cmd_default);
+        cbHw->set_active(-1);
     }
     
 }
diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h
index dd466a6..9f32d1f 100755
--- a/source/ubl-settings-datetime.h
+++ b/source/ubl-settings-datetime.h
@@ -143,8 +143,7 @@ class MainWindow : public Gtk::ApplicationWindow {
         void hardware_clock_global(string &local, string &etc);
         void info_warning_error(int mess);
         void synopsis_show();
-        void entry_hardware_clock(string &cmd, string &cmd_default);
-        void entry_hardware_clock_default(string &cmd_default);
+        void entry_hardware_clock(string &cmd);
         void save_global_local_cfg();
         void fill_in_reg_zone(string &cmd);
         void load_globl_cfg();

From fd671140bb8b81f3f6af9c14d3ea49f79dddd006 Mon Sep 17 00:00:00 2001
From: Igor Belitskiy <goga.belitskiy.00@mail.eu>
Date: Wed, 15 Mar 2023 14:57:11 +0600
Subject: [PATCH 27/27] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D0=B0=D0=BF=D0=BF=D0=B0=D1=80=D0=B0=D1=82=D0=BD=D1=8B=D1=85=20?=
 =?UTF-8?q?=D1=87=D0=B0=D1=81=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/ubl-settings-datetime.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc
index 4bcbaa0..b01728f 100644
--- a/source/ubl-settings-datetime.cc
+++ b/source/ubl-settings-datetime.cc
@@ -351,8 +351,7 @@ void MainWindow::load_local_cfg() {
     string cmd_default_get_dhcp = "/usr/bin/ubconfig --source=default get NTPSERVERS_DEFAULT";
     this->entry_dhcp_mess(cmd_get_dhcp, cmd_default_get_dhcp);
     string hw = "/usr/bin/ubconfig --default --source system get clock HWCLOCK_SYNC";
-    string hw_default = "/usr/bin/ubconfig --source default get clock HWCLOCK_SYNC";
-    this->entry_hardware_clock(hw, hw_default);
+    this->entry_hardware_clock(hw);
     info_warning_error(0);
 }
 
@@ -513,6 +512,9 @@ void MainWindow::entry_hardware_clock(string &cmd) {
     else { 
         cbHw->set_active(-1);
     }
+    if (error != warning_info){
+        warning_info = error;
+    }
     
 }