Изменён дизайн кнопок

source/ubl-settings-datetime.cc

@@ -56,15 +56,15 @@ void MainWindow::settings(){
     Gtk::Widget *plugBox;
     Gtk::Window *window;
     Gtk::Widget *boxButton;
-    Gtk::Widget *btnSave;
+    Gtk::Widget *boxSave;
     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);
+    builder->get_widget("boxSave",boxSave);
     
     
-    ubl_make_plugs(boxButton,btnSave, socket_ext_id_I, socket_trd_id_I);
+    ubl_make_plugs(boxButton,boxSave, socket_ext_id_I, socket_trd_id_I);
     year=0, month=0, day=0;
     this->get_builder();
     this->lacalization();
@@ -80,7 +80,6 @@ void MainWindow::settings(){
         this->parse_text_date();
         btnSaveGlobl->set_sensitive(false);
         this->download_local_cfg(); 
-        
     }
     else{
         btnSaveLocal->set_sensitive(false);
@@ -107,7 +106,19 @@ void MainWindow::settings(){
         btnBoxAboutDialog->set_visible(false);
         this->event();
         
+
     }
+    //popCalendar->show_all();
+
+}
+
+bool MainWindow::gui_set_orientation(GdkEventConfigure* event){
+    if (event){}
+    //int w;
+    //w = this->get_width();
+    //popWarning->set_default_widget(w);
+    return false;
+
 }
 
 int MainWindow::check_root(){
@@ -248,7 +259,8 @@ void MainWindow::get_builder(){
     builder->get_widget("btnSettings", btnSettings);
     builder->get_widget("aboutWindows", aboutWindows);
     builder->get_widget("btnBoxAboutDialog", btnBoxAboutDialog);
-    //builder->get_widget("cbxSynchronizeNtp",cbxSynchronizeNtp);
+
+    
     this->add_CSS();
 }
 void MainWindow::gui_exit(){
@@ -279,6 +291,7 @@ void MainWindow::event(){
     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));
+    signal_configure_event().connect(sigc::mem_fun(*this, &MainWindow::gui_set_orientation), false);
 }
 
 void MainWindow::about_Dialog_show(){
@@ -975,9 +988,24 @@ void MainWindow::read_file(){
                 std::ifstream in1(entry_zone.path()); // окрываем файл для чтения
                 if (in1.is_open()){
                     string key_zone = entry_zone.path().filename().string();
-                    if (key_zone.length()!=0 || key_zone!=" "){
+
+                    if (fs::is_directory(path_dir+"/"+key_zone)){
+                        string reg_reg_zone = path_dir+"/"+key_zone;
+                        for (const auto & entry_reg_reg_zone : fs::directory_iterator(reg_reg_zone)){
+                            std::ifstream in2(entry_zone.path()); // окрываем файл для чтения
+                            if (in2.is_open()){
+                                string reg_reg_zone = entry_reg_reg_zone.path().filename().string();
+                                zone.push_back(reg_reg_zone);
+                                path_reg_zone=key_reg + "/" + reg_reg_zone;
+                                key_zone_local = this->zone_file_read(path_reg_zone) +_(reg_reg_zone.c_str());
+                                zone_local.push_back(key_zone_local);
+                            }
+                            in2.close();
+                        }    
+                    }
+                    else if (key_zone.length()!=0 || key_zone!=" "){
                         zone.push_back(key_zone);
-                        path_reg_zone=key_reg + "/" + key_zone;
+                        path_reg_zone = key_reg + "/" + key_zone;
                         key_zone_local = this->zone_file_read(path_reg_zone) +_(key_zone.c_str());
                         zone_local.push_back(key_zone_local);
                     }

source/ubl-settings-datetime.h

@@ -89,6 +89,7 @@ class MainWindow : public Gtk::ApplicationWindow {
         Gtk::MenuItem *btnSaveLocal;
         Gtk::MenuItem *btnSaveGlobl;
 
+        
         Gtk::MenuItem *btnDownloadGlobal;
         Gtk::MenuItem *btnDownloadlocal;
         Gtk::AboutDialog *aboutWindows;
@@ -162,6 +163,7 @@ class MainWindow : public Gtk::ApplicationWindow {
         void stop_ntp();
         void wind_close_ntp();
         void wrapper_update_time_date();
+        bool gui_set_orientation(GdkEventConfigure* event);
         string zone_file_read(string zone);
         void sort_zone(vector<string> *time_reg_map_local,vector<string> *time_reg_map);
         array<string, 2> split_region_zone(string read_reg_zon_cfg);

ubl-settings-datetime_ru.po

@@ -1660,3 +1660,68 @@ msgstr "Загрузить"
 msgid "Argument not recognized\n"
 msgstr "Нepacпoзнaнный аргумент\n"
 
+msgid "La_Rioja"
+msgstr "Риоха"
+
+msgid "Rio_Gallegos"
+msgstr "Рио-Гальегос"
+
+msgid "Salta"
+msgstr "Сальта"
+
+msgid "San_Juan"
+msgstr "Сан-Хуан"
+
+msgid "San_Luis"
+msgstr "Сан-Луис"
+
+msgid "Tucuman"
+msgstr "Тукуман"
+
+msgid "Ushuaia"
+msgstr "Ушуая"
+
+msgid "Knox"
+msgstr "Ноксвилл"
+
+msgid "Marengo"
+msgstr "Маренго"
+
+msgid "Petersburg"
+msgstr "Петербург"
+
+msgid "Tell_City"
+msgstr "Телл-Сити"
+
+msgid "Vevay"
+msgstr "Вевей"
+
+msgid "Vincennes"
+msgstr "Венсен"
+
+msgid "Winamac"
+msgstr "Winamac"
+
+msgid "Monticello"
+msgstr "Монтиселло"
+
+msgid "Beulah"
+msgstr "Беула"
+
+msgid "Center"
+msgstr "Центр"
+
+msgid "New_Salem"
+msgstr "Нью-Салем"
+
+msgid "Windhoek"
+msgstr "Виндхук"
+
+msgid "Iqaluit"
+msgstr "Икалуит"
+
+msgid "EasterIsland"
+msgstr "Остров Пасхи"
+
+msgid "Andorra"
+msgstr "Андорра"