X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui.h;h=42f2af7c1386f0762577c1cb1c8d6418b1e34d75;hb=d280db5907574f0d29458dd5d301ce030a13189b;hp=14bd7687cb251e0ee418ab847ca8d648b7962cba;hpb=d9557400f86107a716e10444a2eb02babc1a1645;p=psensor.git

diff --git a/src/ui.h b/src/ui.h
index 14bd768..42f2af7 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
 
@@ -39,27 +39,14 @@ struct ui_psensor {
 	/* 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.
-	 */
-	GtkWidget *main_box;
-
-	/*
-	 * The box which contains the sensors graph and the sensors
-	 * information list.
-	 */
-	GtkWidget *sensor_box;
+	GtkListStore *sensors_store;
+	GtkTreeView *sensors_tree;
 
 	int graph_update_interval;
 };
@@ -85,7 +72,7 @@ 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);
 
@@ -94,4 +81,7 @@ 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);
 
+GtkWidget *ui_get_graph(void);
+
+struct psensor **ui_get_sensors_ordered_by_position(struct psensor **);
 #endif