Applications
/
ubl-settings-datetime
8
0
Fork 3
Code Issues 5 Pull Requests Packages Projects Releases Wiki Activity

Исправлен дизайн по #15, исправлен баг с аппаратными часами,не работало изменение времени

Browse Source
pull/18/head
Igor Belitskiy 3 years ago
parent 0786348b63
commit 1d03479984
3 changed files with 65 additions and 62 deletions
Show Stats Download Patch File Download Diff File

10
source/ubl-settings-datetime.cc
Unescape View File

@ -90,7 +90,7 @@ 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("Apply local date and time settings")); _lblSynchronizeBtn->set_text(gettext("Sync by"));
_lblDateTimeSettingGlob->set_text(gettext("Global customization")); _lblDateTimeSettingGlob->set_text(gettext("Global customization"));
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!"));
@ -427,8 +427,8 @@ void MainWindow::enter_zone_glob(){
void MainWindow::set_ntp_toggle_glob(){ void MainWindow::set_ntp_toggle_glob(){
bool flag = _cbxSynchronizeNtp->get_active(); bool flag = _cbxSynchronizeNtp->get_active();
if (flag==true){ if (flag==false){
system("/usr/bin/ubconfig remove network NTPSERVERS") system("/usr/bin/ubconfig remove network NTPSERVERS");
} }
else{ else{
@ -508,7 +508,7 @@ void MainWindow::append_zone_glob(){
void MainWindow::update_time_date(){ void MainWindow::update_time_date(){
//this->enter_zone(); //this->enter_zone();
bool flag = _cbxSynchronizeNtpGlob->get_active(); bool flag = _cbxSynchronizeNtp->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 = "";
@ -556,8 +556,6 @@ void MainWindow::update_time_date(){
+ ":" + to_string(ltm->tm_sec) +"\""; + ":" + to_string(ltm->tm_sec) +"\"";
system(cmd.c_str()); system(cmd.c_str());
} }
cmd = "hwclock --systohc";
system(cmd.c_str());
} }
void MainWindow::post_entry_data(){ void MainWindow::post_entry_data(){

113
ubl-settings-datetime.glade
Unescape View File

@ -399,6 +399,62 @@
<object class="GtkBox"> <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>
<object class="GtkButton" id="btnUpdateDateTime">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</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>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
<child>
<object class="GtkImage">
<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="icon-name">media-playlist-repeat</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="lblSynchronizeBtn">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
<property name="label" translatable="yes">Синхронизировать</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</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="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property> <property name="visible">True</property>
@ -426,9 +482,12 @@
<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">True</property> <property name="receives-default">True</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>
<child> <child>
<object class="GtkLabel" id="lblTimeBios"> <object class="GtkLabel" id="lblTimeBios">
<property name="visible">True</property> <property name="visible">True</property>
@ -589,60 +648,6 @@
<property name="position">5</property> <property name="position">5</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkButton" id="btnUpdateDateTime">
<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-start">5</property>
<property name="margin-end">5</property>
<property name="margin-bottom">6</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
<child>
<object class="GtkImage">
<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="icon-name">media-playlist-repeat</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="lblSynchronizeBtn">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
<property name="label" translatable="yes">Применить локальную настройку даты и времени</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">6</property>
</packing>
</child>
</object> </object>
</child> </child>
<child type="label"> <child type="label">

4
ubl-settings-datetime_ru.po
Unescape View File

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

Write Preview
Loading…
Cancel
Save