Измененён дизайн, добавлено о программе

source/ubl-settings-datetime.cc

@@ -12,6 +12,7 @@ bool flag_timezone = false;
 bool flag_ntp = false;
 bool flag_update = false;
 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} {
@@ -26,8 +27,14 @@ CmdArgParser::CmdArgParser(const std::string& p_name, const std::string& p_descr
     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);
 }
 ::Window CmdArgParser::GetSocketID() const{
     return m_socketID;
@@ -49,13 +56,15 @@ void MainWindow::settings(){
     Gtk::Widget *plugBox;
     Gtk::Window *window;
     Gtk::Widget *boxButton;
+    Gtk::Widget *btnSave;
     builder->get_widget("standartHead",standartHead);
     builder->get_widget("plugBox",plugBox);
     builder->get_widget("window",window);
     builder->get_widget("boxButton",boxButton);
+    builder->get_widget("btnSave",btnSave);
     
     
-    ubl_get_standard_ui(standartHead,plugBox,boxButton,window,"ubl-settings-datetime.svg",_("Settings the date and time"),_("ubl-settings-datetime"),0,socket_ext_id_I);
+    ubl_make_plugs(boxButton,btnSave, socket_ext_id_I, socket_trd_id_I);
     year=0, month=0, day=0;
     this->get_builder();
     this->lacalization();
@@ -226,11 +235,13 @@ void MainWindow::get_builder(){
     builder->get_widget("btnSaveLocal",btnSaveLocal);
     builder->get_widget("btnSaveGlobl",btnSaveGlobl);
     builder->get_widget("lblSave",lblSave);
-    builder->get_widget("btnSave",btnSave);
+
     builder->get_widget("btnDownload",btnDownload);
     builder->get_widget("lblDownload",lblDownload);
     builder->get_widget("btnDownloadGlobal", btnDownloadGlobal);
     builder->get_widget("btnDownloadlocal", btnDownloadlocal);
+    builder->get_widget("btnSettings", btnSettings);
+    builder->get_widget("aboutWindows", aboutWindows);
     
     //builder->get_widget("cbxSynchronizeNtp",cbxSynchronizeNtp);
     
@@ -263,8 +274,14 @@ void MainWindow::event(){
     btnSaveLocal->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::save_local_cfg));
     btnSaveGlobl->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::save_global_cfg));
     btnDownloadlocal->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::download_local_cfg));
+    btnSettings->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::about_Dialog_show));
+}
+
+void MainWindow::about_Dialog_show(){
+    aboutWindows->show();
 }
 
