r19815 - gnucash/trunk/src - Bug #634357 followup: convert New and Open submenus into plain menus

[Geert Janssens]

Author: gjanssens
Date: 2010-11-15 17:53:18 -0500 (Mon, 15 Nov 2010)
New Revision: 19815
Trac: http://svn.gnucash.org/trac/changeset/19815

Modified:
   gnucash/trunk/src/gnome-utils/gnc-main-window.c
   gnucash/trunk/src/gnome-utils/ui/gnc-main-window-ui.xml
   gnucash/trunk/src/gnome/ui/gnc-plugin-basic-commands-ui.xml
Log:
Bug #634357 followup: convert New and Open submenus into plain menus

Modified: gnucash/trunk/src/gnome/ui/gnc-plugin-basic-commands-ui.xml
===================================================================
--- gnucash/trunk/src/gnome/ui/gnc-plugin-basic-commands-ui.xml	2010-11-15 19:37:24 UTC (rev 19814)
+++ gnucash/trunk/src/gnome/ui/gnc-plugin-basic-commands-ui.xml	2010-11-15 22:53:18 UTC (rev 19815)
@@ -1,16 +1,12 @@
 <ui>
   <menubar>
     <menu name="File" action="FileAction">
-      <menu name="FileNewMenu" action="FileNewMenuAction">
-        <placeholder name="FileNewTopPlaceholder">
-          <menuitem name="FileNew" action="FileNewAction"/>
-        </placeholder>
-      </menu>
-      <menu name="FileOpenMenu" action="FileOpenMenuAction">
-        <placeholder name="FileOpenTopPlaceholder">
-          <menuitem name="FileOpen" action="FileOpenAction"/>
-        </placeholder>
-      </menu>
+      <placeholder name="FileNewTopPlaceholder">
+        <menuitem name="FileNew" action="FileNewAction"/>
+      </placeholder>
+      <placeholder name="FileOpenTopPlaceholder">
+        <menuitem name="FileOpen" action="FileOpenAction"/>
+      </placeholder>
       <placeholder name="FileSavePlaceholder">
         <menuitem name="FileSave" action="FileSaveAction"/>
         <menuitem name="FileSaveAs" action="FileSaveAsAction"/>

Modified: gnucash/trunk/src/gnome-utils/gnc-main-window.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-main-window.c	2010-11-15 19:37:24 UTC (rev 19814)
+++ gnucash/trunk/src/gnome-utils/gnc-main-window.c	2010-11-15 22:53:18 UTC (rev 19815)
@@ -242,8 +242,6 @@
 
     /* File menu */
 
-    { "FileNewMenuAction", GTK_STOCK_NEW, N_("_New"), "", NULL, NULL },
-    { "FileOpenMenuAction", GTK_STOCK_OPEN, N_("_Open"), "", NULL, NULL },
     { "FileImportAction", NULL, N_("_Import"), NULL, NULL, NULL },
     { "FileExportAction", NULL, N_("_Export"), NULL, NULL, NULL },
     {

Modified: gnucash/trunk/src/gnome-utils/ui/gnc-main-window-ui.xml
===================================================================
--- gnucash/trunk/src/gnome-utils/ui/gnc-main-window-ui.xml	2010-11-15 19:37:24 UTC (rev 19814)
+++ gnucash/trunk/src/gnome-utils/ui/gnc-main-window-ui.xml	2010-11-15 22:53:18 UTC (rev 19815)
@@ -1,16 +1,12 @@
 <ui>
   <menubar>
     <menu name="File" action="FileAction">
-      <menu name="FileNewMenu" action="FileNewMenuAction">
-        <placeholder name="FileNewTopPlaceholder"/>
-        <placeholder name="FileNewMiddlePlaceholder"/>
-        <placeholder name="FileNewBottomPlaceholder"/>
-      </menu>
-      <menu name="FileOpenMenu" action="FileOpenMenuAction">
-        <placeholder name="FileOpenTopPlaceholder"/>
-        <placeholder name="FileOpenMiddlePlaceholder"/>
-        <placeholder name="FileOpenBottomPlaceholder"/>
-      </menu>
+      <placeholder name="FileNewTopPlaceholder"/>
+      <placeholder name="FileNewMiddlePlaceholder"/>
+      <placeholder name="FileNewBottomPlaceholder"/>
+      <placeholder name="FileOpenTopPlaceholder"/>
+      <placeholder name="FileOpenMiddlePlaceholder"/>
+      <placeholder name="FileOpenBottomPlaceholder"/>
       <menu name="FileImport" action="FileImportAction">
         <placeholder name="FileImportPlaceholder"/>
       </menu>