diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-16 10:46:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-16 10:46:30 -0700 |
| commit | 9b72217f79f29313d30c87c55f533cc606da6a8f (patch) | |
| tree | f3e9eb1d508b1873d20f22ddbbe9ecc0269a3149 /display-gtk.h | |
| parent | 91e7dcc555ada4fe43198327383e895e528c4cc7 (diff) | |
| parent | e6ecddfa3d17901847474b67b6121c0c8f56f078 (diff) | |
| download | subsurface-9b72217f79f29313d30c87c55f533cc606da6a8f.tar.gz | |
Merge branch 'tree2' of git://git.hohndel.org/subsurface
Pull dive-trip grouping from Dirk Hohndel:
"This turned into an updated pull request for the tree2 branch where I
implemented the date based grouping - but is actually a very different
topic: this adds the ability to edit multiple dives (and fixes some
issues with the dive editing overall). The reason for that is that it
reuses some of the infrastructure that I implemented in the tree2
branch for tracking the selected dives. More details in the commit
messages."
* 'tree2' of git://git.hohndel.org/subsurface:
Switch from date based to dive trip based grouping
Redo dive editing
Fix selecting and unselecting summary items
Apply sort functions to the correct model, don't select summary entries
Maintain selected rows when switching between list model and tree model
Create duplicate list model so sorting by columns works again
Improve tree model implementation
Allow date based grouping
Diffstat (limited to 'display-gtk.h')
| -rw-r--r-- | display-gtk.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/display-gtk.h b/display-gtk.h index 37326d590..059c6aa23 100644 --- a/display-gtk.h +++ b/display-gtk.h @@ -65,16 +65,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(GList *, int *, GtkTreeModel *); typedef void (*data_func_t)(GtkTreeViewColumn *col, GtkCellRenderer *renderer, |