Merge branch 'unstable'

elementary · Apr 12, 2019 · 2299c88 · 2299c88
2 parents dd948eb + 09f10bc
commit 2299c88
Show file tree

Hide file tree

Showing 19 changed files with 337 additions and 219 deletions.
diff --git a/data/com.github.stsdc.monitor.appdata.xml.in b/data/com.github.stsdc.monitor.appdata.xml.in
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2018 Stanisław <@ststdc> -->
+<!-- Copyright 2019 Stanisław <@ststdc> -->
 <component type="desktop">
   <id>com.github.stsdc.monitor</id>
   <metadata_license>CC0</metadata_license>
@@ -25,13 +25,10 @@
 <url type="help">https://github.com/stsdc/monitor/issues</url>
 
 <releases>
-    <release version="0.4.3" date="2019-04-03">
+    <release version="0.4.4" date="2019-04-12">
       <description>
          <ul>
-            <li>Add start-in-background command line option</li>
-            <li>Add Italian and Portuguese translations</li>
-            <li>Update Dutch, French and Spanish translations</li>
-            <li>Fix Japanese translation</li>
+            <li>Add start-in-background option to UI (Ryo Nakano)</li>
         </ul>
       </description>
     </release>

diff --git a/data/com.github.stsdc.monitor.gschema.xml b/data/com.github.stsdc.monitor.gschema.xml
@@ -25,5 +25,10 @@
       <summary>To show Monitor Indicator or not</summary>
       <description>To show Monitor Indicator or not</description>
     </key>
+    <key type='b' name="background-state">
+      <default>false</default>
+      <summary>To start Monitor in background or not</summary>
+      <description>To start Monitor in background or not</description>
+    </key>
   </schema>
 </schemalist>
diff --git a/data/com.github.stsdc.monitor.screenshot.png b/data/com.github.stsdc.monitor.screenshot.png
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+com.github.stsdc.monitor (0.4.4) bionic; urgency=low
+
+    * Add start-in-background option to UI
+
+-- Stanisław Dac <[email protected]>  Fri, 12 Apr 2019 18:17:34 +0200
+
 com.github.stsdc.monitor (0.4.3) bionic; urgency=low
 
     * Add start-in-background command line option

diff --git a/po/com.github.stsdc.monitor.pot b/po/com.github.stsdc.monitor.pot
@@ -8,13 +8,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: com.github.stsdc.monitor\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-03 22:44+0100\n"
+"POT-Creation-Date: 2019-04-12 18:26+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/Indicator/Widgets/PopoverWidget.vala:12
@@ -27,45 +27,49 @@ msgstr ""
 
 #. Some information about the indicator
 #. Unique name
-#: src/Indicator/Indicator.vala:43
+#: src/Indicator/Indicator.vala:44
 msgid "Monitor Indicator"
 msgstr ""
 
 #. Localised name
-#: src/Indicator/Indicator.vala:44
+#: src/Indicator/Indicator.vala:45
 msgid "Show system resources"
 msgstr ""
 
-#: src/Widgets/Headerbar.vala:11
+#: src/Widgets/Headerbar.vala:13
 msgid "Monitor"
 msgstr ""
 
-#: src/Widgets/Headerbar.vala:18
+#: src/Widgets/Headerbar.vala:20
 msgid "End process"
 msgstr ""
 
-#: src/Widgets/Headerbar.vala:21
+#: src/Widgets/Headerbar.vala:23
 msgid "Ctrl+E"
 msgstr ""
 
-#: src/Widgets/Headerbar.vala:28
+#: src/Widgets/Headerbar.vala:32
 msgid "Settings"
 msgstr ""
 
 #: src/Widgets/Headerbar.vala:46
-msgid "Show an indicator"
+msgid "Show an indicator:"
+msgstr ""
+
+#: src/Widgets/Headerbar.vala:52
+msgid "Start in background:"
 msgstr ""
 
 #. setup name column
 #: src/Widgets/OverallView.vala:21
 msgid "Process Name"
 msgstr ""
 
-#: src/Widgets/OverallView.vala:42
+#: src/Widgets/OverallView.vala:42 src/Widgets/Statusbar/Statusbar.vala:7
 msgid "CPU"
 msgstr ""
 
