From cba6960fb85f63714cf4be8adb24e0aa28d51078 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 17 May 2023 17:16:01 +0600 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=B1=D0=B0=D0=BD=D0=B5=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- #ubl-settings-datetime.glade# | 1636 +++++++++++++++++++++++++++++++ source/ubl-settings-datetime.cc | 2 +- ubl-settings-datetime.glade | 67 +- 3 files changed, 1671 insertions(+), 34 deletions(-) create mode 100644 #ubl-settings-datetime.glade# diff --git a/#ubl-settings-datetime.glade# b/#ubl-settings-datetime.glade# new file mode 100644 index 0000000..96c2b7d --- /dev/null +++ b/#ubl-settings-datetime.glade# @@ -0,0 +1,1636 @@ + + + + + + False + Внимание! + com.ublinux.ubl-settings-datetime + dialog + + + True + False + vertical + + + True + False + 5 + 5 + 5 + 5 + + + True + False + 5 + 5 + 5 + 5 + 5 + 50 + gtk-dialog-warning + + + True + True + 0 + + + + + 160 + True + False + start + center + 5 + 5 + Enter DHCP ! + + + True + True + 1 + + + + + False + True + 1 + + + + + OK + True + True + True + 5 + 5 + 5 + 5 + 3 + 3 + + + False + True + 1 + + + + + + + False + False + True + center + com.ublinux.ubl-settings-datetime + dialog + True + True + ubl-settings-datetime + 1.0 + Copyright © 2022 - 2023, UBSoft LLC + Setting the date and time + https://ublinux.ru/ + Project Home Page + Это приложение распространяется без каких-либо гарантий. +Подробнее в <a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GNU General Public License, версии 2 или позднее</a>. + UBGroup + UBGroup + com.ublinux.ubl-settings-datetime + True + gpl-2-0 + + + True + False + vertical + 2 + + + False + end + + + False + False + 1 + + + + + + + + + + True + False + True + + + True + False + 5 + 5 + 5 + 5 + 2 + ubl-settings-datetime + + + + + + + + + + True + False + + + 90 + True + False + 5 + 5 + 5 + 5 + 5 + 5 + 69 + com.ublinux.ubl-settings-datetime + + + False + True + 0 + + + + + True + False + + + True + False + + + True + False + vertical + + + 255 + True + False + Date and Time + 0.25 + + + + + + + True + True + 0 + + + + + False + True + 0 + + + + + True + True + 0 + + + + + True + False + + + False + True + 1 + + + + + True + True + 1 + + + + + True + False + False + False + 4 + + + True + False + Load global configuration + + + + + + True + False + Load local configuration + + + + + + True + False + False + False + 4 + + + True + False + Help + + + + + + True + False + About + + + + + + True + False + False + False + 4 + + + True + False + Save configuration + + + + + + True + False + Save to global configuration + + + + + + True + False + Save to local configuration + + + + + + 659 + False + com.ublinux.ubl-settings-datetime + + + True + False + vertical + + + True + False + vertical + + + True + False + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + 25 + 1 + + + False + True + 0 + + + + + True + False + start + 5 + 5 + 5 + 5 + 5 + 5 + + + + + + + True + True + 1 + + + + + False + True + 0 + + + + + True + False + vertical + + + 81 + True + False + + + True + False + start + + + -1 + + + + + False + True + 0 + + + + + False + True + 1 + + + + + True + False + vertical + + + True + False + vertical + + + True + False + 5 + 5 + 5 + 5 + 0.019999999552965164 + in + + + True + False + 5 + 5 + 5 + vertical + + + True + False + + + True + False + + + 0 + True + False + 5 + 5 + 5 + 5 + 5 + 5 + Time: + True + 0 + + + False + True + 0 + + + + + True + True + 5 + 5 + 5 + 5 + 5 + 5 + 2 + 0.099999999776482579 + True + + + False + True + 1 + + + + + True + False + : + + + False + True + 2 + + + + + True + True + 5 + 5 + 5 + 5 + 5 + 5 + 2 + True + + + False + True + 3 + + + + + False + True + 0 + + + + + 20 + True + False + 5 + 5 + 5 + 5 + 5 + 5 + Date: + True + 0 + + + False + True + 4 + + + + + True + True + True + Интерактивный выбор даты + 5 + 10 + 5 + 10 + 5 + 5 + + + True + False + x-office-calendar + + + + + False + True + 5 + + + + + -1 + True + True + Date +Format: DD.MM.YYYY + 5 + 5 + 5 + 5 + 5 + 5 + + + True + True + 5 + + + + + False + True + 1 + + + + + True + False + + + 0 + True + True + True + 7 + 5 + 7 + 5 + 5 + 5 + + + True + False + center + center + + + True + False + 5 + 5 + 5 + 5 + media-playlist-repeat + + + False + True + 0 + + + + + True + False + center + center + Sync by + + + False + True + 1 + + + + + + + True + True + 0 + + + + + True + False + + + False + True + 1 + + + + + True + False + + + False + True + 2 + + + + + True + True + True + 5 + 10 + 5 + 10 + 5 + 5 + + + True + False + center + center + Synchronize hardware time + + + + + True + True + 3 + + + + + False + True + 3 + + + + + + + True + False + Current date and time + + + + + False + True + 0 + + + + + False + True + 1 + + + + + True + False + vertical + + + True + False + 5 + 5 + 5 + 5 + 0.019999999552965164 + in + + + True + False + 5 + 5 + 5 + vertical + + + True + False + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + + + False + True + 1 + + + + + True + True + Enter the name of the ntp server or its ip address. When entering multiple addresses, separate them with spaces. + center + 5 + 10 + 5 + 10 + 5 + 5 + + + True + True + 3 + + + + + False + True + 1 + + + + + + + True + False + Synchronize via NTP + + + + + False + True + 0 + + + + + False + True + 2 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 0.019999999552965164 + in + + + True + False + vertical + + + True + False + + + True + False + start + 8 + 5 + 8 + 5 + 5 + 13 + Synchronize hardware time: + + + False + True + 0 + + + + + True + False + 10 + 5 + 5 + 10 + 5 + 10 + False + False + + + True + True + 2 + + + + + False + True + 0 + + + + + True + False + + + True + False + + + False + True + 1 + + + + + True + False + 8 + 5 + 8 + 5 + 5 + 13 + Region: + 0 + + + False + True + 2 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 10 + False + False + + + True + True + 3 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 13 + Area: + 0 + + + False + True + 4 + + + + + 5 + True + False + + + False + True + 5 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 10 + False + False + + + True + True + 5 + + + + + True + False + + + False + True + 7 + + + + + False + True + 1 + + + + + + + True + False + Time Zone + + + + + False + True + 3 + + + + + False + True + 2 + + + + + False + True + 0 + + + + + + + True + False + True + + + True + False + start + 5 + 5 + 5 + 5 + 1 + False + ubl-settings-datetime + + + + + + + + True + False + 5 + 5 + 5 + 5 + 32 + com.ublinux.ubl-settings-datetime + + + + + True + False + + + True + True + False + True + True + menu + none + + + True + False + + + True + False + 5 + 5 + 5 + 5 + Load + + + False + True + 0 + + + + + True + False + pan-down-symbolic + + + False + True + 1 + + + + + + + False + True + 0 + + + + + + 1 + + + + + True + False + + + True + True + False + True + True + menu2 + none + + + True + False + + + True + False + 5 + 5 + 5 + 5 + Save + + + + False + True + 0 + + + + + True + False + pan-down-symbolic + + + False + True + 1 + + + + + + + False + True + 0 + + + + + True + True + False + True + True + menu1 + none + + + True + False + open-menu-symbolic + + + + + False + True + 1 + + + + + + end + 3 + + + + + + + both + True + + + + + + + both + True + + + + + + + 240 + 185 + False + btnChooseDate + bottom + none + + + True + True + 10 + 10 + 10 + 10 + 10 + 10 + 2023 + 1 + 10 + + + + + False + start + False + + + True + False + vertical + + + True + False + + + True + False + center + start + 20 + 20 + 20 + 20 + 20 + 20 + dialog-warning-symbolic + 5 + + + False + True + 1 + + + + + True + False + center + center + 10 + 25 + 10 + 25 + 20 + 20 + Enter DHCP ! + True + 0 + + + True + True + 2 + + + + + True + True + 0 + + + + + Close + True + True + True + 5 + 5 + 5 + 5 + 5 + 5 + + + False + True + 2 + + + + + + + True + False + Attention + True + + + True + False + 32 + com.ublinux.ubl-settings-datetime + 5 + + + + + + + False + start + start + False + 450 + 250 + dialog-question-symbolic + + + True + False + vertical + + + True + False + + + True + False + start + 20 + 20 + dialog-question-symbolic + 5 + + + False + True + 0 + + + + + True + False + vertical + + + True + False + start + 10 + 5 + Would you like to read documentation in the Web? + True + 0 + + + + + + + False + True + 0 + + + + + True + False + start + start + 10 + 10 + You will be redirected to documentation website where documentation is translated and supported by community. + True + 0 + + + + True + True + 1 + + + + + Always redirect to online documentation + True + True + False + end + 10 + True + + + + False + True + 2 + + + + + + True + True + 1 + + + + + + True + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + 30 + True + + + Cancel + True + True + True + + + + True + True + 0 + + + + + Read Online + True + True + True + + + + True + True + 1 + + + + + False + True + 1 + + + + + + + True + False + True + + + True + False + ubl-settings-datetime + + + + + + + + True + False + 32 + dialog-question-symbolic + + + + + + + 800 + 600 + False + True + True + com.ublinux.ubl-settings-datetime + center + + + + + + True + False + True + + + True + False + ubl-settings-datetime + + + + + True + False + 32 + com.ublinux.ubl-settings-datetime + 5 + + + + + + diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index f7db74a..285a28c 100644 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -147,7 +147,7 @@ void MainWindow::lacalization() { cbDhcp->append(str_manual); cbDhcp->append(str_disabled); lblDateTimeSetting->set_text(current_date_time); - lblHead->set_text(setting_date_time); + lblHead->set_text(str_date_time); lblTime->set_text(str_time); lblData->set_text(str_date); lblTimeZone->set_text(str_time_zone); diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade index f055c4b..6145e91 100644 --- a/ubl-settings-datetime.glade +++ b/ubl-settings-datetime.glade @@ -192,7 +192,8 @@ 255 True False - Date and time settings + Date and Time + 0.20999999344348907 @@ -564,26 +565,6 @@ 4 - - - -1 - True - True - Date -Format: DD.MM.YYYY - 5 - 5 - 5 - 5 - 5 - 5 - - - True - True - 5 - - True @@ -610,6 +591,26 @@ Format: DD.MM.YYYY 5 + + + -1 + True + True + Date +Format: DD.MM.YYYY + 5 + 5 + 5 + 5 + 5 + 5 + + + True + True + 5 + + False @@ -987,6 +988,18 @@ Format: DD.MM.YYYY 4 + + + 5 + True + False + + + False + True + 5 + + True @@ -1006,18 +1019,6 @@ Format: DD.MM.YYYY 5 - - - 5 - True - False - - - False - True - 5 - - True