X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=display-gtk.h;h=1cf150bb622d18c5e649f30d20d28f3eab3290cb;hb=621761233b2e1b139c07987b562ef2aa299ff35e;hp=d5ffcb246de00702985882648e3372184745d7ae;hpb=f078bc04e1f55ad9ecd0632fcfa5753440ba2267;p=ext%2Fsubsurface.git

diff --git a/display-gtk.h b/display-gtk.h
index d5ffcb2..1cf150b 100644
--- a/display-gtk.h
+++ b/display-gtk.h
@@ -27,36 +27,65 @@ typedef enum {
 #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>comma"
+#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_flush_conf(void);
 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;
 extern void set_divelist_font(const char *);
 
 extern void import_dialog(GtkWidget *, gpointer);
+extern void add_dive_cb(GtkWidget *, gpointer);
 extern void report_error(GError* error);
 extern int process_ui_events(void);
 extern void update_progressbar(progressbar_t *progress, double value);
+extern void update_progressbar_text(progressbar_t *progress, const char *text);
 
 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 *equipment_widget(int w_idx);
+extern GtkWidget *single_stats_widget(void);
+extern GtkWidget *total_stats_widget(void);
+extern GtkWidget *cylinder_list_widget(int w_idx);
+extern GtkWidget *weightsystem_list_widget(int w_idx);
 
 extern GtkWidget *dive_list_create(void);
 
+unsigned int amount_selected;
+
+extern void process_selected_dives(GList *, int *, GtkTreeModel *);
+
 typedef void (*data_func_t)(GtkTreeViewColumn *col,
 			    GtkCellRenderer *renderer,
 			    GtkTreeModel *model,
 			    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