diff options
| author |  Maximilian Güntner <maximilian.guentner@gmail.com> | 2012-08-22 01:15:41 +0200 |
|---|---|---|
| committer | Maximilian Güntner <maximilian.guentner@gmail.com> | 2012-08-22 01:15:41 +0200 |
| commit | 0c0ec7e4f60d9678c3950757ccb8f791f10d033c (patch) | |
| tree | c0bc02a006629b9aff242a5ffe08e0d0a16e20b2 /display-gtk.h | |
| parent | 2cada118eb515e369ba23b85c8f3fb8c4d100aaa (diff) | |
| parent | 666538ec7739fe839623bd1b6f9f80ff884ad5a9 (diff) | |
| download | subsurface-0c0ec7e4f60d9678c3950757ccb8f791f10d033c.tar.gz | |
Merge branch 'master' into freediving-tweaks
Signed-off-by: Maximilian Güntner <maximilian.guentner@gmail.com>
Diffstat (limited to 'display-gtk.h')
| -rw-r--r-- | display-gtk.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/display-gtk.h b/display-gtk.h index efbf3fd87..dd7e2c4a0 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,9 +31,11 @@ typedef enum { #if defined __APPLE__ #define CTRLCHAR "<Meta>" +#define SHIFTCHAR "<Shift>" #define PREFERENCE_ACCEL "<Meta>comma" #else #define CTRLCHAR "<Control>" +#define SHIFTCHAR "<Shift>" #define PREFERENCE_ACCEL NULL #endif @@ -54,6 +58,7 @@ 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); @@ -62,16 +67,17 @@ 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 *equipment_widget(int w_idx); extern GtkWidget *single_stats_widget(void); extern GtkWidget *total_stats_widget(void); -extern GtkWidget *cylinder_list_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 *, GtkTreeModel *); +extern void process_selected_dives(void); typedef void (*data_func_t)(GtkTreeViewColumn *col, GtkCellRenderer *renderer, |