Исправлен дизайн исправлен баг с информационным полем

Makefile

@@ -117,10 +117,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/" alert.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/${pkgname}/images/" close.svg
 	@gtk-update-icon-cache -fiq /usr/share/icons/hicolor/
 	@update-desktop-database --quiet 2>/dev/null 
 	@touch /usr/share/applications

checked.svg

@@ -21,11 +21,11 @@
      inkscape:pagecheckerboard="0"
      showgrid="false"
      inkscape:zoom="14.8125"
-     inkscape:cx="-12.219409"
+     inkscape:cx="-4.6919831"
      inkscape:cy="9.9578059"
      inkscape:window-width="1920"
      inkscape:window-height="1027"
-     inkscape:window-x="1920"
+     inkscape:window-x="0"
      inkscape:window-y="0"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg25" />
@@ -323,5 +323,5 @@
   <path
      id="path21"
      d="M 12 1 C 5.906 1 1 5.906 1 12 C 1 18.094 5.906 23 12 23 C 18.094 23 23 18.094 23 12 C 23 5.906 18.094 1 12 1 z M 15.480469 8.9042969 C 16.392469 8.8782969 16.860031 9.9850937 16.207031 10.621094 L 11 15.828125 L 8.09375 12.921875 C 7.11175 11.979875 8.5648125 10.525813 9.5078125 11.507812 L 11 13 L 14.792969 9.2070312 A 1 1 0 0 1 15.480469 8.9042969 z "
-     style="fill:#ffffff" />
+     style="fill:#4d4d4d;fill-opacity:1" />
 </svg>

source/ubl-settings-datetime.cc

