Merge branch 'dev'

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

@@ -28,6 +28,17 @@
 <url type="help">https://github.com/stsdc/monitor/issues</url>
 
 <releases>
+<release version="0.9.1" date="2020-09-04">
+​      <description>
+​         <ul>
+           <li>Update Portuguese translation (@rottenpants466)</li>
+           <li>Update Dutch translation (@Vistaus)</li>
+           <li>Smoother animations (@DevAlien)</li>
+           <li>Preselect first entry so that the info panel is always open (@DevAlien)</li>
+           <li>Show CPU temperature in the Indicator</li>
+        </ul>
+​      </description>
+​    </release>
     <release version="0.9.0" date="2020-08-18">
 ​      <description>
 ​         <ul>

data/icons/icons.indicator.gresource.xml

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

meson.build

@@ -1,4 +1,4 @@
-project('com.github.stsdc.monitor', 'vala', 'c', version: '0.9.0')
+project('com.github.stsdc.monitor', 'vala', 'c', version: '0.9.1')
 
 # these are Meson modules
 gnome = import('gnome')
@@ -88,7 +88,6 @@ executable(
     'src/Widgets/Labels/LabelH4.vala',
     'src/Widgets/Chart/Chart.vala',
     'src/Widgets/Chart/ProcessChart.vala',
-    'src/Widgets/Chart/NetworkChart.vala',
 
 
     # Models
@@ -144,6 +143,7 @@ shared_module(
     'src/Indicator/Widgets/DisplayWidget.vala',
     'src/Indicator/Widgets/PopoverWidget.vala',
     'src/Indicator/Widgets/IndicatorWidget.vala',
+    'src/Indicator/Widgets/TemperatureWidget.vala',
 
     'src/Indicator/Services/DBusClient.vala',
     # 'src/Widgets/RevealerSwitch.vala',

po/nl.po

@@ -3,14 +3,14 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-04-28 22:18+0400\n"
-"PO-Revision-Date: 2019-03-25 17:22+0100\n"
+"PO-Revision-Date: 2020-08-22 19:23+0200\n"
 "Last-Translator: Heimen Stoffels <[email protected]>\n"
 "Language-Team: \n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.1.1\n"
+"X-Generator: Poedit 2.4.1\n"
 
 #: src/Utils.vala:13
 #: src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala:32
@@ -22,11 +22,11 @@ msgstr ""
 #: src/Views/ProcessView/ProcessInfoView/ProcessInfoIOStats.vala:34
 #: src/Views/ProcessView/ProcessInfoView/ProcessInfoIOStats.vala:35
 msgid "N/A"
-msgstr ""
+msgstr "n/b"
 
 #: src/Utils.vala:45
 msgid "B"
-msgstr ""
+msgstr "B"
 
 #: src/Utils.vala:50
 #: src/Views/ProcessView/ProcessTreeView/CPUProcessTreeView.vala:113
@@ -48,19 +48,19 @@ msgstr "Monitor afsluiten"
 
 #: src/Views/ProcessView/ProcessInfoView/OpenFilesListBox.vala:56
 msgid "Deleted"
-msgstr ""
+msgstr "Verwijderd"
 
 #: src/Views/ProcessView/ProcessInfoView/Preventor.vala:21
 msgid "Are you sure you want to do this?"
-msgstr ""
+msgstr "Weet je zeker dat je dit wilt doen?"
 
 #: src/Views/ProcessView/ProcessInfoView/Preventor.vala:24
 msgid "Yes"
-msgstr ""
+msgstr "Ja"
 
 #: src/Views/ProcessView/ProcessInfoView/Preventor.vala:28
 msgid "No"
-msgstr ""
+msgstr "Nee"
 
 #: src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala:39
 #: src/Views/ProcessView/ProcessTreeView/CPUProcessTreeView.vala:59
@@ -69,62 +69,59 @@ msgstr "PID"
 
 #: src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala:40
 msgid "NI"
-msgstr ""
+msgstr "NI"
 
 #: src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala:41
-#, fuzzy
 msgid "PRI"
-msgstr "PID"
+msgstr "PRI"
 
 #: src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala:42
 msgid "THR"
-msgstr ""
+msgstr "THR"
 
 #: src/Views/ProcessView/ProcessInfoView/ProcessInfoIOStats.vala:18
 msgid "Opened files"
-msgstr ""
+msgstr "Geopende bestanden"
 
 #: src/Views/ProcessView/ProcessInfoView/ProcessInfoIOStats.vala:22
 msgid "Characters"
-msgstr ""
+msgstr "Tekens"
 
 #: src/Views/ProcessView/ProcessInfoView/ProcessInfoIOStats.vala:27
 msgid "System calls"
-msgstr ""
+msgstr "Systeemaanroepen"
 
 #: src/Views/ProcessView/ProcessInfoView/ProcessInfoIOStats.vala:32
 msgid "Read/Written"
-msgstr ""
+msgstr "Uitgelezen/Weggeschreven"
 
 #: src/Views/ProcessView/ProcessInfoView/ProcessInfoIOStats.vala:37
 msgid "Cancelled write"
-msgstr ""
+msgstr "Wegschrijven afgebroken"
 
 #: src/Views/ProcessView/ProcessInfoView/ProcessInfoView.vala:79
-#, fuzzy
 msgid "End Process"
 msgstr "Proces beëindigen"
 
 #: src/Views/ProcessView/ProcessInfoView/ProcessInfoView.vala:81
-#, fuzzy
 msgid "End selected process"
-msgstr "Proces beëindigen"
+msgstr "Geselecteerd proces beëindigen"
 
 #: src/Views/ProcessView/ProcessInfoView/ProcessInfoView.vala:85
 msgid "Kill Process"
-msgstr ""
+msgstr "Proces vernietigen"
 
 #: src/Views/ProcessView/ProcessInfoView/ProcessInfoView.vala:86
 msgid "Kill selected process"
-msgstr ""
+msgstr "Geselecteerd proces vernietigen"
 
 #: src/Views/ProcessView/ProcessInfoView/ProcessInfoView.vala:96
 msgid "Confirm kill of the process?"
-msgstr ""
+msgstr "Weet je het zeker?"
 
 #: src/Views/ProcessView/ProcessInfoView/ProcessInfoView.vala:103
 msgid "Confirm end of the process?"
-msgstr ""
+msgstr "Weet je het zeker?"
 
 #. setup name column
 #: src/Views/ProcessView/ProcessTreeView/CPUProcessTreeView.vala:17
@@ -134,7 +131,7 @@ msgstr "Procesnaam"
 #: src/Views/ProcessView/ProcessTreeView/CPUProcessTreeView.vala:38
 #: src/Widgets/Statusbar/Statusbar.vala:8
 msgid "CPU"
-msgstr "Processor"
+msgstr "CPU"
 
 #: src/Views/ProcessView/ProcessTreeView/CPUProcessTreeView.vala:49
 #: src/Widgets/Statusbar/Statusbar.vala:11
@@ -150,12 +147,12 @@ msgstr "GiB"
 #: src/Views/ProcessView/ProcessInfoView/ProcessInfoCPURAM.vala:50
 #, c-format
 msgid "CPU: %.1f%%"
-msgstr ""
+msgstr "CPU: %.1f%%"
 
 #: src/Views/ProcessView/ProcessInfoView/ProcessInfoCPURAM.vala:51
 #, c-format
 msgid "RAM: %.1f%%"
-msgstr ""
+msgstr "RAM: %.1f%%"
 
 #: src/Widgets/Headerbar/Headerbar.vala:13
 msgid "Monitor"
@@ -166,36 +163,34 @@ msgid "Settings"
 msgstr "Instellingen"
 
 #: src/Widgets/Headerbar/Headerbar.vala:35
-#, fuzzy
 msgid "Show an indicator:"
-msgstr "Indicator tonen"
+msgstr "Indicator tonen:"
 
 #: src/Widgets/Headerbar/Headerbar.vala:41
 msgid "Start in background:"
-msgstr ""
+msgstr "Geminimaliseerd opstarten:"
 
 #: src/Widgets/Headerbar/Search.vala:14
 msgid "Search Process"
-msgstr "Zoek een proces"
+msgstr "Zoeken naar proces"
 
 #: src/Widgets/Headerbar/Search.vala:15
-#, fuzzy
 msgid "Type process name or PID to search"
 msgstr "Voer de procesnaam of PID in"
 
 #: src/Widgets/Statusbar/Statusbar.vala:14
 msgid "Swap"
-msgstr ""
+msgstr "Wisselgeheugen"
 
 #: src/Widgets/Statusbar/Statusbar.vala:16
 #: src/Widgets/Statusbar/Statusbar.vala:20
 #: src/Widgets/Statusbar/Statusbar.vala:25
 msgid "Calculating…"
-msgstr ""
+msgstr "Bezig met berekenen…"
 
 #: src/Widgets/Statusbar/Statusbar.vala:38
 msgid "GHz"
-msgstr ""
+msgstr "GHz"
 
 #~ msgid "Monitor Indicator"
 #~ msgstr "Monitor-indicator"

src/Indicator/Indicator.vala

@@ -22,6 +22,7 @@ public class Monitor.Indicator : Wingpanel.Indicator {
 
         dbusclient.interface.update.connect ((sysres) => {
             display_widget.cpu_widget.percentage = sysres.cpu_percentage;
+            display_widget.temperature_widget.degree = sysres.cpu_temperature;
             display_widget.memory_widget.percentage = sysres.memory_percentage;
         });
 

src/Indicator/Widgets/DisplayWidget.vala

@@ -2,14 +2,20 @@ public class Monitor.Widgets.DisplayWidget : Gtk.Grid {
     public IndicatorWidget cpu_widget;
     public IndicatorWidget memory_widget;
 
+    public TemperatureWidget temperature_widget;
+
     construct {
         valign = Gtk.Align.CENTER;
 
         cpu_widget = new IndicatorWidget ("cpu-symbolic");
 
         memory_widget = new IndicatorWidget ("ram-symbolic");
 
+        temperature_widget = new TemperatureWidget ("temperature-sensor-symbolic");
+
+
         add (cpu_widget);
         add (memory_widget);
+        add (temperature_widget);
     }
 }

src/Indicator/Widgets/TemperatureWidget.vala

@@ -0,0 +1,25 @@
+public class Monitor.Widgets.TemperatureWidget : Gtk.Box {
+    private Gtk.Label degree_label;
+
+    public string icon_name { get; construct; }
+    public double degree {
+        set { degree_label.label = "%d℃".printf ((int)Math.round (value)); }
+    }
+
+    public TemperatureWidget (string icon_name) {
+        Object (
+            orientation: Gtk.Orientation.HORIZONTAL,
+            icon_name: icon_name
+            );
+    }
+
+    construct {
+        var icon = new Gtk.Image.from_icon_name (icon_name, Gtk.IconSize.SMALL_TOOLBAR);
+
+        degree_label = new Gtk.Label (Utils.NOT_AVAILABLE);
+        degree_label.margin = 2;
+
+        pack_start (icon);
+        pack_start (degree_label);
+    }
+}