Skip to content

system-monitor-graph@rcassani: Add label for network graph #1884

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rcalixte merged 5 commits into from
Aug 9, 2026
Merged

system-monitor-graph@rcassani: Add label for network graph #1884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e1e366f
Update TODO section in `README.md`
rcassani Aug 9, 2026
2552b56
Different constants for CPU and GPU min and max temperatures
rcassani Aug 9, 2026
e3ef7a9
Network: Allow using interface name or custom text as label for graph
rcassani Aug 9, 2026
8e23566
Update translation `.pot` file and `.po` files
rcassani Aug 9, 2026
4c6d435
Clean `README.md`
rcassani Aug 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed system-monitor-graph@rcassani/Network Desktlet.png
View file
Open in desktop
Binary file not shown.
8 changes: 4 additions & 4 deletions system-monitor-graph@rcassani/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@ CPU fan speed history while the fan is running and stopped.
</p>

## TODO
- [x] Add network
- [x] Battery levels for main battery (laptop)
- [x] CPU and GPU temperatures
- [ ] Battery levels for main battery (laptop)
- [x] Add network: [#1511](https://github.com/linuxmint/cinnamon-spices-desklets/pull/1511)
- [x] Battery levels for main battery (laptop): [#1766](https://github.com/linuxmint/cinnamon-spices-desklets/pull/1766)
- [x] CPU and GPU temperatures: [#1768](https://github.com/linuxmint/cinnamon-spices-desklets/pull/1768)
- [x] CPU fan speed and status: [#1868](https://github.com/linuxmint/cinnamon-spices-desklets/pull/1868)

### Resources
This is my first Desklet and the first time using JavaScript. Below, some resources that I used for the development of this Desklet.
Expand Down
17 changes: 14 additions & 3 deletions system-monitor-graph@rcassani/files/system-monitor-graph@rcassani/desklet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ const KIB_TO_B = 1024; // 1 KiB = 1,024 B

const CPU_TEMP_MIN = 20; // Minimum CPU temperature
const CPU_TEMP_MAX = 100; // Maximum CPU temperature
const GPU_TEMP_MIN = 20; // Minimum GPU temperature
const GPU_TEMP_MAX = 100; // Maximum GPU temperature
const CPU_FANSPEED_MAX = 4000; // CPU fan graph full-scale speed
const CPU_FAN_RETRY_MIN = 5; // Initial retry delay in seconds
const CPU_FAN_RETRY_MAX = 300; // Maximum retry delay in seconds
Expand Down Expand Up @@ -109,6 +111,7 @@ SystemMonitorGraph.prototype = {
this.settings.bindProperty(Settings.BindingDirection.IN, "data-prefix-gpumem", "data_prefix_gpumem", this.on_setting_changed);
this.settings.bindProperty(Settings.BindingDirection.IN, "data-prefix-network", "data_prefix_network", this.on_setting_changed);
this.settings.bindProperty(Settings.BindingDirection.IN, "network-interface", "network_interface", this.on_setting_changed);
this.settings.bindProperty(Settings.BindingDirection.IN, "network-label", "network_label", this.on_setting_changed);
this.settings.bindProperty(Settings.BindingDirection.IN, "battery-name", "battery_name", this.on_setting_changed);
this.settings.bindProperty(Settings.BindingDirection.IN, "filesystem", "filesystem", this.on_setting_changed);
this.settings.bindProperty(Settings.BindingDirection.IN, "filesystem-label", "filesystem_label", this.on_setting_changed);
Expand Down Expand Up @@ -429,7 +432,8 @@ SystemMonitorGraph.prototype = {
this.get_amdgpu_gpu_temperature(this.gpu_amd_temperature_file);
break;
}
value = 1.0 * (this.gpu_temperature - CPU_TEMP_MIN) / (CPU_TEMP_MAX - CPU_TEMP_MIN);
// scale GPU temperature based on [GPU_TEMP_MIN, GPU_TEMP_MAX]
value = 1.0 * (this.gpu_temperature - GPU_TEMP_MIN) / (GPU_TEMP_MAX - GPU_TEMP_MIN);
value = value < 0 ? 0 : value > 1 ? 1 : value;
text1 = _("GPU Temperature");
if (this.temperature_units_gpu == "C") {
Expand All @@ -445,8 +449,15 @@ SystemMonitorGraph.prototype = {
this.get_network_values();
// For network, we don't use the single 'value' variable as we have dual lines
value = 0; // Not used for network type
text1 = _("Network");

// Network label
text1 = this.network_label;
if (text1 == "") {
if (this.network_interface.trim() == "") {
text1 = _("Network");
} else {
text1 = this.network_interface.trim();
}
}
// Format speeds with appropriate units
let down_speed_formatted = this.format_network_speed(this.net_down_speed);
let up_speed_formatted = this.format_network_speed(this.net_up_speed);
Expand Down
85 changes: 48 additions & 37 deletions system-monitor-graph@rcassani/files/system-monitor-graph@rcassani/po/ca.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-desklets/issues\n"
"POT-Creation-Date: 2026-07-22 14:45+0530\n"
"Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-desklets/"
"issues\n"
"POT-Creation-Date: 2026-08-08 22:04-0400\n"
"PO-Revision-Date: 2025-09-29 04:41+0200\n"
"Last-Translator: Daniel <d3vf4n@tutanota.com>\n"
"Language-Team: \n"
Expand All @@ -19,128 +20,128 @@ msgstr ""
"X-Generator: Poedit 3.6\n"

#. settings-schema.json->type->options
#. desklet.js:288
#. desklet.js:291
msgid "CPU"
msgstr "CPU"

#. desklet.js:297
#. desklet.js:300
msgid "CPU Temperature"
msgstr ""

#. desklet.js:309
#. desklet.js:312
msgid "CPU Fan"
msgstr ""

#. desklet.js:313
#. desklet.js:316
msgid "RPM"
msgstr ""

#. desklet.js:314
#. desklet.js:317
msgid "On"
msgstr ""

#. desklet.js:316
#. desklet.js:319
msgid "Off"
msgstr ""

#. desklet.js:319
#. desklet.js:322
msgid "Not detected"
msgstr ""

#. desklet.js:321
#. desklet.js:324
msgid "Detecting..."
msgstr ""

#. desklet.js:334 desklet.js:352 desklet.js:372 desklet.js:413 desklet.js:717
#. desklet.js:337 desklet.js:355 desklet.js:375 desklet.js:416 desklet.js:728
msgid "GB"
msgstr "GB"

#. desklet.js:337 desklet.js:355 desklet.js:375 desklet.js:416 desklet.js:731
#. desklet.js:340 desklet.js:358 desklet.js:378 desklet.js:419 desklet.js:742
msgid "GiB"
msgstr "GiB"

#. settings-schema.json->type->options
#. desklet.js:339
#. desklet.js:342
msgid "RAM"
msgstr "RAM"

#. settings-schema.json->type->options
#. desklet.js:357
#. desklet.js:360
msgid "Swap"
msgstr "Swap"

#. desklet.js:380
#. desklet.js:383
msgid "free of"
msgstr "lliure de"

#. desklet.js:396
#. desklet.js:399
msgid "GPU Usage"
msgstr "Ús de GPU"

#. desklet.js:418
#. desklet.js:421
msgid "GPU Memory"
msgstr "Memòria de la GPU"

#. desklet.js:434
#. desklet.js:438
#, fuzzy
msgid "GPU Temperature"
msgstr "Fabricant de la GPU"

#. settings-schema.json->type->options
#. desklet.js:448
#. desklet.js:456
msgid "Network"
msgstr "Xarxa"

#. settings-schema.json->type->options
#. desklet.js:461
#. desklet.js:472
msgid "Battery"
msgstr ""

#. desklet.js:464
#. desklet.js:475
msgid "Fully charged"
msgstr ""

#. desklet.js:465
#. desklet.js:476
msgid "Not charging"
msgstr ""

#. desklet.js:467
#. desklet.js:478
msgid " hrs"
msgstr ""

#. desklet.js:688 desklet.js:711
#. desklet.js:699 desklet.js:722
msgid "b"
msgstr "b"

#. desklet.js:690 desklet.js:725 desklet.js:739
#. desklet.js:701 desklet.js:736 desklet.js:750
msgid "B"
msgstr "B"

#. desklet.js:703
#. desklet.js:714
msgid "Gb"
msgstr "Gb"

#. desklet.js:706
#. desklet.js:717
msgid "Mb"
msgstr "Mb"

#. desklet.js:709
#. desklet.js:720
msgid "Kb"
msgstr "Kb"

#. desklet.js:720
#. desklet.js:731
msgid "MB"
msgstr "MB"

#. desklet.js:723
#. desklet.js:734
msgid "KB"
msgstr "KB"

#. desklet.js:734
#. desklet.js:745
msgid "MiB"
msgstr "MiB"

#. desklet.js:737
#. desklet.js:748
msgid "KiB"
msgstr "KiB"

Expand Down Expand Up @@ -197,7 +198,7 @@ msgid "Temperature"
msgstr ""

#. settings-schema.json->cpu-variable->options
msgid "Fan Speed"
msgid "Fan"
msgstr ""

#. settings-schema.json->temperature-units-cpu->options
Expand Down Expand Up @@ -279,11 +280,21 @@ msgstr "Interfície de xarxa a monitorar"

#. settings-schema.json->network-interface->tooltip
msgid ""
"Leave empty to monitor all interfaces combined. Examples: eth0, wlan0, "
"enp0s3"
"Leave empty to monitor all interfaces combined. Examples: eth0, wlan0, enp0s3"
msgstr ""
"Deixeu-ho en blanc per a monitorar totes les interfícies. Per exemple: eth0, "
"wlan0, enp0s3"

#. settings-schema.json->network-label->description
#, fuzzy
msgid "Network label"
msgstr "Xarxa"

#. settings-schema.json->network-label->tooltip
msgid ""
"Empty uses the network interface name or 'Network' if monitoring all "
"interfaces."
msgstr ""
"Deixeu-ho en blanc per a monitorar totes les interfícies. Per exemple: eth0,"
" wlan0, enp0s3"

#. settings-schema.json->battery-name->description
#, fuzzy
Expand Down
Loading
Loading