X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui_pref.c;h=8748365661975f119bdaeb8f94ee8ec658f21cb3;hb=12388f81cb55cca6fba194a1fc02870242dddef5;hp=b84cf734f52c579213b1caed4e2b28164d95f2bf;hpb=45c8086f97097df36ba8cd0552f152be80f79b12;p=psensor.git

diff --git a/src/ui_pref.c b/src/ui_pref.c
index b84cf73..8748365 100644
--- a/src/ui_pref.c
+++ b/src/ui_pref.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 jeanfi@gmail.com
+ * Copyright (C) 2010-2012 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
@@ -46,13 +46,14 @@ void ui_pref_dialog_run(struct ui_psensor *ui)
 	GError *error = NULL;
 	GdkColor *color_fg, *color_bg;
 	GtkColorButton *w_color_fg, *w_color_bg;
-	GtkHScale *w_bg_opacity;
+	GtkScale *w_bg_opacity;
 	GtkSpinButton *w_update_interval, *w_monitoring_duration,
 		*w_s_update_interval;
 	GtkComboBox *w_sensorlist_pos;
 	GtkToggleButton *w_hide_window_decoration, *w_keep_window_below,
 		*w_enable_menu, *w_enable_launcher_counter, *w_hide_on_startup,
-		*w_win_restore;
+		*w_win_restore, *w_slog_enabled;
+	GtkComboBoxText *w_temp_unit;
 
 	cfg = ui->config;
 
@@ -81,8 +82,8 @@ void ui_pref_dialog_run(struct ui_psensor *ui)
 							     "color_bg"));
 	gtk_color_button_set_color(w_color_bg, color_bg);
 
-	w_bg_opacity = GTK_HSCALE(gtk_builder_get_object(builder,
-							 "bg_opacity"));
+	w_bg_opacity = GTK_SCALE(gtk_builder_get_object(builder,
+							"bg_opacity"));
 	gtk_range_set_value(GTK_RANGE(w_bg_opacity), cfg->graph_bg_alpha);
 
 	w_update_interval = GTK_SPIN_BUTTON(gtk_builder_get_object
@@ -125,6 +126,10 @@ void ui_pref_dialog_run(struct ui_psensor *ui)
 	gtk_toggle_button_set_active(w_enable_launcher_counter,
 				     !cfg->unity_launcher_count_disabled);
 
+	w_slog_enabled = GTK_TOGGLE_BUTTON
+		(gtk_builder_get_object(builder, "enable_slog"));
+	gtk_toggle_button_set_active(w_slog_enabled, cfg->slog_enabled);
+
 	w_hide_on_startup
 		= GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder,
 							   "hide_on_startup"));
@@ -136,6 +141,12 @@ void ui_pref_dialog_run(struct ui_psensor *ui)
 	gtk_toggle_button_set_active(w_win_restore,
 				     cfg->window_restore_enabled);
 
+	w_temp_unit
+		= GTK_COMBO_BOX_TEXT(gtk_builder_get_object
+				     (builder, "temperature_unit"));
+	gtk_combo_box_set_active(GTK_COMBO_BOX(w_temp_unit),
+				 cfg->temperature_unit);
+
 	result = gtk_dialog_run(diag);
 
 	if (result == GTK_RESPONSE_ACCEPT) {
@@ -202,6 +213,12 @@ void ui_pref_dialog_run(struct ui_psensor *ui)
 		cfg->window_restore_enabled
 			= gtk_toggle_button_get_active(w_win_restore);
 
+		cfg->slog_enabled
+			= gtk_toggle_button_get_active(w_slog_enabled);
+
+		cfg->temperature_unit
+			= gtk_combo_box_get_active(GTK_COMBO_BOX(w_temp_unit));
+
 		config_save(cfg);
 
 		g_mutex_unlock(ui->sensors_mutex);