From 3095b62e04ca779560b84023dd41df18787f64b4 Mon Sep 17 00:00:00 2001
From: Igor Belitskiy <goga.belitskiy.00@mail.eu>
Date: Wed, 15 Feb 2023 16:26:39 +0600
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=D0=B0=20=D1=81=D0=BE=D1=80=D1=82=D0=B8=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=BA=D0=B0=20=D1=80=D0=B5=D0=B3=D0=B8=D0=BE=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=B2,=20=D1=83=D0=B1=D1=80=D0=B0=D0=BD=D1=8B=20=D0=B7=D0=B0?=
 =?UTF-8?q?=D0=B3=D0=BE=D0=BB=D0=BE=D0=B2=D0=BE=D1=87=D0=BD=D1=8B=D0=B5=20?=
 =?UTF-8?q?=D1=84=D0=B0=D0=B9=D0=BB=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/ubl-settings-datetime.cc | 47 +++++++++++----------------------
 source/ubl-settings-datetime.h  | 17 +-----------
 2 files changed, 16 insertions(+), 48 deletions(-)

diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc
index a3e7edf..20fdde2 100644
--- a/source/ubl-settings-datetime.cc
+++ b/source/ubl-settings-datetime.cc
@@ -1,36 +1,18 @@
 #include <gtkmm/window.h>
-#include <stddef.h>
-#include <cstddef>
-#include <cstdlib>
-#include <iostream>
-#include <memory>
+#include <glibmm/i18n.h>
+#include <gtkmm/plug.h>
+#include <gtkmm/stock.h>
 #include <gtkmm.h>
-#include <ostream>
+#include <iostream>
+#include <map>
 #include <string>
-#include <ctime>
+#include <array>
 #include <vector>
-#include <map>
 #include <fstream>
 #include <filesystem>
-#include <glibmm/i18n.h>
 #include <stdio.h>
-#include <gtkmm/plug.h>
-#include <gtkmm/stock.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <stdio.h>
-#include <string>
-#include <sstream>
-#include <vector>
-#include <unicode/unistr.h>
-#include <unicode/ustdio.h>
-#include <unicode/uloc.h>
-#include <unicode/uldnames.h>
-#include "unicode/utypes.h"
-#include "unicode/utext.h"
 #include <unicode/timezone.h>
 #include <unicode/calendar.h>
-#include <array>
 #include "ubl-settings-datetime.h"
 using namespace std;
 
@@ -687,16 +669,17 @@ void MainWindow::append_region_zone(string region, string zone, Gtk::ComboBoxTex
     }
     // Cортировка пузырьком 
     if (size_vec==0){
+        size_vec = array_region_local.size();
         for (int i = 0; i < size_vec; i++) {
             for (int j = 0; j < size_vec-1; j++) {
-            if (array_region_local[j] > array_region_local[j + 1]) {
-                auto b = array_region_local[j];
-                array_region_local[j] = array_region_local[j + 1];
-                array_region_local[j + 1] = b;
-                b = array_region[j]; 
-                array_region[j] = array_region[j + 1];
-                array_region[j + 1] = b;
-                }
+                if (array_region_local[j] > array_region_local[j + 1]) {
+                    auto b = array_region_local[j];
+                    array_region_local[j] = array_region_local[j + 1];
+                    array_region_local[j + 1] = b;
+                    b = array_region[j]; 
+                    array_region[j] = array_region[j + 1];
+                    array_region[j + 1] = b;
+                    }
             }
         }
     }
diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h
index 4a5ef20..c1572ab 100644
--- a/source/ubl-settings-datetime.h
+++ b/source/ubl-settings-datetime.h
@@ -100,22 +100,7 @@ class MainWindow : public Gtk::ApplicationWindow {
             int error;
         };
         vector<string> array_region_local;
-        vector<string> array_region;/*={
-            "America",
-            "Antarctica",
-            "Arctic",
-            "Asia",
-            "Africa",
-            "Etc",
-            "Atlantic",
-            "Australia",
-            "Brazil",
-            "Canada",
-            "Chile",
-            "Europe",
-            "Indian",
-            "Mexico",
-            "US"};*/
+        vector<string> array_region;
     public:
         MainWindow(BaseObjectType* obj, Glib::RefPtr<Gtk::Builder> const& builder);
         MainWindow(Glib::RefPtr<Gtk::Builder> const& builder);