From 1f6a218693dcdfb07c6e711ddacde849319d7b69 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Thu, 23 Mar 2023 10:36:46 +0600 Subject: [PATCH 1/2] =?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=B4=D0=B8=D0=B7=D0=B0=D0=B9=D0=BD=20=D1=88?= =?UTF-8?q?=D0=B0=D0=BF=D0=BA=D0=B8=20=D0=B8=20=D1=82=D0=B5=D0=BA=D1=81?= =?UTF-8?q?=D1=82=D0=B0=20=D1=88=D0=B0=D0=BF=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ubl-settings-datetime.cc | 9 +- source/ubl-settings-datetime.h | 3 - ubl-settings-datetime.css | 3 +- ubl-settings-datetime.glade | 233 +++++++++++++++++--------------- ubl-settings-datetime.pot | 2 +- ubl-settings-datetime_ru.po | 4 +- 6 files changed, 129 insertions(+), 125 deletions(-) diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index 99a11c9..743978b 100755 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -149,7 +149,7 @@ void MainWindow::lacalization() { lblZone->set_text(gettext("Zone:")); lblSynchronizeBtn->set_text(gettext("Sync by")); lblHeader->set_text(gettext("ubl-settings-datetime")); - windowMessDchp->set_title(gettext("Warning!")); + windowMessDchp->set_title(gettext("Attention")); lblTimeBios->set_text(gettext("Synchronize hardware time")); lblHW->set_text(gettext("Synchronize hardware time:")); array_hw_local[0] = gettext("UTC time"); @@ -278,8 +278,6 @@ void MainWindow::get_builder() { builder->get_widget("lblSynchronizeBtn", lblSynchronizeBtn); builder->get_widget("lblTimeBios", lblTimeBios); builder->get_widget("btnHardwareTime",btnHardwareTime); - builder->get_widget("lblMessageSudo", lblMessageSudo); - builder->get_widget("btnMessCloseSudo",btnMessCloseSudo); builder->get_widget("lblSave", lblSave); builder->get_widget("lblLoad", lblLoad); builder->get_widget("aboutWindows", aboutWindows); @@ -317,14 +315,9 @@ void MainWindow::get_builder() { } -void MainWindow::gui_exit() { - exit(1); -} - void MainWindow::event() { btnHardwareTime->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::hardware_clock)); btnMessClose->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::gui_mess_close)); - btnMessCloseSudo->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::gui_exit)); //cldrDate->signal_day_selected().connect(sigc::mem_fun(*this, &MainWindow::get_calendar)); btnUpdateDateTime->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::update_time_date)); btnChooseDate->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::calendar_show)); diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h index cf0933d..2fb08f7 100644 --- a/source/ubl-settings-datetime.h +++ b/source/ubl-settings-datetime.h @@ -54,7 +54,6 @@ class MainWindow : public Gtk::ApplicationWindow { Glib::RefPtr builder; Gtk::Button *btnUpdateDateTime; Gtk::Button *btnChooseDate; - Gtk::Button *btnMessCloseSudo; Gtk::Button *btnMessClose; Gtk::ComboBoxText *cbDhcp; Gtk::SpinButton *numTimeHrs; @@ -66,7 +65,6 @@ class MainWindow : public Gtk::ApplicationWindow { Gtk::Popover *popCalendar; Gtk::Calendar *cldrDate; Gtk::Label *lblMessage; - Gtk::Label *lblMessageSudo; Gtk::Label *lblDateTimeSetting; Gtk::Label *lblHead; Gtk::Label *lblTime; @@ -203,7 +201,6 @@ class MainWindow : public Gtk::ApplicationWindow { void parse_text_date(); void hardware_clock(); void set_ntp_toggle_glob(); - void gui_exit(); void wind_close_ntp(); void wrapper_system(string cmd, string thread_str); void info_status_app(string stule); diff --git a/ubl-settings-datetime.css b/ubl-settings-datetime.css index 57095ec..8458a42 100644 --- a/ubl-settings-datetime.css +++ b/ubl-settings-datetime.css @@ -6,7 +6,8 @@ background-color: #f3f0ac; } .textHead{ - text-shadow: 1px 1px #ffffff; + text-shadow: 2px 2px @theme_bg_color; + color: @theme_text_color; } .textHeaderBar{ font-weight: bold; diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade index a62872a..5009dd2 100644 --- a/ubl-settings-datetime.glade +++ b/ubl-settings-datetime.glade @@ -2,6 +2,88 @@ + + False + Внимание! + com.ublinux.ubl-settings-datetime + dialog + + + True + False + vertical + + + True + False + 5 + 5 + 5 + 5 + + + True + False + 5 + 5 + 5 + 6 + 6 + 50 + gtk-dialog-warning + + + True + True + 0 + + + + + 160 + True + False + start + center + 6 + 6 + Enter DHCP ! + + + True + True + 1 + + + + + False + True + 1 + + + + + OK + True + True + True + 5 + 5 + 5 + 5 + 3 + 3 + + + False + True + 1 + + + + + False О Программе @@ -94,9 +176,7 @@ False Date and time settings - - @@ -279,7 +359,7 @@ 6 - + @@ -309,6 +389,7 @@ True False + start -1 @@ -1197,9 +1278,8 @@ Format: DD.MM.YYYY False - Внимание! - com.ublinux.ubl-settings-datetime - dialog + start + False True @@ -1209,55 +1289,59 @@ Format: DD.MM.YYYY True False - 5 - 5 - 5 - 5 True False - 5 - 5 - 5 - 6 - 6 - 50 - gtk-dialog-warning + center + start + 20 + 20 + 20 + 20 + 20 + 20 + dialog-warning-symbolic + 6 - True + False True - 0 + 1 - 160 True False - start + center center - 6 - 6 - Enter DHCP ! + 10 + 25 + 10 + 25 + 20 + 20 + Enter DHCP ! + True + 0 True True - 1 + 2 - False + True True - 1 + 0 - OK + Close True True True @@ -1265,102 +1349,31 @@ Format: DD.MM.YYYY 5 5 5 - 3 - 3 + 5 + 5 False True - 1 + 2 - - - False - popup - Внимание! - center - com.ublinux.ubl-settings-datetime - dialog - - + + True False - vertical + Attention + True - + True False - 5 - 5 - 5 - 5 - - - True - False - 5 - 5 - 5 - 6 - 6 - 50 - gtk-dialog-warning - - - True - True - 0 - - - - - 160 - True - False - start - center - 5 - 5 - 5 - 5 - 6 - 6 - Enter DHCP ! - - - True - True - 1 - - - - - False - True - 1 - - - - - OK - True - True - True - 5 - 5 - 5 - 5 - 3 - 3 + 32 + com.ublinux.ubl-settings-datetime + 5 - - False - True - 1 - diff --git a/ubl-settings-datetime.pot b/ubl-settings-datetime.pot index 411dc9f..6fd54d6 100644 --- a/ubl-settings-datetime.pot +++ b/ubl-settings-datetime.pot @@ -1815,7 +1815,7 @@ msgid "Wallis" msgstr "" #: source/ubl-settings-datetime.cc:147 -msgid "Warning!" +msgid "Attention" msgstr "" msgid "Warsaw" diff --git a/ubl-settings-datetime_ru.po b/ubl-settings-datetime_ru.po index ae2ef8a..5f91c3d 100644 --- a/ubl-settings-datetime_ru.po +++ b/ubl-settings-datetime_ru.po @@ -1839,8 +1839,8 @@ msgid "Wallis" msgstr "Уоллис" #: source/ubl-settings-datetime.cc:147 -msgid "Warning!" -msgstr "Внимание!" +msgid "Attention" +msgstr "Внимание" msgid "Warsaw" msgstr "Варшава" From 5e1f82890eec9bd156c8d6b08a97403810e7f4b6 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Thu, 23 Mar 2023 10:46:59 +0600 Subject: [PATCH 2/2] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=B8=D0=BA=D0=BE=D0=BD=D0=BA=D0=B0=20?= =?UTF-8?q?=D0=B2=20=D1=82=D1=80=D0=B5=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ubl-settings-datetime.glade | 1 + 1 file changed, 1 insertion(+) diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade index 5009dd2..fbadc70 100644 --- a/ubl-settings-datetime.glade +++ b/ubl-settings-datetime.glade @@ -313,6 +313,7 @@ 659 False + com.ublinux.ubl-settings-datetime True