From b71fa208b8a800a44773b0aefc946e3d828c5e62 Mon Sep 17 00:00:00 2001 From: leo Date: Sun, 12 Jun 2005 03:29:42 +0000 Subject: Fixed the menu accelerators. git-svn-id: http://svn.leocad.org/trunk@406 c7d43263-9d01-0410-8a33-9dba5d9f93d6 --- linux/gtkmisc.cpp | 50 +++------------ linux/gtkmisc.h | 9 ++- linux/menu.cpp | 177 +++++++++++++++++++++++++++--------------------------- 3 files changed, 102 insertions(+), 134 deletions(-) (limited to 'linux') diff --git a/linux/gtkmisc.cpp b/linux/gtkmisc.cpp index 1ca6e85..e0d1d5e 100755 --- a/linux/gtkmisc.cpp +++ b/linux/gtkmisc.cpp @@ -103,41 +103,30 @@ GtkWidget* menu_tearoff (GtkWidget *menu) return menu_item; } -GtkWidget* create_sub_menu (GtkWidget *bar, char *label, GtkAccelGroup *accel, GtkAccelGroup **menu_accel) +GtkWidget* create_sub_menu (GtkWidget *bar, char *label, GtkAccelGroup *accel) { GtkWidget *item, *menu; - guint tmp_key; - item = gtk_menu_item_new_with_label (""); - tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (item)->child), label); - gtk_widget_add_accelerator (item, "activate_item", accel, tmp_key, GDK_MOD1_MASK, (GtkAccelFlags)0); + item = gtk_menu_item_new_with_mnemonic(label); gtk_widget_show (item); gtk_container_add (GTK_CONTAINER (bar), item); menu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu); - // *menu_accel = gtk_menu_ensure_uline_accel_group (GTK_MENU (menu)); - *menu_accel = gtk_menu_get_accel_group(GTK_MENU(menu)); return menu; } -GtkWidget* create_menu_in_menu (GtkWidget *menu, gchar *label, GtkAccelGroup *menu_accel, - GtkAccelGroup **submenu_accel) +GtkWidget* create_menu_in_menu (GtkWidget *menu, gchar *label, GtkAccelGroup *accel) { GtkWidget *item, *submenu; - guint tmp_key; - item = gtk_menu_item_new_with_label (""); - tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (item)->child), label); - gtk_widget_add_accelerator (item, "activate_item", menu_accel, tmp_key, (GdkModifierType)0, (GtkAccelFlags)0); + item = gtk_menu_item_new_with_mnemonic(label); gtk_widget_show (item); gtk_container_add (GTK_CONTAINER (menu), item); submenu = gtk_menu_new (); gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), submenu); - // *submenu_accel = gtk_menu_ensure_uline_accel_group (GTK_MENU (submenu)); - *submenu_accel = gtk_menu_get_accel_group(GTK_MENU(submenu)); return submenu; } @@ -146,12 +135,8 @@ GtkWidget* create_menu_item (GtkWidget *menu, gchar *label, GtkAccelGroup *menu_ GtkSignalFunc func, GtkObject *window, int id, const char* data) { GtkWidget *item; - guint tmp_key; - - item = gtk_menu_item_new_with_label (""); - tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (item)->child), label); - gtk_widget_add_accelerator (item, "activate_item", menu_accel, tmp_key, (GdkModifierType)0, (GtkAccelFlags)0); + item = gtk_menu_item_new_with_mnemonic (label); gtk_widget_show (item); gtk_container_add (GTK_CONTAINER (menu), item); gtk_signal_connect (GTK_OBJECT (item), "activate", GTK_SIGNAL_FUNC (func), GINT_TO_POINTER (id)); @@ -165,25 +150,14 @@ GtkWidget* create_menu_item (GtkWidget *menu, gchar *label, GtkAccelGroup *menu_ GtkWidget* create_pixmap_menu_item (GtkWidget *menu, gchar *label, gchar **pixmap, GtkAccelGroup *menu_accel, GtkSignalFunc func, GtkObject *window, int id, const char* data) { - GtkWidget *item, *accel_label, *pixmap_widget; - guint tmp_key; - - item = gtk_image_menu_item_new (); + GtkWidget *item, *pixmap_widget; - accel_label = gtk_accel_label_new (label); - gtk_misc_set_alignment (GTK_MISC (accel_label), 0.0, 0.5); - - gtk_container_add (GTK_CONTAINER (item), accel_label); - gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (accel_label), item); - gtk_widget_show (accel_label); + item = gtk_image_menu_item_new_with_mnemonic(label); pixmap_widget = new_pixmap (GTK_WIDGET (window), pixmap); gtk_widget_show (pixmap_widget); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), pixmap_widget); - tmp_key = gtk_label_parse_uline (GTK_LABEL (accel_label), label); - gtk_widget_add_accelerator (item, "activate_item", menu_accel, tmp_key, (GdkModifierType)0, (GtkAccelFlags)0); - gtk_widget_show (item); gtk_container_add (GTK_CONTAINER (menu), item); gtk_signal_connect (GTK_OBJECT (item), "activate", GTK_SIGNAL_FUNC (func), GINT_TO_POINTER (id)); @@ -198,11 +172,8 @@ GtkWidget* create_check_menu_item (GtkWidget *menu, gchar *label, GtkAccelGroup GtkSignalFunc func, GtkObject *window, int id, const char* data) { GtkWidget *item; - guint tmp_key; - item = gtk_check_menu_item_new_with_label (""); - tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (item)->child), label); - gtk_widget_add_accelerator (item, "activate_item", menu_accel, tmp_key, (GdkModifierType)0, (GtkAccelFlags)0); + item = gtk_check_menu_item_new_with_mnemonic(label); gtk_widget_show (item); gtk_container_add (GTK_CONTAINER (menu), item); gtk_signal_connect (GTK_OBJECT (item), "activate", GTK_SIGNAL_FUNC (func), GINT_TO_POINTER (id)); @@ -218,14 +189,11 @@ GtkWidget* create_radio_menu_item (GtkWidget *menu, GtkWidget *last, gchar *labe GtkObject *window, int id, const char* data) { GtkWidget *item; - guint tmp_key; GSList *group = NULL; if (last != NULL) group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (last)); - item = gtk_radio_menu_item_new_with_label (group, ""); - tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (item)->child), label); - gtk_widget_add_accelerator (item, "activate_item", menu_accel, tmp_key, (GdkModifierType)0, (GtkAccelFlags)0); + item = gtk_radio_menu_item_new_with_mnemonic(group, label); gtk_widget_show (item); gtk_container_add (GTK_CONTAINER (menu), item); gtk_signal_connect (GTK_OBJECT (item), "activate", GTK_SIGNAL_FUNC (func), GINT_TO_POINTER (id)); diff --git a/linux/gtkmisc.h b/linux/gtkmisc.h index 6c7688c..eed42d3 100755 --- a/linux/gtkmisc.h +++ b/linux/gtkmisc.h @@ -6,12 +6,11 @@ void load_pixmap (const char* filename, GdkPixmap **gdkpixmap, GdkBitmap **mask) GtkWidget* menu_separator (GtkWidget *menu); GtkWidget* menu_tearoff (GtkWidget *menu); -GtkWidget* create_sub_menu (GtkWidget *bar, char *label, GtkAccelGroup *accel, GtkAccelGroup **menu_accel); -GtkWidget* create_menu_in_menu (GtkWidget *menu, gchar *label, GtkAccelGroup *menu_accel, - GtkAccelGroup **submenu_accel); -GtkWidget* create_menu_item (GtkWidget *menu, gchar *label, GtkAccelGroup *menu_accel, +GtkWidget* create_sub_menu (GtkWidget *bar, char *label, GtkAccelGroup *accel); +GtkWidget* create_menu_in_menu (GtkWidget *menu, gchar *label, GtkAccelGroup *accel); +GtkWidget* create_menu_item (GtkWidget *menu, gchar *label, GtkAccelGroup *accel, GtkSignalFunc func, GtkObject *window, int id, const char* data); -GtkWidget* create_pixmap_menu_item (GtkWidget *menu, gchar *label, gchar **pixmap, GtkAccelGroup *menu_accel, +GtkWidget* create_pixmap_menu_item (GtkWidget *menu, gchar *label, gchar **pixmap, GtkAccelGroup *accel, GtkSignalFunc func, GtkObject *window, int id, const char* data); GtkWidget* create_check_menu_item (GtkWidget *menu, gchar *label, GtkAccelGroup *menu_accel, GtkSignalFunc func, GtkObject *window, int id, const char* data); diff --git a/linux/menu.cpp b/linux/menu.cpp index 4a08170..8d48354 100644 --- a/linux/menu.cpp +++ b/linux/menu.cpp @@ -23,9 +23,10 @@ void create_main_menu (GtkObject *window, GtkWidget *vbox) #include "pixmaps/st-paste.xpm" GtkWidget *handle_box, *menu_bar, *menu, *menu_in_menu, *item; - GtkAccelGroup *accel, *menu_accel, *menu_in_menu_accel; + GtkAccelGroup *accel; - accel = NULL;//gtk_accel_group_get_default (); + accel = gtk_accel_group_new(); + gtk_window_add_accel_group(GTK_WINDOW(window), accel); handle_box = gtk_handle_box_new (); gtk_box_pack_start (GTK_BOX (vbox), handle_box, FALSE, FALSE, 0); gtk_widget_show (handle_box); @@ -35,233 +36,233 @@ void create_main_menu (GtkObject *window, GtkWidget *vbox) gtk_widget_show (menu_bar); // File menu - menu = create_sub_menu (menu_bar, "_File", accel, &menu_accel); + menu = create_sub_menu (menu_bar, "_File", accel); menu_tearoff (menu); - create_pixmap_menu_item (menu, "_New", st_new, menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_pixmap_menu_item (menu, "_New", st_new, accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_FILE_NEW, "menu_file_new"); - create_pixmap_menu_item (menu, "_Open...", st_open, menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_pixmap_menu_item (menu, "_Open...", st_open, accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_FILE_OPEN, "menu_file_open"); - create_menu_item (menu, "_Merge...", menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_menu_item (menu, "_Merge...", accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_FILE_MERGE, "menu_file_merge"); menu_separator (menu); - create_pixmap_menu_item (menu, "_Save", st_save, menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_pixmap_menu_item (menu, "_Save", st_save, accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_FILE_SAVE, "menu_file_save"); - create_menu_item (menu, "Save _As...", menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_menu_item (menu, "Save _As...", accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_FILE_SAVEAS, "menu_file_saveas"); - create_pixmap_menu_item (menu, "Save Pic_ture...", photo, menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_pixmap_menu_item (menu, "Save Pic_ture...", photo, accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_FILE_PICTURE, "menu_file_picture"); - menu_in_menu = create_menu_in_menu (menu, "Ex_port", menu_accel, &menu_in_menu_accel); - create_menu_item (menu_in_menu, "_HTML...", menu_in_menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + menu_in_menu = create_menu_in_menu (menu, "Ex_port", accel); + create_menu_item (menu_in_menu, "_HTML...", accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_FILE_HTML, "menu_file_html"); - create_menu_item (menu_in_menu, "_POV-Ray...", menu_in_menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_menu_item (menu_in_menu, "_POV-Ray...", accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_FILE_POVRAY, "menu_file_povray"); - create_menu_item (menu_in_menu, "_Wavefront...", menu_in_menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_menu_item (menu_in_menu, "_Wavefront...", accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_FILE_WAVEFRONT, "menu_file_wavefront"); menu_separator (menu); - create_pixmap_menu_item (menu, "Propert_ies...", info, menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_pixmap_menu_item (menu, "Propert_ies...", info, accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_FILE_PROPERTIES, "menu_file_properties"); - create_menu_item (menu, "Pieces _Library Manager...", menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_menu_item (menu, "Pieces _Library Manager...", accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_FILE_LIBRARY, "menu_file_library"); - create_menu_item (menu, "Terrain _Editor...", menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_menu_item (menu, "Terrain _Editor...", accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_FILE_TERRAIN, "menu_file_terrain"); menu_separator (menu); BaseMenuItem base; - base.accel = menu_accel; + base.accel = accel; - base.widget = create_menu_item (menu, "1", menu_accel, GTK_SIGNAL_FUNC (OnCommand), + base.widget = create_menu_item (menu, "1", accel, GTK_SIGNAL_FUNC (OnCommand), window, ID_FILE_RECENT1, "menu_file_recent1"); main_window->SetMenuItem (LC_MAINWND_RECENT1, &base); - base.widget = create_menu_item (menu, "2", menu_accel, GTK_SIGNAL_FUNC (OnCommand), + base.widget = create_menu_item (menu, "2", accel, GTK_SIGNAL_FUNC (OnCommand), window, ID_FILE_RECENT2, "menu_file_recent2"); main_window->SetMenuItem (LC_MAINWND_RECENT2, &base); - base.widget = create_menu_item (menu, "3", menu_accel, GTK_SIGNAL_FUNC (OnCommand), + base.widget = create_menu_item (menu, "3", accel, GTK_SIGNAL_FUNC (OnCommand), window, ID_FILE_RECENT3, "menu_file_recent3"); main_window->SetMenuItem (LC_MAINWND_RECENT3, &base); - base.widget = create_menu_item (menu, "4", menu_accel, GTK_SIGNAL_FUNC (OnCommand), + base.widget = create_menu_item (menu, "4", accel, GTK_SIGNAL_FUNC (OnCommand), window, ID_FILE_RECENT4, "menu_file_recent4"); main_window->SetMenuItem (LC_MAINWND_RECENT4, &base); - gtk_object_set_data (window, "file_menu_accel", menu_accel); + gtk_object_set_data (window, "file_menu_accel", accel); menu_separator (menu); - create_menu_item (menu, "E_xit...", menu_accel, GTK_SIGNAL_FUNC (OnCommand), + create_menu_item (menu, "E_xit...", accel, GTK_SIGNAL_FUNC (OnCommand), window, ID_FILE_EXIT, "menu_file_exit"); // Edit menu - menu = create_sub_menu (menu_bar, "_Edit", accel, &menu_accel); + menu = create_sub_menu (menu_bar, "_Edit", accel); menu_tearoff (menu); - create_pixmap_menu_item (menu, "_Undo", st_undo, menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_pixmap_menu_item (menu, "_Undo", st_undo, accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_EDIT_UNDO, "menu_edit_undo"); - create_pixmap_menu_item (menu, "_Redo", st_redo, menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_pixmap_menu_item (menu, "_Redo", st_redo, accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_EDIT_REDO, "menu_edit_redo"); menu_separator (menu); - create_pixmap_menu_item (menu, "Cu_t", st_cut, menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_pixmap_menu_item (menu, "Cu_t", st_cut, accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_EDIT_CUT, "menu_edit_cut"); - create_pixmap_menu_item (menu, "_Copy", st_copy, menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_pixmap_menu_item (menu, "_Copy", st_copy, accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_EDIT_COPY, "menu_edit_copy"); - create_pixmap_menu_item (menu, "_Paste", st_paste, menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_pixmap_menu_item (menu, "_Paste", st_paste, accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_EDIT_PASTE, "menu_edit_paste"); menu_separator (menu); - create_menu_item (menu, "Select _All", menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_menu_item (menu, "Select _All", accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_EDIT_SELECT_ALL, "menu_edit_select_all"); - create_menu_item (menu, "Select _None", menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_menu_item (menu, "Select _None", accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_EDIT_SELECT_NONE, "menu_edit_select_none"); - create_menu_item (menu, "Select _Invert", menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_menu_item (menu, "Select _Invert", accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_EDIT_SELECT_INVERT, "menu_edit_select_invert"); - create_menu_item (menu, "_Select by Name...", menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_menu_item (menu, "_Select by Name...", accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_EDIT_SELECT_BYNAME, "menu_edit_select_byname"); // Piece menu - menu = create_sub_menu (menu_bar, "_Piece", accel, &menu_accel); + menu = create_sub_menu (menu_bar, "_Piece", accel); menu_tearoff (menu); - create_menu_item (menu, "_Insert", menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_menu_item (menu, "_Insert", accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_PIECE_INSERT, "menu_piece_insert"); - create_menu_item (menu, "De_lete", menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_menu_item (menu, "De_lete", accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_PIECE_DELETE, "menu_piece_delete"); - create_menu_item (menu, "Minifig Wi_zard...", menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_menu_item (menu, "Minifig Wi_zard...", accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_PIECE_MINIFIG, "menu_piece_minifig"); - create_menu_item (menu, "Ar_ray...", menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_menu_item (menu, "Ar_ray...", accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_PIECE_ARRAY, "menu_piece_array"); - create_menu_item (menu, "_Copy Keys", menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_menu_item (menu, "_Copy Keys", accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_PIECE_COPYKEYS, "menu_piece_copykeys"); menu_separator (menu); - create_menu_item (menu, "_Group", menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_menu_item (menu, "_Group", accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_PIECE_GROUP, "menu_piece_group"); - create_menu_item (menu, "_Ungroup", menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_menu_item (menu, "_Ungroup", accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_PIECE_UNGROUP, "menu_piece_ungroup"); - create_menu_item (menu, "Re_move from Group", menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_menu_item (menu, "Re_move from Group", accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_PIECE_GROUP_REMOVE, "menu_piece_group_remove"); - create_menu_item (menu, "A_dd to Group", menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_menu_item (menu, "A_dd to Group", accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_PIECE_GROUP_ADD, "menu_piece_group_add"); - create_menu_item (menu, "Edi_t Groups...", menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_menu_item (menu, "Edi_t Groups...", accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_PIECE_GROUP_EDIT, "menu_piece_group_edit"); menu_separator (menu); - create_menu_item (menu, "Hide _Selected", menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_menu_item (menu, "Hide _Selected", accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_PIECE_HIDE_SELECTED, "menu_piece_hide_selected"); - create_menu_item (menu, "Hide U_nselected", menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_menu_item (menu, "Hide U_nselected", accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_PIECE_HIDE_UNSELECTED, "menu_piece_hide_unselected"); - create_menu_item (menu, "Unhide _All", menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_menu_item (menu, "Unhide _All", accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_PIECE_UNHIDE_ALL, "menu_piece_unhide_all"); // View menu - menu = create_sub_menu (menu_bar, "_View", accel, &menu_accel); + menu = create_sub_menu (menu_bar, "_View", accel); menu_tearoff (menu); - create_menu_item (menu, "_Preferences...", menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_menu_item (menu, "_Preferences...", accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_VIEW_PREFERENCES, "menu_view_preferences"); menu_separator (menu); - menu_in_menu = create_menu_in_menu (menu, "Tool_bars", menu_accel, &menu_in_menu_accel); - create_check_menu_item (menu_in_menu, "S_tandard", menu_in_menu_accel, GTK_SIGNAL_FUNC (OnCommand), + menu_in_menu = create_menu_in_menu (menu, "Tool_bars", accel); + create_check_menu_item (menu_in_menu, "S_tandard", accel, GTK_SIGNAL_FUNC (OnCommand), window, ID_VIEW_TOOLBAR_STANDARD, "menu_view_toolbar_standard"); - create_check_menu_item (menu_in_menu, "Dra_wing", menu_in_menu_accel, GTK_SIGNAL_FUNC (OnCommand), + create_check_menu_item (menu_in_menu, "Dra_wing", accel, GTK_SIGNAL_FUNC (OnCommand), window, ID_VIEW_TOOLBAR_DRAWING, "menu_view_toolbar_drawing"); - create_check_menu_item (menu_in_menu, "Ani_mation", menu_in_menu_accel, GTK_SIGNAL_FUNC (OnCommand), + create_check_menu_item (menu_in_menu, "Ani_mation", accel, GTK_SIGNAL_FUNC (OnCommand), window, ID_VIEW_TOOLBAR_ANIMATION, "menu_view_toolbar_animation"); - create_check_menu_item (menu_in_menu, "Mo_dify", menu_in_menu_accel, GTK_SIGNAL_FUNC (OnCommand), + create_check_menu_item (menu_in_menu, "Mo_dify", accel, GTK_SIGNAL_FUNC (OnCommand), window, ID_VIEW_TOOLBAR_MODIFY, "menu_view_toolbar_modify"); - create_check_menu_item (menu_in_menu, "_Pieces", menu_in_menu_accel, GTK_SIGNAL_FUNC (OnCommand), + create_check_menu_item (menu_in_menu, "_Pieces", accel, GTK_SIGNAL_FUNC (OnCommand), window, ID_VIEW_TOOLBAR_PIECES, "menu_view_toolbar_pieces"); menu_separator (menu_in_menu); - create_check_menu_item (menu_in_menu, "_Floating Pieces", menu_in_menu_accel, GTK_SIGNAL_FUNC (OnCommand), + create_check_menu_item (menu_in_menu, "_Floating Pieces", accel, GTK_SIGNAL_FUNC (OnCommand), window, ID_VIEW_TOOLBAR_FLOATING, "menu_view_toolbar_floating"); - item = create_radio_menu_item (menu_in_menu, NULL, "Icons _and Text", menu_in_menu_accel, + item = create_radio_menu_item (menu_in_menu, NULL, "Icons _and Text", accel, GTK_SIGNAL_FUNC (OnCommand), window, ID_VIEW_TOOLBAR_BOTH, "menu_view_toolbar_both"); - item = create_radio_menu_item (menu_in_menu, item, "_Icons only", menu_in_menu_accel, + item = create_radio_menu_item (menu_in_menu, item, "_Icons only", accel, GTK_SIGNAL_FUNC (OnCommand), window, ID_VIEW_TOOLBAR_ICONS, "menu_view_toolbar_icons"); - item = create_radio_menu_item (menu_in_menu, item, "Te_xt only", menu_in_menu_accel, + item = create_radio_menu_item (menu_in_menu, item, "Te_xt only", accel, GTK_SIGNAL_FUNC (OnCommand), window, ID_VIEW_TOOLBAR_TEXT, "menu_view_toolbar_text"); - create_menu_item (menu, "Zoom _In", menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_menu_item (menu, "Zoom _In", accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_VIEW_ZOOMIN, "menu_view_zoomin"); - create_menu_item (menu, "Zoom _Out", menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_menu_item (menu, "Zoom _Out", accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_VIEW_ZOOMOUT, "menu_view_zoomout"); - create_menu_item (menu, "Zoom E_xtents", menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_menu_item (menu, "Zoom E_xtents", accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_VIEW_ZOOMEXTENTS, "menu_view_zoomextents"); menu_separator (menu); - create_menu_item (menu, "_Create", menu_accel, GTK_SIGNAL_FUNC (OnCommand), + create_menu_item (menu, "_Create", accel, GTK_SIGNAL_FUNC (OnCommand), window, ID_VIEW_CREATE, "menu_view_create"); - menu_in_menu = create_menu_in_menu (menu, "Vie_wports", menu_accel, &menu_in_menu_accel); - item = create_radio_menu_pixmap (menu_in_menu, NULL, "vports01.xpm", menu_in_menu_accel, + menu_in_menu = create_menu_in_menu (menu, "Vie_wports", accel); + item = create_radio_menu_pixmap (menu_in_menu, NULL, "vports01.xpm", accel, GTK_SIGNAL_FUNC (OnCommand), window, ID_VIEW_VIEWPORTS_01, "menu_view_viewports_01"); - item = create_radio_menu_pixmap (menu_in_menu, item, "vports02.xpm", menu_in_menu_accel, + item = create_radio_menu_pixmap (menu_in_menu, item, "vports02.xpm", accel, GTK_SIGNAL_FUNC (OnCommand), window, ID_VIEW_VIEWPORTS_02, "menu_view_viewports_02"); - item = create_radio_menu_pixmap (menu_in_menu, item, "vports03.xpm", menu_in_menu_accel, + item = create_radio_menu_pixmap (menu_in_menu, item, "vports03.xpm", accel, GTK_SIGNAL_FUNC (OnCommand), window, ID_VIEW_VIEWPORTS_03, "menu_view_viewports_03"); - item = create_radio_menu_pixmap (menu_in_menu, item, "vports04.xpm", menu_in_menu_accel, + item = create_radio_menu_pixmap (menu_in_menu, item, "vports04.xpm", accel, GTK_SIGNAL_FUNC (OnCommand), window, ID_VIEW_VIEWPORTS_04, "menu_view_viewports_04"); - item = create_radio_menu_pixmap (menu_in_menu, item, "vports05.xpm", menu_in_menu_accel, + item = create_radio_menu_pixmap (menu_in_menu, item, "vports05.xpm", accel, GTK_SIGNAL_FUNC (OnCommand), window, ID_VIEW_VIEWPORTS_05, "menu_view_viewports_05"); - item = create_radio_menu_pixmap (menu_in_menu, item, "vports06.xpm", menu_in_menu_accel, + item = create_radio_menu_pixmap (menu_in_menu, item, "vports06.xpm", accel, GTK_SIGNAL_FUNC (OnCommand), window, ID_VIEW_VIEWPORTS_06, "menu_view_viewports_06"); - item = create_radio_menu_pixmap (menu_in_menu, item, "vports07.xpm", menu_in_menu_accel, + item = create_radio_menu_pixmap (menu_in_menu, item, "vports07.xpm", accel, GTK_SIGNAL_FUNC (OnCommand), window, ID_VIEW_VIEWPORTS_07, "menu_view_viewports_07"); - item = create_radio_menu_pixmap (menu_in_menu, item, "vports08.xpm", menu_in_menu_accel, + item = create_radio_menu_pixmap (menu_in_menu, item, "vports08.xpm", accel, GTK_SIGNAL_FUNC (OnCommand), window, ID_VIEW_VIEWPORTS_08, "menu_view_viewports_08"); - item = create_radio_menu_pixmap (menu_in_menu, item, "vports09.xpm", menu_in_menu_accel, + item = create_radio_menu_pixmap (menu_in_menu, item, "vports09.xpm", accel, GTK_SIGNAL_FUNC (OnCommand), window, ID_VIEW_VIEWPORTS_09, "menu_view_viewports_09"); - item = create_radio_menu_pixmap (menu_in_menu, item, "vports10.xpm", menu_in_menu_accel, + item = create_radio_menu_pixmap (menu_in_menu, item, "vports10.xpm", accel, GTK_SIGNAL_FUNC (OnCommand), window, ID_VIEW_VIEWPORTS_10, "menu_view_viewports_10"); - item = create_radio_menu_pixmap (menu_in_menu, item, "vports11.xpm", menu_in_menu_accel, + item = create_radio_menu_pixmap (menu_in_menu, item, "vports11.xpm", accel, GTK_SIGNAL_FUNC (OnCommand), window, ID_VIEW_VIEWPORTS_11, "menu_view_viewports_11"); - item = create_radio_menu_pixmap (menu_in_menu, item, "vports12.xpm", menu_in_menu_accel, + item = create_radio_menu_pixmap (menu_in_menu, item, "vports12.xpm", accel, GTK_SIGNAL_FUNC (OnCommand), window, ID_VIEW_VIEWPORTS_12, "menu_view_viewports_12"); - item = create_radio_menu_pixmap (menu_in_menu, item, "vports13.xpm", menu_in_menu_accel, + item = create_radio_menu_pixmap (menu_in_menu, item, "vports13.xpm", accel, GTK_SIGNAL_FUNC (OnCommand), window, ID_VIEW_VIEWPORTS_13, "menu_view_viewports_13"); - item = create_radio_menu_pixmap (menu_in_menu, item, "vports14.xpm", menu_in_menu_accel, + item = create_radio_menu_pixmap (menu_in_menu, item, "vports14.xpm", accel, GTK_SIGNAL_FUNC (OnCommand), window, ID_VIEW_VIEWPORTS_14, "menu_view_viewports_14"); - menu_in_menu = create_menu_in_menu (menu, "_Cameras", menu_accel, &menu_in_menu_accel); + menu_in_menu = create_menu_in_menu (menu, "_Cameras", accel); gtk_object_set_data (window, "cameras_menu", menu_in_menu); - menu_in_menu = create_menu_in_menu (menu, "S_tep", menu_accel, &menu_in_menu_accel); - create_menu_item (menu_in_menu, "Fi_rst", menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + menu_in_menu = create_menu_in_menu (menu, "S_tep", accel); + create_menu_item (menu_in_menu, "Fi_rst", accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_VIEW_STEP_FIRST, "menu_view_step_first"); - create_menu_item (menu_in_menu, "Pre_vious", menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_menu_item (menu_in_menu, "Pre_vious", accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_VIEW_STEP_PREVIOUS, "menu_view_step_previous"); - create_menu_item (menu_in_menu, "Ne_xt", menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_menu_item (menu_in_menu, "Ne_xt", accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_VIEW_STEP_NEXT, "menu_view_step_next"); - create_menu_item (menu_in_menu, "_Last", menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_menu_item (menu_in_menu, "_Last", accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_VIEW_STEP_LAST, "menu_view_step_last"); menu_separator (menu_in_menu); - create_menu_item (menu_in_menu, "_Insert", menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_menu_item (menu_in_menu, "_Insert", accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_VIEW_STEP_INSERT, "menu_view_step_insert"); - create_menu_item (menu_in_menu, "_Delete", menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_menu_item (menu_in_menu, "_Delete", accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_VIEW_STEP_DELETE, "menu_view_step_delete"); - menu = create_sub_menu (menu_bar, "_Help", accel, &menu_accel); + menu = create_sub_menu (menu_bar, "_Help", accel); menu_tearoff (menu); - create_menu_item (menu, "_About", menu_accel, GTK_SIGNAL_FUNC (OnCommandDirect), + create_menu_item (menu, "_About", accel, GTK_SIGNAL_FUNC (OnCommandDirect), window, LC_HELP_ABOUT, "menu_help_about"); // TODO: read accelerators from a file -- cgit v1.2.3