Merge branch 'unstable'

README.md

@@ -1,23 +1,39 @@
-# Monitor
-Manage processes and monitor system resources.
-
-[![Get it on AppCenter](https://appcenter.elementary.io/badge.svg)](https://appcenter.elementary.io/com.github.stsdc.monitor)
+<p align="center">
+    <img align="left" width="64" height="64" src="data/icons/64/com.github.stsdc.monitor.svg">
+    <h1 class="rich-diff-level-zero">Monitor</h1>
+</p>
+
+<h4 align="left">Manage processes and monitor system resources</h4>
+
+<p align="left">
+    <a href="https://paypal.me/stsdc/10">
+        <img src="https://img.shields.io/badge/Donate-PayPal-green.svg">
+    </a>
+    <a href="https://github.com/stsdc/monitor/releases">
+        <img src="https://img.shields.io/github/release/stsdc/monitor.svg" alt="Release">
+    </a>
+    <a href="https://travis-ci.org/stsdc/monitor">
+        <img src="https://travis-ci.org/stsdc/monitor.svg?branch=master" alt="Build Status">
+    </a>
+    <a href="https://github.com/stsdc/monitor/blob/master/LICENSE">
+        <img src="https://img.shields.io/github/license/stsdc/monitor.svg">
+    </a>
+</p>
 
 ![Monitor Screenshot](https://github.com/stsdc/monitor/raw/master/data/com.github.stsdc.monitor.screenshot.png)
 
-## For coffee
-[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://paypal.me/stsdc/10)
-
-
 ## Building and Installation
 
 You'll need the following dependencies to build:
+
 * valac
 * libgtk-3-dev
 * libgranite-dev
 * libbamf3-dev
 * libwnck-3-dev
 * libgtop2-dev
+* libwingpanel-2.0-dev
+* libxml2-utils
 * meson
 
 ## How To Build
@@ -27,8 +43,12 @@ You'll need the following dependencies to build:
     meson build --prefix=/usr
     cd build
     sudo ninja install
-
+
+### Debug
+    `G_MESSAGES_DEBUG=all ./com.github.stsdc.monitor`
+
 ## 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**:
 
 `$ aurman -S pantheon-system-monitor-git`

data/com.github.stsdc.monitor.appdata.xml.in

@@ -10,7 +10,7 @@
     <p>Display usage of system resources, filter and manage processes.</p>
   </description>
     <custom>
-     <value key="x-appcenter-color-primary">#2196f3</value>
+     <value key="x-appcenter-color-primary">#d7f4d7</value>
      <value key="x-appcenter-color-primary-text">rgb(255, 255, 255)</value>
      <value key="x-appcenter-suggested-price">0</value>
   </custom>
@@ -25,14 +25,12 @@
 <url type="help">https://github.com/stsdc/monitor/issues</url>
 
 <releases>
-    <release version="0.4.0" date="2019-01-31">
+    <release version="0.4.1" date="2019-02-20">
 ​      <description>
 ​         <ul>
-            <li>Add Monitor indicator</li>
-            <li>Add missing extra French translations</li>
-            <li>Fix: if icon missing for the process, icon is taken from previous process</li>
-            <li>Fix: search erases my input while I'm typing</li>
-            <li>Fix POTFILES</li>
+            <li>Add CPU and RAM icons</li>
+            <li>Update Polish and Russian translation</li>
+            <li>Fix bug, that caused hanging</li>
         </ul>
 ​      </description>
 ​    </release>

data/icons/icons.indicator.gresource.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <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>
+  </gresource>
+</gresources>

debian/changelog

@@ -1,3 +1,11 @@
+com.github.stsdc.monitor (0.4.1) bionic; urgency=low
+
+    * Add CPU and RAM icons
+    * Update Polish and Russian translation
+    * Fix bug, that caused hanging
+
+-- Stanisław Dac <[email protected]>  Wed, 20 Feb 2019 00:42:22 +0100
+
 com.github.stsdc.monitor (0.4.0) bionic; urgency=low
 
     * Add Monitor indicator

meson.build

@@ -17,11 +17,19 @@ gtop = dependency('libgtop-2.0')
 wnck = dependency('libwnck-3.0')
 wingpanel = dependency('wingpanel-2.0')
 
-conf = configuration_data()
-conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
-configure_file(output: 'config.h', configuration: conf)
+config_data = configuration_data()
+config_data.set_quoted('GETTEXT_PACKAGE', meson.project_name())
+
+configure_file(output: 'config.h', configuration: config_data)
 config_h_dir = include_directories('.')
 
+icons_gresource = gnome.compile_resources(
+    'gresource_icons',
+    'data/icons/icons.indicator.gresource.xml',
+    source_dir: 'data/icons',
+    c_name: 'as'
+)
+
 c_args = [
     '-include', 'config.h',
     '-DWNCK_I_KNOW_THIS_IS_UNSTABLE',
@@ -30,14 +38,15 @@ c_args = [
 
 executable(
     meson.project_name(),
+    icons_gresource,
     'src/Monitor.vala',
     'src/MainWindow.vala',
     'src/Utils.vala',
 
     'src/Widgets/OverallView.vala',
     'src/Widgets/Search.vala',
     'src/Widgets/Headerbar.vala',
-    'src/Widgets/Statusbar.vala',
+    'src/Widgets/Statusbar/Statusbar.vala',
 
     'src/Models/GenericModel.vala',
     'src/Models/ModelHelper.vala',
@@ -71,7 +80,7 @@ executable(
     vala_args: [
         '--vapidir=' + meson.source_root() + '/vapi/',
     ],
-    install: true,
+    install: true
 )
 
 shared_module(
@@ -87,7 +96,7 @@ shared_module(
     'src/Indicator/Services/DBusClient.vala',
     'src/Services/Settings.vala',
     # 'src/Widgets/RevealerSwitch.vala',
-    # asresources,
+    icons_gresource,
     c_args: c_args,
     dependencies: [
         glib,

po/POTFILES

@@ -1,5 +1,7 @@
 src/Monitor.vala
 src/MainWindow.vala
+src/Indicator/Widgets/PopoverWidget.vala
+src/Indicator/Indicator.vala
 src/Widgets/Headerbar.vala
 src/Widgets/OverallView.vala
 src/Widgets/Search.vala
@@ -10,4 +12,3 @@ src/Managers/Process.vala
 src/Models/GenericModel.vala
 src/Services/Settings.vala
 src/Services/Shortcuts.vala
-src/Services/Resources.vala