[Xfce4-commits] [panel-plugins/xfce4-hardware-monitor-plugin] 45/96: Cleanup all tabs - convert to spaces (which seems to be this codebases default indentation
noreply at xfce.org
noreply at xfce.org
Thu Nov 27 22:20:50 CET 2014
This is an automated email from the git hooks/post-receive script.
nick pushed a commit to branch master
in repository panel-plugins/xfce4-hardware-monitor-plugin.
commit e760709b64193374fa102de91fad9f10613f43ab
Author: Omega Weapon <OmegaPhil at gmail.com>
Date: Thu Nov 7 15:04:32 2013 +0000
Cleanup all tabs - convert to spaces (which seems to be this codebases default indentation
---
configure.ac | 6 +-
src/applet.cpp | 12 +-
src/applet.hpp | 10 +-
src/bar-view.cpp | 22 ++--
src/canvas-view.cpp | 6 +-
src/canvas-view.hpp | 4 +-
src/choose-monitor-window.cpp | 276 ++++++++++++++++++++---------------------
src/column-view.cpp | 6 +-
src/curve-view.cpp | 6 +-
src/flame-view.cpp | 18 +--
src/gui-helpers.hpp | 2 +-
src/monitor-impls.cpp | 136 ++++++++++----------
src/monitor-impls.hpp | 86 ++++++-------
src/pixbuf-drawing.hpp | 4 +-
src/preferences-window.cpp | 34 ++---
src/text-view.cpp | 6 +-
src/view.hpp | 10 +-
17 files changed, 322 insertions(+), 322 deletions(-)
diff --git a/configure.ac b/configure.ac
index 39b7c6c..4d44c0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,7 +59,7 @@ XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
dnl Checks for libraries
PKG_CHECK_MODULES([DEPS], [gtkmm-2.4 >= 2.6.0 \
libgnomecanvasmm-2.6 >= 2.6.0 \
- libglademm-2.4 >= 2.4.0 \
+ libglademm-2.4 >= 2.4.0 \
libgtop-2.0 >= 2.6.0])
dnl Translations (XFCE4 xdt-i18n.m4) - this needs to be done before the
@@ -108,7 +108,7 @@ LDFLAGS=${_ldflags}
dnl Create makefiles
AC_CONFIG_FILES([Makefile
- src/Makefile
- po/Makefile.in
+ src/Makefile
+ po/Makefile.in
])
AC_OUTPUT
diff --git a/src/applet.cpp b/src/applet.cpp
index cf2cb30..d89190f 100644
--- a/src/applet.cpp
+++ b/src/applet.cpp
@@ -216,7 +216,7 @@ Applet::Applet(XfcePanelPlugin *plugin)
if (settings)
xfce_rc_close(settings);
- /* Connect plugin signals to functions - since I'm not really interested
+ /* Connect plugin signals to functions - since I'm not really interested
* in the plugin but the applet pointer, swapped results in the signal
* handler getting the applet reference first - the plugin pointer is
* passed next, but since the handler only takes one parameter this is
@@ -234,17 +234,17 @@ Applet::Applet(XfcePanelPlugin *plugin)
this);
// Hooking into save signal
- g_signal_connect_swapped(panel_applet, "save", G_CALLBACK(save_monitors),
+ g_signal_connect_swapped(panel_applet, "save", G_CALLBACK(save_monitors),
this);
/* Not needed as the canvas resizes on the fly
// Hooking into size changed signal
- g_signal_connect(panel_applet, "size-changed", G_CALLBACK(size_changed),
+ g_signal_connect(panel_applet, "size-changed", G_CALLBACK(size_changed),
this);
*/
// Adding configure and about to the applet's right-click menu
- xfce_panel_plugin_menu_show_configure(panel_applet);
+ xfce_panel_plugin_menu_show_configure(panel_applet);
xfce_panel_plugin_menu_show_about(panel_applet);
/* Add applet to panel - I need to turn the Applet (which inherits from
@@ -382,7 +382,7 @@ bool Applet::main_loop()
// Note to translators: %1 is the name of a monitor, e.g. "CPU 1", and %2 is
// the current measurement, e.g. "78%"
Glib::ustring next = String::ucompose(_("%1: %2"), mon.get_short_name(),
- mon.format_value(mon.value()));
+ mon.format_value(mon.value()));
if (tip.empty())
tip = next;
else
@@ -786,7 +786,7 @@ void Applet::on_about_activated()
about->set_logo(icon);
about->set_icon(icon);
about->signal_response().connect(
- sigc::hide(sigc::mem_fun(*about, &Gtk::Widget::hide)));
+ sigc::hide(sigc::mem_fun(*about, &Gtk::Widget::hide)));
about->show();
}
else {
diff --git a/src/applet.hpp b/src/applet.hpp
index 8f8bd2a..ed1733f 100644
--- a/src/applet.hpp
+++ b/src/applet.hpp
@@ -55,10 +55,10 @@ public:
Gtk::Container &get_container();
- unsigned int get_fg_color(); // return varying foreground colours
- int get_size() const; // in pixels
- bool horizontal() const; // whether we're in horizontal mode
- void set_view(View *view); // use this view to monitor
+ unsigned int get_fg_color(); // return varying foreground colours
+ int get_size() const; // in pixels
+ bool horizontal() const; // whether we're in horizontal mode
+ void set_view(View *view); // use this view to monitor
/* The following have been created to access properties that used to
* be publically available through GConf, but are private data in the
@@ -74,7 +74,7 @@ public:
void background_color_listener(unsigned int background_color);
void use_background_color_listener(gboolean use_background_color);
- Glib::RefPtr<Gdk::Pixbuf> get_icon(); // get the application icon
+ Glib::RefPtr<Gdk::Pixbuf> get_icon(); // get the application icon
void add_monitor(Monitor *monitor); // take over ownership of monitor
void remove_monitor(Monitor *monitor); // get rid of the monitor
diff --git a/src/bar-view.cpp b/src/bar-view.cpp
index 819406c..6c1e25f 100644
--- a/src/bar-view.cpp
+++ b/src/bar-view.cpp
@@ -20,8 +20,8 @@
*/
#include <vector>
-#include <cmath> // for ceil/floor
-#include <algorithm> // for max/min
+#include <cmath> // for ceil/floor
+#include <algorithm> // for max/min
#include <libgnomecanvasmm/rect.h>
@@ -42,8 +42,8 @@ public:
void update();
void draw(Gnome::Canvas::Canvas &canvas,
- Applet *applet, int width, int height, int no, int total,
- double time_offset);
+ Applet *applet, int width, int height, int no, int total,
+ double time_offset);
Monitor *monitor;
@@ -99,8 +99,8 @@ unsigned int outlineified(unsigned int color)
}
void Bar::draw(Gnome::Canvas::Canvas &canvas,
- Applet *applet, int width, int height, int no, int total,
- double time_offset)
+ Applet *applet, int width, int height, int no, int total,
+ double time_offset)
{
unsigned int outline_color = outlineified(fill_color);
@@ -139,7 +139,7 @@ void Bar::draw(Gnome::Canvas::Canvas &canvas,
unsigned int no_boxes = int(std::ceil(box_frac));
double alpha = box_frac - std::floor(box_frac);
- if (alpha == 0) // x.0 should give an opaque last box
+ if (alpha == 0) // x.0 should give an opaque last box
alpha = 1;
// trim/expand boxes list
@@ -167,10 +167,10 @@ void Bar::draw(Gnome::Canvas::Canvas &canvas,
coord += box_size + box_spacing;
}
else {
- rect.property_x1() = double(width) * no / total + 1;
- rect.property_x2() = double(width) * (no + 1) / total - 1;
- rect.property_y1() = coord;
- rect.property_y2() = coord - box_size;
+ rect.property_x1() = double(width) * no / total + 1;
+ rect.property_x2() = double(width) * (no + 1) / total - 1;
+ rect.property_y1() = coord;
+ rect.property_y2() = coord - box_size;
coord -= (box_size + box_spacing);
}
diff --git a/src/canvas-view.cpp b/src/canvas-view.cpp
index 2f9b960..0820911 100644
--- a/src/canvas-view.cpp
+++ b/src/canvas-view.cpp
@@ -39,7 +39,7 @@ CanvasView::CanvasView(bool keeps_history)
CanvasView::~CanvasView()
{
- draw_timer.disconnect(); // FIXME: is this enough to prevent crash?
+ draw_timer.disconnect(); // FIXME: is this enough to prevent crash?
}
void CanvasView::do_display()
@@ -75,8 +75,8 @@ void CanvasView::do_set_background(unsigned int color)
{
Gdk::Color c;
c.set_rgb(((color >> 24) & 0xff) * 256,
- ((color >> 16) & 0xff) * 256,
- ((color >> 8) & 0xff) * 256);
+ ((color >> 16) & 0xff) * 256,
+ ((color >> 8) & 0xff) * 256);
canvas->modify_bg(Gtk::STATE_NORMAL, c);
canvas->modify_bg(Gtk::STATE_ACTIVE, c);
diff --git a/src/canvas-view.hpp b/src/canvas-view.hpp
index e891241..937c003 100644
--- a/src/canvas-view.hpp
+++ b/src/canvas-view.hpp
@@ -53,9 +53,9 @@ protected:
int width() const;
int height() const;
- void resize_canvas(); // resize canvas according to width and height
+ void resize_canvas(); // resize canvas according to width and height
- int size; // in pixels, width when vertical, else height
+ int size; // in pixels, width when vertical, else height
std::auto_ptr<Gnome::Canvas::Canvas> canvas;
diff --git a/src/choose-monitor-window.cpp b/src/choose-monitor-window.cpp
index 89bdf33..3db37fc 100644
--- a/src/choose-monitor-window.cpp
+++ b/src/choose-monitor-window.cpp
@@ -29,7 +29,7 @@
ChooseMonitorWindow::ChooseMonitorWindow(Glib::RefPtr<Gdk::Pixbuf> icon,
- Gtk::Window &parent)
+ Gtk::Window &parent)
{
ui = get_glade_xml("choose_monitor_window");
@@ -73,28 +73,28 @@ ChooseMonitorWindow::ChooseMonitorWindow(Glib::RefPtr<Gdk::Pixbuf> icon,
cpu_usage_radiobutton->signal_toggled()
.connect(sigc::mem_fun(*this, &ChooseMonitorWindow::
- on_cpu_usage_radiobutton_toggled));
+ on_cpu_usage_radiobutton_toggled));
disk_usage_radiobutton->signal_toggled()
.connect(sigc::mem_fun(*this, &ChooseMonitorWindow::
- on_disk_usage_radiobutton_toggled));
+ on_disk_usage_radiobutton_toggled));
network_load_radiobutton->signal_toggled()
.connect(sigc::mem_fun(*this, &ChooseMonitorWindow::
- on_network_load_radiobutton_toggled));
+ on_network_load_radiobutton_toggled));
temperature_radiobutton->signal_toggled()
.connect(sigc::mem_fun(*this, &ChooseMonitorWindow::
- on_temperature_radiobutton_toggled));
+ on_temperature_radiobutton_toggled));
fan_speed_radiobutton->signal_toggled()
.connect(sigc::mem_fun(*this, &ChooseMonitorWindow::
- on_fan_speed_radiobutton_toggled));
+ on_fan_speed_radiobutton_toggled));
// note 1 off to avoid counting from zero in the interface
cpu_no_spinbutton->set_range(1, CpuUsageMonitor::max_no_cpus);
-#if !HAVE_LIBSENSORS // no sensors support, no options for it
+#if !HAVE_LIBSENSORS // no sensors support, no options for it
device_notebook->get_nth_page(3)->hide();
#endif
@@ -107,13 +107,13 @@ ChooseMonitorWindow::ChooseMonitorWindow(Glib::RefPtr<Gdk::Pixbuf> icon,
Gtk::Menu *menu = manage(new Gtk::Menu());
int counter = 1;
for (Sensors::FeatureInfoSequence::iterator i = seq.begin(),
- end = seq.end(); i != end; ++i) {
+ end = seq.end(); i != end; ++i) {
Glib::ustring s;
if (!i->description.empty())
- // %2 is a descriptive string from sensors.conf
- s = String::ucompose(_("Sensor %1: \"%2\""), counter, i->description);
+ // %2 is a descriptive string from sensors.conf
+ s = String::ucompose(_("Sensor %1: \"%2\""), counter, i->description);
else
- s = String::ucompose(_("Sensor %1"), counter);
+ s = String::ucompose(_("Sensor %1"), counter);
menu->append(*manage(new Gtk::MenuItem(s)));
++counter;
@@ -131,13 +131,13 @@ ChooseMonitorWindow::ChooseMonitorWindow(Glib::RefPtr<Gdk::Pixbuf> icon,
Gtk::Menu *menu = manage(new Gtk::Menu());
int counter = 1;
for (Sensors::FeatureInfoSequence::iterator i = seq.begin(),
- end = seq.end(); i != end; ++i) {
+ end = seq.end(); i != end; ++i) {
Glib::ustring s;
if (!i->description.empty())
- // %2 is a descriptive string from sensors.conf
- s = String::ucompose(_("Fan %1: \"%2\""), counter, i->description);
+ // %2 is a descriptive string from sensors.conf
+ s = String::ucompose(_("Fan %1: \"%2\""), counter, i->description);
else
- s = String::ucompose(_("Fan %1"), counter);
+ s = String::ucompose(_("Fan %1"), counter);
menu->append(*manage(new Gtk::MenuItem(s)));
++counter;
@@ -183,108 +183,108 @@ Monitor *ChooseMonitorWindow::run(XfcePanelPlugin* panel_applet,
if (type == "memory_usage")
{
- device_notebook->set_current_page(1);
- memory_usage_radiobutton->set_active();
+ device_notebook->set_current_page(1);
+ memory_usage_radiobutton->set_active();
}
else if (type == "load_average")
{
- device_notebook->set_current_page(0);
- load_average_radiobutton->set_active();
+ device_notebook->set_current_page(0);
+ load_average_radiobutton->set_active();
}
else if (type == "disk_usage")
{
- device_notebook->set_current_page(1);
- disk_usage_radiobutton->set_active();
+ device_notebook->set_current_page(1);
+ disk_usage_radiobutton->set_active();
}
else if (type == "swap_usage")
{
- device_notebook->set_current_page(1);
- swap_usage_radiobutton->set_active();
+ device_notebook->set_current_page(1);
+ swap_usage_radiobutton->set_active();
}
else if (type == "network_load")
{
- device_notebook->set_current_page(2);
- network_load_radiobutton->set_active();
+ device_notebook->set_current_page(2);
+ network_load_radiobutton->set_active();
}
else if (type == "temperature")
{
- device_notebook->set_current_page(3);
- temperature_radiobutton->set_active();
+ device_notebook->set_current_page(3);
+ temperature_radiobutton->set_active();
}
else
{
- device_notebook->set_current_page(0);
- // FIXME: use schema?
- cpu_usage_radiobutton->set_active();
+ device_notebook->set_current_page(0);
+ // FIXME: use schema?
+ cpu_usage_radiobutton->set_active();
}
// Fill in cpu info
if (xfce_rc_has_entry(settings, "cpu_no"))
{
- int no = xfce_rc_read_int_entry(settings, "cpu_no", -1);
- if (no >= 0 && no < CpuUsageMonitor::max_no_cpus) {
- one_cpu_radiobutton->set_active();
- cpu_no_spinbutton->set_value(no + 1);
- }
- else {
- all_cpus_radiobutton->set_active();
- }
+ int no = xfce_rc_read_int_entry(settings, "cpu_no", -1);
+ if (no >= 0 && no < CpuUsageMonitor::max_no_cpus) {
+ one_cpu_radiobutton->set_active();
+ cpu_no_spinbutton->set_value(no + 1);
+ }
+ else {
+ all_cpus_radiobutton->set_active();
+ }
}
// Fill in disk usage info
if (xfce_rc_has_entry(settings, "mount_dir"))
{
- Glib::ustring mount_dir = xfce_rc_read_entry(settings,
- "mount_dir", "");
- mount_dir_entry->set_text(mount_dir);
+ Glib::ustring mount_dir = xfce_rc_read_entry(settings,
+ "mount_dir", "");
+ mount_dir_entry->set_text(mount_dir);
}
if (xfce_rc_has_entry(settings, "show_free"))
{
- bool show_free = xfce_rc_read_bool_entry(settings,
- "show_free", false);
- show_free_checkbutton->set_active(show_free);
+ bool show_free = xfce_rc_read_bool_entry(settings,
+ "show_free", false);
+ show_free_checkbutton->set_active(show_free);
}
// Fill in network load info
if (xfce_rc_has_entry(settings, "interface"))
{
- Glib::ustring interface = xfce_rc_read_entry(settings,
- "interface", "eth");
-
- int interface_no = xfce_rc_read_int_entry(settings,
- "interface_no", 0);
-
- if (interface == "eth" && interface_no == 0)
- network_type_optionmenu->set_history(0);
- else if (interface == "eth" && interface_no == 1)
- network_type_optionmenu->set_history(1);
- else if (interface == "eth" && interface_no == 2)
- network_type_optionmenu->set_history(2);
- else if (interface == "ppp")
- network_type_optionmenu->set_history(3);
- else if (interface == "slip")
- network_type_optionmenu->set_history(4);
- else if (interface == "wlan")
- network_type_optionmenu->set_history(5);
- else
- network_type_optionmenu->set_history(0);
+ Glib::ustring interface = xfce_rc_read_entry(settings,
+ "interface", "eth");
+
+ int interface_no = xfce_rc_read_int_entry(settings,
+ "interface_no", 0);
+
+ if (interface == "eth" && interface_no == 0)
+ network_type_optionmenu->set_history(0);
+ else if (interface == "eth" && interface_no == 1)
+ network_type_optionmenu->set_history(1);
+ else if (interface == "eth" && interface_no == 2)
+ network_type_optionmenu->set_history(2);
+ else if (interface == "ppp")
+ network_type_optionmenu->set_history(3);
+ else if (interface == "slip")
+ network_type_optionmenu->set_history(4);
+ else if (interface == "wlan")
+ network_type_optionmenu->set_history(5);
+ else
+ network_type_optionmenu->set_history(0);
}
if (xfce_rc_has_entry(settings, "interface_direction"))
{
- int direction = xfce_rc_read_int_entry(settings,
- "interface_direction", NetworkLoadMonitor::all_data);
-
- if (direction == NetworkLoadMonitor::incoming_data)
- network_direction_optionmenu->set_history(1);
- else if (direction == NetworkLoadMonitor::outgoing_data)
- network_direction_optionmenu->set_history(2);
- else if (direction == NetworkLoadMonitor::all_data)
- network_direction_optionmenu->set_history(0);
+ int direction = xfce_rc_read_int_entry(settings,
+ "interface_direction", NetworkLoadMonitor::all_data);
+
+ if (direction == NetworkLoadMonitor::incoming_data)
+ network_direction_optionmenu->set_history(1);
+ else if (direction == NetworkLoadMonitor::outgoing_data)
+ network_direction_optionmenu->set_history(2);
+ else if (direction == NetworkLoadMonitor::all_data)
+ network_direction_optionmenu->set_history(0);
}
int temperature_no = xfce_rc_read_int_entry(settings,
- "temperature_no", 0);
+ "temperature_no", 0);
temperature_optionmenu->set_history(temperature_no);
}
@@ -311,79 +311,79 @@ Monitor *ChooseMonitorWindow::run(XfcePanelPlugin* panel_applet,
Monitor *mon = 0;
if (cpu_usage_radiobutton->get_active())
- if (one_cpu_radiobutton->get_active())
- mon = new CpuUsageMonitor(int(cpu_no_spinbutton->get_value()) - 1);
- else
- mon = new CpuUsageMonitor;
+ if (one_cpu_radiobutton->get_active())
+ mon = new CpuUsageMonitor(int(cpu_no_spinbutton->get_value()) - 1);
+ else
+ mon = new CpuUsageMonitor;
else if (memory_usage_radiobutton->get_active())
- mon = new MemoryUsageMonitor;
+ mon = new MemoryUsageMonitor;
else if (swap_usage_radiobutton->get_active())
- mon = new SwapUsageMonitor;
+ mon = new SwapUsageMonitor;
else if (load_average_radiobutton->get_active())
- mon = new LoadAverageMonitor;
+ mon = new LoadAverageMonitor;
else if (disk_usage_radiobutton->get_active()) {
- Glib::ustring mount_dir = mount_dir_entry->get_text();
- bool show_free = show_free_checkbutton->get_active();
- // FIXME: check that mount_dir is valid
- mon = new DiskUsageMonitor(mount_dir, show_free);
+ Glib::ustring mount_dir = mount_dir_entry->get_text();
+ bool show_free = show_free_checkbutton->get_active();
+ // FIXME: check that mount_dir is valid
+ mon = new DiskUsageMonitor(mount_dir, show_free);
}
else if (network_load_radiobutton->get_active()) {
- Glib::ustring interface;
- int interface_no;
-
- switch (network_type_optionmenu->get_history()) {
- case 1:
- interface = "eth";
- interface_no = 1;
- break;
-
- case 2:
- interface = "eth";
- interface_no = 2;
- break;
-
- case 3:
- interface = "ppp";
- interface_no = 0;
- break;
-
- case 4:
- interface = "slip";
- interface_no = 0;
- break;
-
- case 5:
- interface = "wlan";
- interface_no = 0;
- break;
-
- default:
- interface = "eth";
- interface_no = 0;
- break;
- }
-
- NetworkLoadMonitor::Direction dir;
- switch (network_direction_optionmenu->get_history()) {
- case NetworkLoadMonitor::incoming_data:
- dir = NetworkLoadMonitor::incoming_data;
- break;
-
- case NetworkLoadMonitor::outgoing_data:
- dir = NetworkLoadMonitor::outgoing_data;
- break;
-
- default:
- dir = NetworkLoadMonitor::all_data;
- break;
- }
-
- mon = new NetworkLoadMonitor(interface, interface_no, dir);
+ Glib::ustring interface;
+ int interface_no;
+
+ switch (network_type_optionmenu->get_history()) {
+ case 1:
+ interface = "eth";
+ interface_no = 1;
+ break;
+
+ case 2:
+ interface = "eth";
+ interface_no = 2;
+ break;
+
+ case 3:
+ interface = "ppp";
+ interface_no = 0;
+ break;
+
+ case 4:
+ interface = "slip";
+ interface_no = 0;
+ break;
+
+ case 5:
+ interface = "wlan";
+ interface_no = 0;
+ break;
+
+ default:
+ interface = "eth";
+ interface_no = 0;
+ break;
+ }
+
+ NetworkLoadMonitor::Direction dir;
+ switch (network_direction_optionmenu->get_history()) {
+ case NetworkLoadMonitor::incoming_data:
+ dir = NetworkLoadMonitor::incoming_data;
+ break;
+
+ case NetworkLoadMonitor::outgoing_data:
+ dir = NetworkLoadMonitor::outgoing_data;
+ break;
+
+ default:
+ dir = NetworkLoadMonitor::all_data;
+ break;
+ }
+
+ mon = new NetworkLoadMonitor(interface, interface_no, dir);
}
else if (temperature_radiobutton->get_active())
- mon = new TemperatureMonitor(temperature_optionmenu->get_history());
+ mon = new TemperatureMonitor(temperature_optionmenu->get_history());
else if (fan_speed_radiobutton->get_active())
- mon = new FanSpeedMonitor(fan_speed_optionmenu->get_history());
+ mon = new FanSpeedMonitor(fan_speed_optionmenu->get_history());
return mon;
}
diff --git a/src/column-view.cpp b/src/column-view.cpp
index 1a1037b..47b925a 100644
--- a/src/column-view.cpp
+++ b/src/column-view.cpp
@@ -42,7 +42,7 @@ public:
void update(unsigned int max_samples); // gather info from monitor
void draw(Gnome::Canvas::Canvas &canvas, // redraw columns on canvas
- Applet *applet, int width, int height);
+ Applet *applet, int width, int height);
Monitor *monitor;
@@ -70,7 +70,7 @@ void ColumnGraph::update(unsigned int max_samples)
}
void ColumnGraph::draw(Gnome::Canvas::Canvas &canvas,
- Applet *applet, int width, int height)
+ Applet *applet, int width, int height)
{
if (remaining_draws <= 0)
return;
@@ -82,7 +82,7 @@ void ColumnGraph::draw(Gnome::Canvas::Canvas &canvas,
ValueHistory::iterator vi = value_history.values.begin(),
vend = value_history.values.end();
- if (vi == vend) // there must be at least one point
+ if (vi == vend) // there must be at least one point
return;
// make sure we got a pixbuf and that it has the right size
diff --git a/src/curve-view.cpp b/src/curve-view.cpp
index 2b8c2bc..bee5e38 100644
--- a/src/curve-view.cpp
+++ b/src/curve-view.cpp
@@ -19,7 +19,7 @@
* USA.
*/
-#include <algorithm> // for max/min[_element]()
+#include <algorithm> // for max/min[_element]()
#include <libgnomecanvasmm/line.h>
#include <libgnomecanvasmm/point.h>
@@ -41,7 +41,7 @@ public:
void update(unsigned int max_samples); // gather info from monitor
void draw(Gnome::Canvas::Canvas &canvas, // redraw curve on canvas
- int width, int height);
+ int width, int height);
Monitor *monitor;
@@ -104,7 +104,7 @@ void Curve::draw(Gnome::Canvas::Canvas &canvas, int width, int height)
// start from right
double x = width + CurveView::pixels_per_sample * time_offset;
-
+
do {
double y = line_width/2 + (1 - (*vi / max)) * (height - line_width/2);
if (y < 0)
diff --git a/src/flame-view.cpp b/src/flame-view.cpp
index c62f30a..a26b8e6 100644
--- a/src/flame-view.cpp
+++ b/src/flame-view.cpp
@@ -42,7 +42,7 @@ public:
Flame(Monitor *monitor, unsigned int color);
void update(Gnome::Canvas::Canvas &canvas,
- Applet *applet, int width, int height, int no, int total);
+ Applet *applet, int width, int height, int no, int total);
void burn();
@@ -55,7 +55,7 @@ private:
std::vector<unsigned char> fuel;
int next_refuel;
- int cooling; // cooling factor
+ int cooling; // cooling factor
void recompute_fuel();
unsigned int color;
@@ -66,7 +66,7 @@ Flame::Flame(Monitor *m, unsigned int c)
{}
void Flame::update(Gnome::Canvas::Canvas &canvas,
- Applet *applet, int width, int height, int no, int total)
+ Applet *applet, int width, int height, int no, int total)
{
// Then make sure layer is correctly setup
if (flame.get() == 0)
@@ -85,7 +85,7 @@ void Flame::update(Gnome::Canvas::Canvas &canvas,
if (pixbuf->get_width() != width || pixbuf->get_height() != height)
{
Glib::RefPtr<Gdk::Pixbuf> new_pixbuf =
- Gdk::Pixbuf::create(Gdk::COLORSPACE_RGB, true, 8, width, height);
+ Gdk::Pixbuf::create(Gdk::COLORSPACE_RGB, true, 8, width, height);
new_pixbuf->fill(color & 0xFFFFFF00);
flame->property_pixbuf() = new_pixbuf;
@@ -107,7 +107,7 @@ void Flame::update(Gnome::Canvas::Canvas &canvas,
pixel.green() = green;
pixel.blue() = blue;
}
-
+
flame->property_pixbuf() = pixbuf;
}
}
@@ -213,13 +213,13 @@ void Flame::burn()
(left_alpha + 6 * pos_alpha + right_alpha + 8 * below_alpha) / 16;
pos.pixel().alpha()
- = std::max(((256 + cooling) * tmp - cooling * 256) / 256, 0);
+ = std::max(((256 + cooling) * tmp - cooling * 256) / 256, 0);
#if 0
if (std::rand() / 4 == 0)
- pos.pixel().alpha()
- = (pos.pixel().alpha() * y * 2
- + random_between(0, 255) * (height - y)) / height / 3;
+ pos.pixel().alpha()
+ = (pos.pixel().alpha() * y * 2
+ + random_between(0, 255) * (height - y)) / height / 3;
#endif
left_alpha = pos_alpha;
diff --git a/src/gui-helpers.hpp b/src/gui-helpers.hpp
index 4a38d99..092cbcb 100644
--- a/src/gui-helpers.hpp
+++ b/src/gui-helpers.hpp
@@ -34,7 +34,7 @@ inline Glib::RefPtr<Gnome::Glade::Xml> get_glade_xml(Glib::ustring root)
{
try {
return Gnome::Glade::Xml::create(HARDWARE_MONITOR_GLADEDIR
- "ui.glade", root);
+ "ui.glade", root);
}
catch (Gnome::Glade::XmlError &error) {
fatal_error(error.what());
diff --git a/src/monitor-impls.cpp b/src/monitor-impls.cpp
index 772bdb0..967c165 100644
--- a/src/monitor-impls.cpp
+++ b/src/monitor-impls.cpp
@@ -3,8 +3,8 @@
* Copyright (c) 2003, 04, 05 Ole Laursen.
* Copyright (c) 2013 OmegaPhil (OmegaPhil+hardware.monitor at gmail.com)
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
@@ -22,7 +22,7 @@
#include <string>
#include <iomanip>
#include <ostream>
-#include <sys/time.h> // for high-precision timing for the network load
+#include <sys/time.h> // for high-precision timing for the network load
#include <vector>
#include <algorithm>
#include <cstdio>
@@ -45,7 +45,7 @@
// decay factor for maximum values (log_0.999(0.9) = 105 iterations before
// reduced 10%)
-double const max_decay = 0.999;
+double const max_decay = 0.999;
//
@@ -69,13 +69,13 @@ load_monitors(XfceRc* settings)
// Skipping default group
if (g_strcmp0(settings_monitors[i], "[NULL]") == 0)
continue;
-
+
// Setting the correct group prior to loading settings
xfce_rc_set_group(settings, settings_monitors[i]);
-
+
// Obtaining monitor type
Glib::ustring type = xfce_rc_read_entry(settings, "type", "");
-
+
if (type == "cpu_usage")
{
// Obtaining cpu_no
@@ -115,14 +115,14 @@ load_monitors(XfceRc* settings)
// Fetching interface number
int inter_no = xfce_rc_read_int_entry(settings, "interface_no",
0);
-
+
// Fetching interface 'direction' setting
int inter_direction = xfce_rc_read_int_entry(settings,
"interface_direction", NetworkLoadMonitor::all_data);
// Converting direction setting into dedicated type
NetworkLoadMonitor::Direction dir;
-
+
if (inter_direction == NetworkLoadMonitor::incoming_data)
dir = NetworkLoadMonitor::incoming_data;
else if (inter_direction == NetworkLoadMonitor::outgoing_data)
@@ -146,7 +146,7 @@ load_monitors(XfceRc* settings)
{
// Fetching fan number
int fan_no = xfce_rc_read_int_entry(settings, "fan_no", 0);
-
+
// Creating fan monitor
monitors.push_back(new FanSpeedMonitor(fan_no));
}
@@ -210,7 +210,7 @@ Precision decimal_digits(double val, int n)
p.n = n;
}
-
+
return p;
}
@@ -235,11 +235,11 @@ CpuUsageMonitor::CpuUsageMonitor(int cpu)
double CpuUsageMonitor::do_measure()
{
glibtop_cpu cpu;
-
+
glibtop_get_cpu(&cpu);
guint64 t, n, i, io;
-
+
if (cpu_no == all_cpus) {
t = cpu.total;
n = cpu.nice;
@@ -252,7 +252,7 @@ double CpuUsageMonitor::do_measure()
i = cpu.xcpu_idle[cpu_no];
io = cpu.xcpu_iowait[cpu_no];
}
-
+
// calculate ticks since last call
guint64
dtotal = t - total_time,
@@ -333,9 +333,9 @@ SwapUsageMonitor::SwapUsageMonitor()
double SwapUsageMonitor::do_measure()
{
glibtop_swap swp;
-
+
glibtop_get_swap(&swp);
-
+
max_value = swp.total;
if (swp.total > 0)
@@ -352,7 +352,7 @@ double SwapUsageMonitor::max()
Glib::ustring SwapUsageMonitor::format_value(double val)
{
val /= 1000000;
-
+
return String::ucompose(_("%1 Mb"), decimal_digits(val, 3), val);
}
@@ -395,16 +395,16 @@ LoadAverageMonitor::LoadAverageMonitor()
double LoadAverageMonitor::do_measure()
{
glibtop_loadavg loadavg;
-
+
glibtop_get_loadavg (&loadavg);
double val = loadavg.loadavg[0];
-
- max_value *= max_decay; // reduce gradually
-
- if (max_value < 1) // make sure we don't get below 1
+
+ max_value *= max_decay; // reduce gradually
+
+ if (max_value < 1) // make sure we don't get below 1
max_value = 1;
-
+
if (val > max_value)
max_value = val * 1.05;
@@ -480,7 +480,7 @@ MemoryUsageMonitor::MemoryUsageMonitor()
double MemoryUsageMonitor::do_measure()
{
glibtop_mem mem;
-
+
glibtop_get_mem (&mem);
max_value = mem.total;
@@ -495,11 +495,11 @@ double MemoryUsageMonitor::max()
{
return max_value;
}
-
+
Glib::ustring MemoryUsageMonitor::format_value(double val)
{
val /= 1000000;
-
+
return String::ucompose(_("%1 Mb"), decimal_digits(val, 3), val);
}
@@ -548,7 +548,7 @@ double DiskUsageMonitor::do_measure()
max_value = fsusage.blocks * fsusage.block_size;
double v = 0;
-
+
if (show_free) {
if (fsusage.bavail > 0)
v = fsusage.bavail * fsusage.block_size;
@@ -557,7 +557,7 @@ double DiskUsageMonitor::do_measure()
if (fsusage.blocks > 0)
v = (fsusage.blocks - fsusage.bfree) * fsusage.block_size;
}
-
+
return v;
}
@@ -618,7 +618,7 @@ void DiskUsageMonitor::save(XfceRc *settings)
//
NetworkLoadMonitor::NetworkLoadMonitor(const Glib::ustring &inter, int inter_no,
- Direction dir)
+ Direction dir)
: max_value(1), byte_count(0), time_stamp_secs(0), time_stamp_usecs(0),
interface(inter), interface_no(inter_no), direction(dir)
{
@@ -629,9 +629,9 @@ double NetworkLoadMonitor::do_measure()
glibtop_netload netload;
glibtop_get_netload(&netload,
- String::ucompose("%1%2", interface, interface_no).c_str());
+ String::ucompose("%1%2", interface, interface_no).c_str());
guint64 val, measured_bytes;
-
+
if (direction == all_data)
measured_bytes = netload.bytes_total;
else if (direction == incoming_data)
@@ -641,16 +641,16 @@ double NetworkLoadMonitor::do_measure()
if (byte_count == 0) // no estimate initially
val = 0;
- else if (measured_bytes < byte_count) // interface was reset
+ else if (measured_bytes < byte_count) // interface was reset
val = 0;
else
val = measured_bytes - byte_count;
byte_count = measured_bytes;
- if (val != 0) // reduce scale gradually
+ if (val != 0) // reduce scale gradually
max_value = guint64(max_value * max_decay);
-
+
if (val > max_value)
max_value = guint64(val * 1.05);
@@ -662,7 +662,7 @@ double NetworkLoadMonitor::do_measure()
else if (max_value > other.max_value)
other.max_value = max_value;
}
-
+
// calculate difference in msecs
struct timeval tv;
if (gettimeofday(&tv, 0) == 0) {
@@ -686,9 +686,9 @@ Glib::ustring NetworkLoadMonitor::format_value(double val)
// 1000 ms = 1 s
val = val / time_difference * 1000;
- if (val <= 0) // fix weird problem with negative values
+ if (val <= 0) // fix weird problem with negative values
val = 0;
-
+
if (val >= 1000 * 1000 * 1000) {
val /= 1000 * 1000 * 1000;
return String::ucompose(_("%1 GB/s"), decimal_digits(val, 3), val);
@@ -701,14 +701,14 @@ Glib::ustring NetworkLoadMonitor::format_value(double val)
val /= 1000;
return String::ucompose(_("%1 kB/s"), decimal_digits(val, 3), val);
}
- else
+ else
return String::ucompose(_("%1 B/s"), decimal_digits(val, 3), val);
}
Glib::ustring NetworkLoadMonitor::get_name()
{
Glib::ustring str;
-
+
if (interface == "eth" && interface_no == 0)
str = _("Ethernet (first)");
else if (interface == "eth" && interface_no == 1)
@@ -733,14 +733,14 @@ Glib::ustring NetworkLoadMonitor::get_name()
// %1 is the network connection, e.g. "Ethernet (first)", out signifies
// that this is outgoing data
str = String::ucompose(_("%1, out"), str);
-
+
return str;
}
Glib::ustring NetworkLoadMonitor::get_short_name()
{
Glib::ustring str;
-
+
if (interface == "eth")
// short for an ethernet card
str = String::ucompose(_("Eth. %1"), interface_no + 1);
@@ -808,7 +808,7 @@ void NetworkLoadMonitor::possibly_add_sync_with(Monitor *other)
{
if (NetworkLoadMonitor *o = dynamic_cast<NetworkLoadMonitor *>(other))
if (interface == o->interface && interface_no == o->interface_no
- && direction != o->direction)
+ && direction != o->direction)
sync_monitors.push_back(o);
}
@@ -834,7 +834,7 @@ Sensors::Sensors()
int i = 0;
const sensors_chip_name *c;
-
+
while ((c = sensors_get_detected_chips(0, &i)))
chips.push_back(*c);
#endif
@@ -844,7 +844,7 @@ Sensors::~Sensors()
{
#if HAVE_LIBSENSORS
chips.clear();
-
+
sensors_cleanup();
#endif
}
@@ -859,7 +859,7 @@ Sensors &Sensors::instance()
Sensors::FeatureInfoSequence Sensors::get_features(std::string base)
{
FeatureInfoSequence vec;
-
+
#if HAVE_LIBSENSORS
const sensors_feature *feature;
@@ -870,23 +870,23 @@ Sensors::FeatureInfoSequence Sensors::get_features(std::string base)
while ((feature = sensors_get_features(chip, &i1))) {
std::string name = feature->name;
if (name.find(base) != std::string::npos) {
- FeatureInfo info;
- info.chip_no = i;
- info.feature_no = feature->number;
- info.max = invalid_max;
-
- char *desc = sensors_get_label(chip, feature);
- if (desc) {
- info.description = desc;
- std::free(desc);
- }
-
- vec.push_back(info);
+ FeatureInfo info;
+ info.chip_no = i;
+ info.feature_no = feature->number;
+ info.max = invalid_max;
+
+ char *desc = sensors_get_label(chip, feature);
+ if (desc) {
+ info.description = desc;
+ std::free(desc);
+ }
+
+ vec.push_back(info);
// now see if we can find a max
const sensors_subfeature *subfeature;
int i2 = 0;
-
+
while ((subfeature = sensors_get_all_subfeatures(chip, feature, &i2))) {
std::string subname = subfeature->name;
// check whether this is a max value for the last feature
@@ -903,7 +903,7 @@ Sensors::FeatureInfoSequence Sensors::get_features(std::string base)
}
}
#endif
-
+
return vec;
}
@@ -916,7 +916,7 @@ Sensors::FeatureInfoSequence Sensors::get_fan_features()
{
return get_features("fan");
}
-
+
double Sensors::get_value(int chip_no, int feature_no)
{
#if HAVE_LIBSENSORS
@@ -947,20 +947,20 @@ TemperatureMonitor::TemperatureMonitor(int no)
{
Sensors::FeatureInfo info
= Sensors::instance().get_temperature_features()[sensors_no];
-
+
chip_no = info.chip_no;
feature_no = info.feature_no;
description = info.description;
if (info.max != Sensors::invalid_max)
max_value = info.max;
else
- max_value = 40; // set a reasonable default (40 Celcius degrees)
+ max_value = 40; // set a reasonable default (40 Celcius degrees)
}
double TemperatureMonitor::do_measure()
{
double val = Sensors::instance().get_value(chip_no, feature_no);
-
+
if (val > max_value)
max_value = val;
@@ -983,7 +983,7 @@ Glib::ustring TemperatureMonitor::get_name()
if (!description.empty())
// %2 is a descriptive string from sensors.conf
return String::ucompose(_("Temperature %1: \"%2\""),
- sensors_no + 1, description);
+ sensors_no + 1, description);
else
return String::ucompose(_("Temperature %1"), sensors_no + 1);
}
@@ -1039,20 +1039,20 @@ FanSpeedMonitor::FanSpeedMonitor(int no)
{
Sensors::FeatureInfo info
= Sensors::instance().get_fan_features()[sensors_no];
-
+
chip_no = info.chip_no;
feature_no = info.feature_no;
description = info.description;
if (info.max != Sensors::invalid_max)
max_value = info.max;
else
- max_value = 1; // 1 rpm isn't realistic, but whatever
+ max_value = 1; // 1 rpm isn't realistic, but whatever
}
double FanSpeedMonitor::do_measure()
{
double val = Sensors::instance().get_value(chip_no, feature_no);
-
+
if (val > max_value)
max_value = val;
@@ -1075,7 +1075,7 @@ Glib::ustring FanSpeedMonitor::get_name()
if (!description.empty())
// %2 is a descriptive string from sensors.conf
return String::ucompose(_("Fan %1 speed: \"%2\""),
- sensors_no + 1, description);
+ sensors_no + 1, description);
else
return String::ucompose(_("Fan %1 speed"), sensors_no + 1);
}
diff --git a/src/monitor-impls.hpp b/src/monitor-impls.hpp
index ac53149..f1a159a 100644
--- a/src/monitor-impls.hpp
+++ b/src/monitor-impls.hpp
@@ -3,8 +3,8 @@
* Copyright (c) 2003, 04, 05 Ole Laursen.
* Copyright (c) 2013 OmegaPhil (OmegaPhil+hardware.monitor at gmail.com)
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
@@ -40,8 +40,8 @@
class CpuUsageMonitor: public Monitor
{
public:
- CpuUsageMonitor(); // monitor all cpus
- CpuUsageMonitor(int cpu_no); // monitor only cpu no.
+ CpuUsageMonitor(); // monitor all cpus
+ CpuUsageMonitor(int cpu_no); // monitor only cpu no.
virtual double max();
virtual Glib::ustring format_value(double val);
@@ -51,13 +51,13 @@ public:
virtual void save(XfceRc *settings);
static int const max_no_cpus;
-
+
private:
virtual double do_measure();
-
+
static int const all_cpus = -1;
int cpu_no;
-
+
// we need to save these values to compute the difference next time the
// monitor is updated
guint64 total_time, nice_time, idle_time, iowait_time;
@@ -68,7 +68,7 @@ class SwapUsageMonitor: public Monitor
{
public:
SwapUsageMonitor();
-
+
virtual double max();
virtual Glib::ustring format_value(double val);
virtual Glib::ustring get_name();
@@ -78,16 +78,16 @@ public:
private:
virtual double do_measure();
-
- guint64 max_value; // maximum available swap
+
+ guint64 max_value; // maximum available swap
};
-
-
+
+
class LoadAverageMonitor: public Monitor
{
public:
LoadAverageMonitor();
-
+
virtual double max();
virtual Glib::ustring format_value(double val);
virtual Glib::ustring get_name();
@@ -95,19 +95,19 @@ public:
virtual int update_interval();
virtual void save(XfceRc *settings);
virtual void load(XfceRc *settings);
-
+
private:
virtual double do_measure();
-
- double max_value; // currently monitored max number of processes
+
+ double max_value; // currently monitored max number of processes
};
-
-
+
+
class MemoryUsageMonitor: public Monitor
{
public:
MemoryUsageMonitor();
-
+
virtual double max();
virtual Glib::ustring format_value(double val);
virtual Glib::ustring get_name();
@@ -117,16 +117,16 @@ public:
private:
virtual double do_measure();
-
- guint64 max_value; // maximum available physical RAM
+
+ guint64 max_value; // maximum available physical RAM
};
-
+
class DiskUsageMonitor: public Monitor
{
public:
DiskUsageMonitor(const std::string &mount_dir, bool show_free);
-
+
virtual double max();
virtual Glib::ustring format_value(double val);
virtual Glib::ustring get_name();
@@ -136,8 +136,8 @@ public:
private:
virtual double do_measure();
-
- guint64 max_value; // maximum available disk blocks
+
+ guint64 max_value; // maximum available disk blocks
std::string mount_dir;
bool show_free;
@@ -149,10 +149,10 @@ public:
enum Direction {
all_data, incoming_data, outgoing_data
};
-
+
NetworkLoadMonitor(const Glib::ustring &interface, int interface_no,
- Direction direction);
-
+ Direction direction);
+
virtual double max();
virtual Glib::ustring format_value(double val);
virtual Glib::ustring get_name();
@@ -165,15 +165,15 @@ public:
private:
virtual double do_measure();
-
- guint64 max_value; // maximum measured capacity of line
- long int time_difference; // no. of msecs. between the last two calls
-
- guint64 byte_count; // number of bytes at last call
+
+ guint64 max_value; // maximum measured capacity of line
+ long int time_difference; // no. of msecs. between the last two calls
+
+ guint64 byte_count; // number of bytes at last call
long int time_stamp_secs, time_stamp_usecs; // time stamp for last call
- Glib::ustring interface; // e.g. "eth"
- int interface_no; // e.g. 0
+ Glib::ustring interface; // e.g. "eth"
+ int interface_no; // e.g. 0
Direction direction;
typedef std::list<NetworkLoadMonitor *> nlm_seq;
@@ -184,8 +184,8 @@ private:
class TemperatureMonitor: public Monitor
{
public:
- TemperatureMonitor(int no); // no. in the temperature features
-
+ TemperatureMonitor(int no); // no. in the temperature features
+
virtual double max();
virtual Glib::ustring format_value(double val);
virtual Glib::ustring get_name();
@@ -196,7 +196,7 @@ public:
private:
virtual double do_measure();
-
+
double max_value;
int chip_no, feature_no, sensors_no;
std::string description;
@@ -206,8 +206,8 @@ private:
class FanSpeedMonitor: public Monitor
{
public:
- FanSpeedMonitor(int no); // no. in the fan features
-
+ FanSpeedMonitor(int no); // no. in the fan features
+
virtual double max();
virtual Glib::ustring format_value(double val);
virtual Glib::ustring get_name();
@@ -218,7 +218,7 @@ public:
private:
virtual double do_measure();
-
+
double max_value;
int chip_no, feature_no, sensors_no;
std::string description;
@@ -232,11 +232,11 @@ public:
static Sensors &instance();
static double const invalid_max;
-
+
struct FeatureInfo
{
int chip_no, feature_no;
- std::string description; // description from sensors.conf
+ std::string description; // description from sensors.conf
double max;
};
typedef std::vector<FeatureInfo> FeatureInfoSequence;
diff --git a/src/pixbuf-drawing.hpp b/src/pixbuf-drawing.hpp
index 508cda4..c23d250 100644
--- a/src/pixbuf-drawing.hpp
+++ b/src/pixbuf-drawing.hpp
@@ -140,7 +140,7 @@ private:
};
inline PixelPosition get_position(const Glib::RefPtr<Gdk::Pixbuf> &pixbuf,
- int x, int y)
+ int x, int y)
{
unsigned char *data = pixbuf->get_pixels();
int rowstride = pixbuf->get_rowstride();
@@ -164,7 +164,7 @@ public:
{}
PixelIterator(const Glib::RefPtr<Gdk::Pixbuf> &p,
- unsigned int x, unsigned int y)
+ unsigned int x, unsigned int y)
: xpos(x), width(p->get_width()), channels(p->get_n_channels()),
padding(p->get_rowstride() - width * channels)
{
diff --git a/src/preferences-window.cpp b/src/preferences-window.cpp
index 4e9fd4e..1aeb8a2 100644
--- a/src/preferences-window.cpp
+++ b/src/preferences-window.cpp
@@ -37,11 +37,11 @@
void PreferencesWindow::connect_monitor_colorbutton(Gtk::ColorButton
- *colorbutton)
+ *colorbutton)
{
colorbutton->signal_color_set()
.connect(sigc::bind(sigc::mem_fun(*this, &PreferencesWindow::on_monitor_colorbutton_set),
- colorbutton));
+ colorbutton));
}
PreferencesWindow::PreferencesWindow(Applet &applet_, monitor_seq monitors)
@@ -58,32 +58,32 @@ PreferencesWindow::PreferencesWindow(Applet &applet_, monitor_seq monitors)
ui->get_widget("curve_radiobutton", curve_radiobutton);
curve_radiobutton->signal_toggled()
.connect(sigc::mem_fun(*this, &PreferencesWindow::
- on_curve_radiobutton_toggled));
+ on_curve_radiobutton_toggled));
ui->get_widget("bar_radiobutton", bar_radiobutton);
bar_radiobutton->signal_toggled()
.connect(sigc::mem_fun(*this, &PreferencesWindow::
- on_bar_radiobutton_toggled));
+ on_bar_radiobutton_toggled));
ui->get_widget("vbar_radiobutton", vbar_radiobutton);
vbar_radiobutton->signal_toggled()
.connect(sigc::mem_fun(*this, &PreferencesWindow::
- on_vbar_radiobutton_toggled));
+ on_vbar_radiobutton_toggled));
ui->get_widget("column_radiobutton", column_radiobutton);
column_radiobutton->signal_toggled()
.connect(sigc::mem_fun(*this, &PreferencesWindow::
- on_column_radiobutton_toggled));
+ on_column_radiobutton_toggled));
ui->get_widget("text_radiobutton", text_radiobutton);
text_radiobutton->signal_toggled()
.connect(sigc::mem_fun(*this, &PreferencesWindow::
- on_text_radiobutton_toggled));
+ on_text_radiobutton_toggled));
ui->get_widget("flame_radiobutton", flame_radiobutton);
flame_radiobutton->signal_toggled()
.connect(sigc::mem_fun(*this, &PreferencesWindow::
- on_flame_radiobutton_toggled));
+ on_flame_radiobutton_toggled));
ui->get_widget("size_outer_vbox", size_outer_vbox);
@@ -96,7 +96,7 @@ PreferencesWindow::PreferencesWindow(Applet &applet_, monitor_seq monitors)
ui->get_widget("font_checkbutton", font_checkbutton);
font_checkbutton->signal_toggled()
.connect(sigc::mem_fun(*this, &PreferencesWindow::
- on_font_checkbutton_toggled));
+ on_font_checkbutton_toggled));
ui->get_widget("fontbutton", fontbutton);
fontbutton->signal_font_set()
@@ -106,13 +106,13 @@ PreferencesWindow::PreferencesWindow(Applet &applet_, monitor_seq monitors)
ui->get_widget("background_colorbutton", background_colorbutton);
background_colorbutton->signal_color_set()
.connect(sigc::mem_fun(*this, &PreferencesWindow::
- on_background_colorbutton_set));
+ on_background_colorbutton_set));
ui->get_widget("panel_background_radiobutton", panel_background_radiobutton);
ui->get_widget("background_color_radiobutton", background_color_radiobutton);
background_color_radiobutton->signal_toggled()
.connect(sigc::mem_fun(*this, &PreferencesWindow::
- on_background_color_radiobutton_toggled));
+ on_background_color_radiobutton_toggled));
// connect the Monitor tab widgets
@@ -205,10 +205,10 @@ void PreferencesWindow::show()
namespace
{
void update_colorbutton_if_different(Gtk::ColorButton *colorbutton,
- unsigned char r,
- unsigned char g,
- unsigned char b,
- unsigned char a)
+ unsigned char r,
+ unsigned char g,
+ unsigned char b,
+ unsigned char a)
{
unsigned char pa, pr, pg, pb;
@@ -345,7 +345,7 @@ namespace
{
// Helper for avoiding clipping when shifting values
unsigned int pack_int(unsigned int r, unsigned int g, unsigned int b,
- unsigned int a)
+ unsigned int a)
{
return ((r & 255) << 24) | ((g & 255) << 16) | ((b & 255) << 8) | (a & 255);
}
@@ -406,7 +406,7 @@ void PreferencesWindow::on_background_colorbutton_set()
{
// Settings dir here is the default XFCE4 settings group
sync_conf_with_colorbutton("[NULL]", "background_color",
- background_colorbutton);
+ background_colorbutton);
// Actually apply the color change
applet.background_color_listener(
diff --git a/src/text-view.cpp b/src/text-view.cpp
index 9cc720b..b6dab96 100644
--- a/src/text-view.cpp
+++ b/src/text-view.cpp
@@ -57,7 +57,7 @@ void Text::add_to_table(Gtk::Table &table, int col, int row)
{
label.reset(new Gtk::Label);
table.attach(*label, col, col + 1, row, row + 1,
- Gtk::EXPAND | Gtk::FILL | Gtk::SHRINK, Gtk::SHRINK);
+ Gtk::EXPAND | Gtk::FILL | Gtk::SHRINK, Gtk::SHRINK);
label->set_alignment(0, 0.5);
}
@@ -136,8 +136,8 @@ void TextView::do_set_background(unsigned int color)
{
Gdk::Color c;
c.set_rgb(((color >> 24) & 0xff) * 256,
- ((color >> 16) & 0xff) * 256,
- ((color >> 8) & 0xff) * 256);
+ ((color >> 16) & 0xff) * 256,
+ ((color >> 8) & 0xff) * 256);
background_box.modify_bg(Gtk::STATE_NORMAL, c);
background_box.modify_bg(Gtk::STATE_ACTIVE, c);
diff --git a/src/view.hpp b/src/view.hpp
index f8983b6..cc440ba 100644
--- a/src/view.hpp
+++ b/src/view.hpp
@@ -3,8 +3,8 @@
* Copyright (c) 2003, 04 Ole Laursen.
* Copyright (c) 2013 OmegaPhil (OmegaPhil+hardware.monitor at gmail.com)
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
@@ -50,9 +50,9 @@ public:
void unset_background();
bool const keeps_history;
-
+
protected:
- Applet *applet; // store pointer for reference
+ Applet *applet; // store pointer for reference
private:
// for derived classes to override
@@ -60,7 +60,7 @@ private:
virtual void do_update() = 0;
virtual void do_attach(Monitor *monitor) = 0;
virtual void do_detach(Monitor *monitor) = 0;
-
+
virtual void do_set_background(unsigned int color) = 0;
virtual void do_unset_background() = 0;
};
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list