Skip to content

Commit 562d7e2

Browse files
schorschiischorschii
authored
system-monitor-graph@rcassani: Add option to display network speed in bits and align labels (#1531)
1 parent c6d058c commit 562d7e2

14 files changed

Lines changed: 395 additions & 132 deletions

File tree

‎system-monitor-graph@rcassani/files/system-monitor-graph@rcassani/desklet.js‎

Lines changed: 30 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -293,8 +293,8 @@ SystemMonitorGraph.prototype = {
293293
let down_speed_formatted = this.format_network_speed(this.net_down_speed);
294294
let up_speed_formatted = this.format_network_speed(this.net_up_speed);
295295

296-
text2 = "↓ " + down_speed_formatted;
297-
text3 = "↑ " + up_speed_formatted;
296+
text2 = "";
297+
text3 = "↓ " + down_speed_formatted + " ↑ " + up_speed_formatted;
298298
break;
299299
}
300300

@@ -389,19 +389,11 @@ SystemMonitorGraph.prototype = {
389389
Math.round((2.5 * unit_size) - this.text2.get_height())
390390
);
391391
this.text3.set_text(text3);
392-
if (this.type !== "network") {
393-
this.text3.style = "font-size: " + text3_size + "px;"
394-
+ "color: " + this.text_color + ";";
395-
this.text3.set_position(
396-
Math.round((21 * unit_size) - this.text3.get_width()),
397-
Math.round((2.5 * unit_size) - this.text3.get_height()));
398-
} else {
399-
this.text3.style = "font-size: " + text2_size + "px;"
400-
+ "color: " + this.text_color + ";";
401-
this.text3.set_position(
402-
Math.round(this.text1.get_width() + (9 * unit_size)),
403-
Math.round((2.5 * unit_size) - this.text3.get_height()));
404-
}
392+
this.text3.style = "font-size: " + text3_size + "px;"
393+
+ "color: " + this.text_color + ";";
394+
this.text3.set_position(
395+
Math.round((21 * unit_size) - this.text3.get_width()),
396+
Math.round((2.5 * unit_size) - this.text3.get_height()));
405397

406398

407399
// update canvas
@@ -522,15 +514,34 @@ SystemMonitorGraph.prototype = {
522514
format_network_speed: function(speed_bytes_per_sec) {
523515
// Enhanced error handling for speed formatting
524516
if (!speed_bytes_per_sec || isNaN(speed_bytes_per_sec) || !isFinite(speed_bytes_per_sec) || speed_bytes_per_sec < 0) {
525-
return "0 " + _("B") + "/s";
517+
if (this.data_prefix_network == 2) {
518+
return "0 " + _("b") + "/s";
519+
} else {
520+
return "0 " + _("B") + "/s";
521+
}
526522
}
527523

528524
// Convert bytes per second to appropriate units
529525
let speed = speed_bytes_per_sec;
530526
let unit = "";
531527

532-
if (this.data_prefix_network == 1) {
533-
// Decimal prefix (1000-based)
528+
if (this.data_prefix_network == 2) {
529+
// Decimal prefix (1000-based) bit
530+
speed = speed * 8;
531+
if (speed >= 1000000000) {
532+
speed = speed / 1000000000;
533+
unit = _("Gb") + "/s";
534+
} else if (speed >= 1000000) {
535+
speed = speed / 1000000;
536+
unit = _("Mb") + "/s";
537+
} else if (speed >= 1000) {
538+
speed = speed / 1000;
539+
unit = _("Kb") + "/s";
540+
} else {
541+
unit = _("b") + "/s";
542+
}
543+
} else if (this.data_prefix_network == 1) {
544+
// Decimal prefix (1000-based) bytes
534545
if (speed >= 1000000000) {
535546
speed = speed / 1000000000;
536547
unit = _("GB") + "/s";
@@ -544,7 +555,7 @@ SystemMonitorGraph.prototype = {
544555
unit = _("B") + "/s";
545556
}
546557
} else {
547-
// Binary prefix (1024-based)
558+
// Binary prefix (1024-based) bytes
548559
if (speed >= 1073741824) { // 1024^3
549560
speed = speed / 1073741824;
550561
unit = _("GiB") + "/s";

‎system-monitor-graph@rcassani/files/system-monitor-graph@rcassani/po/ca.po‎

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-desklets/"
1010
"issues\n"
11-
"POT-Creation-Date: 2025-07-05 08:35-0400\n"
11+
"POT-Creation-Date: 2025-08-01 22:18-0400\n"
1212
"PO-Revision-Date: 2023-08-04 22:51+0200\n"
1313
"Last-Translator: Daniel <d3vf4n@tutanota.com>\n"
1414
"Language-Team: \n"
@@ -24,11 +24,11 @@ msgstr ""
2424
msgid "CPU"
2525
msgstr "CPU"
2626

27-
#. desklet.js:194 desklet.js:212 desklet.js:232 desklet.js:273 desklet.js:536
27+
#. desklet.js:194 desklet.js:212 desklet.js:232 desklet.js:273 desklet.js:547
2828
msgid "GB"
2929
msgstr "GB"
3030

31-
#. desklet.js:197 desklet.js:215 desklet.js:235 desklet.js:276 desklet.js:550
31+
#. desklet.js:197 desklet.js:215 desklet.js:235 desklet.js:276 desklet.js:561
3232
msgid "GiB"
3333
msgstr "GiB"
3434

@@ -59,25 +59,41 @@ msgstr "Memòria de la GPU"
5959
msgid "Network"
6060
msgstr ""
6161

62-
#. desklet.js:525 desklet.js:544 desklet.js:558
62+
#. desklet.js:518 desklet.js:541
63+
msgid "b"
64+
msgstr ""
65+
66+
#. desklet.js:520 desklet.js:555 desklet.js:569
6367
#, fuzzy
6468
msgid "B"
6569
msgstr "GB"
6670

71+
#. desklet.js:533
72+
msgid "Gb"
73+
msgstr ""
74+
75+
#. desklet.js:536
76+
msgid "Mb"
77+
msgstr ""
78+
6779
#. desklet.js:539
80+
msgid "Kb"
81+
msgstr ""
82+
83+
#. desklet.js:550
6884
msgid "MB"
6985
msgstr ""
7086

71-
#. desklet.js:542
87+
#. desklet.js:553
7288
msgid "KB"
7389
msgstr ""
7490

75-
#. desklet.js:553
91+
#. desklet.js:564
7692
#, fuzzy
7793
msgid "MiB"
7894
msgstr "GiB"
7995

80-
#. desklet.js:556
96+
#. desklet.js:567
8197
#, fuzzy
8298
msgid "KiB"
8399
msgstr "GiB"
@@ -152,12 +168,17 @@ msgstr "Prefix de la unitat de mesura del sistema de fitxers."
152168

153169
#. settings-schema.json->data-prefix-network->options
154170
#, fuzzy
155-
msgid "Binary prefix or IEC (1 KiB = 1024 bytes)"
171+
msgid "Bytes - Binary prefix or IEC (1 KiB = 1024 bytes)"
156172
msgstr "Prefix binari o de l'IEC (1GiB = 1024³ octets)"
157173

158174
#. settings-schema.json->data-prefix-network->options
159175
#, fuzzy
160-
msgid "Decimal prefix (1 KB = 1000 bytes)"
176+
msgid "Bytes - Decimal prefix (1 KB = 1000 bytes)"
177+
msgstr "Prefix decimal (1 GB = 1000³ octets)"
178+
179+
#. settings-schema.json->data-prefix-network->options
180+
#, fuzzy
181+
msgid "Bits - Decimal prefix (1 Kb = 1000 bits)"
161182
msgstr "Prefix decimal (1 GB = 1000³ octets)"
162183

163184
#. settings-schema.json->data-prefix-network->tooltip

‎system-monitor-graph@rcassani/files/system-monitor-graph@rcassani/po/da.po‎

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-desklets/"
1010
"issues\n"
11-
"POT-Creation-Date: 2025-07-05 08:35-0400\n"
11+
"POT-Creation-Date: 2025-08-01 22:18-0400\n"
1212
"PO-Revision-Date: 2023-12-08 07:51+0100\n"
1313
"Last-Translator: Alan Mortensen <alanmortensen.am@gmail.com>\n"
1414
"Language-Team: \n"
@@ -24,11 +24,11 @@ msgstr ""
2424
msgid "CPU"
2525
msgstr "CPU"
2626

27-
#. desklet.js:194 desklet.js:212 desklet.js:232 desklet.js:273 desklet.js:536
27+
#. desklet.js:194 desklet.js:212 desklet.js:232 desklet.js:273 desklet.js:547
2828
msgid "GB"
2929
msgstr "GB"
3030

31-
#. desklet.js:197 desklet.js:215 desklet.js:235 desklet.js:276 desklet.js:550
31+
#. desklet.js:197 desklet.js:215 desklet.js:235 desklet.js:276 desklet.js:561
3232
msgid "GiB"
3333
msgstr "GiB"
3434

@@ -59,25 +59,41 @@ msgstr "GPU-hukommelse"
5959
msgid "Network"
6060
msgstr ""
6161

62-
#. desklet.js:525 desklet.js:544 desklet.js:558
62+
#. desklet.js:518 desklet.js:541
63+
msgid "b"
64+
msgstr ""
65+
66+
#. desklet.js:520 desklet.js:555 desklet.js:569
6367
#, fuzzy
6468
msgid "B"
6569
msgstr "GB"
6670

71+
#. desklet.js:533
72+
msgid "Gb"
73+
msgstr ""
74+
75+
#. desklet.js:536
76+
msgid "Mb"
77+
msgstr ""
78+
6779
#. desklet.js:539
80+
msgid "Kb"
81+
msgstr ""
82+
83+
#. desklet.js:550
6884
msgid "MB"
6985
msgstr ""
7086

71-
#. desklet.js:542
87+
#. desklet.js:553
7288
msgid "KB"
7389
msgstr ""
7490

75-
#. desklet.js:553
91+
#. desklet.js:564
7692
#, fuzzy
7793
msgid "MiB"
7894
msgstr "GiB"
7995

80-
#. desklet.js:556
96+
#. desklet.js:567
8197
#, fuzzy
8298
msgid "KiB"
8399
msgstr "GiB"
@@ -150,12 +166,17 @@ msgstr "Enhedspræfiks for filsystemstørrelse."
150166

151167
#. settings-schema.json->data-prefix-network->options
152168
#, fuzzy
153-
msgid "Binary prefix or IEC (1 KiB = 1024 bytes)"
169+
msgid "Bytes - Binary prefix or IEC (1 KiB = 1024 bytes)"
154170
msgstr "Binært præfiks eller IEC (1 GiB = 1024³ bytes)"
155171

156172
#. settings-schema.json->data-prefix-network->options
157173
#, fuzzy
158-
msgid "Decimal prefix (1 KB = 1000 bytes)"
174+
msgid "Bytes - Decimal prefix (1 KB = 1000 bytes)"
175+
msgstr "Decimalpræfiks (1 GB = 1000³ bytes)"
176+
177+
#. settings-schema.json->data-prefix-network->options
178+
#, fuzzy
179+
msgid "Bits - Decimal prefix (1 Kb = 1000 bits)"
159180
msgstr "Decimalpræfiks (1 GB = 1000³ bytes)"
160181

161182
#. settings-schema.json->data-prefix-network->tooltip

‎system-monitor-graph@rcassani/files/system-monitor-graph@rcassani/po/de.po‎

Lines changed: 33 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-desklets/"
1010
"issues\n"
11-
"POT-Creation-Date: 2025-07-05 08:35-0400\n"
11+
"POT-Creation-Date: 2025-08-01 22:18-0400\n"
1212
"PO-Revision-Date: 2022-04-17 18:13+0100\n"
1313
"Last-Translator: Georg Sieber\n"
1414
"Language-Team: \n"
@@ -22,11 +22,11 @@ msgstr ""
2222
msgid "CPU"
2323
msgstr "CPU"
2424

25-
#. desklet.js:194 desklet.js:212 desklet.js:232 desklet.js:273 desklet.js:536
25+
#. desklet.js:194 desklet.js:212 desklet.js:232 desklet.js:273 desklet.js:547
2626
msgid "GB"
2727
msgstr "GB"
2828

29-
#. desklet.js:197 desklet.js:215 desklet.js:235 desklet.js:276 desklet.js:550
29+
#. desklet.js:197 desklet.js:215 desklet.js:235 desklet.js:276 desklet.js:561
3030
msgid "GiB"
3131
msgstr "GiB"
3232

@@ -57,25 +57,41 @@ msgstr "GPU-Speicher"
5757
msgid "Network"
5858
msgstr ""
5959

60-
#. desklet.js:525 desklet.js:544 desklet.js:558
60+
#. desklet.js:518 desklet.js:541
61+
msgid "b"
62+
msgstr ""
63+
64+
#. desklet.js:520 desklet.js:555 desklet.js:569
6165
#, fuzzy
6266
msgid "B"
6367
msgstr "GB"
6468

69+
#. desklet.js:533
70+
msgid "Gb"
71+
msgstr ""
72+
73+
#. desklet.js:536
74+
msgid "Mb"
75+
msgstr ""
76+
6577
#. desklet.js:539
78+
msgid "Kb"
79+
msgstr ""
80+
81+
#. desklet.js:550
6682
msgid "MB"
6783
msgstr ""
6884

69-
#. desklet.js:542
85+
#. desklet.js:553
7086
msgid "KB"
7187
msgstr ""
7288

73-
#. desklet.js:553
89+
#. desklet.js:564
7490
#, fuzzy
7591
msgid "MiB"
7692
msgstr "GiB"
7793

78-
#. desklet.js:556
94+
#. desklet.js:567
7995
#, fuzzy
8096
msgid "KiB"
8197
msgstr "GiB"
@@ -148,12 +164,17 @@ msgstr "Einheiten-Präfix für Dateisystem-Größe."
148164

149165
#. settings-schema.json->data-prefix-network->options
150166
#, fuzzy
151-
msgid "Binary prefix or IEC (1 KiB = 1024 bytes)"
167+
msgid "Bytes - Binary prefix or IEC (1 KiB = 1024 bytes)"
152168
msgstr "Binär bzw. IEC (1 GiB = 1024³ Bytes)"
153169

154170
#. settings-schema.json->data-prefix-network->options
155171
#, fuzzy
156-
msgid "Decimal prefix (1 KB = 1000 bytes)"
172+
msgid "Bytes - Decimal prefix (1 KB = 1000 bytes)"
173+
msgstr "Dezimal (1 GB = 1000³ Bytes)"
174+
175+
#. settings-schema.json->data-prefix-network->options
176+
#, fuzzy
177+
msgid "Bits - Decimal prefix (1 Kb = 1000 bits)"
157178
msgstr "Dezimal (1 GB = 1000³ Bytes)"
158179

159180
#. settings-schema.json->data-prefix-network->tooltip
@@ -164,7 +185,7 @@ msgstr "Einheiten-Präfix für Swap-Größe."
164185
#. settings-schema.json->network-interface->description
165186
#, fuzzy
166187
msgid "Network interface to monitor"
167-
msgstr "Wählen Sie die anzuzeigende GPU-Variable."
188+
msgstr "Zu überwachendes Netzwerkinterface"
168189

169190
#. settings-schema.json->network-interface->tooltip
170191
msgid ""
@@ -348,12 +369,12 @@ msgstr "GPU-Linienfarbe"
348369
#. settings-schema.json->line-color-network-down->description
349370
#, fuzzy
350371
msgid "Line color Network Download"
351-
msgstr "Swap-Linienfarbe"
372+
msgstr "Netzwerk-Download-Linienfarbe"
352373

353374
#. settings-schema.json->line-color-network-up->description
354375
#, fuzzy
355376
msgid "Line color Network Upload"
356-
msgstr "Swap-Linienfarbe"
377+
msgstr "Netzwerk-Upload-Linienfarbe"
357378

358379
#. settings-schema.json->midline-color->description
359380
msgid "Grid color"

0 commit comments

Comments
 (0)