Исправил значки в справке

2 years ago · 037d2e2a42
parent 54c340d375
commit 037d2e2a42
4 changed files with 92 additions and 45 deletions
--- a/source/view/ubl-strings.h
+++ b/source/view/ubl-strings.h
@ -1,8 +1,8 @@
 #define VERSION_LABEL yon_char_unite(_("Version:")," ",version_application,"\n",NULL)
 #define HELP_LABEL yon_char_unite(_("ubl-settings-resourcequota version:")," ", version_application,"\n",_("TEMPLATE settings"),"\n",_("Usage:"), " ubl-settings-resourcequota ",_("[OPTIONS]"),"\n",_("Options:"),"\n\t--help, -h\t\t\t",_("Show this help"),"\n\t--version, -V\t\t\t",_("Show package version"),"\n\t--lock-help\t\t\t",_("Lock this help menu"),"\n\t--lock-save\t\t\t",_("Lock configuration saving"),"\n\t--lock-save-local\t\t",_("Lock local configration saving"),"\n\t--lock-save-global\t\t",_("Lock global configration saving"),"\n\t--lock-load-global\t\t",_("Lock global configration loading"),"\n",NULL)

-#define TITLE_LABEL _("TEMPLATE Manager")
-#define TITLE_INFO_LABEL _("System TEMPLATE settings management")
+#define TITLE_LABEL _("ubl-settings-resourcequota")
+#define TITLE_INFO_LABEL _("System resource quota settings management")

 #define ABOUT_LABEL _("About")
 #define DOCUMENTATION_LABEL _("Documentation")
@ -12,7 +12,7 @@
 #define SAVE_LABEL _("Save")
 #define LOAD_LOCAL_LABEL _("Load local configuration")
 #define LOAD_GLOBAL_LABEL _("Load global configuration")
-#define LOAD_LABEL _("load")
+#define LOAD_LABEL _("Load")

 #define CANCEL_LABEL _("Cancel")

--- a/ubl-settings-resourcequota.glade
+++ b/ubl-settings-resourcequota.glade
@ -11,10 +11,10 @@
    <property name="icon-name">com.ublinux.ubl-settings-TEMPLATE</property>
    <property name="type-hint">dialog</property>
    <property name="urgency-hint">True</property>
-    <property name="program-name">ubl-settings-TEMPLATE</property>
-    <property name="version">1.1</property>
+    <property name="program-name">ubl-settings-resourcequota</property>
+    <property name="version">1.0</property>
    <property name="copyright" translatable="yes">Copyright © 2022 - 2023, UBSoft LLC</property>
-    <property name="comments" translatable="yes">TEMPLATE</property>
+    <property name="comments" translatable="yes">ubl-settings-resourcequota</property>
    <property name="website">https://wiki.ublinux.ru/ru/Программное_обеспечение/Программы_и_утилиты/Все/ubl-settings-TEMPLATE</property>
    <property name="website-label" translatable="yes">Project Home Page</property>
    <property name="license" translatable="yes">Это приложение распространяется без каких-либо гарантий.
@ -26,17 +26,24 @@
    <property name="license-type">gpl-2-0</property>
    <child internal-child="vbox">
      <object class="GtkBox">
+        <property name="visible">True</property>
        <property name="can-focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
        <child internal-child="action_area">
          <object class="GtkButtonBox">
            <property name="can-focus">False</property>
+            <property name="layout-style">end</property>
          </object>
          <packing>
            <property name="expand">False</property>
            <property name="fill">False</property>
-            <property name="position">0</property>
+            <property name="position">1</property>
          </packing>
        </child>
+        <child>
+          <placeholder/>
+        </child>
      </object>
    </child>
    <child type="titlebar">
@ -52,7 +59,7 @@
            <property name="margin-start">5</property>
            <property name="margin-end">5</property>
            <property name="margin-bottom">2</property>
-            <property name="label" translatable="yes">TEMPLATE</property>
+            <property name="label" translatable="yes">ubl-settings-resourcequota</property>
            <attributes>
              <attribute name="weight" value="bold"/>
            </attributes>
@ -76,7 +83,7 @@
        <property name="margin-top">6</property>
        <property name="margin-bottom">6</property>
        <property name="pixel-size">69</property>
-        <property name="icon-name">com.ublinux.ubl-settings-TEMPLATE</property>
+        <property name="icon-name">com.ublinux.ubl-settings-resourcequota</property>
      </object>
      <packing>
        <property name="expand">False</property>
@ -125,7 +132,7 @@
                    <property name="visible">True</property>
                    <property name="can-focus">False</property>
                    <property name="valign">start</property>
-                    <property name="label" translatable="yes">TEMPLATE</property>
+                    <property name="label" translatable="yes">ubl-settings-resourcequota</property>
                    <property name="xalign">0</property>
                    <attributes>
                      <attribute name="weight" value="bold"/>
@ -163,6 +170,45 @@
      </packing>
    </child>
  </object>
