X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui.h;h=af17b78c32156481a6a80dfe783d192220b1ae61;hb=f3b05dae619a7909bd7422b3a82422c9442aa114;hp=b78fab2bfce70b733f343dd7ad954f12bfbd3d3c;hpb=f8fe519c1b5454ba939ade2a4b60f0066fb6aa14;p=psensor.git

diff --git a/src/ui.h b/src/ui.h
index b78fab2..af17b78 100644
--- a/src/ui.h
+++ b/src/ui.h
@@ -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
@@ -21,6 +21,8 @@
 
 #include "config.h"
 
+#include <pthread.h>
+
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
@@ -30,19 +32,23 @@
 
 #include "psensor.h"
 
+#define PSENSOR_ICON "psensor"
+
 struct ui_psensor {
 	struct psensor **sensors;
+	/* mutex which MUST be used for accessing sensors.*/
+	pthread_mutex_t sensors_mutex;
 
 	GtkWidget *w_graph;
 
-	struct ui_sensorlist *ui_sensorlist;
-
 	struct config *config;
 
 	GtkWidget *main_window;
 
 	GtkWidget *menu_bar;
 
+	GtkWidget *popup_menu;
+
 	/*
 	 * The main vertical box, top contains the menubar, bottom
 	 * contains the sensor_box.
@@ -53,11 +59,13 @@ struct ui_psensor {
 	 * The box which contains the sensors graph and the sensors
 	 * information list.
 	 */
-	GtkWidget *sensor_box;
+	GtkPaned *sensor_box;
 
-	int graph_update_interval;
+	GtkListStore *sensors_store;
+	GtkTreeView *sensors_tree;
+	GtkScrolledWindow *sensors_scrolled_tree;
 
-	GMutex *sensors_mutex;
+	int graph_update_interval;
 };
 
 /*
@@ -85,4 +93,10 @@ void ui_show_about_dialog();
 
 void ui_enable_alpha_channel(struct ui_psensor *ui);
 
+void ui_cb_preferences(GtkMenuItem *mi, gpointer data);
+void ui_cb_about(GtkMenuItem *mi, gpointer data);
+void ui_cb_menu_quit(GtkMenuItem *mi, gpointer data);
+void ui_cb_sensor_preferences(GtkMenuItem *mi, gpointer data);
+
+struct psensor **ui_get_sensors_ordered_by_position(const struct ui_psensor *);
 #endif