diff options
author | Vincent Sanders <vince@netsurf-browser.org> | 2010-09-18 18:14:09 +0000 |
---|---|---|
committer | Vincent Sanders <vince@netsurf-browser.org> | 2010-09-18 18:14:09 +0000 |
commit | ae4339a97063fc6d51f27284178d6658677969f6 (patch) | |
tree | 6468d0080060f2547bf2fe1fe0c04f68a780fda8 /gtk/gtk_menu.h | |
parent | 300d094f2fbe4ed45b554e122dc0de8f5a396f1d (diff) | |
download | netsurf-ae4339a97063fc6d51f27284178d6658677969f6.tar.gz netsurf-ae4339a97063fc6d51f27284178d6658677969f6.tar.bz2 |
Make the gtk menus fully translatable
clean up the macro madness a bit in gtk_menu.c
svn path=/trunk/netsurf/; revision=10796
Diffstat (limited to 'gtk/gtk_menu.h')
-rw-r--r-- | gtk/gtk_menu.h | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/gtk/gtk_menu.h b/gtk/gtk_menu.h index 627ee1283..09934b45f 100644 --- a/gtk/gtk_menu.h +++ b/gtk/gtk_menu.h @@ -21,6 +21,7 @@ #include <gtk/gtk.h> struct nsgtk_file_menu { + GtkMenuItem *file; /* File menu item on menubar */ GtkMenu *file_menu; GtkImageMenuItem *newwindow_menuitem; GtkImageMenuItem *newtab_menuitem; @@ -35,6 +36,7 @@ struct nsgtk_file_menu { }; struct nsgtk_edit_menu { + GtkMenuItem *edit; /* Edit menu item on menubar */ GtkMenu *edit_menu; GtkImageMenuItem *cut_menuitem; GtkImageMenuItem *copy_menuitem; @@ -46,7 +48,8 @@ struct nsgtk_edit_menu { }; struct nsgtk_view_menu { - GtkMenu *view_menu; + GtkMenuItem *view; /* View menu item on menubar */ + GtkMenu *view_menu; /* gtk menu attached to menu item */ GtkImageMenuItem *stop_menuitem; GtkImageMenuItem *reload_menuitem; GtkImageMenuItem *scaleview_menuitem; @@ -64,6 +67,7 @@ struct nsgtk_view_menu { }; struct nsgtk_nav_menu { + GtkMenuItem *nav; /* Nav menu item on menubar */ GtkMenu *nav_menu; GtkImageMenuItem *back_menuitem; GtkImageMenuItem *forward_menuitem; @@ -76,6 +80,7 @@ struct nsgtk_nav_menu { }; struct nsgtk_tabs_menu { + GtkMenuItem *tabs; /* Tabs menu item on menubar */ GtkMenu *tabs_menu; GtkImageMenuItem *nexttab_menuitem; GtkImageMenuItem *prevtab_menuitem; @@ -83,6 +88,7 @@ struct nsgtk_tabs_menu { }; struct nsgtk_help_menu { + GtkMenuItem *help; /* Help menu item on menubar */ GtkMenu *help_menu; GtkImageMenuItem *contents_menuitem; GtkImageMenuItem *guide_menuitem; @@ -126,20 +132,18 @@ struct nsgtk_debugging_submenu { struct nsgtk_menu { - struct nsgtk_file_menu *file_menu; - struct nsgtk_file_menu *rclick_file_menu; - struct nsgtk_edit_menu *edit_menu; - struct nsgtk_edit_menu *rclick_edit_menu; - struct nsgtk_view_menu *view_menu; - struct nsgtk_view_menu *rclick_view_menu; - struct nsgtk_nav_menu *nav_menu; - struct nsgtk_nav_menu *rclick_nav_menu; - struct nsgtk_tabs_menu *tabs_menu; - struct nsgtk_tabs_menu *rclick_tabs_menu; - struct nsgtk_help_menu *help_menu; - struct nsgtk_help_menu *rclick_help_menu; - GtkMenuItem *edit_menu_item; - GtkMenuItem *tabs_menu_item; + struct nsgtk_file_menu *file; + struct nsgtk_file_menu *rclick_file; + struct nsgtk_edit_menu *edit; + struct nsgtk_edit_menu *rclick_edit; + struct nsgtk_view_menu *view; + struct nsgtk_view_menu *rclick_view; + struct nsgtk_nav_menu *nav; + struct nsgtk_nav_menu *rclick_nav; + struct nsgtk_tabs_menu *tabs; + struct nsgtk_tabs_menu *rclick_tabs; + struct nsgtk_help_menu *help; + struct nsgtk_help_menu *rclick_help; }; struct nsgtk_menu *nsgtk_menu_create(GladeXML *xml, GtkWindow *window); |