X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui.c;h=dce1c18121d9211242cab7e8fed1fe50dd204703;hb=cc35e177d57bc4ee2cc57ae25f130dfc168aa61d;hp=f1c84b21df4448f5898c0c0708bff7f5924a7ac6;hpb=e57d7f801ae20f02e0cb28107a89b31fa51de1c1;p=psensor.git

diff --git a/src/ui.c b/src/ui.c
index f1c84b2..dce1c18 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2012 jeanfi@gmail.com
+ * Copyright (C) 2010-2013 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
@@ -17,6 +17,7 @@
  * 02110-1301 USA
  */
 #include "cfg.h"
+#include "slog.h"
 #include "ui.h"
 #include "ui_graph.h"
 #include "ui_pref.h"
@@ -75,19 +76,20 @@ on_delete_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
 
 void ui_show_about_dialog()
 {
-	gtk_show_about_dialog(NULL,
-			      "comments",
-			      _("Psensor is a GTK+ application for monitoring "
-				"hardware sensors"),
-			      "copyright",
-			      _("Copyright(c) 2010-2012\njeanfi@gmail.com"),
-			      "logo-icon-name", "psensor",
-			      "program-name", "Psensor",
-			      "title", _("About Psensor"),
-			      "version", VERSION,
-			      "website", PACKAGE_URL,
-			      "website-label", _("Psensor Homepage"),
-			      NULL);
+	gtk_show_about_dialog
+		(NULL,
+		 "comments",
+		 _("Psensor is a GTK+ application for monitoring hardware "
+		   "sensors"),
+		 "copyright",
+		 _("Copyright(c) 2010-2012\njeanfi@gmail.com"),
+		 "logo-icon-name", "psensor",
+		 "program-name", "Psensor",
+		 "title", _("About Psensor"),
+		 "version", VERSION,
+		 "website", PACKAGE_URL,
+		 "website-label", _("Psensor Homepage"),
+		 NULL);
 }
 
 static void cb_about(GtkMenuItem *mi, gpointer data)
@@ -146,7 +148,7 @@ static GtkActionEntry entries[] = {
 	  G_CALLBACK(cb_preferences) },
 
 	{ "SensorPreferencesAction", GTK_STOCK_PREFERENCES,
-	  N_("_Sensor Preferences"), NULL,
+	  N_("S_ensor Preferences"), NULL,
 	  N_("Sensor Preferences"),
 	  G_CALLBACK(cb_sensor_preferences) },
 
@@ -154,7 +156,7 @@ static GtkActionEntry entries[] = {
 	  GTK_STOCK_QUIT, N_("_Quit"), NULL, N_("Quit"),
 	  G_CALLBACK(cb_menu_quit) },
 
-	{ "HelpMenuAction", NULL, "_Help" },
+	{ "HelpMenuAction", NULL, N_("_Help") },
 
 	{ "AboutAction", GTK_STOCK_PREFERENCES,
 	  N_("_About"), NULL,
@@ -165,9 +167,9 @@ static guint n_entries = G_N_ELEMENTS(entries);
 
 static GtkWidget *get_menu(struct ui_psensor *ui)
 {
-	GtkActionGroup      *action_group;
-	GtkUIManager        *menu_manager;
-	GError              *error;
+	GtkActionGroup *action_group;
+	GtkUIManager *menu_manager;
+	GError *error;
 
 	action_group = gtk_action_group_new("PsensorActions");
 	gtk_action_group_set_translation_domain(action_group, PACKAGE);
@@ -212,6 +214,27 @@ void ui_enable_alpha_channel(struct ui_psensor *ui)
 
 }
 
+static void on_slog_enabled_cb(GConfClient *client,
+			       guint cnxn_id,
+			       GConfEntry *entry,
+			       gpointer user_data)
+{
+	struct ui_psensor *ui;
+	struct psensor **sensors;
+	pthread_mutex_t *mutex;
+
+	ui = (struct ui_psensor *)user_data;
+	sensors = ui->sensors;
+	mutex = &ui->sensors_mutex;
+
+	log_debug("cbk_slog_enabled");
+
+	if (is_slog_enabled())
+		slog_activate(NULL, sensors, mutex, config_get_slog_interval());
+	else
+		slog_close();
+}
+
 void ui_window_create(struct ui_psensor *ui)
 {
 	GtkWidget *window, *menubar;
@@ -227,6 +250,8 @@ void ui_window_create(struct ui_psensor *ui)
 				cfg->window_x,
 				cfg->window_y);
 
+	config_slog_enabled_notify_add(on_slog_enabled_cb, ui);
+
 	gtk_window_set_default_size(GTK_WINDOW(window),
 				    cfg->window_w,
 				    cfg->window_h);
@@ -240,7 +265,7 @@ void ui_window_create(struct ui_psensor *ui)
 	if (icon)
 		gtk_window_set_icon(GTK_WINDOW(window), icon);
 	else
-		fprintf(stderr, _("ERROR: Failed to load psensor icon.\n"));
+		log_err(_("Failed to load Psensor icon."));
 
 	g_signal_connect(window,
 			 "delete_event", G_CALLBACK(on_delete_event_cb), ui);
@@ -335,5 +360,6 @@ void ui_window_update(struct ui_psensor *ui)
 void ui_window_show(struct ui_psensor *ui)
 {
 	log_debug("ui_window_show()");
+	ui_window_update(ui);
 	gtk_window_present(GTK_WINDOW(ui->main_window));
 }