|
|
|
|
@ -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<string> 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;
|
|
|
|
|
|