-#: src/Widgets/OverallView.vala:53
+#: src/Widgets/OverallView.vala:53 src/Widgets/Statusbar/Statusbar.vala:10
 msgid "Memory"
 msgstr ""
 
@@ -81,7 +85,7 @@ msgstr ""
 msgid "MiB"
 msgstr ""
 
-#: src/Widgets/OverallView.vala:118 src/Widgets/Statusbar.vala:25
+#: src/Widgets/OverallView.vala:118 src/Widgets/Statusbar/Statusbar.vala:28
 msgid "GiB"
 msgstr ""
 
@@ -93,12 +97,9 @@ msgstr ""
 msgid "Type Process Name or PID"
 msgstr ""
 
-#: src/Widgets/Statusbar.vala:9
-msgid "CPU:"
-msgstr ""
-
-#: src/Widgets/Statusbar.vala:10
-msgid "Memory:"
+#: src/Widgets/Statusbar/Statusbar.vala:12
+#: src/Widgets/Statusbar/Statusbar.vala:16
+msgid "Calculating…"
 msgstr ""
 
 #: src/Models/GenericModel.vala:274

diff --git a/po/de.po b/po/de.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-03 22:44+0100\n"
+"POT-Creation-Date: 2019-04-12 18:26+0200\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
@@ -17,45 +17,50 @@ msgstr "Monitor"
 
 #. Some information about the indicator
 #. Unique name
-#: src/Indicator/Indicator.vala:43
+#: src/Indicator/Indicator.vala:44
 msgid "Monitor Indicator"
 msgstr ""
 
 #. Localised name
-#: src/Indicator/Indicator.vala:44
+#: src/Indicator/Indicator.vala:45
 msgid "Show system resources"
 msgstr ""
 
-#: src/Widgets/Headerbar.vala:11
+#: src/Widgets/Headerbar.vala:13
 msgid "Monitor"
 msgstr "Monitor"
 
-#: src/Widgets/Headerbar.vala:18
+#: src/Widgets/Headerbar.vala:20
 msgid "End process"
 msgstr "Prozess beenden"
 
-#: src/Widgets/Headerbar.vala:21
+#: src/Widgets/Headerbar.vala:23
 msgid "Ctrl+E"
 msgstr "Strg+E"
 
-#: src/Widgets/Headerbar.vala:28
+#: src/Widgets/Headerbar.vala:32
 msgid "Settings"
 msgstr ""
 
 #: src/Widgets/Headerbar.vala:46
-msgid "Show an indicator"
+#, fuzzy
+msgid "Show an indicator:"
+msgstr "Monitor"
+
+#: src/Widgets/Headerbar.vala:52
+msgid "Start in background:"
 msgstr ""
 
 #. setup name column
 #: src/Widgets/OverallView.vala:21
 msgid "Process Name"
 msgstr "Prozess"
 
-#: src/Widgets/OverallView.vala:42
+#: src/Widgets/OverallView.vala:42 src/Widgets/Statusbar/Statusbar.vala:7
 msgid "CPU"
 msgstr "CPU"
 
-#: src/Widgets/OverallView.vala:53
+#: src/Widgets/OverallView.vala:53 src/Widgets/Statusbar/Statusbar.vala:10
 msgid "Memory"
 msgstr "Arbeitsspeicher"
 
@@ -71,7 +76,7 @@ msgstr "KiB"
 msgid "MiB"
 msgstr "MiB"
 
-#: src/Widgets/OverallView.vala:118 src/Widgets/Statusbar.vala:25
+#: src/Widgets/OverallView.vala:118 src/Widgets/Statusbar/Statusbar.vala:28
 msgid "GiB"
 msgstr "GiB"
 
@@ -83,14 +88,17 @@ msgstr "Suche"
 msgid "Type Process Name or PID"
 msgstr "Geben Sie den Prozessnamen oder PID ein"
 
