added sensor setting to show/hide in the sensor list of the main window.

[psensor.git] / src / cfg.c

diff --git a/src/cfg.c b/src/cfg.c
index 0139d7e..bb69d7a 100644 (file)
--- a/src/cfg.c
+++ b/src/cfg.c
@@ -47,10 +47,11 @@ static const char *ATT_SENSOR_APPINDICATOR_MENU_DISABLED
 static const char *ATT_SENSOR_APPINDICATOR_LABEL_ENABLED
 = "appindicator_label_enabled";
 static const char *ATT_SENSOR_POSITION = "position";
+static const char *ATT_SENSOR_HIDE = "hide";
 
 /* Update interval of the measures of the sensors */
 static const char *KEY_SENSOR_UPDATE_INTERVAL
-= "/apps/psensor/sensor/update_interval";
+= "sensor-update-interval";
 
 /* Graph settings */
 static const char *KEY_GRAPH_UPDATE_INTERVAL = "graph-update-interval";
@@ -104,13 +105,12 @@ static const char *KEY_INTERFACE_TEMPERATURE_UNIT
 = "interface-temperature-unit";
 
 /* Sensor logging settings */
-static const char *KEY_SLOG_ENABLED = "/apps/psensor/slog/enabled";
-static const char *KEY_SLOG_INTERVAL = "/apps/psensor/slog/interval";
+static const char *KEY_SLOG_ENABLED = "slog-enabled";
+static const char *KEY_SLOG_INTERVAL = "slog-interval";
 
 /* Path to the script called when a notification is raised */
 static const char *KEY_NOTIFICATION_SCRIPT = "notif-script";
 
-static GConfClient *client;
 static GSettings *settings;
 
 static char *user_dir;
@@ -119,6 +119,8 @@ static GKeyFile *key_file;
 
 static char *sensor_config_path;
 
+static void (*slog_enabled_cbk)(void *);
+
 static char *get_string(const char *key)
 {
        return g_settings_get_string(settings, key);
@@ -250,8 +252,7 @@ static void set_background_color(const struct color *color)
        if (!scolor)
                scolor = strdup(DEFAULT_GRAPH_BACKGROUND_COLOR);
 
-       gconf_client_set_string(client,
-                               KEY_GRAPH_BACKGROUND_COLOR, scolor, NULL);
+       set_string(KEY_GRAPH_BACKGROUND_COLOR, scolor);
 
        free(scolor);
 }
@@ -264,46 +265,46 @@ static void set_foreground_color(const struct color *color)
        if (!str)
                str = strdup(DEFAULT_GRAPH_FOREGROUND_COLOR);
 
-       gconf_client_set_string(client, KEY_GRAPH_FOREGROUND_COLOR, str, NULL);
+       set_string(KEY_GRAPH_FOREGROUND_COLOR, str);
 
        free(str);
 }
 
 bool is_slog_enabled()
 {
-       return gconf_client_get_bool(client, KEY_SLOG_ENABLED, NULL);
+       return get_bool(KEY_SLOG_ENABLED);
 }
 
 static void set_slog_enabled(bool enabled)
 {
-       gconf_client_set_bool(client, KEY_SLOG_ENABLED, enabled, NULL);
+       set_bool(KEY_SLOG_ENABLED, enabled);
 }
 
-void config_slog_enabled_notify_add(GConfClientNotifyFunc cbk, void *data)
+static void slog_enabled_changed_cbk(GSettings *settings,
+                                    gchar *key,
+                                    gpointer data)
 {
-       log_debug("config_slog_enabled_notify_add");
-       gconf_client_add_dir(client,
-                            KEY_SLOG_ENABLED,
-                            GCONF_CLIENT_PRELOAD_NONE,
-                            NULL);
-       gconf_client_notify_add(client,
-                               KEY_SLOG_ENABLED,
-                               cbk,
-                               data,
-                               NULL,
-                               NULL);
+       if (slog_enabled_cbk)
+               slog_enabled_cbk(data);
 }
 
-int config_get_slog_interval()
+void config_set_slog_enabled_changed_cbk(void (*cbk)(void *), void *data)
 {
-       int res;
+       log_fct_enter();
 
-       res = gconf_client_get_int(client, KEY_SLOG_INTERVAL, NULL);
+       slog_enabled_cbk = cbk;
 
-       if (res <= 0)
-               return 300;
-       else
-               return res;
+       g_signal_connect_after(settings,
+                              "changed::slog-enabled",
+                              G_CALLBACK(slog_enabled_changed_cbk),
+                              data);
+
+       log_fct_exit();
+}
+
+int config_get_slog_interval()
+{
+       return get_int(KEY_SLOG_INTERVAL);
 }
 
 static void set_slog_interval(int interval)
