diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-17 10:57:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-17 10:57:24 -0700 |
| commit | d0e27c6c533005b5fd161286f68f1325bdabe8e3 (patch) | |
| tree | 37d7fe231cd6c9e8d4acc7bba243b9fd456f70c1 /divelist.c | |
| parent | 589589c707262920a4c9ffc258704e30fa62b8fa (diff) | |
| parent | 549708c6eaab2d0592c3e520e0debd82d64619b4 (diff) | |
| download | subsurface-d0e27c6c533005b5fd161286f68f1325bdabe8e3.tar.gz | |
Merge branch 'misc-fixes' of git://github.com/DataBeaver/subsurface
Pull miscellaneous fixes, mostly UI stuff from Mikko Rasa.
Both this and the pull from Pierre-Yves Chibon created a "Save As" menu
entry and logic. As a result, there were a fair number of conflicts,
but I tried to make the end result somewhat reasonable. I might have
missed some semantic conflict, though.
Series-acked-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
* 'misc-fixes' of git://github.com/DataBeaver/subsurface:
Add a separate "Save as" entry to the menu
Changes to menu icons
Improved depth info for dives without samples
Divide the panes evenly in view_three
Diffstat (limited to 'divelist.c')
| -rw-r--r-- | divelist.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/divelist.c b/divelist.c index 0e1b40dd6..5d6915256 100644 --- a/divelist.c +++ b/divelist.c @@ -1047,11 +1047,13 @@ void edit_dive_cb(GtkWidget *menuitem, gpointer data) static void popup_divelist_menu(GtkTreeView *tree_view, GtkTreeModel *model, int button) { - GtkWidget *menu, *menuitem; + GtkWidget *menu, *menuitem, *image; char editlabel[] = "Edit dives"; menu = gtk_menu_new(); - menuitem = gtk_menu_item_new_with_label("Add dive"); + menuitem = gtk_image_menu_item_new_with_label("Add dive"); + image = gtk_image_new_from_stock(GTK_STOCK_ADD, GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), image); g_signal_connect(menuitem, "activate", G_CALLBACK(add_dive_cb), NULL); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); if (amount_selected) { |