X-Git-Url: http://wpitchoune.net/gitweb/?p=psensor-pkg-debian.git;a=blobdiff_plain;f=src%2Fui_pref.c;h=4dd4bf8309f855a602c1046190cd03e6a178b492;hp=b9bc3c4b4cb18d7e48fed711767ee531e53f9d78;hb=f59206913efca168851e1a3f57b1b0f5a50495ec;hpb=f055e7507526592d3a74c652f5f053701614c9c0

diff --git a/src/ui_pref.c b/src/ui_pref.c
index b9bc3c4..4dd4bf8 100644
--- a/src/ui_pref.c
+++ b/src/ui_pref.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2012 jeanfi@gmail.com
+ * Copyright (C) 2010-2014 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
@@ -23,7 +23,7 @@
 #include "cfg.h"
 #include "ui_pref.h"
 #include "ui_color.h"
-#include "compat.h"
+#include <pxdg.h>
 
 GdkColor *color_to_gdkcolor(struct color *color)
 {
@@ -46,13 +46,16 @@ 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;
+		*w_s_update_interval, *w_slog_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, *w_autostart;
+	GtkComboBoxText *w_temp_unit;
+	GtkEntry *w_notif_script;
+	char *notif_script;
 
 	cfg = ui->config;
 
@@ -71,6 +74,14 @@ void ui_pref_dialog_run(struct ui_psensor *ui)
 
 	diag = GTK_DIALOG(gtk_builder_get_object(builder, "dialog1"));
 
+	w_notif_script = GTK_ENTRY(gtk_builder_get_object(builder,
+							  "notif_script"));
+	notif_script = config_get_notif_script();
+	if (notif_script) {
+		gtk_entry_set_text(GTK_ENTRY(w_notif_script), notif_script);
+		free(notif_script);
+	}
+
 	color_fg = color_to_gdkcolor(cfg->graph_fgcolor);
 	w_color_fg = GTK_COLOR_BUTTON(gtk_builder_get_object(builder,
 							     "color_fg"));
@@ -81,8 +92,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
@@ -116,6 +127,10 @@ void ui_pref_dialog_run(struct ui_psensor *ui)
 	gtk_toggle_button_set_active(w_keep_window_below,
 				     cfg->window_keep_below_enabled);
 
+	w_autostart = GTK_TOGGLE_BUTTON
+		(gtk_builder_get_object(builder, "autostart"));
+	gtk_toggle_button_set_active(w_autostart, pxdg_is_autostarted());
+
 	w_enable_menu = GTK_TOGGLE_BUTTON
 		(gtk_builder_get_object(builder, "enable_menu"));
 	gtk_toggle_button_set_active(w_enable_menu, !cfg->menu_bar_disabled);
@@ -125,6 +140,14 @@ 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_slog_interval = GTK_SPIN_BUTTON
+		(gtk_builder_get_object(builder, "slog_interval"));
+	gtk_spin_button_set_value(w_slog_interval, cfg->slog_interval);
+
 	w_hide_on_startup
 		= GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder,
 							   "hide_on_startup"));
@@ -136,13 +159,22 @@ 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) {
 		double value;
 		GdkColor color;
 
-		g_mutex_lock(ui->sensors_mutex);
+		pthread_mutex_lock(&ui->sensors_mutex);
+
+		config_set_notif_script
+			(gtk_entry_get_text(GTK_ENTRY(w_notif_script)));
 
 		gtk_color_button_get_color(w_color_fg, &color);
 		color_set(cfg->graph_fgcolor,
@@ -202,9 +234,20 @@ 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->slog_interval
+			= gtk_spin_button_get_value_as_int(w_slog_interval);
+
+		cfg->temperature_unit
+			= gtk_combo_box_get_active(GTK_COMBO_BOX(w_temp_unit));
+
 		config_save(cfg);
 
-		g_mutex_unlock(ui->sensors_mutex);
+		pxdg_set_autostart(gtk_toggle_button_get_active(w_autostart));
+
+		pthread_mutex_unlock(&ui->sensors_mutex);
 
 		ui_window_update(ui);
 	}