diff options
| author |  Mikko Rasa <tdb@tdb.fi> | 2012-07-29 13:15:04 +0300 |
|---|---|---|
| committer | Mikko Rasa <tdb@tdb.fi> | 2012-07-31 21:12:21 +0300 |
| commit | d8c8ada6c7f3952394989b6a705624d94e956d7a (patch) | |
| tree | ec6b148c4e96122ec7220583136e0a9f31ca9f4a /info.c | |
| parent | a5e822a4d6f742afe2b4b2e6a856af3063b5ffe1 (diff) | |
| download | subsurface-d8c8ada6c7f3952394989b6a705624d94e956d7a.tar.gz | |
Changes to menu icons
It's customary for menu bars to not have icons.
Some items were lacking icons when there's perfectly good stock icons
available. I was a bit torn between the "new" and "add" icons for the
"add dive" item, since what it really does is create a new dive, but
the "add" icon is an uninteresting sheet of paper in the default icon
theme so I decided to use the "add" icon.
Signed-off-by: Mikko Rasa <tdb@tdb.fi>
Diffstat (limited to 'info.c')
| -rw-r--r-- | info.c | 16 |
1 files changed, 12 insertions, 4 deletions
@@ -139,9 +139,17 @@ static void info_menu_delete_cb(GtkMenuItem *menuitem, gpointer user_data) delete_dive_info(current_dive); } -static void add_menu_item(GtkMenu *menu, const char *label, void (*cb)(GtkMenuItem *, gpointer)) +static void add_menu_item(GtkMenu *menu, const char *label, const char *icon, void (*cb)(GtkMenuItem *, gpointer)) { - GtkWidget *item = gtk_menu_item_new_with_label(label); + GtkWidget *item; + if (icon) { + GtkWidget *image; + item = gtk_image_menu_item_new_with_label(label); + image = gtk_image_new_from_stock(icon, GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); + } else { + item = gtk_menu_item_new_with_label(label); + } g_signal_connect(item, "activate", G_CALLBACK(cb), NULL); gtk_widget_show(item); /* Yes, really */ gtk_menu_prepend(menu, item); @@ -149,8 +157,8 @@ static void add_menu_item(GtkMenu *menu, const char *label, void (*cb)(GtkMenuIt static void populate_popup_cb(GtkTextView *entry, GtkMenu *menu, gpointer user_data) { - add_menu_item(menu, "Delete", info_menu_delete_cb); - add_menu_item(menu, "Edit", info_menu_edit_cb); + add_menu_item(menu, "Delete", GTK_STOCK_DELETE, info_menu_delete_cb); + add_menu_item(menu, "Edit", GTK_STOCK_EDIT, info_menu_edit_cb); } static GtkEntry *text_value(GtkWidget *box, const char *label) |