@@ -78,15 +78,16 @@ void MainWindow::settings(){
         btnBoxAboutDialog->set_visible(false);
         this->event();
         this->parse_text_date();
+        this->download_local_cfg();
         this->download_globl_cfg();
-        this->download_local_cfg(); 
+         
-        orevrlayInfo->add_overlay(*boxInfoError);
+        //orevrlayInfo->add_overlay(*boxInfoError);
-        imgInfo->set("/usr/share/ubl-settings-datetime/images/checked.svg");
+        //imgInfo->set("/usr/share/ubl-settings-datetime/images/checked.svg");
-        imageCloseInfo->set("/usr/share/ubl-settings-datetime/images/close.svg");
+        //GdkPixbuf* pixbuf_image = gdk_pixbuf_new_from_file_at_size("/usr/share/ubl-settings-datetime/images/close.svg", 12,12,NULL);
+        //GtkWidget* imageInfo = GTK_WIDGET(imageCloseInfo->gobj());
+        //gtk_image_set_from_pixbuf(GTK_IMAGE(imageInfo), pixbuf_image);
     }
     else{
-        btnSaveLocal->set_sensitive(false);
-        btnSaveGlobl->set_sensitive(false);
         btnDownload->set_sensitive(false);
         numTimeHrs->set_sensitive(false);
         numTimeMin->set_sensitive(false);
@@ -108,6 +109,8 @@ void MainWindow::settings(){
         lblDateTimeSetting->set_sensitive(false);
         btnBoxAboutDialog->set_visible(false);
         this->event();
+        imgInfo->set("/usr/share/ubl-settings-datetime/images/checked.svg");
+
         
 
     }
@@ -127,13 +130,15 @@ int MainWindow::check_root(){
 
 void MainWindow::lacalization(){
     btnSynopsis->set_label(_("Synopsis"));
-    aboutProgram->set_label(_("About the program"));
+    btnAbout->set_label(_("About the program"));
+    lblDonwlodLocal->set_label(_("Download local"));
+    lblDonwlolGlob->set_label(_("Download global"));
+    lblSaveGlob->set_label(_("Save to Global configuration"));
+    lblSaveLocal->set_label(_("Save to local configuration"));
+    lblSaveLocalGlob->set_label(_("Save to global and local configuration"));
     aboutWindows->set_comments(_("Setting the date and time"));
     lblSave->set_label(_("Save"));
     lblDownload->set_label(_("Download"));
-    btnDownloadGlobal->set_label(_("Download global"));
-    btnSaveLocal->set_label(_("Save local"));
-    btnSaveGlobl->set_label(_("Save global"));
     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:"));
@@ -198,22 +203,14 @@ void MainWindow::add_CSS(){
     //Glib::RefPtr<Gtk::StyleContext> context_button = btnHardwareTime->get_style_context();
     context->add_class("cssboxColor1");
     context_lbl_head->add_class("textHead");
-    Glib::RefPtr<Gtk::StyleContext> boxInfo = boxInfoError->get_style_context();
-    boxInfo->add_class("boxInfoOK");
-    Glib::RefPtr<Gtk::StyleContext> btnWarngingCloseCss = btnWarngingClose->get_style_context();
-    btnWarngingCloseCss->add_class("boxInfoOK");
 }
 
-void MainWindow::info_status_app(string style){
+
-    Glib::RefPtr<Gtk::CssProvider> cssProvider = Gtk::CssProvider::create();
+void MainWindow::info_status_app(string stule){
-    cssProvider->load_from_path(path_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> boxInfo = boxInfoError->get_style_context();
-    boxInfo->add_class(style);
+    boxInfo->remove_class("boxInfoMessOK");
-    Glib::RefPtr<Gtk::StyleContext> btnWarngingCloseCss = btnWarngingClose->get_style_context();
+    boxInfo->remove_class("boxInfoMessError");
-    btnWarngingCloseCss->add_class(style);
+    boxInfo->add_class(stule);
 }
 
 void MainWindow::get_builder(){
@@ -248,24 +245,34 @@ void MainWindow::get_builder(){
     builder->get_widget("mess_sudo",mess_sudo);
     builder->get_widget("lblMessageSudo",lblMessageSudo);
     builder->get_widget("btnMessCloseSudo",btnMessCloseSudo);
-    builder->get_widget("btnSaveLocal",btnSaveLocal);
-    builder->get_widget("btnSaveGlobl",btnSaveGlobl);
     builder->get_widget("lblSave",lblSave);
 
-    builder->get_widget("btnDownload",btnDownload);
     builder->get_widget("lblDownload",lblDownload);
-    builder->get_widget("btnDownloadGlobal", btnDownloadGlobal);
-    builder->get_widget("btnSettings", btnSettings);
     builder->get_widget("aboutWindows", aboutWindows);
     builder->get_widget("btnBoxAboutDialog", btnBoxAboutDialog);
-    builder->get_widget("btnSynopsis", btnSynopsis);
-    builder->get_widget("aboutProgram", aboutProgram);
     builder->get_widget("boxInfoError", boxInfoError);
-    builder->get_widget("orevrlayInfo", orevrlayInfo);
-    builder->get_widget("btnWarngingClose", btnWarngingClose);
     builder->get_widget("lblWarning", lblWarning);
     builder->get_widget("imgInfo", imgInfo);
-    builder->get_widget("imageCloseInfo", imageCloseInfo);
+    builder->get_widget("popDownloadMenu", popDownloadMenu);
+    builder->get_widget("popSaveMenu", popSaveMenu);
+    builder->get_widget("popAbout", popAbout);
+    builder->get_widget("btnSave", btnSave);
+    builder->get_widget("btnSettings", btnSettings);
+    builder->get_widget("btnDownload", btnDownload);
+    builder->get_widget("btnSynopsis", btnSynopsis);
+    builder->get_widget("btnAbout", btnAbout);
+    builder->get_widget("btnDonwlodLocal", btnDonwlodLocal);
+    builder->get_widget("btnDonwlolGlob", btnDonwlolGlob);
+    builder->get_widget("btnSaveLocalGlob", btnSaveLocalGlob);
+    builder->get_widget("btnSaveLocal", btnSaveLocal);
+    builder->get_widget("btnSaveGlob", btnSaveGlob);
+    builder->get_widget("lblSynopsis", lblSynopsis);
+    builder->get_widget("lblAbout", lblAbout);
+    builder->get_widget("lblDonwlodLocal", lblDonwlodLocal);
+    builder->get_widget("lblDonwlolGlob", lblDonwlolGlob);
+    builder->get_widget("lblSaveLocalGlob", lblSaveLocalGlob);
+    builder->get_widget("lblSaveLocal", lblSaveLocal);
+    builder->get_widget("lblSaveGlob", lblSaveGlob);
     this->add_CSS();
 }
 void MainWindow::gui_exit(){
@@ -289,26 +296,16 @@ void MainWindow::event(){
     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));
-    btnDownloadGlobal->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::download_globl_cfg));
+    btnDownload->signal_clicked().connect([&](){popDownloadMenu->show();});
-    btnSaveLocal->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::save_local_cfg));
+    btnSave->signal_clicked().connect([&](){popSaveMenu->show();});
-    btnSaveGlobl->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::save_global_cfg));
+    btnSettings->signal_clicked().connect([&](){popAbout->show();});
-    aboutProgram->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::about_Dialog_show));
+    btnAbout->signal_clicked().connect([&](){aboutWindows->show();});
-    btnDownload->signal_toggled().connect(sigc::mem_fun(*this, &MainWindow::download_local_cfg));
+    btnSynopsis->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::synopsis_show));
-    btnSynopsis->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::synopsis_show));
+    btnDonwlodLocal->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::download_local_cfg));
-    btnWarngingClose->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::close_banner_info));
+    btnDonwlolGlob->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::download_globl_cfg));
-    Glib::signal_timeout().connect(sigc::mem_fun(*this, &MainWindow::close_banner_info_timer), 10000);
+    btnSaveLocalGlob->signal_clicked().connect([&](){save_global_local_cfg();});
-}
+    btnSaveLocal->signal_clicked().connect([&](){save_local_cfg();});
-
+    btnSaveGlob->signal_clicked().connect([&](){save_global_cfg();});
-bool MainWindow::close_banner_info_timer(){
-    if (bool_close_banner_info==true){
-        boxInfoError->hide();
-    }
-    
-    return false;
-}
-
-void MainWindow::close_banner_info(){
-    boxInfoError->hide();
 }
 
 void MainWindow::synopsis_show(){
@@ -317,11 +314,6 @@ void MainWindow::synopsis_show(){
     warning_info=0;
 }
 
-
-void MainWindow::about_Dialog_show(){
-    aboutWindows->show();
-}
-
 void MainWindow::download_local_cfg(){
     string cmd = "/usr/bin/ubconfig --default --source system get clock ZONE";
     this->fill_in_reg_zone(cmd);
@@ -349,33 +341,19 @@ void MainWindow::save_global_cfg(){
     this->save_Dhcp();
     info_warning_error(3);
 }
-
+void MainWindow::save_global_local_cfg(){
+    string cmd = "ubconfig --target system set clock ZONE=";
+    this->enter_zone(cmd);
+    info_warning_error(4);
+    cmd = "/usr/bin/ubconfig --target global set clock ZONE=";
+    this->enter_zone(cmd);
+    this->save_Dhcp();
+}
 
 void MainWindow::info_warning_error(int mess){
-    boxInfoError->show();
+    if (error_info>0 || warning_info>0){
-    if (error_info!=0){
+        info_status_app("boxInfoMessError");
-        imgInfo->set("/usr/share/ubl-settings-datetime/images/alert.svg");
-        bool_close_banner_info=false;
-        info_status_app("boxInfoError");
-        error_info=0;
-        warning_info=0;
-        if (mess == 0){
-            lblWarning->set_text(_("Local configuration reading error"));
-        }
-        else if (mess == 1){
-            lblWarning->set_text(_("Global configuration read error"));
-        }
-        else if (mess == 2){
-            lblWarning->set_text(_("Local configuration write error"));
-        }
-        else if (mess == 3){
-            lblWarning->set_text(_("Global configuration write error"));
-        }
-    }
-    else if (warning_info!=0){
         imgInfo->set("/usr/share/ubl-settings-datetime/images/warning.svg");
-        bool_close_banner_info=false;
-        info_status_app("boxInfoWarning");
         error_info=0;
         warning_info=0;
         if (mess == 0){
@@ -390,12 +368,13 @@ void MainWindow::info_warning_error(int mess){
         else if (mess == 3){
             lblWarning->set_text(_("Global configuration write error"));
         }
-
+        else if (mess == 4){
+            lblWarning->set_text(_("Error saved local and global configuration"));
+        }
     }
     else{
+        info_status_app("boxInfoMessOK");
         imgInfo->set("/usr/share/ubl-settings-datetime/images/checked.svg");
-        bool_close_banner_info=true;
-        info_status_app("boxInfoOK");
         if (mess == 0){
             lblWarning->set_text(_("Local configuration downloaded successfully"));
         }
@@ -408,6 +387,9 @@ void MainWindow::info_warning_error(int mess){
         else if (mess == 3){
             lblWarning->set_text(_("Global configuration successfully written"));
         }
+        else if (mess == 4){
+            lblWarning->set_text(_("Successfully saved local and global configuration"));
+        }
     }
 }
 
@@ -602,18 +584,7 @@ void MainWindow::event_entry_cbDhcp(){
         txtNtpServer->set_text("");
         btnUpdateDateTime->set_sensitive(false);
         txtNtpServer->set_sensitive(false);
-        /*
+
-        cmd = "/usr/bin/ubconfig --source=default get NTPSERVERS_DEFAULT";
-        struct Result<string> obj_result = this->wrapper_call(cmd);
-        if (obj_result.error==0){
-            txtNtpServer->set_text(obj_result.response);
-        }
-        else{
-            //string error = "";
-            //error = string(_("ERROR")) + "\n" + obj_result.response;
-            //lblMessage->set_text(error);
-            //mess_dchp->show();
-        }*/
 
     }
     else if (activ_index==1){
@@ -623,25 +594,6 @@ void MainWindow::event_entry_cbDhcp(){
     }
     else if (activ_index==2){
         txtNtpServer->set_sensitive(true);
-        /*
-        string  cmd = "/usr/bin/ubconfig get network NTPSERVERS"; 
-        struct Result<string> obj_result = this->wrapper_call(cmd);
-        if (obj_result.error==0){
-            if (obj_result.response.find("default")==std::string::npos){
-                if (obj_result.response.find("dhcp")==std::string::npos){  
-                    txtNtpServer->set_text(obj_result.response);
-                } 
-            cbDhcp->set_active(activ_index);
-            }
-        }
-        else if (obj_result.error==3){}
-        else{
-            string error = "";
-            error = string(_("ERROR")) + "\n" + obj_result.response;
-            lblMessage->set_text(error);
-            mess_dchp->show();
-        }
-        */
     }
     else if (activ_index==3){
         txtNtpServer->set_text("");
@@ -746,6 +698,10 @@ void MainWindow::entry_dhcp_mess(){
                 txtNtpServer->set_text(obj_result.response);
             }
             else{
+                if (obj_result.error==2){
+                    error_info-=1;
+                    warning_info-=1;
+                }
                 //string error = "";
                 //error = string(_("ERROR")) + "\n" + obj_result.response;
                 //lblMessage->set_text(error);
@@ -800,7 +756,6 @@ 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){
@@ -921,6 +876,13 @@ void MainWindow::append_region_zone(string region, string zone, Gtk::ComboBoxTex
             index+=1;
         }
     }
+    if (region=="Etc" && zone==""){
+        error_info-=1;
+        warning_info-=1;
+    }
+    else if (region==""){
+        error_info+=1;
+    }
     
 }
 string MainWindow::call(string cmd){

source/ubl-settings-datetime.h

@@ -58,6 +58,9 @@ class MainWindow : public Gtk::ApplicationWindow {
         Gtk::Window *mess_dchp;
         Gtk::Window *mess_sudo;
         Gtk::Popover *popCalendar;
+        Gtk::Popover *popSaveMenu;
+        Gtk::Popover *popDownloadMenu;
+        Gtk::Popover *popAbout;
         Gtk::Calendar *cldrDate;
         Gtk::Label *lblMessage;
         Gtk::Label *lblMessageSudo;
@@ -79,23 +82,31 @@ class MainWindow : public Gtk::ApplicationWindow {
         Gtk::CheckButton *cbxSynchronizeNtp;
         Gtk::Entry *txtNtpServer;
         Gtk::Entry *txtDate;
-        Gtk::MenuButton *btnDownload;
+        Gtk::Button *btnDownload;
-        Gtk::MenuItem *btnSaveLocal;
+        Gtk::Button *btnSave;
-        Gtk::MenuItem *btnSaveGlobl; 
+        Gtk::Button *btnSettings; 
-        Gtk::MenuItem *btnDownloadGlobal;
         Gtk::AboutDialog *aboutWindows;
         Gtk::ButtonBox *btnBoxAboutDialog;
-        Gtk::MenuButton *btnSettings;
+        
-        Gtk::MenuItem *btnSynopsis;
+        Gtk::Box *boxInfoError; 
-        Gtk::MenuItem *aboutProgram;
-        Gtk::Widget *boxInfoError; 
-        Gtk::Overlay *orevrlayInfo;
-        Gtk::Button *btnWarngingClose;
         Gtk::Label *lblWarning;
         Gtk::Image *imgInfo;
-        Gtk::Image *imageCloseInfo;
         std::map <string, vector<string>> time_reg_map;
         std::map <string, vector<string>> time_reg_map_local;
+        Gtk::Button *btnSaveLocalGlob;
+        Gtk::Button *btnSaveLocal;
+        Gtk::Button *btnSaveGlob;
+        Gtk::Button *btnDonwlolGlob;
+        Gtk::Button *btnDonwlodLocal;
+        Gtk::Button *btnAbout;
+        Gtk::Button *btnSynopsis;
+        Gtk::Label *lblSaveLocalGlob;
+        Gtk::Label *lblSaveLocal;
+        Gtk::Label *lblSaveGlob;
+        Gtk::Label *lblDonwlolGlob;
+        Gtk::Label *lblDonwlodLocal;
+        Gtk::Label *lblAbout;
+        Gtk::Label *lblSynopsis;
         unsigned int year=0;
         unsigned int month=0;
         unsigned int day=0;
@@ -119,12 +130,10 @@ class MainWindow : public Gtk::ApplicationWindow {
         MainWindow(Glib::RefPtr<Gtk::Builder> const& builder);
         virtual ~MainWindow() = default;
         void info_warning_error(int mess);
-        bool close_banner_info_timer();
-        void close_banner_info();
         void synopsis_show();
+        void save_global_local_cfg();
         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();
@@ -162,7 +171,7 @@ class MainWindow : public Gtk::ApplicationWindow {
         void stop_ntp();
         void wind_close_ntp();
         void wrapper_system(string cmd);
-        void info_status_app(string style);
+        void info_status_app(string stule);
         void wrapper_update_time_date();
         string zone_file_read(string zone);
         void sort_zone(vector<string> *time_reg_map_local,vector<string> *time_reg_map);

style.css

@@ -1,17 +1,13 @@
+.boxInfoMessError{
+    background-color: #ea9999;
+}
 .cssboxColor1{
     background: url("/usr/share/ubl-settings-datetime/images/bg_top.png") no-repeat;
 }
+.boxInfoMessOK{
+    background-color: #f3f0ac;
+}
 .textHead{
     text-shadow: 1px 1px #ffffff;
 }
-.boxInfoOK{
-    background-color:#6edf64;
-}
 
-.boxInfoWarning{
-    background-color: rgba(242, 255, 0, 1);
-}
-
-.boxInfoError{
-    background-color: rgba(255, 0, 0, 1);
-}

ubl-settings-datetime.glade

@@ -5,17 +5,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.4</property>
+    <property name="version">1.28</property>
     <property name="copyright" translatable="yes">Copyright © 2021 - the ublinux team</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">www.ublinux.ru</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="logo-icon-name">ublinux-ubconfig</property>
+    <property name="wrap-license">True</property>
     <property name="license-type">gpl-2-0</property>
     <child internal-child="vbox">
       <object class="GtkBox">
@@ -24,9 +31,11 @@
         <property name="spacing">2</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="btnBoxAboutDialog">
-            <property name="name">btnBoxAboutDialog</property>
             <property name="can-focus">False</property>
             <property name="layout-style">end</property>
+            <child>
+              <placeholder/>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -40,150 +49,471 @@
       </object>
     </child>
   </object>
-  <object class="GtkBox" id="boxInfoError">
+  <object class="GtkWindow" id="mess_dchp">
-    <property name="visible">True</property>
     <property name="can-focus">False</property>
-    <property name="valign">start</property>
+    <property name="title" translatable="yes">Внимание!</property>
-    <property name="hexpand">True</property>
+    <property name="type-hint">dialog</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="GtkImage" id="imgInfo">
+          <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>
-            <property name="margin-top">6</property>
+            <child>
-            <property name="margin-bottom">6</property>
+              <object class="GtkImage">
-            <property name="stock">gtk-dialog-warning</property>
+                <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">0</property>
+            <property name="position">1</property>
           </packing>
         </child>
         <child>
-          <object class="GtkLabel" id="lblWarning">
+          <object class="GtkButton" id="btnMessClose">
+            <property name="label" translatable="yes">OK</property>
             <property name="visible">True</property>
-            <property name="can-focus">False</property>
+            <property name="can-focus">True</property>
-            <property name="halign">start</property>
+            <property name="receives-default">True</property>
-            <property name="valign">center</property>
+            <property name="margin-left">5</property>
-            <property name="margin-left">6</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-top">3</property>
-            <property name="margin-bottom">6</property>
+            <property name="margin-bottom">3</property>
-            <property name="label" translatable="yes">Warning!</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-              <attribute name="foreground" value="#000000000000"/>
-            </attributes>
           </object>
           <packing>
-            <property name="expand">True</property>
+            <property name="expand">False</property>
             <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkWindow" id="mess_sudo">
+    <property name="can-focus">False</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="GtkButton" id="btnWarngingClose">
+          <object class="GtkBox">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="receives-default">True</property>
+            <property name="margin-left">5</property>
-            <property name="relief">none</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="GtkImage" id="imageCloseInfo">
+              <object class="GtkLabel" id="lblMessageSudo">
+                <property name="width-request">160</property>
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="stock">gtk-remove</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="pack-type">end</property>
+            <property name="position">1</property>
-            <property name="position">3</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>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">0</property>
-      </packing>
     </child>
   </object>
-  <object class="GtkMenu" id="menu1">
+  <object class="GtkPopover" id="popAbout">
-    <property name="visible">True</property>
     <property name="can-focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="btnSaveLocal">
+      <object class="GtkFrame">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="label" translatable="yes">Save Local</property>
-        <property name="use-underline">True</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="btnSaveGlobl">
         <property name="visible">True</property>
         <property name="can-focus">False</property>
-        <property name="label" translatable="yes">Save Global</property>
+        <property name="label-xalign">0</property>
-        <property name="use-underline">True</property>
+        <property name="shadow-type">none</property>
+        <child>
+          <object class="GtkAlignment">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="top-padding">5</property>
+            <property name="bottom-padding">5</property>
+            <property name="left-padding">5</property>
+            <property name="right-padding">5</property>
+            <child>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkButton" id="btnSynopsis">
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">True</property>
+                    <property name="hexpand">True</property>
+                    <child>
+                      <object class="GtkLabel" id="lblSynopsis">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="halign">start</property>
+                        <property name="label" translatable="yes">Synopsis</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="btnAbout">
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">True</property>
+                    <child>
+                      <object class="GtkLabel" id="lblAbout">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="halign">start</property>
+                        <property name="label" translatable="yes">About the program</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child type="label_item">
+          <placeholder/>
+        </child>
       </object>
     </child>
   </object>
-  <object class="GtkMenu" id="menu2">
+  <object class="GtkPopover" id="popDownloadMenu">
-    <property name="visible">True</property>
     <property name="can-focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="btnDownloadGlobal">
+      <object class="GtkFrame">
         <property name="visible">True</property>
         <property name="can-focus">False</property>
-        <property name="label" translatable="yes">Download Global</property>
+        <property name="label-xalign">0</property>
-        <property name="use-underline">True</property>
+        <property name="shadow-type">none</property>
+        <child>
+          <object class="GtkAlignment">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="top-padding">5</property>
+            <property name="bottom-padding">5</property>
+            <property name="left-padding">5</property>
+            <property name="right-padding">5</property>
+            <child>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkButton" id="btnDonwlodLocal">
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">True</property>
+                    <child>
+                      <object class="GtkLabel" id="lblDonwlodLocal">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="halign">start</property>
+                        <property name="label" translatable="yes">Download local</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="btnDonwlolGlob">
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">True</property>
+                    <property name="halign">start</property>
+                    <child>
+                      <object class="GtkLabel" id="lblDonwlolGlob">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="halign">start</property>
+                        <property name="label" translatable="yes">Download global</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child type="label_item">
+          <placeholder/>
+        </child>
       </object>
     </child>
   </object>
-  <object class="GtkMenu" id="menu3">
+  <object class="GtkPopover" id="popSaveMenu">
-    <property name="visible">True</property>
     <property name="can-focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="btnSynopsis">
+      <object class="GtkFrame">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="label" translatable="yes">Synopsis</property>
-        <property name="use-underline">True</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="aboutProgram">
         <property name="visible">True</property>
         <property name="can-focus">False</property>
-        <property name="label" translatable="yes">About the program</property>
+        <property name="label-xalign">0</property>
-        <property name="use-underline">True</property>
+        <property name="shadow-type">none</property>
+        <child>
+          <object class="GtkAlignment">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="top-padding">5</property>
+            <property name="bottom-padding">5</property>
+            <property name="left-padding">5</property>
+            <property name="right-padding">5</property>
+            <child>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkButton" id="btnSaveLocalGlob">
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">True</property>
+                    <child>
+                      <object class="GtkLabel" id="lblSaveLocalGlob">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="halign">start</property>
+                        <property name="label" translatable="yes">Save to global and local configuration</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="btnSaveLocal">
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">True</property>
+                    <child>
+                      <object class="GtkLabel" id="lblSaveLocal">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="halign">start</property>
+                        <property name="label" translatable="yes">Save to local configuration</property>
+                      </object>
+                    </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="btnSaveGlob">
+                    <property name="visible">True</property>
+                    <property name="can-focus">True</property>
+                    <property name="receives-default">True</property>
+                    <child>
+                      <object class="GtkLabel" id="lblSaveGlob">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="halign">start</property>
+                        <property name="label" translatable="yes">Save to Global configuration</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child type="label_item">
+          <placeholder/>
+        </child>
       </object>
     </child>
   </object>
   <object class="GtkWindow" id="window">
     <property name="can-focus">False</property>
     <child>
-      <object class="GtkOverlay" id="orevrlayInfo">
+      <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" id="plugBox">
+          <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">gtk-missing-image</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>
@@ -288,7 +618,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">0</property>
+                <property name="position">1</property>
               </packing>
             </child>
             <child>
@@ -443,9 +773,9 @@ Format: DD.MM.YYYY</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">5</property>
+                                    <property name="margin-right">10</property>
                                     <property name="margin-start">5</property>
-                                    <property name="margin-end">7</property>
+                                    <property name="margin-end">10</property>
                                     <property name="margin-top">6</property>
                                     <property name="margin-bottom">6</property>
                                     <child>
@@ -478,7 +808,7 @@ Format: DD.MM.YYYY</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-left">7</property>
                                     <property name="margin-right">5</property>
                                     <property name="margin-start">7</property>
                                     <property name="margin-end">5</property>
@@ -559,7 +889,7 @@ Format: DD.MM.YYYY</property>
                                     <property name="margin-left">5</property>
                                     <property name="margin-right">10</property>
                                     <property name="margin-start">5</property>
-                                    <property name="margin-end">5</property>
+                                    <property name="margin-end">10</property>
                                     <property name="margin-top">6</property>
                                     <property name="margin-bottom">6</property>
                                     <child>
@@ -707,9 +1037,9 @@ Format: DD.MM.YYYY</property>
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
                     <property name="margin-left">5</property>
-                    <property name="margin-right">10</property>
+                    <property name="margin-right">5</property>
                     <property name="margin-start">5</property>
-                    <property name="margin-end">10</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>
@@ -756,7 +1086,7 @@ Format: DD.MM.YYYY</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="margin-bottom">10</property>
                             <property name="hexpand">False</property>
                             <property name="vexpand">False</property>
                           </object>
@@ -794,7 +1124,7 @@ Format: DD.MM.YYYY</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="margin-bottom">10</property>
                             <property name="hexpand">False</property>
                             <property name="vexpand">False</property>
                           </object>
@@ -847,12 +1177,14 @@ Format: DD.MM.YYYY</property>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">1</property>
+                <property name="position">2</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="index">-1</property>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </object>
@@ -885,13 +1217,15 @@ Format: DD.MM.YYYY</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>
+                <property name="draw-indicator">True</property>
+                <property name="direction">none</property>
+                <property name="popover">popDownloadMenu</property>
                 <child>
                   <object class="GtkBox">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
                     <child>
-                      <object class="GtkImage">
+                      <object class="GtkLabel" id="lblDownload">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
                         <property name="margin-left">5</property>
@@ -900,7 +1234,7 @@ Format: DD.MM.YYYY</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>
+                        <property name="label" translatable="yes">Download</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -909,16 +1243,16 @@ Format: DD.MM.YYYY</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="lblDownload">
+                      <object class="GtkMenuButton">
                         <property name="visible">True</property>
-                        <property name="can-focus">False</property>
+                        <property name="sensitive">False</property>
-                        <property name="margin-left">5</property>
+                        <property name="can-focus">True</property>
-                        <property name="margin-right">5</property>
+                        <property name="focus-on-click">False</property>
-                        <property name="margin-start">5</property>
+                        <property name="receives-default">True</property>
-                        <property name="margin-end">5</property>
+                        <property name="use-popover">False</property>
-                        <property name="margin-top">6</property>
+                        <child>
-                        <property name="margin-bottom">6</property>
+                          <placeholder/>
-                        <property name="label" translatable="yes">Download</property>
+                        </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -928,9 +1262,6 @@ Format: DD.MM.YYYY</property>
                     </child>
                   </object>
                 </child>
-                <style>
-                  <class name="toolbar"/>
-                </style>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -956,13 +1287,15 @@ Format: DD.MM.YYYY</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>
+                <property name="draw-indicator">True</property>
+                <property name="direction">none</property>
+                <property name="popover">popSaveMenu</property>
                 <child>
                   <object class="GtkBox">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
                     <child>
-                      <object class="GtkImage">
+                      <object class="GtkLabel" id="lblSave">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
                         <property name="margin-left">5</property>
@@ -971,7 +1304,10 @@ Format: DD.MM.YYYY</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>
+                        <property name="label" translatable="yes">Save</property>
+                        <style>
+                          <class name="toolbar"/>
+                        </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -980,16 +1316,15 @@ Format: DD.MM.YYYY</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="lblSave">
+                      <object class="GtkMenuButton">
                         <property name="visible">True</property>
-                        <property name="can-focus">False</property>
+                        <property name="sensitive">False</property>
-                        <property name="margin-left">5</property>
+                        <property name="can-focus">True</property>
-                        <property name="margin-right">5</property>
+                        <property name="focus-on-click">False</property>
-                        <property name="margin-start">5</property>
+                        <property name="receives-default">True</property>
-                        <property name="margin-end">5</property>
+                        <child>
-                        <property name="margin-top">6</property>
+                          <placeholder/>
-                        <property name="margin-bottom">6</property>
+                        </child>
-                        <property name="label" translatable="yes">Save</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -999,9 +1334,6 @@ Format: DD.MM.YYYY</property>
                     </child>
                   </object>
                 </child>
-                <style>
-                  <class name="toolbar"/>
-                </style>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -1015,19 +1347,11 @@ Format: DD.MM.YYYY</property>
                 <property name="can-focus">True</property>
                 <property name="focus-on-click">False</property>
                 <property name="receives-default">True</property>
-                <property name="popup">menu3</property>
+                <property name="draw-indicator">True</property>
+                <property name="direction">none</property>
+                <property name="popover">popAbout</property>
                 <child>
-                  <object class="GtkImage">
+                  <placeholder/>
-                    <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">gtk-execute</property>
-                  </object>
                 </child>
               </object>
               <packing>
@@ -1071,171 +1395,4 @@ Format: DD.MM.YYYY</property>
       </object>
     </child>
   </object>
-  <object class="GtkWindow" id="mess_dchp">
-    <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="mess_sudo">
-    <property name="can-focus">False</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>

ubl-settings-datetime_ru.po

@@ -52,6 +52,12 @@ msgstr "OK"
 msgid "Setting the date and time"
 msgstr "Настройка даты времени"
 
+msgid "Successfully saved local and global configuration"
+msgstr "Успешно сохранена локальная и глобальная конфигурация"
+
+msgid "Error saved local and global configuration"
+msgstr "Ошибка сохранена локальной и глобальной конфигурации"
+
 msgid "Settings the date and time"
 msgstr "Настройки даты и времени"
 
@@ -1642,10 +1648,13 @@ msgstr "Опции:\n"
 msgid "Save"
 msgstr "Сохранить"
 
-msgid "Save global"
+msgid "Save to global and local configuration"
+msgstr "Сохранить в глобальную и локальную конфигурацию"
+
+msgid "Save to Global configuration"
 msgstr "Сохранить в глобальную конфигурацию"
 
-msgid "Save local"
+msgid "Save to local configuration"
 msgstr "Сохранить в локальную конфигурацию"
 
 msgid "Download global"

warning.svg

@@ -50,6 +50,6 @@
      inkscape:window-maximized="1" />
   <path
      id="path4136-2"
-     style="opacity:1;fill:#ffffff;fill-opacity:1"
+     style="opacity:1;fill:#4d4d4d;fill-opacity:1"
      d="M 11.292969 1.0234375 A 11 11.000002 86.311656 0 0 1.0234375 12.707031 A 11 11.000002 86.311656 0 0 12.707031 22.976562 A 11 11.000002 86.311656 0 0 22.976562 11.292969 A 11 11.000002 86.311656 0 0 11.292969 1.0234375 z M 11.996094 6 L 12.003906 6 C 12.556173 6 13 6.4439 13 6.9960938 L 13 14.003906 C 13 14.556325 12.556173 15 12.003906 15 L 11.996094 15 C 11.443827 15 11 14.556325 11 14.003906 L 11 6.9960938 C 11 6.4439 11.443827 6 11.996094 6 z M 12 17 C 12.554 17 13 17.446 13 18 C 13 18.554 12.554 19 12 19 C 11.446 19 11 18.554 11 18 C 11 17.446 11.446 17 12 17 z " />
 </svg>