From a6b9eaee0aa2ff67482560f4401e0dc6f2c79237 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sat, 3 Sep 2011 21:38:07 -0700 Subject: [PATCH] Add 'Quit' menu item, and fix invisible "File" on gtk2 I didn't even notice that the "File" part of the file menu no longer showed up, since the keyboard accelerator for ^S worked fine.. But apparently there's no default label associated with GTK_STOCK_FILE in gtk2, so the "File" text went away with the conversion to GtkUIManager in commit 4d62478e14fe ("Use the newer GtkUIManager for menu creation.") The addition of a Quit menu entry with the associated keyboard accelerator also makes ^Q "just work". Of course, if we actually tracked dirty state etc, we could perhaps ask the user whether they wanted to save or something. But I'm not exactly famous for my GUI chops, so .. Signed-off-by: Linus Torvalds --- main.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/main.c b/main.c index 410bf95..c9cda2b 100644 --- a/main.c +++ b/main.c @@ -128,10 +128,16 @@ static void file_save(GtkWidget *w, gpointer data) gtk_widget_destroy(dialog); } +static void quit(GtkWidget *w, gpointer data) +{ + gtk_main_quit(); +} + static GtkActionEntry menu_items[] = { - { "FileMenuAction", GTK_STOCK_FILE, NULL, NULL, NULL, NULL}, - { "OpenFile", GTK_STOCK_OPEN, NULL, "O", NULL, G_CALLBACK(file_open) }, - { "SaveFile", GTK_STOCK_SAVE, NULL, "S", NULL, G_CALLBACK(file_save) }, + { "FileMenuAction", GTK_STOCK_FILE, "File", NULL, NULL, NULL}, + { "OpenFile", GTK_STOCK_OPEN, NULL, "O", NULL, G_CALLBACK(file_open) }, + { "SaveFile", GTK_STOCK_SAVE, NULL, "S", NULL, G_CALLBACK(file_save) }, + { "Quit", GTK_STOCK_QUIT, NULL, "Q", NULL, G_CALLBACK(quit) }, }; static gint nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]); @@ -141,6 +147,7 @@ static const gchar* ui_string = " \ \ \ \ + \ \ \ \ @@ -190,7 +197,7 @@ int main(int argc, char **argv) report_dives(); win = gtk_window_new(GTK_WINDOW_TOPLEVEL); - g_signal_connect(G_OBJECT(win), "destroy", G_CALLBACK(on_destroy), NULL); + g_signal_connect(G_OBJECT(win), "destroy", G_CALLBACK(on_destroy), NULL); main_window = win; vbox = gtk_vbox_new(FALSE, 0); -- 2.43.0