X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui.c;h=446da53625a14c6cd7168a7380b37f93c9ce43e4;hb=66aa25bbb5834e9278226680087f4e8b325f23e7;hp=4bd209b18f8788a2c6f2d6b18428f39a4fc671fd;hpb=a80c55c64b0344ebd11ba451713df089bb356b14;p=psensor.git

diff --git a/src/ui.c b/src/ui.c
index 4bd209b..446da53 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2013 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
@@ -16,15 +16,57 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
-#include "cfg.h"
-#include "slog.h"
-#include "ui.h"
-#include "ui_graph.h"
-#include "ui_pref.h"
-#include "ui_sensorpref.h"
-#include "ui_sensorlist.h"
-#include "ui_status.h"
-#include "ui_appindicator.h"
+#include <stdlib.h>
+
+#include <cfg.h>
+#include <slog.h>
+#include <ui.h>
+#include <ui_appindicator.h>
+#include <ui_graph.h>
+#include <ui_pref.h>
+#include <ui_sensorlist.h>
+#include <ui_sensorpref.h>
+#include <ui_status.h>
+
+
+static void set_decoration(GtkWindow *win)
+{
+	gtk_window_set_decorated(win, config_is_window_decoration_enabled());
+}
+
+static void set_keep_below(GtkWindow *win)
+{
+	gtk_window_set_keep_below(win, config_is_window_keep_below_enabled());
+}
+
+static void
+decoration_changed_cbk(GSettings *settings, gchar *key, gpointer data)
+{
+	set_decoration((GtkWindow *)data);
+}
+
+static void
+keep_below_changed_cbk(GSettings *settings, gchar *key, gpointer data)
+{
+	set_keep_below((GtkWindow *)data);
+}
+
+static void connect_cbks(GtkWindow *win)
+{
+	log_fct_enter();
+
+	g_signal_connect_after(config_get_GSettings(),
+			       "changed::interface-window-decoration-disabled",
+			       G_CALLBACK(decoration_changed_cbk),
+			       win);
+
+	g_signal_connect_after(config_get_GSettings(),
+			       "changed::interface-window-keep-below-enabled",
+			       G_CALLBACK(keep_below_changed_cbk),
+			       win);
+
+	log_fct_exit();
+}
 
 static void save_window_pos(struct ui_psensor *ui)
 {
@@ -74,18 +116,25 @@ on_delete_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
 	return TRUE;
 }
 
-void ui_show_about_dialog()
+void ui_show_about_dialog(void)
 {
+	static const char *const authors[] = { "jeanfi@gmail.com", NULL };
+
 	gtk_show_about_dialog
 		(NULL,
+		 "authors", authors,
 		 "comments",
 		 _("Psensor is a GTK+ application for monitoring hardware "
 		   "sensors"),
 		 "copyright",
-		 _("Copyright(c) 2010-2012\njeanfi@gmail.com"),
+		 _("Copyright(c) 2010-2014 jeanfi@gmail.com"),
+#if GTK_CHECK_VERSION(3, 12, 0)
+		 "license-type", GTK_LICENSE_GPL_2_0,
+#endif
 		 "logo-icon-name", "psensor",
 		 "program-name", "Psensor",
 		 "title", _("About Psensor"),
+		 "translator-credits", _("translator-credits"),
 		 "version", VERSION,
 		 "website", PACKAGE_URL,
 		 "website-label", _("Psensor Homepage"),
@@ -150,20 +199,17 @@ 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)
+static void slog_enabled_cbk(void *data)
 {
 	struct ui_psensor *ui;
 	struct psensor **sensors;
 	pthread_mutex_t *mutex;
 
-	ui = (struct ui_psensor *)user_data;
+	ui = (struct ui_psensor *)data;
 	sensors = ui->sensors;
 	mutex = &ui->sensors_mutex;
 
-	log_debug("cbk_slog_enabled");
+	log_debug("slog_enabled_cbk");
 
 	if (is_slog_enabled())
 		slog_activate(NULL, sensors, mutex, config_get_slog_interval());
@@ -192,7 +238,7 @@ void ui_window_create(struct ui_psensor *ui)
 	if (!ok) {
 		log_printf(LOG_ERR, error->message);
 		g_error_free(error);
-		return ;
+		return;
 	}
 
 	window = GTK_WIDGET(gtk_builder_get_object(builder, "window"));
@@ -203,7 +249,7 @@ void ui_window_create(struct ui_psensor *ui)
 				cfg->window_x,
 				cfg->window_y);
 
-	config_slog_enabled_notify_add(on_slog_enabled_cb, ui);
+	config_set_slog_enabled_changed_cbk(slog_enabled_cbk, ui);
 
 	gtk_window_set_default_size(GTK_WINDOW(window),
 				    cfg->window_w,
@@ -219,11 +265,8 @@ void ui_window_create(struct ui_psensor *ui)
 	g_signal_connect(window,
 			 "delete_event", G_CALLBACK(on_delete_event_cb), ui);
 
-	gtk_window_set_decorated(GTK_WINDOW(window),
-				 cfg->window_decoration_enabled);
-
-	gtk_window_set_keep_below(GTK_WINDOW(window),
-				  cfg->window_keep_below_enabled);
+	set_decoration(GTK_WINDOW(window));
+	set_keep_below(GTK_WINDOW(window));
 
 	ui->menu_bar = GTK_WIDGET(gtk_builder_get_object(builder, "menu_bar"));
 	ui->main_box = GTK_WIDGET(gtk_builder_get_object(builder, "main_box"));
@@ -247,6 +290,8 @@ void ui_window_create(struct ui_psensor *ui)
 
 	ui_sensorlist_create(ui);
 
+	connect_cbks(GTK_WINDOW(window));
+
 	log_debug("ui_window_create(): show_all");
 	gtk_widget_show_all(ui->main_box);
 
@@ -328,3 +373,30 @@ void ui_window_show(struct ui_psensor *ui)
 	ui_window_update(ui);
 	gtk_window_present(GTK_WINDOW(ui->main_window));
 }
+
+static int cmp_sensors(const void *p1, const void *p2)
+{
+	const struct psensor *s1, *s2;
+	int pos1, pos2;
+
+	s1 = *(void **)p1;
+	s2 = *(void **)p2;
+
+	pos1 = config_get_sensor_position(s1->id);
+	pos2 = config_get_sensor_position(s2->id);
+
+	return pos1 - pos2;
+}
+
+struct psensor **ui_get_sensors_ordered_by_position(struct psensor **sensors)
+{
+	struct psensor **result;
+
+	result = psensor_list_copy(sensors);
+	qsort(result,
+	      psensor_list_size(result),
+	      sizeof(struct psensor *),
+	      cmp_sensors);
+
+	return result;
+}