+  <object class="GtkImage" id="image1">
+    <property name="visible">True</property>
+    <property name="can-focus">False</property>
+    <property name="icon-name">ibus-panel</property>
+  </object>
+  <object class="GtkImage" id="image2">
+    <property name="visible">True</property>
+    <property name="can-focus">False</property>
+    <property name="icon-name">dialog-question-symbolic</property>
+  </object>
+  <object class="GtkMenu" id="menuAbout">
+    <property name="visible">True</property>
+    <property name="can-focus">False</property>
+    <property name="reserve-toggle-size">False</property>
+    <child>
+      <object class="GtkImageMenuItem" id="DocumentationMenuItem">
+        <property name="label" translatable="yes">imagemenuitem</property>
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="image">image2</property>
+        <property name="use-stock">False</property>
+        <style>
+          <class name="menuitemtop"/>
+        </style>
+      </object>
+    </child>
+    <child>
+      <object class="GtkImageMenuItem" id="AboutMenuItem">
+        <property name="label" translatable="yes">imagemenuitem</property>
+        <property name="visible">True</property>
+        <property name="can-focus">False</property>
+        <property name="image">image1</property>
+        <property name="use-stock">False</property>
+        <style>
+          <class name="menuitembottom"/>
+        </style>
+      </object>
+    </child>
+  </object>
  <object class="GtkImage" id="image8">
    <property name="visible">True</property>
    <property name="can-focus">False</property>
@ -385,37 +431,6 @@ translated and supported by community.</property>
      <column type="gchararray"/>
    </columns>
  </object>
-  <object class="GtkMenu" id="menuAbout">
-    <property name="visible">True</property>
-    <property name="can-focus">False</property>
-    <property name="reserve-toggle-size">False</property>
-    <child>
-      <object class="GtkCheckMenuItem" id="chbMangSystemFile">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <property name="margin-left">7</property>
-        <property name="margin-start">7</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="DocumentationMenuItem">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <style>
-          <class name="menuitemtop"/>
-        </style>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="AboutMenuItem">
-        <property name="visible">True</property>
-        <property name="can-focus">False</property>
-        <style>
-          <class name="menuitembottom"/>
-        </style>
-      </object>
-    </child>
-  </object>
  <object class="GtkMenu" id="menuLoad">
    <property name="visible">True</property>
    <property name="can-focus">False</property>
@ -457,7 +472,7 @@ translated and supported by community.</property>
        <property name="visible">True</property>
        <property name="can-focus">False</property>
        <style>
-          <class name="menuitembottom"/>
+          <class name="menuitemmiddle"/>
        </style>
      </object>
    </child>
@ -466,6 +481,9 @@ translated and supported by community.</property>
        <property name="visible">True</property>
        <property name="can-focus">False</property>
        <property name="use-underline">True</property>
+        <style>
+          <class name="menuitembottom"/>
+        </style>
      </object>
    </child>
  </object>
@ -475,7 +493,7 @@ translated and supported by community.</property>
    <property name="can-focus">False</property>
    <property name="default-width">800</property>
    <property name="default-height">600</property>
-    <property name="icon-name">com.ublinux.ubl-settings-TEMPLATE</property>
+    <property name="icon-name">com.ublinux.ubl-settings-resourcequota</property>
    <child>
      <object class="GtkBox" id="plugBox">
        <property name="visible">True</property>
@ -1417,7 +1435,7 @@ translated and supported by community.</property>
            <property name="margin-start">5</property>
            <property name="margin-end">5</property>
            <property name="margin-bottom">2</property>
-            <property name="label" translatable="yes">TEMPLATE</property>
+            <property name="label" translatable="yes">ubl-settings-resourcequota</property>
            <attributes>
              <attribute name="weight" value="bold"/>
            </attributes>
@ -1434,7 +1452,7 @@ translated and supported by community.</property>
            <property name="margin-top">6</property>
            <property name="margin-bottom">6</property>
            <property name="pixel-size">32</property>
-            <property name="icon-name">com.ublinux.ubl-settings-TEMPLATE</property>
+            <property name="icon-name">com.ublinux.ubl-settings-resourcequota</property>
          </object>
        </child>
        <child>
--- a/ubl-settings-resourcequota.pot
+++ b/ubl-settings-resourcequota.pot
@ -17,6 +17,19 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

+msgid "Documentation"
+msgstr ""
+
+msgid "Save to local configuration"
+msgstr ""
+
+#: source/ubl-strings.h:10
+msgid "Save to global configuration"
+msgstr ""
+
+#: source/ubl-strings.h:11
+msgid "Save configuration"
+msgstr ""

 msgid "Kb"
 msgstr ""
--- a/ubl-settings-resourcequota_ru.po
+++ b/ubl-settings-resourcequota_ru.po
@ -16,6 +16,22 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit"
+#: source/ubl-strings.h:9
+#: source/ubl-strings.h:8
+
+msgid "Documentation"
+msgstr "Справка"
+
+msgid "Save to local configuration"
+msgstr "Сохранить в локальную конфигурацию"
+
+#: source/ubl-strings.h:10
+msgid "Save to global configuration"
+msgstr "Сохранить в глобальную конфигурацию"
+
+#: source/ubl-strings.h:11
+msgid "Save configuration"
+msgstr "Сохранить конфигурацию"

 msgid "Kb"
 msgstr "Кб"