[Xfce4-commits] [panel-plugins/xfce4-hardware-monitor-plugin] 01/03: Allow user to hide individual monitors from visualisation text overlay
noreply at xfce.org
noreply at xfce.org
Sat Dec 23 14:40:19 CET 2017
This is an automated email from the git hooks/post-receive script.
o m e g a p h i l p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository panel-plugins/xfce4-hardware-monitor-plugin.
commit e0ad7c3973305fdc6d4c72d86942a74d367b2b99
Author: OmegaPhil <OmegaPhil at startmail.com>
Date: Sat Dec 23 10:54:35 2017 +0000
Allow user to hide individual monitors from visualisation text overlay
Implements feature request in https://bugzilla.xfce.org/show_bug.cgi?id=14113
---
src/canvas-view.cpp | 12 +-
src/choose-monitor-window.cpp | 95 +++++++++++----
src/choose-monitor-window.hpp | 15 ++-
src/monitor-impls.cpp | 118 ++++++++++++-------
src/monitor-impls.hpp | 31 +++--
src/monitor.hpp | 12 +-
src/ui.glade | 260 ++++++++++++++++++++++++++++++++++++++++--
7 files changed, 447 insertions(+), 96 deletions(-)
diff --git a/src/canvas-view.cpp b/src/canvas-view.cpp
index 832b61c..dfccf96 100644
--- a/src/canvas-view.cpp
+++ b/src/canvas-view.cpp
@@ -278,8 +278,10 @@ std::list<std::pair<T*, double>> CanvasView::process_mon_maxes_text_overlay(
r != end; ++r)
{
/* With separating out the monitor curves based on type, the max and
- * units reported on can be correct */
- if (text_overlay_enabled)
+ * units reported on can be correct
+ * Only reporting on the monitor in the text overlay if configured to do
+ * so */
+ if (text_overlay_enabled && (*r)->monitor->add_to_text_overlay)
{
if (graph_max_needed && max_formatted.empty())
max_formatted += "Max:" + separator_string +
@@ -380,9 +382,9 @@ std::list<std::pair<T*, double>> CanvasView::process_mon_maxes_text_overlay(
else if (text_overlay->property_text() != overlay_text)
text_overlay->property_text() = overlay_text;
- /* Setting/fixing changed font and colour - doing it here since the CurveView
- * updates so frequently that its not worth also setting it directly from the
- * UI etc */
+ /* Setting/fixing changed font and colour - doing it here since the
+ * CanvasView updates so frequently that its not worth also setting it
+ * directly from the UI etc */
Glib::ustring font_details = plugin->get_viewer_text_overlay_font();
if (font_details.empty())
font_details = "Sans 8";
diff --git a/src/choose-monitor-window.cpp b/src/choose-monitor-window.cpp
index 42b7e4e..4d3aa90 100644
--- a/src/choose-monitor-window.cpp
+++ b/src/choose-monitor-window.cpp
@@ -87,6 +87,8 @@ ChooseMonitorWindow::ChooseMonitorWindow(Plugin& plugin, Gtk::Window &parent)
ui->get_widget("cpu_usage_fixed_max_checkbutton",
cpu_usage_fixed_max_checkbutton);
ui->get_widget("cpu_usage_tag_entry", cpu_tag);
+ ui->get_widget("cpu_usage_text_overlay_checkbutton",
+ cpu_usage_text_overlay_checkbutton);
ui->get_widget("load_average_radiobutton", load_average_radiobutton);
ui->get_widget("load_average_options", load_average_options);
@@ -98,6 +100,8 @@ ChooseMonitorWindow::ChooseMonitorWindow(Plugin& plugin, Gtk::Window &parent)
load_average_fixed_max_checkbutton);
ui->get_widget("load_average_max_spinbutton", load_average_max_spinbutton);
ui->get_widget("load_average_tag_entry", load_average_tag);
+ ui->get_widget("load_average_text_overlay_checkbutton",
+ load_average_text_overlay_checkbutton);
ui->get_widget("disk_usage_radiobutton", disk_usage_radiobutton);
ui->get_widget("disk_usage_options", disk_usage_options);
@@ -110,6 +114,8 @@ ChooseMonitorWindow::ChooseMonitorWindow(Plugin& plugin, Gtk::Window &parent)
ui->get_widget("disk_usage_fixed_max_checkbutton",
disk_usage_fixed_max_checkbutton);
ui->get_widget("disk_usage_tag_entry", disk_usage_tag);
+ ui->get_widget("disk_usage_text_overlay_checkbutton",
+ disk_usage_text_overlay_checkbutton);
ui->get_widget("disk_stats_radiobutton", disk_stats_radiobutton);
ui->get_widget("disk_stats_options", disk_stats_options);
@@ -124,6 +130,8 @@ ChooseMonitorWindow::ChooseMonitorWindow(Plugin& plugin, Gtk::Window &parent)
ui->get_widget("disk_stats_max_spinbutton",
disk_stats_max_spinbutton);
ui->get_widget("disk_stats_tag_entry", disk_stats_tag);
+ ui->get_widget("disk_stats_text_overlay_checkbutton",
+ disk_stats_text_overlay_checkbutton);
ui->get_widget("swap_usage_radiobutton", swap_usage_radiobutton);
ui->get_widget("swap_usage_options", swap_usage_options);
@@ -132,6 +140,7 @@ ChooseMonitorWindow::ChooseMonitorWindow(Plugin& plugin, Gtk::Window &parent)
swap_refresh_delay_default_button);
ui->get_widget("swap_fixed_max_checkbutton", swap_fixed_max_checkbutton);
ui->get_widget("swap_tag_entry", swap_usage_tag);
+ ui->get_widget("swap_text_overlay_checkbutton", swap_text_overlay_checkbutton);
ui->get_widget("memory_usage_radiobutton", memory_usage_radiobutton);
ui->get_widget("memory_usage_options", memory_usage_options);
@@ -141,6 +150,8 @@ ChooseMonitorWindow::ChooseMonitorWindow(Plugin& plugin, Gtk::Window &parent)
memory_refresh_delay_default_button);
ui->get_widget("memory_fixed_max_checkbutton", memory_fixed_max_checkbutton);
ui->get_widget("memory_tag_entry", memory_usage_tag);
+ ui->get_widget("memory_text_overlay_checkbutton",
+ memory_text_overlay_checkbutton);
ui->get_widget("network_load_radiobutton", network_load_radiobutton);
ui->get_widget("network_load_options", network_load_options);
@@ -155,6 +166,8 @@ ChooseMonitorWindow::ChooseMonitorWindow(Plugin& plugin, Gtk::Window &parent)
network_load_fixed_max_checkbutton);
ui->get_widget("network_load_max_spinbutton", network_load_max_spinbutton);
ui->get_widget("network_load_tag_entry", network_load_tag);
+ ui->get_widget("network_load_text_overlay_checkbutton",
+ network_load_text_overlay_checkbutton);
/* Need special code here to set the desired stock icon as GTK Builder doesn't
* support setting a stock icon but custom text, and as soon as you change the
@@ -180,6 +193,8 @@ ChooseMonitorWindow::ChooseMonitorWindow(Plugin& plugin, Gtk::Window &parent)
temperature_fixed_max_checkbutton);
ui->get_widget("temperature_max_spinbutton", temperature_max_spinbutton);
ui->get_widget("temperature_tag_entry", temperature_tag);
+ ui->get_widget("temperature_text_overlay_checkbutton",
+ temperature_text_overlay_checkbutton);
ui->get_widget("fan_speed_radiobutton", fan_speed_radiobutton);
ui->get_widget("fan_speed_box", fan_speed_box);
@@ -192,6 +207,7 @@ ChooseMonitorWindow::ChooseMonitorWindow(Plugin& plugin, Gtk::Window &parent)
ui->get_widget("fan_fixed_max_checkbutton", fan_fixed_max_checkbutton);
ui->get_widget("fan_max_spinbutton", fan_max_spinbutton);
ui->get_widget("fan_speed_tag_entry", fan_speed_tag);
+ ui->get_widget("fan_text_overlay_checkbutton", fan_text_overlay_checkbutton);
ui->get_widget("generic_radiobutton", generic_radiobutton);
ui->get_widget("generic_box", generic_box);
@@ -225,6 +241,8 @@ ChooseMonitorWindow::ChooseMonitorWindow(Plugin& plugin, Gtk::Window &parent)
ui->get_widget("generic_fixed_max_checkbutton", generic_fixed_max_checkbutton);
ui->get_widget("generic_max_spinbutton", generic_max_spinbutton);
ui->get_widget("generic_tag_entry", generic_tag);
+ ui->get_widget("generic_text_overlay_checkbutton",
+ generic_text_overlay_checkbutton);
cpu_usage_radiobutton->signal_toggled()
.connect(sigc::mem_fun(*this, &ChooseMonitorWindow::
@@ -316,15 +334,18 @@ ChooseMonitorWindow::ChooseMonitorWindow(Plugin& plugin, Gtk::Window &parent)
cpu_usage_refresh_delay_spinbutton->set_value(
CpuUsageMonitor::update_interval_default / 1000);
cpu_usage_fixed_max_checkbutton->set_active(true);
+ cpu_usage_text_overlay_checkbutton->set_active(true);
load_average_refresh_delay_spinbutton->set_value(
LoadAverageMonitor::update_interval_default / 1000);
load_average_fixed_max_checkbutton->set_active(false);
load_average_max_spinbutton->set_value(0);
+ load_average_text_overlay_checkbutton->set_active(true);
disk_usage_refresh_delay_spinbutton->set_value(
DiskUsageMonitor::update_interval_default / 1000);
disk_usage_fixed_max_checkbutton->set_active(true);
+ disk_usage_text_overlay_checkbutton->set_active(true);
/* Setup disk statistics device name combobox - no column packing needed here
* since this seems to be done automatically when a text entry is included */
@@ -359,14 +380,17 @@ ChooseMonitorWindow::ChooseMonitorWindow(Plugin& plugin, Gtk::Window &parent)
DiskStatsMonitor::update_interval_default / 1000);
disk_stats_fixed_max_checkbutton->set_active(false);
disk_stats_max_spinbutton->set_value(0);
+ disk_stats_text_overlay_checkbutton->set_active(true);
swap_refresh_delay_spinbutton->set_value(
SwapUsageMonitor::update_interval_default / 1000);
swap_fixed_max_checkbutton->set_active(true);
+ swap_text_overlay_checkbutton->set_active(true);
memory_refresh_delay_spinbutton->set_value(
MemoryUsageMonitor::update_interval_default / 1000);
memory_fixed_max_checkbutton->set_active(true);
+ memory_text_overlay_checkbutton->set_active(true);
// Setup network interface type combobox
static NetworkInterfaceTypeCols nitc;
@@ -435,6 +459,7 @@ ChooseMonitorWindow::ChooseMonitorWindow(Plugin& plugin, Gtk::Window &parent)
NetworkLoadMonitor::update_interval_default / 1000);
network_load_fixed_max_checkbutton->set_active(false);
network_load_max_spinbutton->set_value(0);
+ network_load_text_overlay_checkbutton->set_active(true);
#if !HAVE_LIBSENSORS // No sensors support, no options for it
device_notebook->get_nth_page(3)->hide();
@@ -476,6 +501,7 @@ ChooseMonitorWindow::ChooseMonitorWindow(Plugin& plugin, Gtk::Window &parent)
TemperatureMonitor::update_interval_default / 1000);
temperature_fixed_max_checkbutton->set_active(false);
temperature_max_spinbutton->set_value(0);
+ temperature_text_overlay_checkbutton->set_active(true);
// Setup fan combobox
static SensorsCols fsc;
@@ -512,11 +538,13 @@ ChooseMonitorWindow::ChooseMonitorWindow(Plugin& plugin, Gtk::Window &parent)
FanSpeedMonitor::update_interval_default / 1000);
fan_fixed_max_checkbutton->set_active(false);
fan_max_spinbutton->set_value(0);
+ fan_text_overlay_checkbutton->set_active(true);
generic_refresh_delay_spinbutton->set_value(
GenericMonitor::update_interval_default / 1000);
generic_fixed_max_checkbutton->set_active(false);
generic_max_spinbutton->set_value(0);
+ generic_text_overlay_checkbutton->set_active(true);
/* Fix border on help linkbutton - border is specified in the glade config, yet
* it is ignored?? */
@@ -554,6 +582,8 @@ Monitor *ChooseMonitorWindow::run(const Glib::ustring &mon_dir)
tag = xfce_rc_read_entry(settings_ro, "tag", "");
int update_interval = xfce_rc_read_int_entry(settings_ro,
"update_interval", -1);
+ bool add_to_text_overlay = xfce_rc_read_bool_entry(
+ settings_ro, "add_to_text_overlay", true);
/* Floats are not supported by XFCE configuration code, so need to
* unserialise the double */
@@ -569,6 +599,7 @@ Monitor *ChooseMonitorWindow::run(const Glib::ustring &mon_dir)
device_notebook->set_current_page(1);
memory_usage_radiobutton->set_active();
memory_usage_tag->set_text(tag);
+ memory_text_overlay_checkbutton->set_active(add_to_text_overlay);
// Enforcing default update interval when it isn't present
if (update_interval == -1)
@@ -583,6 +614,7 @@ Monitor *ChooseMonitorWindow::run(const Glib::ustring &mon_dir)
device_notebook->set_current_page(0);
load_average_radiobutton->set_active();
load_average_tag->set_text(tag);
+ load_average_text_overlay_checkbutton->set_active(add_to_text_overlay);
// Enforcing default update interval when it isn't present
if (update_interval == -1)
@@ -605,6 +637,7 @@ Monitor *ChooseMonitorWindow::run(const Glib::ustring &mon_dir)
"show_free", false);
show_free_checkbutton->set_active(show_free);
disk_usage_tag->set_text(tag);
+ disk_usage_text_overlay_checkbutton->set_active(add_to_text_overlay);
// Enforcing default update interval when it isn't present
if (update_interval == -1)
@@ -657,6 +690,7 @@ Monitor *ChooseMonitorWindow::run(const Glib::ustring &mon_dir)
disk_stats_stat_combobox->set_active(stat);
disk_stats_tag->set_text(tag);
+ disk_stats_text_overlay_checkbutton->set_active(add_to_text_overlay);
// Enforcing default update interval when it isn't present
if (update_interval == -1)
@@ -678,6 +712,7 @@ Monitor *ChooseMonitorWindow::run(const Glib::ustring &mon_dir)
device_notebook->set_current_page(1);
swap_usage_radiobutton->set_active();
swap_usage_tag->set_text(tag);
+ swap_text_overlay_checkbutton->set_active(add_to_text_overlay);
// Enforcing default update interval when it isn't present
if (update_interval == -1)
@@ -786,6 +821,7 @@ Monitor *ChooseMonitorWindow::run(const Glib::ustring &mon_dir)
* populated when this form is instantiated */
network_load_tag->set_text(tag);
+ network_load_text_overlay_checkbutton->set_active(add_to_text_overlay);
// Enforcing default update interval when it isn't present
if (update_interval == -1)
@@ -809,6 +845,7 @@ Monitor *ChooseMonitorWindow::run(const Glib::ustring &mon_dir)
"temperature_no", 0);
temperature_combobox->set_active(temperature_no);
temperature_tag->set_text(tag);
+ temperature_text_overlay_checkbutton->set_active(add_to_text_overlay);
// Enforcing default update interval when it isn't present
if (update_interval == -1)
@@ -872,6 +909,7 @@ Monitor *ChooseMonitorWindow::run(const Glib::ustring &mon_dir)
generic_units_short_entry->set_text(units_short);
generic_tag->set_text(tag);
+ generic_text_overlay_checkbutton->set_active(add_to_text_overlay);
// Enforcing default update interval when it isn't present
if (update_interval == -1)
@@ -913,6 +951,7 @@ Monitor *ChooseMonitorWindow::run(const Glib::ustring &mon_dir)
cpu_usage_fixed_max_checkbutton->set_active(fixed_max);
cpu_tag->set_text(tag);
+ cpu_usage_text_overlay_checkbutton->set_active(add_to_text_overlay);
}
xfce_rc_close(settings_ro);
@@ -946,28 +985,32 @@ Monitor *ChooseMonitorWindow::run(const Glib::ustring &mon_dir)
int(cpu_usage_refresh_delay_spinbutton->get_value() * 1000),
cpu_usage_incl_low_checkbutton->get_active(),
cpu_usage_incl_iowait_checkbutton->get_active(),
- cpu_tag->get_text(), plugin_priv);
+ cpu_tag->get_text(),
+ cpu_usage_text_overlay_checkbutton->get_active(), plugin_priv);
else
mon = new CpuUsageMonitor(
cpu_usage_fixed_max_checkbutton->get_active(),
int(cpu_usage_refresh_delay_spinbutton->get_value() * 1000),
cpu_usage_incl_low_checkbutton->get_active(),
cpu_usage_incl_iowait_checkbutton->get_active(),
- cpu_tag->get_text(), plugin_priv);
+ cpu_tag->get_text(),
+ cpu_usage_text_overlay_checkbutton->get_active(), plugin_priv);
}
else if (memory_usage_radiobutton->get_active())
{
mon = new MemoryUsageMonitor(
int(memory_refresh_delay_spinbutton->get_value() * 1000),
memory_fixed_max_checkbutton->get_active(),
- memory_usage_tag->get_text(), plugin_priv);
+ memory_usage_tag->get_text(),
+ memory_text_overlay_checkbutton->get_active(), plugin_priv);
}
else if (swap_usage_radiobutton->get_active())
{
mon = new SwapUsageMonitor(
int(swap_refresh_delay_spinbutton->get_value() * 1000),
swap_fixed_max_checkbutton->get_active(),
- swap_usage_tag->get_text(), plugin_priv);
+ swap_usage_tag->get_text(),
+ swap_text_overlay_checkbutton->get_active(), plugin_priv);
}
else if (load_average_radiobutton->get_active())
{
@@ -975,7 +1018,8 @@ Monitor *ChooseMonitorWindow::run(const Glib::ustring &mon_dir)
int(load_average_refresh_delay_spinbutton->get_value() * 1000),
load_average_fixed_max_checkbutton->get_active(),
load_average_max_spinbutton->get_value(),
- load_average_tag->get_text(), plugin_priv);
+ load_average_tag->get_text(),
+ load_average_text_overlay_checkbutton->get_active(), plugin_priv);
}
else if (disk_usage_radiobutton->get_active())
{
@@ -1008,8 +1052,9 @@ Monitor *ChooseMonitorWindow::run(const Glib::ustring &mon_dir)
mon = new DiskUsageMonitor(mount_dir, show_free,
int(disk_usage_refresh_delay_spinbutton->get_value() * 1000),
- disk_usage_fixed_max_checkbutton->get_active(),
- disk_usage_tag->get_text(), plugin_priv);
+ disk_usage_fixed_max_checkbutton->get_active(),
+ disk_usage_tag->get_text(),
+ disk_usage_text_overlay_checkbutton->get_active(), plugin_priv);
}
else if (disk_stats_radiobutton->get_active())
{
@@ -1050,9 +1095,11 @@ Monitor *ChooseMonitorWindow::run(const Glib::ustring &mon_dir)
mon = new DiskStatsMonitor(device_name, stat,
int(disk_stats_refresh_delay_spinbutton->get_value() * 1000),
- disk_stats_fixed_max_checkbutton->get_active(),
- disk_stats_max_spinbutton->get_value(),
- disk_stats_tag->get_text(), plugin_priv);
+ disk_stats_fixed_max_checkbutton->get_active(),
+ disk_stats_max_spinbutton->get_value(),
+ disk_stats_tag->get_text(),
+ disk_stats_text_overlay_checkbutton->get_active(),
+ plugin_priv);
}
else if (network_load_radiobutton->get_active())
{
@@ -1096,25 +1143,27 @@ Monitor *ChooseMonitorWindow::run(const Glib::ustring &mon_dir)
mon = new NetworkLoadMonitor(interface_type, dir,
int(network_load_refresh_delay_spinbutton->get_value() * 1000),
- network_load_fixed_max_checkbutton->get_active(),
- network_load_max_spinbutton->get_value(),
- network_load_tag->get_text(), plugin_priv);
+ network_load_fixed_max_checkbutton->get_active(),
+ network_load_max_spinbutton->get_value(),
+ network_load_tag->get_text(),
+ network_load_text_overlay_checkbutton->get_active(), plugin_priv);
}
else if (temperature_radiobutton->get_active())
{
mon = new TemperatureMonitor(temperature_combobox->get_active_row_number(),
- int(temperature_refresh_delay_spinbutton->get_value() * 1000),
- temperature_fixed_max_checkbutton->get_active(),
- temperature_max_spinbutton->get_value(),
- temperature_tag->get_text(), plugin_priv);
+ int(temperature_refresh_delay_spinbutton->get_value() * 1000),
+ temperature_fixed_max_checkbutton->get_active(),
+ temperature_max_spinbutton->get_value(),
+ temperature_tag->get_text(),
+ temperature_text_overlay_checkbutton->get_active(), plugin_priv);
}
else if (fan_speed_radiobutton->get_active())
{
mon = new FanSpeedMonitor(fan_speed_combobox->get_active_row_number(),
- int(fan_speed_refresh_delay_spinbutton->get_value() * 1000),
- fan_fixed_max_checkbutton->get_active(),
- fan_max_spinbutton->get_value(),
- fan_speed_tag->get_text(), plugin_priv);
+ int(fan_speed_refresh_delay_spinbutton->get_value() * 1000),
+ fan_fixed_max_checkbutton->get_active(),
+ fan_max_spinbutton->get_value(), fan_speed_tag->get_text(),
+ fan_text_overlay_checkbutton->get_active(), plugin_priv);
}
else if (generic_radiobutton->get_active())
{
@@ -1252,7 +1301,9 @@ Monitor *ChooseMonitorWindow::run(const Glib::ustring &mon_dir)
int(generic_refresh_delay_spinbutton->get_value() * 1000),
generic_fixed_max_checkbutton->get_active(),
generic_max_spinbutton->get_value(),
- generic_tag->get_text(), plugin_priv);
+ generic_tag->get_text(),
+ generic_text_overlay_checkbutton->get_active(),
+ plugin_priv);
}
return mon;
diff --git a/src/choose-monitor-window.hpp b/src/choose-monitor-window.hpp
index 73f106f..11a0011 100644
--- a/src/choose-monitor-window.hpp
+++ b/src/choose-monitor-window.hpp
@@ -97,11 +97,16 @@ private:
*swap_usage_tag;
Gtk::CheckButton *cpu_usage_incl_low_checkbutton,
*cpu_usage_incl_iowait_checkbutton, *cpu_usage_fixed_max_checkbutton,
- *load_average_fixed_max_checkbutton, *show_free_checkbutton,
- *disk_usage_fixed_max_checkbutton, *disk_stats_fixed_max_checkbutton,
- *swap_fixed_max_checkbutton, *memory_fixed_max_checkbutton,
- *network_load_fixed_max_checkbutton, *temperature_fixed_max_checkbutton,
- *fan_fixed_max_checkbutton, *generic_fixed_max_checkbutton;
+ *cpu_usage_text_overlay_checkbutton, *load_average_fixed_max_checkbutton,
+ *load_average_text_overlay_checkbutton, *show_free_checkbutton,
+ *disk_usage_fixed_max_checkbutton, *disk_usage_text_overlay_checkbutton,
+ *disk_stats_fixed_max_checkbutton, *disk_stats_text_overlay_checkbutton,
+ *swap_fixed_max_checkbutton, *swap_text_overlay_checkbutton,
+ *memory_fixed_max_checkbutton, *memory_text_overlay_checkbutton,
+ *network_load_fixed_max_checkbutton, *network_load_text_overlay_checkbutton,
+ *temperature_fixed_max_checkbutton, *temperature_text_overlay_checkbutton,
+ *fan_fixed_max_checkbutton, *fan_text_overlay_checkbutton,
+ *generic_fixed_max_checkbutton, *generic_text_overlay_checkbutton;
Gtk::ComboBox *disk_stats_device_combobox, *disk_stats_stat_combobox;
diff --git a/src/monitor-impls.cpp b/src/monitor-impls.cpp
index 364b808..cca4cc4 100644
--- a/src/monitor-impls.cpp
+++ b/src/monitor-impls.cpp
@@ -83,6 +83,8 @@ load_monitors(XfceRc *settings_ro, Plugin& plugin)
tag = xfce_rc_read_entry(settings_ro, "tag", "");
int update_interval = xfce_rc_read_int_entry(settings_ro,
"update_interval", -1);
+ bool add_to_text_overlay = xfce_rc_read_bool_entry(
+ settings_ro, "add_to_text_overlay", true);
/* Floats are not supported by XFCE configuration code, so need to
* unstringify the double */
@@ -124,13 +126,15 @@ load_monitors(XfceRc *settings_ro, Plugin& plugin)
{
monitors.push_back(new CpuUsageMonitor(fixed_max, incl_low_prio,
incl_iowait, update_interval,
- tag, plugin));
+ tag, add_to_text_overlay,
+ plugin));
}
else
{
monitors.push_back(new CpuUsageMonitor(cpu_no, fixed_max,
incl_low_prio, incl_iowait,
- update_interval, tag, plugin));
+ update_interval, tag,
+ add_to_text_overlay, plugin));
}
}
else if (type == "memory_usage")
@@ -140,7 +144,8 @@ load_monitors(XfceRc *settings_ro, Plugin& plugin)
update_interval = MemoryUsageMonitor::update_interval_default;
monitors.push_back(new MemoryUsageMonitor(update_interval, fixed_max,
- tag, plugin));
+ tag, add_to_text_overlay,
+ plugin));
}
else if (type == "swap_usage")
{
@@ -149,7 +154,8 @@ load_monitors(XfceRc *settings_ro, Plugin& plugin)
update_interval = SwapUsageMonitor::update_interval_default;
monitors.push_back(new SwapUsageMonitor(update_interval, fixed_max,
- tag, plugin));
+ tag, add_to_text_overlay,
+ plugin));
}
else if (type == "load_average")
{
@@ -158,7 +164,8 @@ load_monitors(XfceRc *settings_ro, Plugin& plugin)
update_interval = LoadAverageMonitor::update_interval_default;
monitors.push_back(new LoadAverageMonitor(update_interval, fixed_max,
- max, tag, plugin));
+ max, tag, add_to_text_overlay,
+ plugin));
}
else if (type == "disk_usage")
{
@@ -177,7 +184,7 @@ load_monitors(XfceRc *settings_ro, Plugin& plugin)
// Creating disk usage monitor
monitors.push_back(new DiskUsageMonitor(mount_dir, show_free,
update_interval, fixed_max,
- tag, plugin));
+ tag, add_to_text_overlay, plugin));
}
else if (type == "disk_statistics")
{
@@ -196,7 +203,7 @@ load_monitors(XfceRc *settings_ro, Plugin& plugin)
// Creating disk statistics monitor
monitors.push_back(new DiskStatsMonitor(device_name, stat,
update_interval, fixed_max, max,
- tag, plugin));
+ tag, add_to_text_overlay, plugin));
// Debug code
/*
@@ -293,7 +300,8 @@ load_monitors(XfceRc *settings_ro, Plugin& plugin)
// Creating network load monitor
monitors.push_back(new NetworkLoadMonitor(inter_type, inter_direction,
update_interval, fixed_max,
- max, tag, plugin));
+ max, tag, add_to_text_overlay,
+ plugin));
// Debug code
/*
@@ -315,7 +323,8 @@ load_monitors(XfceRc *settings_ro, Plugin& plugin)
// Creating temperature monitor
monitors.push_back(new TemperatureMonitor(temperature_no,
update_interval, fixed_max,
- max, tag, plugin));
+ max, tag, add_to_text_overlay,
+ plugin));
}
else if (type == "fan_speed")
{
@@ -328,7 +337,8 @@ load_monitors(XfceRc *settings_ro, Plugin& plugin)
// Creating fan monitor
monitors.push_back(new FanSpeedMonitor(fan_no, update_interval,
- fixed_max, max, tag, plugin));
+ fixed_max, max, tag,
+ add_to_text_overlay, plugin));
}
else if (type == "generic")
@@ -375,7 +385,8 @@ load_monitors(XfceRc *settings_ro, Plugin& plugin)
data_source_name_long,
data_source_name_short, units_long,
units_short, update_interval,
- fixed_max, max, tag, plugin));
+ fixed_max, max, tag,
+ add_to_text_overlay, plugin));
}
// Saving the monitor's settings root
@@ -388,7 +399,8 @@ load_monitors(XfceRc *settings_ro, Plugin& plugin)
// Always start with a CpuUsageMonitor
if (monitors.empty())
- monitors.push_back(new CpuUsageMonitor(true, false, false, 1000, "", plugin));
+ monitors.push_back(new CpuUsageMonitor(true, false, false, 1000, "", true,
+ plugin));
return monitors;
}
@@ -538,8 +550,9 @@ int const CpuUsageMonitor::update_interval_default = 1000;
CpuUsageMonitor::CpuUsageMonitor(bool fixed_max, bool incl_low_prio,
bool incl_iowait, int interval,
- const Glib::ustring &tag_string, Plugin& plugin)
- : Monitor(tag_string, interval, plugin), cpu_no(all_cpus),
+ const Glib::ustring &tag_string,
+ bool add_to_text_overlay, Plugin& plugin)
+ : Monitor(tag_string, add_to_text_overlay, interval, plugin), cpu_no(all_cpus),
fixed_max_priv(fixed_max), incl_low_prio_priv(incl_low_prio),
incl_iowait_priv(incl_iowait), total_time(0), nice_time(0), idle_time(0),
iowait_time(0)
@@ -547,8 +560,9 @@ CpuUsageMonitor::CpuUsageMonitor(bool fixed_max, bool incl_low_prio,
CpuUsageMonitor::CpuUsageMonitor(int cpu, bool fixed_max, bool incl_low_prio,
bool incl_iowait, int interval,
- const Glib::ustring &tag_string, Plugin& plugin)
- : Monitor(tag_string, interval, plugin), cpu_no(cpu),
+ const Glib::ustring &tag_string,
+ bool add_to_text_overlay, Plugin& plugin)
+ : Monitor(tag_string, add_to_text_overlay, interval, plugin), cpu_no(cpu),
fixed_max_priv(fixed_max), incl_low_prio_priv(incl_low_prio),
incl_iowait_priv(incl_iowait), total_time(0), nice_time(0), idle_time(0),
iowait_time(0)
@@ -654,6 +668,8 @@ void CpuUsageMonitor::save(XfceRc *settings_w)
xfce_rc_write_int_entry(settings_w, "update_interval", update_interval());
xfce_rc_write_bool_entry(settings_w, "fixed_max", fixed_max_priv);
xfce_rc_write_entry(settings_w, "tag", tag.c_str());
+ xfce_rc_write_bool_entry(settings_w, "add_to_text_overlay",
+ add_to_text_overlay);
}
int CpuUsageMonitor::update_interval()
@@ -669,8 +685,8 @@ int const SwapUsageMonitor::update_interval_default = 10 * 1000;
SwapUsageMonitor::SwapUsageMonitor(int interval, bool fixed_max,
const Glib::ustring &tag_string,
- Plugin& plugin)
- : Monitor(tag_string, interval, plugin), max_value(0),
+ bool add_to_text_overlay, Plugin& plugin)
+ : Monitor(tag_string, add_to_text_overlay, interval, plugin), max_value(0),
fixed_max_priv(fixed_max)
{
}
@@ -732,6 +748,8 @@ void SwapUsageMonitor::save(XfceRc *settings_w)
xfce_rc_write_int_entry(settings_w, "update_interval", update_interval());
xfce_rc_write_bool_entry(settings_w, "fixed_max", fixed_max_priv);
xfce_rc_write_entry(settings_w, "tag", tag.c_str());
+ xfce_rc_write_bool_entry(settings_w, "add_to_text_overlay",
+ add_to_text_overlay);
}
int SwapUsageMonitor::update_interval()
@@ -747,8 +765,8 @@ int const LoadAverageMonitor::update_interval_default = 30 * 1000;
LoadAverageMonitor::LoadAverageMonitor(int interval, bool fixed_max, double max,
const Glib::ustring &tag_string,
- Plugin& plugin)
- : Monitor(tag_string, interval, plugin), max_value(max),
+ bool add_to_text_overlay, Plugin& plugin)
+ : Monitor(tag_string, add_to_text_overlay, interval, plugin), max_value(max),
fixed_max_priv(fixed_max)
{
}
@@ -828,6 +846,8 @@ void LoadAverageMonitor::save(XfceRc *settings_w)
xfce_rc_write_entry(settings_w, "max", "0");
xfce_rc_write_entry(settings_w, "tag", tag.c_str());
+ xfce_rc_write_bool_entry(settings_w, "add_to_text_overlay",
+ add_to_text_overlay);
}
int LoadAverageMonitor::update_interval()
@@ -843,8 +863,9 @@ int const MemoryUsageMonitor::update_interval_default = 10 * 1000;
MemoryUsageMonitor::MemoryUsageMonitor(int interval, bool fixed_max,
const Glib::ustring &tag_string,
- Plugin& plugin)
- : Monitor(tag_string, interval, plugin), max_value(0), fixed_max_priv(fixed_max)
+ bool add_to_text_overlay, Plugin& plugin)
+ : Monitor(tag_string, add_to_text_overlay, interval, plugin), max_value(0),
+ fixed_max_priv(fixed_max)
{
}
@@ -904,6 +925,8 @@ void MemoryUsageMonitor::save(XfceRc *settings_w)
xfce_rc_write_int_entry(settings_w, "update_interval", update_interval());
xfce_rc_write_bool_entry(settings_w, "fixed_max", fixed_max_priv);
xfce_rc_write_entry(settings_w, "tag", tag.c_str());
+ xfce_rc_write_bool_entry(settings_w, "add_to_text_overlay",
+ add_to_text_overlay);
}
int MemoryUsageMonitor::update_interval()
@@ -920,8 +943,8 @@ int const DiskUsageMonitor::update_interval_default = 60 * 1000;
DiskUsageMonitor::DiskUsageMonitor(const std::string &dir, bool free,
int interval, bool fixed_max,
const Glib::ustring &tag_string,
- Plugin& plugin)
- : Monitor(tag_string, interval, plugin), max_value(0),
+ bool add_to_text_overlay, Plugin& plugin)
+ : Monitor(tag_string, add_to_text_overlay, interval, plugin), max_value(0),
fixed_max_priv(fixed_max), mount_dir(dir), show_free(free)
{
}
@@ -1007,6 +1030,8 @@ void DiskUsageMonitor::save(XfceRc *settings_w)
xfce_rc_write_int_entry(settings_w, "update_interval", update_interval());
xfce_rc_write_bool_entry(settings_w, "fixed_max", fixed_max_priv);
xfce_rc_write_entry(settings_w, "tag", tag.c_str());
+ xfce_rc_write_bool_entry(settings_w, "add_to_text_overlay",
+ add_to_text_overlay);
}
int DiskUsageMonitor::update_interval()
@@ -1032,10 +1057,11 @@ DiskStatsMonitor::DiskStatsMonitor(const Glib::ustring &device_name,
const Stat &stat_to_monitor,
int interval, bool fixed_max, double max,
const Glib::ustring &tag_string,
- Plugin& plugin)
- : Monitor(tag_string, interval, plugin), device_name(device_name),
- stat_to_monitor(stat_to_monitor), previous_value(-1), max_value(max),
- fixed_max_priv(fixed_max), time_stamp_secs(0), time_stamp_usecs(0)
+ bool add_to_text_overlay, Plugin& plugin)
+ : Monitor(tag_string, add_to_text_overlay, interval, plugin),
+ device_name(device_name), stat_to_monitor(stat_to_monitor),
+ previous_value(-1), max_value(max), fixed_max_priv(fixed_max),
+ time_stamp_secs(0), time_stamp_usecs(0)
{
}
@@ -1325,6 +1351,8 @@ void DiskStatsMonitor::save(XfceRc *settings_w)
xfce_rc_write_int_entry(settings_w, "update_interval", update_interval());
xfce_rc_write_entry(settings_w, "tag", tag.c_str());
+ xfce_rc_write_bool_entry(settings_w, "add_to_text_overlay",
+ add_to_text_overlay);
// Debug code
/*plugin_priv.debug_log(
@@ -1442,8 +1470,8 @@ bool NetworkLoadMonitor::interface_names_configured = false;
NetworkLoadMonitor::NetworkLoadMonitor(InterfaceType &inter_type, Direction dir,
int interval, bool fixed_max, double max,
const Glib::ustring &tag_string,
- Plugin& plugin)
- : Monitor(tag_string, interval, plugin), max_value(max),
+ bool add_to_text_overlay, Plugin& plugin)
+ : Monitor(tag_string, add_to_text_overlay, interval, plugin), max_value(max),
fixed_max_priv(fixed_max), byte_count(0), time_stamp_secs(0),
time_stamp_usecs(0), interface_type(inter_type), direction(dir)
{
@@ -1989,6 +2017,8 @@ void NetworkLoadMonitor::save(XfceRc *settings_w)
xfce_rc_write_int_entry(settings_w, "update_interval", update_interval());
xfce_rc_write_entry(settings_w, "tag", tag.c_str());
+ xfce_rc_write_bool_entry(settings_w, "add_to_text_overlay",
+ add_to_text_overlay);
// Debug code
/*plugin_priv.debug_log(
@@ -2171,9 +2201,9 @@ int const TemperatureMonitor::update_interval_default = 20 * 1000;
TemperatureMonitor::TemperatureMonitor(int no, int interval, bool fixed_max,
double max,
const Glib::ustring &tag_string,
- Plugin& plugin)
- : Monitor(tag_string, interval, plugin), sensors_no(no), max_value(max),
- fixed_max_priv(fixed_max)
+ bool add_to_text_overlay, Plugin& plugin)
+ : Monitor(tag_string, add_to_text_overlay, interval, plugin), sensors_no(no),
+ max_value(max), fixed_max_priv(fixed_max)
{
Sensors::FeatureInfo info
= Sensors::instance().get_temperature_features()[sensors_no];
@@ -2255,6 +2285,8 @@ void TemperatureMonitor::save(XfceRc *settings_w)
xfce_rc_write_entry(settings_w, "max", "0");
xfce_rc_write_entry(settings_w, "tag", tag.c_str());
+ xfce_rc_write_bool_entry(settings_w, "add_to_text_overlay",
+ add_to_text_overlay);
}
int TemperatureMonitor::update_interval()
@@ -2269,10 +2301,10 @@ int TemperatureMonitor::update_interval()
int const FanSpeedMonitor::update_interval_default = 20 * 1000;
FanSpeedMonitor::FanSpeedMonitor(int no, int interval, bool fixed_max,
- double max,
- const Glib::ustring &tag_string, Plugin& plugin)
- : Monitor(tag_string, interval, plugin), sensors_no(no), max_value(max),
- fixed_max_priv(fixed_max)
+ double max, const Glib::ustring &tag_string,
+ bool add_to_text_overlay, Plugin& plugin)
+ : Monitor(tag_string, add_to_text_overlay, interval, plugin), sensors_no(no),
+ max_value(max), fixed_max_priv(fixed_max)
{
Sensors::FeatureInfo info
= Sensors::instance().get_fan_features()[sensors_no];
@@ -2352,6 +2384,8 @@ void FanSpeedMonitor::save(XfceRc *settings_w)
xfce_rc_write_entry(settings_w, "max", "0");
xfce_rc_write_entry(settings_w, "tag", tag.c_str());
+ xfce_rc_write_bool_entry(settings_w, "add_to_text_overlay",
+ add_to_text_overlay);
}
int FanSpeedMonitor::update_interval()
@@ -2375,10 +2409,10 @@ GenericMonitor::GenericMonitor(const Glib::ustring &file_path,
const Glib::ustring &units_long,
const Glib::ustring &units_short,
int interval, bool fixed_max, double max,
- const Glib::ustring &tag_string, Plugin& plugin)
- : Monitor(tag_string, interval, plugin), max_value(max),
- fixed_max_priv(fixed_max),
- previous_value(std::numeric_limits<double>::min()),
+ const Glib::ustring &tag_string,
+ bool add_to_text_overlay, Plugin& plugin)
+ : Monitor(tag_string, add_to_text_overlay, interval, plugin), max_value(max),
+ fixed_max_priv(fixed_max), previous_value(std::numeric_limits<double>::min()),
file_path(file_path), value_from_contents(value_from_contents),
follow_change(follow_change), dir(dir),
data_source_name_long(data_source_name_long),
@@ -2587,6 +2621,8 @@ void GenericMonitor::save(XfceRc *settings_w)
xfce_rc_write_entry(settings_w, "max", "0");
xfce_rc_write_entry(settings_w, "tag", tag.c_str());
+ xfce_rc_write_bool_entry(settings_w, "add_to_text_overlay",
+ add_to_text_overlay);
}
int GenericMonitor::update_interval()
diff --git a/src/monitor-impls.hpp b/src/monitor-impls.hpp
index f7b1e5d..2021ef0 100644
--- a/src/monitor-impls.hpp
+++ b/src/monitor-impls.hpp
@@ -51,12 +51,14 @@ public:
// Monitor all CPUs
CpuUsageMonitor(bool fixed_max, bool incl_low_prio, bool incl_iowait,
- int interval, const Glib::ustring &tag_string, Plugin& plugin);
+ int interval, const Glib::ustring &tag_string,
+ bool add_to_text_overlay, Plugin& plugin);
// Monitor only CPU no.
CpuUsageMonitor(int cpu_no, bool fixed_max, bool incl_low_prio,
bool incl_iowait, int interval,
- const Glib::ustring &tag_string, Plugin& plugin);
+ const Glib::ustring &tag_string, bool add_to_text_overlay,
+ Plugin& plugin);
virtual bool fixed_max();
virtual Glib::ustring format_value(double val, bool compact = false);
@@ -95,7 +97,7 @@ class SwapUsageMonitor: public Monitor
{
public:
SwapUsageMonitor(int interval, bool fixed_max, const Glib::ustring &tag_string,
- Plugin& plugin);
+ bool add_to_text_overlay, Plugin& plugin);
virtual bool fixed_max();
virtual Glib::ustring format_value(double val, bool compact = false);
@@ -122,7 +124,8 @@ class LoadAverageMonitor: public Monitor
{
public:
LoadAverageMonitor(int interval, bool fixed_max, double max,
- const Glib::ustring &tag_string, Plugin& plugin);
+ const Glib::ustring &tag_string, bool add_to_text_overlay,
+ Plugin& plugin);
virtual bool fixed_max();
virtual Glib::ustring format_value(double val, bool compact = false);
@@ -152,7 +155,8 @@ class MemoryUsageMonitor: public Monitor
{
public:
MemoryUsageMonitor(int interval, bool fixed_max,
- const Glib::ustring &tag_string, Plugin& plugin);
+ const Glib::ustring &tag_string, bool add_to_text_overlay,
+ Plugin& plugin);
virtual bool fixed_max();
virtual Glib::ustring format_value(double val, bool compact = false);
@@ -180,7 +184,7 @@ class DiskUsageMonitor: public Monitor
public:
DiskUsageMonitor(const std::string &mount_dir, bool show_free, int interval,
bool fixed_max, const Glib::ustring &tag_string,
- Plugin& plugin);
+ bool add_to_text_overlay, Plugin& plugin);
virtual bool fixed_max();
virtual Glib::ustring format_value(double val, bool compact= false);
@@ -228,7 +232,8 @@ public:
DiskStatsMonitor(const Glib::ustring &device_name, const Stat &stat_to_monitor,
int interval, bool fixed_max, double max,
- const Glib::ustring &tag_string, Plugin& plugin);
+ const Glib::ustring &tag_string, bool add_to_text_overlay,
+ Plugin& plugin);
virtual bool fixed_max();
virtual Glib::ustring format_value(double val, bool compact=false);
@@ -303,7 +308,8 @@ public:
NetworkLoadMonitor(InterfaceType &interface_type,
Direction dir, int interval, bool fixed_max, double max,
- const Glib::ustring &tag_string, Plugin& plugin);
+ const Glib::ustring &tag_string,
+ bool add_to_text_overlay, Plugin& plugin);
virtual bool fixed_max();
virtual Glib::ustring format_value(double val, bool compact = false);
@@ -389,7 +395,8 @@ public:
// no. in the temperature features
TemperatureMonitor(int no, int interval, bool fixed_max, double max,
- const Glib::ustring &tag_string, Plugin& plugin);
+ const Glib::ustring &tag_string, bool add_to_text_overlay,
+ Plugin& plugin);
virtual bool fixed_max();
virtual Glib::ustring format_value(double val, bool compact = false);
@@ -420,7 +427,8 @@ public:
// no. in the fan features
FanSpeedMonitor(int no, int interval, bool fixed_max, double max,
- const Glib::ustring &tag_string, Plugin& plugin);
+ const Glib::ustring &tag_string, bool add_to_text_overlay,
+ Plugin& plugin);
virtual bool fixed_max();
virtual Glib::ustring format_value(double val, bool compact = false);
@@ -467,7 +475,8 @@ public:
const Glib::ustring &units_long,
const Glib::ustring &units_short,
int interval, bool fixed_max, double max,
- const Glib::ustring &tag_string, Plugin& plugin);
+ const Glib::ustring &tag_string, bool add_to_text_overlay,
+ Plugin& plugin);
virtual bool fixed_max();
virtual Glib::ustring format_value(double val, bool compact=false);
diff --git a/src/monitor.hpp b/src/monitor.hpp
index 07a782c..bbcc332 100644
--- a/src/monitor.hpp
+++ b/src/monitor.hpp
@@ -41,9 +41,11 @@ class Plugin;
class Monitor: noncopyable
{
public:
- Monitor(const Glib::ustring &tag_string, int interval, Plugin& plugin)
- : measured_value(0), tag(tag_string), update_interval_priv(interval),
- plugin_priv(plugin)
+ Monitor(const Glib::ustring &tag_string, bool add_to_text_overlay,
+ int interval, Plugin& plugin)
+ : measured_value(0), tag(tag_string),
+ add_to_text_overlay(add_to_text_overlay),
+ update_interval_priv(interval), plugin_priv(plugin)
{
}
@@ -79,6 +81,10 @@ public:
* overlay in the CurveView */
Glib::ustring tag;
+ /* Allow user to define whether this monitor's data is included in the
+ * visualisation text overlay or not */
+ bool add_to_text_overlay;
+
// The max value that the monitor may attain
virtual double max() = 0;
diff --git a/src/ui.glade b/src/ui.glade
index 1debdca..0432d9b 100644
--- a/src/ui.glade
+++ b/src/ui.glade
@@ -361,7 +361,7 @@ less than default priority</property>
<object class="GtkTable" id="table1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">3</property>
+ <property name="n_rows">4</property>
<property name="n_columns">4</property>
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
@@ -479,6 +479,31 @@ is fixed to a maximum value of 100%</property>
<property name="bottom_attach">2</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="cpu_usage_text_overlay_checkbutton">
+ <property name="label" translatable="yes">Add to text overlay</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">When the text overlay is enabled in a visualisation,
+include this monitor in the text output</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">True</property>
@@ -561,7 +586,7 @@ is fixed to a maximum value of 100%</property>
<object class="GtkTable" id="table2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">3</property>
+ <property name="n_rows">4</property>
<property name="n_columns">4</property>
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
@@ -695,6 +720,31 @@ value</property>
<property name="bottom_attach">2</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="load_average_text_overlay_checkbutton">
+ <property name="label" translatable="yes">Add to text overlay</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">When the text overlay is enabled in a visualisation,
+include this monitor in the text output</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ </packing>
+ </child>
</object>
</child>
<child type="label">
@@ -841,7 +891,7 @@ value</property>
<object class="GtkTable" id="table3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">3</property>
+ <property name="n_rows">4</property>
<property name="n_columns">4</property>
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
@@ -965,6 +1015,31 @@ on the size of the volume</property>
<property name="bottom_attach">2</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="disk_usage_text_overlay_checkbutton">
+ <property name="label" translatable="yes">Add to text overlay</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">When the text overlay is enabled in a visualisation,
+include this monitor in the text output</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ </packing>
+ </child>
</object>
</child>
<child type="label">
@@ -1117,7 +1192,7 @@ on the size of the volume</property>
<object class="GtkTable" id="table4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">3</property>
+ <property name="n_rows">4</property>
<property name="n_columns">4</property>
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
@@ -1254,6 +1329,31 @@ maximum value</property>
<property name="bottom_attach">2</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="disk_stats_text_overlay_checkbutton">
+ <property name="label" translatable="yes">Add to text overlay</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">When the text overlay is enabled in a visualisation,
+include this monitor in the text output</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ </packing>
+ </child>
</object>
</child>
<child type="label">
@@ -1332,7 +1432,7 @@ maximum value</property>
<object class="GtkTable" id="table5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">3</property>
+ <property name="n_rows">4</property>
<property name="n_columns">4</property>
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
@@ -1453,6 +1553,31 @@ on the amount of swap available</property>
<property name="bottom_attach">2</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="swap_text_overlay_checkbutton">
+ <property name="label" translatable="yes">Add to text overlay</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">When the text overlay is enabled in a visualisation,
+include this monitor in the text output</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ </packing>
+ </child>
</object>
</child>
<child type="label">
@@ -1531,7 +1656,7 @@ on the amount of swap available</property>
<object class="GtkTable" id="table6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">3</property>
+ <property name="n_rows">4</property>
<property name="n_columns">4</property>
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
@@ -1652,6 +1777,31 @@ the amount of RAM available</property>
<property name="bottom_attach">2</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="memory_text_overlay_checkbutton">
+ <property name="label" translatable="yes">Add to text overlay</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">When the text overlay is enabled in a visualisation,
+include this monitor in the text output</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ </packing>
+ </child>
</object>
</child>
<child type="label">
@@ -1825,7 +1975,7 @@ the amount of RAM available</property>
<object class="GtkTable" id="table7">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">3</property>
+ <property name="n_rows">4</property>
<property name="n_columns">4</property>
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
@@ -1958,6 +2108,31 @@ is fixed to a user-specified maximum value</property>
<property name="bottom_attach">2</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="network_load_text_overlay_checkbutton">
+ <property name="label" translatable="yes">Add to text overlay</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">When the text overlay is enabled in a visualisation,
+include this monitor in the text output</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">True</property>
@@ -2123,7 +2298,7 @@ is fixed to a user-specified maximum value</property>
<object class="GtkTable" id="table8">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">3</property>
+ <property name="n_rows">4</property>
<property name="n_columns">4</property>
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
@@ -2257,6 +2432,31 @@ value</property>
<property name="bottom_attach">2</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="temperature_text_overlay_checkbutton">
+ <property name="label" translatable="yes">Add to text overlay</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">When the text overlay is enabled in a visualisation,
+include this monitor in the text output</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ </packing>
+ </child>
</object>
</child>
<child type="label">
@@ -2348,7 +2548,7 @@ value</property>
<object class="GtkTable" id="table9">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">3</property>
+ <property name="n_rows">4</property>
<property name="n_columns">4</property>
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
@@ -2482,6 +2682,31 @@ value</property>
<property name="bottom_attach">2</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="fan_text_overlay_checkbutton">
+ <property name="label" translatable="yes">Add to text overlay</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">When the text overlay is enabled in a visualisation,
+include this monitor in the text output</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ </packing>
+ </child>
</object>
</child>
<child type="label">
@@ -3104,6 +3329,23 @@ view</property>
<property name="position">11</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton" id="generic_text_overlay_checkbutton">
+ <property name="label" translatable="yes">Add to text overlay</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">When the text overlay is enabled in a visualisation,
+include this monitor in the text output</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">12</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list