Skip to content

Commit 3b32dec

Browse files
0ry0n0ry0n
authoredOct 28, 2024
New version (#96)
- Removed deprecated TreeView component. - Added custom peripheral name support. - Adjusted width with scale factor for better sizing. - Enhanced UI for improved user experience. - Other bug fixes.
·
2524
1 parent 46a111f commit 3b32dec

File tree

4 files changed

+2120
-1937
lines changed

4 files changed

+2120
-1937
lines changed
 

‎README.md

+7
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,13 @@ To report issues or request features, please use the [GitHub Issues](../../issue
5050

5151
## Change Log
5252

53+
**Version 24 (Oct 28, 2024)**
54+
- Removed deprecated TreeView component.
55+
- Added custom peripheral name support.
56+
- Adjusted width with scale factor for better sizing.
57+
- Enhanced UI for improved user experience.
58+
- Other bug fixes.
59+
5360
**Version 23 (Oct 18, 2024)**
5461
- Added support for GNOME 47.
5562
- Introduced memory alerts for RAM and SWAP usage to enhance monitoring capabilities.

‎Resource_Monitor@Ory0n/extension.js

+155-77
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,28 @@ const ResourceMonitor = GObject.registerClass(
133133
this._path = path;
134134
this._metadata = metadata;
135135

136+
this._themeContext = St.ThemeContext.get_for_stage(global.stage);
137+
this._scaleFactor = 1;
138+
this._themeContextHandlerId = this._themeContext.connect('notify::scale-factor', () => {
139+
this._onScaleFactorChanged();
140+
141+
console.error(`Resource ${this._scaleFactor}`)
142+
143+
this._cpuWidthChanged();
144+
this._cpuFrequencyWidthChanged();
145+
this._cpuLoadAverageWidthChanged();
146+
this._ramWidthChanged();
147+
this._swapWidthChanged();
148+
this._diskStatsWidthChanged();
149+
this._diskSpaceWidthChanged();
150+
this._netEthWidthChanged();
151+
this._netWlanWidthChanged();
152+
this._thermalCpuTemperatureWidthChanged();
153+
this._thermalGpuTemperatureWidthChanged();
154+
this._gpuWidthChanged()
155+
});
156+
this._onScaleFactorChanged();
157+
136158
// Variables
137159
this._handlerIds = [];
138160
this._handlerIdsCount = 0;
@@ -240,6 +262,8 @@ const ResourceMonitor = GObject.registerClass(
240262
this._handlerIds[i] = 0;
241263
}
242264

265+
this.themeContext.disconnect(this._themeContextHandlerId);
266+
243267
super.destroy();
244268
}
245269

@@ -340,19 +364,25 @@ const ResourceMonitor = GObject.registerClass(
340364
y_align: Clutter.ActorAlign.CENTER,
341365
text: "--",
342366
});
343-
this._cpuValue.set_style("text-align: right;");
367+
this._cpuValue.clutter_text.set({
368+
x_align: Clutter.ActorAlign.END,
369+
});
344370

345371
this._ramValue = new St.Label({
346372
y_align: Clutter.ActorAlign.CENTER,
347373
text: "--",
348374
});
349-
this._ramValue.set_style("text-align: right;");
375+
this._ramValue.clutter_text.set({
376+
x_align: Clutter.ActorAlign.END,
377+
});
350378

351379
this._swapValue = new St.Label({
352380
y_align: Clutter.ActorAlign.CENTER,
353381
text: "--",
354382
});
355-
this._swapValue.set_style("text-align: right;");
383+
this._swapValue.clutter_text.set({
384+
x_align: Clutter.ActorAlign.END,
385+
});
356386

357387
this._diskStatsBox = new DiskContainerStats();
358388
this._diskSpaceBox = new DiskContainerSpace();
@@ -361,39 +391,65 @@ const ResourceMonitor = GObject.registerClass(
361391
y_align: Clutter.ActorAlign.CENTER,
362392
text: "--|--",
363393
});
364-
this._ethValue.set_style("text-align: right;");
394+
this._ethValue.clutter_text.set({
395+
x_align: Clutter.ActorAlign.END,
396+
});
365397

366398
this._wlanValue = new St.Label({
367399
y_align: Clutter.ActorAlign.CENTER,
368400
text: "--|--",
369401
});
370-
this._wlanValue.set_style("text-align: right;");
402+
this._wlanValue.clutter_text.set({
403+
x_align: Clutter.ActorAlign.END,
404+
});
371405