-#: src/Widgets/Statusbar.vala:9
-msgid "CPU:"
-msgstr "CPU:"
-
-#: src/Widgets/Statusbar.vala:10
-msgid "Memory:"
-msgstr "Arbeitsspeicher"
+#: src/Widgets/Statusbar/Statusbar.vala:12
+#: src/Widgets/Statusbar/Statusbar.vala:16
+msgid "Calculating…"
+msgstr ""
 
 #: src/Models/GenericModel.vala:274
 msgid "Background Applications"
 msgstr "Hintergrundanwendungen"
+
+#~ msgid "CPU:"
+#~ msgstr "CPU:"
+
+#~ msgid "Memory:"
+#~ msgstr "Arbeitsspeicher"
diff --git a/po/es.po b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-03 22:44+0100\n"
+"POT-Creation-Date: 2019-04-12 18:26+0200\n"
 "PO-Revision-Date: 2019-03-31 10:43+0200\n"
 "Last-Translator: Raí B. Toffoletto <[email protected]>\n"
 "Language-Team: \n"
@@ -29,45 +29,50 @@ msgstr "Cerrar Monitor"
 
 #. Some information about the indicator
 #. Unique name
-#: src/Indicator/Indicator.vala:43
+#: src/Indicator/Indicator.vala:44
 msgid "Monitor Indicator"
 msgstr "Icone de panel"
 
 #. Localised name
-#: src/Indicator/Indicator.vala:44
+#: src/Indicator/Indicator.vala:45
 msgid "Show system resources"
 msgstr "Mostrar recursos del sistema"
 
-#: src/Widgets/Headerbar.vala:11
+#: src/Widgets/Headerbar.vala:13
 msgid "Monitor"
 msgstr "Monitor"
 
-#: src/Widgets/Headerbar.vala:18
+#: src/Widgets/Headerbar.vala:20
 msgid "End process"
 msgstr "Terminar proceso"
 
-#: src/Widgets/Headerbar.vala:21
+#: src/Widgets/Headerbar.vala:23
 msgid "Ctrl+E"
 msgstr "Ctrl+E"
 
-#: src/Widgets/Headerbar.vala:28
+#: src/Widgets/Headerbar.vala:32
 msgid "Settings"
 msgstr "Preferencias"
 
 #: src/Widgets/Headerbar.vala:46
-msgid "Show an indicator"
+#, fuzzy
+msgid "Show an indicator:"
 msgstr "Mostrar icone de panel"
 
+#: src/Widgets/Headerbar.vala:52
+msgid "Start in background:"
+msgstr ""
+
 #. setup name column
 #: src/Widgets/OverallView.vala:21
 msgid "Process Name"
 msgstr "Nombre del proceso"
 
-#: src/Widgets/OverallView.vala:42
+#: src/Widgets/OverallView.vala:42 src/Widgets/Statusbar/Statusbar.vala:7
 msgid "CPU"
 msgstr "CPU"
 
-#: src/Widgets/OverallView.vala:53
+#: src/Widgets/OverallView.vala:53 src/Widgets/Statusbar/Statusbar.vala:10
 msgid "Memory"
 msgstr "Memoria"
 
@@ -83,7 +88,7 @@ msgstr "KiB"
 msgid "MiB"
 msgstr "MiB"
 
-#: src/Widgets/OverallView.vala:118 src/Widgets/Statusbar.vala:25
+#: src/Widgets/OverallView.vala:118 src/Widgets/Statusbar/Statusbar.vala:28
 msgid "GiB"
 msgstr "GiB"
 
@@ -95,14 +100,17 @@ msgstr "Buscar proceso"
 msgid "Type Process Name or PID"
 msgstr "Introduce el nombre del proceso o el PID"
 
-#: src/Widgets/Statusbar.vala:9
-msgid "CPU:"
-msgstr "CPU :"
-
-#: src/Widgets/Statusbar.vala:10
-msgid "Memory:"
-msgstr "Memoria :"
+#: src/Widgets/Statusbar/Statusbar.vala:12
+#: src/Widgets/Statusbar/Statusbar.vala:16
+msgid "Calculating…"
+msgstr ""
 
 #: src/Models/GenericModel.vala:274
 msgid "Background Applications"
 msgstr "Aplicaciones en segundo plano"
+
+#~ msgid "CPU:"
+#~ msgstr "CPU :"
+
+#~ msgid "Memory:"
+#~ msgstr "Memoria :"