@@ -311,7 +312,7 @@ static void set_slog_interval(int interval)
        if (interval <= 0)
                interval = 300;
 
-       gconf_client_set_int(client, KEY_SLOG_INTERVAL, interval, NULL);
+       set_int(KEY_SLOG_INTERVAL, interval);
 }
 
 static bool is_window_decoration_enabled()
@@ -334,14 +335,8 @@ static void set_window_keep_below_enabled(bool enabled)
        set_bool(KEY_INTERFACE_WINDOW_KEEP_BELOW_ENABLED, enabled);
 }
 
-/*
- * Initializes the GConf client.
- */
 static void init()
 {
-       if (!client)
-               client = gconf_client_get_default();
-
        if (!settings)
                settings = g_settings_new("psensor");
 }
@@ -350,11 +345,6 @@ void config_cleanup()
 {
        config_sync();
 
-       if (client) {
-               g_object_unref(client);
-               client = NULL;
-       }
-
        if (settings) {
                g_settings_sync();
                g_object_unref(settings);
@@ -375,6 +365,8 @@ void config_cleanup()
                free(sensor_config_path);
                sensor_config_path = NULL;
        }
+
+       slog_enabled_cbk = NULL;
 }
 
 struct config *config_load()
@@ -396,7 +388,7 @@ struct config *config_load()
        c->slog_interval = config_get_slog_interval();
 
        c->sensor_update_interval
-           = gconf_client_get_int(client, KEY_SENSOR_UPDATE_INTERVAL, NULL);
+           = get_int(KEY_SENSOR_UPDATE_INTERVAL);
        if (c->sensor_update_interval < 1)
                c->sensor_update_interval = 1;
 
@@ -458,9 +450,7 @@ void config_save(const struct config *c)
 
        set_int(KEY_GRAPH_MONITORING_DURATION, c->graph_monitoring_duration);
 
-       gconf_client_set_int(client,
-                            KEY_SENSOR_UPDATE_INTERVAL,
-                            c->sensor_update_interval, NULL);
+       set_int(KEY_SENSOR_UPDATE_INTERVAL, c->sensor_update_interval);
 
        set_bool(KEY_INTERFACE_MENU_BAR_DISABLED, c->menu_bar_disabled);
 
@@ -544,14 +534,13 @@ static GKeyFile *get_sensor_key_file()
                                                &err);
 
                if (!ret) {
-                       if (err->code == G_KEY_FILE_ERROR_NOT_FOUND) {
+                       if (err->code == G_KEY_FILE_ERROR_NOT_FOUND)
                                log_fct(_("The configuration file "
                                          "does not exist."));
-                       } else {
+                       else
                                log_err(_("Failed to parse configuration "
                                          "file: %s"),
                                        path);
-                       }
                }
        }
 
@@ -683,12 +672,12 @@ config_get_sensor_color(const char *sid, const struct color *dft)
        return color;
 }
 
-bool config_is_sensor_enabled(const char *sid)
+bool config_is_sensor_graph_enabled(const char *sid)
 {
        return sensor_get_bool(sid, ATT_SENSOR_GRAPH_ENABLED);
 }
 
-void config_set_sensor_enabled(const char *sid, bool enabled)
+void config_set_sensor_graph_enabled(const char *sid, bool enabled)
 {
        sensor_set_bool(sid, ATT_SENSOR_GRAPH_ENABLED, enabled);
 }
@@ -745,6 +734,16 @@ void config_set_sensor_alarm_enabled(const char *sid, bool enabled)
        sensor_set_bool(sid, ATT_SENSOR_ALARM_ENABLED, enabled);
 }
 
+bool config_is_sensor_enabled(const char *sid)
+{
+       return !sensor_get_bool(sid, ATT_SENSOR_HIDE);
+}
+
+void config_set_sensor_enabled(const char *sid, bool enabled)
+{
+       sensor_set_bool(sid, ATT_SENSOR_HIDE, !enabled);
+}
+
 bool config_is_appindicator_label_enabled(const char *sid)
 {
        return sensor_get_bool(sid, ATT_SENSOR_APPINDICATOR_LABEL_ENABLED);