debian #154627 - quiver menu item in gnome interface

Add a menu item for Quiver.  While testing this, found the Quit menu
item still said that you quit using shift-q, so I updated that too.
Trunk change includes some other exit related fixes that don't apply to
the 3.4.3 branch.
This commit is contained in:
cohrs
2003-10-14 07:00:13 +00:00
parent 84f667c5a4
commit 120d0b0295
2 changed files with 11 additions and 2 deletions

View File

@@ -61,6 +61,7 @@ win32gui: allow race/gender/alignment selections beyond those specified in
unix: don't define errno if NHSTDC
X11: avoid a possible crash when using window manger to close a player
selection window
Gnome: add Quiver menu item, fix outdated Quit menu item
General New Features

View File

@@ -33,6 +33,7 @@ void ghack_quit_game(GtkWidget *widget, int button)
if (button == 0) {
gnome_exit_nhwindows(0);
gtk_object_unref(GTK_OBJECT(session_id));
gtk_exit(0);
}
}
@@ -64,6 +65,7 @@ void ghack_save_game(GtkWidget *widget, int button)
/* make sure they see the Saving message */
display_nhwindow(WIN_MESSAGE, TRUE);
gnome_exit_nhwindows("Be seeing you...");
gtk_exit(0);
} else (void)doredraw();
}
}
@@ -216,8 +218,8 @@ GnomeUIInfo game_tree[] =
GNOMEUIINFO_MENU_SAVE_ITEM(ghack_save_game_cb, NULL),
{
GNOME_APP_UI_ITEM, N_("Exit"), NULL,
ghack_quit_game_cb, GINT_TO_POINTER('Q'), NULL,
GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_ABOUT, 'Q', GDK_SHIFT_MASK
ghack_quit_game_cb, GINT_TO_POINTER(M('Q')), NULL,
GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_ABOUT, 'Q', GDK_MOD1_MASK
},
GNOMEUIINFO_END
};
@@ -361,6 +363,12 @@ GnomeUIInfo action_menu[] = {
ghack_accelerator_selected,
GINT_TO_POINTER('t'), NULL, GNOME_APP_PIXMAP_NONE, NULL, 't',0
},
{
GNOME_APP_UI_ITEM, N_("Quiver/Ready"),
N_("ready or quiver some ammunition"),
ghack_accelerator_selected,
GINT_TO_POINTER('Q'), NULL, GNOME_APP_PIXMAP_NONE, NULL, 'Q',GDK_SHIFT_MASK,
},
{
GNOME_APP_UI_ITEM, N_("Open Door"),
N_("open a door"),