Skip to content

Commit

Permalink
Add an 'edit' menu item to the dive info text fields
Browse files Browse the repository at this point in the history
It just pops up the dive info edit box.  This way you can be in the dive
info tab, and not have to go to the dive list just to double-click on
the dive.

This thing still needs some polish, but it's now usable.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
torvalds committed Nov 19, 2011
1 parent 1efcf45 commit 7e92084
Showing 1 changed file with 15 additions and 0 deletions.
15 changes: 15 additions & 0 deletions info.c
Expand Up @@ -95,6 +95,19 @@ void show_dive_info(struct dive *dive)
dive && dive->notes ? dive->notes : "", -1);
}

static void info_menu_edit_cb(GtkMenuItem *menuitem, gpointer user_data)
{
edit_dive_info(current_dive);
}

static void populate_popup_cb(GtkTextView *entry, GtkMenu *menu, gpointer user_data)
{
GtkWidget *item = gtk_menu_item_new_with_label("Edit");
g_signal_connect(item, "activate", G_CALLBACK(info_menu_edit_cb), NULL);
gtk_widget_show(item); /* Yes, really */
gtk_menu_prepend(menu, item);
}

static GtkEntry *text_value(GtkWidget *box, const char *label)
{
GtkWidget *widget;
Expand All @@ -105,6 +118,7 @@ static GtkEntry *text_value(GtkWidget *box, const char *label)
gtk_widget_set_can_focus(widget, FALSE);
gtk_editable_set_editable(GTK_EDITABLE(widget), FALSE);
gtk_container_add(GTK_CONTAINER(frame), widget);
g_signal_connect(widget, "populate-popup", G_CALLBACK(populate_popup_cb), NULL);
return GTK_ENTRY(widget);
}

Expand Down Expand Up @@ -160,6 +174,7 @@ static GtkTextView *text_view(GtkWidget *box, const char *label, enum writable w
gtk_widget_set_can_focus(view, FALSE);
gtk_text_view_set_editable(GTK_TEXT_VIEW(view), FALSE);
gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(view), FALSE);
g_signal_connect(view, "populate-popup", G_CALLBACK(populate_popup_cb), NULL);
}
gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(view), GTK_WRAP_WORD);
gtk_container_add(GTK_CONTAINER(scrolled_window), view);
Expand Down

0 comments on commit 7e92084

Please sign in to comment.