X-Git-Url: https://git.wpitchoune.net/gitweb/?p=psensor.git;a=blobdiff_plain;f=src%2Fcfg.c;h=d9034783ccc72db6ba42e1f95657de573a91bcbf;hp=19f99ba837da2f040f7f99542eadf716ecc18f24;hb=c1e20f2631a1249720e9c75d753eacfcb0f6c7b9;hpb=66aa25bbb5834e9278226680087f4e8b325f23e7

diff --git a/src/cfg.c b/src/cfg.c
index 19f99ba..d903478 100644
--- a/src/cfg.c
+++ b/src/cfg.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2014 jeanfi@gmail.com
+ * Copyright (C) 2010-2016 jeanfi@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
@@ -237,12 +237,12 @@ static void set_alpha_channeld_enabled(bool b)
 	set_bool(KEY_ALPHA_CHANNEL_ENABLED, b);
 }
 
-static enum sensorlist_position get_sensorlist_position(void)
+enum sensorlist_position config_get_sensorlist_position(void)
 {
 	return get_int(KEY_INTERFACE_SENSORLIST_POSITION);
 }
 
-static void set_sensorlist_position(enum sensorlist_position pos)
+void config_set_sensorlist_position(enum sensorlist_position pos)
 {
 	set_int(KEY_INTERFACE_SENSORLIST_POSITION, pos);
 }
@@ -418,7 +418,6 @@ struct config *config_load(void)
 	c->graph_fgcolor = get_foreground_color();
 	c->graph_bg_alpha = get_graph_background_alpha();
 	c->alpha_channel_enabled = is_alpha_channel_enabled();
-	c->sensorlist_position = get_sensorlist_position();
 	c->slog_enabled = is_slog_enabled();
 	c->slog_interval = config_get_slog_interval();
 
@@ -436,13 +435,6 @@ struct config *config_load(void)
 	if (c->graph_monitoring_duration < 1)
 		c->graph_monitoring_duration = 10;
 
-	c->menu_bar_disabled = get_bool(KEY_INTERFACE_MENU_BAR_DISABLED);
-
-	c->unity_launcher_count_disabled
-		= get_bool(KEY_INTERFACE_UNITY_LAUNCHER_COUNT_DISABLED);
-
-	c->hide_on_startup = get_bool(KEY_INTERFACE_HIDE_ON_STARTUP);
-
 	c->window_restore_enabled
 		= get_bool(KEY_INTERFACE_WINDOW_RESTORE_ENABLED);
 
@@ -453,13 +445,13 @@ struct config *config_load(void)
 
 	c->window_divider_pos = get_int(KEY_INTERFACE_WINDOW_DIVIDER_POS);
 
+	c->hide_on_startup = get_bool(KEY_INTERFACE_HIDE_ON_STARTUP);
+
 	if (!c->window_restore_enabled || !c->window_w || !c->window_h) {
 		c->window_w = 800;
 		c->window_h = 200;
 	}
 
-	c->temperature_unit = get_int(KEY_INTERFACE_TEMPERATURE_UNIT);
-
 	c->sensor_values_max_length = compute_values_max_length(c);
 
 	return c;
@@ -471,7 +463,6 @@ void config_save(const struct config *c)
 	set_background_color(c->graph_bgcolor);
 	set_foreground_color(c->graph_fgcolor);
 	set_graph_background_alpha(c->graph_bg_alpha);
-	set_sensorlist_position(c->sensorlist_position);
 	set_slog_enabled(c->slog_enabled);
 	set_slog_interval(c->slog_interval);
 
@@ -481,11 +472,6 @@ void config_save(const struct config *c)
 
 	set_int(KEY_SENSOR_UPDATE_INTERVAL, c->sensor_update_interval);
 
-	set_bool(KEY_INTERFACE_MENU_BAR_DISABLED, c->menu_bar_disabled);
-
-	set_bool(KEY_INTERFACE_UNITY_LAUNCHER_COUNT_DISABLED,
-		 c->unity_launcher_count_disabled);
-
 	set_bool(KEY_INTERFACE_HIDE_ON_STARTUP, c->hide_on_startup);
 
 	set_bool(KEY_INTERFACE_WINDOW_RESTORE_ENABLED,
@@ -497,8 +483,6 @@ void config_save(const struct config *c)
 	set_int(KEY_INTERFACE_WINDOW_H, c->window_h);
 
 	set_int(KEY_INTERFACE_WINDOW_DIVIDER_POS, c->window_divider_pos);
-
-	set_int(KEY_INTERFACE_TEMPERATURE_UNIT, c->temperature_unit);
 }
 
 const char *get_psensor_user_dir(void)
