Merge branch 'unstable'

elementary · Oct 29, 2019 · 7138bd2 · 7138bd2
2 parents e3ba5e0 + a1e7689
commit 7138bd2
Show file tree

Hide file tree

Showing 38 changed files with 629 additions and 348 deletions.
diff --git a/README.md b/README.md
@@ -22,21 +22,21 @@
 
 ![Monitor Screenshot](https://github.com/stsdc/monitor/raw/master/data/com.github.stsdc.monitor.screenshot.png)
 
-## Building and Installation
+## Development
 
-You'll need the following dependencies to build:
+### Install dependencies
 
 * valac
 * libgtk-3-dev
-* libgranite-dev
+* libgranite-dev (>= 5.2.0)
 * libbamf3-dev
 * libwnck-3-dev
 * libgtop2-dev
 * libwingpanel-2.0-dev
 * libxml2-utils
 * meson
 
-## How To Build
+### Clone, Build & Install
 
     git clone https://github.com/stsdc/monitor
     cd monitor
@@ -47,7 +47,9 @@ You'll need the following dependencies to build:
 ### Debug
 `G_MESSAGES_DEBUG=all ./com.github.stsdc.monitor`
 
-## Arch Linux
+## Other OSes
+
+### Arch Linux
 
 Arch Linux users can find Monitor under the name [pantheon-system-monitor-git](https://aur.archlinux.org/packages/pantheon-system-monitor-git/) in the **AUR**:
 

diff --git a/data/com.github.stsdc.monitor.appdata.xml.in b/data/com.github.stsdc.monitor.appdata.xml.in
@@ -25,18 +25,14 @@
 <url type="help">https://github.com/stsdc/monitor/issues</url>
 
 <releases>
-    <release version="0.5.0" date="2019-06-07">
+    <release version="0.6.0" date="2019-10-29">
       <description>
          <ul>
-            <li>Fix contents of the window are not shown (Ryo Nakano)</li>
-            <li>Fix no row is still selected when indicator options are enabled (Ryo Nakano)</li>
-            <li>Fix the app crashes by clicking the "End/Kill Process" buttons when no process is selected (Ryo Nakano)</li>
-            <li>Added buttons to either "kill" or "end" a process. (Evan Buss)</li>
-            <li>Change screenshot to English (Christopher Crouse)</li>
-            <li>Update Russian translation (camellan)</li>
-            <li>Check if the default display is a X11 display (Hannes Schulze)</li>
-            <li>Update German translation (J0Ar)</li>
-            <li>Update Spanish translation (Mario Rodrigo)</li>
+           <li> Update Italian translation (Mirko Brombin)</li>
+           <li> Show swap usage (Ryo Nakano)</li>
+           <li> Update Russian translation (camellan)</li>
+           <li> Code refactoring (Ryo Nakano)</li>
+          <li> Update Japanese translation (Ryo Nakano)</li>
         </ul>
       </description>
     </release>

diff --git a/data/com.github.stsdc.monitor.gschema.xml b/data/com.github.stsdc.monitor.gschema.xml
@@ -20,6 +20,16 @@
       <summary>Window height</summary>
       <description>Window height</description>
     </key>
+    <key type="i" name="position-x">
+      <default>-1</default>
+      <summary>Window X position</summary>
+      <description>Window X position</description>
+    </key>
+    <key type="i" name="position-y">
+      <default>-1</default>
+      <summary>Window Y position</summary>
+      <description>Window Y position</description>
+    </key>
     <key type='b' name="indicator-state">
       <default>false</default>
       <summary>To show Monitor Indicator or not</summary>

diff --git a/data/icons/icons.indicator.gresource.xml b/data/icons/icons.indicator.gresource.xml
@@ -3,5 +3,6 @@
   <gresource prefix="/com/github/stsdc/monitor/icons">
     <file compressed="true" preprocess="xml-stripblanks">cpu-symbolic.svg</file>
     <file compressed="true" preprocess="xml-stripblanks">ram-symbolic.svg</file>
+    <file compressed="true" preprocess="xml-stripblanks">swap-symbolic.svg</file>
   </gresource>
 </gresources>
diff --git a/data/icons/swap-symbolic.svg b/data/icons/swap-symbolic.svg
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,13 @@
+com.github.stsdc.monitor (0.6.0) bionic; urgency=low
+
+      * Update Italian translation (Mirko Brombin)
+      * Show swap usage (Ryo Nakano)
+      * Update Russian translation (camellan)
+      * Code refactoring (Ryo Nakano)
+      * Update Japanese translation (Ryo Nakano)
+
+-- Stanisław Dac <[email protected]>  Tue, 29 Oct 2019 17:48:02 +0100
+
 com.github.stsdc.monitor (0.5.0) bionic; urgency=low
 
       * Fix contents of the window are not shown (Ryo Nakano)

diff --git a/debian/control b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: meson,
                libgtk-3-dev,
                libglib2.0-dev,
                valac (>= 0.26),
-               libgranite-dev,
+               libgranite-dev (>= 5.2.0),
                libbamf3-dev,
                libwnck-3-dev,
                libgtop2-dev,

diff --git a/meson.build b/meson.build
@@ -1,13 +1,13 @@
 
-project('com.github.stsdc.monitor', 'vala', 'c', version: '0.5.0')
+project('com.github.stsdc.monitor', 'vala', 'c', version: '0.6.0')
 
 # these are Meson modules
 gnome = import('gnome')
 i18n = import('i18n')
 
 # and these are project dependencies
 glib = dependency('glib-2.0')
-granite = dependency('granite')
+granite = dependency('granite', version: '>= 5.2.0')
 gtk = dependency('gtk+-3.0')
 gee = dependency('gee-0.8')
 gio = dependency('gio-2.0')
@@ -56,14 +56,14 @@ executable(
     'src/Managers/ProcessManager.vala',
     'src/Managers/Process.vala',
 
-    'src/Services/Settings.vala',
     'src/Services/Shortcuts.vala',
     'src/Services/DBusServer.vala',
     'src/Services/Updater.vala',
 
     'src/Resources/CPU.vala',
     'src/Resources/Core.vala',
     'src/Resources/Memory.vala',
+    'src/Resources/Swap.vala',
     c_args: c_args,
     dependencies: [
         glib,
@@ -92,11 +92,9 @@ shared_module(
 
     'src/Indicator/Widgets/DisplayWidget.vala',
     'src/Indicator/Widgets/PopoverWidget.vala',
-    'src/Indicator/Widgets/CPUWidget.vala',
-    'src/Indicator/Widgets/MemoryWidget.vala',
+    'src/Indicator/Widgets/IndicatorWidget.vala',
 
     'src/Indicator/Services/DBusClient.vala',
-    'src/Services/Settings.vala',
     # 'src/Widgets/RevealerSwitch.vala',
     icons_gresource,
     c_args: c_args,
@@ -108,8 +106,8 @@ shared_module(
         wingpanel
     ],
     install: true,
-    # install_dir : wingpanel.get_pkgconfig_variable('indicatorsdir'), <- installs to /usr/local/
-    install_dir : '/usr/lib/x86_64-linux-gnu/wingpanel/'
+    install_dir : wingpanel.get_pkgconfig_variable('indicatorsdir'),
+    # install_dir : '/usr/lib/x86_64-linux-gnu/wingpanel/'
 
 )
 

diff --git a/po/POTFILES b/po/POTFILES
@@ -10,5 +10,4 @@ src/Managers/AppManager.vala
 src/Managers/ProcessManager.vala
 src/Managers/Process.vala
 src/Models/GenericModel.vala
-src/Services/Settings.vala
 src/Services/Shortcuts.vala
diff --git a/po/com.github.stsdc.monitor.pot b/po/com.github.stsdc.monitor.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: com.github.stsdc.monitor\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-12 18:26+0200\n"
+"POT-Creation-Date: 2019-10-17 21:21+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"
@@ -36,27 +36,35 @@ msgstr ""
 msgid "Show system resources"
 msgstr ""
 
-#: src/Widgets/Headerbar.vala:13
+#: src/Widgets/Headerbar.vala:15
 msgid "Monitor"
 msgstr ""
 
-#: src/Widgets/Headerbar.vala:20
-msgid "End process"
+#: src/Widgets/Headerbar.vala:23
+msgid "End Process"
 msgstr ""
 
-#: src/Widgets/Headerbar.vala:23
-msgid "Ctrl+E"
+#: src/Widgets/Headerbar.vala:26
+msgid "End selected process"
+msgstr ""
+
+#: src/Widgets/Headerbar.vala:30
+msgid "Kill Process"
 msgstr ""
 
 #: src/Widgets/Headerbar.vala:32
+msgid "Kill selected process"
+msgstr ""
+
+#: src/Widgets/Headerbar.vala:42
 msgid "Settings"
 msgstr ""
 
-#: src/Widgets/Headerbar.vala:46
+#: src/Widgets/Headerbar.vala:56
 msgid "Show an indicator:"
 msgstr ""
 
-#: src/Widgets/Headerbar.vala:52
+#: src/Widgets/Headerbar.vala:62
 msgid "Start in background:"
 msgstr ""
 
@@ -89,12 +97,12 @@ msgstr ""
 msgid "GiB"
 msgstr ""
 
-#: src/Widgets/Search.vala:9
+#: src/Widgets/Search.vala:14
 msgid "Search Process"
 msgstr ""
 
-#: src/Widgets/Search.vala:10
-msgid "Type Process Name or PID"
+#: src/Widgets/Search.vala:15
+msgid "Type process name or PID to search"
 msgstr ""
 
 #: src/Widgets/Statusbar/Statusbar.vala:12