Merge branch 'dev'

.gitignore

@@ -3,3 +3,4 @@ build
 .vscode
 *~
 .goutputstream-*
+subprojects/*/

.travis.yml

@@ -3,7 +3,7 @@
 language: node_js
 
 node_js:
-  - 10/*
+  - 10.17.0
 
 sudo: required
 

data/Application.css

@@ -0,0 +1,95 @@
+.roundy-label,
+.roundy-label:hover,
+.roundy-label:selected,
+.roundy-label:selected:focus,
+.roundy-label:hover:selected {
+    background-image: none;
+    background-color: @SILVER_300;
+    box-shadow: none;
+    color: alpha(@text_color, 0.7);
+    font-weight: 700;
+    border-radius: 10px;
+    padding: 0 6px;
+    margin: 0 3px;
+    border-width: 0;
+}
+
+.username-current {
+    background-color: @SILVER_300;
+    color: @SILVER_900;
+}
+
+.username-other {
+    background-color: @BANANA_300;
+    color: #381F00;
+}
+
+.username-root {
+    background-color: @STRAWBERRY_300;
+    color: @SILVER_100;
+}
+
+.state_badge,
+.state_badge:hover,
+.state_badge:selected,
+.state_badge:selected:focus,
+.state_badge:hover:selected {
+    background-image: none;
+    background-color: @BLUEBERRY_500;
+    box-shadow: none;
+    color: white;
+    font-weight: 700;
+    border-radius: 10px;
+    padding: 0 6px;
+    margin: 0 3px;
+    border-width: 0;
+}
+
+.command_wrapper {
+    background-color: #fdf6e3;
+    border-radius: 3px;
+    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.20);
+    padding: 5px;
+}
+
+.command text {
+    background-color: #fdf6e3;
+}
+.command {
+    font-family: monospace;
+}
+
+.pid {
+    color:grey;
+font-weight:bold;
+font-size:9px;
+}
+
+.graph {
+    border: 1px @SILVER_300 solid;
+    border-radius: 6px
+
+}
+
+.open_files_list_box_wrapper {
+    border: 1px @SILVER_300 solid;
+}
+
+.open_files_list_box {
+
+}
+.open_files_list_box_row {
+    border-bottom: 1px @SILVER_100 solid;
+}
+
+.open_files_list_box_row label {
+    font-family: monospace;
+    /* background-color: @SILVER_300; */
+    padding: 6px 2px 2px;
+    border-radius: 4px;
+}
+
+.open_files_list_box_row image {
+    color: @SILVER_700;
+    margin: 6px;
+}

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

@@ -25,11 +25,13 @@
 <url type="help">https://github.com/stsdc/monitor/issues</url>
 
 <releases>
-    <release version="0.6.2" date="2019-12-21">
+    <release version="0.7.0" date="2020-04-11">
 ​      <description>
 ​         <ul>
-           <li> Bugfix (potential) of crushes and high CPU usage</li>
-           <li> Update German translation (Carsten Dietrich)</li>
+           <li>Detailed process info in sidebar</li>
+           <li>CPU frequency in tooltip (Ryo Nakano)</li>
+           <li>Removed tree view . This fixes high CPU usage, indicator hangs, and app crashes</li>
+           <li>Special  thanks to gavr, Ryo Nakano, Adam Bieńkowski and Daniele Cocca</li>
         </ul>
 ​      </description>
 ​    </release>

data/css.gresource.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/com/github/stsdc/monitor">
+    <file alias="Application.css" compressed="true">Application.css</file>
+  </gresource>
+</gresources>

data/icons/icons.indicator.gresource.xml

@@ -4,5 +4,6 @@
     <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>
+    <file compressed="true" preprocess="xml-stripblanks">file-deleted-symbolic.svg</file>
   </gresource>
 </gresources>

debian/changelog

@@ -1,3 +1,10 @@
+com.github.stsdc.monitor (0.7.0) bionic; urgency=low
+
+      * Detailed process info in sidebar
+      * CPU frequency in tooltip (Ryo Nakano)
+
+-- Stanisław Dac <[email protected]>  Sat, 11 Apr 2020 21:01:15 +0200
+
 com.github.stsdc.monitor (0.6.2) bionic; urgency=low
 
       * Bugfix (potential) of crushes and high CPU usage