@@ -620,7 +604,10 @@ static char *sensor_get_str(const char *sid, const char *att)
 	return g_key_file_get_string(kfile, sid, att, NULL);
 }
 
-static bool sensor_get_double(const char *sid, const char *att, double *d)
+static bool sensor_get_double(const char *sid,
+			      const char *att,
+			      double *d,
+			      double d_default)
 {
 	GKeyFile *kfile;
 	GError *err;
@@ -629,6 +616,18 @@ static bool sensor_get_double(const char *sid, const char *att, double *d)
 	kfile = get_sensor_key_file();
 
 	err = NULL;
+	if (!g_key_file_has_key(kfile, sid, att, &err)) {
+		if (err) {
+			log_err(err->message);
+			g_error_free(err);
+			return false;
+		}
+
+		*d = d_default;
+		return true;
+	}
+
+	err = NULL;
 	v = g_key_file_get_double(kfile, sid, att, &err);
 
 	if (err) {
@@ -716,7 +715,8 @@ void config_set_sensor_color(const char *sid, const GdkRGBA *color)
 static const char *next_default_color(void)
 {
 	/* copied from the default colors of the gtk color color
-	 * chooser. */
+	 * chooser.
+	 */
 	const char *default_colors[27] = {
 		"#ef2929",  /* Scarlet Red */
 		"#fcaf3e",  /* Orange */
@@ -787,9 +787,11 @@ void config_set_sensor_graph_enabled(const char *sid, bool enabled)
 	sensor_set_bool(sid, ATT_SENSOR_GRAPH_ENABLED, enabled);
 }
 
-bool config_get_sensor_alarm_high_threshold(const char *sid, double *v)
+bool config_get_sensor_alarm_high_threshold(const char *sid,
+					    double *v,
+					    double d)
 {
-	return sensor_get_double(sid, ATT_SENSOR_ALARM_HIGH_THRESHOLD, v);
+	return sensor_get_double(sid, ATT_SENSOR_ALARM_HIGH_THRESHOLD, v, d);
 }
 
 void config_set_sensor_alarm_high_threshold(const char *sid, int threshold)
@@ -797,9 +799,9 @@ void config_set_sensor_alarm_high_threshold(const char *sid, int threshold)
 	sensor_set_int(sid, ATT_SENSOR_ALARM_HIGH_THRESHOLD, threshold);
 }
 
-bool config_get_sensor_alarm_low_threshold(const char *sid, double *v)
+bool config_get_sensor_alarm_low_threshold(const char *sid, double *v, double d)
 {
-	return sensor_get_double(sid, ATT_SENSOR_ALARM_LOW_THRESHOLD, v);
+	return sensor_get_double(sid, ATT_SENSOR_ALARM_LOW_THRESHOLD, v, d);
 }
 
 void config_set_sensor_alarm_low_threshold(const char *sid, int threshold)
@@ -940,7 +942,32 @@ void config_set_udisks2_enable(bool b)
 	set_bool(KEY_PROVIDER_UDISKS2_ENABLED, b);
 }
 
-int config_get_sensor_unit(void)
+enum temperature_unit config_get_temperature_unit(void)
 {
 	return get_int(KEY_INTERFACE_TEMPERATURE_UNIT);
 }
+
+void config_set_temperature_unit(enum temperature_unit u)
+{
+	set_int(KEY_INTERFACE_TEMPERATURE_UNIT, u);
+}
+
+bool config_is_menu_bar_enabled(void)
+{
+	return !get_bool(KEY_INTERFACE_MENU_BAR_DISABLED);
+}
+
+void config_set_menu_bar_enabled(bool enabled)
+{
+	set_bool(KEY_INTERFACE_MENU_BAR_DISABLED, !enabled);
+}
+
+bool config_is_count_visible(void)
+{
+	return !get_bool(KEY_INTERFACE_UNITY_LAUNCHER_COUNT_DISABLED);
+}
+
+void config_set_count_visible(bool visible)
+{
+	set_bool(KEY_INTERFACE_UNITY_LAUNCHER_COUNT_DISABLED, !visible);
+}