Modernize menus a little

A bit in preparation to gtk3 app menus.
This commit is contained in:
René Stadler 2012-08-24 02:09:04 +02:00 committed by Stefan Sauer
parent 9864042ff8
commit fb9d9ca4cf
2 changed files with 8 additions and 12 deletions

View file

@ -230,7 +230,7 @@ class Window (object):
self.actions = Common.GUI.Actions () self.actions = Common.GUI.Actions ()
group = gtk.ActionGroup ("MenuActions") group = gtk.ActionGroup ("MenuActions")
group.add_actions ([("FileMenuAction", None, _("_File")), group.add_actions ([("AppMenuAction", None, _("_Application")),
("ViewMenuAction", None, _("_View")), ("ViewMenuAction", None, _("_View")),
("ViewColumnsMenuAction", None, _("_Columns")), ("ViewColumnsMenuAction", None, _("_Columns")),
("HelpMenuAction", None, _("_Help")), ("HelpMenuAction", None, _("_Help")),
@ -244,7 +244,7 @@ class Window (object):
("close-window", gtk.STOCK_CLOSE, _("Close _Window"), "<Ctrl>W"), ("close-window", gtk.STOCK_CLOSE, _("Close _Window"), "<Ctrl>W"),
("cancel-load", gtk.STOCK_CANCEL, None,), ("cancel-load", gtk.STOCK_CANCEL, None,),
("clear-line-view", gtk.STOCK_CLEAR, None), ("clear-line-view", gtk.STOCK_CLEAR, None),
("show-about", gtk.STOCK_ABOUT, None), ("show-about", None, _("About GStreamer Debug Viewer",)),
("enlarge-text", gtk.STOCK_ZOOM_IN, _("Enlarge Text"), "<Ctrl>plus"), ("enlarge-text", gtk.STOCK_ZOOM_IN, _("Enlarge Text"), "<Ctrl>plus"),
("shrink-text", gtk.STOCK_ZOOM_OUT, _("Shrink Text"), "<Ctrl>minus"), ("shrink-text", gtk.STOCK_ZOOM_OUT, _("Shrink Text"), "<Ctrl>minus"),
("reset-text", gtk.STOCK_ZOOM_100, _("Normal Text Size"), "<Ctrl>0")]) ("reset-text", gtk.STOCK_ZOOM_100, _("Normal Text Size"), "<Ctrl>0")])

View file

@ -1,14 +1,14 @@
<!-- -*- mode: xml; -*- --> <!-- -*- mode: xml; -*- -->
<ui> <ui>
<menubar> <menubar>
<menu name="FileMenu" action="FileMenuAction"> <menu name="AppMenu" action="AppMenuAction">
<menuitem name="FileNewWindow" action="new-window"/> <menuitem name="AppNewWindow" action="new-window"/>
<menuitem name="FileOpen" action="open-file"/> <menuitem name="WindowOpen" action="open-file"/>
<menuitem name="FileReload" action="reload-file"/> <menuitem name="WindowReload" action="reload-file"/>
<separator/> <separator/>
<placeholder name="FileMenuAdditions"/> <menuitem name="ShowAbout" action="show-about"/>
<separator/> <separator/>
<menuitem name="FileCloseWindow" action="close-window"/> <menuitem name="WindowClose" action="close-window"/>
</menu> </menu>
<menu name="ViewMenu" action="ViewMenuAction"> <menu name="ViewMenu" action="ViewMenuAction">
<menu name="ViewColumnsMenu" action="ViewColumnsMenuAction"> <menu name="ViewColumnsMenu" action="ViewColumnsMenuAction">
@ -39,10 +39,6 @@
<menuitem name="ZoomOut" action="shrink-text"/> <menuitem name="ZoomOut" action="shrink-text"/>
<menuitem name="Zoom100" action="reset-text"/> <menuitem name="Zoom100" action="reset-text"/>
</menu> </menu>
<menu name="HelpMenu" action="HelpMenuAction">
<placeholder name="HelpMenuAdditions"/>
<menuitem name="HelpInfo" action="show-about"/>
</menu>
</menubar> </menubar>
<menubar name="context"> <menubar name="context">
<menu name="LogViewContextMenu" action="ViewMenuAction"> <menu name="LogViewContextMenu" action="ViewMenuAction">