X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=display-gtk.h;h=f624bf6cc99cad9caedec68995f1f9029ffa2270;hb=513df18f50afc13fcef9f2421b5a33b772eed380;hp=fe373a14fc3ab9eb1349ee14080fdd36a4d79eec;hpb=9d469862af57227c93da6f2a253b76677711c886;p=ext%2Fsubsurface.git

diff --git a/display-gtk.h b/display-gtk.h
index fe373a1..f624bf6 100644
--- a/display-gtk.h
+++ b/display-gtk.h
@@ -12,10 +12,41 @@ typedef struct {
 } progressbar_t;
 
 typedef struct {
+	gboolean cylinder;
+	gboolean temperature;
+	gboolean nitrox;
 	gboolean sac;
 	gboolean otu;
 } visible_cols_t;
 
+typedef enum {
+	PREF_BOOL,
+	PREF_STRING
+} pref_type_t;
+
+#define BOOL_TO_PTR(_cond) ((_cond) ? (void *)1 : NULL)
+#define PTR_TO_BOOL(_ptr) ((_ptr) != NULL)
+
+#if defined __APPLE__
+#define CTRLCHAR "<Meta>"
+#define PREFERENCE_ACCEL "<Meta>,"
+#else
+#define CTRLCHAR "<Control>"
+#define PREFERENCE_ACCEL NULL
+#endif
+
+extern void subsurface_open_conf(void);
+extern void subsurface_set_conf(char *name, pref_type_t type, const void *value);
+extern const void *subsurface_get_conf(char *name, pref_type_t type);
+extern void subsurface_close_conf(void);
+
+extern const char *subsurface_USB_name(void);
+extern const char *subsurface_icon_name(void);
+extern void subsurface_ui_setup(GtkSettings *settings, GtkWidget *menubar,
+		GtkWidget *vbox, GtkUIManager *ui_manager);
+
+extern const char *divelist_font;
+
 extern visible_cols_t visible_cols;
 
 extern const char *divelist_font;
@@ -30,6 +61,8 @@ extern GtkWidget *dive_profile_widget(void);
 extern GtkWidget *dive_info_frame(void);
 extern GtkWidget *extended_dive_info_widget(void);
 extern GtkWidget *equipment_widget(void);
+extern GtkWidget *stats_widget(void);
+extern GtkWidget *cylinder_list_widget(void);
 
 extern GtkWidget *dive_list_create(void);
 
@@ -39,7 +72,17 @@ typedef void (*data_func_t)(GtkTreeViewColumn *col,
 			    GtkTreeIter *iter,
 			    gpointer data);
 
+typedef gint (*sort_func_t)(GtkTreeModel *model,
+			    GtkTreeIter *a,
+			    GtkTreeIter *b,
+			    gpointer user_data);
+
+#define ALIGN_LEFT 1
+#define ALIGN_RIGHT 2
+#define INVISIBLE 4
+#define UNSORTABLE 8
+
 extern GtkTreeViewColumn *tree_view_column(GtkWidget *tree_view, int index, const char *title,
-		data_func_t data_func, PangoAlignment align, gboolean visible);
+		data_func_t data_func, unsigned int flags);
 
 #endif