[gnome-system-monitor] Consistently use #defines to identify gsettings keys
- From: Robert Roth <robertroth src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-system-monitor] Consistently use #defines to identify gsettings keys
- Date: Mon, 5 Aug 2013 21:25:39 +0000 (UTC)
commit b4f345c8cb4e1a468c842278d9317f5b2dca27e9
Author: Stefano Facchini <stefano facchini gmail com>
Date: Sun Aug 4 19:29:28 2013 +0200
Consistently use #defines to identify gsettings keys
https://bugzilla.gnome.org/show_bug.cgi?id=705456
src/Makefile.am | 4 +-
src/disks.cpp | 21 ++++-----
src/interface.cpp | 44 +++++++++++--------
src/memmaps.cpp | 3 +-
src/openfiles.cpp | 4 +-
src/procdialogs.cpp | 26 ++++++++---
src/procman-app.cpp | 115 ++++++++++++++++++++++--------------------------
src/proctable.cpp | 27 ++++++-----
src/settings-keys.cpp | 16 -------
src/settings-keys.h | 39 +++++++++++-----
src/smooth_refresh.cpp | 3 +-
11 files changed, 154 insertions(+), 148 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 7969980..555f4a9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,7 +31,6 @@ gnome_system_monitor_cpp_files = \
procman_gksu.cpp \
procman_pkexec.cpp \
lsof.cpp \
- settings-keys.cpp \
iconthemewrapper.cpp \
procman-app.cpp
@@ -42,7 +41,8 @@ gnome_system_monitor_c_files = \
gnome_system_monitor_h_files = \
$(gnome_system_monitor_cpp_files:.cpp=.h) \
$(gnome_system_monitor_c_files:.c=.h) \
- defaulttable.h
+ defaulttable.h \
+ settings-keys.h
gnome_system_monitor_SOURCES = \
$(BUILT_SOURCES) \
diff --git a/src/disks.cpp b/src/disks.cpp
index 293b0c6..0c30262 100644
--- a/src/disks.cpp
+++ b/src/disks.cpp
@@ -8,11 +8,11 @@
#include <glibtop/fsusage.h>
#include <glib/gi18n.h>
-#include "procman-app.h"
#include "disks.h"
+#include "procman-app.h"
#include "util.h"
-#include "interface.h"
#include "iconthemewrapper.h"
+#include "settings-keys.h"
enum DiskColumns
{
@@ -40,7 +40,7 @@ cb_sort_changed (GtkTreeSortable *model, gpointer data)
procman_save_tree_state (app->settings,
GTK_WIDGET (app->disk_list),
- "disktreenew");
+ GSM_SETTINGS_CHILD_DISKS);
}
static void
@@ -247,8 +247,7 @@ disks_update(ProcmanApp *app)
gboolean show_all_fs;
list = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(app->disk_list)));
- show_all_fs = g_settings_get_boolean (app->settings, "show-all-fs");
-
+ show_all_fs = g_settings_get_boolean (app->settings, GSM_SETTING_SHOW_ALL_FS);
entries = glibtop_get_mountlist (&mountlist, show_all_fs);
remove_old_disks(GTK_TREE_MODEL(list), entries, mountlist.number);
@@ -301,9 +300,9 @@ cb_disk_columns_changed(GtkTreeView *treeview, gpointer data)
{
ProcmanApp *app = static_cast<ProcmanApp *>(data);
- procman_save_tree_state(app->settings,
- GTK_WIDGET(treeview),
- "disktreenew");
+ procman_save_tree_state (app->settings,
+ GTK_WIDGET (treeview),
+ GSM_SETTINGS_CHILD_DISKS);
}
@@ -381,7 +380,7 @@ create_disk_view(ProcmanApp *app, GtkBuilder *builder)
N_("Used")
};
- GSettings * settings = g_settings_get_child (app->settings, "disktreenew");
+ GSettings * settings = g_settings_get_child (app->settings, GSM_SETTINGS_CHILD_DISKS);
scrolled = GTK_WIDGET (gtk_builder_get_object (builder, "disks_scrolled"));
@@ -484,7 +483,7 @@ create_disk_view(ProcmanApp *app, GtkBuilder *builder)
/* numeric sort */
procman_get_tree_state (app->settings, disk_tree,
- "disktreenew");
+ GSM_SETTINGS_CHILD_DISKS);
g_signal_connect (G_OBJECT(disk_tree), "destroy",
G_CALLBACK(cb_disk_list_destroying),
@@ -496,7 +495,7 @@ create_disk_view(ProcmanApp *app, GtkBuilder *builder)
g_signal_connect (G_OBJECT (model), "sort-column-changed",
G_CALLBACK (cb_sort_changed), app);
- g_signal_connect (app->settings, "changed::show-all-fs",
+ g_signal_connect (app->settings, "changed::" GSM_SETTING_SHOW_ALL_FS,
G_CALLBACK (cb_show_all_fs_changed), app);
gtk_widget_show (disk_tree);
diff --git a/src/interface.cpp b/src/interface.cpp
index 692334e..98729c0 100644
--- a/src/interface.cpp
+++ b/src/interface.cpp
@@ -41,6 +41,7 @@
#include "load-graph.h"
#include "util.h"
#include "disks.h"
+#include "settings-keys.h"
#include "gsm_color_button.h"
@@ -108,7 +109,7 @@ cb_cpu_color_changed (GSMColorButton *cp, gpointer data)
GSettings *settings = g_settings_new (GSM_GSETTINGS_SCHEMA);
/* Get current values */
- GVariant *cpu_colors_var = g_settings_get_value(settings, "cpu-colors");
+ GVariant *cpu_colors_var = g_settings_get_value (settings, GSM_SETTING_CPU_COLORS);
gsize children_n = g_variant_n_children(cpu_colors_var);
/* Create builder to contruct new setting with updated value for cpu i */
@@ -130,7 +131,8 @@ cb_cpu_color_changed (GSMColorButton *cp, gpointer data)
}
/* Just set the value and let the changed::cpu-colors signal callback do the rest. */
- g_settings_set_value(settings, "cpu-colors", g_variant_builder_end(&builder));
+ g_settings_set_value (settings, GSM_SETTING_CPU_COLORS,
+ g_variant_builder_end(&builder));
}
static void change_settings_color(GSettings *settings, const char *key,
@@ -149,7 +151,7 @@ static void
cb_mem_color_changed (GSMColorButton *cp, gpointer data)
{
ProcmanApp *app = (ProcmanApp *) data;
- change_settings_color(app->settings, "mem-color", cp);
+ change_settings_color (app->settings, GSM_SETTING_MEM_COLOR, cp);
}
@@ -157,21 +159,21 @@ static void
cb_swap_color_changed (GSMColorButton *cp, gpointer data)
{
ProcmanApp *app = (ProcmanApp *) data;
- change_settings_color(app->settings, "swap-color", cp);
+ change_settings_color (app->settings, GSM_SETTING_SWAP_COLOR, cp);
}
static void
cb_net_in_color_changed (GSMColorButton *cp, gpointer data)
{
ProcmanApp *app = (ProcmanApp *) data;
- change_settings_color(app->settings, "net-in-color", cp);
+ change_settings_color (app->settings, GSM_SETTING_NET_IN_COLOR, cp);
}
static void
cb_net_out_color_changed (GSMColorButton *cp, gpointer data)
{
ProcmanApp *app = (ProcmanApp *) data;
- change_settings_color(app->settings, "net-out-color", cp);
+ change_settings_color(app->settings, GSM_SETTING_NET_OUT_COLOR, cp);
}
static void
@@ -341,9 +343,15 @@ create_sys_view (ProcmanApp *app, GtkBuilder * builder)
g_object_bind_property (mem_exp, "expanded", mem_graph_box, "visible", G_BINDING_SYNC_CREATE);
g_object_bind_property (net_exp, "expanded", net_graph_box, "visible", G_BINDING_SYNC_CREATE);
- g_settings_bind (app->settings, "show-cpu", cpu_exp, "expanded", G_SETTINGS_BIND_DEFAULT);
- g_settings_bind (app->settings, "show-mem", mem_exp, "expanded", G_SETTINGS_BIND_DEFAULT);
- g_settings_bind (app->settings, "show-network", net_exp, "expanded", G_SETTINGS_BIND_DEFAULT);
+ g_settings_bind (app->settings, GSM_SETTING_SHOW_CPU,
+ cpu_exp, "expanded",
+ G_SETTINGS_BIND_DEFAULT);
+ g_settings_bind (app->settings, GSM_SETTING_SHOW_MEM,
+ mem_exp, "expanded",
+ G_SETTINGS_BIND_DEFAULT);
+ g_settings_bind (app->settings, GSM_SETTING_SHOW_NETWORK,
+ net_exp, "expanded",
+ G_SETTINGS_BIND_DEFAULT);
}
@@ -404,7 +412,7 @@ on_activate_refresh (GSimpleAction *, GVariant *, gpointer data)
static void
kill_process_with_confirmation (ProcmanApp *app, int signal) {
- gboolean kill_dialog = g_settings_get_boolean (app->settings, "kill-dialog");
+ gboolean kill_dialog = g_settings_get_boolean (app->settings, GSM_SETTING_SHOW_KILL_DIALOG);
if (kill_dialog)
procdialog_create_kill_dialog (app, signal);
@@ -475,7 +483,7 @@ change_show_page_state (GSimpleAction *action, GVariant *state, gpointer data)
ProcmanApp *app = (ProcmanApp *) data;
g_simple_action_set_state (action, state);
- g_settings_set_value (app->settings, "current-tab", state);
+ g_settings_set_value (app->settings, GSM_SETTING_CURRENT_TAB, state);
}
static void
@@ -484,7 +492,7 @@ change_show_processes_state (GSimpleAction *action, GVariant *state, gpointer da
ProcmanApp *app = (ProcmanApp *) data;
g_simple_action_set_state (action, state);
- g_settings_set_value (app->settings, "show-whose-processes", state);
+ g_settings_set_value (app->settings, GSM_SETTING_SHOW_WHOSE_PROCESSES, state);
}
static void
@@ -493,7 +501,7 @@ change_show_dependencies_state (GSimpleAction *action, GVariant *state, gpointer
ProcmanApp *app = (ProcmanApp *) data;
g_simple_action_set_state (action, state);
- g_settings_set_value (app->settings, "show-dependencies", state);
+ g_settings_set_value (app->settings, GSM_SETTING_SHOW_DEPENDENCIES, state);
}
static void
@@ -604,14 +612,14 @@ create_main_window (ProcmanApp *app)
gtk_widget_set_name (main_window, "gnome-system-monitor");
app->main_window = main_window;
- g_settings_get (app->settings, "window-state", "(iiii)",
+ g_settings_get (app->settings, GSM_SETTING_WINDOW_STATE, "(iiii)",
&width, &height, &xpos, &ypos);
width = CLAMP (width, 50, gdk_screen_width ());
height = CLAMP (height, 50, gdk_screen_height ());
gtk_window_set_default_size (GTK_WINDOW (main_window), width, height);
gtk_window_move (GTK_WINDOW (main_window), xpos, ypos);
- if (g_settings_get_boolean (app->settings, "maximized"))
+ if (g_settings_get_boolean (app->settings, GSM_SETTING_MAXIMIZED))
gtk_window_maximize (GTK_WINDOW (main_window));
app->process_menu_button = process_menu_button = GTK_WIDGET (gtk_builder_get_object (builder,
"process_menu_button"));
@@ -660,7 +668,7 @@ create_main_window (ProcmanApp *app)
create_disk_view (app, builder);
- g_settings_bind (app->settings, "current-tab", stack, "visible-child-name", G_SETTINGS_BIND_DEFAULT);
+ g_settings_bind (app->settings, GSM_SETTING_CURRENT_TAB, stack, "visible-child-name",
G_SETTINGS_BIND_DEFAULT);
g_signal_connect (G_OBJECT (stack), "notify::visible-child",
G_CALLBACK (cb_change_current_page), app);
@@ -673,13 +681,13 @@ create_main_window (ProcmanApp *app)
action = g_action_map_lookup_action (G_ACTION_MAP (main_window),
"show-dependencies");
g_action_change_state (action,
- g_settings_get_value (app->settings, "show-dependencies"));
+ g_settings_get_value (app->settings, GSM_SETTING_SHOW_DEPENDENCIES));
action = g_action_map_lookup_action (G_ACTION_MAP (main_window),
"show-whose-processes");
g_action_change_state (action,
- g_settings_get_value (app->settings, "show-whose-processes"));
+ g_settings_get_value (app->settings, GSM_SETTING_SHOW_WHOSE_PROCESSES));
gtk_widget_show (main_window);
diff --git a/src/memmaps.cpp b/src/memmaps.cpp
index cc8323c..a554d84 100644
--- a/src/memmaps.cpp
+++ b/src/memmaps.cpp
@@ -18,6 +18,7 @@ using std::string;
#include "procman-app.h"
#include "memmaps.h"
#include "proctable.h"
+#include "settings-keys.h"
#include "util.h"
@@ -166,7 +167,7 @@ namespace
MemMapsData(GtkWidget *a_tree, GSettings *a_settings)
: tree(a_tree),
settings(a_settings),
- schema("memmapstree")
+ schema(GSM_SETTINGS_CHILD_MEMMAP)
{
procman_get_tree_state(this->settings, this->tree, this->schema);
}
diff --git a/src/openfiles.cpp b/src/openfiles.cpp
index 7c2697c..ca122d0 100644
--- a/src/openfiles.cpp
+++ b/src/openfiles.cpp
@@ -225,7 +225,7 @@ close_openfiles_dialog (GtkDialog *dialog, gint id, gpointer data)
guint timer;
settings = static_cast<GSettings*>(g_object_get_data (G_OBJECT (tree), "settings"));
- procman_save_tree_state (settings, tree, procman::settings::open_files_tree_prefix.c_str());
+ procman_save_tree_state (settings, tree, GSM_SETTINGS_CHILD_OPEN_FILES);
timer = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (tree), "timer"));
g_source_remove (timer);
@@ -294,7 +294,7 @@ create_openfiles_tree (ProcmanApp *app)
GTK_SORT_ASCENDING);*/
#endif
- procman_get_tree_state (app->settings, tree, procman::settings::open_files_tree_prefix.c_str());
+ procman_get_tree_state (app->settings, tree, GSM_SETTINGS_CHILD_OPEN_FILES);
return tree;
diff --git a/src/procdialogs.cpp b/src/procdialogs.cpp
index 493c090..d813706 100644
--- a/src/procdialogs.cpp
+++ b/src/procdialogs.cpp
@@ -282,14 +282,14 @@ private:
};
static void
-field_toggled (const gchar *gconf_parent, GtkCellRendererToggle *cell, gchar *path_str, gpointer data)
+field_toggled (const gchar *gsettings_parent, GtkCellRendererToggle *cell, gchar *path_str, gpointer data)
{
GtkTreeModel *model = static_cast<GtkTreeModel*>(data);
GtkTreePath *path = gtk_tree_path_new_from_string (path_str);
GtkTreeIter iter;
GtkTreeViewColumn *column;
gboolean toggled;
- GSettings *settings = g_settings_get_child (ProcmanApp::get()->settings, gconf_parent);
+ GSettings *settings = g_settings_get_child (ProcmanApp::get()->settings, gsettings_parent);
gchar *key;
int id;
@@ -454,13 +454,19 @@ procdialog_create_preferences_dialog (ProcmanApp *app)
g_settings_bind(app->settings, SmoothRefresh::KEY.c_str(), smooth_button, "active",
G_SETTINGS_BIND_DEFAULT);
check_button = GTK_WIDGET (gtk_builder_get_object (builder, "check_button"));
- g_settings_bind(app->settings, "kill-dialog", check_button, "active", G_SETTINGS_BIND_DEFAULT);
+ g_settings_bind (app->settings, GSM_SETTING_SHOW_KILL_DIALOG,
+ check_button, "active",
+ G_SETTINGS_BIND_DEFAULT);
GtkWidget *solaris_button = GTK_WIDGET (gtk_builder_get_object (builder, "solaris_button"));
- g_settings_bind(app->settings, procman::settings::solaris_mode.c_str(), solaris_button, "active",
G_SETTINGS_BIND_DEFAULT);
+ g_settings_bind (app->settings, GSM_SETTING_SOLARIS_MODE,
+ solaris_button, "active",
+ G_SETTINGS_BIND_DEFAULT);
GtkWidget *draw_stacked_button = GTK_WIDGET (gtk_builder_get_object (builder, "draw_stacked_button"));
- g_settings_bind(app->settings, procman::settings::draw_stacked.c_str(), draw_stacked_button, "active",
G_SETTINGS_BIND_DEFAULT);
+ g_settings_bind (app->settings, GSM_SETTING_DRAW_STACKED,
+ draw_stacked_button, "active",
+ G_SETTINGS_BIND_DEFAULT);
create_field_page (builder, app->tree, "proctree");
@@ -474,7 +480,9 @@ procdialog_create_preferences_dialog (ProcmanApp *app)
&graph_interval_updater);
GtkWidget *bits_button = GTK_WIDGET (gtk_builder_get_object (builder, "bits_button"));
- g_settings_bind(app->settings, procman::settings::network_in_bits.c_str(), bits_button, "active",
G_SETTINGS_BIND_DEFAULT);
+ g_settings_bind(app->settings, GSM_SETTING_NETWORK_IN_BITS,
+ bits_button, "active",
+ G_SETTINGS_BIND_DEFAULT);
update = (gfloat) app->config.disks_update_interval;
adjustment = (GtkAdjustment *) gtk_adjustment_new (update / 1000.0, 1.0,
@@ -487,7 +495,9 @@ procdialog_create_preferences_dialog (ProcmanApp *app)
check_button = GTK_WIDGET (gtk_builder_get_object (builder, "all_devices_check"));
- g_settings_bind(app->settings, "show-all-fs", check_button, "active", G_SETTINGS_BIND_DEFAULT);
+ g_settings_bind (app->settings, GSM_SETTING_SHOW_ALL_FS,
+ check_button, "active",
+ G_SETTINGS_BIND_DEFAULT);
create_field_page (builder, app->disk_list, "disktreenew");
@@ -495,7 +505,7 @@ procdialog_create_preferences_dialog (ProcmanApp *app)
g_signal_connect (G_OBJECT (prefs_dialog), "response",
G_CALLBACK (prefs_dialog_button_pressed), app);
- const char* current_tab = g_settings_get_string (app->settings, "current-tab");
+ const char* current_tab = g_settings_get_string (app->settings, GSM_SETTING_CURRENT_TAB);
if (strcmp (current_tab, "processes") == 0)
gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook), 0);
else if (strcmp (current_tab, "resources") == 0)
diff --git a/src/procman-app.cpp b/src/procman-app.cpp
index 2281956..f6e8498 100644
--- a/src/procman-app.cpp
+++ b/src/procman-app.cpp
@@ -54,14 +54,13 @@ timeouts_changed_cb (GSettings *settings, const gchar *key, gpointer data)
{
ProcmanApp *app = static_cast<ProcmanApp *>(data);
- if (g_str_equal (key, "update-interval")) {
+ if (strcmp (key, GSM_SETTING_PROCESS_UPDATE_INTERVAL) == 0) {
app->config.update_interval = g_settings_get_int (settings, key);
app->smooth_refresh->reset();
proctable_reset_timeout (app);
- }
- else if (g_str_equal (key, "graph-update-interval")){
+ } else if (strcmp (key, GSM_SETTING_GRAPH_UPDATE_INTERVAL) == 0) {
app->config.graph_update_interval = g_settings_get_int (settings, key);
load_graph_change_speed(app->cpu_graph,
app->config.graph_update_interval);
@@ -69,14 +68,10 @@ timeouts_changed_cb (GSettings *settings, const gchar *key, gpointer data)
app->config.graph_update_interval);
load_graph_change_speed(app->net_graph,
app->config.graph_update_interval);
- }
- else if (g_str_equal(key, "disks-interval")) {
+ } else if (strcmp (key, GSM_SETTING_DISKS_UPDATE_INTERVAL) == 0) {
app->config.disks_update_interval = g_settings_get_int (settings, key);
disks_reset_timeout (app);
}
- else {
- g_assert_not_reached();
- }
}
static void
@@ -84,7 +79,7 @@ apply_cpu_color_settings(GSettings *settings, gpointer data)
{
ProcmanApp *app = static_cast<ProcmanApp *>(data);
- GVariant *cpu_colors_var = g_settings_get_value(settings, "cpu-colors");
+ GVariant *cpu_colors_var = g_settings_get_value (settings, GSM_SETTING_CPU_COLORS);
gsize n = g_variant_n_children(cpu_colors_var);
gchar *color;
@@ -112,7 +107,7 @@ apply_cpu_color_settings(GSettings *settings, gpointer data)
full = g_variant_builder_end(&builder);
// if the user has more cores than colors stored in the gsettings, store the newly built gvariant in
gsettings
if (n < static_cast<guint>(app->config.num_cpus)) {
- g_settings_set_value(settings, "cpu-colors", full);
+ g_settings_set_value(settings, GSM_SETTING_CPU_COLORS, full);
} else {
g_variant_unref(full);
}
@@ -125,7 +120,7 @@ color_changed_cb (GSettings *settings, const gchar *key, gpointer data)
{
ProcmanApp *app = static_cast<ProcmanApp *>(data);
- if (g_str_equal (key, "cpu-colors")) {
+ if (strcmp (key, GSM_SETTING_CPU_COLORS) == 0) {
apply_cpu_color_settings(settings, app);
for (int i = 0; i < app->config.num_cpus; i++) {
if(!gdk_rgba_equal(&app->cpu_graph->colors[i], &app->config.cpu_color[i])) {
@@ -137,25 +132,19 @@ color_changed_cb (GSettings *settings, const gchar *key, gpointer data)
}
gchar *color = g_settings_get_string (settings, key);
- if (g_str_equal (key, "mem-color")) {
+ if (strcmp (key, GSM_SETTING_MEM_COLOR) == 0) {
gdk_rgba_parse (&app->config.mem_color, color);
app->mem_graph->colors.at(0) = app->config.mem_color;
- }
- else if (g_str_equal (key, "swap-color")) {
+ } else if (strcmp (key, GSM_SETTING_SWAP_COLOR) == 0) {
gdk_rgba_parse (&app->config.swap_color, color);
app->mem_graph->colors.at(1) = app->config.swap_color;
- }
- else if (g_str_equal (key, "net-in-color")) {
+ } else if (strcmp (key, GSM_SETTING_NET_IN_COLOR) == 0) {
gdk_rgba_parse (&app->config.net_in_color, color);
app->net_graph->colors.at(0) = app->config.net_in_color;
- }
- else if (g_str_equal (key, "net-out-color")) {
+ } else if (strcmp (key, GSM_SETTING_NET_OUT_COLOR) == 0) {
gdk_rgba_parse (&app->config.net_out_color, color);
app->net_graph->colors.at(1) = app->config.net_out_color;
}
- else {
- g_assert_not_reached();
- }
g_free (color);
}
@@ -168,26 +157,27 @@ ProcmanApp::load_settings()
settings = g_settings_new (GSM_GSETTINGS_SCHEMA);
- config.solaris_mode = g_settings_get_boolean(settings, procman::settings::solaris_mode.c_str());
- std::string detail_string("changed::" + procman::settings::solaris_mode);
- g_signal_connect(G_OBJECT(settings), detail_string.c_str(), G_CALLBACK(solaris_mode_changed_cb), this);
+ config.solaris_mode = g_settings_get_boolean (settings, GSM_SETTING_SOLARIS_MODE);
+ g_signal_connect (settings, "changed::" GSM_SETTING_SOLARIS_MODE,
+ G_CALLBACK(solaris_mode_changed_cb), this);
- config.draw_stacked = g_settings_get_boolean(settings, procman::settings::draw_stacked.c_str());
- detail_string = "changed::" + procman::settings::draw_stacked;
- g_signal_connect(G_OBJECT(settings), detail_string.c_str(), G_CALLBACK(draw_stacked_changed_cb), this);
+ config.draw_stacked = g_settings_get_boolean (settings, GSM_SETTING_DRAW_STACKED);
+ g_signal_connect (settings, "changed::" GSM_SETTING_DRAW_STACKED,
+ G_CALLBACK (draw_stacked_changed_cb), this);
- config.network_in_bits = g_settings_get_boolean(settings, procman::settings::network_in_bits.c_str());
- detail_string = "changed::" + procman::settings::network_in_bits;
- g_signal_connect(G_OBJECT(settings), detail_string.c_str(), G_CALLBACK(network_in_bits_changed_cb),
this);
+ config.network_in_bits = g_settings_get_boolean (settings, GSM_SETTING_NETWORK_IN_BITS);
+ g_signal_connect (settings, "changed::" GSM_SETTING_NETWORK_IN_BITS,
+ G_CALLBACK (network_in_bits_changed_cb), this);
- config.update_interval = g_settings_get_int (settings, "update-interval");
- g_signal_connect (G_OBJECT(settings), "changed::update-interval", G_CALLBACK(timeouts_changed_cb), this);
- config.graph_update_interval = g_settings_get_int (settings,
- "graph-update-interval");
- g_signal_connect (G_OBJECT(settings), "changed::graph-update-interval",
- G_CALLBACK(timeouts_changed_cb), this);
- config.disks_update_interval = g_settings_get_int (settings, "disks-interval");
- g_signal_connect (G_OBJECT(settings), "changed::disks-interval", G_CALLBACK(timeouts_changed_cb), this);
+ config.update_interval = g_settings_get_int (settings, GSM_SETTING_PROCESS_UPDATE_INTERVAL);
+ g_signal_connect (settings, "changed::" GSM_SETTING_PROCESS_UPDATE_INTERVAL,
+ G_CALLBACK (timeouts_changed_cb), this);
+ config.graph_update_interval = g_settings_get_int (settings, GSM_SETTING_GRAPH_UPDATE_INTERVAL);
+ g_signal_connect (settings, "changed::" GSM_SETTING_GRAPH_UPDATE_INTERVAL,
+ G_CALLBACK (timeouts_changed_cb), this);
+ config.disks_update_interval = g_settings_get_int (settings, GSM_SETTING_DISKS_UPDATE_INTERVAL);
+ g_signal_connect (settings, "changed::" GSM_SETTING_DISKS_UPDATE_INTERVAL,
+ G_CALLBACK (timeouts_changed_cb), this);
/* Determine number of cpus since libgtop doesn't really tell you*/
config.num_cpus = 0;
@@ -201,41 +191,40 @@ ProcmanApp::load_settings()
if (config.num_cpus == 0)
config.num_cpus = 1;
- apply_cpu_color_settings(settings, this);
- g_signal_connect (G_OBJECT(settings), "changed::cpu-colors",
- G_CALLBACK(color_changed_cb), this);
+ apply_cpu_color_settings (settings, this);
+ g_signal_connect (settings, "changed::" GSM_SETTING_CPU_COLORS,
+ G_CALLBACK (color_changed_cb), this);
- color = g_settings_get_string (settings, "mem-color");
+ color = g_settings_get_string (settings, GSM_SETTING_MEM_COLOR);
if (!color)
color = g_strdup ("#000000ff0082");
- g_signal_connect (G_OBJECT(settings), "changed::mem-color",
- G_CALLBACK(color_changed_cb), this);
- gdk_rgba_parse(&config.mem_color, color);
-
+ g_signal_connect (settings, "changed::" GSM_SETTING_MEM_COLOR,
+ G_CALLBACK (color_changed_cb), this);
+ gdk_rgba_parse (&config.mem_color, color);
g_free (color);
- color = g_settings_get_string (settings, "swap-color");
+ color = g_settings_get_string (settings, GSM_SETTING_SWAP_COLOR);
if (!color)
color = g_strdup ("#00b6000000ff");
- g_signal_connect (G_OBJECT(settings), "changed::swap-color",
- G_CALLBACK(color_changed_cb), this);
- gdk_rgba_parse(&config.swap_color, color);
+ g_signal_connect (settings, "changed::" GSM_SETTING_SWAP_COLOR,
+ G_CALLBACK (color_changed_cb), this);
+ gdk_rgba_parse (&config.swap_color, color);
g_free (color);
- color = g_settings_get_string (settings, "net-in-color");
+ color = g_settings_get_string (settings, GSM_SETTING_NET_IN_COLOR);
if (!color)
color = g_strdup ("#000000f200f2");
- g_signal_connect (G_OBJECT(settings), "changed::net-in-color",
- G_CALLBACK(color_changed_cb), this);
- gdk_rgba_parse(&config.net_in_color, color);
+ g_signal_connect (settings, "changed::" GSM_SETTING_NET_IN_COLOR,
+ G_CALLBACK (color_changed_cb), this);
+ gdk_rgba_parse (&config.net_in_color, color);
g_free (color);
- color = g_settings_get_string (settings, "net-out-color");
+ color = g_settings_get_string (settings, GSM_SETTING_NET_OUT_COLOR);
if (!color)
color = g_strdup ("#00f2000000c1");
- g_signal_connect (G_OBJECT(settings), "changed::net-out-color",
- G_CALLBACK(color_changed_cb), this);
- gdk_rgba_parse(&config.net_out_color, color);
+ g_signal_connect (settings, "changed::" GSM_SETTING_NET_OUT_COLOR,
+ G_CALLBACK (color_changed_cb), this);
+ gdk_rgba_parse (&config.net_out_color, color);
g_free (color);
}
@@ -447,10 +436,10 @@ ProcmanApp::save_config ()
maximized = gdk_window_get_state (gtk_widget_get_window (main_window)) & GDK_WINDOW_STATE_MAXIMIZED;
- g_settings_set (settings, "window-state", "(iiii)",
+ g_settings_set (settings, GSM_SETTING_WINDOW_STATE, "(iiii)",
width, height, xpos, ypos);
- g_settings_set_boolean (settings, "maximized", maximized);
+ g_settings_set_boolean (settings, GSM_SETTING_MAXIMIZED, maximized);
}
int ProcmanApp::on_command_line(const Glib::RefPtr<Gio::ApplicationCommandLine>& command_line)
@@ -478,11 +467,11 @@ int ProcmanApp::on_command_line(const Glib::RefPtr<Gio::ApplicationCommandLine>&
}
if (option_group.show_processes_tab)
- g_settings_set_string (settings, "current-tab", "processes");
+ g_settings_set_string (settings, GSM_SETTING_CURRENT_TAB, "processes");
else if (option_group.show_resources_tab)
- g_settings_set_string (settings, "current-tab", "resources");
+ g_settings_set_string (settings, GSM_SETTING_CURRENT_TAB, "resources");
else if (option_group.show_file_systems_tab)
- g_settings_set_string (settings, "current-tab", "disks");
+ g_settings_set_string (settings, GSM_SETTING_CURRENT_TAB, "disks");
else if (option_group.print_version)
on_activate ();
diff --git a/src/proctable.cpp b/src/proctable.cpp
index 266fa0c..2490324 100644
--- a/src/proctable.cpp
+++ b/src/proctable.cpp
@@ -60,6 +60,7 @@
#include "util.h"
#include "interface.h"
#include "selinux.h"
+#include "settings-keys.h"
#include "cgroups.h"
ProcInfo::UserMap ProcInfo::users;
@@ -78,9 +79,9 @@ cb_columns_changed(GtkTreeView *treeview, gpointer data)
{
ProcmanApp * const app = static_cast<ProcmanApp *>(data);
- procman_save_tree_state(app->settings,
- GTK_WIDGET(treeview),
- "proctree");
+ procman_save_tree_state (app->settings,
+ GTK_WIDGET(treeview),
+ GSM_SETTINGS_CHILD_PROCESSES);
}
static void
@@ -90,7 +91,7 @@ cb_sort_changed (GtkTreeSortable *model, gpointer data)
procman_save_tree_state (app->settings,
GTK_WIDGET (app->tree),
- "proctree");
+ GSM_SETTINGS_CHILD_PROCESSES);
}
static GtkTreeViewColumn*
@@ -309,7 +310,7 @@ process_visibility_func (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
// in case we are in dependencies view, we show (and expand) rows not matching the text, but having a
matching child
gboolean match = false;
- if (g_settings_get_boolean (app->settings, "show-dependencies")) {
+ if (g_settings_get_boolean (app->settings, GSM_SETTING_SHOW_DEPENDENCIES)) {
GtkTreeIter child;
if (gtk_tree_model_iter_children (model, &child, iter)) {
gboolean child_match = FALSE;
@@ -358,7 +359,7 @@ cb_show_dependencies_changed (GSettings *settings, const gchar *key, gpointer da
ProcmanApp *app = (ProcmanApp *) data;
gtk_tree_view_set_show_expanders (GTK_TREE_VIEW (app->tree),
- g_settings_get_boolean (settings, "show-dependencies"));
+ g_settings_get_boolean (settings, GSM_SETTING_SHOW_DEPENDENCIES));
proctable_clear_tree (app);
proctable_update_all (app);
@@ -415,7 +416,7 @@ proctable_new (ProcmanApp * const app)
};
gint i;
- GSettings * settings = g_settings_get_child (app->settings, "proctree");
+ GSettings * settings = g_settings_get_child (app->settings, GSM_SETTINGS_CHILD_PROCESSES);
model = gtk_tree_store_new (NUM_COLUMNS,
G_TYPE_STRING, /* Process Name */
G_TYPE_STRING, /* User */
@@ -454,7 +455,7 @@ proctable_new (ProcmanApp * const app)
proctree = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model_sort));
gtk_tree_view_set_tooltip_column (GTK_TREE_VIEW (proctree), COL_TOOLTIP);
gtk_tree_view_set_show_expanders (GTK_TREE_VIEW (proctree),
- g_settings_get_boolean (app->settings, "show-dependencies"));
+ g_settings_get_boolean (app->settings, GSM_SETTING_SHOW_DEPENDENCIES));
gtk_tree_view_set_enable_search (GTK_TREE_VIEW (proctree), FALSE);
gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (proctree), TRUE);
g_object_unref (G_OBJECT (model));
@@ -667,10 +668,10 @@ proctable_new (ProcmanApp * const app)
g_signal_connect (G_OBJECT (model_sort), "sort-column-changed",
G_CALLBACK (cb_sort_changed), app);
- g_signal_connect (app->settings, "changed::show-dependencies",
+ g_signal_connect (app->settings, "changed::" GSM_SETTING_SHOW_DEPENDENCIES,
G_CALLBACK (cb_show_dependencies_changed), app);
- g_signal_connect (app->settings, "changed::show-whose-processes",
+ g_signal_connect (app->settings, "changed::" GSM_SETTING_SHOW_WHOSE_PROCESSES,
G_CALLBACK (cb_show_whose_processes_changed), app);
gtk_widget_show (proctree);
@@ -844,7 +845,7 @@ insert_info_to_tree (ProcInfo *info, ProcmanApp *app, bool forced = false)
filtered = gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(sorted));
model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filtered));
- if (g_settings_get_boolean (app->settings, "show-dependencies")) {
+ if (g_settings_get_boolean (app->settings, GSM_SETTING_SHOW_DEPENDENCIES)) {
ProcInfo *parent = 0;
@@ -1100,7 +1101,7 @@ refresh_list (ProcmanApp *app, const pid_t* pid_list, const guint n)
// pid_list == ProcInfo::all + addition
- if (g_settings_get_boolean (app->settings, "show-dependencies")) {
+ if (g_settings_get_boolean (app->settings, GSM_SETTING_SHOW_DEPENDENCIES)) {
// insert process in the tree. walk through the addition list
// (new process + process that have a new parent). This loop
@@ -1177,7 +1178,7 @@ proctable_update_list (ProcmanApp *app)
int which = 0;
int arg = 0;
- const char* whose_processes = g_settings_get_string (app->settings, "show-whose-processes");
+ const char* whose_processes = g_settings_get_string (app->settings, GSM_SETTING_SHOW_WHOSE_PROCESSES);
if (strcmp (whose_processes, "all") == 0) {
which = GLIBTOP_KERN_PROC_ALL;
arg = 0;
diff --git a/src/settings-keys.h b/src/settings-keys.h
index 6496945..7a9fbb3 100644
--- a/src/settings-keys.h
+++ b/src/settings-keys.h
@@ -2,19 +2,32 @@
#ifndef H_PROCMAN_SETTINGS_KEYS_1177430397
#define H_PROCMAN_SETTINGS_KEYS_1177430397
-#include <string>
-
-namespace procman
-{
- namespace settings
- {
- extern const std::string root;
- extern const std::string solaris_mode;
- extern const std::string draw_stacked;
- extern const std::string open_files_tree_prefix;
- extern const std::string network_in_bits;
- }
-}
+#define GSM_SETTINGS_CHILD_OPEN_FILES "openfilestree"
+#define GSM_SETTINGS_CHILD_DISKS "disktreenew"
+#define GSM_SETTINGS_CHILD_PROCESSES "proctree"
+#define GSM_SETTINGS_CHILD_MEMMAP "memmaptree"
+#define GSM_SETTING_WINDOW_STATE "window-state"
+#define GSM_SETTING_MAXIMIZED "maximized"
+#define GSM_SETTING_CURRENT_TAB "current-tab"
+#define GSM_SETTING_PROCESS_UPDATE_INTERVAL "update-interval"
+#define GSM_SETTING_SHOW_WHOSE_PROCESSES "show-whose-processes"
+#define GSM_SETTING_SHOW_DEPENDENCIES "show-dependencies"
+#define GSM_SETTING_SHOW_KILL_DIALOG "kill-dialog"
+#define GSM_SETTING_SOLARIS_MODE "solaris-mode"
+#define GSM_SETTING_GRAPH_UPDATE_INTERVAL "graph-update-interval"
+#define GSM_SETTING_CPU_COLORS "cpu-colors"
+#define GSM_SETTING_MEM_COLOR "mem-color"
+#define GSM_SETTING_SWAP_COLOR "swap-color"
+#define GSM_SETTING_NET_IN_COLOR "net-in-color"
+#define GSM_SETTING_NET_OUT_COLOR "net-out-color"
+#define GSM_SETTING_DRAW_STACKED "cpu-stacked-area-chart"
+#define GSM_SETTING_NETWORK_IN_BITS "network-in-bits"
+#define GSM_SETTING_SHOW_CPU "show-cpu"
+#define GSM_SETTING_SHOW_MEM "show-mem"
+#define GSM_SETTING_SHOW_NETWORK "show-network"
+#define GSM_SETTING_DISKS_UPDATE_INTERVAL "disks-interval"
+#define GSM_SETTING_SHOW_ALL_FS "show-all-fs"
+#define GSM_SETTING_SMOOTH_REFRESH "smooth-refresh"
#endif // H_PROCMAN_SETTINGS_KEYS_1177430397
diff --git a/src/smooth_refresh.cpp b/src/smooth_refresh.cpp
index 3138657..ed347e0 100644
--- a/src/smooth_refresh.cpp
+++ b/src/smooth_refresh.cpp
@@ -13,10 +13,11 @@
#include "smooth_refresh.h"
#include "procman-app.h"
+#include "settings-keys.h"
#include "util.h"
-const string SmoothRefresh::KEY("smooth-refresh");
+const string SmoothRefresh::KEY(GSM_SETTING_SMOOTH_REFRESH);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
