diff --git a/#ubl-settings-datetime.glade# b/#ubl-settings-datetime.glade#
deleted file mode 100644
index d46c97a..0000000
--- a/#ubl-settings-datetime.glade#
+++ /dev/null
@@ -1,820 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc
index f89be15..cf7db5e 100644
--- a/source/ubl-settings-datetime.cc
+++ b/source/ubl-settings-datetime.cc
@@ -75,6 +75,7 @@ void MainWindow::settings(){
this->parse_text_date();
}
void MainWindow::lacalization(){
+
_txtDate->set_tooltip_text(gettext("Date of\nFormat: DD.MM.YYYY"));
_lblSynchronizebChk->set_text(gettext("Synchronize via NTP"));
_cbDhcp->append(gettext("DHCP"));
@@ -93,21 +94,23 @@ void MainWindow::lacalization(){
_lblDateTimeSettingGlob->set_text(gettext("Setting date and time in global configuration"));
this->set_title(gettext("ubl-settings-datetime"));
_mess_dchp->set_title(gettext("Warning!"));
+ _lblTimeBios->set_text(gettext("Synchronize hardware time"));
+ _lblTimeBiosGlob->set_text(gettext("Synchronize hardware time"));
}
void MainWindow::flag_block_gui(){
if (flag_datetime==true){
- _numTimeHrs->set_sensitive(false);
- _numTimeMin->set_sensitive(false);
- _txtDate->set_sensitive(false);
- _btnChooseDate->set_sensitive(false);
+ //_numTimeHrs->set_sensitive(false);
+ //_numTimeMin->set_sensitive(false);
+ //_txtDate->set_sensitive(false);
+ _btnUpdateDateTime->set_sensitive(false);
}
if (flag_timezone==true){
_cbRegion->set_sensitive(false);
_cbZone->set_sensitive(false);
_cbRegionGlob->set_sensitive(false);
_cbZoneGlob->set_sensitive(false);
- _btnChooseDate->set_sensitive(false);
+ //_btnChooseDate->set_sensitive(false);
_cbDhcp->set_sensitive(false);
}
if (flag_ntp==true){
@@ -116,7 +119,15 @@ void MainWindow::flag_block_gui(){
_txtNtpServer->set_sensitive(false);
}
if (flag_update==true){
- _btnUpdateDateTime->set_sensitive(false);
+ _lblDateTimeSettingGlob->set_sensitive(false);
+ _lblSynchronizebChk->set_sensitive(false);
+ _cbxSynchronizeNtp->set_sensitive(false);
+ _lblTimeZoneGlob->set_sensitive(false);
+ _lblRegGlob->set_sensitive(false);
+ _cbRegionGlob->set_sensitive(false);
+ _lblZone1Glob->set_sensitive(false);
+ _cbZoneGlob->set_sensitive(false);
+ _txtNtpServer->set_sensitive(false);
}
}
@@ -162,6 +173,11 @@ void MainWindow::get_builder(){
builder->get_widget("lblSynchronizebChk",_lblSynchronizebChk);
builder->get_widget("lblSynchronizeBtn",_lblSynchronizeBtn);
builder->get_widget("lblDateTimeSettingGlob",_lblDateTimeSettingGlob);
+ builder->get_widget("lblTimeBios",_lblTimeBios);
+ builder->get_widget("lblTimeBiosGlob",_lblTimeBiosGlob);
+
+
+
this->add_CSS();
}
@@ -458,7 +474,7 @@ void MainWindow::append_zone_glob(){
}
void MainWindow::update_time_date(){
- this->enter_zone();
+ //this->enter_zone();
bool flag = _cbxSynchronizeNtp->get_active();
string cmd = "";
if ((year!=0) && (month !=0) && (day !=0)){
@@ -484,8 +500,8 @@ void MainWindow::update_time_date(){
cmd = "date +%Y%m%d -s \"" + to_string(year)+
str_month+str_day+"\"";
system(cmd.c_str());
- cmd = "hwclock --systohc";
- system(cmd.c_str());
+ //cmd = "hwclock --systohc";
+ //system(cmd.c_str());
_txtDate->set_text(str_data);
year=0;
month=0;
diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h
index 60b5e11..7d34d73 100644
--- a/source/ubl-settings-datetime.h
+++ b/source/ubl-settings-datetime.h
@@ -107,6 +107,8 @@ class MainWindow : public Gtk::ApplicationWindow {
Gtk::Label *_lblSynchronizebChk;
Gtk::Label *_lblSynchronizeBtn;
Gtk::Label *_lblDateTimeSettingGlob;
+ Gtk::Label *_lblTimeBios;
+ Gtk::Label *_lblTimeBiosGlob;
std::map > time_reg_map;
unsigned int year=0;
unsigned int month=0;
diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade
index 46cce72..e7ac7c2 100644
--- a/ubl-settings-datetime.glade
+++ b/ubl-settings-datetime.glade
@@ -79,6 +79,29 @@
+
@@ -767,6 +865,66 @@
1
+
+
+
+ False
+ True
+ 2
+
+
@@ -793,27 +951,4 @@
-
diff --git a/ubl-settings-datetime_ru.po b/ubl-settings-datetime_ru.po
index fdf671c..a9bbf62 100644
--- a/ubl-settings-datetime_ru.po
+++ b/ubl-settings-datetime_ru.po
@@ -72,5 +72,8 @@ msgstr "Настройка даты и времени в глобальной к
msgid "Incorrect date format"
msgstr "Не верный формат даты"
+msgid "Synchronize hardware time"
+msgstr "Синхронизировать аппаратное время"
+
msgid "Warning!"
msgstr "Внимание!"