Merge branch 'dev'

Author: Stanisław

.github/FUNDING.yml

@@ -1 +1 @@
-
+custom: https://www.paypal.me/stsdc

.github/workflows/lint.yml

@@ -0,0 +1,17 @@
+
+name: "CI: Lint"
+
+on: [push, pull_request]
+
+jobs:
+  lint:
+
+    runs-on: ubuntu-latest
+
+    container:
+      image: valalang/lint
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Lint
+      run: io.elementary.vala-lint -d .

data/Application.css

@@ -14,6 +14,14 @@
     border-width: 0;
 }
 
+.green {
+    background-color: alpha(@LIME_300, 0.6);
+}
+
+.blue {
+    background-color: alpha(@BLUEBERRY_300, 0.6);
+}
+
 /* .vertical-label,
 .vertical-label:hover,
 .vertical-label:selected,
@@ -84,15 +92,15 @@
 }
 
 .core_badge-mild-warning {
-    background-color: @BANANA_100;
+    background-color: alpha(@BANANA_100, 0.7);
     color: @BANANA_900;
-    border: 1px solid @BANANA_300;
+    border: 1px solid alpha(@BANANA_300, 0.7);
 }
 
 .core_badge-strong-warning {
-    background-color: @ORANGE_100;
+    background-color: alpha(@ORANGE_100, 0.7);
     color: @ORANGE_900;
-    border: 1px solid @ORANGE_300;
+    border: 1px solid alpha(@ORANGE_300, 0.7);
 }
 
 .core_badge-critical-warning {

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2019 Stanisław <@ststdc> -->
+<!-- Copyright 2020 Stanisław <@ststdc> -->
 <component type="desktop">
   <id>com.github.stsdc.monitor</id>
   <metadata_license>CC0</metadata_license>
@@ -28,6 +28,16 @@
 <url type="help">https://github.com/stsdc/monitor/issues</url>
 
 <releases>
+<release version="0.9.2" date="2020-12-14">
+​      <description>
+​         <ul>
+           <li>Display Storage usage</li>
+           <li>Update Russian translation (@camellan)</li>
+           <li>Update Portuguese translation (@hugok79)</li>
+           <li>Different colours for Upload and Download</li>
+        </ul>
+​      </description>
+​    </release>
 <release version="0.9.1" date="2020-09-04">
 ​      <description>
 ​         <ul>

meson.build

@@ -1,4 +1,4 @@
-project('com.github.stsdc.monitor', 'vala', 'c', version: '0.9.1')
+project('com.github.stsdc.monitor', 'vala', 'c', version: '0.9.2')
 
 # these are Meson modules
 gnome = import('gnome')
@@ -71,6 +71,7 @@ executable(
     'src/Views/SystemView/SystemCPUInfoPopover.vala',
     'src/Views/SystemView/SystemMemoryView.vala',
     'src/Views/SystemView/SystemNetworkView.vala',
+    'src/Views/SystemView/SystemStorageView.vala',
 
     # Widgets related only to ProcessInfoView
     'src/Views/ProcessView/ProcessInfoView/Preventor.vala',
@@ -87,8 +88,6 @@ executable(
     'src/Widgets/Labels/LabelRoundy.vala',
     'src/Widgets/Labels/LabelH4.vala',
     'src/Widgets/Chart/Chart.vala',
-    'src/Widgets/Chart/ProcessChart.vala',
-
 
     # Models
     'src/Models/TreeViewModel.vala',
@@ -112,6 +111,7 @@ executable(
     'src/Resources/Swap.vala',
     'src/Resources/TemperatureSensor.vala',
     'src/Resources/Network.vala',
+    'src/Resources/Storage.vala',
     c_args: c_args,
     dependencies: [
         glib,

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: 2020-04-28 22:18+0400\n"
+"POT-Creation-Date: 2020-09-25 22:12+0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -17,7 +17,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/Utils.vala:13
+#: src/MainWindow.vala:34
+msgid "Processes"
+msgstr ""
+
+#: src/MainWindow.vala:35
+msgid "System"
+msgstr ""
+
+#: src/Utils.vala:2
 #: src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala:32
 #: src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala:35
 #: src/Views/ProcessView/ProcessInfoView/ProcessInfoIOStats.vala:24
@@ -29,20 +37,26 @@ msgstr ""
 msgid "N/A"
 msgstr ""
 
-#: src/Utils.vala:45
+#: src/Utils.vala:67
 msgid "B"
 msgstr ""
 
-#: src/Utils.vala:50
-#: src/Views/ProcessView/ProcessTreeView/CPUProcessTreeView.vala:113
+#: src/Utils.vala:72
+#: src/Views/ProcessView/ProcessTreeView/CPUProcessTreeView.vala:116
 msgid "KiB"
 msgstr ""
 
-#: src/Utils.vala:56
-#: src/Views/ProcessView/ProcessTreeView/CPUProcessTreeView.vala:118
+#: src/Utils.vala:78
+#: src/Views/ProcessView/ProcessTreeView/CPUProcessTreeView.vala:121
 msgid "MiB"
 msgstr ""
 
+#: src/Utils.vala:83
+#: src/Views/ProcessView/ProcessTreeView/CPUProcessTreeView.vala:127
+#: src/Widgets/Statusbar/Statusbar.vala:55
+msgid "GiB"
+msgstr ""
+
 #: src/Indicator/Widgets/PopoverWidget.vala:13
 msgid "Show Monitor"
 msgstr ""
@@ -55,15 +69,15 @@ msgstr ""
 msgid "Deleted"
 msgstr ""
 
-#: src/Views/ProcessView/ProcessInfoView/Preventor.vala:21
+#: src/Views/ProcessView/ProcessInfoView/Preventor.vala:20
 msgid "Are you sure you want to do this?"
 msgstr ""
 
-#: src/Views/ProcessView/ProcessInfoView/Preventor.vala:24
+#: src/Views/ProcessView/ProcessInfoView/Preventor.vala:23
 msgid "Yes"
 msgstr ""
 
-#: src/Views/ProcessView/ProcessInfoView/Preventor.vala:28
+#: src/Views/ProcessView/ProcessInfoView/Preventor.vala:27
 msgid "No"
 msgstr ""
 
@@ -84,6 +98,35 @@ msgstr ""
 msgid "THR"
 msgstr ""
 
+#: src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala:110
+msgid "The app is waiting in an uninterruptible disk sleep"
+msgstr ""
+
+#: src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala:112
+msgid "Idle kernel thread"
+msgstr ""
+
+#: src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala:114
+msgid "The process is running or runnable (on run queue)"
+msgstr ""
+
+#: src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala:116
+msgid ""
+"The process is in an interruptible sleep; waiting for an event to complete"
+msgstr ""
+
+#: src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala:118
+msgid "The process is stopped by a job control signal"
+msgstr ""
+
+#: src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala:120
+msgid "The process is stopped stopped by a debugger during the tracing"
+msgstr ""
+
+#: src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala:122
+msgid "The app is terminated but not reaped by its parent"
+msgstr ""
+
 #: src/Views/ProcessView/ProcessInfoView/ProcessInfoIOStats.vala:18
 msgid "Opened files"
 msgstr ""
@@ -104,27 +147,27 @@ msgstr ""
 msgid "Cancelled write"
 msgstr ""
 
-#: src/Views/ProcessView/ProcessInfoView/ProcessInfoView.vala:79
+#: src/Views/ProcessView/ProcessInfoView/ProcessInfoView.vala:73
 msgid "End Process"
 msgstr ""
 
-#: src/Views/ProcessView/ProcessInfoView/ProcessInfoView.vala:81
+#: src/Views/ProcessView/ProcessInfoView/ProcessInfoView.vala:75
 msgid "End selected process"
 msgstr ""
 
-#: src/Views/ProcessView/ProcessInfoView/ProcessInfoView.vala:85
+#: src/Views/ProcessView/ProcessInfoView/ProcessInfoView.vala:79
 msgid "Kill Process"
 msgstr ""
 
-#: src/Views/ProcessView/ProcessInfoView/ProcessInfoView.vala:86
+#: src/Views/ProcessView/ProcessInfoView/ProcessInfoView.vala:80
 msgid "Kill selected process"
 msgstr ""
 
-#: src/Views/ProcessView/ProcessInfoView/ProcessInfoView.vala:96
+#: src/Views/ProcessView/ProcessInfoView/ProcessInfoView.vala:90
 msgid "Confirm kill of the process?"
 msgstr ""
 
-#: src/Views/ProcessView/ProcessInfoView/ProcessInfoView.vala:103
+#: src/Views/ProcessView/ProcessInfoView/ProcessInfoView.vala:97
 msgid "Confirm end of the process?"
 msgstr ""
 
@@ -139,16 +182,11 @@ msgid "CPU"
 msgstr ""
 
 #: src/Views/ProcessView/ProcessTreeView/CPUProcessTreeView.vala:49
+#: src/Views/SystemView/SystemMemoryView.vala:26
 #: src/Widgets/Statusbar/Statusbar.vala:11
 msgid "Memory"
 msgstr ""
 
-#: src/Views/ProcessView/ProcessTreeView/CPUProcessTreeView.vala:124
-#: src/Widgets/Statusbar/Statusbar.vala:41
-#: src/Widgets/Statusbar/Statusbar.vala:49
-msgid "GiB"
-msgstr ""
-
 #: src/Views/ProcessView/ProcessInfoView/ProcessInfoCPURAM.vala:50
 #, c-format
 msgid "CPU: %.1f%%"
@@ -159,6 +197,100 @@ msgstr ""
 msgid "RAM: %.1f%%"
 msgstr ""
 
+#: src/Views/SystemView/SystemCPUView.vala:32
+#: src/Views/SystemView/SystemMemoryView.vala:28
+msgid "UTILIZATION"
+msgstr ""
+
+#: src/Views/SystemView/SystemCPUView.vala:34
+#: src/Views/SystemView/SystemCPUView.vala:94
+#: src/Views/SystemView/SystemMemoryView.vala:30
+#: src/Views/SystemView/SystemMemoryView.vala:35
+msgid "Show detailed info"
+msgstr ""
+
+#: src/Views/SystemView/SystemCPUView.vala:36
+msgid "FREQUENCY"
+msgstr ""
+
+#: src/Views/SystemView/SystemCPUView.vala:40
+msgid "TEMPERATURE"
+msgstr ""
+
+#: src/Views/SystemView/SystemCPUView.vala:96
+#: src/Views/SystemView/SystemMemoryView.vala:37
+msgid "Hide detailed info"
+msgstr ""
+
+#: src/Views/SystemView/SystemCPUView.vala:152
+#: src/Views/SystemView/SystemMemoryView.vala:100
+#, c-format
+msgid "%d%%"
+msgstr ""
+
+#: src/Views/SystemView/SystemCPUView.vala:153
+#: src/Widgets/Statusbar/Statusbar.vala:44
+msgid "GHz"
+msgstr ""
+
+#: src/Views/SystemView/SystemCPUView.vala:154
+msgid "℃"
+msgstr ""
+
+#: src/Views/SystemView/SystemMemoryView.vala:41
+msgid "Total: "
+msgstr ""
+
+#: src/Views/SystemView/SystemMemoryView.vala:44
+msgid "Used: "
+msgstr ""
+
+#: src/Views/SystemView/SystemMemoryView.vala:47
+msgid "Shared: "
+msgstr ""
+
+#: src/Views/SystemView/SystemMemoryView.vala:50
+msgid "Buffered: "
+msgstr ""
+
+#: src/Views/SystemView/SystemMemoryView.vala:53
+msgid "Cached: "
+msgstr ""
+
+#: src/Views/SystemView/SystemMemoryView.vala:56
+msgid "Locked: "
+msgstr ""
+
+#: src/Views/SystemView/SystemMemoryView.vala:103
+#, c-format
+msgid "Total: %s"
+msgstr ""
+
+#: src/Views/SystemView/SystemMemoryView.vala:104
+#, c-format
+msgid "Used: %s"
+msgstr ""
+
+#: src/Views/SystemView/SystemMemoryView.vala:105
+#, c-format
+msgid "Shared: %s"
+msgstr ""
+
+#: src/Views/SystemView/SystemMemoryView.vala:106
+#, c-format
+msgid "Buffered: %s"
+msgstr ""
+
+#: src/Views/SystemView/SystemMemoryView.vala:107
+#, c-format
+msgid "Cached: %s"
+msgstr ""
+
+#: src/Views/SystemView/SystemMemoryView.vala:108
+#, c-format
+msgid "Locked: %s"
+msgstr ""
+
 #: src/Widgets/Headerbar/Headerbar.vala:13
 msgid "Monitor"
 msgstr ""
@@ -188,11 +320,7 @@ msgid "Swap"
 msgstr ""
 
 #: src/Widgets/Statusbar/Statusbar.vala:16
-#: src/Widgets/Statusbar/Statusbar.vala:20
-#: src/Widgets/Statusbar/Statusbar.vala:25
+#: src/Widgets/Statusbar/Statusbar.vala:22
+#: src/Widgets/Statusbar/Statusbar.vala:29
 msgid "Calculating…"
 msgstr ""
-
-#: src/Widgets/Statusbar/Statusbar.vala:38
-msgid "GHz"
-msgstr ""