406+
this._cpuTemperatureBracketStart = new St.Label({
407+
y_align: Clutter.ActorAlign.CENTER,
408+
text: "[",
409+
});
372410
this._cpuTemperatureValue = new St.Label({
373411
y_align: Clutter.ActorAlign.CENTER,
374-
text: "[--",
412+
text: "--",
375413
});
376-
this._cpuTemperatureValueBracket = new St.Label({
414+
this._cpuTemperatureValue.clutter_text.set({
415+
x_align: Clutter.ActorAlign.END,
416+
});
417+
this._cpuTemperatureBracketEnd = new St.Label({
377418
y_align: Clutter.ActorAlign.CENTER,
378419
text: "]",
379420
});
380-
this._cpuTemperatureValue.set_style("text-align: right;");
381421

422+
this._cpuFrequencyBracketStart = new St.Label({
423+
y_align: Clutter.ActorAlign.CENTER,
424+
text: "[",
425+
});
382426
this._cpuFrequencyValue = new St.Label({
383427
y_align: Clutter.ActorAlign.CENTER,
384-
text: "[--",
428+
text: "--",
429+
});
430+
this._cpuFrequencyValue.clutter_text.set({
431+
x_align: Clutter.ActorAlign.END,
385432
});
386-
this._cpuFrequencyValueBracket = new St.Label({
433+
this._cpuFrequencyBracketEnd = new St.Label({
387434
y_align: Clutter.ActorAlign.CENTER,
388435
text: "]",
389436
});
390-
this._cpuFrequencyValue.set_style("text-align: right;");
391437

438+
this._cpuLoadAverageBracketStart = new St.Label({
439+
y_align: Clutter.ActorAlign.CENTER,
440+
text: "[",
441+
});
392442
this._cpuLoadAverageValue = new St.Label({
393443
y_align: Clutter.ActorAlign.CENTER,
394-
text: "[--]",
444+
text: "--",
445+
});
446+
this._cpuLoadAverageValue.clutter_text.set({
447+
x_align: Clutter.ActorAlign.END,
448+
});
449+
this._cpuLoadAverageBracketEnd = new St.Label({
450+
y_align: Clutter.ActorAlign.CENTER,
451+
text: "]",
395452
});
396-
this._cpuLoadAverageValue.set_style("text-align: right;");
397453

398454
this._gpuBox = new GpuContainer();
399455
}
@@ -411,13 +467,17 @@ const ResourceMonitor = GObject.registerClass(
411467
this._box.add_child(this._cpuValue);
412468
this._box.add_child(this._cpuUnit);
413469

470+
this._box.add_child(this._cpuTemperatureBracketStart);
414471
this._box.add_child(this._cpuTemperatureValue);
415472
this._box.add_child(this._cpuTemperatureUnit);
416-
this._box.add_child(this._cpuTemperatureValueBracket);
473+
this._box.add_child(this._cpuTemperatureBracketEnd);
474+
this._box.add_child(this._cpuFrequencyBracketStart);
417475
this._box.add_child(this._cpuFrequencyValue);
418476
this._box.add_child(this._cpuFrequencyUnit);
419-
this._box.add_child(this._cpuFrequencyValueBracket);
477+
this._box.add_child(this._cpuFrequencyBracketEnd);
478+
this._box.add_child(this._cpuLoadAverageBracketStart);
420479
this._box.add_child(this._cpuLoadAverageValue);
480+
this._box.add_child(this._cpuLoadAverageBracketEnd);
421481

422482
break;
423483

@@ -483,13 +543,17 @@ const ResourceMonitor = GObject.registerClass(
483543
this._box.add_child(this._cpuValue);
484544
this._box.add_child(this._cpuUnit);
485545

546+
this._box.add_child(this._cpuTemperatureBracketStart);
486547
this._box.add_child(this._cpuTemperatureValue);
487548
this._box.add_child(this._cpuTemperatureUnit);
488-
this._box.add_child(this._cpuTemperatureValueBracket);
549+
this._box.add_child(this._cpuTemperatureBracketEnd);
550+
this._box.add_child(this._cpuFrequencyBracketStart);
489551
this._box.add_child(this._cpuFrequencyValue);
490552
this._box.add_child(this._cpuFrequencyUnit);
491-
this._box.add_child(this._cpuFrequencyValueBracket);
553+
this._box.add_child(this._cpuFrequencyBracketEnd);
554+
this._box.add_child(this._cpuLoadAverageBracketStart);
492555
this._box.add_child(this._cpuLoadAverageValue);
556+
this._box.add_child(this._cpuLoadAverageBracketEnd);
493557
this._box.add_child(this._cpuIcon);
494558

495559
break;
@@ -564,23 +628,23 @@ const ResourceMonitor = GObject.registerClass(
564628
this._itemsPosition = this._settings.get_strv(ITEMS_POSITION);
565629

566630
this._cpuStatus = this._settings.get_boolean(CPU_STATUS);
567-
this._cpuWidth = this._settings.get_int(CPU_WIDTH);
631+
this._cpuWidth = this._settings.get_int(CPU_WIDTH) * this._scaleFactor;
568632
this._cpuColors = this._settings.get_strv(CPU_COLORS);
569633
this._cpuFrequencyStatus =
570634
this._settings.get_boolean(CPU_FREQUENCY_STATUS);
571-
this._cpuFrequencyWidth = this._settings.get_int(CPU_FREQUENCY_WIDTH);
635+
this._cpuFrequencyWidth = this._settings.get_int(CPU_FREQUENCY_WIDTH) * this._scaleFactor;
572636
this._cpuFrequencyColors = this._settings.get_strv(CPU_FREQUENCY_COLORS);
573637
this._cpuFrequencyUnitMeasure = this._settings.get_string(
574638
CPU_FREQUENCY_UNIT_MEASURE
575639
);
576640
this._cpuLoadAverageStatus = this._settings.get_boolean(
577641
CPU_LOADAVERAGE_STATUS
578642
);
579-
this._cpuLoadAverageWidth = this._settings.get_int(CPU_LOADAVERAGE_WIDTH);
643+
this._cpuLoadAverageWidth = this._settings.get_int(CPU_LOADAVERAGE_WIDTH) * this._scaleFactor;
580644
this._cpuLoadAverageColors = this._settings.get_strv(CPU_LOADAVERAGE_COLORS);
581645

582646
this._ramStatus = this._settings.get_boolean(RAM_STATUS);
583-
this._ramWidth = this._settings.get_int(RAM_WIDTH);
647+
this._ramWidth = this._settings.get_int(RAM_WIDTH) * this._scaleFactor;
584648
this._ramColors = this._settings.get_strv(RAM_COLORS);
585649
this._ramUnitType = this._settings.get_string(RAM_UNIT);
586650
this._ramUnitMeasure = this._settings.get_string(RAM_UNIT_MEASURE);
@@ -589,7 +653,7 @@ const ResourceMonitor = GObject.registerClass(
589653
this._ramAlertThreshold = this._settings.get_int(RAM_ALERT_THRESHOLD);
590654

591655
this._swapStatus = this._settings.get_boolean(SWAP_STATUS);
592-
this._swapWidth = this._settings.get_int(SWAP_WIDTH);
656+
this._swapWidth = this._settings.get_int(SWAP_WIDTH) * this._scaleFactor;
593657
this._swapColors = this._settings.get_strv(SWAP_COLORS);
594658
this._swapUnitType = this._settings.get_string(SWAP_UNIT);
595659
this._swapUnitMeasure = this._settings.get_string(SWAP_UNIT_MEASURE);
@@ -598,14 +662,14 @@ const ResourceMonitor = GObject.registerClass(
598662
this._swapAlertThreshold = this._settings.get_int(SWAP_ALERT_THRESHOLD);
599663

600664
this._diskStatsStatus = this._settings.get_boolean(DISK_STATS_STATUS);
601-
this._diskStatsWidth = this._settings.get_int(DISK_STATS_WIDTH);
665+
this._diskStatsWidth = this._settings.get_int(DISK_STATS_WIDTH) * this._scaleFactor;
602666
this._diskStatsColors = this._settings.get_strv(DISK_STATS_COLORS);
603667
this._diskStatsMode = this._settings.get_string(DISK_STATS_MODE);
604668
this._diskStatsUnitMeasure = this._settings.get_string(
605669
DISK_STATS_UNIT_MEASURE
606670
);
607671
this._diskSpaceStatus = this._settings.get_boolean(DISK_SPACE_STATUS);
608-
this._diskSpaceWidth = this._settings.get_int(DISK_SPACE_WIDTH);
672+
this._diskSpaceWidth = this._settings.get_int(DISK_SPACE_WIDTH) * this._scaleFactor;
609673
this._diskSpaceColors = this._settings.get_strv(DISK_SPACE_COLORS);
610674
this._diskSpaceUnitType = this._settings.get_string(DISK_SPACE_UNIT);
611675
this._diskSpaceUnitMeasure = this._settings.get_string(
@@ -620,10 +684,10 @@ const ResourceMonitor = GObject.registerClass(
620684
this._netUnit = this._settings.get_string(NET_UNIT);
621685
this._netUnitMeasure = this._settings.get_string(NET_UNIT_MEASURE);
622686
this._netEthStatus = this._settings.get_boolean(NET_ETH_STATUS);
623-
this._netEthWidth = this._settings.get_int(NET_ETH_WIDTH);
687+
this._netEthWidth = this._settings.get_int(NET_ETH_WIDTH) * this._scaleFactor;
624688
this._netEthColors = this._settings.get_strv(NET_ETH_COLORS);
625689
this._netWlanStatus = this._settings.get_boolean(NET_WLAN_STATUS);
626-
this._netWlanWidth = this._settings.get_int(NET_WLAN_WIDTH);
690+
this._netWlanWidth = this._settings.get_int(NET_WLAN_WIDTH) * this._scaleFactor;
627691
this._netWlanColors = this._settings.get_strv(NET_WLAN_COLORS);
628692

629693
this._thermalTemperatureUnit = this._settings.get_string(
@@ -634,7 +698,7 @@ const ResourceMonitor = GObject.registerClass(
634698
);
635699
this._thermalCpuTemperatureWidth = this._settings.get_int(
636700
THERMAL_CPU_TEMPERATURE_WIDTH
637-
);
701+
) * this._scaleFactor;
638702
this._thermalCpuColors = this._settings.get_strv(THERMAL_CPU_COLORS);
639703
this._thermalCpuTemperatureDevicesList = this._settings.get_strv(
640704
THERMAL_CPU_TEMPERATURE_DEVICES_LIST
@@ -644,14 +708,14 @@ const ResourceMonitor = GObject.registerClass(
644708
);
645709
this._thermalGpuTemperatureWidth = this._settings.get_int(
646710
THERMAL_GPU_TEMPERATURE_WIDTH
647-
);
711+
) * this._scaleFactor;
648712
this._thermalGpuColors = this._settings.get_strv(THERMAL_GPU_COLORS);
649713
this._thermalGpuTemperatureDevicesList = this._settings.get_strv(
650714
THERMAL_GPU_TEMPERATURE_DEVICES_LIST
651715
);
652716

653717
this._gpuStatus = this._settings.get_boolean(GPU_STATUS);
654-
this._gpuWidth = this._settings.get_int(GPU_WIDTH);
718+
this._gpuWidth = this._settings.get_int(GPU_WIDTH) * this._scaleFactor;
655719
this._gpuColors = this._settings.get_strv(GPU_COLORS);
656720
this._gpuMemoryColors = this._settings.get_strv(GPU_MEMORY_COLORS);
657721
this._gpuMemoryUnitType = this._settings.get_string(GPU_MEMORY_UNIT);
@@ -966,6 +1030,10 @@ const ResourceMonitor = GObject.registerClass(
9661030
}
9671031

9681032
// HANDLERS
1033+
_onScaleFactorChanged() {
1034+
this._scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor
1035+
}
1036+
9691037
_clickManager(actor, event) {
9701038
switch (event.get_button()) {
9711039
case 3: // Right Click
@@ -1190,7 +1258,7 @@ const ResourceMonitor = GObject.registerClass(
11901258
_cpuWidthChanged() {
11911259
this._cpuWidth = this._settings.get_int(CPU_WIDTH);
11921260

1193-
this._basicItemWidth(this._cpuWidth, this._cpuValue);
1261+
this._basicItemWidth(this._cpuWidth * this._scaleFactor, this._cpuValue);
11941262
}
11951263

11961264
_cpuColorsChanged() {
@@ -1213,14 +1281,15 @@ const ResourceMonitor = GObject.registerClass(
12131281
this._cpuIcon,
12141282
this._cpuFrequencyValue,
12151283
this._cpuFrequencyUnit,
1216-
this._cpuFrequencyValueBracket
1284+
this._cpuFrequencyBracketStart,
1285+
this._cpuFrequencyBracketEnd
12171286
);
12181287
}
12191288

12201289
_cpuFrequencyWidthChanged() {
12211290
this._cpuFrequencyWidth = this._settings.get_int(CPU_FREQUENCY_WIDTH);
12221291

1223-
this._basicItemWidth(this._cpuFrequencyWidth, this._cpuFrequencyValue);
1292+
this._basicItemWidth(this._cpuFrequencyWidth * this._scaleFactor, this._cpuFrequencyValue);
12241293
}
12251294

12261295
_cpuFrequencyColorsChanged() {
@@ -1252,15 +1321,17 @@ const ResourceMonitor = GObject.registerClass(
12521321
!this._thermalCpuTemperatureStatus &&
12531322
!this._cpuFrequencyStatus,
12541323
this._cpuIcon,
1255-
this._cpuLoadAverageValue
1324+
this._cpuLoadAverageValue,
1325+
this._cpuLoadAverageBracketStart,
1326+
this._cpuLoadAverageBracketEnd
12561327
);
12571328
}
12581329

12591330
_cpuLoadAverageWidthChanged() {
12601331
this._cpuLoadAverageWidth = this._settings.get_int(CPU_LOADAVERAGE_WIDTH);
12611332

12621333
this._basicItemWidth(
1263-
this._cpuLoadAverageWidth,
1334+
this._cpuLoadAverageWidth * this._scaleFactor,
12641335
this._cpuLoadAverageValue
12651336
);
12661337
}
@@ -1288,7 +1359,7 @@ const ResourceMonitor = GObject.registerClass(
12881359
_ramWidthChanged() {
12891360
this._ramWidth = this._settings.get_int(RAM_WIDTH);
12901361

1291-
this._basicItemWidth(this._ramWidth, this._ramValue);
1362+
this._basicItemWidth(this._ramWidth * this._scaleFactor, this._ramValue);
12921363
}
12931364

12941365
_ramColorsChanged() {
@@ -1346,7 +1417,7 @@ const ResourceMonitor = GObject.registerClass(
13461417
_swapWidthChanged() {
13471418
this._swapWidth = this._settings.get_int(SWAP_WIDTH);
13481419

1349-
this._basicItemWidth(this._swapWidth, this._swapValue);
1420+
this._basicItemWidth(this._swapWidth * this._scaleFactor, this._swapValue);
13501421
}
13511422

13521423
_swapColorsChanged() {
@@ -1403,7 +1474,7 @@ const ResourceMonitor = GObject.registerClass(
14031474
_diskStatsWidthChanged() {
14041475
this._diskStatsWidth = this._settings.get_int(DISK_STATS_WIDTH);
14051476

1406-
this._diskStatsBox.set_element_width(this._diskStatsWidth);
1477+
this._diskStatsBox.set_element_width(this._diskStatsWidth * this._scaleFactor);
14071478
}
14081479

14091480
_diskStatsColorsChanged() {
@@ -1444,7 +1515,7 @@ const ResourceMonitor = GObject.registerClass(
14441515
_diskSpaceWidthChanged() {
14451516
this._diskSpaceWidth = this._settings.get_int(DISK_SPACE_WIDTH);
14461517

1447-
this._diskSpaceBox.set_element_width(this._diskSpaceWidth);
1518+
this._diskSpaceBox.set_element_width(this._diskSpaceWidth * this._scaleFactor);
14481519
}
14491520

14501521
_diskSpaceColorsChanged() {
@@ -1494,29 +1565,22 @@ const ResourceMonitor = GObject.registerClass(
14941565
const mountPoint = it[1];
14951566
const stats = it[2] === "true";
14961567
const space = it[3] === "true";
1497-
1498-
let label = "";
1499-
1500-
if (filesystem.match(/(\/\w+)+/)) {
1501-
label = filesystem.split("/").pop();
1502-
} else {
1503-
label = filesystem;
1504-
}
1568+
const displayName = it[4];
15051569

15061570
if (stats) {
1507-
this._diskStatsBox.add_element(filesystem, label);
1571+
this._diskStatsBox.add_element(filesystem, displayName);
15081572
}
15091573

15101574
if (space) {
1511-
this._diskSpaceBox.add_element(filesystem, label);
1575+
this._diskSpaceBox.add_element(filesystem, displayName);
15121576
}
15131577
});
15141578

15151579
this._diskStatsBox.add_single();
15161580
this._diskStatsBox.update_mode(this._diskStatsMode);
15171581

1518-
this._diskStatsBox.set_element_width(this._diskStatsWidth);
1519-
this._diskSpaceBox.set_element_width(this._diskSpaceWidth);
1582+
this._diskStatsBox.set_element_width(this._diskStatsWidth * this._scaleFactor);
1583+
this._diskSpaceBox.set_element_width(this._diskSpaceWidth * this._scaleFactor);
15201584
}
15211585

15221586
_netAutoHideStatusChanged() {
@@ -1580,7 +1644,7 @@ const ResourceMonitor = GObject.registerClass(
15801644
_netEthWidthChanged() {
15811645
this._netEthWidth = this._settings.get_int(NET_ETH_WIDTH);
15821646

1583-
this._basicItemWidth(this._netEthWidth, this._ethValue);
1647+
this._basicItemWidth(this._netEthWidth * this._scaleFactor, this._ethValue);
15841648
}
15851649

15861650
_netEthColorsChanged() {
@@ -1607,7 +1671,7 @@ const ResourceMonitor = GObject.registerClass(
16071671
_netWlanWidthChanged() {
16081672
this._netWlanWidth = this._settings.get_int(NET_WLAN_WIDTH);
16091673

1610-
this._basicItemWidth(this._netWlanWidth, this._wlanValue);
1674+
this._basicItemWidth(this._netWlanWidth * this._scaleFactor, this._wlanValue);
16111675
}
16121676

16131677
_netWlanColorsChanged() {
@@ -1631,7 +1695,8 @@ const ResourceMonitor = GObject.registerClass(
16311695
this._cpuIcon,
16321696
this._cpuTemperatureValue,
16331697
this._cpuTemperatureUnit,
1634-
this._cpuTemperatureValueBracket
1698+
this._cpuTemperatureBracketStart,
1699+
this._cpuTemperatureBracketEnd,
16351700
);
16361701
}
16371702

@@ -1641,7 +1706,7 @@ const ResourceMonitor = GObject.registerClass(
16411706
);
16421707

16431708
this._basicItemWidth(
1644-
this._thermalCpuTemperatureWidth,
1709+
this._thermalCpuTemperatureWidth * this._scaleFactor,
16451710
this._cpuTemperatureValue
16461711
);
16471712
}
@@ -1693,7 +1758,7 @@ const ResourceMonitor = GObject.registerClass(
16931758
THERMAL_GPU_TEMPERATURE_WIDTH
16941759
);
16951760

1696-
this._gpuBox.set_element_thermal_width(this._thermalGpuTemperatureWidth);
1761+
this._gpuBox.set_element_thermal_width(this._thermalGpuTemperatureWidth * this._scaleFactor);
16971762
}
16981763

16991764
_thermalGpuColorsChanged() {
@@ -1727,7 +1792,7 @@ const ResourceMonitor = GObject.registerClass(
17271792
_gpuWidthChanged() {
17281793
this._gpuWidth = this._settings.get_int(GPU_WIDTH);
17291794

1730-
this._gpuBox.set_element_width(this._gpuWidth);
1795+
this._gpuBox.set_element_width(this._gpuWidth * this._scaleFactor);
17311796
}
17321797

17331798
_gpuColorsChanged() {
@@ -1789,9 +1854,10 @@ const ResourceMonitor = GObject.registerClass(
17891854
const it = element.split(GPU_DEVICES_LIST_SEPARATOR);
17901855

17911856
const uuid = it[0];
1792-
const name = this._gpuDisplayDeviceName ? it[1] : null;
1857+
const name = it[1];
17931858
const usage = it[2] === "true" && this._gpuStatus;
17941859
const memory = it[3] === "true" && this._gpuStatus;
1860+
const displayName = this._gpuDisplayDeviceName ? it[4] : null
17951861
let thermal = false;
17961862

17971863
if (this._thermalGpuTemperatureStatus) {
@@ -1804,10 +1870,10 @@ const ResourceMonitor = GObject.registerClass(
18041870
});
18051871
}
18061872

1807-
this._gpuBox.add_element(uuid, name, usage, memory, thermal);
1873+
this._gpuBox.add_element(uuid, displayName, usage, memory, thermal);
18081874
});
18091875

1810-
this._gpuBox.set_element_width(this._gpuWidth);
1876+
this._gpuBox.set_element_width(this._gpuWidth * this._scaleFactor);
18111877
}
18121878

18131879
_refreshHandler() {
@@ -3052,9 +3118,9 @@ const ResourceMonitor = GObject.registerClass(
30523118
}
30533119

30543120
if (this._decimalsStatus) {
3055-
this._cpuFrequencyValue.text = `[${value.toFixed(2)}`;
3121+
this._cpuFrequencyValue.text = `${value.toFixed(2)}`;
30563122
} else {
3057-
this._cpuFrequencyValue.text = `[${value.toFixed(0)}`;
3123+
this._cpuFrequencyValue.text = `${value.toFixed(0)}`;
30583124
}
30593125
});
30603126
}
@@ -3083,7 +3149,7 @@ const ResourceMonitor = GObject.registerClass(
30833149
this._cpuLoadAverageValue.style = "";
30843150
}
30853151

3086-
this._cpuLoadAverageValue.text = "[" + l0 + " " + l1 + " " + l2 + "]";
3152+
this._cpuLoadAverageValue.text = `${l0} ${l1} ${l2}`;
30873153
});
30883154
}
30893155

@@ -3150,11 +3216,11 @@ const ResourceMonitor = GObject.registerClass(
31503216
}
31513217

31523218
if (this._decimalsStatus) {
3153-
this._cpuTemperatureValue.text = `[${this._cpuTemperatures.toFixed(
3219+
this._cpuTemperatureValue.text = `${this._cpuTemperatures.toFixed(
31543220
1
31553221
)}`;
31563222
} else {
3157-
this._cpuTemperatureValue.text = `[${this._cpuTemperatures.toFixed(
3223+
this._cpuTemperatureValue.text = `${this._cpuTemperatures.toFixed(
31583224
0
31593225
)}`;
31603226
}
@@ -3164,12 +3230,12 @@ const ResourceMonitor = GObject.registerClass(
31643230
}
31653231
});
31663232
} else {
3167-
this._cpuTemperatureValue.text = _("[Temperature Error");
3233+
this._cpuTemperatureValue.text = _("Temperature Error");
31683234
this._cpuTemperatureUnit.text = "";
31693235
}
31703236
}
31713237
} else {
3172-
this._cpuTemperatureValue.text = _("[--");
3238+
this._cpuTemperatureValue.text = _("--");
31733239
}
31743240
}
31753241

@@ -3337,7 +3403,7 @@ const ResourceMonitor = GObject.registerClass(
33373403
const item = this._gpuMemoryColors[i];
33383404
const values = item.split(COLOR_LIST_SEPARATOR);
33393405

3340-
if (usage <= parseFloat(values[0])) {
3406+
if (value <= parseFloat(values[0])) {
33413407
styleM = `color: rgb(${(parseFloat(values[1]) * 255).toFixed(0)}, ${(parseFloat(values[2]) * 255).toFixed(0)}, ${(parseFloat(values[3]) * 255).toFixed(0)});`;
33423408
break;
33433409
}
@@ -3352,7 +3418,7 @@ const ResourceMonitor = GObject.registerClass(
33523418
const item = this._thermalGpuColors[i];
33533419
const values = item.split(COLOR_LIST_SEPARATOR);
33543420

3355-
if (usage <= parseFloat(values[0])) {
3421+
if (valueT <= parseFloat(values[0])) {
33563422
styleT = `color: rgb(${(parseFloat(values[1]) * 255).toFixed(0)}, ${(parseFloat(values[2]) * 255).toFixed(0)}, ${(parseFloat(values[3]) * 255).toFixed(0)});`;
33573423
break;
33583424
}
@@ -3538,7 +3604,9 @@ const DiskContainerStats = GObject.registerClass(
35383604
y_align: Clutter.ActorAlign.CENTER,
35393605
text: "--|--",
35403606
});
3541-
this._elementsValue["single"].set_style("text-align: right;");
3607+
this._elementsValue["single"].clutter_text.set({
3608+
x_align: Clutter.ActorAlign.END,
3609+
});
35423610

35433611
this._elementsUnit["single"] = new St.Label({
35443612
y_align: Clutter.ActorAlign.CENTER,
@@ -3565,7 +3633,9 @@ const DiskContainerStats = GObject.registerClass(
35653633
y_align: Clutter.ActorAlign.CENTER,
35663634
text: "--|--",
35673635
});
3568-
this._elementsValue[filesystem].set_style("text-align: right;");
3636+
this._elementsValue[filesystem].clutter_text.set({
3637+
x_align: Clutter.ActorAlign.END,
3638+
});
35693639

35703640
this._elementsUnit[filesystem] = new St.Label({
35713641
y_align: Clutter.ActorAlign.CENTER,
@@ -3659,7 +3729,9 @@ const DiskContainerSpace = GObject.registerClass(
36593729
y_align: Clutter.ActorAlign.CENTER,
36603730
text: "--",
36613731
});
3662-
this._elementsValue[filesystem].set_style("text-align: right;");
3732+
this._elementsValue[filesystem].clutter_text.set({
3733+
x_align: Clutter.ActorAlign.END,
3734+
});
36633735

36643736
this._elementsUnit[filesystem] = new St.Label({
36653737
y_align: Clutter.ActorAlign.CENTER,
@@ -3776,7 +3848,9 @@ const GpuContainer = GObject.registerClass(
37763848
y_align: Clutter.ActorAlign.CENTER,
37773849
text: "--",
37783850
});
3779-
this._elementsValue[uuid].set_style("text-align: right;");
3851+
this._elementsValue[uuid].clutter_text.set({
3852+
x_align: Clutter.ActorAlign.END,
3853+
});
37803854

37813855
this._elementsUnit[uuid] = new St.Label({
37823856
y_align: Clutter.ActorAlign.CENTER,
@@ -3806,7 +3880,9 @@ const GpuContainer = GObject.registerClass(
38063880
y_align: Clutter.ActorAlign.CENTER,
38073881
text: "--",
38083882
});
3809-
this._elementsMemoryValue[uuid].set_style("text-align: right;");
3883+
this._elementsMemoryValue[uuid].clutter_text.set({
3884+
x_align: Clutter.ActorAlign.END,
3885+
});
38103886

38113887
this._elementsMemoryUnit[uuid] = new St.Label({
38123888
y_align: Clutter.ActorAlign.CENTER,
@@ -3836,7 +3912,9 @@ const GpuContainer = GObject.registerClass(
38363912
y_align: Clutter.ActorAlign.CENTER,
38373913
text: "--",
38383914
});
3839-
this._elementsThermalValue[uuid].set_style("text-align: right;");
3915+
this._elementsThermalValue[uuid].clutter_text.set({
3916+
x_align: Clutter.ActorAlign.END,
3917+
});
38403918

38413919
this._elementsThermalUnit[uuid] = new St.Label({
38423920
y_align: Clutter.ActorAlign.CENTER,
@@ -3864,23 +3942,23 @@ const GpuContainer = GObject.registerClass(
38643942
update_element_value(uuid, value, unit, style = "") {
38653943
if (this._elementsValue[uuid]) {
38663944
this._elementsValue[uuid].text = value;
3867-
this._elementsValue[filesystem].style = style;
3945+
this._elementsValue[uuid].style = style;
38683946
this._elementsUnit[uuid].text = unit;
38693947
}
38703948
}
38713949

38723950
update_element_memory_value(uuid, value, unit, style = "") {
38733951
if (this._elementsMemoryValue[uuid]) {
38743952
this._elementsMemoryValue[uuid].text = value;
3875-
this._elementsValue[filesystem].style = style;
3953+
this._elementsMemoryValue[uuid].style = style;
38763954
this._elementsMemoryUnit[uuid].text = unit;
38773955
}
38783956
}
38793957

38803958
update_element_thermal_value(uuid, value, unit, style = "") {
38813959
if (this._elementsThermalValue[uuid]) {
38823960
this._elementsThermalValue[uuid].text = value;
3883-
this._elementsValue[filesystem].style = style;
3961+
this._elementsThermalValue[uuid].style = style;
38843962
this._elementsThermalUnit[uuid].text = unit;
38853963
}
38863964
}

‎Resource_Monitor@Ory0n/prefs.js

+539-385
Large diffs are not rendered by default.

‎Resource_Monitor@Ory0n/prefs.ui

+1,419-1,475
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)
Please sign in to comment.