Merge tag 'upstream/1.2.0'

[psensor-pkg-debian.git] / src / ui.h

diff --git a/src/ui.h b/src/ui.h
index 753d7b9..95135d6 100644 (file)
--- a/src/ui.h
+++ b/src/ui.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2012 jeanfi@gmail.com
+ * Copyright (C) 2010-2016 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,43 +21,34 @@
 
 #include "config.h"
 
+#include <pthread.h>
+
 #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
 
 #include "psensor.h"
 
+#define PSENSOR_ICON "psensor"
+
 struct ui_psensor {
        struct psensor **sensors;
-
-       GtkWidget *w_graph;
-
-       struct ui_sensorlist *ui_sensorlist;
+       /* mutex which MUST be used for accessing sensors.*/
+       pthread_mutex_t sensors_mutex;
 
        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;
-
-       GMutex *sensors_mutex;
 };
 
 /*
@@ -81,6 +72,13 @@ 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_enable_alpha_channel(struct ui_psensor *ui);
+
+void ui_cb_preferences(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