X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui.h;h=26229d3121a69d3af4a2d4522582845f99e17567;hb=30280041f93f4374ce36a151df44c2bc7495d807;hp=636a9f203c0d5155784a19e168ef2c195408ebfc;hpb=73de4a553c122a608ca9ee401e306fc3ab03c03a;p=psensor.git

diff --git a/src/ui.h b/src/ui.h
index 636a9f2..26229d3 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
@@ -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,13 +41,11 @@ 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
@@ -59,7 +57,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 +87,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