diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index 75e93f9..256c87f 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]; diff --git a/ubl-settings-datetime.desktop b/ubl-settings-datetime.desktop index 11ef493..8e77257 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]=Настройка даты и времени -Comment=Date time settings -Comment[ru]=Приложение для настройки даты и времени +Name=Date and Time +Name[ru]=Дата и Время +GenericName=Date and Time +GenericName[ru]=Дата и Время +Comment=Setting the system date and time +Comment[ru]=Настройка даты и времени системы Type=Application Exec=pkexec ubl-settings-datetime Icon=com.ublinux.ubl-settings-datetime diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade index a947538..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 @@ -1423,7 +1438,7 @@ Format: DD.MM.YYYY 20 20 dialog-question-symbolic - 5 + 6 False 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 "Настройки даты и времени"