meson.build

@@ -1,24 +1,28 @@
 
-project('com.github.stsdc.monitor', 'vala', 'c', version: '0.6.2')
+project('com.github.stsdc.monitor', 'vala', 'c', version: '0.7.0')
 
 # these are Meson modules
 gnome = import('gnome')
 i18n = import('i18n')
 
+
 # common dirs
 prefix = get_option('prefix')
 datadir = join_paths(prefix, get_option('datadir'))
 libdir = join_paths(prefix, get_option('libdir'))
 icondir = join_paths(datadir, 'icons', 'hicolor')
 
+livechart_proj = subproject('live-chart')
+livechart_dep = livechart_proj.get_variable('livechart_dep')
+
 # and these are project dependencies
 glib = dependency('glib-2.0')
 granite = dependency('granite', version: '>= 5.2.0')
 gtk = dependency('gtk+-3.0')
 gee = dependency('gee-0.8')
 gio = dependency('gio-2.0')
 gobject = dependency('gobject-2.0')
-bamf = dependency('libbamf3')
+bamf = dependency('libbamf3') # to remove
 gtop = dependency('libgtop-2.0')
 wnck = dependency('libwnck-3.0')
 wingpanel = dependency('wingpanel-2.0')
@@ -31,36 +35,62 @@ 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',
+    'gresource_icons', 'data/icons/icons.indicator.gresource.xml',
     source_dir: 'data/icons',
-    c_name: 'as'
+    c_name: 'as1'
+)
+
+css_gresource = gnome.compile_resources(
+    'gresource_css', 'data/css.gresource.xml',
+    source_dir: 'data',
+    c_name: 'as2'
 )
 
 c_args = [
     '-include', 'config.h',
     '-DWNCK_I_KNOW_THIS_IS_UNSTABLE',
-    '-w'
+    '-w',
+    # '-g',
+    # '--save-temps'
 ]
 
 executable(
     meson.project_name(),
     icons_gresource,
+    css_gresource,
     'src/Monitor.vala',
     'src/MainWindow.vala',
     'src/Utils.vala',
 
-    'src/Widgets/OverallView.vala',
-    'src/Widgets/Search.vala',
-    'src/Widgets/Headerbar.vala',
+    # Views
+    'src/Views/ProcessView/ProcessView.vala',
+    'src/Views/ProcessView/ProcessInfoView/ProcessInfoView.vala',
+    'src/Views/ProcessView/ProcessTreeView/CPUProcessTreeView.vala',
+
+    # Widgets related only to ProcessInfoView
+    'src/Views/ProcessView/ProcessInfoView/Preventor.vala',
+    'src/Views/ProcessView/ProcessInfoView/RoundyLabel.vala',
+    'src/Views/ProcessView/ProcessInfoView/Chart.vala',
+    'src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala',
+    'src/Views/ProcessView/ProcessInfoView/ProcessInfoCPURAM.vala',
+    'src/Views/ProcessView/ProcessInfoView/ProcessInfoIOStats.vala',
+    'src/Views/ProcessView/ProcessInfoView/OpenFilesListBox.vala',
+
+    # Widgets
+    'src/Widgets/Headerbar/Headerbar.vala',
+    'src/Widgets/Headerbar/Search.vala',
     'src/Widgets/Statusbar/Statusbar.vala',
+
 
-    'src/Models/GenericModel.vala',
-    'src/Models/ModelHelper.vala',
+    # Models
+    'src/Models/TreeViewModel.vala',
 
+    # Other
     'src/Managers/AppManager.vala',
     'src/Managers/ProcessManager.vala',
     'src/Managers/Process.vala',
+    'src/Managers/ProcessStructs.vala',
+    'src/Managers/ProcessUtils.vala',
 
     'src/Services/Shortcuts.vala',
     'src/Services/DBusServer.vala',
@@ -78,10 +108,11 @@ executable(
         gee,
         gio,
         gobject,
-        bamf,
+        bamf, # to remove
         gtop,
         wnck,
         gdk_x11,
+        livechart_dep,
         meson.get_compiler('c').find_library('m', required : false),
         meson.get_compiler('vala').find_library('posix')
     ],