diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index a17cad5..a64c36e 100644 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -95,7 +95,7 @@ void MainWindow::lacalization(){ this->set_title(gettext("ubl-settings-datetime")); _mess_dchp->set_title(gettext("Warning!")); _lblTimeBios->set_text(gettext("Synchronize hardware time")); - _lblSynchronizebChk->set_text(gettext("Synchronize via NTP")); + //_lblSynchronizebChk->set_text(gettext("Synchronize via NTP")); } void MainWindow::flag_block_gui(){ @@ -112,7 +112,7 @@ void MainWindow::flag_block_gui(){ _btnHardwareTime->set_sensitive(false); _lblTime->set_sensitive(false); _lblData->set_sensitive(false); - //_cbxSynchronizeNtp->set_sensitive(false); + //_cbxSynchronizeNtpGlob->set_sensitive(false); } if (flag_timezone==true){ _cbRegion->set_sensitive(false); @@ -126,11 +126,10 @@ void MainWindow::flag_block_gui(){ _cbxSynchronizeNtpGlob->set_sensitive(false); _cbDhcp->set_sensitive(false); _txtNtpServer->set_sensitive(false); - _cbxSynchronizeNtp->set_sensitive(false); } if (flag_update==true){ _lblDateTimeSettingGlob->set_sensitive(false); - _lblSynchronizebChkGLob->set_sensitive(false); + //_lblSynchronizebChkGLob->set_sensitive(false); _cbxSynchronizeNtpGlob->set_sensitive(false); _lblTimeZoneGlob->set_sensitive(false); _lblRegGlob->set_sensitive(false); @@ -155,6 +154,7 @@ void MainWindow::add_CSS(){ } void MainWindow::get_builder(){ + builder->set_translation_domain(path_app); builder->get_widget("boxColor", _boxColor); builder->get_widget("btnUpdateDateTime", _btnUpdateDateTime); builder->get_widget("btnChooseDate", _btnChooseDate); @@ -183,19 +183,19 @@ void MainWindow::get_builder(){ builder->get_widget("lblRegGlob",_lblRegGlob); builder->get_widget("lblZone1Glob",_lblZone1Glob); builder->get_widget("lblTimeZoneGlob",_lblTimeZoneGlob); - builder->get_widget("lblSynchronizebChk",_lblSynchronizebChk); + //builder->get_widget("lblSynchronizebChk",_lblSynchronizebChk); builder->get_widget("lblSynchronizebChkGLob",_lblSynchronizebChkGLob); builder->get_widget("lblSynchronizeBtn",_lblSynchronizeBtn); builder->get_widget("lblDateTimeSettingGlob",_lblDateTimeSettingGlob); builder->get_widget("lblTimeBios",_lblTimeBios); builder->get_widget("btnHardwareTime",_btnHardwareTime); - builder->get_widget("cbxSynchronizeNtp",_cbxSynchronizeNtp); + //builder->get_widget("cbxSynchronizeNtp",_cbxSynchronizeNtp); this->add_CSS(); } void MainWindow::event(){ - _cbxSynchronizeNtp->signal_toggled().connect(sigc::mem_fun(*this, &MainWindow::set_ntp_toggle)); + //_cbxSynchronizeNtpGlob->signal_toggled().connect(sigc::mem_fun(*this, &MainWindow::set_ntp_toggle)); _btnHardwareTime->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::hardware_clock)); _btnMessClose->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::gui_mess_close)); //_cldrDate->signal_day_selected().connect(sigc::mem_fun(*this, &MainWindow::get_calendar)); @@ -212,7 +212,7 @@ void MainWindow::event(){ } void MainWindow::set_ntp_toggle(){ - bool flag = _cbxSynchronizeNtp->get_active(); + bool flag = _cbxSynchronizeNtpGlob->get_active(); if (flag_ntp==true || flag_datetime==true){ } else { @@ -263,8 +263,6 @@ bool MainWindow::focus_ntp(GdkEventFocus* event){ void MainWindow::event_entry_cbDhcp(){ Glib::ustring str_dhcp = _cbDhcp->get_active_text(); - int index_activ = _cbDhcp->get_entry_text_column(); - cout << index_activ << endl; if (str_dhcp.length()!=0){ if (str_dhcp=="DHCP"){ string cmd = "/usr/bin/ubconfig set network NTPSERVERS=dhcp"; @@ -372,7 +370,7 @@ void MainWindow::get_config(){ this->enry_dhcp_mess(); string str_ntp = this->call("systemctl status ntpd.service systemd-timesyncd.service | grep \"Active: active\""); if (str_ntp.length()<50) { - _cbxSynchronizeNtp->set_active(false); + _cbxSynchronizeNtpGlob->set_active(false); _numTimeHrs->set_sensitive(true); _numTimeMin->set_sensitive(true); _btnChooseDate->set_sensitive(true); @@ -380,7 +378,7 @@ void MainWindow::get_config(){ _lblTimeBios->set_sensitive(true); } else{ - _cbxSynchronizeNtp->set_active(true); + _cbxSynchronizeNtpGlob->set_active(true); _numTimeHrs->set_sensitive(false); _numTimeMin->set_sensitive(false); _btnChooseDate->set_sensitive(false); @@ -388,7 +386,7 @@ void MainWindow::get_config(){ _lblTimeBios->set_sensitive(false); } string read_reg_zon_cfg = this->call("/usr/bin/ubconfig get clock ZONE"); - if ((read_reg_zon_cfg != "") && (read_reg_zon_cfg !="(null)")){ + if ((read_reg_zon_cfg != "") && (strstr(read_reg_zon_cfg.c_str() ,"(null)")==NULL)){ read_reg_zon_cfg = read_reg_zon_cfg.substr(read_reg_zon_cfg.find("=")+1,read_reg_zon_cfg.length()); read_reg_zon_cfg = read_reg_zon_cfg.substr(0,read_reg_zon_cfg.find("\n")); string str_filling_reg = read_reg_zon_cfg.substr(0,read_reg_zon_cfg.find("/")); @@ -398,7 +396,7 @@ void MainWindow::get_config(){ this->append_region_zone(str_filling_reg,str_filling_zon); } else { - this->append_region_zone("Asia","Omsk"); + this->append_region_zone("Africa","Abidjan"); } } @@ -432,9 +430,8 @@ void MainWindow::enter_zone_glob(){ Glib::ustring zone_text = _cbZoneGlob->get_active_text(); Glib::ustring reg_text = _cbRegionGlob->get_active_text(); if(!(zone_text.empty()) && !(reg_text.empty())){ - str_zoneGlob = zone_text.substr(zone_text.find(") ")+2,zone_text.length()); - str_region_glob = reg_text; - string cmd = "/usr/bin/ubconfig set clock ZONE=" +str_region_glob +"/" + str_zoneGlob; + //str_zoneGlob = zone_text.substr(zone_text.find(") ")+2,zone_text.length()); + string cmd = "/usr/bin/ubconfig set clock ZONE=" +reg_text +"/" + zone_text; system(cmd.c_str()); } else{ @@ -444,6 +441,7 @@ void MainWindow::enter_zone_glob(){ } void MainWindow::set_ntp_toggle_glob(){ + this->set_ntp_toggle(); bool flag = _cbxSynchronizeNtpGlob->get_active(); if (flag==false){ system("/usr/bin/ubconfig remove network NTPSERVERS"); @@ -469,13 +467,12 @@ void MainWindow::append_region_zone(string region, string zone){ index+=1; } index = 0; - string cheek_zone = ""; + cout << zone; for (const auto &_str_zone : time_reg_map.at(region)){ _cbZone->append(_str_zone); _cbZoneGlob->append(_str_zone); if (_str_zone!=""){ - cheek_zone = _str_zone.substr(_str_zone.find(") ")+2,_str_zone.length()); - if (cheek_zone == zone){ + if (_str_zone == zone){ _cbZone->set_active(index); _cbZoneGlob->set_active(index); } @@ -529,7 +526,7 @@ void MainWindow::append_zone_glob(){ void MainWindow::update_time_date(){ //this->enter_zone(); - bool flag = _cbxSynchronizeNtp->get_active(); + bool flag = _cbxSynchronizeNtpGlob->get_active(); string cmd = ""; if ((year!=0) && (month !=0) && (day !=0)){ string str_month = ""; @@ -692,5 +689,4 @@ void help(){ g_print(" --lock-ntp Disable ntp field editing\n"); g_print(" --lock-datetime Disable datetime field editing\n"); g_print(" --lock-update Disable save changes\n"); - cout << "Параметры командной строки --lock-datetime\n --lock-timezone\n --lock-ntp\n --lock-update\n" << endl; } \ No newline at end of file diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade index ae6f203..f7021fe 100644 --- a/ubl-settings-datetime.glade +++ b/ubl-settings-datetime.glade @@ -129,7 +129,7 @@ 255 True False - Настройки даты и времени + Date and time settings @@ -205,38 +205,6 @@ 5 5 vertical - - - True - True - False - 5 - 5 - 5 - 6 - 6 - True - - - 145 - True - False - 5 - 5 - 5 - 5 - 6 - 6 - Синхронизировать через NTP - - - - - False - True - 0 - - True @@ -251,7 +219,7 @@ 5 6 6 - Время + Time True 0 @@ -333,7 +301,7 @@ 5 6 6 - Дата + Date True 0 @@ -348,8 +316,8 @@ 191 True True - Дата -Формат: ДД.ММ.ГГГГ + Date +Format: DD.MM.YYYY 5 5 5 @@ -439,7 +407,7 @@ False center center - Синхронизировать + Sync by False @@ -495,7 +463,7 @@ False center center - Синхронизировать аппаратное время + Synchronize hardware time @@ -542,13 +510,12 @@ True False - Регион 5 5 5 5 8 - Регион + Region 0 @@ -577,13 +544,12 @@ True False - Зона 5 5 10 5 8 - Зона + Area 0 @@ -637,7 +603,7 @@ True False - Часовой пояс + Time Zone @@ -653,7 +619,7 @@ True False - Локальная настройка + Local Configuration @@ -712,7 +678,7 @@ True False - Синхронизировать через NTP + Synchronize via NTP @@ -794,7 +760,7 @@ 5 5 8 - Регион + Region 0 @@ -828,7 +794,7 @@ 10 5 8 - Зона + Area 0 @@ -891,7 +857,7 @@ True False - Глобальная настройка + Global customization