Merge pull request 'master' (#121) from Igor1/ubl-settings-datetime:master into develop

Reviewed-on: #121

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);

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];

ubl-settings-datetime.desktop

@@ -1,11 +1,11 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=Date & time settings
+Name=Date and Time
-Name[ru]=Настройка даты и времени
+Name[ru]=Дата и Время
-GenericName=Date & time settings
+GenericName=Date and Time
-GenericName[ru]=Настройка даты и времени
+GenericName[ru]=Дата и Время
-Comment=Date time settings
+Comment=Setting the system date and time
-Comment[ru]=Приложение для настройки даты и времени
+Comment[ru]=Настройка даты и времени системы
 Type=Application
 Exec=pkexec ubl-settings-datetime
 Icon=com.ublinux.ubl-settings-datetime

ubl-settings-datetime.glade

@@ -163,8 +163,8 @@
         <property name="margin-right">5</property>
         <property name="margin-start">5</property>
         <property name="margin-end">5</property>
-        <property name="margin-top">5</property>
+        <property name="margin-top">6</property>
-        <property name="margin-bottom">5</property>
+        <property name="margin-bottom">6</property>
         <property name="pixel-size">69</property>
         <property name="icon-name">com.ublinux.ubl-settings-datetime</property>
       </object>
@@ -192,12 +192,16 @@
                     <property name="width-request">255</property>
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
+                    <property name="valign">end</property>
                     <property name="label" translatable="yes">Date and Time</property>
-                    <property name="xalign">0.25</property>
+                    <property name="xalign">0</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                       <attribute name="size" value="15360"/>
                     </attributes>
+                    <style>
+                      <class name="textHead"/>
+                    </style>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -205,29 +209,40 @@
                     <property name="position">0</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkLabel" id="headInfoLabel">
+                    <property name="width-request">255</property>
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="valign">start</property>
+                    <property name="label" translatable="yes">Setting the system date and time</property>
+                    <property name="xalign">0</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                      <attribute name="size" value="12288"/>
+                    </attributes>
+                    <style>
+                      <class name="textHead"/>
+                    </style>
                   </object>
                   <packing>
-                <property name="expand">False</property>
+                    <property name="expand">True</property>
                     <property name="fill">True</property>
-                <property name="position">0</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
-            <property name="expand">True</property>
+                <property name="expand">False</property>
                 <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
           </object>
           <packing>
-            <property name="expand">False</property>
+            <property name="expand">True</property>
             <property name="fill">True</property>
-            <property name="position">1</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </object>
@@ -1423,7 +1438,7 @@ Format: DD.MM.YYYY</property>
                 <property name="xpad">20</property>
                 <property name="ypad">20</property>
                 <property name="icon-name">dialog-question-symbolic</property>
-                <property name="icon_size">5</property>
+                <property name="icon_size">6</property>
               </object>
               <packing>
                 <property name="expand">False</property>

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 ""
 

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 "Настройки даты и времени"