From eef5bcaa36aa8686cc6b02e58cce6a18a22cf7d1 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Thu, 2 Mar 2023 09:55:13 +0600 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D1=91=D0=BD=20?= =?UTF-8?q?=D0=B4=D0=B8=D0=B7=D0=B0=D0=B9=D0=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ubl-settings-datetime.cc | 4 ++-- source/ubl-settings-datetime.h | 2 +- ubl-settings-datetime.glade | 37 ++++++++++++++++++++++++++------- 3 files changed, 33 insertions(+), 10 deletions(-) diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index a322279..f4cf60e 100755 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -436,13 +436,13 @@ void MainWindow::wrapper_system(string cmd){ } -void MainWindow::hardware_clock_global(string &local, string &utc){ +void MainWindow::hardware_clock_global(string &local, string &etc){ int index = cbHw->get_active_row_number(); if (index == 0){ wrapper_system(local); } else if (index == 1){ - wrapper_system(utc); + wrapper_system(etc); } } diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h index 2069e94..dae17b1 100755 --- a/source/ubl-settings-datetime.h +++ b/source/ubl-settings-datetime.h @@ -130,7 +130,7 @@ class MainWindow : public Gtk::ApplicationWindow { MainWindow(BaseObjectType* obj, Glib::RefPtr const& builder); MainWindow(Glib::RefPtr const& builder); virtual ~MainWindow() = default; - void hardware_clock_global(string &local, string &utc); + void hardware_clock_global(string &local, string &etc); void info_warning_error(int mess); void synopsis_show(); void entry_hardware_clock(string &cmd); diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade index e4f42de..285ef8b 100644 --- a/ubl-settings-datetime.glade +++ b/ubl-settings-datetime.glade @@ -1024,17 +1024,17 @@ Format: DD.MM.YYYY True False - 5 + 10 5 5 - 5 + 10 6 10 False False - False + True True 1 @@ -1082,6 +1082,7 @@ Format: DD.MM.YYYY + 167 True False 5 @@ -1132,7 +1133,7 @@ Format: DD.MM.YYYY False - False + True True 5 @@ -1266,7 +1267,16 @@ Format: DD.MM.YYYY - + + True + False + pan-down-symbolic + + + False + True + 1 + @@ -1322,7 +1332,16 @@ Format: DD.MM.YYYY - + + True + False + pan-down-symbolic + + + False + True + 1 + @@ -1343,7 +1362,11 @@ Format: DD.MM.YYYY none popAbout - + + True + False + open-menu-symbolic +