r19806 - gnucash/trunk/src - Bug #634357: Further menu ui cleanup: Reserve File New/Open menu only the file-related items anymore.

[Christian Stimming]

Author: cstim
Date: 2010-11-14 08:05:43 -0500 (Sun, 14 Nov 2010)
New Revision: 19806
Trac: http://svn.gnucash.org/trac/changeset/19806

Modified:
   gnucash/trunk/src/business/business-gnome/ui/gnc-plugin-page-invoice-ui.xml
   gnucash/trunk/src/gnome/ui/gnc-plugin-page-account-tree-ui.xml
   gnucash/trunk/src/gnome/ui/gnc-plugin-page-budget-ui.xml
Log:
Bug #634357: Further menu ui cleanup: Reserve File New/Open menu only the file-related items anymore.

The menu items under "File" should relate only to the file (database),
not to anything within a file. The open/new for all other things (budget,
invoice, account) have been moved somewhere else.

Modified: gnucash/trunk/src/business/business-gnome/ui/gnc-plugin-page-invoice-ui.xml
===================================================================
--- gnucash/trunk/src/business/business-gnome/ui/gnc-plugin-page-invoice-ui.xml	2010-11-13 21:32:18 UTC (rev 19805)
+++ gnucash/trunk/src/business/business-gnome/ui/gnc-plugin-page-invoice-ui.xml	2010-11-14 13:05:43 UTC (rev 19806)
@@ -1,14 +1,5 @@
 <ui>
   <menubar>
-    <menu name="File" action="FileAction">
-      <menu name="FileNewMenu" action="FileNewMenuAction">
-        <placeholder name="FileNewTopPlaceholder">
-          <menuitem name="FileNewInvoice"         action="FileNewInvoiceAction"/>
-          <menuitem name="FileNewAccount"         action="FileNewAccountAction"/>
-        </placeholder>
-      </menu>
-    </menu>
-
     <menu name="Edit" action="EditAction">
       <placeholder name="EditSelectedPlaceholder">
         <menuitem name="EditEditInvoice"        action="EditEditInvoiceAction"/>

Modified: gnucash/trunk/src/gnome/ui/gnc-plugin-page-account-tree-ui.xml
===================================================================
--- gnucash/trunk/src/gnome/ui/gnc-plugin-page-account-tree-ui.xml	2010-11-13 21:32:18 UTC (rev 19805)
+++ gnucash/trunk/src/gnome/ui/gnc-plugin-page-account-tree-ui.xml	2010-11-14 13:05:43 UTC (rev 19806)
@@ -1,35 +1,27 @@
 <ui>
   <menubar>
-    <menu name="File" action="FileAction">
-      <menu name="FileNewMenu" action="FileNewMenuAction">
-        <placeholder name="FileNewBottonPlaceholder">
-          <menuitem name="FileNewAccount" action="FileNewAccountAction"/>
-          <menuitem name="FileAddAccountHierarchyDruid" action="FileAddAccountHierarchyDruidAction"/>
-        </placeholder>
-      </menu>
-      <menu name="FileOpenMenu" action="FileOpenMenuAction">
-        <placeholder name="FileOpenBottomPlaceholder">
-          <menuitem name="FileOpenAccount" action="FileOpenAccountAction"/>
-          <menuitem name="FileOpenSubaccounts" action="FileOpenSubaccountsAction"/>
-        </placeholder>
-      </menu>
-    </menu>
     <menu name="Edit" action="EditAction">
       <placeholder name="EditSelectedPlaceholder">
         <menuitem name="EditEditAccount" action="EditEditAccountAction"/>
 	<menuitem name="EditDeleteAccount" action="EditDeleteAccountAction"/>
 	<menuitem name="EditRenumberSubaccounts" action="EditRenumberSubaccountsAction"/>
+        <separator name="EditSep2"/>
+        <menuitem name="FileOpenAccount" action="FileOpenAccountAction"/>
+        <menuitem name="FileOpenSubaccounts" action="FileOpenSubaccountsAction"/>
       </placeholder>
     </menu>
     <menu name="Actions" action="ActionsAction">
       <placeholder name="ActionsPlaceholder">
-        <separator name="ActionsSep1"/>
+	<separator name="ActionsSep1"/>
+        <menuitem name="FileNewAccount" action="FileNewAccountAction"/>
+        <menuitem name="FileAddAccountHierarchyDruid" action="FileAddAccountHierarchyDruidAction"/>
+        <separator name="ActionsSep2"/>
 	<menuitem name="ActionsTransfer" action="ActionsTransferAction"/>
 	<menuitem name="ActionsReconcile" action="ActionsReconcileAction"/>
 	<menuitem name="ActionsAutoClear" action="ActionsAutoClearAction"/>
 	<menuitem name="ActionsStockSplit" action="ActionsStockSplitAction"/>
 	<menuitem name="ActionLots" action="ActionsLotsAction"/>
-	<separator name="ActionsSep2"/>
+	<separator name="ActionsSep3"/>
 	<menu name="ScrubMenu" action="ScrubMenuAction">
 	  <menuitem name="Scrub" action="ScrubAction"/>
 	  <menuitem name="ScrubSub" action="ScrubSubAction"/>

Modified: gnucash/trunk/src/gnome/ui/gnc-plugin-page-budget-ui.xml
===================================================================
--- gnucash/trunk/src/gnome/ui/gnc-plugin-page-budget-ui.xml	2010-11-13 21:32:18 UTC (rev 19805)
+++ gnucash/trunk/src/gnome/ui/gnc-plugin-page-budget-ui.xml	2010-11-14 13:05:43 UTC (rev 19806)
@@ -1,13 +1,5 @@
 <ui>
   <menubar>
-    <menu name="File" action="FileAction">
-      <menu name="FileOpenMenu" action="FileOpenMenuAction">
-        <placeholder name="FileOpenBottomPlaceholder">
-          <menuitem name="FileOpenAccount" action="OpenAccountAction"/>
-          <menuitem name="FileOpenSubaccounts" action="OpenSubaccountsAction"/>
-        </placeholder>
-      </menu>
-    </menu>
     <menu name="Edit" action="EditAction">
       <placeholder name="EditSelectedPlaceholder">
         <menuitem name="Estimate" action="EstimateBudgetAction"/>