diff --git a/source/main.cc b/source/main.cc index 2363a00..ec8c69f 100644 --- a/source/main.cc +++ b/source/main.cc @@ -1,22 +1,6 @@ #include -#include -#include -#include #include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include "ubl-settings-datetime.h" int main(int argc, char* argv[]) { diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index 3bc6bcf..f64cccc 100644 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -625,14 +625,12 @@ void MainWindow::append_zone(){ Glib::ustring text = cbRegion->get_active_text(); string zone_mixing=""; string path_dir=""; - if(!(text.empty())){ str_region = text; for (const auto &_str_zone : time_reg_map.at(str_region)){ path_dir=str_region+"/"+_str_zone; zone_mixing = this->zone_file_read(path_dir) + string(gettext(_str_zone.c_str())); cbZone->append(zone_mixing); - //cbZone->append(_str_zone); } } } @@ -649,7 +647,6 @@ void MainWindow::append_zone_glob(){ path_dir=str_region+"/"+_str_zone; zone_mixing = this->zone_file_read(path_dir) + string(gettext(_str_zone.c_str())); cbZoneGlob->append(zone_mixing); - //cbZoneGlob->append(_str_zone); } } } @@ -780,7 +777,7 @@ void MainWindow::read_file(){ if (key_reg!="Etc"){ if (key_reg!="right"){ vector zone; - zone.push_back(""); + //zone.push_back(""); for (const auto & entry_zone : fs::directory_iterator(path_dir)){ std::ifstream in1(entry_zone.path()); // окрываем файл для чтения if (in1.is_open()){ @@ -802,6 +799,10 @@ void MainWindow::read_file(){ } string MainWindow::zone_file_read(string zone){ + + if (zone.length()==1){ + return ""; + } UErrorCode success = U_ZERO_ERROR; UDate curDate; int32_t stdOffset,dstOffset; diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h index 33abbd2..144e45b 100644 --- a/source/ubl-settings-datetime.h +++ b/source/ubl-settings-datetime.h @@ -1,36 +1,16 @@ #ifndef UBL_SETTINGS_DATETIME_H #define UBL_SETTINGS_DATETIME_H #include -#include -#include -#include #include -#include #include -#include #include -#include #include #include -#include -#include #include -#include #include #include -#include -#include -#include -#include -#include -#include -#include -#include "unicode/utypes.h" -#include "unicode/utext.h" -#include -#include -#include + using namespace std; extern string path_app;