[Gnucash-changes] Move a few commands around to try and better align with HIG 2.0.

[David Hampton]

Log Message:
-----------
Move a few commands around to try and better align with HIG 2.0.

Tags:
----
gnucash-gnome2-dev

Modified Files:
--------------
    gnucash/src/gnome:
        gnc-plugin-basic-commands.c
    gnucash/src/gnome/ui:
        gnc-plugin-basic-commands-ui.xml

Revision Data
-------------
Index: gnc-plugin-basic-commands.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/Attic/gnc-plugin-basic-commands.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -Lsrc/gnome/gnc-plugin-basic-commands.c -Lsrc/gnome/gnc-plugin-basic-commands.c -u -r1.1.2.3 -r1.1.2.4
--- src/gnome/gnc-plugin-basic-commands.c
+++ src/gnome/gnc-plugin-basic-commands.c
@@ -79,10 +79,10 @@
 
   /* File menu */
 
-  { "FileNewAction", GTK_STOCK_NEW, N_("_New File"), "<control>n",
+  { "FileNewAction", GTK_STOCK_NEW, N_("New _File"), NULL,
     N_("Create a new file"),
     G_CALLBACK (gnc_main_window_cmd_file_new) },
-  { "FileOpenAction", GTK_STOCK_OPEN, N_("_Open"), NULL,
+  { "FileOpenAction", GTK_STOCK_OPEN, N_("_Open..."), NULL,
     NULL,
     G_CALLBACK (gnc_main_window_cmd_file_open) },
   { "FileSaveAction", GTK_STOCK_SAVE, N_("_Save"), "<control>s",
@@ -106,6 +106,9 @@
 
   /* Edit menu */
 
+  { "EditFindTransactionsAction", GTK_STOCK_FIND, N_("_Find Transactions..."), "<control>f",
+    N_("Find transactions with a search"),
+    G_CALLBACK (gnc_main_window_cmd_tools_find_transactions) },
   { "EditTaxOptionsAction", NULL, N_("Ta_x Options"), NULL,
     N_("Setup tax information for all income and expense accounts"),
     G_CALLBACK (gnc_main_window_cmd_edit_tax_options) },
@@ -122,10 +125,10 @@
   { "ActionsMortgageLoanAction", NULL, N_("_Mortgage & Loan Repayment..."), NULL,
     N_("Setup scheduled transactions for repayment of a loan"),
     G_CALLBACK (gnc_main_window_cmd_actions_mortgage_loan) },
-  { "ActionsBudgetWorkbenchAction", NULL, N_("_Budget Workbench (Experimental)"), NULL, 
+  { "ActionsBudgetWorkbenchAction", NULL, N_("Budget _Workbench (Experimental)"), NULL, 
     N_("Create, Manage, and Monitor Budgets." ),
     G_CALLBACK(gnc_main_window_cmd_actions_budget_workbench) },
-  { "ActionsCloseBooksAction", NULL, N_("Close Books"), NULL,
+  { "ActionsCloseBooksAction", NULL, N_("Close _Books"), NULL,
     N_("Archive old data using accounting periods"),
     G_CALLBACK (gnc_main_window_cmd_actions_close_books) },
 
@@ -134,15 +137,12 @@
   { "ToolsPriceEditorAction", NULL, N_("_Price Editor"), NULL,
     N_("View and edit the prices for stocks and mutual funds"),
     G_CALLBACK (gnc_main_window_cmd_tools_price_editor) },
-  { "ToolsCommodityEditorAction", NULL, N_("Commodity _Editor"), NULL,
+  { "ToolsCommodityEditorAction", NULL, N_("_Commodity Editor"), NULL,
     N_("View and edit the commodities for stocks and mutual funds"),
     G_CALLBACK (gnc_main_window_cmd_tools_commodity_editor) },
-  { "ToolsFinancialCalculatorAction", NULL, N_("Financial _Calculator"), NULL,
+  { "ToolsFinancialCalculatorAction", NULL, N_("_Financial Calculator"), NULL,
     N_("Use the financial calculator"),
     G_CALLBACK (gnc_main_window_cmd_tools_financial_calculator) },
-  { "ToolsFindTransactionsAction", GTK_STOCK_FIND, N_("_Find Transactions"), "<control>f",
-    N_("Find transactions with a search"),
-    G_CALLBACK (gnc_main_window_cmd_tools_find_transactions) },
 
   /* Help menu */
 
@@ -257,8 +257,6 @@
   gnc_window_set_progressbar_window (GNC_WINDOW(data->window));
   gnc_file_open ();
   gnc_window_set_progressbar_window (NULL);
-  gnc_main_window_update_title (data->window);
-  /* FIXME GNOME 2 Port (update the title etc.) */
 }
 
 static void
Index: gnc-plugin-basic-commands-ui.xml
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/ui/Attic/gnc-plugin-basic-commands-ui.xml,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -Lsrc/gnome/ui/gnc-plugin-basic-commands-ui.xml -Lsrc/gnome/ui/gnc-plugin-basic-commands-ui.xml -u -r1.1.2.1 -r1.1.2.2
--- src/gnome/ui/gnc-plugin-basic-commands-ui.xml
+++ src/gnome/ui/gnc-plugin-basic-commands-ui.xml
@@ -1,21 +1,20 @@
 <ui>
   <menubar>
     <menu name="File" action="FileAction">
-      <placeholder name="FileNewPlaceholder">
-        <menuitem name="FileNew" action="FileNewAction"/>
-      </placeholder>
-      <separator name="FileSep1"/>
-      <placeholder name="FileOpenPlaceholder">
-        <menuitem name="FileOpen" action="FileOpenAction"/>
-      </placeholder>
-      <menuitem name="FileOpenNewWindow" action="FileOpenNewWindowAction"/>
-      <placeholder name="FileOpenRecentPlaceholder"/>
-      <separator name="FileSep2"/>
+      <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="FileSavePlaceholder">
         <menuitem name="FileSave" action="FileSaveAction"/>
         <menuitem name="FileSaveAs" action="FileSaveAsAction"/>
       </placeholder>
-      <separator name="FileSep3"/>
       <menu name="FileImport" action="FileImportAction">
         <menuitem name="FileImportQSF" action="FileImportQSFAction"/>
       </menu>
@@ -23,25 +22,12 @@
         <menuitem name="FileExportAccounts" action="FileExportAccountsAction"/>
         <menuitem name="FileExportChart" action="FileExportChartAction"/>
       </menu>
-      <separator name="FileSep4"/>
-      <menuitem name="FilePrint" action="FilePrintAction"/>
-      <placeholder name="FilePrintPlaceholder"/>
-      <separator name="FileSep5"/>
-      <menuitem name="FileProperties" action="FilePropertiesAction"/>
-      <separator name="FileSep6"/>
-      <menuitem name="FileClose" action="FileCloseAction"/>
-      <menuitem name="FileQuit" action="FileQuitAction"/>
     </menu>
   
     <menu name="Edit" action="EditAction">
-      <menuitem name="EditCut" action="EditCutAction"/>
-      <menuitem name="EditCopy" action="EditCopyAction"/>
-      <menuitem name="EditPaste" action="EditPasteAction"/>
-      <separator name="EditSep1"/>
-      <placeholder name="EditPlaceholder"/>
-      <menuitem name="EditPreferences" action="EditPreferencesAction"/>
-      <placeholder name="EditPreferencesPlaceholder"/>
-      <placeholder name="EditStyleSheetsPlaceholder"/>
+      <placeholder name="EditFindPlaceholder">
+        <menuitem name="EditFindTransactions" action="EditFindTransactionsAction"/>
+      </placeholder>
       <menuitem name="EditTaxOptions" action="EditTaxOptionsAction"/>
     </menu>
   
@@ -77,7 +63,6 @@
         <menuitem name="ToolsPriceEditor" action="ToolsPriceEditorAction"/>
         <menuitem name="ToolsCommodityEditor" action="ToolsCommodityEditorAction"/>
         <menuitem name="ToolsFinancialCalculator" action="ToolsFinancialCalculatorAction"/>
-        <menuitem name="ToolsFindTransactions" action="ToolsFindTransactionsAction"/>
       </placeholder>
     </menu>