[Gnucash-changes] Add a "Transaction" top level menu that collects
all the menu items from
David Hampton
hampton at cvs.gnucash.org
Mon Jul 18 00:04:44 EDT 2005
Log Message:
-----------
Add a "Transaction" top level menu that collects all the menu items
from Edit and Actions that modify transactions. This menu parallels
the HIG definition of an "Edit" menu as much as possible.
Tags:
----
gnucash-gnome2-dev
Modified Files:
--------------
gnucash:
ChangeLog
gnucash/src/gnome:
gnc-plugin-page-register.c
gnucash/src/gnome/ui:
gnc-plugin-page-register-ui.xml
gnucash/src/gnome-utils:
gnc-main-window.c
gnucash/src/gnome-utils/ui:
gnc-main-window-ui.xml
Revision Data
-------------
Index: ChangeLog
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/ChangeLog,v
retrieving revision 1.1487.2.241
retrieving revision 1.1487.2.242
diff -LChangeLog -LChangeLog -u -r1.1487.2.241 -r1.1487.2.242
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,16 @@
2005-07-17 David Hampton <hampton at employees.org>
+ * src/gnome/gnc-plugin-page-register.c:
+ * src/gnome/ui/gnc-plugin-page-register-ui.xml:
+ * src/gnome-utils/gnc-main-window.c:
+ * src/gnome-utils/ui/gnc-main-window-ui.xml: Add a "Transaction"
+ top level menu that collects all the menu items from Edit and
+ Actions that modify transactions. This menu parallels the HIG
+ definition of an "Edit" menu as much as possible.
+
+ * src/gnome/ui/gnc-plugin-basic-commands-ui.xml: Move a couple
+ menu items within the Actions menu.
+
* src/gnome/schemas/apps_gnucash_dialog_common.schemas:
* src/gnome-utils/Makefile.am:
* src/gnome-utils/dialog-reset-warnings.[ch]:
Index: gnc-plugin-page-register-ui.xml
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/ui/Attic/gnc-plugin-page-register-ui.xml,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -Lsrc/gnome/ui/gnc-plugin-page-register-ui.xml -Lsrc/gnome/ui/gnc-plugin-page-register-ui.xml -u -r1.1.2.8 -r1.1.2.9
--- src/gnome/ui/gnc-plugin-page-register-ui.xml
+++ src/gnome/ui/gnc-plugin-page-register-ui.xml
@@ -1,18 +1,27 @@
<ui>
<menubar>
<menu name="Edit" action="EditAction">
- <placeholder name="EditSelectedPlaceholder">
+ <placeholder name="EditAllSelectedPlaceholder">
<menuitem name="EditEditAccount" action="EditEditAccountAction"/>
- <separator name="EditSep22"/>
- <menuitem name="EditCutTransaction" action="EditCutTransactionAction"/>
- <menuitem name="EditCopyTransaction" action="EditCopyTransactionAction"/>
- <menuitem name="EditPasteTransaction" action="EditPasteTransactionAction"/>
- <menuitem name="EditVoidTransaction" action="EditVoidTransactionAction"/>
- <menuitem name="EditUnvoidTransaction" action="EditUnvoidTransactionAction"/>
- <menuitem name="EditReverseTransaction" action="EditReverseTransactionAction"/>
</placeholder>
</menu>
+ <menu name="Transaction" action="TransactionAction">
+ <menuitem name="CutTransaction" action="CutTransactionAction"/>
+ <menuitem name="CopyTransaction" action="CopyTransactionAction"/>
+ <menuitem name="PasteTransaction" action="PasteTransactionAction"/>
+ <menuitem name="DuplicateTransaction" action="DuplicateTransactionAction"/>
+ <menuitem name="DeleteTransaction" action="DeleteTransactionAction"/>
+ <menuitem name="RemoveTransactionSplits" action="RemoveTransactionSplitsAction"/>
+ <separator name="TransactionSep1"/>
+ <menuitem name="RecordTransaction" action="RecordTransactionAction"/>
+ <menuitem name="CancelTransaction" action="CancelTransactionAction"/>
+ <separator name="TransactionSep2"/>
+ <menuitem name="VoidTransaction" action="VoidTransactionAction"/>
+ <menuitem name="UnvoidTransaction" action="UnvoidTransactionAction"/>
+ <menuitem name="ReverseTransaction" action="ReverseTransactionAction"/>
+ </menu>
+
<menu name="View" action="ViewAction">
<placeholder name="ViewContentPlaceholder">
<menuitem name="ViewStyleBasic" action="ViewStyleBasicAction"/>
@@ -35,13 +44,8 @@
<menuitem name="ActionsStockSplit" action="ActionsStockSplitAction"/>
<menuitem name="ActionLots" action="ActionsLotsAction"/>
<separator name="ActionsSep3"/>
- <menuitem name="RecordTransaction" action="RecordTransactionAction"/>
- <menuitem name="CancelTransaction" action="CancelTransactionAction"/>
- <menuitem name="DeleteTransaction" action="DeleteTransactionAction"/>
- <menuitem name="BlankTransaction" action="BlankTransactionAction"/>
<separator name="ActionsSep4"/>
- <menuitem name="DuplicateTransaction" action="DuplicateTransactionAction"/>
- <menuitem name="RemoveTransactionSplits" action="RemoveTransactionSplitsAction"/>
+ <menuitem name="BlankTransaction" action="BlankTransactionAction"/>
<menuitem name="SplitTransaction" action="SplitTransactionAction"/>
<menuitem name="EditExchangeRate" action="EditExchangeRateAction"/>
<menuitem name="ScheduleTransaction" action="ScheduleTransactionAction"/>
@@ -57,16 +61,16 @@
<toolbar name="DefaultToolbar">
<placeholder name="DefaultToolbarPlaceholder">
- <toolitem name="ToolbarRecordTransaction" action="RecordTransactionAction"/>
- <toolitem name="ToolbarCancelTransaction" action="CancelTransactionAction"/>
+ <toolitem name="ToolbarDuplicateTransaction" action="DuplicateTransactionAction"/>
<toolitem name="ToolbarDeleteTransaction" action="DeleteTransactionAction"/>
<separator name="ToolbarSep66"/>
- <toolitem name="ToolbarDuplicateTransaction" action="DuplicateTransactionAction"/>
- <toolitem name="ToolbarScheduleTransaction" action="ScheduleTransactionAction"/>
+ <toolitem name="ToolbarRecordTransaction" action="RecordTransactionAction"/>
+ <toolitem name="ToolbarCancelTransaction" action="CancelTransactionAction"/>
<separator name="ToolbarSep67"/>
- <toolitem name="ToolbarSplitTransaction" action="SplitTransactionAction"/>
<toolitem name="ToolbarBlankTransaction" action="BlankTransactionAction"/>
+ <toolitem name="ToolbarSplitTransaction" action="SplitTransactionAction"/>
<toolitem name="ToolbarJumpTransaction" action="JumpTransactionAction"/>
+ <toolitem name="ToolbarScheduleTransaction" action="ScheduleTransactionAction"/>
<separator name="ToolbarSep68"/>
<toolitem name="ToolbarTransfer" action="ActionsTransferAction"/>
</placeholder>
@@ -76,13 +80,14 @@
<menuitem name="ViewSortBy" action="ViewSortByAction"/>
<menuitem name="ViewFilterBy" action="ViewFilterByAction"/>
<separator name="PopupSep1"/>
+ <menuitem name="DuplicateTransaction" action="DuplicateTransactionAction"/>
+ <menuitem name="DeleteTransaction" action="DeleteTransactionAction"/>
+ <menuitem name="RemoveTransactionSplits" action="RemoveTransactionSplitsAction"/>
+ <separator name="PopupSep2"/>
<menuitem name="RecordTransaction" action="RecordTransactionAction"/>
<menuitem name="CancelTransaction" action="CancelTransactionAction"/>
- <menuitem name="DeleteTransaction" action="DeleteTransactionAction"/>
+ <separator name="PopupSep3"/>
<menuitem name="BlankTransaction" action="BlankTransactionAction"/>
- <separator name="PopupSep2"/>
- <menuitem name="DuplicateTransaction" action="DuplicateTransactionAction"/>
- <menuitem name="RemoveTransactionSplits" action="RemoveTransactionSplitsAction"/>
<menuitem name="SplitTransaction" action="SplitTransactionAction"/>
<menuitem name="EditExchangeRate" action="EditExchangeRateAction"/>
<menuitem name="ScheduleTransaction" action="ScheduleTransactionAction"/>
Index: gnc-main-window.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/Attic/gnc-main-window.c,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -Lsrc/gnome-utils/gnc-main-window.c -Lsrc/gnome-utils/gnc-main-window.c -u -r1.1.2.10 -r1.1.2.11
--- src/gnome-utils/gnc-main-window.c
+++ src/gnome-utils/gnc-main-window.c
@@ -135,6 +135,7 @@
{ "EditAction", NULL, N_("_Edit"), NULL, NULL, NULL },
{ "ViewAction", NULL, N_("_View"), NULL, NULL, NULL },
{ "ActionsAction", NULL, N_("_Actions"), NULL, NULL, NULL },
+ { "TransactionAction", NULL, N_("_Transaction"), NULL, NULL, NULL },
{ "ReportsAction", NULL, N_("_Reports"), NULL, NULL, NULL },
{ "ToolsAction", NULL, N_("_Tools"), NULL, NULL, NULL },
{ "ExtensionsAction", NULL, N_("E_xtensions"), NULL, NULL, NULL },
Index: gnc-plugin-page-register.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/Attic/gnc-plugin-page-register.c,v
retrieving revision 1.1.2.30
retrieving revision 1.1.2.31
diff -Lsrc/gnome/gnc-plugin-page-register.c -Lsrc/gnome/gnc-plugin-page-register.c -u -r1.1.2.30 -r1.1.2.31
--- src/gnome/gnc-plugin-page-register.c
+++ src/gnome/gnc-plugin-page-register.c
@@ -138,14 +138,13 @@
static GtkActionEntry gnc_plugin_page_register_actions [] =
{
- /* Toplevel */
- { "FakeToplevel", NULL, "", NULL, NULL, NULL },
-
/* File menu */
+
{ "FilePrintAction", GTK_STOCK_PRINT, N_("_Print Check..."), NULL, NULL,
G_CALLBACK (gnc_plugin_page_register_cmd_print_check) },
/* Edit menu */
+
{ "EditCutAction", GTK_STOCK_CUT, N_("Cu_t"), NULL,
NULL,
G_CALLBACK (gnc_plugin_page_register_cmd_cut) },
@@ -158,26 +157,46 @@
{ "EditEditAccountAction", GNC_STOCK_EDIT_ACCOUNT, N_("Edit Account"), "<control>e",
N_("Edit the selected account"),
G_CALLBACK (gnc_plugin_page_register_cmd_edit_account) },
- { "EditCutTransactionAction", NULL, N_("Cut Transaction"), NULL, NULL,
+
+ /* Transaction menu */
+
+ { "CutTransactionAction", GTK_STOCK_CUT, N_("Cu_t Transaction"), "", NULL,
G_CALLBACK (gnc_plugin_page_register_cmd_cut_transaction) },
- { "EditCopyTransactionAction", NULL, N_("Copy Transaction"), NULL, NULL,
+ { "CopyTransactionAction", GTK_STOCK_COPY, N_("_Copy Transaction"), "", NULL,
G_CALLBACK (gnc_plugin_page_register_cmd_copy_transaction) },
- { "EditPasteTransactionAction", NULL, N_("Paste Transaction"), NULL, NULL,
+ { "PasteTransactionAction", GTK_STOCK_PASTE, N_("_Paste Transaction"), "", NULL,
G_CALLBACK (gnc_plugin_page_register_cmd_paste_transaction) },
- { "EditVoidTransactionAction", NULL, N_("_Void Transaction"), NULL, NULL,
+ { "DuplicateTransactionAction", GTK_STOCK_COPY, N_("Du_plicate Transaction"), "",
+ N_("Make a copy of the current transaction"),
+ G_CALLBACK (gnc_plugin_page_register_cmd_duplicate_transaction) },
+ { "DeleteTransactionAction", GTK_STOCK_DELETE, N_("Delete Transaction"), NULL,
+ N_("Delete the current transaction"),
+ G_CALLBACK (gnc_plugin_page_register_cmd_delete_transaction) },
+ { "RemoveTransactionSplitsAction", GTK_STOCK_CLEAR, N_("Remo_ve Transaction Splits"), NULL,
+ N_("Remove all splits in the current transaction"),
+ G_CALLBACK (gnc_plugin_page_register_cmd_reinitialize_transaction) },
+ { "RecordTransactionAction", GTK_STOCK_ADD, N_("_Enter Transaction"), NULL,
+ N_("Record the current transaction"),
+ G_CALLBACK (gnc_plugin_page_register_cmd_enter_transaction) },
+ { "CancelTransactionAction", GTK_STOCK_CANCEL, N_("Ca_ncel Transaction"), NULL,
+ N_("_Cancel the current transaction"),
+ G_CALLBACK (gnc_plugin_page_register_cmd_cancel_transaction) },
+ { "VoidTransactionAction", NULL, N_("_Void Transaction"), NULL, NULL,
G_CALLBACK (gnc_plugin_page_register_cmd_void_transaction) },
- { "EditUnvoidTransactionAction", NULL, N_("_Unvoid Transaction"), NULL, NULL,
+ { "UnvoidTransactionAction", NULL, N_("_Unvoid Transaction"), NULL, NULL,
G_CALLBACK (gnc_plugin_page_register_cmd_unvoid_transaction) },
- { "EditReverseTransactionAction", NULL, N_("_Reverse Transaction"), NULL, NULL,
+ { "ReverseTransactionAction", NULL, N_("_Reverse Transaction"), NULL, NULL,
G_CALLBACK (gnc_plugin_page_register_cmd_reverse_transaction) },
/* View menu */
+
{ "ViewSortByAction", NULL, N_("_Sort By..."), NULL, NULL,
G_CALLBACK (gnc_plugin_page_register_cmd_view_sort_by) },
{ "ViewFilterByAction", NULL, N_("_Filter By..."), NULL, NULL,
G_CALLBACK (gnc_plugin_page_register_cmd_view_filter_by) },
/* Actions menu */
+
{ "ActionsTransferAction", GTK_STOCK_MISSING_IMAGE, N_("_Transfer..."), "<control>t",
N_("Transfer funds from one account to another"),
G_CALLBACK (gnc_plugin_page_register_cmd_transfer) },
@@ -190,25 +209,9 @@
{ "ActionsLotsAction", NULL, N_("_Lot Viewer..."), NULL,
N_("Bring up the lot viewer/editor window"),
G_CALLBACK (gnc_plugin_page_register_cmd_lots) },
- { "RecordTransactionAction", GTK_STOCK_ADD, N_("_Enter Transaction"), NULL,
- N_("Record the current transaction"),
- G_CALLBACK (gnc_plugin_page_register_cmd_enter_transaction) },
- { "CancelTransactionAction", GTK_STOCK_CANCEL, N_("_Cancel Transaction"), NULL,
- N_("_Cancel the current transaction"),
- G_CALLBACK (gnc_plugin_page_register_cmd_cancel_transaction) },
- { "DeleteTransactionAction", GTK_STOCK_DELETE, N_("_Delete Transaction"), NULL,
- N_("Delete the current transaction"),
- G_CALLBACK (gnc_plugin_page_register_cmd_delete_transaction) },
{ "BlankTransactionAction", GTK_STOCK_MISSING_IMAGE, N_("_Blank Transaction"), NULL,
N_("Move to the blank transaction at the bottom of the register"),
G_CALLBACK (gnc_plugin_page_register_cmd_blank_transaction) },
-
- { "DuplicateTransactionAction", GTK_STOCK_COPY, N_("D_uplicate Transaction"), NULL,
- N_("Make a copy of the current transaction"),
- G_CALLBACK (gnc_plugin_page_register_cmd_duplicate_transaction) },
- { "RemoveTransactionSplitsAction", GTK_STOCK_CLEAR, N_("Remo_ve Transaction Splits"), NULL,
- N_("Remove all splits in the current transaction"),
- G_CALLBACK (gnc_plugin_page_register_cmd_reinitialize_transaction) },
{ "EditExchangeRateAction", GTK_STOCK_MISSING_IMAGE, N_("Edit E_xchange Rate"), NULL,
N_("Exit the exchange rate for the current transaction"),
G_CALLBACK (gnc_plugin_page_register_cmd_exchange_rate) },
@@ -220,6 +223,7 @@
G_CALLBACK (gnc_plugin_page_register_cmd_schedule) },
/* Reports menu */
+
{ "ReportsAccountReportAction", NULL, N_("_Account Report"), NULL, NULL,
G_CALLBACK (gnc_plugin_page_register_cmd_account_report) },
{ "ReportsTransactionReportAction", NULL, N_("_Transaction Report"), NULL, NULL,
Index: gnc-main-window-ui.xml
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/ui/Attic/gnc-main-window-ui.xml,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -Lsrc/gnome-utils/ui/gnc-main-window-ui.xml -Lsrc/gnome-utils/ui/gnc-main-window-ui.xml -u -r1.1.2.4 -r1.1.2.5
--- src/gnome-utils/ui/gnc-main-window-ui.xml
+++ src/gnome-utils/ui/gnc-main-window-ui.xml
@@ -67,6 +67,9 @@
<menuitem name="ViewRefresh" action="ViewRefreshAction"/>
</menu>
+ <menu name="Transaction" action="TransactionAction">
+ </menu>
+
<menu name="Actions" action="ActionsAction">
<placeholder name="ActionsPlaceholder"/>
<separator name="ActionSep1"/>
More information about the gnucash-changes
mailing list