From 0b2d46d9dbe52b067032950486abaacfbed408c9 Mon Sep 17 00:00:00 2001
From: Ryo Nakano <26003928+ryonakano@users.noreply.github.com>
Date: Sun, 26 Jul 2020 11:45:17 +0900
Subject: [PATCH 01/45] Save the last opened view
---
data/com.github.stsdc.monitor.gschema.xml | 5 +++++
src/MainWindow.vala | 8 +++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/data/com.github.stsdc.monitor.gschema.xml b/data/com.github.stsdc.monitor.gschema.xml
index b7f8c63b..90fc778d 100644
--- a/data/com.github.stsdc.monitor.gschema.xml
+++ b/data/com.github.stsdc.monitor.gschema.xml
@@ -40,5 +40,10 @@
To start Monitor in background or not
To start Monitor in background or not
+
+ 'process_view'
+ Opened view
+ The last opened view
+
diff --git a/src/MainWindow.vala b/src/MainWindow.vala
index 7adce5b4..f36441ac 100644
--- a/src/MainWindow.vala
+++ b/src/MainWindow.vala
@@ -10,6 +10,7 @@
public ProcessView process_view;
public SystemView system_view;
+ private Gtk.Stack stack;
private Statusbar statusbar;
@@ -29,7 +30,7 @@
process_view = new ProcessView ();
system_view = new SystemView (resources);
- Gtk.Stack stack = new Gtk.Stack ();
+ stack = new Gtk.Stack ();
stack.set_transition_type (Gtk.StackTransitionType.SLIDE_LEFT_RIGHT);
stack.add_titled (process_view, "process_view", _("Processes"));
stack.add_titled (system_view, "system_view", _("System"));
@@ -48,6 +49,8 @@
main_box.pack_start (statusbar, false, true, 0);
this.add (main_box);
+ show_all ();
+
dbusserver = DBusServer.get_default ();
stack.notify["visible-child-name"].connect (() => {
@@ -87,6 +90,8 @@
MonitorApp.settings.set_int ("position-y", position_y);
MonitorApp.settings.set_boolean ("is-maximized", this.is_maximized);
+ MonitorApp.settings.set_string ("opened-view", stack.visible_child_name);
+
if (MonitorApp.settings.get_boolean ("indicator-state")) {
this.hide_on_delete ();
} else {
@@ -98,6 +103,7 @@
});
dbusserver.indicator_state (MonitorApp.settings.get_boolean ("indicator-state"));
+ stack.visible_child_name = MonitorApp.settings.get_string ("opened-view");
}
private void setup_window_state () {
From 9704009d4d0073df87c962a8b0bfb7a056c87089 Mon Sep 17 00:00:00 2001
From: Ryo Nakano <26003928+ryonakano@users.noreply.github.com>
Date: Sun, 26 Jul 2020 12:05:29 +0900
Subject: [PATCH 02/45] Fix compiler warnings
---
src/Views/ProcessView/ProcessInfoView/Chart.vala | 2 +-
.../ProcessView/ProcessInfoView/Preventor.vala | 10 +++++-----
.../ProcessInfoView/ProcessInfoView.vala | 7 -------
.../ProcessTreeView/CPUProcessTreeView.vala | 14 +++++++-------
4 files changed, 13 insertions(+), 20 deletions(-)
diff --git a/src/Views/ProcessView/ProcessInfoView/Chart.vala b/src/Views/ProcessView/ProcessInfoView/Chart.vala
index 3e320b5e..3ccbf737 100644
--- a/src/Views/ProcessView/ProcessInfoView/Chart.vala
+++ b/src/Views/ProcessView/ProcessInfoView/Chart.vala
@@ -46,7 +46,7 @@ public class Monitor.Chart : Gtk.Box {
chart.add_value (serie, value);
}
- public void set_data (Gee.ArrayList history) {
+ public new void set_data (Gee.ArrayList history) {
var refresh_rate_is_ms = 2000; //your own refresh rate in milliseconds
chart.add_unaware_timestamp_collection(serie, history, refresh_rate_is_ms);
}
diff --git a/src/Views/ProcessView/ProcessInfoView/Preventor.vala b/src/Views/ProcessView/ProcessInfoView/Preventor.vala
index f09f5673..df5e80bc 100644
--- a/src/Views/ProcessView/ProcessInfoView/Preventor.vala
+++ b/src/Views/ProcessView/ProcessInfoView/Preventor.vala
@@ -5,7 +5,7 @@ public class Monitor.Preventor : Gtk.Stack {
private Gtk.Button confirm_button;
private Gtk.Button deny_button;
- private Gtk.Widget child;
+ private Gtk.Widget child_widget;
public signal void confirmed (bool is_confirmed);
@@ -33,19 +33,19 @@ public class Monitor.Preventor : Gtk.Stack {
}
public Preventor (Gtk.Widget _child, string name) {
- child = _child;
- add_named (child, name);
+ child_widget = _child;
+ add_named (child_widget, name);
add_named (preventive_action_bar, "preventive_action_bar");
deny_button.clicked.connect (() => {
set_transition_type(Gtk.StackTransitionType.SLIDE_UP);
- set_visible_child (child);
+ set_visible_child (child_widget);
confirmed(false);
});
confirm_button.clicked.connect(() => {
set_transition_type(Gtk.StackTransitionType.SLIDE_UP);
- set_visible_child (child);
+ set_visible_child (child_widget);
confirmed(true);
});
}
diff --git a/src/Views/ProcessView/ProcessInfoView/ProcessInfoView.vala b/src/Views/ProcessView/ProcessInfoView/ProcessInfoView.vala
index 26929c1f..c0163bd7 100644
--- a/src/Views/ProcessView/ProcessInfoView/ProcessInfoView.vala
+++ b/src/Views/ProcessView/ProcessInfoView/ProcessInfoView.vala
@@ -22,7 +22,6 @@ public class Monitor.ProcessInfoView : Gtk.Box {
}
}
public string ? icon_name;
- private Gtk.ScrolledWindow command_wrapper;
private Gtk.InfoBar permission_error_infobar;
private Gtk.Label permission_error_label;
@@ -31,15 +30,9 @@ public class Monitor.ProcessInfoView : Gtk.Box {
private ProcessInfoIOStats process_info_io_stats;
private ProcessInfoCPURAM process_info_cpu_ram;
-
- private Regex ? regex;
- private Gtk.Grid grid;
-
private Gtk.Button end_process_button;
private Gtk.Button kill_process_button;
- private Preventor preventor;
-
public ProcessInfoView () {
orientation = Gtk.Orientation.VERTICAL;
hexpand = true;
diff --git a/src/Views/ProcessView/ProcessTreeView/CPUProcessTreeView.vala b/src/Views/ProcessView/ProcessTreeView/CPUProcessTreeView.vala
index 149c910f..31ae9d01 100644
--- a/src/Views/ProcessView/ProcessTreeView/CPUProcessTreeView.vala
+++ b/src/Views/ProcessView/ProcessTreeView/CPUProcessTreeView.vala
@@ -82,12 +82,12 @@ public class Monitor.CPUProcessTreeView : Gtk.TreeView {
try {
Gdk.Pixbuf icon = new Gdk.Pixbuf.from_file_at_size (path, 16, -1);
- (icon_cell as Gtk.CellRendererPixbuf).pixbuf = icon;
+ ((Gtk.CellRendererPixbuf)icon_cell).pixbuf = icon;
} catch (Error e) {
warning (e.message);
}
} else {
- (icon_cell as Gtk.CellRendererPixbuf).icon_name = path;
+ ((Gtk.CellRendererPixbuf)icon_cell).icon_name = path;
}
}
@@ -99,9 +99,9 @@ public class Monitor.CPUProcessTreeView : Gtk.TreeView {
// format the double into a string
if (cpu_usage < 0.0)
- (cell as Gtk.CellRendererText).text = Utils.NO_DATA;
+ ((Gtk.CellRendererText)cell).text = Utils.NO_DATA;
else
- (cell as Gtk.CellRendererText).text = "%.0f%%".printf (cpu_usage);
+ ((Gtk.CellRendererText)cell).text = "%.0f%%".printf (cpu_usage);
}
public void memory_usage_cell_layout (Gtk.CellLayout cell_layout, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter) {
@@ -126,9 +126,9 @@ public class Monitor.CPUProcessTreeView : Gtk.TreeView {
// format the double into a string
if (memory_usage == 0)
- (cell as Gtk.CellRendererText).text = Utils.NO_DATA;
+ ((Gtk.CellRendererText)cell).text = Utils.NO_DATA;
else
- (cell as Gtk.CellRendererText).text = "%.1f %s".printf (memory_usage_double, units);
+ ((Gtk.CellRendererText)cell).text = "%.1f %s".printf (memory_usage_double, units);
}
private void pid_cell_layout (Gtk.CellLayout cell_layout, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter) {
@@ -137,7 +137,7 @@ public class Monitor.CPUProcessTreeView : Gtk.TreeView {
int pid = pid_value.get_int ();
// format the double into a string
if (pid == 0) {
- (cell as Gtk.CellRendererText).text = Utils.NO_DATA;
+ ((Gtk.CellRendererText)cell).text = Utils.NO_DATA;
}
}
From d44a55dfa2771d8c9bc6e4ab903a460b34ce82a5 Mon Sep 17 00:00:00 2001
From: stsdc
Date: Mon, 27 Jul 2020 01:25:58 +0200
Subject: [PATCH 03/45] =?UTF-8?q?just=20messing=20around:=20remove=20threa?=
=?UTF-8?q?ds,=20add=20cpu=20name;=20rename=20CPU=20=E2=86=92=20Overall=20?=
=?UTF-8?q?usage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
data/Application.css | 8 ++++
src/Views/SystemView/SystemCPUChart.vala | 1 -
src/Views/SystemView/SystemCPUView.vala | 61 ++++++++++++++++++++----
3 files changed, 61 insertions(+), 9 deletions(-)
diff --git a/data/Application.css b/data/Application.css
index 4a728fba..484f09de 100644
--- a/data/Application.css
+++ b/data/Application.css
@@ -93,3 +93,11 @@ font-size:9px;
color: @SILVER_700;
margin: 6px;
}
+
+.bold {
+ font-weight: bold;
+}
+
+.text-secondary {
+ color: @SILVER_700;
+}
\ No newline at end of file
diff --git a/src/Views/SystemView/SystemCPUChart.vala b/src/Views/SystemView/SystemCPUChart.vala
index 492112c6..038e1e3c 100644
--- a/src/Views/SystemView/SystemCPUChart.vala
+++ b/src/Views/SystemView/SystemCPUChart.vala
@@ -36,7 +36,6 @@ public class Monitor.SystemCPUChart : Gtk.Box {
red= 1, green= 1, blue= 1, alpha= 1
}; //White background
-
}
public SystemCPUChart (int cores_quantity) {
diff --git a/src/Views/SystemView/SystemCPUView.vala b/src/Views/SystemView/SystemCPUView.vala
index 7914ffad..67d42835 100644
--- a/src/Views/SystemView/SystemCPUView.vala
+++ b/src/Views/SystemView/SystemCPUView.vala
@@ -3,11 +3,15 @@ public class Monitor.SystemCPUView : Gtk.Grid {
private CPU cpu;
private Gtk.Label cpu_percentage_label;
+ private Gtk.Label processor_name_label;
+
+ private Gtk.Button view_threads_usage_button;
private Gee.ArrayList core_label_list;
construct {
margin = 12;
+ margin_top = 6;
column_spacing = 12;
set_vexpand (false);
@@ -19,17 +23,38 @@ public class Monitor.SystemCPUView : Gtk.Grid {
public SystemCPUView(CPU _cpu) {
cpu = _cpu;
- cpu_percentage_label = new Gtk.Label (_("CPU: ") + Utils.NO_DATA);
- cpu_percentage_label.get_style_context ().add_class ("h2");
+ cpu_percentage_label = new Gtk.Label (_("Overall usage: ") + Utils.NO_DATA);
+ cpu_percentage_label.get_style_context ().add_class ("h3");
cpu_percentage_label.valign = Gtk.Align.START;
cpu_percentage_label.halign = Gtk.Align.START;
- cpu_percentage_label.margin_start = 6;
+ cpu_percentage_label.margin_start = 12;
+ cpu_percentage_label.margin_top = 6;
+
+ processor_name_label = new Gtk.Label ("AMD Ryzen 5 2400G with Radeon Vega Graphics");
+ processor_name_label.get_style_context ().add_class ("h4");
+ // processor_name_label.get_style_context ().add_class ("text-secondary");
+ processor_name_label.valign = Gtk.Align.START;
+ processor_name_label.halign = Gtk.Align.START;
+ processor_name_label.margin_start = 6;
+ // processor_name_label.margin_top = 6;
cpu_chart = new SystemCPUChart (cpu.core_list.size);
- attach (grid_core_labels (), 0, 0, 1);
- attach (cpu_percentage_label, 1, 0, 1, 1);
- attach (cpu_chart, 1, 0, 1, 2);
+ view_threads_usage_button = new Gtk.Button ();
+ view_threads_usage_button.has_tooltip = true;
+ view_threads_usage_button.tooltip_text = (_("Settings"));
+ var icon = new Gtk.Image ();
+ icon.gicon = new ThemedIcon ("view-more-horizontal-symbolic");
+ icon.pixel_size = 16;
+ view_threads_usage_button.set_image (icon);
+
+ // attach (grid_core_labels (), 0, 0, 1, 1);
+ // attach (grid_info_labels (), 0, 0, 1, 1);
+ attach (processor_name_label, 0, 0, 1, 1);
+ attach (grid_usage_labels(), 0, 1, 1, 1);
+ // attach (view_threads_usage_button, 1, 1, 1, 1);
+ // attach (processor_name_label, 0, 0, 1, 1);
+ attach (cpu_chart, 0, 1, 1, 1);
}
@@ -39,10 +64,30 @@ public class Monitor.SystemCPUView : Gtk.Grid {
double core_percentage = cpu.core_list[i].percentage_used;
cpu_chart.update(i, core_percentage);
string percentage_formatted = ("% 3d%%").printf ( (int)core_percentage);
- core_label_list[i].set_text (_("Thread %d: %s").printf (i, percentage_formatted));
+ // core_label_list[i].set_text (_("Thread %d: %s").printf (i, percentage_formatted));
}
- cpu_percentage_label.set_text ((_("CPU: % 3d%%")).printf (cpu.percentage));
+ cpu_percentage_label.set_text ((_("Overall usage: % 3d%%")).printf (cpu.percentage));
+ }
+
+ private Gtk.Grid grid_info_labels () {
+ Gtk.Grid grid = new Gtk.Grid ();
+ grid.column_spacing = 12;
+
+ grid.attach(processor_name_label, 0, 0, 1, 1);
+ grid.attach(cpu_percentage_label, 0, 1, 1, 1);
+
+ return grid;
+ }
+
+ private Gtk.Grid grid_usage_labels () {
+ Gtk.Grid grid = new Gtk.Grid ();
+ grid.column_spacing = 12;
+
+ grid.attach(cpu_percentage_label, 0, 0, 1, 1);
+ grid.attach(view_threads_usage_button, 1, 0, 1, 1);
+
+ return grid;
}
private Gtk.Grid grid_core_labels () {
From 91de09c875bcfa3210e9a9b7b262fb422702cb9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw?=
Date: Wed, 29 Jul 2020 19:01:10 +0200
Subject: [PATCH 04/45] add vertical label
---
data/Application.css | 19 +++++++++++--
meson.build | 5 ++--
src/Views/SystemView/SystemCPUView.vala | 18 ++++++------
.../Labels}/RoundyLabel.vala | 2 +-
src/Widgets/Labels/VerticalLabel.vala | 28 +++++++++++++++++++
5 files changed, 57 insertions(+), 15 deletions(-)
rename src/{Views/ProcessView/ProcessInfoView => Widgets/Labels}/RoundyLabel.vala (87%)
create mode 100644 src/Widgets/Labels/VerticalLabel.vala
diff --git a/data/Application.css b/data/Application.css
index 484f09de..a7d66c05 100644
--- a/data/Application.css
+++ b/data/Application.css
@@ -14,6 +14,19 @@
border-width: 0;
}
+.vertical-label,
+.vertical-label:hover,
+.vertical-label:selected,
+.vertical-label:selected:focus,
+.vertical-label:hover:selected {
+ color: alpha(@text_color, 1);
+ font-size: 28px;
+ font-weight: 100;
+ /* padding: 0 6px;
+ margin: 0 3px; */
+ border-width: 0;
+}
+
.username-current {
background-color: @SILVER_300;
color: @SILVER_900;
@@ -59,10 +72,10 @@
font-family: monospace;
}
-.pid {
+.small-text {
color:grey;
-font-weight:bold;
-font-size:9px;
+ font-weight:bold;
+ font-size:9px;
}
.graph {
diff --git a/meson.build b/meson.build
index 230091e3..d2795eab 100644
--- a/meson.build
+++ b/meson.build
@@ -73,7 +73,6 @@ executable(
# 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',
@@ -84,7 +83,9 @@ executable(
'src/Widgets/Headerbar/Headerbar.vala',
'src/Widgets/Headerbar/Search.vala',
'src/Widgets/Statusbar/Statusbar.vala',
-
+ 'src/Widgets/Labels/VerticalLabel.vala',
+ 'src/Widgets/Labels/RoundyLabel.vala',
+
# Models
'src/Models/TreeViewModel.vala',
diff --git a/src/Views/SystemView/SystemCPUView.vala b/src/Views/SystemView/SystemCPUView.vala
index 67d42835..2c0f0486 100644
--- a/src/Views/SystemView/SystemCPUView.vala
+++ b/src/Views/SystemView/SystemCPUView.vala
@@ -2,7 +2,7 @@ public class Monitor.SystemCPUView : Gtk.Grid {
private SystemCPUChart cpu_chart;
private CPU cpu;
- private Gtk.Label cpu_percentage_label;
+ private VerticalLabel cpu_percentage_label;
private Gtk.Label processor_name_label;
private Gtk.Button view_threads_usage_button;
@@ -23,12 +23,12 @@ public class Monitor.SystemCPUView : Gtk.Grid {
public SystemCPUView(CPU _cpu) {
cpu = _cpu;
- cpu_percentage_label = new Gtk.Label (_("Overall usage: ") + Utils.NO_DATA);
- cpu_percentage_label.get_style_context ().add_class ("h3");
- cpu_percentage_label.valign = Gtk.Align.START;
- cpu_percentage_label.halign = Gtk.Align.START;
- cpu_percentage_label.margin_start = 12;
- cpu_percentage_label.margin_top = 6;
+ cpu_percentage_label = new VerticalLabel (_("UTILIZATION"));
+ // cpu_percentage_label.get_style_context ().add_class ("h3");
+ // cpu_percentage_label.valign = Gtk.Align.START;
+ // cpu_percentage_label.halign = Gtk.Align.START;
+ // cpu_percentage_label.margin_start = 12;
+ // cpu_percentage_label.margin_top = 6;
processor_name_label = new Gtk.Label ("AMD Ryzen 5 2400G with Radeon Vega Graphics");
processor_name_label.get_style_context ().add_class ("h4");
@@ -67,7 +67,7 @@ public class Monitor.SystemCPUView : Gtk.Grid {
// core_label_list[i].set_text (_("Thread %d: %s").printf (i, percentage_formatted));
}
- cpu_percentage_label.set_text ((_("Overall usage: % 3d%%")).printf (cpu.percentage));
+ cpu_percentage_label.set_text ((_("%d%%")).printf (cpu.percentage));
}
private Gtk.Grid grid_info_labels () {
@@ -85,7 +85,7 @@ public class Monitor.SystemCPUView : Gtk.Grid {
grid.column_spacing = 12;
grid.attach(cpu_percentage_label, 0, 0, 1, 1);
- grid.attach(view_threads_usage_button, 1, 0, 1, 1);
+ // grid.attach(view_threads_usage_button, 1, 0, 1, 1);
return grid;
}
diff --git a/src/Views/ProcessView/ProcessInfoView/RoundyLabel.vala b/src/Widgets/Labels/RoundyLabel.vala
similarity index 87%
rename from src/Views/ProcessView/ProcessInfoView/RoundyLabel.vala
rename to src/Widgets/Labels/RoundyLabel.vala
index 7a8964d4..a399279b 100644
--- a/src/Views/ProcessView/ProcessInfoView/RoundyLabel.vala
+++ b/src/Widgets/Labels/RoundyLabel.vala
@@ -8,7 +8,7 @@ public class Monitor.RoundyLabel : Gtk.Fixed {
val.get_style_context ().add_class ("roundy-label");
desc = new Gtk.Label (description);
- desc.get_style_context ().add_class ("pid");
+ desc.get_style_context ().add_class ("small-text");
put(val, 0, 12);
put(desc, 6, 0);
diff --git a/src/Widgets/Labels/VerticalLabel.vala b/src/Widgets/Labels/VerticalLabel.vala
new file mode 100644
index 00000000..3de928b2
--- /dev/null
+++ b/src/Widgets/Labels/VerticalLabel.vala
@@ -0,0 +1,28 @@
+public class Monitor.VerticalLabel : Gtk.Grid {
+
+ public Gtk.Label val;
+ public Gtk.Label desc;
+
+ construct {
+ margin_start = 12;
+ margin_top = 6;
+ }
+
+ public VerticalLabel (string description) {
+ val = new Gtk.Label (Utils.NO_DATA);
+ // val.get_style_context ().add_class ("h2");
+
+ val.get_style_context ().add_class ("vertical-label");
+
+ desc = new Gtk.Label (description);
+ // desc.get_style_context ().add_class ("h4");
+ desc.get_style_context ().add_class ("small-text");
+
+ attach(desc, 0, 0, 1, 1);
+ attach(val, 0, 1, 1, 1);
+ }
+
+ public void set_text (string text) {
+ val.set_text (text);
+ }
+}
\ No newline at end of file
From b8cb0cd08d219aac93de9c9ad0a80ad7f83da5f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw?=
Date: Wed, 29 Jul 2020 19:47:56 +0200
Subject: [PATCH 05/45] get processor's name
---
src/Resources/CPU.vala | 64 +++++++++++++++++++++++++
src/Views/SystemView/SystemCPUView.vala | 2 +-
vapi/libgtop-2.0.vapi | 8 ++--
3 files changed, 69 insertions(+), 5 deletions(-)
diff --git a/src/Resources/CPU.vala b/src/Resources/CPU.vala
index df0ded16..3f40c573 100644
--- a/src/Resources/CPU.vala
+++ b/src/Resources/CPU.vala
@@ -3,6 +3,8 @@ public class Monitor.CPU : Object {
private float last_total;
private float load;
+ public string? cpu_name;
+
GTop.Cpu ? cpu;
public int percentage {
@@ -27,6 +29,7 @@ public class Monitor.CPU : Object {
core_list = new Gee.ArrayList ();
+ cpu_name = get_cpu_info ();
debug ("Number of cores: %d", (int) get_num_processors ());
for (int i = 0; i < (int) get_num_processors (); i++) {
@@ -83,4 +86,65 @@ public class Monitor.CPU : Object {
_frequency = (double)maxcur;
}
+
+ // straight from elementary about-plug
+ private string? get_cpu_info () {
+ unowned GTop.SysInfo? info = GTop.glibtop_get_sysinfo ();
+
+ if (info == null) {
+ return null;
+ }
+
+ var counts = new Gee.HashMap ();
+ const string[] KEYS = { "model name", "cpu", "Processor" };
+
+ for (int i = 0; i < info.ncpu; i++) {
+ unowned GLib.HashTable values = info.cpuinfo[i].values;
+ string? model = null;
+ foreach (var key in KEYS) {
+ model = values.lookup (key);
+
+ if (model != null) {
+ break;
+ }
+ }
+
+ string? core_count = values.lookup ("cpu cores");
+ if (core_count != null) {
+ counts.@set (model, int.parse (core_count));
+ continue;
+ }
+
+ if (!counts.has_key (model)) {
+ counts.@set (model, 1);
+ } else {
+ counts.@set (model, counts.@get (model) + 1);
+ }
+ }
+
+ if (counts.size == 0) {
+ return null;
+ }
+
+ string result = "";
+ foreach (var cpu in counts.entries) {
+ if (result.length > 0) {
+ result += "\n";
+ }
+
+ if (cpu.@value == 2) {
+ result += _("Dual-Core %s").printf ( (cpu.key));
+ } else if (cpu.@value == 4) {
+ result += _("Quad-Core %s").printf ( (cpu.key));
+ } else if (cpu.@value == 6) {
+ result += _("Hexa-Core %s").printf ( (cpu.key));
+ } else {
+ result += "%u\u00D7 %s ".printf (cpu.@value, (cpu.key));
+ }
+ }
+
+ debug("%s", result);
+
+ return result;
+ }
}
diff --git a/src/Views/SystemView/SystemCPUView.vala b/src/Views/SystemView/SystemCPUView.vala
index 2c0f0486..fccead49 100644
--- a/src/Views/SystemView/SystemCPUView.vala
+++ b/src/Views/SystemView/SystemCPUView.vala
@@ -30,7 +30,7 @@ public class Monitor.SystemCPUView : Gtk.Grid {
// cpu_percentage_label.margin_start = 12;
// cpu_percentage_label.margin_top = 6;
- processor_name_label = new Gtk.Label ("AMD Ryzen 5 2400G with Radeon Vega Graphics");
+ processor_name_label = new Gtk.Label (cpu.cpu_name);
processor_name_label.get_style_context ().add_class ("h4");
// processor_name_label.get_style_context ().add_class ("text-secondary");
processor_name_label.valign = Gtk.Align.START;
diff --git a/vapi/libgtop-2.0.vapi b/vapi/libgtop-2.0.vapi
index e8db74b8..53be24b9 100644
--- a/vapi/libgtop-2.0.vapi
+++ b/vapi/libgtop-2.0.vapi
@@ -127,9 +127,9 @@ namespace GTop {
[CCode (cheader_filename = "glibtop/sysinfo.h", cname = "glibtop_entry", has_type_id = false)]
public struct Entry {
- public weak GLib.GenericArray labels;
- public weak GLib.HashTable values;
- public weak GLib.HashTable descriptions;
+ public GLib.PtrArray labels;
+ public GLib.HashTable values;
+ public GLib.HashTable descriptions;
}
[CCode (cheader_filename = "glibtop/fsusage.h", cname = "glibtop_fsusage", has_type_id = false)]
@@ -521,7 +521,7 @@ namespace GTop {
public uint64 flags;
public uint64 ncpu;
[CCode (array_length = false, array_null_terminated = true)]
- public weak GTop.Entry[] cpuinfo;
+ public unowned Entry[] cpuinfo;
}
[CCode (cheader_filename = "glibtop/union.h", cname = "glibtop_union")]
From b786f5bedca9fc773730c5c5fc52edc3879ea4e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw?=
Date: Fri, 31 Jul 2020 00:02:51 +0200
Subject: [PATCH 06/45] refactoring
---
meson.build | 9 ++--
.../ProcessInfoView/ProcessInfoCPURAM.vala | 8 ++--
.../ProcessInfoView/ProcessInfoHeader.vala | 28 ++++++-------
src/Views/SystemView/SystemCPUView.vala | 18 +++-----
src/Views/SystemView/SystemMemoryView.vala | 24 +++++------
.../Chart/Chart.vala} | 42 ++++++++-----------
.../Chart/ProcessChart.vala} | 4 +-
src/Widgets/Labels/LabelH4.vala | 14 +++++++
.../{RoundyLabel.vala => LabelRoundy.vala} | 4 +-
...{VerticalLabel.vala => LabelVertical.vala} | 4 +-
10 files changed, 78 insertions(+), 77 deletions(-)
rename src/{Views/SystemView/SystemCPUChart.vala => Widgets/Chart/Chart.vala} (55%)
rename src/{Views/ProcessView/ProcessInfoView/Chart.vala => Widgets/Chart/ProcessChart.vala} (97%)
create mode 100644 src/Widgets/Labels/LabelH4.vala
rename src/Widgets/Labels/{RoundyLabel.vala => LabelRoundy.vala} (81%)
rename src/Widgets/Labels/{VerticalLabel.vala => LabelVertical.vala} (86%)
diff --git a/meson.build b/meson.build
index d2795eab..249087f0 100644
--- a/meson.build
+++ b/meson.build
@@ -67,13 +67,11 @@ executable(
'src/Views/ProcessView/ProcessTreeView/CPUProcessTreeView.vala',
'src/Views/SystemView/SystemView.vala',
- 'src/Views/SystemView/SystemCPUChart.vala',
'src/Views/SystemView/SystemCPUView.vala',
'src/Views/SystemView/SystemMemoryView.vala',
# Widgets related only to ProcessInfoView
'src/Views/ProcessView/ProcessInfoView/Preventor.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',
@@ -83,8 +81,11 @@ executable(
'src/Widgets/Headerbar/Headerbar.vala',
'src/Widgets/Headerbar/Search.vala',
'src/Widgets/Statusbar/Statusbar.vala',
- 'src/Widgets/Labels/VerticalLabel.vala',
- 'src/Widgets/Labels/RoundyLabel.vala',
+ 'src/Widgets/Labels/LabelVertical.vala',
+ 'src/Widgets/Labels/LabelRoundy.vala',
+ 'src/Widgets/Labels/LabelH4.vala',
+ 'src/Widgets/Chart/Chart.vala',
+ 'src/Widgets/Chart/ProcessChart.vala',
# Models
diff --git a/src/Views/ProcessView/ProcessInfoView/ProcessInfoCPURAM.vala b/src/Views/ProcessView/ProcessInfoView/ProcessInfoCPURAM.vala
index 70ca1541..755c321c 100644
--- a/src/Views/ProcessView/ProcessInfoView/ProcessInfoCPURAM.vala
+++ b/src/Views/ProcessView/ProcessInfoView/ProcessInfoCPURAM.vala
@@ -2,8 +2,8 @@ public class Monitor.ProcessInfoCPURAM : Gtk.Grid {
private Gtk.Label cpu_label;
private Gtk.Label ram_label;
- private Chart cpu_chart;
- private Chart ram_chart;
+ private ProcessChart cpu_chart;
+ private ProcessChart ram_chart;
construct {
column_spacing = 6;
@@ -12,8 +12,8 @@ public class Monitor.ProcessInfoCPURAM : Gtk.Grid {
column_homogeneous = true;
row_homogeneous = false;
- cpu_chart = new Chart ();
- ram_chart = new Chart ();
+ cpu_chart = new ProcessChart ();
+ ram_chart = new ProcessChart ();
var cpu_graph_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
diff --git a/src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala b/src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala
index aa072fbf..1704d346 100644
--- a/src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala
+++ b/src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala
@@ -2,13 +2,13 @@ public class Monitor.ProcessInfoHeader : Gtk.Grid {
private Gtk.Image icon;
public Gtk.Label state;
public Gtk.Label application_name;
- public RoundyLabel pid;
- public RoundyLabel ppid;
- public RoundyLabel pgrp;
- public RoundyLabel nice;
- public RoundyLabel priority;
- public RoundyLabel num_threads;
- public RoundyLabel username;
+ public LabelRoundy pid;
+ public LabelRoundy ppid;
+ public LabelRoundy pgrp;
+ public LabelRoundy nice;
+ public LabelRoundy priority;
+ public LabelRoundy num_threads;
+ public LabelRoundy username;
private Regex ? regex;
@@ -36,15 +36,15 @@ public class Monitor.ProcessInfoHeader : Gtk.Grid {
application_name.halign = Gtk.Align.START;
application_name.valign = Gtk.Align.START;
- pid = new RoundyLabel (_ ("PID"));
- nice = new RoundyLabel (_ ("NI"));
- priority = new RoundyLabel (_ ("PRI"));
- num_threads = new RoundyLabel (_ ("THR"));
- // ppid = new RoundyLabel (_("PPID"));
- // pgrp = new RoundyLabel (_("PGRP"));
+ pid = new LabelRoundy (_ ("PID"));
+ nice = new LabelRoundy (_ ("NI"));
+ priority = new LabelRoundy (_ ("PRI"));
+ num_threads = new LabelRoundy (_ ("THR"));
+ // ppid = new LabelRoundy (_("PPID"));
+ // pgrp = new LabelRoundy (_("PGRP"));
// TODO: tooltip_text UID
- username = new RoundyLabel ("");
+ username = new LabelRoundy ("");
var wrapper = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
wrapper.add (pid);
diff --git a/src/Views/SystemView/SystemCPUView.vala b/src/Views/SystemView/SystemCPUView.vala
index fccead49..d3794449 100644
--- a/src/Views/SystemView/SystemCPUView.vala
+++ b/src/Views/SystemView/SystemCPUView.vala
@@ -1,9 +1,9 @@
public class Monitor.SystemCPUView : Gtk.Grid {
- private SystemCPUChart cpu_chart;
+ private Chart cpu_chart;
private CPU cpu;
- private VerticalLabel cpu_percentage_label;
- private Gtk.Label processor_name_label;
+ private LabelVertical cpu_percentage_label;
+ private LabelH4 processor_name_label;
private Gtk.Button view_threads_usage_button;
@@ -23,22 +23,16 @@ public class Monitor.SystemCPUView : Gtk.Grid {
public SystemCPUView(CPU _cpu) {
cpu = _cpu;
- cpu_percentage_label = new VerticalLabel (_("UTILIZATION"));
+ cpu_percentage_label = new LabelVertical (_("UTILIZATION"));
// cpu_percentage_label.get_style_context ().add_class ("h3");
// cpu_percentage_label.valign = Gtk.Align.START;
// cpu_percentage_label.halign = Gtk.Align.START;
// cpu_percentage_label.margin_start = 12;
// cpu_percentage_label.margin_top = 6;
- processor_name_label = new Gtk.Label (cpu.cpu_name);
- processor_name_label.get_style_context ().add_class ("h4");
- // processor_name_label.get_style_context ().add_class ("text-secondary");
- processor_name_label.valign = Gtk.Align.START;
- processor_name_label.halign = Gtk.Align.START;
- processor_name_label.margin_start = 6;
- // processor_name_label.margin_top = 6;
+ processor_name_label = new LabelH4 (cpu.cpu_name);
- cpu_chart = new SystemCPUChart (cpu.core_list.size);
+ cpu_chart = new Chart (cpu.core_list.size);
view_threads_usage_button = new Gtk.Button ();
view_threads_usage_button.has_tooltip = true;
diff --git a/src/Views/SystemView/SystemMemoryView.vala b/src/Views/SystemView/SystemMemoryView.vala
index 16cd0a72..f2c0647d 100644
--- a/src/Views/SystemView/SystemMemoryView.vala
+++ b/src/Views/SystemView/SystemMemoryView.vala
@@ -1,8 +1,9 @@
public class Monitor.SystemMemoryView : Gtk.Grid {
- private SystemCPUChart memory_chart;
+ private Chart memory_chart;
private Memory memory;
- private Gtk.Label memory_percentage_label;
+ private LabelH4 memory_name_label;
+ private LabelVertical memory_percentage_label;
private Gtk.Label memory_shared_label;
private Gtk.Label memory_buffered_label;
private Gtk.Label memory_cached_label;
@@ -21,11 +22,9 @@ public class Monitor.SystemMemoryView : Gtk.Grid {
public SystemMemoryView(Memory _memory) {
memory = _memory;
- memory_percentage_label = new Gtk.Label (_("Memory: ") + Utils.NO_DATA);
- memory_percentage_label.get_style_context ().add_class ("h2");
- memory_percentage_label.halign = Gtk.Align.START;
- memory_percentage_label.valign = Gtk.Align.START;
- memory_percentage_label.margin_start = 6;
+ memory_name_label = new LabelH4 (_("Memory"));
+
+ memory_percentage_label = new LabelVertical (_("UTILIZATION"));
memory_total_label = new Gtk.Label (_("Total: ") + Utils.NO_DATA);
memory_total_label.halign = Gtk.Align.START;
@@ -45,11 +44,12 @@ public class Monitor.SystemMemoryView : Gtk.Grid {
memory_locked_label = new Gtk.Label (_("Locked: ") + Utils.NO_DATA);
memory_locked_label.halign = Gtk.Align.START;
- memory_chart = new SystemCPUChart (1);
+ memory_chart = new Chart (1);
- attach (memory_percentage_label, 1, 0, 1, 1);
- attach (memory_usage_grid (), 0, 0, 1);
- attach (memory_chart, 1, 0, 1, 2);
+ attach (memory_name_label, 0, 0, 1, 1);
+ attach (memory_percentage_label, 0, 1, 1, 1);
+ // attach (memory_usage_grid (), 0, 0, 1);
+ attach (memory_chart, 0, 1, 1, 2);
}
@@ -70,7 +70,7 @@ public class Monitor.SystemMemoryView : Gtk.Grid {
public void update () {
- memory_percentage_label.set_text ((_("Memory: % 3d%%")).printf (memory.percentage));
+ memory_percentage_label.set_text ((_("%d%%")).printf (memory.percentage));
memory_chart.update (0, memory.percentage);
memory_total_label.set_text ((_("Total: %s")).printf (Utils.HumanUnitFormatter.double_bytes_to_human(memory.total)));
diff --git a/src/Views/SystemView/SystemCPUChart.vala b/src/Widgets/Chart/Chart.vala
similarity index 55%
rename from src/Views/SystemView/SystemCPUChart.vala
rename to src/Widgets/Chart/Chart.vala
index 038e1e3c..7a173946 100644
--- a/src/Views/SystemView/SystemCPUChart.vala
+++ b/src/Widgets/Chart/Chart.vala
@@ -1,13 +1,8 @@
-public class Monitor.SystemCPUChart : Gtk.Box {
- private LiveChart.Chart chart;
+public class Monitor.Chart : Gtk.Box {
+ private LiveChart.Chart live_chart;
private LiveChart.Config config;
- // private Gee.ArrayList serie_list;
-
-
construct {
- // serie_list = new Gee.ArrayList ();
-
get_style_context ().add_class ("graph");
vexpand = true;
@@ -28,42 +23,39 @@ public class Monitor.SystemCPUChart : Gtk.Box {
left = -1
};
- chart = new LiveChart.Chart (config);
- chart.expand = true;
- chart.legend.visible = false;
- chart.grid.visible = true;
- chart.background.main_color = Gdk.RGBA () {
+ live_chart = new LiveChart.Chart (config);
+ live_chart.expand = true;
+ live_chart.legend.visible = false;
+ live_chart.grid.visible = true;
+ live_chart.background.main_color = Gdk.RGBA () {
red= 1, green= 1, blue= 1, alpha= 1
}; //White background
}
- public SystemCPUChart (int cores_quantity) {
- for (int i = 0; i < cores_quantity; i++) {
+ public Chart (int series_quantity) {
+ for (int i = 0; i < series_quantity; i++) {
var renderer = new LiveChart.SmoothLineArea (new LiveChart.Values(1000));
var serie = new LiveChart.Serie ("Core x", renderer);
serie.set_main_color ({ 0.35 + i/20, 0.8, 0.1, 1.0});
- chart.add_serie (serie);
- // serie_list.add (serie);
+ live_chart.add_serie (serie);
}
-
- add (chart);
+ add (live_chart);
}
public void update (int serie_number, double value) {
- // debug("%f", value);
- // chart.add_value (serie_list.get(serie_number), value);
- chart.add_value_by_index (serie_number, value);
+ live_chart.add_value_by_index (serie_number, value);
}
- // public void set_data (Gee.ArrayList history) {
+ // public void set_data (int serie_number, Gee.ArrayList history) {
// var refresh_rate_is_ms = 2000; //your own refresh rate in milliseconds
- // chart.add_unaware_timestamp_collection(serie_list[0], history, refresh_rate_is_ms);
+ // live_chart.add_unaware_timestamp_collection(live_chart.series[serie_number], history, refresh_rate_is_ms);
// }
+
public void clear () {
- // var series = chart.series;
- // foreach (var serie in serie_list) {
+ // var series = live_chart.series;
+ // foreach (var serie in series) {
// serie.clear();
// }
}
diff --git a/src/Views/ProcessView/ProcessInfoView/Chart.vala b/src/Widgets/Chart/ProcessChart.vala
similarity index 97%
rename from src/Views/ProcessView/ProcessInfoView/Chart.vala
rename to src/Widgets/Chart/ProcessChart.vala
index 3e320b5e..3b88ad77 100644
--- a/src/Views/ProcessView/ProcessInfoView/Chart.vala
+++ b/src/Widgets/Chart/ProcessChart.vala
@@ -1,4 +1,4 @@
-public class Monitor.Chart : Gtk.Box {
+public class Monitor.ProcessChart : Gtk.Box {
private LiveChart.Serie serie;
private LiveChart.SmoothLineArea renderer;
private LiveChart.Chart chart;
@@ -54,4 +54,4 @@ public class Monitor.Chart : Gtk.Box {
public void clear () {
serie.clear();
}
-}
+}
\ No newline at end of file
diff --git a/src/Widgets/Labels/LabelH4.vala b/src/Widgets/Labels/LabelH4.vala
new file mode 100644
index 00000000..55f1560b
--- /dev/null
+++ b/src/Widgets/Labels/LabelH4.vala
@@ -0,0 +1,14 @@
+class LabelH4 : Gtk.Label {
+
+ construct {
+ get_style_context ().add_class ("h4");
+ valign = Gtk.Align.START;
+ halign = Gtk.Align.START;
+ margin_start = 6;
+ ellipsize = Pango.EllipsizeMode.END;
+ }
+
+ public LabelH4 (string label) {
+ Object (label: label);
+ }
+}
\ No newline at end of file
diff --git a/src/Widgets/Labels/RoundyLabel.vala b/src/Widgets/Labels/LabelRoundy.vala
similarity index 81%
rename from src/Widgets/Labels/RoundyLabel.vala
rename to src/Widgets/Labels/LabelRoundy.vala
index a399279b..dd490cdd 100644
--- a/src/Widgets/Labels/RoundyLabel.vala
+++ b/src/Widgets/Labels/LabelRoundy.vala
@@ -1,9 +1,9 @@
-public class Monitor.RoundyLabel : Gtk.Fixed {
+public class Monitor.LabelRoundy : Gtk.Fixed {
public Gtk.Label val;
public Gtk.Label desc;
- public RoundyLabel (string description) {
+ public LabelRoundy (string description) {
val = new Gtk.Label (Utils.NO_DATA);
val.get_style_context ().add_class ("roundy-label");
diff --git a/src/Widgets/Labels/VerticalLabel.vala b/src/Widgets/Labels/LabelVertical.vala
similarity index 86%
rename from src/Widgets/Labels/VerticalLabel.vala
rename to src/Widgets/Labels/LabelVertical.vala
index 3de928b2..49eba170 100644
--- a/src/Widgets/Labels/VerticalLabel.vala
+++ b/src/Widgets/Labels/LabelVertical.vala
@@ -1,4 +1,4 @@
-public class Monitor.VerticalLabel : Gtk.Grid {
+public class Monitor.LabelVertical : Gtk.Grid {
public Gtk.Label val;
public Gtk.Label desc;
@@ -8,7 +8,7 @@ public class Monitor.VerticalLabel : Gtk.Grid {
margin_top = 6;
}
- public VerticalLabel (string description) {
+ public LabelVertical (string description) {
val = new Gtk.Label (Utils.NO_DATA);
// val.get_style_context ().add_class ("h2");
From e12767f968bfd9ff47d18d528d7d425f4dd06d7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw?=
Date: Fri, 31 Jul 2020 00:16:05 +0200
Subject: [PATCH 07/45] remove patreon
---
.github/FUNDING.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 24edbd7d..8b137891 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1 +1 @@
-patreon: stsdc
+
From 249343ff1098a0ac25f56ed0bc5b61e93f4eec94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw?=
Date: Tue, 4 Aug 2020 00:34:14 +0200
Subject: [PATCH 08/45] beautify strings
---
src/Resources/CPU.vala | 4 +-
src/Utils.vala | 124 ++++++++++++++++++++++++++---------------
2 files changed, 80 insertions(+), 48 deletions(-)
diff --git a/src/Resources/CPU.vala b/src/Resources/CPU.vala
index 3f40c573..eb17bab9 100644
--- a/src/Resources/CPU.vala
+++ b/src/Resources/CPU.vala
@@ -143,8 +143,6 @@ public class Monitor.CPU : Object {
}
}
- debug("%s", result);
-
- return result;
+ return Utils.Strings.beautify (result);
}
}
diff --git a/src/Utils.vala b/src/Utils.vala
index 4d020acf..628dbaf9 100644
--- a/src/Utils.vala
+++ b/src/Utils.vala
@@ -1,54 +1,88 @@
namespace Monitor.Utils {
- const string NOT_AVAILABLE = (_("N/A"));
+ const string NOT_AVAILABLE = (_ ("N/A"));
const string NO_DATA = "\u2014";
}
+public class Monitor.Utils.Strings {
+ // straight from elementary about-plug
+
+ struct GraphicsReplaceStrings {
+ string regex;
+ string replacement;
+ }
+
+ public static string beautify (string info) {
+ string pretty = GLib.Markup.escape_text (info).strip ();
+
+
+ const GraphicsReplaceStrings REPLACE_STRINGS[] = {
+ // { "Mesa DRI ", ""},
+ { "[(]R[)]", "®"},
+ { "[(]TM[)]", "™"},
+ // { "Gallium .* on (AMD .*)", "\\1"},
+ // { "(AMD .*) [(].*", "\\1"},
+ // { "(AMD [A-Z])(.*)", "\\1\\L\\2\\E"},
+ // { "Graphics Controller", "Graphics"},
+ };
+
+ try {
+ foreach (GraphicsReplaceStrings replace_string in REPLACE_STRINGS) {
+ GLib.Regex re = new GLib.Regex (replace_string.regex, 0, 0);
+ pretty = re.replace (pretty, -1, 0, replace_string.replacement, 0);
+ }
+ } catch (Error e) {
+ critical ("Couldn't cleanup vendor string: %s", e.message);
+ }
+
+ return pretty;
+ }
+}
+
+/**
+ * Static helper class for unit formatting
+ * Author: Laurent Callarec @lcallarec
+ */
+public class Monitor.Utils.HumanUnitFormatter {
+ const string[] SIZE_UNITS = {"B", "KiB", "MiB", "GiB", "TiB"};
+ const double KFACTOR = 1024;
+
/**
- * Static helper class for unit formatting
- * Author: Laurent Callarec @lcallarec
+ * format a string of bytes to an human readable format with units
*/
- public class Monitor.Utils.HumanUnitFormatter {
-
- const string[] SIZE_UNITS = {"B", "KiB", "MiB", "GiB", "TiB"};
- const double KFACTOR = 1024;
-
- /**
- * format a string of bytes to an human readable format with units
- */
- public static string string_bytes_to_human(string bytes) {
- double current_size = double.parse(bytes);
- string current_size_formatted = bytes.to_string() + HumanUnitFormatter.SIZE_UNITS[0];
-
- for (int i = 0; i<= HumanUnitFormatter.SIZE_UNITS.length; i++) {
- if (current_size < HumanUnitFormatter.KFACTOR) {
- return GLib.Math.round(current_size).to_string() + HumanUnitFormatter.SIZE_UNITS[i];
- }
- current_size = current_size / HumanUnitFormatter.KFACTOR;
- }
-
- return current_size_formatted;
- }
-
- public static string double_bytes_to_human(double bytes) {
- string units = _ ("B");
-
- // convert to MiB if needed
- if (bytes > 1024.0) {
- bytes /= 1024.0;
- units = _ ("KiB");
- }
-
- // convert to GiB if needed
- if (bytes > 1024.0) {
- bytes /= 1024.0;
- units = _ ("MiB");
- }
+ public static string string_bytes_to_human (string bytes) {
+ double current_size = double.parse (bytes);
+ string current_size_formatted = bytes.to_string () + HumanUnitFormatter.SIZE_UNITS[0];
- if (bytes > 1024.0) {
- bytes /= 1024.0;
- units = _ ("GiB");
+ for (int i = 0; i<= HumanUnitFormatter.SIZE_UNITS.length; i++) {
+ if (current_size < HumanUnitFormatter.KFACTOR) {
+ return GLib.Math.round (current_size).to_string () + HumanUnitFormatter.SIZE_UNITS[i];
}
+ current_size = current_size / HumanUnitFormatter.KFACTOR;
+ }
+
+ return current_size_formatted;
+ }
+
+ public static string double_bytes_to_human (double bytes) {
+ string units = _ ("B");
- return "%.1f %s".printf (bytes, units);
- }
- }
+ // convert to MiB if needed
+ if (bytes > 1024.0) {
+ bytes /= 1024.0;
+ units = _ ("KiB");
+ }
+
+ // convert to GiB if needed
+ if (bytes > 1024.0) {
+ bytes /= 1024.0;
+ units = _ ("MiB");
+ }
+
+ if (bytes > 1024.0) {
+ bytes /= 1024.0;
+ units = _ ("GiB");
+ }
+
+ return "%.1f %s".printf (bytes, units);
+ }
+}
From 2b452906e3c253458ea976d6b84c677f74d3b5b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw?=
Date: Tue, 4 Aug 2020 18:56:56 +0200
Subject: [PATCH 09/45] use revealer to show more data
---
src/Views/SystemView/SystemCPUView.vala | 55 +++++++++++++++++--------
1 file changed, 37 insertions(+), 18 deletions(-)
diff --git a/src/Views/SystemView/SystemCPUView.vala b/src/Views/SystemView/SystemCPUView.vala
index d3794449..77e006e5 100644
--- a/src/Views/SystemView/SystemCPUView.vala
+++ b/src/Views/SystemView/SystemCPUView.vala
@@ -3,11 +3,14 @@ public class Monitor.SystemCPUView : Gtk.Grid {
private CPU cpu;
private LabelVertical cpu_percentage_label;
+ private LabelRoundy cpu_frequency_label;
private LabelH4 processor_name_label;
private Gtk.Button view_threads_usage_button;
- private Gee.ArrayList core_label_list;
+ private Gtk.Revealer cpu_threads_revealer;
+
+ private Gee.ArrayList core_label_list;
construct {
margin = 12;
@@ -15,7 +18,7 @@ public class Monitor.SystemCPUView : Gtk.Grid {
column_spacing = 12;
set_vexpand (false);
- core_label_list = new Gee.ArrayList ();
+ core_label_list = new Gee.ArrayList ();
}
@@ -24,6 +27,8 @@ public class Monitor.SystemCPUView : Gtk.Grid {
cpu = _cpu;
cpu_percentage_label = new LabelVertical (_("UTILIZATION"));
+ // cpu_percentage_label.valign = Gtk.Align.CENTER;
+ cpu_frequency_label = new LabelRoundy (_("FREQUENCY"));
// cpu_percentage_label.get_style_context ().add_class ("h3");
// cpu_percentage_label.valign = Gtk.Align.START;
// cpu_percentage_label.halign = Gtk.Align.START;
@@ -34,13 +39,18 @@ public class Monitor.SystemCPUView : Gtk.Grid {
cpu_chart = new Chart (cpu.core_list.size);
- view_threads_usage_button = new Gtk.Button ();
+ view_threads_usage_button = new Gtk.Button.with_label (">>");
view_threads_usage_button.has_tooltip = true;
- view_threads_usage_button.tooltip_text = (_("Settings"));
- var icon = new Gtk.Image ();
- icon.gicon = new ThemedIcon ("view-more-horizontal-symbolic");
- icon.pixel_size = 16;
- view_threads_usage_button.set_image (icon);
+ view_threads_usage_button.tooltip_text = (_("View more"));
+ view_threads_usage_button.valign = Gtk.Align.CENTER;
+ // var icon = new Gtk.Image ();
+ // icon.gicon = new ThemedIcon ("view-more-horizontal-symbolic");
+ // icon.pixel_size = 16;
+ // view_threads_usage_button.set_image (icon);
+
+ view_threads_usage_button.clicked.connect(() => {
+ cpu_threads_revealer.reveal_child = !(cpu_threads_revealer.child_revealed);
+ });
// attach (grid_core_labels (), 0, 0, 1, 1);
// attach (grid_info_labels (), 0, 0, 1, 1);
@@ -58,15 +68,16 @@ public class Monitor.SystemCPUView : Gtk.Grid {
double core_percentage = cpu.core_list[i].percentage_used;
cpu_chart.update(i, core_percentage);
string percentage_formatted = ("% 3d%%").printf ( (int)core_percentage);
- // core_label_list[i].set_text (_("Thread %d: %s").printf (i, percentage_formatted));
+ core_label_list[i].set_text (percentage_formatted);
}
cpu_percentage_label.set_text ((_("%d%%")).printf (cpu.percentage));
+ cpu_frequency_label.set_text (("%.2f %s").printf (cpu.frequency, _ ("GHz")));
}
private Gtk.Grid grid_info_labels () {
Gtk.Grid grid = new Gtk.Grid ();
- grid.column_spacing = 12;
+ // grid.column_spacing = 12;
grid.attach(processor_name_label, 0, 0, 1, 1);
grid.attach(cpu_percentage_label, 0, 1, 1, 1);
@@ -75,24 +86,31 @@ public class Monitor.SystemCPUView : Gtk.Grid {
}
private Gtk.Grid grid_usage_labels () {
+
Gtk.Grid grid = new Gtk.Grid ();
- grid.column_spacing = 12;
+ grid.column_spacing = 0;
grid.attach(cpu_percentage_label, 0, 0, 1, 1);
- // grid.attach(view_threads_usage_button, 1, 0, 1, 1);
+ grid.attach(view_threads_usage_button, 2, 0, 1, 1);
+ grid.attach(grid_core_labels(), 1, 0, 1, 1);
return grid;
}
- private Gtk.Grid grid_core_labels () {
+ private Gtk.Revealer grid_core_labels () {
+ cpu_threads_revealer = new Gtk.Revealer();
+ cpu_threads_revealer.margin = 6;
+ cpu_threads_revealer.transition_type = Gtk.RevealerTransitionType.SLIDE_LEFT;
+ cpu_threads_revealer.valign = Gtk.Align.CENTER;
+
Gtk.Grid grid = new Gtk.Grid ();
- grid.column_spacing = 12;
- grid.width_request = 300;
+ grid.column_spacing = 8;
+ grid.row_spacing = 4;
int column = 0;
int row = 0;
for (int i = 0; i < cpu.core_list.size; i++) {
- var core_label = new Gtk.Label(_("Thread %d: ").printf (i) + Utils.NO_DATA);
- core_label.halign = Gtk.Align.START;
+ var core_label = new LabelRoundy(_("Thread %d").printf (i));
+ core_label.set_text (Utils.NO_DATA);
core_label_list.add (core_label);
grid.attach(core_label, column, row, 1, 1);
@@ -103,7 +121,8 @@ public class Monitor.SystemCPUView : Gtk.Grid {
column = 0;
}
}
+ cpu_threads_revealer.add (grid);
- return grid;
+ return cpu_threads_revealer;
}
}
\ No newline at end of file
From 8e0f1ada02cc0377a466eb2a1c7ba6bb756a769d Mon Sep 17 00:00:00 2001
From: stsdc
Date: Tue, 4 Aug 2020 23:54:43 +0200
Subject: [PATCH 10/45] add columns, not rows
---
src/Views/SystemView/SystemCPUView.vala | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/Views/SystemView/SystemCPUView.vala b/src/Views/SystemView/SystemCPUView.vala
index 77e006e5..67ea3b33 100644
--- a/src/Views/SystemView/SystemCPUView.vala
+++ b/src/Views/SystemView/SystemCPUView.vala
@@ -115,10 +115,10 @@ public class Monitor.SystemCPUView : Gtk.Grid {
grid.attach(core_label, column, row, 1, 1);
- column++;
- if (column > 1) {
- row++;
- column = 0;
+ row++;
+ if (row > 1) {
+ column++;
+ row = 0;
}
}
cpu_threads_revealer.add (grid);
From 36008a179834a32afbb42b770fb320c4ca5ec1a4 Mon Sep 17 00:00:00 2001
From: stsdc
Date: Wed, 5 Aug 2020 00:31:33 +0200
Subject: [PATCH 11/45] add core badge styles
---
data/Application.css | 29 +++++++++++++++++++++++++
src/Views/SystemView/SystemCPUView.vala | 9 ++++----
2 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/data/Application.css b/data/Application.css
index a7d66c05..356d2fb6 100644
--- a/data/Application.css
+++ b/data/Application.css
@@ -58,6 +58,35 @@
border-width: 0;
}
+.core_badge {
+ background-color: @SILVER_100;
+ border-radius: 8px;
+ padding-right: 4px;
+ padding-left:2px;
+ font-size: 10px;
+ font-weight:bold;
+ color: @SILVER_900;
+ border: 1px solid @SILVER_300;
+}
+
+.core_badge-mild-warning {
+ background-color: @SBANANA_100;
+ color: @BANANA_900;
+ border: 1px solid @BANANA_300;
+}
+
+.core_badge-strong-warning {
+ background-color: @ORANGE_100;
+ color: @ORANGE_900;
+ border: 1px solid @ORANGE_300;
+}
+
+.core_badge-critical-warning {
+ background-color: @STRAWBERRY_100;
+ color: @STRAWBERRY_700;
+ border: 1px solid @STRAWBERRY_300;
+}
+
.command_wrapper {
background-color: #fdf6e3;
border-radius: 3px;
diff --git a/src/Views/SystemView/SystemCPUView.vala b/src/Views/SystemView/SystemCPUView.vala
index 67ea3b33..d5cd724f 100644
--- a/src/Views/SystemView/SystemCPUView.vala
+++ b/src/Views/SystemView/SystemCPUView.vala
@@ -10,7 +10,7 @@ public class Monitor.SystemCPUView : Gtk.Grid {
private Gtk.Revealer cpu_threads_revealer;
- private Gee.ArrayList core_label_list;
+ private Gee.ArrayList core_label_list;
construct {
margin = 12;
@@ -18,7 +18,7 @@ public class Monitor.SystemCPUView : Gtk.Grid {
column_spacing = 12;
set_vexpand (false);
- core_label_list = new Gee.ArrayList ();
+ core_label_list = new Gee.ArrayList ();
}
@@ -109,8 +109,9 @@ public class Monitor.SystemCPUView : Gtk.Grid {
int column = 0;
int row = 0;
for (int i = 0; i < cpu.core_list.size; i++) {
- var core_label = new LabelRoundy(_("Thread %d").printf (i));
- core_label.set_text (Utils.NO_DATA);
+ var core_label = new Gtk.Label (Utils.NO_DATA);
+ core_label.get_style_context ().add_class ("core_badge");
+ // core_label.set_text (Utils.NO_DATA);
core_label_list.add (core_label);
grid.attach(core_label, column, row, 1, 1);
From 7feb3cf03db456ae376cf49956dbcc6db34ce73b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw?=
Date: Wed, 5 Aug 2020 18:54:19 +0200
Subject: [PATCH 12/45] reveal additional info clicking on utilization label
---
data/Application.css | 2 +-
src/Views/SystemView/SystemCPUView.vala | 30 +++++--------------------
src/Widgets/Labels/LabelVertical.vala | 27 ++++++++++++++++------
3 files changed, 27 insertions(+), 32 deletions(-)
diff --git a/data/Application.css b/data/Application.css
index 356d2fb6..3872a3b7 100644
--- a/data/Application.css
+++ b/data/Application.css
@@ -20,7 +20,7 @@
.vertical-label:selected:focus,
.vertical-label:hover:selected {
color: alpha(@text_color, 1);
- font-size: 28px;
+ font-size: 30px;
font-weight: 100;
/* padding: 0 6px;
margin: 0 3px; */
diff --git a/src/Views/SystemView/SystemCPUView.vala b/src/Views/SystemView/SystemCPUView.vala
index d5cd724f..02df08d7 100644
--- a/src/Views/SystemView/SystemCPUView.vala
+++ b/src/Views/SystemView/SystemCPUView.vala
@@ -27,39 +27,18 @@ public class Monitor.SystemCPUView : Gtk.Grid {
cpu = _cpu;
cpu_percentage_label = new LabelVertical (_("UTILIZATION"));
- // cpu_percentage_label.valign = Gtk.Align.CENTER;
cpu_frequency_label = new LabelRoundy (_("FREQUENCY"));
- // cpu_percentage_label.get_style_context ().add_class ("h3");
- // cpu_percentage_label.valign = Gtk.Align.START;
- // cpu_percentage_label.halign = Gtk.Align.START;
- // cpu_percentage_label.margin_start = 12;
- // cpu_percentage_label.margin_top = 6;
-
processor_name_label = new LabelH4 (cpu.cpu_name);
cpu_chart = new Chart (cpu.core_list.size);
- view_threads_usage_button = new Gtk.Button.with_label (">>");
- view_threads_usage_button.has_tooltip = true;
- view_threads_usage_button.tooltip_text = (_("View more"));
- view_threads_usage_button.valign = Gtk.Align.CENTER;
- // var icon = new Gtk.Image ();
- // icon.gicon = new ThemedIcon ("view-more-horizontal-symbolic");
- // icon.pixel_size = 16;
- // view_threads_usage_button.set_image (icon);
-
- view_threads_usage_button.clicked.connect(() => {
+ cpu_percentage_label.clicked.connect(() => {
cpu_threads_revealer.reveal_child = !(cpu_threads_revealer.child_revealed);
});
- // attach (grid_core_labels (), 0, 0, 1, 1);
- // attach (grid_info_labels (), 0, 0, 1, 1);
attach (processor_name_label, 0, 0, 1, 1);
attach (grid_usage_labels(), 0, 1, 1, 1);
- // attach (view_threads_usage_button, 1, 1, 1, 1);
- // attach (processor_name_label, 0, 0, 1, 1);
attach (cpu_chart, 0, 1, 1, 1);
-
}
@@ -77,7 +56,6 @@ public class Monitor.SystemCPUView : Gtk.Grid {
private Gtk.Grid grid_info_labels () {
Gtk.Grid grid = new Gtk.Grid ();
- // grid.column_spacing = 12;
grid.attach(processor_name_label, 0, 0, 1, 1);
grid.attach(cpu_percentage_label, 0, 1, 1, 1);
@@ -88,7 +66,7 @@ public class Monitor.SystemCPUView : Gtk.Grid {
private Gtk.Grid grid_usage_labels () {
Gtk.Grid grid = new Gtk.Grid ();
- grid.column_spacing = 0;
+ grid.column_spacing = 6;
grid.attach(cpu_percentage_label, 0, 0, 1, 1);
grid.attach(view_threads_usage_button, 2, 0, 1, 1);
@@ -124,6 +102,10 @@ public class Monitor.SystemCPUView : Gtk.Grid {
}
cpu_threads_revealer.add (grid);
+ var threads_label = new Gtk.Label ("THREADS");
+ threads_label.get_style_context ().add_class ("small-text");
+ grid.attach(threads_label, 0, -1, column, 1);
+
return cpu_threads_revealer;
}
}
\ No newline at end of file
diff --git a/src/Widgets/Labels/LabelVertical.vala b/src/Widgets/Labels/LabelVertical.vala
index 49eba170..ceaecbd8 100644
--- a/src/Widgets/Labels/LabelVertical.vala
+++ b/src/Widgets/Labels/LabelVertical.vala
@@ -1,25 +1,38 @@
-public class Monitor.LabelVertical : Gtk.Grid {
+public class Monitor.LabelVertical : Gtk.EventBox {
+
+ private Gtk.Grid grid;
+
+ public signal void clicked ();
public Gtk.Label val;
public Gtk.Label desc;
construct {
- margin_start = 12;
- margin_top = 6;
+ grid = new Gtk.Grid ();
+ grid.margin_start = 12;
+ grid.margin_top = 6;
}
public LabelVertical (string description) {
val = new Gtk.Label (Utils.NO_DATA);
- // val.get_style_context ().add_class ("h2");
val.get_style_context ().add_class ("vertical-label");
desc = new Gtk.Label (description);
- // desc.get_style_context ().add_class ("h4");
desc.get_style_context ().add_class ("small-text");
- attach(desc, 0, 0, 1, 1);
- attach(val, 0, 1, 1, 1);
+ grid.attach(desc, 0, 0, 1, 1);
+ grid.attach(val, 0, 1, 1, 1);
+
+ add (grid);
+
+ events |= Gdk.EventMask.BUTTON_RELEASE_MASK;
+
+ button_release_event.connect ((event) => {
+ clicked ();
+ return false;
+ });
+
}
public void set_text (string text) {
From d1871e111b9392273236aa1fab40c7993da72cff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw?=
Date: Wed, 5 Aug 2020 19:25:41 +0200
Subject: [PATCH 13/45] core labels not bold
---
data/Application.css | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/data/Application.css b/data/Application.css
index 3872a3b7..e163793c 100644
--- a/data/Application.css
+++ b/data/Application.css
@@ -64,8 +64,8 @@
padding-right: 4px;
padding-left:2px;
font-size: 10px;
- font-weight:bold;
- color: @SILVER_900;
+ /* font-weight:bold; */
+ color: black;
border: 1px solid @SILVER_300;
}
From af464ac8bedf5b73bbe0e8bc50c4b707af021d50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw?=
Date: Wed, 5 Aug 2020 19:26:06 +0200
Subject: [PATCH 14/45] memory info in revealer
---
src/Views/SystemView/SystemCPUView.vala | 1 -
src/Views/SystemView/SystemMemoryView.vala | 25 +++++++++++++++++-----
src/Widgets/Labels/LabelVertical.vala | 2 ++
3 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/src/Views/SystemView/SystemCPUView.vala b/src/Views/SystemView/SystemCPUView.vala
index 02df08d7..cbb6cea9 100644
--- a/src/Views/SystemView/SystemCPUView.vala
+++ b/src/Views/SystemView/SystemCPUView.vala
@@ -69,7 +69,6 @@ public class Monitor.SystemCPUView : Gtk.Grid {
grid.column_spacing = 6;
grid.attach(cpu_percentage_label, 0, 0, 1, 1);
- grid.attach(view_threads_usage_button, 2, 0, 1, 1);
grid.attach(grid_core_labels(), 1, 0, 1, 1);
return grid;
diff --git a/src/Views/SystemView/SystemMemoryView.vala b/src/Views/SystemView/SystemMemoryView.vala
index f2c0647d..00a26eb1 100644
--- a/src/Views/SystemView/SystemMemoryView.vala
+++ b/src/Views/SystemView/SystemMemoryView.vala
@@ -10,6 +10,7 @@ public class Monitor.SystemMemoryView : Gtk.Grid {
private Gtk.Label memory_locked_label;
private Gtk.Label memory_total_label;
private Gtk.Label memory_used_label;
+ private Gtk.Revealer memory_usage_revealer;
construct {
margin = 12;
@@ -26,6 +27,10 @@ public class Monitor.SystemMemoryView : Gtk.Grid {
memory_percentage_label = new LabelVertical (_("UTILIZATION"));
+ memory_percentage_label.clicked.connect(() => {
+ memory_usage_revealer.reveal_child = !(memory_usage_revealer.child_revealed);
+ });
+
memory_total_label = new Gtk.Label (_("Total: ") + Utils.NO_DATA);
memory_total_label.halign = Gtk.Align.START;
@@ -46,14 +51,22 @@ public class Monitor.SystemMemoryView : Gtk.Grid {
memory_chart = new Chart (1);
+ var lil_gridy = new Gtk.Grid ();
+ lil_gridy.attach (memory_percentage_label, 0, 0, 1, 1);
+ lil_gridy.attach (memory_usage_grid (), 1, 0, 1, 1);
+
attach (memory_name_label, 0, 0, 1, 1);
- attach (memory_percentage_label, 0, 1, 1, 1);
- // attach (memory_usage_grid (), 0, 0, 1);
- attach (memory_chart, 0, 1, 1, 2);
+ attach (lil_gridy, 0, 1, 1, 1);
+ attach (memory_chart, 0, 1, 2, 2);
}
- private Gtk.Grid memory_usage_grid () {
+ private Gtk.Revealer memory_usage_grid () {
+ memory_usage_revealer = new Gtk.Revealer();
+ memory_usage_revealer.margin = 6;
+ memory_usage_revealer.transition_type = Gtk.RevealerTransitionType.SLIDE_LEFT;
+ memory_usage_revealer.valign = Gtk.Align.CENTER;
+
Gtk.Grid grid = new Gtk.Grid ();
grid.column_spacing = 12;
grid.width_request = 300;
@@ -65,7 +78,9 @@ public class Monitor.SystemMemoryView : Gtk.Grid {
grid.attach (memory_cached_label, 0, 2, 1, 1);
grid.attach (memory_locked_label, 1, 2, 1, 1);
- return grid;
+ memory_usage_revealer.add (grid);
+
+ return memory_usage_revealer;
}
diff --git a/src/Widgets/Labels/LabelVertical.vala b/src/Widgets/Labels/LabelVertical.vala
index ceaecbd8..49ec8283 100644
--- a/src/Widgets/Labels/LabelVertical.vala
+++ b/src/Widgets/Labels/LabelVertical.vala
@@ -11,6 +11,8 @@ public class Monitor.LabelVertical : Gtk.EventBox {
grid = new Gtk.Grid ();
grid.margin_start = 12;
grid.margin_top = 6;
+
+ get_style_context ().add_class (Gtk.STYLE_CLASS_CURSOR_HANDLE);
}
public LabelVertical (string description) {
From 1412d40ada6b17573bdda231faf944fc6f4c17a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw?=
Date: Wed, 5 Aug 2020 19:44:40 +0200
Subject: [PATCH 15/45] change colour of core badge if utilization is high
---
data/Application.css | 2 +-
src/Views/SystemView/SystemCPUView.vala | 13 +++++++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/data/Application.css b/data/Application.css
index e163793c..c1e15d04 100644
--- a/data/Application.css
+++ b/data/Application.css
@@ -70,7 +70,7 @@
}
.core_badge-mild-warning {
- background-color: @SBANANA_100;
+ background-color: @BANANA_100;
color: @BANANA_900;
border: 1px solid @BANANA_300;
}
diff --git a/src/Views/SystemView/SystemCPUView.vala b/src/Views/SystemView/SystemCPUView.vala
index cbb6cea9..92914157 100644
--- a/src/Views/SystemView/SystemCPUView.vala
+++ b/src/Views/SystemView/SystemCPUView.vala
@@ -48,6 +48,19 @@ public class Monitor.SystemCPUView : Gtk.Grid {
cpu_chart.update(i, core_percentage);
string percentage_formatted = ("% 3d%%").printf ( (int)core_percentage);
core_label_list[i].set_text (percentage_formatted);
+
+ if (core_percentage > 75.0) {
+ core_label_list[i].get_style_context ().add_class ("core_badge-mild-warning");
+ core_label_list[i].get_style_context ().remove_class ("core_badge-strong-warning");
+ core_label_list[i].get_style_context ().remove_class ("core_badge-critical-warning");
+ }
+ if (core_percentage > 85.0) {
+ core_label_list[i].get_style_context ().add_class ("core_badge-strong-warning");
+ }
+
+ if (core_percentage > 90.0) {
+ core_label_list[i].get_style_context ().add_class ("core_badge-critical-warning");
+ }
}
cpu_percentage_label.set_text ((_("%d%%")).printf (cpu.percentage));
From 5cda2ff387a3f87ca61562dc3e7b6d7e0a78f9c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw?=
Date: Wed, 5 Aug 2020 20:00:39 +0200
Subject: [PATCH 16/45] better handling class add/remove for core badges
---
src/Views/SystemView/SystemCPUView.vala | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/src/Views/SystemView/SystemCPUView.vala b/src/Views/SystemView/SystemCPUView.vala
index 92914157..b1d59efe 100644
--- a/src/Views/SystemView/SystemCPUView.vala
+++ b/src/Views/SystemView/SystemCPUView.vala
@@ -49,6 +49,11 @@ public class Monitor.SystemCPUView : Gtk.Grid {
string percentage_formatted = ("% 3d%%").printf ( (int)core_percentage);
core_label_list[i].set_text (percentage_formatted);
+ core_label_list[i].get_style_context ().remove_class ("core_badge-mild-warning");
+ core_label_list[i].get_style_context ().remove_class ("core_badge-strong-warning");
+ core_label_list[i].get_style_context ().remove_class ("core_badge-critical-warning");
+
+
if (core_percentage > 75.0) {
core_label_list[i].get_style_context ().add_class ("core_badge-mild-warning");
core_label_list[i].get_style_context ().remove_class ("core_badge-strong-warning");
@@ -56,10 +61,14 @@ public class Monitor.SystemCPUView : Gtk.Grid {
}
if (core_percentage > 85.0) {
core_label_list[i].get_style_context ().add_class ("core_badge-strong-warning");
+ core_label_list[i].get_style_context ().remove_class ("core_badge-mild-warning");
+ core_label_list[i].get_style_context ().remove_class ("core_badge-critical-warning");
}
if (core_percentage > 90.0) {
core_label_list[i].get_style_context ().add_class ("core_badge-critical-warning");
+ core_label_list[i].get_style_context ().remove_class ("core_badge-mild-warning");
+ core_label_list[i].get_style_context ().remove_class ("core_badge-strong-warning");
}
}
From 496c29d7ffa206022555f7f3d31e4e3272c67119 Mon Sep 17 00:00:00 2001
From: stsdc
Date: Sat, 8 Aug 2020 22:01:16 +0200
Subject: [PATCH 17/45] make it a little more obvious, that you can click on a
label
---
data/Application.css | 16 +++++++++++++++-
src/Views/SystemView/SystemCPUView.vala | 12 ++++++++++++
src/Views/SystemView/SystemMemoryView.vala | 12 ++++++++++++
src/Widgets/Labels/LabelVertical.vala | 8 ++++----
4 files changed, 43 insertions(+), 5 deletions(-)
diff --git a/data/Application.css b/data/Application.css
index c1e15d04..74f90a78 100644
--- a/data/Application.css
+++ b/data/Application.css
@@ -14,11 +14,19 @@
border-width: 0;
}
-.vertical-label,
+/* .vertical-label,
.vertical-label:hover,
.vertical-label:selected,
.vertical-label:selected:focus,
.vertical-label:hover:selected {
+
+} */
+
+.label-vertical {
+
+}
+
+.label-vertical-val {
color: alpha(@text_color, 1);
font-size: 30px;
font-weight: 100;
@@ -27,6 +35,12 @@
border-width: 0;
}
+.usage-label-container {
+ border: 1px solid @SILVER_300;;
+ border-radius: 3px;
+ background-color: alpha(@SILVER_100, 0.5);
+ }
+
.username-current {
background-color: @SILVER_300;
color: @SILVER_900;
diff --git a/src/Views/SystemView/SystemCPUView.vala b/src/Views/SystemView/SystemCPUView.vala
index b1d59efe..d42cc4e7 100644
--- a/src/Views/SystemView/SystemCPUView.vala
+++ b/src/Views/SystemView/SystemCPUView.vala
@@ -27,6 +27,8 @@ public class Monitor.SystemCPUView : Gtk.Grid {
cpu = _cpu;
cpu_percentage_label = new LabelVertical (_("UTILIZATION"));
+ cpu_percentage_label.has_tooltip = true;
+ cpu_percentage_label.tooltip_text = (_("Show detailed info"));
cpu_frequency_label = new LabelRoundy (_("FREQUENCY"));
processor_name_label = new LabelH4 (cpu.cpu_name);
@@ -34,6 +36,12 @@ public class Monitor.SystemCPUView : Gtk.Grid {
cpu_percentage_label.clicked.connect(() => {
cpu_threads_revealer.reveal_child = !(cpu_threads_revealer.child_revealed);
+
+ if (cpu_threads_revealer.child_revealed) {
+ cpu_percentage_label.tooltip_text = (_("Show detailed info"));
+ } else {
+ cpu_percentage_label.tooltip_text = (_("Hide detailed info"));
+ }
});
attach (processor_name_label, 0, 0, 1, 1);
@@ -89,6 +97,10 @@ public class Monitor.SystemCPUView : Gtk.Grid {
Gtk.Grid grid = new Gtk.Grid ();
grid.column_spacing = 6;
+ grid.margin = 6;
+ grid.valign = Gtk.Align.START;
+ grid.halign = Gtk.Align.START;
+ grid.get_style_context ().add_class ("usage-label-container");
grid.attach(cpu_percentage_label, 0, 0, 1, 1);
grid.attach(grid_core_labels(), 1, 0, 1, 1);
diff --git a/src/Views/SystemView/SystemMemoryView.vala b/src/Views/SystemView/SystemMemoryView.vala
index 00a26eb1..8c08ad94 100644
--- a/src/Views/SystemView/SystemMemoryView.vala
+++ b/src/Views/SystemView/SystemMemoryView.vala
@@ -26,9 +26,16 @@ public class Monitor.SystemMemoryView : Gtk.Grid {
memory_name_label = new LabelH4 (_("Memory"));
memory_percentage_label = new LabelVertical (_("UTILIZATION"));
+ memory_percentage_label.has_tooltip = true;
+ memory_percentage_label.tooltip_text = (_("Show detailed info"));
memory_percentage_label.clicked.connect(() => {
memory_usage_revealer.reveal_child = !(memory_usage_revealer.child_revealed);
+ if (memory_usage_revealer.child_revealed) {
+ memory_percentage_label.tooltip_text = (_("Show detailed info"));
+ } else {
+ memory_percentage_label.tooltip_text = (_("Hide detailed info"));
+ }
});
memory_total_label = new Gtk.Label (_("Total: ") + Utils.NO_DATA);
@@ -52,6 +59,11 @@ public class Monitor.SystemMemoryView : Gtk.Grid {
memory_chart = new Chart (1);
var lil_gridy = new Gtk.Grid ();
+ lil_gridy.margin = 6;
+ lil_gridy.column_spacing = 6;
+ lil_gridy.valign = Gtk.Align.START;
+ lil_gridy.halign = Gtk.Align.START;
+ lil_gridy.get_style_context ().add_class ("usage-label-container");
lil_gridy.attach (memory_percentage_label, 0, 0, 1, 1);
lil_gridy.attach (memory_usage_grid (), 1, 0, 1, 1);
diff --git a/src/Widgets/Labels/LabelVertical.vala b/src/Widgets/Labels/LabelVertical.vala
index 49ec8283..f7fa2546 100644
--- a/src/Widgets/Labels/LabelVertical.vala
+++ b/src/Widgets/Labels/LabelVertical.vala
@@ -9,16 +9,16 @@ public class Monitor.LabelVertical : Gtk.EventBox {
construct {
grid = new Gtk.Grid ();
- grid.margin_start = 12;
- grid.margin_top = 6;
+ margin_start = 12;
+ margin_top = 6;
- get_style_context ().add_class (Gtk.STYLE_CLASS_CURSOR_HANDLE);
+ get_style_context ().add_class ("label-vertical");
}
public LabelVertical (string description) {
val = new Gtk.Label (Utils.NO_DATA);
- val.get_style_context ().add_class ("vertical-label");
+ val.get_style_context ().add_class ("label-vertical-val");
desc = new Gtk.Label (description);
desc.get_style_context ().add_class ("small-text");
From 16f99cf9b103aedd37eae4b5a1bdd668af86f3d0 Mon Sep 17 00:00:00 2001
From: stsdc
Date: Sun, 9 Aug 2020 23:44:13 +0200
Subject: [PATCH 18/45] add cpu info button
---
src/Views/SystemView/SystemCPUView.vala | 35 ++++++++++++++++++++++++-
1 file changed, 34 insertions(+), 1 deletion(-)
diff --git a/src/Views/SystemView/SystemCPUView.vala b/src/Views/SystemView/SystemCPUView.vala
index d42cc4e7..577c8e02 100644
--- a/src/Views/SystemView/SystemCPUView.vala
+++ b/src/Views/SystemView/SystemCPUView.vala
@@ -30,8 +30,41 @@ public class Monitor.SystemCPUView : Gtk.Grid {
cpu_percentage_label.has_tooltip = true;
cpu_percentage_label.tooltip_text = (_("Show detailed info"));
cpu_frequency_label = new LabelRoundy (_("FREQUENCY"));
+
processor_name_label = new LabelH4 (cpu.cpu_name);
+ var processor_info_button = new Gtk.ToggleButton ();
+ processor_info_button.get_style_context ().add_class ("circular");
+ // processor_info_button.get_style_context ().add_class ("popup");
+ processor_info_button.has_focus = false;
+ var icon = new Gtk.Image ();
+ icon.gicon = new ThemedIcon ("dialog-information");
+ icon.pixel_size = 16;
+ processor_info_button.set_image (icon);
+ processor_info_button.valign = Gtk.Align.START;
+ processor_info_button.halign = Gtk.Align.START;
+
+
+
+ var title_grid = new Gtk.Grid ();
+ title_grid.attach (processor_name_label, 0, 0, 1, 1);
+ title_grid.attach (processor_info_button, 1, 0, 1, 1);
+ title_grid.column_spacing = 6;
+
+ var popover = new Gtk.Popover (processor_info_button);
+ var box2 = new Gtk.Box(Gtk.Orientation.VERTICAL, 5);
+ popover.add(box2);
+ var label = new Gtk.Label("A Label Widget");
+ box2.add(label);
+ var checkbutton = new Gtk.CheckButton.with_label("A CheckButton Widget");
+ box2.add(checkbutton);
+ var radiobutton = new Gtk.RadioButton.with_label(null, "A RadioButton Widget");
+ box2.add(radiobutton);
+
+ processor_info_button.clicked.connect(() => {
+ popover.show_all();
+ });
+
cpu_chart = new Chart (cpu.core_list.size);
cpu_percentage_label.clicked.connect(() => {
@@ -44,7 +77,7 @@ public class Monitor.SystemCPUView : Gtk.Grid {
}
});
- attach (processor_name_label, 0, 0, 1, 1);
+ attach (title_grid, 0, 0, 1, 1);
attach (grid_usage_labels(), 0, 1, 1, 1);
attach (cpu_chart, 0, 1, 1, 1);
}
From 0655c7e5d16b7aba0d62cf0f6efbdf16bf0d579a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw?=
Date: Mon, 10 Aug 2020 18:33:52 +0200
Subject: [PATCH 19/45] adds popover with other cpu info
---
meson.build | 1 +
src/Resources/CPU.vala | 37 ++++++++++++-
.../SystemView/SystemCPUInfoPopover.vala | 52 +++++++++++++++++++
src/Views/SystemView/SystemCPUView.vala | 14 ++---
4 files changed, 91 insertions(+), 13 deletions(-)
create mode 100644 src/Views/SystemView/SystemCPUInfoPopover.vala
diff --git a/meson.build b/meson.build
index 249087f0..c40e772c 100644
--- a/meson.build
+++ b/meson.build
@@ -68,6 +68,7 @@ executable(
'src/Views/SystemView/SystemView.vala',
'src/Views/SystemView/SystemCPUView.vala',
+ 'src/Views/SystemView/SystemCPUInfoPopover.vala',
'src/Views/SystemView/SystemMemoryView.vala',
# Widgets related only to ProcessInfoView
diff --git a/src/Resources/CPU.vala b/src/Resources/CPU.vala
index eb17bab9..895dc875 100644
--- a/src/Resources/CPU.vala
+++ b/src/Resources/CPU.vala
@@ -3,7 +3,15 @@ public class Monitor.CPU : Object {
private float last_total;
private float load;
- public string? cpu_name;
+ public string? model_name;
+ public string? model;
+ public string? family;
+ public string? microcode;
+ public string? cache_size;
+ public string? flags;
+ public string? bogomips;
+ public string? bugs;
+ public string? address_sizes;
GTop.Cpu ? cpu;
@@ -29,7 +37,9 @@ public class Monitor.CPU : Object {
core_list = new Gee.ArrayList ();
- cpu_name = get_cpu_info ();
+ model_name = get_cpu_info ();
+
+ parse_cpuinfo ();
debug ("Number of cores: %d", (int) get_num_processors ());
for (int i = 0; i < (int) get_num_processors (); i++) {
@@ -87,6 +97,29 @@ public class Monitor.CPU : Object {
_frequency = (double)maxcur;
}
+ private void parse_cpuinfo () {
+ unowned GTop.SysInfo? info = GTop.glibtop_get_sysinfo ();
+
+ if (info == null) {
+ warning ("No CPU info");
+ return;
+ }
+
+ // let core 0 represents whole processor
+ // TODO: parse all the values to corresponding core objects in core_list
+ // does it even makes sense??
+
+ unowned GLib.HashTable values = info.cpuinfo[0].values;
+ model = values["model"];
+ family = values["cpu family"];
+ microcode = values["microcode"];
+ cache_size = values["cache size"];
+ flags = values["flags"];
+ bogomips = values["bogomips"];
+ bugs = values["bugs"];
+ address_sizes = values["address sizes"];
+ }
+
// straight from elementary about-plug
private string? get_cpu_info () {
unowned GTop.SysInfo? info = GTop.glibtop_get_sysinfo ();
diff --git a/src/Views/SystemView/SystemCPUInfoPopover.vala b/src/Views/SystemView/SystemCPUInfoPopover.vala
new file mode 100644
index 00000000..8e096242
--- /dev/null
+++ b/src/Views/SystemView/SystemCPUInfoPopover.vala
@@ -0,0 +1,52 @@
+public class Monitor.SystemCPUInfoPopover : Gtk.Popover {
+ private Gtk.Grid grid;
+
+ private CPU cpu;
+
+ construct {
+ grid = new Gtk.Grid ();
+ grid.margin = 12;
+ grid.column_spacing = 6;
+
+ grid.attach (label(_("Model")), 0, 0, 1, 1);
+ grid.attach (label(_("Family")), 0, 1, 1, 1);
+ grid.attach (label(_("Microcode ver.")), 0, 2, 1, 1);
+ grid.attach (label(_("Bogomips")), 0, 3, 1, 1);
+ grid.attach (label(_("Cache size")), 0, 4, 1, 1);
+ grid.attach (label(_("Address sizes")), 0, 5, 1, 1);
+ grid.attach (label(_("Flags")), 0, 6, 1, 1);
+ grid.attach (label(_("Bugs")), 0, 7, 1, 1);
+
+ for (int i; i <= 7; i++) {
+ grid.attach ( label (":"), 1, i, 1, 1);
+ }
+
+ add (grid);
+ }
+
+
+ public SystemCPUInfoPopover(Gtk.Widget? relative_to, CPU _cpu) {
+ Object (relative_to : relative_to);
+
+ cpu = _cpu;
+
+ grid.attach (label(cpu.model), 2, 0, 1, 1);
+ grid.attach (label(cpu.family), 2, 1, 1, 1);
+ grid.attach (label(cpu.microcode), 2, 2, 1, 1);
+ grid.attach (label(cpu.bogomips), 2, 3, 1, 1);
+ grid.attach (label(cpu.cache_size), 2, 4, 1, 1);
+ grid.attach (label(cpu.address_sizes), 2, 5, 1, 1);
+ grid.attach (label(cpu.flags), 2, 6, 1, 1);
+ grid.attach (label(cpu.bugs), 2, 7, 1, 1);
+ }
+
+ private Gtk.Label label(string text) {
+ var label = new Gtk.Label (text);
+ label.halign = Gtk.Align.START;
+ label.valign = Gtk.Align.START;
+ label.wrap = true;
+ label.max_width_chars = 80;
+
+ return label;
+ }
+}
\ No newline at end of file
diff --git a/src/Views/SystemView/SystemCPUView.vala b/src/Views/SystemView/SystemCPUView.vala
index 577c8e02..dbb4d4fa 100644
--- a/src/Views/SystemView/SystemCPUView.vala
+++ b/src/Views/SystemView/SystemCPUView.vala
@@ -31,7 +31,7 @@ public class Monitor.SystemCPUView : Gtk.Grid {
cpu_percentage_label.tooltip_text = (_("Show detailed info"));
cpu_frequency_label = new LabelRoundy (_("FREQUENCY"));
- processor_name_label = new LabelH4 (cpu.cpu_name);
+ processor_name_label = new LabelH4 (cpu.model_name);
var processor_info_button = new Gtk.ToggleButton ();
processor_info_button.get_style_context ().add_class ("circular");
@@ -51,16 +51,8 @@ public class Monitor.SystemCPUView : Gtk.Grid {
title_grid.attach (processor_info_button, 1, 0, 1, 1);
title_grid.column_spacing = 6;
- var popover = new Gtk.Popover (processor_info_button);
- var box2 = new Gtk.Box(Gtk.Orientation.VERTICAL, 5);
- popover.add(box2);
- var label = new Gtk.Label("A Label Widget");
- box2.add(label);
- var checkbutton = new Gtk.CheckButton.with_label("A CheckButton Widget");
- box2.add(checkbutton);
- var radiobutton = new Gtk.RadioButton.with_label(null, "A RadioButton Widget");
- box2.add(radiobutton);
-
+ var popover = new SystemCPUInfoPopover (processor_info_button, cpu);
+
processor_info_button.clicked.connect(() => {
popover.show_all();
});
From 426c850dba96aa14d6bae12cb38071f8acfb6690 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw?=
Date: Mon, 10 Aug 2020 18:42:16 +0200
Subject: [PATCH 20/45] untoggle the button when popover is closed
---
src/Views/SystemView/SystemCPUView.vala | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/Views/SystemView/SystemCPUView.vala b/src/Views/SystemView/SystemCPUView.vala
index dbb4d4fa..2bfb6152 100644
--- a/src/Views/SystemView/SystemCPUView.vala
+++ b/src/Views/SystemView/SystemCPUView.vala
@@ -52,6 +52,9 @@ public class Monitor.SystemCPUView : Gtk.Grid {
title_grid.column_spacing = 6;
var popover = new SystemCPUInfoPopover (processor_info_button, cpu);
+ popover.closed.connect (() => {
+ processor_info_button.set_active(false);
+ });
processor_info_button.clicked.connect(() => {
popover.show_all();
From a610a62d1ce1eb27945386ac546af81d6d6bf4ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw?=
Date: Mon, 10 Aug 2020 18:44:05 +0200
Subject: [PATCH 21/45] move closed signal to the class itself
---
src/Views/SystemView/SystemCPUInfoPopover.vala | 4 +++-
src/Views/SystemView/SystemCPUView.vala | 3 ---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/Views/SystemView/SystemCPUInfoPopover.vala b/src/Views/SystemView/SystemCPUInfoPopover.vala
index 8e096242..3fa74028 100644
--- a/src/Views/SystemView/SystemCPUInfoPopover.vala
+++ b/src/Views/SystemView/SystemCPUInfoPopover.vala
@@ -25,9 +25,11 @@ public class Monitor.SystemCPUInfoPopover : Gtk.Popover {
}
- public SystemCPUInfoPopover(Gtk.Widget? relative_to, CPU _cpu) {
+ public SystemCPUInfoPopover(Gtk.ToggleButton? relative_to, CPU _cpu) {
Object (relative_to : relative_to);
+ closed.connect (() => { relative_to.set_active(false); });
+
cpu = _cpu;
grid.attach (label(cpu.model), 2, 0, 1, 1);
diff --git a/src/Views/SystemView/SystemCPUView.vala b/src/Views/SystemView/SystemCPUView.vala
index 2bfb6152..dbb4d4fa 100644
--- a/src/Views/SystemView/SystemCPUView.vala
+++ b/src/Views/SystemView/SystemCPUView.vala
@@ -52,9 +52,6 @@ public class Monitor.SystemCPUView : Gtk.Grid {
title_grid.column_spacing = 6;
var popover = new SystemCPUInfoPopover (processor_info_button, cpu);
- popover.closed.connect (() => {
- processor_info_button.set_active(false);
- });
processor_info_button.clicked.connect(() => {
popover.show_all();
From a3e1c62bff4563762d0dce048a8ae713e718beac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw?=
Date: Wed, 12 Aug 2020 00:07:33 +0200
Subject: [PATCH 22/45] fix gee_collection_get_size: assertion 'self != NULL'
failed
---
src/Widgets/Chart/Chart.vala | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/Widgets/Chart/Chart.vala b/src/Widgets/Chart/Chart.vala
index 7a173946..f654516b 100644
--- a/src/Widgets/Chart/Chart.vala
+++ b/src/Widgets/Chart/Chart.vala
@@ -36,14 +36,19 @@ public class Monitor.Chart : Gtk.Box {
public Chart (int series_quantity) {
for (int i = 0; i < series_quantity; i++) {
var renderer = new LiveChart.SmoothLineArea (new LiveChart.Values(1000));
- var serie = new LiveChart.Serie ("Core x", renderer);
+ var serie = new LiveChart.Serie (("Serie %d").printf(i), renderer);
serie.set_main_color ({ 0.35 + i/20, 0.8, 0.1, 1.0});
live_chart.add_serie (serie);
+
+ // workaround for `gee_collection_get_size: assertion 'self != NULL' failed`
+ // https://github.com/lcallarec/live-chart/issues/16
+ live_chart.add_value (serie, 0);
}
add (live_chart);
}
public void update (int serie_number, double value) {
+ debug ("update called");
live_chart.add_value_by_index (serie_number, value);
}
From 511b7fbb77a04553942b70ee0ea47394bb0702e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw?=
Date: Wed, 12 Aug 2020 19:43:46 +0200
Subject: [PATCH 23/45] wip layout
---
src/Views/SystemView/SystemCPUView.vala | 42 ++++++++++++++++++-------
1 file changed, 30 insertions(+), 12 deletions(-)
diff --git a/src/Views/SystemView/SystemCPUView.vala b/src/Views/SystemView/SystemCPUView.vala
index dbb4d4fa..edf46939 100644
--- a/src/Views/SystemView/SystemCPUView.vala
+++ b/src/Views/SystemView/SystemCPUView.vala
@@ -1,5 +1,7 @@
-public class Monitor.SystemCPUView : Gtk.Grid {
- private Chart cpu_chart;
+public class Monitor.SystemCPUView : Gtk.Box {
+ private Chart cpu_utilization_chart;
+ private Chart cpu_frequency_chart;
+ private Chart cpu_temperature_chart;
private CPU cpu;
private LabelVertical cpu_percentage_label;
@@ -15,8 +17,9 @@ public class Monitor.SystemCPUView : Gtk.Grid {
construct {
margin = 12;
margin_top = 6;
- column_spacing = 12;
- set_vexpand (false);
+ // column_spacing = 12;
+ // set_vexpand (false);
+ // orintantation = Gtk.Orientation.VERTICAL;
core_label_list = new Gee.ArrayList ();
}
@@ -53,11 +56,11 @@ public class Monitor.SystemCPUView : Gtk.Grid {
var popover = new SystemCPUInfoPopover (processor_info_button, cpu);
- processor_info_button.clicked.connect(() => {
- popover.show_all();
- });
+ processor_info_button.clicked.connect(() => { popover.show_all(); });
- cpu_chart = new Chart (cpu.core_list.size);
+ cpu_utilization_chart = new Chart (cpu.core_list.size);
+ cpu_frequency_chart = new Chart (1);
+ cpu_temperature_chart = new Chart (1);
cpu_percentage_label.clicked.connect(() => {
cpu_threads_revealer.reveal_child = !(cpu_threads_revealer.child_revealed);
@@ -69,16 +72,31 @@ public class Monitor.SystemCPUView : Gtk.Grid {
}
});
- attach (title_grid, 0, 0, 1, 1);
- attach (grid_usage_labels(), 0, 1, 1, 1);
- attach (cpu_chart, 0, 1, 1, 1);
+ var smol_charts_container = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
+ smol_charts_container.width_request = 200;
+ smol_charts_container.halign = Gtk.Align.START;
+ smol_charts_container.add (cpu_frequency_chart);
+ smol_charts_container.add (cpu_temperature_chart);
+
+ var big_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
+ // big_box.add (smol_charts_container);
+ // big_box.add (cpu_utilization_chart);
+
+ add (cpu_utilization_chart);
+ add (smol_charts_container);
+
+ grid_usage_labels();
+
+ // attach (title_grid, 0, 0, 1, 1);
+ // attach (grid_usage_labels(), 0, 1, 1, 1);
+ // attach (big_box, 0, 1, 1, 1);
}
public void update () {
for (int i = 0; i < cpu.core_list.size; i++) {
double core_percentage = cpu.core_list[i].percentage_used;
- cpu_chart.update(i, core_percentage);
+ // cpu_utilization_chart.update(i, core_percentage);
string percentage_formatted = ("% 3d%%").printf ( (int)core_percentage);
core_label_list[i].set_text (percentage_formatted);
From 3bf3900307d55ede113f6c80535901fe070d7961 Mon Sep 17 00:00:00 2001
From: stsdc
Date: Wed, 12 Aug 2020 20:43:44 +0200
Subject: [PATCH 24/45] made some layout
---
src/Views/SystemView/SystemCPUView.vala | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/Views/SystemView/SystemCPUView.vala b/src/Views/SystemView/SystemCPUView.vala
index edf46939..a6b7abcc 100644
--- a/src/Views/SystemView/SystemCPUView.vala
+++ b/src/Views/SystemView/SystemCPUView.vala
@@ -18,8 +18,8 @@ public class Monitor.SystemCPUView : Gtk.Box {
margin = 12;
margin_top = 6;
// column_spacing = 12;
- // set_vexpand (false);
- // orintantation = Gtk.Orientation.VERTICAL;
+ set_vexpand (false);
+ orientation = Gtk.Orientation.VERTICAL;
core_label_list = new Gee.ArrayList ();
}
@@ -47,7 +47,6 @@ public class Monitor.SystemCPUView : Gtk.Box {
processor_info_button.valign = Gtk.Align.START;
processor_info_button.halign = Gtk.Align.START;
-
var title_grid = new Gtk.Grid ();
title_grid.attach (processor_name_label, 0, 0, 1, 1);
@@ -60,7 +59,10 @@ public class Monitor.SystemCPUView : Gtk.Box {
cpu_utilization_chart = new Chart (cpu.core_list.size);
cpu_frequency_chart = new Chart (1);
+ cpu_frequency_chart.height_request = -1;
cpu_temperature_chart = new Chart (1);
+ cpu_temperature_chart.margin_top = 6;
+ cpu_temperature_chart.height_request = -1;
cpu_percentage_label.clicked.connect(() => {
cpu_threads_revealer.reveal_child = !(cpu_threads_revealer.child_revealed);
@@ -74,22 +76,24 @@ public class Monitor.SystemCPUView : Gtk.Box {
var smol_charts_container = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
smol_charts_container.width_request = 200;
+ smol_charts_container.hexpand = false;
smol_charts_container.halign = Gtk.Align.START;
smol_charts_container.add (cpu_frequency_chart);
smol_charts_container.add (cpu_temperature_chart);
+ smol_charts_container.margin_left = 6;
- var big_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
- // big_box.add (smol_charts_container);
- // big_box.add (cpu_utilization_chart);
+ var charts_container = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
- add (cpu_utilization_chart);
- add (smol_charts_container);
+ charts_container.pack_start (cpu_utilization_chart, true, true, 0);
+ charts_container.pack_start(smol_charts_container, false, false, 0);
grid_usage_labels();
// attach (title_grid, 0, 0, 1, 1);
// attach (grid_usage_labels(), 0, 1, 1, 1);
// attach (big_box, 0, 1, 1, 1);
+
+ add (charts_container);
}
From 6656e94b16f759ce4d4b815b29f93f3363309103 Mon Sep 17 00:00:00 2001
From: stsdc
Date: Wed, 12 Aug 2020 21:02:30 +0200
Subject: [PATCH 25/45] bring back utilization label
---
src/Views/SystemView/SystemCPUView.vala | 28 ++++++++-----------------
1 file changed, 9 insertions(+), 19 deletions(-)
diff --git a/src/Views/SystemView/SystemCPUView.vala b/src/Views/SystemView/SystemCPUView.vala
index a6b7abcc..82d0ff72 100644
--- a/src/Views/SystemView/SystemCPUView.vala
+++ b/src/Views/SystemView/SystemCPUView.vala
@@ -17,7 +17,6 @@ public class Monitor.SystemCPUView : Gtk.Box {
construct {
margin = 12;
margin_top = 6;
- // column_spacing = 12;
set_vexpand (false);
orientation = Gtk.Orientation.VERTICAL;
@@ -58,6 +57,12 @@ public class Monitor.SystemCPUView : Gtk.Box {
processor_info_button.clicked.connect(() => { popover.show_all(); });
cpu_utilization_chart = new Chart (cpu.core_list.size);
+
+ var grid_utilization_info = new Gtk.Grid ();
+ grid_utilization_info.attach (grid_usage_labels(), 0, 0, 1, 1);
+ grid_utilization_info.attach (cpu_utilization_chart, 0, 0, 1, 1);
+
+
cpu_frequency_chart = new Chart (1);
cpu_frequency_chart.height_request = -1;
cpu_temperature_chart = new Chart (1);
@@ -82,17 +87,11 @@ public class Monitor.SystemCPUView : Gtk.Box {
smol_charts_container.add (cpu_temperature_chart);
smol_charts_container.margin_left = 6;
+ // Thanks Goncalo
var charts_container = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
-
- charts_container.pack_start (cpu_utilization_chart, true, true, 0);
+ charts_container.pack_start (grid_utilization_info, true, true, 0);
charts_container.pack_start(smol_charts_container, false, false, 0);
- grid_usage_labels();
-
- // attach (title_grid, 0, 0, 1, 1);
- // attach (grid_usage_labels(), 0, 1, 1, 1);
- // attach (big_box, 0, 1, 1, 1);
-
add (charts_container);
}
@@ -100,7 +99,7 @@ public class Monitor.SystemCPUView : Gtk.Box {
public void update () {
for (int i = 0; i < cpu.core_list.size; i++) {
double core_percentage = cpu.core_list[i].percentage_used;
- // cpu_utilization_chart.update(i, core_percentage);
+ cpu_utilization_chart.update(i, core_percentage);
string percentage_formatted = ("% 3d%%").printf ( (int)core_percentage);
core_label_list[i].set_text (percentage_formatted);
@@ -131,15 +130,6 @@ public class Monitor.SystemCPUView : Gtk.Box {
cpu_frequency_label.set_text (("%.2f %s").printf (cpu.frequency, _ ("GHz")));
}
- private Gtk.Grid grid_info_labels () {
- Gtk.Grid grid = new Gtk.Grid ();
-
- grid.attach(processor_name_label, 0, 0, 1, 1);
- grid.attach(cpu_percentage_label, 0, 1, 1, 1);
-
- return grid;
- }
-
private Gtk.Grid grid_usage_labels () {
Gtk.Grid grid = new Gtk.Grid ();
From d82f15436ffc43c1e08a27a1a3f8c08091d07dfd Mon Sep 17 00:00:00 2001
From: stsdc
Date: Wed, 12 Aug 2020 21:36:45 +0200
Subject: [PATCH 26/45] update frequency chart
---
src/Views/SystemView/SystemCPUView.vala | 4 ++++
src/Widgets/Chart/Chart.vala | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/Views/SystemView/SystemCPUView.vala b/src/Views/SystemView/SystemCPUView.vala
index 82d0ff72..98d33c41 100644
--- a/src/Views/SystemView/SystemCPUView.vala
+++ b/src/Views/SystemView/SystemCPUView.vala
@@ -65,6 +65,7 @@ public class Monitor.SystemCPUView : Gtk.Box {
cpu_frequency_chart = new Chart (1);
cpu_frequency_chart.height_request = -1;
+ cpu_frequency_chart.config.y_axis.fixed_max = 5.0;
cpu_temperature_chart = new Chart (1);
cpu_temperature_chart.margin_top = 6;
cpu_temperature_chart.height_request = -1;
@@ -92,11 +93,14 @@ public class Monitor.SystemCPUView : Gtk.Box {
charts_container.pack_start (grid_utilization_info, true, true, 0);
charts_container.pack_start(smol_charts_container, false, false, 0);
+ add (title_grid);
add (charts_container);
}
public void update () {
+ cpu_frequency_chart.update (0, cpu.frequency);
+
for (int i = 0; i < cpu.core_list.size; i++) {
double core_percentage = cpu.core_list[i].percentage_used;
cpu_utilization_chart.update(i, core_percentage);
diff --git a/src/Widgets/Chart/Chart.vala b/src/Widgets/Chart/Chart.vala
index f654516b..be898927 100644
--- a/src/Widgets/Chart/Chart.vala
+++ b/src/Widgets/Chart/Chart.vala
@@ -1,6 +1,6 @@
public class Monitor.Chart : Gtk.Box {
private LiveChart.Chart live_chart;
- private LiveChart.Config config;
+ public LiveChart.Config config;
construct {
get_style_context ().add_class ("graph");
From b921f36f45b8cd8e558c97639661ffcb6ba12f1b Mon Sep 17 00:00:00 2001
From: stsdc
Date: Thu, 13 Aug 2020 23:36:24 +0200
Subject: [PATCH 27/45] add a frequency label
---
src/Views/SystemView/SystemCPUView.vala | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/Views/SystemView/SystemCPUView.vala b/src/Views/SystemView/SystemCPUView.vala
index 98d33c41..8db2a41e 100644
--- a/src/Views/SystemView/SystemCPUView.vala
+++ b/src/Views/SystemView/SystemCPUView.vala
@@ -32,6 +32,7 @@ public class Monitor.SystemCPUView : Gtk.Box {
cpu_percentage_label.has_tooltip = true;
cpu_percentage_label.tooltip_text = (_("Show detailed info"));
cpu_frequency_label = new LabelRoundy (_("FREQUENCY"));
+ cpu_frequency_label.margin = 6;
processor_name_label = new LabelH4 (cpu.model_name);
@@ -63,6 +64,7 @@ public class Monitor.SystemCPUView : Gtk.Box {
grid_utilization_info.attach (cpu_utilization_chart, 0, 0, 1, 1);
+
cpu_frequency_chart = new Chart (1);
cpu_frequency_chart.height_request = -1;
cpu_frequency_chart.config.y_axis.fixed_max = 5.0;
@@ -70,6 +72,11 @@ public class Monitor.SystemCPUView : Gtk.Box {
cpu_temperature_chart.margin_top = 6;
cpu_temperature_chart.height_request = -1;
+ var grid_frequency_info = new Gtk.Grid ();
+ grid_frequency_info.attach (cpu_frequency_label, 0, 0, 1, 1);
+ grid_frequency_info.attach (cpu_frequency_chart, 0, 0, 1, 1);
+
+
cpu_percentage_label.clicked.connect(() => {
cpu_threads_revealer.reveal_child = !(cpu_threads_revealer.child_revealed);
@@ -84,7 +91,7 @@ public class Monitor.SystemCPUView : Gtk.Box {
smol_charts_container.width_request = 200;
smol_charts_container.hexpand = false;
smol_charts_container.halign = Gtk.Align.START;
- smol_charts_container.add (cpu_frequency_chart);
+ smol_charts_container.add (grid_frequency_info);
smol_charts_container.add (cpu_temperature_chart);
smol_charts_container.margin_left = 6;
From 266d0e8b1507e9e274ef894db6f5142ca025f961 Mon Sep 17 00:00:00 2001
From: stsdc
Date: Fri, 14 Aug 2020 02:19:38 +0200
Subject: [PATCH 28/45] temperature sensor WIP
---
meson.build | 1 +
src/Resources/CPU.vala | 2 ++
src/Resources/TemperatureSensor.vala | 54 ++++++++++++++++++++++++++++
src/Widgets/Chart/Chart.vala | 1 -
4 files changed, 57 insertions(+), 1 deletion(-)
create mode 100644 src/Resources/TemperatureSensor.vala
diff --git a/meson.build b/meson.build
index c40e772c..8d9b9522 100644
--- a/meson.build
+++ b/meson.build
@@ -109,6 +109,7 @@ executable(
'src/Resources/Core.vala',
'src/Resources/Memory.vala',
'src/Resources/Swap.vala',
+ 'src/Resources/TemperatureSensor.vala',
c_args: c_args,
dependencies: [
glib,
diff --git a/src/Resources/CPU.vala b/src/Resources/CPU.vala
index 895dc875..9c74cc47 100644
--- a/src/Resources/CPU.vala
+++ b/src/Resources/CPU.vala
@@ -46,6 +46,8 @@ public class Monitor.CPU : Object {
var core = new Core(i);
core_list.add (core);
}
+
+ var temp = new TemperatureSensor.cpu ();
}
public void update () {
diff --git a/src/Resources/TemperatureSensor.vala b/src/Resources/TemperatureSensor.vala
new file mode 100644
index 00000000..ab317846
--- /dev/null
+++ b/src/Resources/TemperatureSensor.vala
@@ -0,0 +1,54 @@
+class TemperatureSensor : Object {
+ private const string hwmon_path = "/sys/class/hwmon";
+
+ public struct Sensor {
+ public string location;
+ public double tdie_current_temperature;
+ public double tdie_critical_temperature;
+ public double tctl_current_temperature;
+ public double tctl_critical_temperature;
+ } public Sensor at_cpu;
+
+ construct { }
+
+ public TemperatureSensor() {
+ }
+
+ public TemperatureSensor.cpu () {
+ traverser ();
+ }
+
+
+ private void traverser () {
+ int hwmon_counter = 0;
+
+ Dir hwmon_dir = Dir.open (hwmon_path, 0);
+
+ string ? hwmonx = null;
+ while ((hwmonx = hwmon_dir.read_name ()) != null) {
+ string hwmonx_name = Path.build_filename (hwmon_path, hwmonx, "name");
+ string sensor_location = open_file (hwmonx_name).replace ("\n","");
+
+ if (sensor_location == "coretemp" || sensor_location == "k10temp") {
+ debug (sensor_location);
+
+ Dir hwmonx_dir = Dir.open (Path.build_filename (hwmon_path, hwmonx), 0);
+ string ? hwmonx_props = null;
+ while ((hwmonx_props = hwmonx_dir.read_name ()) != null) {
+ debug (hwmonx_props);
+ }
+ }
+ }
+ }
+
+ private string open_file (string filename) {
+ try {
+ string read;
+ FileUtils.get_contents (filename, out read);
+ return read;
+ } catch (FileError e) {
+ error ("%s\n", e.message);
+ return "0";
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Widgets/Chart/Chart.vala b/src/Widgets/Chart/Chart.vala
index be898927..dfd85ec8 100644
--- a/src/Widgets/Chart/Chart.vala
+++ b/src/Widgets/Chart/Chart.vala
@@ -48,7 +48,6 @@ public class Monitor.Chart : Gtk.Box {
}
public void update (int serie_number, double value) {
- debug ("update called");
live_chart.add_value_by_index (serie_number, value);
}
From ba096ea84ceea383b5ebb9e38d5f530d62f175e9 Mon Sep 17 00:00:00 2001
From: stsdc
Date: Fri, 14 Aug 2020 20:56:47 +0200
Subject: [PATCH 29/45] detect some more sensors
---
src/Resources/TemperatureSensor.vala | 39 ++++++++++++++++++++--------
1 file changed, 28 insertions(+), 11 deletions(-)
diff --git a/src/Resources/TemperatureSensor.vala b/src/Resources/TemperatureSensor.vala
index ab317846..6ae498ad 100644
--- a/src/Resources/TemperatureSensor.vala
+++ b/src/Resources/TemperatureSensor.vala
@@ -1,13 +1,17 @@
class TemperatureSensor : Object {
private const string hwmon_path = "/sys/class/hwmon";
+ private string? cpu_temp_path;
public struct Sensor {
public string location;
- public double tdie_current_temperature;
- public double tdie_critical_temperature;
- public double tctl_current_temperature;
- public double tctl_critical_temperature;
- } public Sensor at_cpu;
+ public float temperature;
+ public float temperature_critical;
+ // public double tdie_current_temperature;
+ // public double tdie_critical_temperature;
+ // public double tctl_current_temperature;
+ // public double tctl_critical_temperature;
+ } public Sensor sensor;
+
construct { }
@@ -27,16 +31,29 @@ class TemperatureSensor : Object {
string ? hwmonx = null;
while ((hwmonx = hwmon_dir.read_name ()) != null) {
string hwmonx_name = Path.build_filename (hwmon_path, hwmonx, "name");
- string sensor_location = open_file (hwmonx_name).replace ("\n","");
+ string sensor_location = open_file (hwmonx_name);
if (sensor_location == "coretemp" || sensor_location == "k10temp") {
- debug (sensor_location);
+ debug ("Found temp. sensor: %s", sensor_location);
Dir hwmonx_dir = Dir.open (Path.build_filename (hwmon_path, hwmonx), 0);
- string ? hwmonx_props = null;
- while ((hwmonx_props = hwmonx_dir.read_name ()) != null) {
- debug (hwmonx_props);
+ string ? hwmonx_prop = null;
+ while ((hwmonx_prop = hwmonx_dir.read_name ()) != null) {
+ // debug (open_file (hwmonx_name));
+
+ if (hwmonx_prop.contains ("temp")) {
+ // Tdie contains true temperature value, while Tctl contains value for fans
+ // Tctl = Tdie + offset
+ if ("Tdie" == open_file (Path.build_filename (hwmon_path, hwmonx, hwmonx_prop))) {
+ cpu_temp_path = Path.build_filename (hwmon_path, hwmonx, "temp%c_input".printf(hwmonx_prop[4]));
+ debug (open_file (cpu_temp_path));
+ }
+ }
}
+ } else if (sensor_location == "amdgpu" ) {
+ debug ("Found temp. sensor: %s", sensor_location);
+ } else {
+ debug ("Found temp. sensor: %s", sensor_location);
}
}
}
@@ -45,7 +62,7 @@ class TemperatureSensor : Object {
try {
string read;
FileUtils.get_contents (filename, out read);
- return read;
+ return read.replace ("\n","");
} catch (FileError e) {
error ("%s\n", e.message);
return "0";
From 6ab3b2eb4b6691a230d2af54414cd6ee0ed81c96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw?=
Date: Fri, 14 Aug 2020 23:07:02 +0200
Subject: [PATCH 30/45] support intel
---
src/Resources/TemperatureSensor.vala | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/Resources/TemperatureSensor.vala b/src/Resources/TemperatureSensor.vala
index 6ae498ad..4cf6f73a 100644
--- a/src/Resources/TemperatureSensor.vala
+++ b/src/Resources/TemperatureSensor.vala
@@ -47,6 +47,11 @@ class TemperatureSensor : Object {
if ("Tdie" == open_file (Path.build_filename (hwmon_path, hwmonx, hwmonx_prop))) {
cpu_temp_path = Path.build_filename (hwmon_path, hwmonx, "temp%c_input".printf(hwmonx_prop[4]));
debug (open_file (cpu_temp_path));
+ // Intel stuff
+ // But what core to choose
+ } else if (open_file (Path.build_filename (hwmon_path, hwmonx, hwmonx_prop)).contains ("Core")) {
+ cpu_temp_path = Path.build_filename (hwmon_path, hwmonx, "temp%c_input".printf(hwmonx_prop[4]));
+ debug (open_file (cpu_temp_path));
}
}
}
From 2ef29e1ff4a4a36ffaf0c8b441891e3a112191bc Mon Sep 17 00:00:00 2001
From: stsdc
Date: Fri, 14 Aug 2020 23:38:21 +0200
Subject: [PATCH 31/45] save pathes in array
---
src/Resources/TemperatureSensor.vala | 27 +++++++++++++++++++--------
1 file changed, 19 insertions(+), 8 deletions(-)
diff --git a/src/Resources/TemperatureSensor.vala b/src/Resources/TemperatureSensor.vala
index 4cf6f73a..8b697196 100644
--- a/src/Resources/TemperatureSensor.vala
+++ b/src/Resources/TemperatureSensor.vala
@@ -1,6 +1,9 @@
class TemperatureSensor : Object {
private const string hwmon_path = "/sys/class/hwmon";
- private string? cpu_temp_path;
+
+ // contains list of paths to files with a temperature values
+ // Intel reports per core temperature, while AMD Ryzen Tdie
+ public Gee.ArrayList cpu_temp_paths;
public struct Sensor {
public string location;
@@ -13,9 +16,12 @@ class TemperatureSensor : Object {
} public Sensor sensor;
- construct { }
+ construct {
+ cpu_temp_paths = new Gee.ArrayList ();
+ }
public TemperatureSensor() {
+
}
public TemperatureSensor.cpu () {
@@ -42,16 +48,21 @@ class TemperatureSensor : Object {
// debug (open_file (hwmonx_name));
if (hwmonx_prop.contains ("temp")) {
+ // AMD stuff
// Tdie contains true temperature value, while Tctl contains value for fans
- // Tctl = Tdie + offset
+ // Tctl = Tdie + offset in some processors
if ("Tdie" == open_file (Path.build_filename (hwmon_path, hwmonx, hwmonx_prop))) {
- cpu_temp_path = Path.build_filename (hwmon_path, hwmonx, "temp%c_input".printf(hwmonx_prop[4]));
- debug (open_file (cpu_temp_path));
+ string tempx_input = "temp%c_input".printf(hwmonx_prop[4]);
+ cpu_temp_paths.add (Path.build_filename (hwmon_path, hwmonx, tempx_input));
+
+ debug (open_file (cpu_temp_paths[0]));
+
// Intel stuff
- // But what core to choose
+ // Intel reports per core
} else if (open_file (Path.build_filename (hwmon_path, hwmonx, hwmonx_prop)).contains ("Core")) {
- cpu_temp_path = Path.build_filename (hwmon_path, hwmonx, "temp%c_input".printf(hwmonx_prop[4]));
- debug (open_file (cpu_temp_path));
+ string tempx_input = "temp%c_input".printf(hwmonx_prop[4]);
+ cpu_temp_paths.add (Path.build_filename (hwmon_path, hwmonx, tempx_input));
+ debug (open_file (cpu_temp_paths[0]));
}
}
}
From 7c7d4e5152904b0d37aadf9de8fe566e45b6ede6 Mon Sep 17 00:00:00 2001
From: stsdc
Date: Sat, 15 Aug 2020 00:10:44 +0200
Subject: [PATCH 32/45] displaying cpu temperature
---
src/Resources/CPU.vala | 11 ++++++++++-
src/Resources/TemperatureSensor.vala | 26 ++++++++++---------------
src/Views/SystemView/SystemCPUView.vala | 21 ++++++++++++++++----
3 files changed, 37 insertions(+), 21 deletions(-)
diff --git a/src/Resources/CPU.vala b/src/Resources/CPU.vala
index 9c74cc47..8700a4f7 100644
--- a/src/Resources/CPU.vala
+++ b/src/Resources/CPU.vala
@@ -2,6 +2,7 @@ public class Monitor.CPU : Object {
private float last_used;
private float last_total;
private float load;
+ private TemperatureSensor temperature_sensor;
public string? model_name;
public string? model;
@@ -31,6 +32,12 @@ public class Monitor.CPU : Object {
}
}
+ public double temperature {
+ get {
+ return temperature_sensor.cpu / 1000;
+ }
+ }
+
construct {
last_used = 0;
last_total = 0;
@@ -47,7 +54,9 @@ public class Monitor.CPU : Object {
core_list.add (core);
}
- var temp = new TemperatureSensor.cpu ();
+ // Temperature sensor shouldn't be created here since it
+ // will provides not only cpu temperature
+ temperature_sensor = new TemperatureSensor ();
}
public void update () {
diff --git a/src/Resources/TemperatureSensor.vala b/src/Resources/TemperatureSensor.vala
index 8b697196..b64a8e20 100644
--- a/src/Resources/TemperatureSensor.vala
+++ b/src/Resources/TemperatureSensor.vala
@@ -5,33 +5,27 @@ class TemperatureSensor : Object {
// Intel reports per core temperature, while AMD Ryzen Tdie
public Gee.ArrayList cpu_temp_paths;
- public struct Sensor {
- public string location;
- public float temperature;
- public float temperature_critical;
- // public double tdie_current_temperature;
- // public double tdie_critical_temperature;
- // public double tctl_current_temperature;
- // public double tctl_critical_temperature;
- } public Sensor sensor;
-
+ public double cpu {
+ get {
+ double total_temperature = 0;
+ foreach (var path in cpu_temp_paths) {
+ total_temperature += double.parse (open_file (path));
+ }
+ return total_temperature / cpu_temp_paths.size;
+ }
+ }
construct {
cpu_temp_paths = new Gee.ArrayList ();
+ traverser ();
}
public TemperatureSensor() {
}
- public TemperatureSensor.cpu () {
- traverser ();
- }
-
private void traverser () {
- int hwmon_counter = 0;
-
Dir hwmon_dir = Dir.open (hwmon_path, 0);
string ? hwmonx = null;
diff --git a/src/Views/SystemView/SystemCPUView.vala b/src/Views/SystemView/SystemCPUView.vala
index 8db2a41e..96a69383 100644
--- a/src/Views/SystemView/SystemCPUView.vala
+++ b/src/Views/SystemView/SystemCPUView.vala
@@ -6,6 +6,7 @@ public class Monitor.SystemCPUView : Gtk.Box {
private LabelVertical cpu_percentage_label;
private LabelRoundy cpu_frequency_label;
+ private LabelRoundy cpu_temperature_label;
private LabelH4 processor_name_label;
private Gtk.Button view_threads_usage_button;
@@ -31,8 +32,14 @@ public class Monitor.SystemCPUView : Gtk.Box {
cpu_percentage_label = new LabelVertical (_("UTILIZATION"));
cpu_percentage_label.has_tooltip = true;
cpu_percentage_label.tooltip_text = (_("Show detailed info"));
+
cpu_frequency_label = new LabelRoundy (_("FREQUENCY"));
cpu_frequency_label.margin = 6;
+ cpu_frequency_label.margin_top = 2;
+
+ cpu_temperature_label = new LabelRoundy (_("TEMPERATURE"));
+ cpu_temperature_label.margin = 6;
+ cpu_temperature_label.margin_top = 2;
processor_name_label = new LabelH4 (cpu.model_name);
@@ -69,13 +76,16 @@ public class Monitor.SystemCPUView : Gtk.Box {
cpu_frequency_chart.height_request = -1;
cpu_frequency_chart.config.y_axis.fixed_max = 5.0;
cpu_temperature_chart = new Chart (1);
- cpu_temperature_chart.margin_top = 6;
cpu_temperature_chart.height_request = -1;
var grid_frequency_info = new Gtk.Grid ();
grid_frequency_info.attach (cpu_frequency_label, 0, 0, 1, 1);
grid_frequency_info.attach (cpu_frequency_chart, 0, 0, 1, 1);
+ var grid_temperature_info = new Gtk.Grid ();
+ grid_temperature_info.attach (cpu_temperature_label, 0, 0, 1, 1);
+ grid_temperature_info.attach (cpu_temperature_chart, 0, 0, 1, 1);
+
cpu_percentage_label.clicked.connect(() => {
cpu_threads_revealer.reveal_child = !(cpu_threads_revealer.child_revealed);
@@ -87,12 +97,13 @@ public class Monitor.SystemCPUView : Gtk.Box {
}
});
- var smol_charts_container = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
+ var smol_charts_container = new Gtk.Grid ();
smol_charts_container.width_request = 200;
smol_charts_container.hexpand = false;
smol_charts_container.halign = Gtk.Align.START;
- smol_charts_container.add (grid_frequency_info);
- smol_charts_container.add (cpu_temperature_chart);
+ smol_charts_container.attach (grid_frequency_info, 0, 0, 1, 1);
+ smol_charts_container.attach (grid_temperature_info, 0, 1, 1, 1);
+ smol_charts_container.row_spacing = 6;
smol_charts_container.margin_left = 6;
// Thanks Goncalo
@@ -107,6 +118,7 @@ public class Monitor.SystemCPUView : Gtk.Box {
public void update () {
cpu_frequency_chart.update (0, cpu.frequency);
+ cpu_temperature_chart.update (0, cpu.temperature);
for (int i = 0; i < cpu.core_list.size; i++) {
double core_percentage = cpu.core_list[i].percentage_used;
@@ -139,6 +151,7 @@ public class Monitor.SystemCPUView : Gtk.Box {
cpu_percentage_label.set_text ((_("%d%%")).printf (cpu.percentage));
cpu_frequency_label.set_text (("%.2f %s").printf (cpu.frequency, _ ("GHz")));
+ cpu_temperature_label.set_text (("%.2f %s").printf (cpu.temperature, _ ("C")));
}
private Gtk.Grid grid_usage_labels () {
From 4c5a99d775e17c59d7c6d709e7e04d01f8836cf2 Mon Sep 17 00:00:00 2001
From: stsdc
Date: Sat, 15 Aug 2020 19:25:10 +0200
Subject: [PATCH 33/45] getting some network info
---
meson.build | 2 +
src/Resources/Network.vala | 72 +++++++++++++++++++++
src/Resources/Resources.vala | 4 ++
src/Views/SystemView/SystemCPUView.vala | 2 +-
src/Views/SystemView/SystemNetworkView.vala | 52 +++++++++++++++
src/Views/SystemView/SystemView.vala | 2 +
vapi/libgtop-2.0.vapi | 3 +
7 files changed, 136 insertions(+), 1 deletion(-)
create mode 100644 src/Resources/Network.vala
create mode 100644 src/Views/SystemView/SystemNetworkView.vala
diff --git a/meson.build b/meson.build
index 8d9b9522..82daaa09 100644
--- a/meson.build
+++ b/meson.build
@@ -70,6 +70,7 @@ executable(
'src/Views/SystemView/SystemCPUView.vala',
'src/Views/SystemView/SystemCPUInfoPopover.vala',
'src/Views/SystemView/SystemMemoryView.vala',
+ 'src/Views/SystemView/SystemNetworkView.vala',
# Widgets related only to ProcessInfoView
'src/Views/ProcessView/ProcessInfoView/Preventor.vala',
@@ -110,6 +111,7 @@ executable(
'src/Resources/Memory.vala',
'src/Resources/Swap.vala',
'src/Resources/TemperatureSensor.vala',
+ 'src/Resources/Network.vala',
c_args: c_args,
dependencies: [
glib,
diff --git a/src/Resources/Network.vala b/src/Resources/Network.vala
new file mode 100644
index 00000000..8d22fe2c
--- /dev/null
+++ b/src/Resources/Network.vala
@@ -0,0 +1,72 @@
+/*-
+ * Copyright (c) 2020 Tudor Plugaru (https://github.com/PlugaruT/wingpanel-monitor)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ * Authored by: Tudor Plugaru
+ */
+
+
+public class Monitor.Network : GLib.Object {
+ private int _bytes_in;
+ private int _bytes_in_old;
+ private bool control;
+
+ private int _bytes_out;
+ private int _bytes_out_old;
+
+ public Network () {
+ _bytes_in = 0;
+ _bytes_in_old = 0;
+ _bytes_out = 0;
+ _bytes_out_old = 0;
+ control = false;
+ }
+
+ public int[] get_bytes () {
+ if (control == false) {
+ control = true;
+ update_bytes_total ();
+ } else {
+ control = false;
+ }
+ int[] ret;
+ ret = {_bytes_out, _bytes_in};
+ return ret;
+ }
+
+ private void update_bytes_total () {
+ GTop.NetList netlist;
+ GTop.NetLoad netload;
+
+ var devices = GTop.get_netlist (out netlist);
+ var n_bytes_out = 0;
+ var n_bytes_in = 0;
+ for (uint j = 0; j < netlist.number; ++j) {
+ var device = devices[j];
+ if (device != "lo" && device.substring (0, 3) != "tun") {
+ GTop.get_netload (out netload, device);
+
+ n_bytes_out += (int)netload.bytes_out;
+ n_bytes_in += (int)netload.bytes_in;
+ }
+ }
+ _bytes_out = (n_bytes_out - _bytes_out_old) / 1;
+ _bytes_in = (n_bytes_in - _bytes_in_old) / 1;
+ _bytes_out_old = n_bytes_out;
+ _bytes_in_old = n_bytes_in;
+ }
+ }
diff --git a/src/Resources/Resources.vala b/src/Resources/Resources.vala
index 1deef74c..14215537 100644
--- a/src/Resources/Resources.vala
+++ b/src/Resources/Resources.vala
@@ -2,16 +2,20 @@ public class Monitor.Resources : Object {
public CPU cpu;
public Memory memory;
public Swap swap;
+ public Network network;
construct {
memory = new Memory ();
cpu = new CPU ();
swap = new Swap ();
+ network = new Network ();
}
public void update() {
cpu.update();
memory.update();
+
+ debug ("%d", network.get_bytes ()[0]);
}
public ResourcesSerialized serialize () {
return ResourcesSerialized () {
diff --git a/src/Views/SystemView/SystemCPUView.vala b/src/Views/SystemView/SystemCPUView.vala
index 96a69383..33a0d67e 100644
--- a/src/Views/SystemView/SystemCPUView.vala
+++ b/src/Views/SystemView/SystemCPUView.vala
@@ -151,7 +151,7 @@ public class Monitor.SystemCPUView : Gtk.Box {
cpu_percentage_label.set_text ((_("%d%%")).printf (cpu.percentage));
cpu_frequency_label.set_text (("%.2f %s").printf (cpu.frequency, _ ("GHz")));
- cpu_temperature_label.set_text (("%.2f %s").printf (cpu.temperature, _ ("C")));
+ cpu_temperature_label.set_text (("%.2f %s").printf (cpu.temperature, _ ("℃")));
}
private Gtk.Grid grid_usage_labels () {
diff --git a/src/Views/SystemView/SystemNetworkView.vala b/src/Views/SystemView/SystemNetworkView.vala
new file mode 100644
index 00000000..a9c49258
--- /dev/null
+++ b/src/Views/SystemView/SystemNetworkView.vala
@@ -0,0 +1,52 @@
+public class Monitor.SystemNetworkView : Gtk.Grid {
+ private Chart network_chart;
+ private Network network;
+
+ private LabelH4 memory_name_label;
+ private LabelVertical memory_percentage_label;
+ private Gtk.Label memory_shared_label;
+ private Gtk.Label memory_buffered_label;
+ private Gtk.Label memory_cached_label;
+ private Gtk.Label memory_locked_label;
+ private Gtk.Label memory_total_label;
+ private Gtk.Label memory_used_label;
+ private Gtk.Revealer memory_usage_revealer;
+
+ construct {
+ margin = 12;
+ column_spacing = 12;
+ set_vexpand (false);
+ }
+
+
+
+ public SystemNetworkView(Network _network) {
+ network = _network;
+
+ memory_name_label = new LabelH4 (_("Network"));
+
+ network_chart = new Chart (1);
+
+
+
+ attach (memory_name_label, 0, 0, 1, 1);
+ attach (network_chart, 0, 1, 2, 2);
+
+ }
+
+ private Gtk.Revealer memory_usage_grid () {
+
+ Gtk.Grid grid = new Gtk.Grid ();
+ grid.column_spacing = 12;
+ grid.width_request = 300;
+
+ return memory_usage_revealer;
+ }
+
+
+ public void update () {
+ // network_chart.update (0, network);
+
+ }
+
+}
\ No newline at end of file
diff --git a/src/Views/SystemView/SystemView.vala b/src/Views/SystemView/SystemView.vala
index 162d5467..b9d277da 100644
--- a/src/Views/SystemView/SystemView.vala
+++ b/src/Views/SystemView/SystemView.vala
@@ -3,6 +3,7 @@ public class Monitor.SystemView : Gtk.Box {
private SystemCPUView cpu_view;
private SystemMemoryView memory_view;
+ private SystemNetworkView network_view;
construct {
orientation = Gtk.Orientation.VERTICAL;
@@ -14,6 +15,7 @@ public class Monitor.SystemView : Gtk.Box {
cpu_view = new SystemCPUView (resources.cpu);
memory_view = new SystemMemoryView (resources.memory);
+ // memory_view = new SystemNetworkView (resources.memory);
add (cpu_view);
add (memory_view);
diff --git a/vapi/libgtop-2.0.vapi b/vapi/libgtop-2.0.vapi
index 53be24b9..b69e634b 100644
--- a/vapi/libgtop-2.0.vapi
+++ b/vapi/libgtop-2.0.vapi
@@ -45,6 +45,7 @@ namespace GTop {
public void get_msg_limits_s (out GTop.MsgLimits buf);
public void get_netload_l (out GTop.NetLoad buf, string @interface);
public void get_netload_s (out GTop.NetLoad buf, string @interface);
+ public string[] get_netlist (out GTop.NetList buf);
public ulong get_parameter_l (uint parameter, void* data_ptr, ulong data_size);
public void get_ppp_l (out GTop.Ppp buf, ushort device);
public void get_ppp_s (out GTop.Ppp buf, ushort device);
@@ -1273,6 +1274,8 @@ namespace GTop {
public static void get_msg_limits (out GTop.MsgLimits buf);
[CCode (cheader_filename = "glibtop.h", cname = "glibtop_get_netload")]
public static void get_netload (out GTop.NetLoad buf, string @interface);
+ [CCode (cheader_filename = "glibtop/netlist.h", cname = "glibtop_get_netlist", array_length = false, array_null_terminated = true)]
+ public static string[] get_netlist (out GTop.NetList buf);
[CCode (cheader_filename = "glibtop.h", cname = "glibtop_get_ppp")]
public static void get_ppp (out GTop.Ppp buf, ushort device);
[CCode (cheader_filename = "glibtop.h", cname = "glibtop_get_proc_affinity")]
From 471239bfb15b2bba0314f72bcc3f849e14a5acf7 Mon Sep 17 00:00:00 2001
From: stsdc
Date: Sun, 16 Aug 2020 00:16:51 +0200
Subject: [PATCH 34/45] show labels with up/down traffic speed
---
src/Resources/Resources.vala | 2 -
src/Views/SystemView/SystemCPUView.vala | 1 +
src/Views/SystemView/SystemNetworkView.vala | 48 +++++++++------------
src/Views/SystemView/SystemView.vala | 4 +-
4 files changed, 25 insertions(+), 30 deletions(-)
diff --git a/src/Resources/Resources.vala b/src/Resources/Resources.vala
index 14215537..04f2b898 100644
--- a/src/Resources/Resources.vala
+++ b/src/Resources/Resources.vala
@@ -14,8 +14,6 @@ public class Monitor.Resources : Object {
public void update() {
cpu.update();
memory.update();
-
- debug ("%d", network.get_bytes ()[0]);
}
public ResourcesSerialized serialize () {
return ResourcesSerialized () {
diff --git a/src/Views/SystemView/SystemCPUView.vala b/src/Views/SystemView/SystemCPUView.vala
index 33a0d67e..4187c1f4 100644
--- a/src/Views/SystemView/SystemCPUView.vala
+++ b/src/Views/SystemView/SystemCPUView.vala
@@ -182,6 +182,7 @@ public class Monitor.SystemCPUView : Gtk.Box {
int row = 0;
for (int i = 0; i < cpu.core_list.size; i++) {
var core_label = new Gtk.Label (Utils.NO_DATA);
+ core_label.set_width_chars (4);
core_label.get_style_context ().add_class ("core_badge");
// core_label.set_text (Utils.NO_DATA);
core_label_list.add (core_label);
diff --git a/src/Views/SystemView/SystemNetworkView.vala b/src/Views/SystemView/SystemNetworkView.vala
index a9c49258..4d2dc68b 100644
--- a/src/Views/SystemView/SystemNetworkView.vala
+++ b/src/Views/SystemView/SystemNetworkView.vala
@@ -2,15 +2,9 @@ public class Monitor.SystemNetworkView : Gtk.Grid {
private Chart network_chart;
private Network network;
- private LabelH4 memory_name_label;
- private LabelVertical memory_percentage_label;
- private Gtk.Label memory_shared_label;
- private Gtk.Label memory_buffered_label;
- private Gtk.Label memory_cached_label;
- private Gtk.Label memory_locked_label;
- private Gtk.Label memory_total_label;
- private Gtk.Label memory_used_label;
- private Gtk.Revealer memory_usage_revealer;
+ private LabelH4 network_name_label;
+ private LabelRoundy network_upload_label;
+ private LabelRoundy network_download_label;
construct {
margin = 12;
@@ -20,33 +14,33 @@ public class Monitor.SystemNetworkView : Gtk.Grid {
- public SystemNetworkView(Network _network) {
+ public SystemNetworkView (Network _network) {
network = _network;
- memory_name_label = new LabelH4 (_("Network"));
+ network_name_label = new LabelH4 (_ ("Network"));
+ network_download_label = new LabelRoundy (_ ("DOWN"));
+ network_upload_label = new LabelRoundy (_ ("UP"));
- network_chart = new Chart (1);
+ network_chart = new Chart (2);
+ var labels_grid = new Gtk.Grid ();
+ labels_grid.row_spacing = 6;
+ labels_grid.column_spacing = 6;
+ labels_grid.margin = 6;
+ labels_grid.attach (network_upload_label, 0, 0, 1, 1);
+ labels_grid.attach (network_download_label, 1, 0, 1, 1);
-
- attach (memory_name_label, 0, 0, 1, 1);
- attach (network_chart, 0, 1, 2, 2);
-
+ attach (network_name_label, 0, 0, 1, 1);
+ attach (labels_grid, 0, 1, 2, 2);
+ attach (network_chart, 0, 1, 2, 2);
}
- private Gtk.Revealer memory_usage_grid () {
-
- Gtk.Grid grid = new Gtk.Grid ();
- grid.column_spacing = 12;
- grid.width_request = 300;
-
- return memory_usage_revealer;
- }
public void update () {
- // network_chart.update (0, network);
-
+ network_download_label.set_text (("%s/s").printf ( Utils.HumanUnitFormatter.string_bytes_to_human(network.get_bytes ()[1].to_string())));
+ network_upload_label.set_text (("%s/s").printf (Utils.HumanUnitFormatter.string_bytes_to_human(network.get_bytes ()[0].to_string())));
+ network_chart.update (0, network.get_bytes ()[0]/1024);
+ network_chart.update (1, network.get_bytes ()[1]/1024);
}
-
}
\ No newline at end of file
diff --git a/src/Views/SystemView/SystemView.vala b/src/Views/SystemView/SystemView.vala
index b9d277da..c1dc8bee 100644
--- a/src/Views/SystemView/SystemView.vala
+++ b/src/Views/SystemView/SystemView.vala
@@ -15,14 +15,16 @@ public class Monitor.SystemView : Gtk.Box {
cpu_view = new SystemCPUView (resources.cpu);
memory_view = new SystemMemoryView (resources.memory);
- // memory_view = new SystemNetworkView (resources.memory);
+ network_view = new SystemNetworkView (resources.network);
add (cpu_view);
add (memory_view);
+ add (network_view);
}
public void update () {
cpu_view.update();
memory_view.update();
+ network_view.update ();
}
}
\ No newline at end of file
From 65d925fd596082e5900885161d7f59563643d7c5 Mon Sep 17 00:00:00 2001
From: rottenpants466 <62076029+rottenpants466@users.noreply.github.com>
Date: Sun, 16 Aug 2020 14:14:27 +0100
Subject: [PATCH 35/45] Update pt.po
---
po/pt.po | 51 +++++++++++++++++++++++++--------------------------
1 file changed, 25 insertions(+), 26 deletions(-)
diff --git a/po/pt.po b/po/pt.po
index daab273e..d02e8a09 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,14 +9,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-11-04 11:58+0000\n"
-"Last-Translator: Hugo Carvalho \n"
+"PO-Revision-Date: 2020-08-16 14:07+0100\n"
+"Last-Translator: André Barata \n"
"Language-Team: \n"
"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.4\n"
+"X-Generator: Poedit 2.4.1\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: src/Utils.vala:13
@@ -29,11 +29,11 @@ msgstr ""
#: src/Views/ProcessView/ProcessInfoView/ProcessInfoIOStats.vala:34
#: src/Views/ProcessView/ProcessInfoView/ProcessInfoIOStats.vala:35
msgid "N/A"
-msgstr ""
+msgstr "N/A"
#: src/Utils.vala:45
msgid "B"
-msgstr ""
+msgstr "B"
#: src/Utils.vala:50
#: src/Views/ProcessView/ProcessTreeView/CPUProcessTreeView.vala:113
@@ -55,19 +55,19 @@ msgstr "Fechar Monitor"
#: src/Views/ProcessView/ProcessInfoView/OpenFilesListBox.vala:56
msgid "Deleted"
-msgstr ""
+msgstr "Apagado"
#: src/Views/ProcessView/ProcessInfoView/Preventor.vala:21
msgid "Are you sure you want to do this?"
-msgstr ""
+msgstr "Tem a certeza que quer fazer isso?"
#: src/Views/ProcessView/ProcessInfoView/Preventor.vala:24
msgid "Yes"
-msgstr ""
+msgstr "Sim"
#: src/Views/ProcessView/ProcessInfoView/Preventor.vala:28
msgid "No"
-msgstr ""
+msgstr "Não"
#: src/Views/ProcessView/ProcessInfoView/ProcessInfoHeader.vala:39
#: src/Views/ProcessView/ProcessTreeView/CPUProcessTreeView.vala:59
@@ -76,36 +76,35 @@ 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 "Ficheiros abertos"
#: src/Views/ProcessView/ProcessInfoView/ProcessInfoIOStats.vala:22
msgid "Characters"
-msgstr ""
+msgstr "Caracteres"
#: src/Views/ProcessView/ProcessInfoView/ProcessInfoIOStats.vala:27
msgid "System calls"
-msgstr ""
+msgstr "Chamadas de sistema"
#: src/Views/ProcessView/ProcessInfoView/ProcessInfoIOStats.vala:32
msgid "Read/Written"
-msgstr ""
+msgstr "Ler/Escrita"
#: src/Views/ProcessView/ProcessInfoView/ProcessInfoIOStats.vala:37
msgid "Cancelled write"
-msgstr ""
+msgstr "Escrita cancelada"
#: src/Views/ProcessView/ProcessInfoView/ProcessInfoView.vala:79
msgid "End Process"
@@ -125,11 +124,11 @@ msgstr "Matar processo selecionado"
#: src/Views/ProcessView/ProcessInfoView/ProcessInfoView.vala:96
msgid "Confirm kill of the process?"
-msgstr ""
+msgstr "Confirma matar o processo?"
#: src/Views/ProcessView/ProcessInfoView/ProcessInfoView.vala:103
msgid "Confirm end of the process?"
-msgstr ""
+msgstr "Confirma terminar o processo?"
#. setup name column
#: src/Views/ProcessView/ProcessTreeView/CPUProcessTreeView.vala:17
@@ -155,12 +154,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"
@@ -188,7 +187,7 @@ msgstr "Escreva o nome do processo ou PID a pesquisar"
#: src/Widgets/Statusbar/Statusbar.vala:14
msgid "Swap"
-msgstr ""
+msgstr "Trocar"
#: src/Widgets/Statusbar/Statusbar.vala:16
#: src/Widgets/Statusbar/Statusbar.vala:20
@@ -198,7 +197,7 @@ msgstr "A calcular…"
#: src/Widgets/Statusbar/Statusbar.vala:38
msgid "GHz"
-msgstr ""
+msgstr "GHz"
#~ msgid "Monitor Indicator"
#~ msgstr "Indicador do monitor"
@@ -213,7 +212,7 @@ msgstr ""
#~ msgstr "Ctrl+E"
#~ msgid "CPU:"
-#~ msgstr "CPU :"
+#~ msgstr "CPU:"
#~ msgid "Memory:"
-#~ msgstr "Memória :"
+#~ msgstr "Memória:"
From a2bd25392692b6eed47b14a57d3110cef0dd80fb Mon Sep 17 00:00:00 2001
From: stsdc
Date: Sun, 16 Aug 2020 20:51:29 +0200
Subject: [PATCH 36/45] fix showing wrong uload/download speeds
---
src/Views/SystemView/SystemNetworkView.vala | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/Views/SystemView/SystemNetworkView.vala b/src/Views/SystemView/SystemNetworkView.vala
index 4d2dc68b..0bd16f1e 100644
--- a/src/Views/SystemView/SystemNetworkView.vala
+++ b/src/Views/SystemView/SystemNetworkView.vala
@@ -27,8 +27,8 @@ public class Monitor.SystemNetworkView : Gtk.Grid {
labels_grid.row_spacing = 6;
labels_grid.column_spacing = 6;
labels_grid.margin = 6;
- labels_grid.attach (network_upload_label, 0, 0, 1, 1);
- labels_grid.attach (network_download_label, 1, 0, 1, 1);
+ labels_grid.attach (network_download_label, 0, 0, 1, 1);
+ labels_grid.attach (network_upload_label, 1, 0, 1, 1);
attach (network_name_label, 0, 0, 1, 1);
attach (labels_grid, 0, 1, 2, 2);
@@ -38,8 +38,10 @@ public class Monitor.SystemNetworkView : Gtk.Grid {
public void update () {
- network_download_label.set_text (("%s/s").printf ( Utils.HumanUnitFormatter.string_bytes_to_human(network.get_bytes ()[1].to_string())));
- network_upload_label.set_text (("%s/s").printf (Utils.HumanUnitFormatter.string_bytes_to_human(network.get_bytes ()[0].to_string())));
+ double up_bytes = network.get_bytes ()[0] / 2;
+ double down_bytes = network.get_bytes ()[1] / 2;
+ network_download_label.set_text (("%s/s").printf (Utils.HumanUnitFormatter.string_bytes_to_human (down_bytes.to_string ())));
+ network_upload_label.set_text (("%s/s").printf (Utils.HumanUnitFormatter.string_bytes_to_human (up_bytes.to_string ())));
network_chart.update (0, network.get_bytes ()[0]/1024);
network_chart.update (1, network.get_bytes ()[1]/1024);
}
From c25bd5caafcbcdfc710e0f4034ff3449a3a4ed65 Mon Sep 17 00:00:00 2001
From: stsdc
Date: Sun, 16 Aug 2020 21:39:19 +0200
Subject: [PATCH 37/45] adding network chart
---
meson.build | 1 +
src/Views/SystemView/SystemNetworkView.vala | 18 +++---
src/Widgets/Chart/NetworkChart.vala | 66 +++++++++++++++++++++
3 files changed, 77 insertions(+), 8 deletions(-)
create mode 100644 src/Widgets/Chart/NetworkChart.vala
diff --git a/meson.build b/meson.build
index 82daaa09..17aa7927 100644
--- a/meson.build
+++ b/meson.build
@@ -88,6 +88,7 @@ executable(
'src/Widgets/Labels/LabelH4.vala',
'src/Widgets/Chart/Chart.vala',
'src/Widgets/Chart/ProcessChart.vala',
+ 'src/Widgets/Chart/NetworkChart.vala',
# Models
diff --git a/src/Views/SystemView/SystemNetworkView.vala b/src/Views/SystemView/SystemNetworkView.vala
index 0bd16f1e..96845fad 100644
--- a/src/Views/SystemView/SystemNetworkView.vala
+++ b/src/Views/SystemView/SystemNetworkView.vala
@@ -1,5 +1,5 @@
public class Monitor.SystemNetworkView : Gtk.Grid {
- private Chart network_chart;
+ private NetworkChart network_chart;
private Network network;
private LabelH4 network_name_label;
@@ -21,7 +21,7 @@ public class Monitor.SystemNetworkView : Gtk.Grid {
network_download_label = new LabelRoundy (_ ("DOWN"));
network_upload_label = new LabelRoundy (_ ("UP"));
- network_chart = new Chart (2);
+ network_chart = new NetworkChart (2);
var labels_grid = new Gtk.Grid ();
labels_grid.row_spacing = 6;
@@ -35,14 +35,16 @@ public class Monitor.SystemNetworkView : Gtk.Grid {
attach (network_chart, 0, 1, 2, 2);
}
-
-
public void update () {
double up_bytes = network.get_bytes ()[0] / 2;
double down_bytes = network.get_bytes ()[1] / 2;
- network_download_label.set_text (("%s/s").printf (Utils.HumanUnitFormatter.string_bytes_to_human (down_bytes.to_string ())));
- network_upload_label.set_text (("%s/s").printf (Utils.HumanUnitFormatter.string_bytes_to_human (up_bytes.to_string ())));
- network_chart.update (0, network.get_bytes ()[0]/1024);
- network_chart.update (1, network.get_bytes ()[1]/1024);
+
+ debug ("%f %f", up_bytes, down_bytes);
+ if (up_bytes >= 0 && down_bytes >= 0) {
+ network_download_label.set_text (("%s/s").printf (Utils.HumanUnitFormatter.string_bytes_to_human (down_bytes.to_string ())));
+ network_upload_label.set_text (("%s/s").printf (Utils.HumanUnitFormatter.string_bytes_to_human (up_bytes.to_string ())));
+ network_chart.update (0, up_bytes);
+ network_chart.update (1, down_bytes);
+ }
}
}
\ No newline at end of file
diff --git a/src/Widgets/Chart/NetworkChart.vala b/src/Widgets/Chart/NetworkChart.vala
new file mode 100644
index 00000000..d4aa38c8
--- /dev/null
+++ b/src/Widgets/Chart/NetworkChart.vala
@@ -0,0 +1,66 @@
+public class Monitor.NetworkChart : Gtk.Box {
+ private LiveChart.Chart live_chart;
+ public LiveChart.Config config;
+
+ construct {
+ get_style_context ().add_class ("graph");
+
+ vexpand = true;
+ height_request = 120;
+
+ config = new LiveChart.Config ();
+ // config.y_axis.unit = "%";
+ // config.y_axis.tick_interval = 25;
+ // config.y_axis.fixed_max = 100.0;
+ config.y_axis.labels.visible = false;
+ config.x_axis.labels.visible = false;
+
+ config.padding = LiveChart.Padding () {
+ smart = LiveChart.AutoPadding.NONE,
+ top = 0,
+ right = 0,
+ bottom = 0,
+ left = -1
+ };
+
+ live_chart = new LiveChart.Chart (config);
+ live_chart.expand = true;
+ live_chart.legend.visible = false;
+ live_chart.grid.visible = true;
+ live_chart.background.main_color = Gdk.RGBA () {
+ red= 1, green= 1, blue= 1, alpha= 1
+ }; //White background
+
+ }
+
+ public NetworkChart (int series_quantity) {
+ for (int i = 0; i < series_quantity; i++) {
+ var renderer = new LiveChart.SmoothLineArea (new LiveChart.Values(1000));
+ var serie = new LiveChart.Serie (("Serie %d").printf(i), renderer);
+ serie.set_main_color ({ 0.35 + i/20, 0.8, 0.1, 1.0});
+ live_chart.add_serie (serie);
+
+ // workaround for `gee_collection_get_size: assertion 'self != NULL' failed`
+ // https://github.com/lcallarec/live-chart/issues/16
+ live_chart.add_value (serie, 3.0);
+ }
+ add (live_chart);
+ }
+
+ public void update (int serie_number, double value) {
+ live_chart.add_value_by_index (serie_number, value);
+ }
+
+ // public void set_data (int serie_number, Gee.ArrayList history) {
+ // var refresh_rate_is_ms = 2000; //your own refresh rate in milliseconds
+ // live_chart.add_unaware_timestamp_collection(live_chart.series[serie_number], history, refresh_rate_is_ms);
+ // }
+
+
+ public void clear () {
+ // var series = live_chart.series;
+ // foreach (var serie in series) {
+ // serie.clear();
+ // }
+ }
+}
From ea5a70f1c83e348d66daeb7af79b72f6a3026cb9 Mon Sep 17 00:00:00 2001
From: stsdc
Date: Sun, 16 Aug 2020 21:41:51 +0200
Subject: [PATCH 38/45] add comment
---
src/Widgets/Chart/NetworkChart.vala | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/Widgets/Chart/NetworkChart.vala b/src/Widgets/Chart/NetworkChart.vala
index d4aa38c8..ae8e8b1c 100644
--- a/src/Widgets/Chart/NetworkChart.vala
+++ b/src/Widgets/Chart/NetworkChart.vala
@@ -42,7 +42,8 @@ public class Monitor.NetworkChart : Gtk.Box {
// workaround for `gee_collection_get_size: assertion 'self != NULL' failed`
// https://github.com/lcallarec/live-chart/issues/16
- live_chart.add_value (serie, 3.0);
+ // why 3? I don't know.
+ live_chart.add_value (serie, 3);
}
add (live_chart);
}
From aec98655616d58f9060419509e35f298e126fb8d Mon Sep 17 00:00:00 2001
From: stsdc
Date: Sun, 16 Aug 2020 22:20:22 +0200
Subject: [PATCH 39/45] fix peak at start in network
---
src/Resources/Network.vala | 23 +++++++++++++++++++++--
1 file changed, 21 insertions(+), 2 deletions(-)
diff --git a/src/Resources/Network.vala b/src/Resources/Network.vala
index 8d22fe2c..e459b261 100644
--- a/src/Resources/Network.vala
+++ b/src/Resources/Network.vala
@@ -28,12 +28,19 @@ public class Monitor.Network : GLib.Object {
private int _bytes_out;
private int _bytes_out_old;
+ private int i;
+
+ // flag first run
+ // bc first calculasion is wrong
+ private bool dumb_flag;
+
public Network () {
_bytes_in = 0;
_bytes_in_old = 0;
_bytes_out = 0;
_bytes_out_old = 0;
control = false;
+ dumb_flag = true;
}
public int[] get_bytes () {
@@ -64,9 +71,21 @@ public class Monitor.Network : GLib.Object {
n_bytes_in += (int)netload.bytes_in;
}
}
- _bytes_out = (n_bytes_out - _bytes_out_old) / 1;
- _bytes_in = (n_bytes_in - _bytes_in_old) / 1;
+
+ var bout = (n_bytes_out - _bytes_out_old) / 1;
+ var bin = (n_bytes_in - _bytes_in_old) / 1;
+
_bytes_out_old = n_bytes_out;
_bytes_in_old = n_bytes_in;
+
+ if (!dumb_flag) {
+ _bytes_out = bout;
+ _bytes_in = bin;
+
+ debug ("%d", i);
+ i++;
+ }
+ dumb_flag = false;
+
}
}
From 91886ef18de8e85e3cbc210bf48e4eda509b16ac Mon Sep 17 00:00:00 2001
From: stsdc
Date: Sun, 16 Aug 2020 22:20:53 +0200
Subject: [PATCH 40/45] rm debug
---
src/Resources/Network.vala | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/src/Resources/Network.vala b/src/Resources/Network.vala
index e459b261..272f2978 100644
--- a/src/Resources/Network.vala
+++ b/src/Resources/Network.vala
@@ -28,8 +28,6 @@ public class Monitor.Network : GLib.Object {
private int _bytes_out;
private int _bytes_out_old;
- private int i;
-
// flag first run
// bc first calculasion is wrong
private bool dumb_flag;
@@ -74,16 +72,13 @@ public class Monitor.Network : GLib.Object {
var bout = (n_bytes_out - _bytes_out_old) / 1;
var bin = (n_bytes_in - _bytes_in_old) / 1;
-
+
_bytes_out_old = n_bytes_out;
_bytes_in_old = n_bytes_in;
if (!dumb_flag) {
_bytes_out = bout;
_bytes_in = bin;
-
- debug ("%d", i);
- i++;
}
dumb_flag = false;
From c8620ab6a562ab15ef58b615232f11f5ac77ca23 Mon Sep 17 00:00:00 2001
From: stsdc
Date: Tue, 18 Aug 2020 21:02:49 +0200
Subject: [PATCH 41/45] reserve space for characters in some labels
---
src/Views/SystemView/SystemNetworkView.vala | 3 ++-
src/Widgets/Statusbar/Statusbar.vala | 6 ++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/Views/SystemView/SystemNetworkView.vala b/src/Views/SystemView/SystemNetworkView.vala
index 96845fad..f8ed9402 100644
--- a/src/Views/SystemView/SystemNetworkView.vala
+++ b/src/Views/SystemView/SystemNetworkView.vala
@@ -19,7 +19,9 @@ public class Monitor.SystemNetworkView : Gtk.Grid {
network_name_label = new LabelH4 (_ ("Network"));
network_download_label = new LabelRoundy (_ ("DOWN"));
+ network_download_label.val.set_width_chars (7);
network_upload_label = new LabelRoundy (_ ("UP"));
+ network_upload_label.val.set_width_chars (7);
network_chart = new NetworkChart (2);
@@ -38,7 +40,6 @@ public class Monitor.SystemNetworkView : Gtk.Grid {
public void update () {
double up_bytes = network.get_bytes ()[0] / 2;
double down_bytes = network.get_bytes ()[1] / 2;
-
debug ("%f %f", up_bytes, down_bytes);
if (up_bytes >= 0 && down_bytes >= 0) {
network_download_label.set_text (("%s/s").printf (Utils.HumanUnitFormatter.string_bytes_to_human (down_bytes.to_string ())));
diff --git a/src/Widgets/Statusbar/Statusbar.vala b/src/Widgets/Statusbar/Statusbar.vala
index d30193e6..26fa62bd 100644
--- a/src/Widgets/Statusbar/Statusbar.vala
+++ b/src/Widgets/Statusbar/Statusbar.vala
@@ -14,15 +14,21 @@ public class Monitor.Statusbar : Gtk.ActionBar {
swap_icon.tooltip_text = _ ("Swap");
cpu_usage_label = new Gtk.Label (_("Calculating…"));
+ cpu_usage_label.set_width_chars (4);
+ cpu_usage_label.xalign = 0;
pack_start (cpu_icon);
pack_start (cpu_usage_label);
memory_usage_label = new Gtk.Label (_("Calculating…"));
+ memory_usage_label.set_width_chars (4);
+ memory_usage_label.xalign = 0;
ram_icon.margin_start = 6;
pack_start (ram_icon);
pack_start (memory_usage_label);
swap_usage_label = new Gtk.Label (_("Calculating…"));
+ swap_usage_label.set_width_chars (4);
+ swap_usage_label.xalign = 0;
swap_icon.margin_start = 6;
pack_start (swap_icon);
pack_start (swap_usage_label);
From c2afc719898ef1e5ad888dcd33340dac9ce30606 Mon Sep 17 00:00:00 2001
From: stsdc
Date: Tue, 18 Aug 2020 21:05:14 +0200
Subject: [PATCH 42/45] add fresh screenshot
---
data/screenshots/monitor-system.png | Bin 54834 -> 99235 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/data/screenshots/monitor-system.png b/data/screenshots/monitor-system.png
index da9946d8a653631909128249bdf6dcbc4cb8db5d..65d775000bb7578d51419a50e501d9980b3205bd 100644
GIT binary patch
literal 99235
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