X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui.h;h=453cdb075afdb43ff9af2301595d3ea968e7d94d;hb=0ef6b5963fe07dcdf417058327a35b1655e44498;hp=b8cd45c99325ed2be70818559f2a76f2265d1ffb;hpb=cc35e177d57bc4ee2cc57ae25f130dfc168aa61d;p=psensor.git

diff --git a/src/ui.h b/src/ui.h
index b8cd45c..453cdb0 100644
--- a/src/ui.h
+++ b/src/ui.h
@@ -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
@@ -26,7 +26,7 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
+#if defined(HAVE_APPINDICATOR)
 #include <libappindicator/app-indicator.h>
 #endif
 
@@ -41,14 +41,14 @@ struct ui_psensor {
 
 	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.
@@ -59,7 +59,11 @@ struct ui_psensor {
 	 * The box which contains the sensors graph and the sensors
 	 * information list.
 	 */
-	GtkWidget *sensor_box;
+	GtkPaned *sensor_box;
+
+	GtkListStore *sensors_store;
+	GtkTreeView *sensors_tree;
+	GtkScrolledWindow *sensors_scrolled_tree;
 
 	int graph_update_interval;
 };
@@ -85,8 +89,14 @@ void ui_window_create(struct ui_psensor *ui);
 
 void ui_menu_bar_show(unsigned int show, struct ui_psensor *ui);
 
-void ui_show_about_dialog();
+void ui_show_about_dialog(void);
 
 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(struct psensor **);
 #endif