#include <libintl.h>
#define _(str) gettext(str)
-#include <gio/gio.h>
-
#include <cfg.h>
+#include <graph.h>
#include <pio.h>
#include <plog.h>
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";
-
static const char *KEY_GRAPH_MONITORING_DURATION = "graph-monitoring-duration";
-
static const char *KEY_GRAPH_BACKGROUND_COLOR = "graph-background-color";
-
static const char *DEFAULT_GRAPH_BACKGROUND_COLOR = "#e8f4e8f4a8f5";
-
static const char *KEY_GRAPH_BACKGROUND_ALPHA = "graph-background-alpha";
-
static const char *KEY_GRAPH_FOREGROUND_COLOR
= "graph-foreground-color";
+static const char *KEY_GRAPH_SMOOTH_CURVES_ENABLED
+= "graph-smooth-curves-enabled";
static const char *DEFAULT_GRAPH_FOREGROUND_COLOR = "#000000000000";
/* Path to the script called when a notification is raised */
static const char *KEY_NOTIFICATION_SCRIPT = "notif-script";
-static GConfClient *client;
+/* Provider settings */
+static const char *KEY_PROVIDER_LMSENSORS_ENABLED
+= "provider-lmsensors-enabled";
+static const char *KEY_PROVIDER_ATIADLSDK_ENABLED
+= "provider-atiadlsdk-enabled";
+static const char *KEY_PROVIDER_GTOP2_ENABLED = "provider-gtop2-enabled";
+static const char *KEY_PROVIDER_HDDTEMP_ENABLED = "provider-hddtemp-enabled";
+static const char *KEY_PROVIDER_LIBATASMART_ENABLED
+= "provider-libatasmart-enabled";
+static const char *KEY_PROVIDER_NVCTRL_ENABLED = "provider-nvctrl-enabled";
+static const char *KEY_PROVIDER_UDISKS2_ENABLED = "provider-udisks2-enabled";
+
+
static GSettings *settings;
static char *user_dir;
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);
free(scolor);
if (!c)
- return color_new(0xffff, 0xffff, 0xffff);
+ return color_new(1, 1, 1);
return c;
}
free(scolor);
if (!c)
- return color_new(0x0000, 0x0000, 0x0000);
+ return color_new(0, 0, 0);
return c;
}
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);
+}
+
+void config_set_slog_enabled_changed_cbk(void (*cbk)(void *), void *data)
+{
+ log_fct_enter();
+
+ slog_enabled_cbk = cbk;
+
+ g_signal_connect_after(settings,
+ "changed::slog-enabled",
+ G_CALLBACK(slog_enabled_changed_cbk),
+ data);
+
+ log_fct_exit();
}
int config_get_slog_interval()
set_bool(KEY_INTERFACE_WINDOW_KEEP_BELOW_ENABLED, enabled);
}
-/*
- * Initializes the GConf client.
- */
+bool config_is_smooth_curves_enabled()
+{
+ return get_bool(KEY_GRAPH_SMOOTH_CURVES_ENABLED);
+}
+
+void config_set_smooth_curves_enabled(bool b)
+{
+ set_bool(KEY_GRAPH_SMOOTH_CURVES_ENABLED, b);
+}
+
+
static void init()
{
- if (!client)
- client = gconf_client_get_default();
+ log_fct_enter();
if (!settings)
settings = g_settings_new("psensor");
+
+ log_fct_exit();
}
void config_cleanup()
{
config_sync();
- if (client) {
- g_object_unref(client);
- client = NULL;
- }
-
if (settings) {
g_settings_sync();
g_object_unref(settings);
free(sensor_config_path);
sensor_config_path = NULL;
}
+
+ slog_enabled_cbk = NULL;
}
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;
if (c->graph_monitoring_duration < 1)
c->graph_monitoring_duration = 10;
- c->sensor_values_max_length
- = (c->graph_monitoring_duration * 60) / c->sensor_update_interval;
-
- if (c->sensor_values_max_length < 3)
- c->sensor_values_max_length = 3;
-
c->menu_bar_disabled = get_bool(KEY_INTERFACE_MENU_BAR_DISABLED);
c->unity_launcher_count_disabled
c->temperature_unit = get_int(KEY_INTERFACE_TEMPERATURE_UNIT);
+ c->sensor_values_max_length = compute_values_max_length(c);
+
return 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);
| G_KEY_FILE_KEEP_TRANSLATIONS,
&err);
- if (!ret) {
- if (err->code == G_KEY_FILE_ERROR_NOT_FOUND) {
- log_fct(_("The configuration file "
- "does not exist."));
- } else {
- log_err(_("Failed to parse configuration "
- "file: %s"),
- path);
- }
- }
+ if (!ret)
+ log_warn(_("Failed to load configuration file %s: %s"),
+ path,
+ err->message);
}
return key_file;
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);
}
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);
{
sensor_set_bool(sid, ATT_SENSOR_APPINDICATOR_LABEL_ENABLED, enabled);
}
+
+GSettings *config_get_GSettings()
+{
+ return settings;
+}
+
+bool config_is_lmsensor_enabled()
+{
+ return get_bool(KEY_PROVIDER_LMSENSORS_ENABLED);
+}
+
+bool config_is_gtop2_enabled()
+{
+ return get_bool(KEY_PROVIDER_GTOP2_ENABLED);
+}
+
+bool config_is_udisks2_enabled()
+{
+ return get_bool(KEY_PROVIDER_UDISKS2_ENABLED);
+}
+
+bool config_is_hddtemp_enabled()
+{
+ return get_bool(KEY_PROVIDER_HDDTEMP_ENABLED);
+}
+
+bool config_is_libatasmart_enabled()
+{
+ return get_bool(KEY_PROVIDER_LIBATASMART_ENABLED);
+}
+
+bool config_is_nvctrl_enabled()
+{
+ return get_bool(KEY_PROVIDER_NVCTRL_ENABLED);
+}
+
+bool config_is_atiadlsdk_enabled()
+{
+ return get_bool(KEY_PROVIDER_ATIADLSDK_ENABLED);
+}
+
+void config_set_lmsensor_enable(bool b)
+{
+ set_bool(KEY_PROVIDER_LMSENSORS_ENABLED, b);
+}
+
+void config_set_nvctrl_enable(bool b)
+{
+ set_bool(KEY_PROVIDER_NVCTRL_ENABLED, b);
+}
+
+void config_set_atiadlsdk_enable(bool b)
+{
+ set_bool(KEY_PROVIDER_ATIADLSDK_ENABLED, b);
+}
+
+void config_set_gtop2_enable(bool b)
+{
+ set_bool(KEY_PROVIDER_GTOP2_ENABLED, b);
+}
+
+void config_set_hddtemp_enable(bool b)
+{
+ set_bool(KEY_PROVIDER_HDDTEMP_ENABLED, b);
+}
+
+void config_set_libatasmart_enable(bool b)
+{
+ set_bool(KEY_PROVIDER_LIBATASMART_ENABLED, b);
+}
+
+void config_set_udisks2_enable(bool b)
+{
+ set_bool(KEY_PROVIDER_UDISKS2_ENABLED, b);
+}
projects / psensor.git / blobdiff