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

diff --git a/display-gtk.h b/display-gtk.h
index f624bf6..059c6aa 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;
@@ -29,7 +31,7 @@ typedef enum {
 
 #if defined __APPLE__
 #define CTRLCHAR "<Meta>"
-#define PREFERENCE_ACCEL "<Meta>,"
+#define PREFERENCE_ACCEL "<Meta>comma"
 #else
 #define CTRLCHAR "<Control>"
 #define PREFERENCE_ACCEL NULL
@@ -38,6 +40,7 @@ typedef enum {
 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);
@@ -53,19 +56,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(GList *, int *, GtkTreeModel *);
+
 typedef void (*data_func_t)(GtkTreeViewColumn *col,
 			    GtkCellRenderer *renderer,
 			    GtkTreeModel *model,