Исправлены баги

pull/16/head
Igor Belitskiy 3 years ago
parent 06cceaa6b8
commit 90f957b99e

@ -109,6 +109,7 @@ install: check uninstall
@install -Dm644 -t /usr/share/${PKGNAME}/css/ style.css @install -Dm644 -t /usr/share/${PKGNAME}/css/ style.css
@install -Dm644 -t /usr/share/${PKGNAME}/images/ ${PKGNAME}.svg @install -Dm644 -t /usr/share/${PKGNAME}/images/ ${PKGNAME}.svg
@install -Dm644 -t /usr/share/${PKGNAME}/images/ ${PKGNAME}.png @install -Dm644 -t /usr/share/${PKGNAME}/images/ ${PKGNAME}.png
@install -Dm644 -t /usr/share/${PKGNAME}/images/ bg_top.png
@gtk-update-icon-cache -fiq /usr/share/icons/hicolor/ @gtk-update-icon-cache -fiq /usr/share/icons/hicolor/
@update-desktop-database --quiet 2>/dev/null @update-desktop-database --quiet 2>/dev/null
@touch /usr/share/applications @touch /usr/share/applications

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.2 KiB

@ -77,11 +77,11 @@ void MainWindow::settings(){
void MainWindow::lacalization(){ void MainWindow::lacalization(){
_txtDate->set_tooltip_text(gettext("Date of\nFormat: DD.MM.YYYY")); _txtDate->set_tooltip_text(gettext("Date of\nFormat: DD.MM.YYYY"));
_lblSynchronizebChk->set_text(gettext("Synchronize via NTP")); _lblSynchronizebChkGLob->set_text(gettext("Synchronize via NTP"));
_cbDhcp->append(gettext("DHCP")); _cbDhcp->append(gettext("DHCP"));
_cbDhcp->append(gettext("Manually")); _cbDhcp->append(gettext("Manually"));
_lblDateTimeSetting->set_text(gettext("Settings the date and time")); _lblDateTimeSetting->set_text(gettext("Settings the date and time"));
_lblNtpServer1->set_text(gettext("Settings the date and time")); //_lblNtpServer1->set_text(gettext("Settings the date and time"));
_lblTime->set_text(gettext("Time")); _lblTime->set_text(gettext("Time"));
_lblData->set_text(gettext("Date")); _lblData->set_text(gettext("Date"));
_lblTimeZone->set_text(gettext("Time zone")); _lblTimeZone->set_text(gettext("Time zone"));
@ -90,12 +90,12 @@ void MainWindow::lacalization(){
_lblRegGlob->set_text(gettext("Region")); _lblRegGlob->set_text(gettext("Region"));
_lblZone1Glob->set_text(gettext("Zone")); _lblZone1Glob->set_text(gettext("Zone"));
_lblTimeZoneGlob->set_text(gettext("Time zone")); _lblTimeZoneGlob->set_text(gettext("Time zone"));
_lblSynchronizeBtn->set_text(gettext("Sync by")); _lblSynchronizeBtn->set_text(gettext("Apply local date and time settings"));
_lblDateTimeSettingGlob->set_text(gettext("Setting date and time in global configuration")); _lblDateTimeSettingGlob->set_text(gettext("Setting date and time in global configuration"));
this->set_title(gettext("ubl-settings-datetime")); this->set_title(gettext("ubl-settings-datetime"));
_mess_dchp->set_title(gettext("Warning!")); _mess_dchp->set_title(gettext("Warning!"));
_lblTimeBios->set_text(gettext("Synchronize hardware time")); _lblTimeBios->set_text(gettext("Synchronize hardware time"));
_lblTimeBiosGlob->set_text(gettext("Synchronize hardware time")); _lblSynchronizebChk->set_text(gettext("Synchronize via NTP"));
} }
void MainWindow::flag_block_gui(){ void MainWindow::flag_block_gui(){
@ -114,14 +114,15 @@ void MainWindow::flag_block_gui(){
_cbDhcp->set_sensitive(false); _cbDhcp->set_sensitive(false);
} }
if (flag_ntp==true){ if (flag_ntp==true){
_cbxSynchronizeNtp->set_sensitive(false); _cbxSynchronizeNtpGlob->set_sensitive(false);
_cbDhcp->set_sensitive(false); _cbDhcp->set_sensitive(false);
_txtNtpServer->set_sensitive(false); _txtNtpServer->set_sensitive(false);
_cbxSynchronizeNtp->set_sensitive(false);
} }
if (flag_update==true){ if (flag_update==true){
_lblDateTimeSettingGlob->set_sensitive(false); _lblDateTimeSettingGlob->set_sensitive(false);
_lblSynchronizebChk->set_sensitive(false); _lblSynchronizebChkGLob->set_sensitive(false);
_cbxSynchronizeNtp->set_sensitive(false); _cbxSynchronizeNtpGlob->set_sensitive(false);
_lblTimeZoneGlob->set_sensitive(false); _lblTimeZoneGlob->set_sensitive(false);
_lblRegGlob->set_sensitive(false); _lblRegGlob->set_sensitive(false);
_cbRegionGlob->set_sensitive(false); _cbRegionGlob->set_sensitive(false);
@ -146,7 +147,7 @@ void MainWindow::get_builder(){
builder->get_widget("btnUpdateDateTime", _btnUpdateDateTime); builder->get_widget("btnUpdateDateTime", _btnUpdateDateTime);
builder->get_widget("btnChooseDate", _btnChooseDate); builder->get_widget("btnChooseDate", _btnChooseDate);
builder->get_widget("btnMessClose", _btnMessClose); builder->get_widget("btnMessClose", _btnMessClose);
builder->get_widget("cbxSynchronizeNtp", _cbxSynchronizeNtp); builder->get_widget("cbxSynchronizeNtpGlob", _cbxSynchronizeNtpGlob);
builder->get_widget("popCalendar", _popCalendar); builder->get_widget("popCalendar", _popCalendar);
builder->get_widget("numTimeHrs", _numTimeHrs); builder->get_widget("numTimeHrs", _numTimeHrs);
builder->get_widget("numTimeMin", _numTimeMin); builder->get_widget("numTimeMin", _numTimeMin);
@ -171,20 +172,22 @@ void MainWindow::get_builder(){
builder->get_widget("lblZone1Glob",_lblZone1Glob); builder->get_widget("lblZone1Glob",_lblZone1Glob);
builder->get_widget("lblTimeZoneGlob",_lblTimeZoneGlob); 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("lblSynchronizeBtn",_lblSynchronizeBtn);
builder->get_widget("lblDateTimeSettingGlob",_lblDateTimeSettingGlob); builder->get_widget("lblDateTimeSettingGlob",_lblDateTimeSettingGlob);
builder->get_widget("lblTimeBios",_lblTimeBios); builder->get_widget("lblTimeBios",_lblTimeBios);
builder->get_widget("lblTimeBiosGlob",_lblTimeBiosGlob); builder->get_widget("btnHardwareTime",_btnHardwareTime);
builder->get_widget("cbxSynchronizeNtp",_cbxSynchronizeNtp);
this->add_CSS(); this->add_CSS();
} }
void MainWindow::event(){ void MainWindow::event(){
_cbxSynchronizeNtp->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)); _btnMessClose->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::gui_mess_close));
//_cldrDate->signal_day_selected().connect(sigc::mem_fun(*this, &MainWindow::get_calendar)); //_cldrDate->signal_day_selected().connect(sigc::mem_fun(*this, &MainWindow::get_calendar));
_cbxSynchronizeNtp->signal_toggled().connect(sigc::mem_fun(*this, &MainWindow::set_ntp_toggle)); _cbxSynchronizeNtpGlob->signal_toggled().connect(sigc::mem_fun(*this, &MainWindow::set_ntp_toggle_glob));
_btnUpdateDateTime->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::update_time_date)); _btnUpdateDateTime->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::update_time_date));
_btnChooseDate->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::calendar_show)); _btnChooseDate->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::calendar_show));
_cbDhcp->signal_changed().connect(sigc::mem_fun(*this, &MainWindow::event_entry_cbDhcp)); _cbDhcp->signal_changed().connect(sigc::mem_fun(*this, &MainWindow::event_entry_cbDhcp));
@ -196,6 +199,33 @@ void MainWindow::event(){
_cldrDate->signal_day_selected_double_click().connect(sigc::mem_fun(*this, &MainWindow::get_calendar)); _cldrDate->signal_day_selected_double_click().connect(sigc::mem_fun(*this, &MainWindow::get_calendar));
} }
void MainWindow::set_ntp_toggle(){
bool flag = _cbxSynchronizeNtp->get_active();
if (flag_ntp==true){
}
else {
_numTimeHrs->set_sensitive(!flag);
_numTimeMin->set_sensitive(!flag);
_btnChooseDate->set_sensitive(!flag);
_txtDate->set_sensitive(!flag);
_lblTimeBios->set_sensitive(!flag);
}
string cmd = "";
if (flag==false){
cmd="systemctl --now disable systemd-timesyncd.service ntpd.service";
system(cmd.c_str());
}
else {
cmd = "systemctl --now enable systemd-timesyncd.service";
system(cmd.c_str());
}
}
void MainWindow::hardware_clock(){
string cmd = "hwclock --systohc";
system(cmd.c_str());
}
void MainWindow::gui_mess_close(){ void MainWindow::gui_mess_close(){
_mess_dchp->hide(); _mess_dchp->hide();
@ -288,7 +318,7 @@ void MainWindow::calendar_show(){
void MainWindow::enry_dhcp_mess(){ void MainWindow::enry_dhcp_mess(){
string str_dhcp = this->call("/usr/bin/ubconfig get network NTPSERVERS"); string str_dhcp = this->call("/usr/bin/ubconfig get network NTPSERVERS");
if ((str_dhcp!="") && (str_dhcp!="(null)")){ if ((str_dhcp!="") && (str_dhcp!="(null)")){
_cbxSynchronizeNtp->set_active(1); _cbxSynchronizeNtpGlob->set_active(1);
str_dhcp = str_dhcp.substr(str_dhcp.find("=")+1,str_dhcp.length()); str_dhcp = str_dhcp.substr(str_dhcp.find("=")+1,str_dhcp.length());
str_dhcp = str_dhcp.substr(0,str_dhcp.find("\n")); str_dhcp = str_dhcp.substr(0,str_dhcp.find("\n"));
if (str_dhcp=="dhcp"){ if (str_dhcp=="dhcp"){
@ -305,10 +335,10 @@ void MainWindow::enry_dhcp_mess(){
_txtNtpServer->set_text(str_dhcp); _txtNtpServer->set_text(str_dhcp);
} }
} }
this->set_ntp_toggle(); this->set_ntp_toggle_glob();
} }
else{ else{
_cbxSynchronizeNtp->set_active(0); _cbxSynchronizeNtpGlob->set_active(0);
_cbDhcp->set_sensitive(0); _cbDhcp->set_sensitive(0);
_txtNtpServer->set_sensitive(0); _txtNtpServer->set_sensitive(0);
} }
@ -322,9 +352,19 @@ void MainWindow::get_config(){
string str_ntp = this->call("systemctl status ntpd.service systemd-timesyncd.service | grep \"Active: active\""); string str_ntp = this->call("systemctl status ntpd.service systemd-timesyncd.service | grep \"Active: active\"");
if (str_ntp.length()<50) { if (str_ntp.length()<50) {
_cbxSynchronizeNtp->set_active(false); _cbxSynchronizeNtp->set_active(false);
_numTimeHrs->set_sensitive(true);
_numTimeMin->set_sensitive(true);
_btnChooseDate->set_sensitive(true);
_txtDate->set_sensitive(true);
_lblTimeBios->set_sensitive(true);
} }
else{ else{
_cbxSynchronizeNtp->set_active(true); _cbxSynchronizeNtp->set_active(true);
_numTimeHrs->set_sensitive(false);
_numTimeMin->set_sensitive(false);
_btnChooseDate->set_sensitive(false);
_txtDate->set_sensitive(false);
_lblTimeBios->set_sensitive(false);
} }
string read_reg_zon_cfg = this->call("/usr/bin/ubconfig get clock ZONE"); 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 != "") && (read_reg_zon_cfg !="(null)")){
@ -382,25 +422,15 @@ void MainWindow::enter_zone_glob(){
} }
} }
void MainWindow::set_ntp_toggle(){ void MainWindow::set_ntp_toggle_glob(){
bool flag = _cbxSynchronizeNtp->get_active(); bool flag = _cbxSynchronizeNtp->get_active();
if (flag_datetime==true){ if (flag==true){
}
else {
_numTimeHrs->set_sensitive(!flag);
_numTimeMin->set_sensitive(!flag);
_btnChooseDate->set_sensitive(!flag);
_txtDate->set_sensitive(!flag);
}
string cmd = "";
if (flag==false){
cmd="systemctl --now disable systemd-timesyncd.service ntpd.service";
system(cmd.c_str());
} }
else { else{
cmd = "systemctl --now enable systemd-timesyncd.service";
system(cmd.c_str());
} }
} }
void MainWindow::append_region_zone(string region, string zone){ void MainWindow::append_region_zone(string region, string zone){
@ -475,7 +505,7 @@ void MainWindow::append_zone_glob(){
void MainWindow::update_time_date(){ void MainWindow::update_time_date(){
//this->enter_zone(); //this->enter_zone();
bool flag = _cbxSynchronizeNtp->get_active(); bool flag = _cbxSynchronizeNtpGlob->get_active();
string cmd = ""; string cmd = "";
if ((year!=0) && (month !=0) && (day !=0)){ if ((year!=0) && (month !=0) && (day !=0)){
string str_month = ""; string str_month = "";
@ -500,8 +530,7 @@ void MainWindow::update_time_date(){
cmd = "date +%Y%m%d -s \"" + to_string(year)+ cmd = "date +%Y%m%d -s \"" + to_string(year)+
str_month+str_day+"\""; str_month+str_day+"\"";
system(cmd.c_str()); system(cmd.c_str());
//cmd = "hwclock --systohc";
//system(cmd.c_str());
_txtDate->set_text(str_data); _txtDate->set_text(str_data);
year=0; year=0;
month=0; month=0;

@ -73,6 +73,8 @@ class MainWindow : public Gtk::ApplicationWindow {
void update_calendar(); void update_calendar();
void read_file(); void read_file();
void parse_text_date(); void parse_text_date();
void hardware_clock();
void set_ntp_toggle_glob();
vector<std::string> split(const std::string &s, char delim); vector<std::string> split(const std::string &s, char delim);
private: private:
Glib::RefPtr<Gtk::Builder> builder; Glib::RefPtr<Gtk::Builder> builder;
@ -82,7 +84,7 @@ class MainWindow : public Gtk::ApplicationWindow {
Gtk::ComboBoxText *_cbDhcp; Gtk::ComboBoxText *_cbDhcp;
Gtk::SpinButton *_numTimeHrs; Gtk::SpinButton *_numTimeHrs;
Gtk::SpinButton *_numTimeMin; Gtk::SpinButton *_numTimeMin;
Gtk::CheckButton *_cbxSynchronizeNtp; Gtk::CheckButton *_cbxSynchronizeNtpGlob;
Gtk::Box *_boxColor; Gtk::Box *_boxColor;
Gtk::Entry *_txtDate; Gtk::Entry *_txtDate;
Gtk::ComboBoxText *_cbRegion; Gtk::ComboBoxText *_cbRegion;
@ -105,10 +107,12 @@ class MainWindow : public Gtk::ApplicationWindow {
Gtk::Label *_lblZone1Glob; Gtk::Label *_lblZone1Glob;
Gtk::Label *_lblTimeZoneGlob; Gtk::Label *_lblTimeZoneGlob;
Gtk::Label *_lblSynchronizebChk; Gtk::Label *_lblSynchronizebChk;
Gtk::Label *_lblSynchronizebChkGLob;
Gtk::Label *_lblSynchronizeBtn; Gtk::Label *_lblSynchronizeBtn;
Gtk::Label *_lblDateTimeSettingGlob; Gtk::Label *_lblDateTimeSettingGlob;
Gtk::Label *_lblTimeBios; Gtk::Label *_lblTimeBios;
Gtk::Label *_lblTimeBiosGlob; Gtk::Button *_btnHardwareTime;
Gtk::CheckButton *_cbxSynchronizeNtp;
std::map <string, vector<string>> time_reg_map; std::map <string, vector<string>> time_reg_map;
unsigned int year=0; unsigned int year=0;
unsigned int month=0; unsigned int month=0;

@ -1,4 +1,3 @@
.cssboxColor1{ .cssboxColor1{
background-color: rgb(255, 255, 255); background-image: url("/usr/share/ubl-settings-datetime/images/bg_top.png");
background-size: 100% auto;
} }

@ -79,29 +79,6 @@
</object> </object>
</child> </child>
</object> </object>
<object class="GtkPopover" id="popCalendar">
<property name="width-request">240</property>
<property name="height-request">185</property>
<property name="can-focus">False</property>
<property name="relative-to">btnChooseDate</property>
<property name="position">bottom</property>
<property name="constrain-to">none</property>
<child>
<object class="GtkCalendar" id="cldrDate">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="margin-left">10</property>
<property name="margin-right">10</property>
<property name="margin-start">10</property>
<property name="margin-end">10</property>
<property name="margin-top">10</property>
<property name="margin-bottom">10</property>
<property name="year">2023</property>
<property name="month">1</property>
<property name="day">10</property>
</object>
</child>
</object>
<object class="GtkWindow" id="window"> <object class="GtkWindow" id="window">
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="title" translatable="yes" context="Settings the date and time" comments="Date and Time Settings">Настройки даты и времени</property> <property name="title" translatable="yes" context="Settings the date and time" comments="Date and Time Settings">Настройки даты и времени</property>
@ -111,7 +88,7 @@
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkBox" id="boxColor"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<child> <child>
@ -134,49 +111,61 @@
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkBox" id="boxColor">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<child> <child>
<object class="GtkLabel" id="lblNtpServer1"> <object class="GtkLabel" id="lblNtpServer1">
<property name="width-request">145</property> <property name="width-request">255</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="margin-left">5</property>
<property name="margin-right">5</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="margin-top">3</property>
<property name="margin-bottom">6</property>
<property name="label" translatable="yes" context="Setting the date and time" comments="Setting the date and time">Настройка даты и времени</property>
<property name="wrap">True</property>
<property name="max-width-chars">28</property>
<property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
<attribute name="size" value="12288"/>
</attributes>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">0</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="width-request">100</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="margin-left">15</property>
<property name="margin-right">5</property>
<property name="margin-start">15</property>
<property name="margin-end">5</property>
<attributes>
<attribute name="background" value="#ffffffffffff"/>
</attributes>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">2</property> <property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing> </packing>
</child> </child>
</object> </object>
@ -209,6 +198,38 @@
<property name="margin-left">6</property> <property name="margin-left">6</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child>
<object class="GtkCheckButton" id="cbxSynchronizeNtp">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="margin-right">5</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="margin-top">6</property>
<property name="margin-bottom">6</property>
<property name="draw-indicator">True</property>
<child>
<object class="GtkLabel" id="lblSynchronizebChk">
<property name="width-request">145</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-left">5</property>
<property name="margin-right">5</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="margin-top">6</property>
<property name="margin-bottom">6</property>
<property name="label" translatable="yes" context="Synchronize via NTP" comments="Synchronize via NTP">Синхронизировать через NTP</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
@ -218,7 +239,6 @@
<property name="width-request">145</property> <property name="width-request">145</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="margin-left">5</property>
<property name="margin-right">5</property> <property name="margin-right">5</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
@ -289,7 +309,7 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">0</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -301,7 +321,6 @@
<property name="width-request">145</property> <property name="width-request">145</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="margin-left">5</property>
<property name="margin-right">5</property> <property name="margin-right">5</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
@ -319,7 +338,7 @@
</child> </child>
<child> <child>
<object class="GtkEntry" id="txtDate"> <object class="GtkEntry" id="txtDate">
<property name="width-request">221</property> <property name="width-request">191</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="tooltip-text" translatable="yes" context="Date of&#10;Format: DD.MM.YYYY" comments="Date of&#10;Format: DD.MM.YYYY">Дата <property name="tooltip-text" translatable="yes" context="Date of&#10;Format: DD.MM.YYYY" comments="Date of&#10;Format: DD.MM.YYYY">Дата
@ -367,7 +386,7 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">2</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -375,26 +394,73 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<child> <child>
<object class="GtkLabel" id="lblTimeZone"> <object class="GtkLabel">
<property name="width-request">145</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="margin-left">5</property> </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkButton" id="btnHardwareTime">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="margin-right">5</property> <property name="margin-right">5</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-top">6</property> <child>
<property name="margin-bottom">6</property> <object class="GtkLabel" id="lblTimeBios">
<property name="label" translatable="yes" context="time zone" comments="time zone">Часовой пояс</property> <property name="visible">True</property>
<property name="wrap">True</property> <property name="can-focus">False</property>
<property name="xalign">0</property> <property name="halign">center</property>
<property name="valign">center</property>
<property name="label" translatable="yes">Синхронизировать аппаратное время</property>
</object>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">0</property> <property name="position">3</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkFrame">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-right">5</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="margin-top">6</property>
<property name="margin-bottom">6</property>
<property name="label-xalign">0.019999999552965164</property>
<property name="shadow-type">in</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property> <property name="visible">True</property>
@ -415,8 +481,7 @@
<property name="margin-right">5</property> <property name="margin-right">5</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-top">6</property> <property name="margin-bottom">8</property>
<property name="margin-bottom">6</property>
<property name="label" translatable="yes" context="Region" comments="Region">Регион</property> <property name="label" translatable="yes" context="Region" comments="Region">Регион</property>
<property name="xalign">0</property> <property name="xalign">0</property>
</object> </object>
@ -434,8 +499,7 @@
<property name="margin-right">5</property> <property name="margin-right">5</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-top">6</property> <property name="margin-bottom">8</property>
<property name="margin-bottom">6</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -452,8 +516,7 @@
<property name="margin-right">5</property> <property name="margin-right">5</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-top">6</property> <property name="margin-bottom">8</property>
<property name="margin-bottom">6</property>
<property name="label" translatable="yes" context="Zone" comments="Zone">Зона</property> <property name="label" translatable="yes" context="Zone" comments="Zone">Зона</property>
<property name="xalign">0</property> <property name="xalign">0</property>
</object> </object>
@ -471,8 +534,7 @@
<property name="margin-right">5</property> <property name="margin-right">5</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-top">6</property> <property name="margin-bottom">8</property>
<property name="margin-bottom">6</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -504,70 +566,19 @@
</packing> </packing>
</child> </child>
</object> </object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkCheckButton" id="chbHardwareTime">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<child>
<object class="GtkLabel" id="lblTimeBios">
<property name="width-request">145</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-left">5</property>
<property name="margin-right">5</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="margin-top">6</property>
<property name="margin-bottom">5</property>
<property name="label" translatable="yes">Синхронизировать аппаратное время</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child> </child>
<child> <child type="label">
<object class="GtkLabel"> <object class="GtkLabel" id="lblTimeZone">
<property name="visible">True</property>
<property name="can-focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="label" translatable="yes">Часовой пояс</property>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">3</property> <property name="position">5</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -576,8 +587,8 @@
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<property name="margin-right">5</property> <property name="margin-right">5</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-top">6</property>
<property name="margin-bottom">6</property> <property name="margin-bottom">6</property>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
@ -589,6 +600,10 @@
<object class="GtkImage"> <object class="GtkImage">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="margin-left">5</property>
<property name="margin-right">5</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="icon-name">media-playlist-repeat</property> <property name="icon-name">media-playlist-repeat</property>
</object> </object>
<packing> <packing>
@ -603,7 +618,7 @@
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="halign">center</property> <property name="halign">center</property>
<property name="valign">center</property> <property name="valign">center</property>
<property name="label" translatable="yes">Синхронизировать</property> <property name="label" translatable="yes">Применить локальную настройку даты и времени</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -617,7 +632,7 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">4</property> <property name="position">6</property>
</packing> </packing>
</child> </child>
</object> </object>
@ -657,7 +672,7 @@
<property name="margin-right">5</property> <property name="margin-right">5</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="label-xalign">0.019999999552965164</property> <property name="label-xalign">0.05999999865889549</property>
<property name="shadow-type">in</property> <property name="shadow-type">in</property>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
@ -671,7 +686,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<child> <child>
<object class="GtkCheckButton" id="cbxSynchronizeNtp"> <object class="GtkCheckButton" id="cbxSynchronizeNtpGlob">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">False</property> <property name="receives-default">False</property>
@ -680,10 +695,9 @@
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-top">6</property> <property name="margin-top">6</property>
<property name="margin-bottom">6</property>
<property name="draw-indicator">True</property> <property name="draw-indicator">True</property>
<child> <child>
<object class="GtkLabel" id="lblSynchronizebChk"> <object class="GtkLabel" id="lblSynchronizebChkGLob">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="label" translatable="yes" context="Synchronize via NTP" comments="Synchronize via NTP">Синхронизировать через NTP</property> <property name="label" translatable="yes" context="Synchronize via NTP" comments="Synchronize via NTP">Синхронизировать через NTP</property>
@ -701,7 +715,6 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="margin-top">6</property> <property name="margin-top">6</property>
<property name="margin-bottom">6</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -720,7 +733,6 @@
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-top">6</property> <property name="margin-top">6</property>
<property name="margin-bottom">6</property>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">True</property>
@ -736,31 +748,19 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkBox"> <object class="GtkFrame">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkLabel" id="lblTimeZoneGlob">
<property name="width-request">145</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="margin-left">5</property>
<property name="margin-right">5</property> <property name="margin-right">5</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-top">6</property>
<property name="margin-bottom">6</property> <property name="margin-bottom">6</property>
<property name="label" translatable="yes" context="Time zone" comments="Time zone">Часовой пояс</property> <property name="label-xalign">0.019999999552965164</property>
<property name="wrap">True</property> <property name="shadow-type">in</property>
<property name="max-width-chars">28</property> <child>
<property name="xalign">0</property> <object class="GtkBox">
</object> <property name="visible">True</property>
<packing> <property name="can-focus">False</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property> <property name="visible">True</property>
@ -780,8 +780,7 @@
<property name="margin-right">5</property> <property name="margin-right">5</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-top">6</property> <property name="margin-bottom">8</property>
<property name="margin-bottom">6</property>
<property name="label" translatable="yes" context="Region" comments="Region">Регион</property> <property name="label" translatable="yes" context="Region" comments="Region">Регион</property>
<property name="xalign">0</property> <property name="xalign">0</property>
</object> </object>
@ -799,8 +798,7 @@
<property name="margin-right">5</property> <property name="margin-right">5</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-top">6</property> <property name="margin-bottom">8</property>
<property name="margin-bottom">6</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -816,6 +814,7 @@
<property name="margin-right">5</property> <property name="margin-right">5</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-bottom">8</property>
<property name="label" translatable="yes" context="Zone" comments="Zone">Зона</property> <property name="label" translatable="yes" context="Zone" comments="Zone">Зона</property>
<property name="xalign">0</property> <property name="xalign">0</property>
</object> </object>
@ -833,8 +832,7 @@
<property name="margin-right">5</property> <property name="margin-right">5</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-top">6</property> <property name="margin-bottom">8</property>
<property name="margin-bottom">6</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -859,47 +857,14 @@
</packing> </packing>
</child> </child>
</object> </object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child> </child>
<child> <child type="label">
<object class="GtkBox"> <object class="GtkLabel" id="lblTimeZoneGlob">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkCheckButton" id="chbHardwareTimeGlob">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
<child>
<object class="GtkLabel" id="lblTimeBiosGlob">
<property name="width-request">145</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="margin-left">5</property> <property name="label" translatable="yes">Часовой пояс</property>
<property name="margin-right">5</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="margin-top">6</property>
<property name="margin-bottom">5</property>
<property name="label" translatable="yes">Синхронизировать аппаратное время</property>
</object>
</child>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child> </child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -907,24 +872,6 @@
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object> </object>
</child> </child>
<child type="label"> <child type="label">
@ -951,4 +898,27 @@
</object> </object>
</child> </child>
</object> </object>
<object class="GtkPopover" id="popCalendar">
<property name="width-request">240</property>
<property name="height-request">185</property>
<property name="can-focus">False</property>
<property name="relative-to">btnChooseDate</property>
<property name="position">bottom</property>
<property name="constrain-to">none</property>
<child>
<object class="GtkCalendar" id="cldrDate">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="margin-left">10</property>
<property name="margin-right">10</property>
<property name="margin-start">10</property>
<property name="margin-end">10</property>
<property name="margin-top">10</property>
<property name="margin-bottom">10</property>
<property name="year">2023</property>
<property name="month">1</property>
<property name="day">10</property>
</object>
</child>
</object>
</interface> </interface>

@ -9,8 +9,8 @@ msgstr ""
msgid "Manually" msgid "Manually"
msgstr "Вручную" msgstr "Вручную"
msgid "Enter DHCP !" msgid "Enter DHCP!"
msgstr "Введите DHCP !" msgstr "Введите DHCP!"
msgid "OK" msgid "OK"
msgstr "OK" msgstr "OK"
@ -54,8 +54,8 @@ msgstr "Регион"
msgid "Zone" msgid "Zone"
msgstr "Зона" msgstr "Зона"
msgid "Sync by" msgid "Apply local date and time settings"
msgstr "Синхронизировать" msgstr "Применить локальную настройку даты и времени"
msgid "Automatic time synchronization" msgid "Automatic time synchronization"
msgstr "Автоматическая синхронизация времени" msgstr "Автоматическая синхронизация времени"

Loading…
Cancel
Save