X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=display-gtk.h;h=dd7e2c4a0d97a8522ce84d4a4c02d6efbb5f9d67;hb=666538ec7739fe839623bd1b6f9f80ff884ad5a9;hp=23fea912a9098af2fea81995601382cc023f4b75;hpb=565736a471e9ba66cbc68ce76c90d5e0c2fa57cf;p=ext%2Fsubsurface.git
diff --git a/display-gtk.h b/display-gtk.h
index 23fea91..dd7e2c4 100644
--- a/display-gtk.h
+++ b/display-gtk.h
@@ -14,6 +14,8 @@ typedef struct {
typedef struct {
gboolean cylinder;
gboolean temperature;
+ gboolean totalweight;
+ gboolean suit;
gboolean nitrox;
gboolean sac;
gboolean otu;
@@ -27,13 +29,28 @@ typedef enum {
#define BOOL_TO_PTR(_cond) ((_cond) ? (void *)1 : NULL)
#define PTR_TO_BOOL(_ptr) ((_ptr) != NULL)
+#if defined __APPLE__
+#define CTRLCHAR ""
+#define SHIFTCHAR ""
+#define PREFERENCE_ACCEL "comma"
+#else
+#define CTRLCHAR ""
+#define SHIFTCHAR ""
+#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;
@@ -41,19 +58,27 @@ 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(void);
+
typedef void (*data_func_t)(GtkTreeViewColumn *col,
GtkCellRenderer *renderer,
GtkTreeModel *model,