From 1b040263daf7c17f3d9d658e448d7c72f2492a5a Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Fri, 19 May 2023 16:10:49 +0600 Subject: [PATCH 1/5] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BE=D1=87=D0=B8=D1=82=D0=BA=D1=83=20=D0=B1=D1=80?= =?UTF-8?q?=D0=B0=D1=83=D0=B7=D0=B5=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ubl-settings-datetime.cc | 15 +++++++++------ source/ubl-settings-datetime.h | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index 88ff657..7488228 100644 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -94,11 +94,6 @@ void MainWindow::settings() { day = 0; this->lacalization(); btnBoxAboutDialog->set_visible(false); - #ifdef WEBKIT_FOUND - one = WEBKIT_WEB_VIEW( webkit_web_view_new() ); - three = Glib::wrap(GTK_WIDGET(one)); - wndWeb->add(*three); - #endif if (geteuid() == 0) { numTimeHrs->set_range(0, 23); numTimeMin->set_range(0, 59); @@ -430,7 +425,15 @@ void MainWindow::open_help() { void MainWindow::open_browser() { #ifdef WEBKIT_FOUND - webkit_web_view_load_uri(one, _(global_lick_doc.c_str())); + if (my_web_kit) { + gtk_widget_destroy(GTK_WIDGET(my_web_kit)); + } + my_web_kit = WEBKIT_WEB_VIEW(webkit_web_view_new()); + three = Glib::wrap(GTK_WIDGET(my_web_kit)); + wndWeb->add(*three); + webkit_web_view_load_uri(my_web_kit, _(global_lick_doc.c_str())); + wndWeb->show_all(); + webkit_web_view_load_uri(my_web_kit, _(global_lick_doc.c_str())); wndWeb->show_all(); #else this->template_open_browser(global_lick_doc); diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h index 6425c94..f46262f 100644 --- a/source/ubl-settings-datetime.h +++ b/source/ubl-settings-datetime.h @@ -237,7 +237,7 @@ class MainWindow : public Gtk::ApplicationWindow { #ifdef WEBKIT_FOUND Gtk::Window *wndWeb; Gtk::Widget *three; - WebKitWebView *one; + WebKitWebView *my_web_kit = NULL; #endif string array_hw[2]; string array_hw_local[2]; -- 2.35.1 From 169dcedc677450cd9b3c36b73a436278b7a604ef Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 24 May 2023 10:52:17 +0600 Subject: [PATCH 2/5] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=B8=D0=BA=D0=BE=D0=BD=D0=BA=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ubl-settings-datetime.glade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade index a947538..21e1739 100644 --- a/ubl-settings-datetime.glade +++ b/ubl-settings-datetime.glade @@ -1423,7 +1423,7 @@ Format: DD.MM.YYYY 20 20 dialog-question-symbolic - 5 + 6 False -- 2.35.1 From 79b0147cc119299f262073268f3d733fc10b44a7 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 24 May 2023 11:12:35 +0600 Subject: [PATCH 3/5] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20=D0=BE=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=B2=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=B3=D0=BE=D0=BB=D0=BE=D0=B2=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ubl-settings-datetime.glade | 43 +++++++++++++++++++++++++------------ ubl-settings-datetime.pot | 3 +++ ubl-settings-datetime_ru.po | 3 +++ 3 files changed, 35 insertions(+), 14 deletions(-) diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade index 21e1739..21db2fa 100644 --- a/ubl-settings-datetime.glade +++ b/ubl-settings-datetime.glade @@ -163,8 +163,8 @@ 5 5 5 - 5 - 5 + 6 + 6 69 com.ublinux.ubl-settings-datetime @@ -192,12 +192,16 @@ 255 True False + end Date and Time - 0.25 + 0 + True @@ -205,6 +209,28 @@ 0 + + + 255 + True + False + start + Setting the system date and time + 0 + + + + + + + + True + True + 1 + + False @@ -219,17 +245,6 @@ 0 - - - True - False - - - False - True - 1 - - True diff --git a/ubl-settings-datetime.pot b/ubl-settings-datetime.pot index a570d35..1644a6a 100644 --- a/ubl-settings-datetime.pot +++ b/ubl-settings-datetime.pot @@ -2034,6 +2034,9 @@ msgid "" "translated and supported by community." msgstr "" +msgid "Setting the system date and time" +msgstr "" + msgid "Yukon" msgstr "" diff --git a/ubl-settings-datetime_ru.po b/ubl-settings-datetime_ru.po index 0812ab1..64fdbaf 100644 --- a/ubl-settings-datetime_ru.po +++ b/ubl-settings-datetime_ru.po @@ -1711,6 +1711,9 @@ msgstr "Настройка даты и времени в глобальной к msgid "Setting the date and time" msgstr "Настройка даты и времени" +msgid "Setting the system date and time" +msgstr "Настройка даты и времени системы" + msgid "Settings the date and time" msgstr "Настройки даты и времени" -- 2.35.1 From 4c3ef0782c8c8aa577082c0b4b608864de06b74d Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 24 May 2023 12:07:56 +0600 Subject: [PATCH 4/5] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20desktop=20=D1=84=D0=B0=D0=B9=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ubl-settings-datetime.desktop | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ubl-settings-datetime.desktop b/ubl-settings-datetime.desktop index 11ef493..01a7c86 100644 --- a/ubl-settings-datetime.desktop +++ b/ubl-settings-datetime.desktop @@ -1,11 +1,11 @@ [Desktop Entry] Encoding=UTF-8 -Name=Date & time settings -Name[ru]=Настройка даты и времени -GenericName=Date & time settings -GenericName[ru]=Настройка даты и времени +Name=Date and Time +Name[ru]=Дата и Время +GenericName=Date and Time +GenericName[ru]=Дата и Время Comment=Date time settings -Comment[ru]=Приложение для настройки даты и времени +Comment[ru]=Настройка даты и времени системы Type=Application Exec=pkexec ubl-settings-datetime Icon=com.ublinux.ubl-settings-datetime -- 2.35.1 From 3a2fcc4f9435c0fe466a32ae9f2d9969a6390552 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 24 May 2023 12:08:50 +0600 Subject: [PATCH 5/5] fix --- ubl-settings-datetime.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubl-settings-datetime.desktop b/ubl-settings-datetime.desktop index 01a7c86..8e77257 100644 --- a/ubl-settings-datetime.desktop +++ b/ubl-settings-datetime.desktop @@ -4,7 +4,7 @@ Name=Date and Time Name[ru]=Дата и Время GenericName=Date and Time GenericName[ru]=Дата и Время -Comment=Date time settings +Comment=Setting the system date and time Comment[ru]=Настройка даты и времени системы Type=Application Exec=pkexec ubl-settings-datetime -- 2.35.1