r22945 - gnucash/trunk/src/gnome - Register rewrite Update, change the default for the new register and rename old one.
Geert Janssens
gjanssens at code.gnucash.org
Sat May 4 03:49:12 EDT 2013
Author: gjanssens
Date: 2013-05-04 03:49:09 -0400 (Sat, 04 May 2013)
New Revision: 22945
Trac: http://svn.gnucash.org/trac/changeset/22945
Modified:
gnucash/trunk/src/gnome/gnc-plugin-page-account-tree.c
gnucash/trunk/src/gnome/gnc-plugin-register.c
gnucash/trunk/src/gnome/gnc-plugin-register2.c
gnucash/trunk/src/gnome/ui/gnc-plugin-page-account-tree2-ui.xml
Log:
Register rewrite Update, change the default for the new register and rename old one.
This update changes the default for double click on the accounts page to open with the new register layout. Also the menu options have been renamed / re-arranged to reflect this. Have also done the same on the general ledger options.
Author: Robert Fewell
Modified: gnucash/trunk/src/gnome/gnc-plugin-page-account-tree.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-plugin-page-account-tree.c 2013-05-03 12:04:03 UTC (rev 22944)
+++ gnucash/trunk/src/gnome/gnc-plugin-page-account-tree.c 2013-05-04 07:49:09 UTC (rev 22945)
@@ -80,9 +80,6 @@
#define DELETE_DIALOG_SA_TRANS_MAS "sa_trans_mas"
#define DELETE_DIALOG_OK_BUTTON "deletebutton"
-/* This define will enable the New Register menu option, comment out to hide it */
-#define REG2ENABLE "yes"
-
enum
{
ACCOUNT_SELECTED,
@@ -174,25 +171,23 @@
G_CALLBACK (gnc_plugin_page_account_tree_cmd_file_new_hierarchy)
},
{
- "FileOpenAccountAction", GNC_STOCK_OPEN_ACCOUNT, N_("Open _Account"), NULL,
+ "FileOpenAccount2Action", GNC_STOCK_OPEN_ACCOUNT, N_("Open _Account"), NULL,
N_("Open the selected account"),
- G_CALLBACK (gnc_plugin_page_account_tree_cmd_open_account)
+ G_CALLBACK (gnc_plugin_page_account_tree_cmd_open2_account)
},
-#ifdef REG2ENABLE
{
- "FileOpenAccount2Action", GNC_STOCK_OPEN_ACCOUNT, N_("Open New Register2 _Account"), NULL,
- N_("Open the New Register2 selected account"),
- G_CALLBACK (gnc_plugin_page_account_tree_cmd_open2_account)
+ "FileOpenAccountAction", GNC_STOCK_OPEN_ACCOUNT, N_("Open _Old Style Register Account"), NULL,
+ N_("Open the old style register selected account"),
+ G_CALLBACK (gnc_plugin_page_account_tree_cmd_open_account)
},
{
- "FileOpenSubaccounts2Action", GNC_STOCK_OPEN_ACCOUNT, N_("Open New Register2 _SubAccount"), NULL,
- N_("Open the New Register2 selected subaccounts"),
+ "FileOpenSubaccounts2Action", GNC_STOCK_OPEN_ACCOUNT, N_("Open _SubAccounts"), NULL,
+ N_("Open the selected account and all its subaccounts"),
G_CALLBACK (gnc_plugin_page_account_tree_cmd_open2_subaccounts)
},
-#endif
{
- "FileOpenSubaccountsAction", GNC_STOCK_OPEN_ACCOUNT, N_("Open _Subaccounts"), NULL,
- N_("Open the selected account and all its subaccounts"),
+ "FileOpenSubaccountsAction", GNC_STOCK_OPEN_ACCOUNT, N_("Open Old St_yle Subaccounts"), NULL,
+ N_("Open the old style register selected account and all its subaccounts"),
G_CALLBACK (gnc_plugin_page_account_tree_cmd_open_subaccounts)
},
@@ -282,9 +277,7 @@
static const gchar *actions_requiring_account_always[] =
{
"FileOpenAccountAction",
-#ifdef REG2ENABLE
"FileOpenAccount2Action",
-#endif
"FileOpenSubaccountsAction",
"ActionsLotsAction",
NULL
@@ -311,11 +304,9 @@
/** Short labels for use on the toolbar buttons. */
static action_toolbar_labels toolbar_labels[] =
{
- { "FileOpenAccountAction", N_("Open") },
-#ifdef REG2ENABLE
+ { "FileOpenAccountAction", N_("Open") },
{ "FileOpenAccount2Action", N_("Open2") },
-#endif
- { "EditEditAccountAction", N_("Edit") },
+ { "EditEditAccountAction", N_("Edit") },
{ "FileNewAccountAction", N_("New") },
{ "EditDeleteAccountAction", N_("Delete") },
{ NULL, NULL },
@@ -409,11 +400,7 @@
g_object_set(G_OBJECT(plugin_page),
"page-name", _("Accounts"),
"page-uri", "default:",
-#ifdef REG2ENABLE
"ui-description", "gnc-plugin-page-account-tree2-ui.xml",
-#else
- "ui-description", "gnc-plugin-page-account-tree-ui.xml",
-#endif
NULL);
g_signal_connect (G_OBJECT (plugin_page), "selected",
G_CALLBACK (gnc_plugin_page_account_tree_selected), plugin_page);
@@ -804,8 +791,6 @@
gnc_main_window_open_page (GNC_MAIN_WINDOW(window), new_page);
}
-
-#ifdef REG2ENABLE
/*################## Added for Reg2 #################*/
/* New Register Common */
static void
@@ -824,7 +809,6 @@
gnc_main_window_open_page (GNC_MAIN_WINDOW(window), new_page);
}
/*################## Added for Reg2 #################*/
-#endif
static void
gnc_plugin_page_account_tree_double_click_cb (GtkTreeView *treeview,
@@ -854,7 +838,7 @@
{
/* It's an account without any children, so open its register */
Account *account = gnc_tree_view_account_get_account_from_path (GNC_TREE_VIEW_ACCOUNT(treeview), path);
- gppat_open_account_common (page, account, FALSE);
+ gppat_open2_account_common (page, account, FALSE);
}
}
}
@@ -945,7 +929,6 @@
}
-#ifdef REG2ENABLE
/*################## Added for Reg2 #################*/
/* Register Firing - Single Account to start with */
static void
@@ -970,7 +953,6 @@
gppat_open2_account_common (page, account, TRUE);
}
/*################## Added for Reg2 #################*/
-#endif
static void
Modified: gnucash/trunk/src/gnome/gnc-plugin-register.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-plugin-register.c 2013-05-03 12:04:03 UTC (rev 22944)
+++ gnucash/trunk/src/gnome/gnc-plugin-register.c 2013-05-04 07:49:09 UTC (rev 22945)
@@ -47,8 +47,8 @@
static GtkActionEntry gnc_plugin_actions [] =
{
{
- "ToolsGeneralLedgerAction", NULL, N_("_General Ledger"), NULL,
- N_("Open a general ledger window"),
+ "ToolsGeneralLedgerAction", NULL, N_("Old St_yle General Ledger"), NULL,
+ N_("Open an old style general ledger window"),
G_CALLBACK (gnc_plugin_register_cmd_general_ledger)
},
};
Modified: gnucash/trunk/src/gnome/gnc-plugin-register2.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-plugin-register2.c 2013-05-03 12:04:03 UTC (rev 22944)
+++ gnucash/trunk/src/gnome/gnc-plugin-register2.c 2013-05-04 07:49:09 UTC (rev 22945)
@@ -32,10 +32,6 @@
#include "gnc-plugin-register2.h"
#include "gnc-plugin-page-register2.h"
-/* This define will enable the New Register menu option, comment out to hide it */
-#define REG2ENABLE "yes"
-
-
static void gnc_plugin_register2_class_init (GncPluginRegister2Class *klass);
static void gnc_plugin_register2_init (GncPluginRegister2 *plugin);
static void gnc_plugin_register2_finalize (GObject *object);
@@ -49,13 +45,11 @@
static GtkActionEntry gnc_plugin_actions [] =
{
-#ifdef REG2ENABLE
{
- "ToolsGeneralLedger2Action", NULL, N_("_General Ledger2"), NULL,
- N_("Open a general ledger2 window"),
+ "ToolsGeneralLedger2Action", NULL, N_("_General Ledger"), NULL,
+ N_("Open a general ledger window"),
G_CALLBACK (gnc_plugin_register2_cmd_general_ledger)
},
-#endif
};
static guint gnc_plugin_n_actions = G_N_ELEMENTS (gnc_plugin_actions);
@@ -159,13 +153,11 @@
/* plugin info */
plugin_class->plugin_name = GNC_PLUGIN_REGISTER2_NAME;
-#ifdef REG2ENABLE
/* widget addition/removal */
plugin_class->actions_name = PLUGIN_ACTIONS_NAME;
plugin_class->actions = gnc_plugin_actions;
plugin_class->n_actions = gnc_plugin_n_actions;
plugin_class->ui_filename = PLUGIN_UI_FILENAME;
-#endif
plugin_class->gconf_section = GCONF_REGISTER2_SECTION;
plugin_class->gconf_notifications = gnc_plugin_register2_gconf_changed;
Modified: gnucash/trunk/src/gnome/ui/gnc-plugin-page-account-tree2-ui.xml
===================================================================
--- gnucash/trunk/src/gnome/ui/gnc-plugin-page-account-tree2-ui.xml 2013-05-03 12:04:03 UTC (rev 22944)
+++ gnucash/trunk/src/gnome/ui/gnc-plugin-page-account-tree2-ui.xml 2013-05-04 07:49:09 UTC (rev 22945)
@@ -6,10 +6,10 @@
<menuitem name="EditDeleteAccount" action="EditDeleteAccountAction"/>
<menuitem name="EditRenumberSubaccounts" action="EditRenumberSubaccountsAction"/>
<separator name="EditSep2"/>
+ <menuitem name="FileOpenAccount2" action="FileOpenAccount2Action"/>
<menuitem name="FileOpenAccount" action="FileOpenAccountAction"/>
- <menuitem name="FileOpenAccount2" action="FileOpenAccount2Action"/>
+ <menuitem name="FileOpenSubaccounts2" action="FileOpenSubaccounts2Action"/>
<menuitem name="FileOpenSubaccounts" action="FileOpenSubaccountsAction"/>
- <menuitem name="FileOpenSubaccounts2" action="FileOpenSubaccounts2Action"/>
</placeholder>
</menu>
<menu name="Actions" action="ActionsAction">
@@ -35,10 +35,10 @@
<popup name="MainPopup" action="FakeToplevel">
<placeholder name="PopupPlaceholder2">
+ <menuitem name="AccountOpenAccount2" action="FileOpenAccount2Action"/>
<menuitem name="AccountOpenAccount" action="FileOpenAccountAction"/>
- <menuitem name="AccountOpenAccount2" action="FileOpenAccount2Action"/>
+ <menuitem name="AccountOpenSubaccounts2" action="FileOpenSubaccounts2Action"/>
<menuitem name="AccountOpenSubaccounts" action="FileOpenSubaccountsAction"/>
- <menuitem name="AccountOpenSubaccounts2" action="FileOpenSubaccounts2Action"/>
<menuitem name="AccountEditAccount" action="EditEditAccountAction"/>
<separator name="AccountSep1"/>
<menuitem name="AccountReconcile" action="ActionsReconcileAction"/>
More information about the gnucash-changes
mailing list