Skip to content

Commit 756ab91

Browse files
ryonakanostsdc
ryonakano
authored and
stsdc
committed
Move references to dbusclient into DisplayWidget as possible
1 parent 6d81eb9 commit 756ab91

File tree

2 files changed

+63
-57
lines changed

2 files changed

+63
-57
lines changed

‎src/Indicator/Indicator.vala‎

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -28,66 +28,9 @@ public class Monitor.Indicator : Wingpanel.Indicator {
2828
dbusclient.monitor_vanished.connect (() => this.visible = false);
2929
dbusclient.monitor_appeared.connect (() => {
3030
this.visible = settings.get_boolean ("indicator-state");
31-
display_widget.cpu_widget.visible = settings.get_boolean ("indicator-cpu-state");
32-
display_widget.cpu_frequency_widget.visible = settings.get_boolean ("indicator-cpu-frequency-state");
33-
display_widget.cpu_temperature_widget.visible = settings.get_boolean ("indicator-cpu-temperature-state");
34-
display_widget.memory_widget.visible = settings.get_boolean ("indicator-memory-state");
35-
display_widget.network_up_widget.visible = settings.get_boolean ("indicator-network-upload-state");
36-
display_widget.network_down_widget.visible = settings.get_boolean ("indicator-network-download-state");
37-
display_widget.gpu_widget.visible = settings.get_boolean ("indicator-gpu-state");
38-
display_widget.gpu_memory_widget.visible = settings.get_boolean ("indicator-gpu-memory-state");
39-
display_widget.gpu_temperature_widget.visible = settings.get_boolean ("indicator-gpu-temperature-state");
40-
4131
});
4232

4333
dbusclient.interface.indicator_state.connect ((state) => this.visible = state);
44-
dbusclient.interface.indicator_cpu_state.connect ((state) => display_widget.cpu_widget.visible = state);
45-
dbusclient.interface.indicator_cpu_frequency_state.connect ((state) => display_widget.cpu_frequency_widget.visible = state);
46-
dbusclient.interface.indicator_cpu_temperature_state.connect ((state) => display_widget.cpu_temperature_widget.visible = state);
47-
dbusclient.interface.indicator_memory_state.connect ((state) => display_widget.memory_widget.visible = state);
48-
dbusclient.interface.indicator_network_up_state.connect ((state) => display_widget.network_up_widget.visible = state);
49-
dbusclient.interface.indicator_network_down_state.connect ((state) => display_widget.network_down_widget.visible = state);
50-
dbusclient.interface.indicator_gpu_state.connect ((state) => display_widget.gpu_widget.visible = state);
51-
dbusclient.interface.indicator_gpu_memory_state.connect ((state) => display_widget.gpu_memory_widget.visible = state);
52-
dbusclient.interface.indicator_gpu_temperature_state.connect ((state) => display_widget.gpu_temperature_widget.visible = state);
53-
54-
dbusclient.interface.update.connect ((sysres) => {
55-
var cpu_percentage = Value (typeof (uint));
56-
cpu_percentage.set_uint (sysres.cpu_percentage);
57-
display_widget.cpu_widget.update_label (cpu_percentage);
58-
59-
var cpu_frequency = Value (typeof (double));
60-
cpu_frequency.set_double (sysres.cpu_frequency);
61-
display_widget.cpu_frequency_widget.update_label (cpu_frequency);
62-
63-
var cpu_temperature = Value (typeof (int));
64-
cpu_temperature.set_int ((int) Math.round (sysres.cpu_temperature));
65-
display_widget.cpu_temperature_widget.update_label (cpu_temperature);
66-
67-
var memory_percentage = Value (typeof (uint));
68-
memory_percentage.set_uint (sysres.memory_percentage);
69-
display_widget.memory_widget.update_label (memory_percentage);
70-
71-
var network_up = Value (typeof (uint64));
72-
network_up.set_uint64 (sysres.network_up);
73-
display_widget.network_up_widget.update_label (network_up);
74-
75-
var network_down = Value (typeof (uint64));
76-
network_down.set_uint64 (sysres.network_down);
77-
display_widget.network_down_widget.update_label (network_down);
78-
79-
var gpu_percentage = Value (typeof (uint));
80-
gpu_percentage.set_uint (sysres.gpu_percentage);
81-
display_widget.gpu_widget.update_label (gpu_percentage);
82-
83-
var gpu_memory_percentage = Value (typeof (uint));
84-
gpu_memory_percentage.set_uint (sysres.gpu_memory_percentage);
85-
display_widget.gpu_memory_widget.update_label (gpu_memory_percentage);
86-
87-
var gpu_temperature = Value (typeof (int));
88-
gpu_temperature.set_int ((int) Math.round (sysres.gpu_temperature));
89-
display_widget.gpu_temperature_widget.update_label (gpu_temperature);
90-
});
9134

9235
popover_widget.quit_monitor.connect (() => {
9336
try {

‎src/Indicator/Widgets/DisplayWidget.vala‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,69 @@ public class Monitor.Widgets.DisplayWidget : Gtk.Grid {
2020
construct {
2121
valign = Gtk.Align.CENTER;
2222

23+
var settings = new Settings ("io.elementary.monitor.settings");
24+
unowned var dbusclient = DBusClient.get_default ();
25+
26+
dbusclient.monitor_appeared.connect (() => {
27+
cpu_widget.visible = settings.get_boolean ("indicator-cpu-state");
28+
cpu_frequency_widget.visible = settings.get_boolean ("indicator-cpu-frequency-state");
29+
cpu_temperature_widget.visible = settings.get_boolean ("indicator-cpu-temperature-state");
30+
memory_widget.visible = settings.get_boolean ("indicator-memory-state");
31+
network_up_widget.visible = settings.get_boolean ("indicator-network-upload-state");
32+
network_down_widget.visible = settings.get_boolean ("indicator-network-download-state");
33+
gpu_widget.visible = settings.get_boolean ("indicator-gpu-state");
34+
gpu_memory_widget.visible = settings.get_boolean ("indicator-gpu-memory-state");
35+
gpu_temperature_widget.visible = settings.get_boolean ("indicator-gpu-temperature-state");
36+
});
37+
38+
dbusclient.interface.indicator_cpu_state.connect ((state) => cpu_widget.visible = state);
39+
dbusclient.interface.indicator_cpu_frequency_state.connect ((state) => cpu_frequency_widget.visible = state);
40+
dbusclient.interface.indicator_cpu_temperature_state.connect ((state) => cpu_temperature_widget.visible = state);
41+
dbusclient.interface.indicator_memory_state.connect ((state) => memory_widget.visible = state);
42+
dbusclient.interface.indicator_network_up_state.connect ((state) => network_up_widget.visible = state);
43+
dbusclient.interface.indicator_network_down_state.connect ((state) => network_down_widget.visible = state);
44+
dbusclient.interface.indicator_gpu_state.connect ((state) => gpu_widget.visible = state);
45+
dbusclient.interface.indicator_gpu_memory_state.connect ((state) => gpu_memory_widget.visible = state);
46+
dbusclient.interface.indicator_gpu_temperature_state.connect ((state) => gpu_temperature_widget.visible = state);
47+
48+
dbusclient.interface.update.connect ((sysres) => {
49+
var cpu_percentage = Value (typeof (uint));
50+
cpu_percentage.set_uint (sysres.cpu_percentage);
51+
cpu_widget.update_label (cpu_percentage);
52+
53+
var cpu_frequency = Value (typeof (double));
54+
cpu_frequency.set_double (sysres.cpu_frequency);
55+
cpu_frequency_widget.update_label (cpu_frequency);
56+
57+
var cpu_temperature = Value (typeof (int));
58+
cpu_temperature.set_int ((int) Math.round (sysres.cpu_temperature));
59+
cpu_temperature_widget.update_label (cpu_temperature);
60+
61+
var memory_percentage = Value (typeof (uint));
62+
memory_percentage.set_uint (sysres.memory_percentage);
63+
memory_widget.update_label (memory_percentage);
64+
65+
var network_up = Value (typeof (uint64));
66+
network_up.set_uint64 (sysres.network_up);
67+
network_up_widget.update_label (network_up);
68+
69+
var network_down = Value (typeof (uint64));
70+
network_down.set_uint64 (sysres.network_down);
71+
network_down_widget.update_label (network_down);
72+
73+
var gpu_percentage = Value (typeof (uint));
74+
gpu_percentage.set_uint (sysres.gpu_percentage);
75+
gpu_widget.update_label (gpu_percentage);
76+
77+
var gpu_memory_percentage = Value (typeof (uint));
78+
gpu_memory_percentage.set_uint (sysres.gpu_memory_percentage);
79+
gpu_memory_widget.update_label (gpu_memory_percentage);
80+
81+
var gpu_temperature = Value (typeof (int));
82+
gpu_temperature.set_int ((int) Math.round (sysres.gpu_temperature));
83+
gpu_temperature_widget.update_label (gpu_temperature);
84+
});
85+
2386
add (cpu_widget);
2487
add (cpu_frequency_widget);
2588
add (cpu_temperature_widget);

0 commit comments

Comments
 (0)