From fb9d9ca4cf233975db94a10f630e8041595fe1b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Stadler?= <mail@renestadler.de>
Date: Fri, 24 Aug 2012 02:09:04 +0200
Subject: [PATCH] Modernize menus a little

A bit in preparation to gtk3 app menus.
---
 debug-viewer/GstDebugViewer/GUI/window.py |  4 ++--
 debug-viewer/data/menus.ui                | 16 ++++++----------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/debug-viewer/GstDebugViewer/GUI/window.py b/debug-viewer/GstDebugViewer/GUI/window.py
index 4c7e201751..990485c388 100644
--- a/debug-viewer/GstDebugViewer/GUI/window.py
+++ b/debug-viewer/GstDebugViewer/GUI/window.py
@@ -230,7 +230,7 @@ class Window (object):
         self.actions = Common.GUI.Actions ()
 
         group = gtk.ActionGroup ("MenuActions")
-        group.add_actions ([("FileMenuAction", None, _("_File")),
+        group.add_actions ([("AppMenuAction", None, _("_Application")),
                             ("ViewMenuAction", None, _("_View")),
                             ("ViewColumnsMenuAction", None, _("_Columns")),
                             ("HelpMenuAction", None, _("_Help")),
@@ -244,7 +244,7 @@ class Window (object):
                             ("close-window", gtk.STOCK_CLOSE, _("Close _Window"), "<Ctrl>W"),
                             ("cancel-load", gtk.STOCK_CANCEL, 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"),
                             ("shrink-text", gtk.STOCK_ZOOM_OUT, _("Shrink Text"), "<Ctrl>minus"),
                             ("reset-text", gtk.STOCK_ZOOM_100, _("Normal Text Size"), "<Ctrl>0")])
diff --git a/debug-viewer/data/menus.ui b/debug-viewer/data/menus.ui
index 2e8bb320f5..491ecdde42 100644
--- a/debug-viewer/data/menus.ui
+++ b/debug-viewer/data/menus.ui
@@ -1,14 +1,14 @@
 <!-- -*- mode: xml; -*- -->
 <ui>
   <menubar>
-    <menu name="FileMenu" action="FileMenuAction">
-      <menuitem name="FileNewWindow" action="new-window"/>
-      <menuitem name="FileOpen" action="open-file"/>
-      <menuitem name="FileReload" action="reload-file"/>
+    <menu name="AppMenu" action="AppMenuAction">
+      <menuitem name="AppNewWindow" action="new-window"/>
+      <menuitem name="WindowOpen" action="open-file"/>
+      <menuitem name="WindowReload" action="reload-file"/>
       <separator/>
-      <placeholder name="FileMenuAdditions"/>
+      <menuitem name="ShowAbout" action="show-about"/>
       <separator/>
-      <menuitem name="FileCloseWindow" action="close-window"/>
+      <menuitem name="WindowClose" action="close-window"/>
     </menu>
     <menu name="ViewMenu" action="ViewMenuAction">
       <menu name="ViewColumnsMenu" action="ViewColumnsMenuAction">
@@ -39,10 +39,6 @@
       <menuitem name="ZoomOut" action="shrink-text"/>
       <menuitem name="Zoom100" action="reset-text"/>
     </menu>
-    <menu name="HelpMenu" action="HelpMenuAction">
-      <placeholder name="HelpMenuAdditions"/>
-      <menuitem name="HelpInfo" action="show-about"/>
-    </menu>
   </menubar>
   <menubar name="context">
     <menu name="LogViewContextMenu" action="ViewMenuAction">