+
 void MainWindow::download_globl_cfg(){
     this->entry_dhcp_mess();
     string cmd = "/usr/bin/ubconfig --default --source global get clock ZONE";
@@ -675,8 +692,7 @@ void MainWindow::get_config(){
     this->read_file();
     this->update_hour_minute();
     this->update_calendar();
-    
+    this->entry_dhcp_mess();
-
 }
 
 array<string, 2> MainWindow::split_region_zone(string read_reg_zon_cfg){

source/ubl-settings-datetime.h

@@ -30,6 +30,7 @@ extern bool flag_timezone;
 extern bool flag_ntp;
 extern bool flag_update;
 extern int socket_ext_id_I;
+extern int socket_trd_id_I;
 class CmdArgParser : public Glib::OptionGroup
 {
 public:
@@ -84,13 +85,16 @@ class MainWindow : public Gtk::ApplicationWindow {
         Gtk::Label *lblNtpClose;
         Gtk::Entry *txtNtpServer;
         Gtk::Entry *txtDate;
-        Gtk::Widget *btnSave;
         Gtk::Widget *btnDownload;
         Gtk::MenuItem *btnSaveLocal;
         Gtk::MenuItem *btnSaveGlobl;
         
         Gtk::MenuItem *btnDownloadGlobal;
         Gtk::MenuItem *btnDownloadlocal;
+        Gtk::AboutDialog *aboutWindows;
+        //Gtk::MenuButton *btnSave;
+        //Gtk::MenuButton *btnDownload;
+        Gtk::Button *btnSettings;
         std::map <string, vector<string>> time_reg_map;
         std::map <string, vector<string>> time_reg_map_local;
         unsigned int year=0;
@@ -119,6 +123,7 @@ class MainWindow : public Gtk::ApplicationWindow {
         virtual ~MainWindow() = default;
         void fill_in_reg_zone(string &cmd);
         void download_globl_cfg();
+        void about_Dialog_show();
         void save_local_cfg();
         void save_global_cfg();
         void save_Dhcp();

ubl-settings-datetime.desktop

@@ -7,7 +7,7 @@ GenericName[ru]=Настройка даты и времени
 Comment=Date time settings
 Comment[ru]=Приложение для настройки даты и времени
 Type=Application
-Exec=pkexec ubl-settings-datetime --lock-datetime
+Exec=pkexec ubl-settings-datetime
 Icon=ubl-settings-datetime
 Terminal=false
 X-XfcePluggable=true

ubl-settings-datetime.glade

@@ -2,6 +2,43 @@
 <!-- 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="window-position">center</property>
+    <property name="type-hint">dialog</property>
+    <property name="program-name">ubl-settings-datetime</property>
+    <property name="version">1.4</property>
+    <property name="copyright" translatable="yes">Copyright © 2021 - the ublinux team</property>
+    <property name="comments" translatable="yes">Настройка даты времени</property>
+    <property name="website">https://ublinux.ru/</property>
+    <property name="website-label" translatable="yes">www.ublinux.ru</property>
+    <property name="authors">UBGroup</property>
+    <property name="artists">UBGroup</property>
+    <property name="logo-icon-name">ubl-settings-datetime</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">
+            <property name="can-focus">False</property>
+            <property name="layout-style">end</property>
+          </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="menu1">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
@@ -26,18 +63,18 @@
     <property name="visible">True</property>
     <property name="can-focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="btnDownloadGlobal">
+      <object class="GtkMenuItem" id="btnDownloadlocal">
         <property name="visible">True</property>
         <property name="can-focus">False</property>
-        <property name="label" translatable="yes">Download Global</property>
+        <property name="label" translatable="yes">Download Local</property>
         <property name="use-underline">True</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="btnDownloadlocal">
+      <object class="GtkMenuItem" id="btnDownloadGlobal">
         <property name="visible">True</property>
         <property name="can-focus">False</property>
-        <property name="label" translatable="yes">Download Local</property>
+        <property name="label" translatable="yes">Download Global</property>
         <property name="use-underline">True</property>
       </object>
     </child>
@@ -732,16 +769,34 @@ Format: DD.MM.YYYY</property>
           </object>
         </child>
         <child>
-          <object class="GtkBox" id="boxButton">
+          <object class="GtkMenuButton" id="btnSave">
             <property name="visible">True</property>
-            <property name="can-focus">False</property>
+            <property name="can-focus">True</property>
+            <property name="focus-on-click">False</property>
+            <property name="receives-default">True</property>
+            <property name="popup">menu1</property>
             <child>
-              <object class="GtkMenuButton" id="btnSave">
+              <object class="GtkBox">
                 <property name="visible">True</property>
-                <property name="can-focus">True</property>
+                <property name="can-focus">False</property>
-                <property name="focus-on-click">False</property>
+                <child>
-                <property name="receives-default">True</property>
+                  <object class="GtkImage">
-                <property name="popup">menu1</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="icon-name">go-bottom</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="lblSave">
                     <property name="visible">True</property>
@@ -754,44 +809,103 @@ Format: DD.MM.YYYY</property>
                     <property name="margin-bottom">6</property>
                     <property name="label" translatable="yes">Save</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="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="boxButton">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <child>
+              <object class="GtkMenuButton" id="btnDownload">
+                <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="popup">menu2</property>
+                <child>
+                  <object class="GtkBox">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</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="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="icon-name">media-floppy</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="lblDownload">
+                        <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">Download</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">1</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkMenuButton" id="btnDownload">
+              <object class="GtkButton" 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="popup">menu2</property>
                 <child>
-                  <object class="GtkLabel" id="lblDownload">
+                  <object class="GtkImage">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
-                    <property name="margin-left">5</property>
+                    <property name="pixel-size">25</property>
-                    <property name="margin-right">5</property>
+                    <property name="icon-name">emblem-system</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">Download</property>
                   </object>
                 </child>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">2</property>
+                <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="position">1</property>
+            <property name="pack-type">end</property>
+            <property name="position">2</property>
           </packing>
         </child>
       </object>