From 1d034799844dac3ae0c4528718f3e300fb0351a6 Mon Sep 17 00:00:00 2001
From: Igor Belitskiy <goga.belitskiy.00@mail.eu>
Date: Mon, 30 Jan 2023 09:48:47 +0000
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=20=D0=B4=D0=B8=D0=B7=D0=B0=D0=B9=D0=BD=20=D0=BF?=
 =?UTF-8?q?=D0=BE=20#15,=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=20=D0=B1=D0=B0=D0=B3=20=D1=81=20=D0=B0=D0=BF=D0=BF?=
 =?UTF-8?q?=D0=B0=D1=80=D0=B0=D1=82=D0=BD=D1=8B=D0=BC=D0=B8=20=D1=87=D0=B0?=
 =?UTF-8?q?=D1=81=D0=B0=D0=BC=D0=B8,=D0=BD=D0=B5=20=D1=80=D0=B0=D0=B1?=
 =?UTF-8?q?=D0=BE=D1=82=D0=B0=D0=BB=D0=BE=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B2=D1=80=D0=B5=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/ubl-settings-datetime.cc |  10 ++-
 ubl-settings-datetime.glade     | 113 +++++++++++++++++---------------
 ubl-settings-datetime_ru.po     |   4 +-
 3 files changed, 65 insertions(+), 62 deletions(-)

diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc
index 884751e..2df0429 100644
--- a/source/ubl-settings-datetime.cc
+++ b/source/ubl-settings-datetime.cc
@@ -90,7 +90,7 @@ void MainWindow::lacalization(){
     _lblRegGlob->set_text(gettext("Region"));
     _lblZone1Glob->set_text(gettext("Zone"));
     _lblTimeZoneGlob->set_text(gettext("Time zone"));
-    _lblSynchronizeBtn->set_text(gettext("Apply local date and time settings"));
+    _lblSynchronizeBtn->set_text(gettext("Sync by"));
     _lblDateTimeSettingGlob->set_text(gettext("Global customization"));
     this->set_title(gettext("ubl-settings-datetime"));
     _mess_dchp->set_title(gettext("Warning!"));
@@ -427,8 +427,8 @@ void MainWindow::enter_zone_glob(){
 
 void MainWindow::set_ntp_toggle_glob(){
     bool flag = _cbxSynchronizeNtp->get_active();
-    if (flag==true){
-        system("/usr/bin/ubconfig remove network NTPSERVERS")
+    if (flag==false){
+        system("/usr/bin/ubconfig remove network NTPSERVERS");
     }
     else{
 
@@ -508,7 +508,7 @@ void MainWindow::append_zone_glob(){
 
 void MainWindow::update_time_date(){
     //this->enter_zone();
-    bool flag = _cbxSynchronizeNtpGlob->get_active();
+    bool flag = _cbxSynchronizeNtp->get_active();
     string cmd = "";
     if ((year!=0) && (month !=0) && (day !=0)){
         string str_month = "";
@@ -556,8 +556,6 @@ void MainWindow::update_time_date(){
             + ":" + to_string(ltm->tm_sec) +"\"";
         system(cmd.c_str());
     }
-    cmd = "hwclock --systohc";
-    system(cmd.c_str());
 }
 
 void MainWindow::post_entry_data(){
diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade
index ff8fc94..52b1d0b 100644
--- a/ubl-settings-datetime.glade
+++ b/ubl-settings-datetime.glade
@@ -399,6 +399,62 @@
                       <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">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>
+                            <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">Синхронизировать</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="GtkLabel">
                             <property name="visible">True</property>
@@ -426,9 +482,12 @@
                             <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">6</property>
+                            <property name="margin-bottom">6</property>
                             <child>
                               <object class="GtkLabel" id="lblTimeBios">
                                 <property name="visible">True</property>
@@ -589,60 +648,6 @@
                         <property name="position">5</property>
                       </packing>
                     </child>
-                    <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-right">5</property>
-                        <property name="margin-start">5</property>
-                        <property name="margin-end">5</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">Применить локальную настройку даты и времени</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">6</property>
-                      </packing>
-                    </child>
                   </object>
                 </child>
                 <child type="label">
diff --git a/ubl-settings-datetime_ru.po b/ubl-settings-datetime_ru.po
index 8f78b7a..62bf046 100644
--- a/ubl-settings-datetime_ru.po
+++ b/ubl-settings-datetime_ru.po
@@ -60,8 +60,8 @@ msgstr "Регион"
 msgid "Zone"
 msgstr "Зона"
 
-msgid "Apply local date and time settings"
-msgstr "Применить локальную настройку даты и времени"
+msgid "Sync by"
+msgstr "Синхронизировать"
 
 msgid "Automatic time synchronization"
 msgstr "Автоматическая синхронизация времени"