r22301 - gnucash/trunk/src - Register2: small improvements
Geert Janssens
gjanssens at code.gnucash.org
Fri Aug 10 12:06:22 EDT 2012
Author: gjanssens
Date: 2012-08-10 12:06:21 -0400 (Fri, 10 Aug 2012)
New Revision: 22301
Trac: http://svn.gnucash.org/trac/changeset/22301
Added:
gnucash/trunk/src/gnome/ui/gnc-plugin-page-account-tree2-ui.xml
Modified:
gnucash/trunk/src/gnome-utils/gnc-tree-model-split-reg.c
gnucash/trunk/src/gnome-utils/gnc-tree-view-split-reg.c
gnucash/trunk/src/gnome/gnc-plugin-page-account-tree.c
gnucash/trunk/src/gnome/ui/Makefile.am
gnucash/trunk/src/gnome/ui/gnc-plugin-page-account-tree-ui.xml
Log:
Register2: small improvements
- Fix make check warnings reported by Frank H. Ellenberger
- Wrap code in ifdef's so it can easily be disabled.
Patch by Robert Fewell
Modified: gnucash/trunk/src/gnome/gnc-plugin-page-account-tree.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-plugin-page-account-tree.c 2012-08-10 05:31:30 UTC (rev 22300)
+++ gnucash/trunk/src/gnome/gnc-plugin-page-account-tree.c 2012-08-10 16:06:21 UTC (rev 22301)
@@ -80,6 +80,9 @@
#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,11 +177,13 @@
N_("Open the selected account"),
G_CALLBACK (gnc_plugin_page_account_tree_cmd_open_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)
},
+#endif
{
"FileOpenSubaccountsAction", GNC_STOCK_OPEN_ACCOUNT, N_("Open _Subaccounts"), NULL,
N_("Open the selected account and all its subaccounts"),
@@ -271,7 +276,9 @@
static const gchar *actions_requiring_account_always[] =
{
"FileOpenAccountAction",
+#ifdef REG2ENABLE
"FileOpenAccount2Action",
+#endif
"FileOpenSubaccountsAction",
"ActionsLotsAction",
NULL
@@ -299,7 +306,9 @@
static action_toolbar_labels toolbar_labels[] =
{
{ "FileOpenAccountAction", N_("Open") },
+#ifdef REG2ENABLE
{ "FileOpenAccount2Action", N_("Open2") },
+#endif
{ "EditEditAccountAction", N_("Edit") },
{ "FileNewAccountAction", N_("New") },
{ "EditDeleteAccountAction", N_("Delete") },
@@ -394,7 +403,11 @@
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);
@@ -785,6 +798,8 @@
gnc_main_window_open_page (GNC_MAIN_WINDOW(window), new_page);
}
+
+#ifdef REG2ENABLE
/*#####################################################################*/
/* New Register Common */
static void
@@ -805,6 +820,7 @@
gnc_main_window_open_page (GNC_MAIN_WINDOW(window), new_page);
}
/*######################################################################*/
+#endif
static void
gnc_plugin_page_account_tree_double_click_cb (GtkTreeView *treeview,
@@ -913,6 +929,8 @@
gppat_open_account_common (page, account, FALSE);
}
+
+#ifdef REG2ENABLE
/*#####################################################################*/
/* Register Firing - Single Account to start with */
static void
@@ -926,6 +944,7 @@
gppat_open2_account_common (page, account, FALSE);
}
/*#####################################################################*/
+#endif
static void
gnc_plugin_page_account_tree_cmd_open_subaccounts (GtkAction *action,
Modified: gnucash/trunk/src/gnome/ui/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome/ui/Makefile.am 2012-08-10 05:31:30 UTC (rev 22300)
+++ gnucash/trunk/src/gnome/ui/Makefile.am 2012-08-10 16:06:21 UTC (rev 22301)
@@ -5,6 +5,7 @@
gnc-plugin-account-tree-ui.xml \
gnc-plugin-basic-commands-ui.xml \
gnc-plugin-page-account-tree-ui.xml \
+ gnc-plugin-page-account-tree2-ui.xml \
gnc-plugin-file-history-ui.xml \
gnc-plugin-register-ui.xml \
gnc-plugin-register2-ui.xml \
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 2012-08-10 05:31:30 UTC (rev 22300)
+++ gnucash/trunk/src/gnome/ui/gnc-plugin-page-account-tree-ui.xml 2012-08-10 16:06:21 UTC (rev 22301)
@@ -7,7 +7,6 @@
<menuitem name="EditRenumberSubaccounts" action="EditRenumberSubaccountsAction"/>
<separator name="EditSep2"/>
<menuitem name="FileOpenAccount" action="FileOpenAccountAction"/>
- <menuitem name="FileOpenAccount2" action="FileOpenAccount2Action"/>
<menuitem name="FileOpenSubaccounts" action="FileOpenSubaccountsAction"/>
</placeholder>
</menu>
@@ -35,7 +34,6 @@
<popup name="MainPopup" action="FakeToplevel">
<placeholder name="PopupPlaceholder2">
<menuitem name="AccountOpenAccount" action="FileOpenAccountAction"/>
- <menuitem name="AccountOpenAccount2" action="FileOpenAccount2Action"/>
<menuitem name="AccountOpenSubaccounts" action="FileOpenSubaccountsAction"/>
<menuitem name="AccountEditAccount" action="EditEditAccountAction"/>
<separator name="AccountSep1"/>
@@ -62,7 +60,6 @@
<placeholder name="DefaultToolbarPlaceholder">
<separator name="ToolbarSep2"/>
<toolitem name="ToolbarOpenAccount" action="FileOpenAccountAction"/>
- <toolitem name="ToolbarOpenAccount2" action="FileOpenAccount2Action"/>
<toolitem name="ToolbarEditAccount" action="EditEditAccountAction"/>
<separator name="ToolbarSep3"/>
<toolitem name="ToolbarNewAccount" action="FileNewAccountAction"/>
Copied: gnucash/trunk/src/gnome/ui/gnc-plugin-page-account-tree2-ui.xml (from rev 22298, gnucash/trunk/src/gnome/ui/gnc-plugin-page-account-tree-ui.xml)
===================================================================
--- gnucash/trunk/src/gnome/ui/gnc-plugin-page-account-tree2-ui.xml (rev 0)
+++ gnucash/trunk/src/gnome/ui/gnc-plugin-page-account-tree2-ui.xml 2012-08-10 16:06:21 UTC (rev 22301)
@@ -0,0 +1,72 @@
+<ui>
+ <menubar>
+ <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="FileOpenAccount2" action="FileOpenAccount2Action"/>
+ <menuitem name="FileOpenSubaccounts" action="FileOpenSubaccountsAction"/>
+ </placeholder>
+ </menu>
+ <menu name="Actions" action="ActionsAction">
+ <placeholder name="ActionsPlaceholder">
+ <separator name="ActionsSep1"/>
+ <menuitem name="FileNewAccount" action="FileNewAccountAction"/>
+ <menuitem name="FileAddAccountHierarchyAssistant" action="FileAddAccountHierarchyAssistantAction"/>
+ <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="ActionsSep3"/>
+ <menu name="ScrubMenu" action="ScrubMenuAction">
+ <menuitem name="Scrub" action="ScrubAction"/>
+ <menuitem name="ScrubSub" action="ScrubSubAction"/>
+ <menuitem name="ScrubAll" action="ScrubAllAction"/>
+ </menu>
+ </placeholder>
+ </menu>
+ </menubar>
+
+ <popup name="MainPopup" action="FakeToplevel">
+ <placeholder name="PopupPlaceholder2">
+ <menuitem name="AccountOpenAccount" action="FileOpenAccountAction"/>
+ <menuitem name="AccountOpenAccount2" action="FileOpenAccount2Action"/>
+ <menuitem name="AccountOpenSubaccounts" action="FileOpenSubaccountsAction"/>
+ <menuitem name="AccountEditAccount" action="EditEditAccountAction"/>
+ <separator name="AccountSep1"/>
+ <menuitem name="AccountReconcile" action="ActionsReconcileAction"/>
+ <menuitem name="AccountAutoClear" action="ActionsAutoClearAction"/>
+ <menuitem name="AccountTransfer" action="ActionsTransferAction"/>
+ <menuitem name="AccountStockSplit" action="ActionsStockSplitAction"/>
+ <menuitem name="AccountLots" action="ActionsLotsAction"/>
+ <separator name="AccountSep2"/>
+ <menuitem name="AccountNewAccount" action="FileNewAccountAction"/>
+ <menuitem name="AccountDeleteAccount" action="EditDeleteAccountAction"/>
+ <separator name="AccountSep3"/>
+ </placeholder>
+ <placeholder name="PopupBottomPlaceholder">
+ <menu name="ScrubMenu" action="ScrubMenuAction">
+ <menuitem name="Scrub" action="ScrubAction"/>
+ <menuitem name="ScrubSub" action="ScrubSubAction"/>
+ <menuitem name="ScrubAll" action="ScrubAllAction"/>
+ </menu>
+ </placeholder>
+ </popup>
+
+ <toolbar name="DefaultToolbar">
+ <placeholder name="DefaultToolbarPlaceholder">
+ <separator name="ToolbarSep2"/>
+ <toolitem name="ToolbarOpenAccount" action="FileOpenAccountAction"/>
+ <toolitem name="ToolbarOpenAccount2" action="FileOpenAccount2Action"/>
+ <toolitem name="ToolbarEditAccount" action="EditEditAccountAction"/>
+ <separator name="ToolbarSep3"/>
+ <toolitem name="ToolbarNewAccount" action="FileNewAccountAction"/>
+ <toolitem name="ToolbarDeleteAccount" action="EditDeleteAccountAction"/>
+ </placeholder>
+ </toolbar>
+</ui>
Modified: gnucash/trunk/src/gnome-utils/gnc-tree-model-split-reg.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-tree-model-split-reg.c 2012-08-10 05:31:30 UTC (rev 22300)
+++ gnucash/trunk/src/gnome-utils/gnc-tree-model-split-reg.c 2012-08-10 16:06:21 UTC (rev 22301)
@@ -790,7 +790,7 @@
GncTreeModelSplitReg *model = GNC_TREE_MODEL_SPLIT_REG (tree_model);
Transaction *trans;
SplitList *slist;
- GList *tnode, *snode;
+ GList *tnode = NULL, *snode = NULL;
gint flags = TROW1;
g_return_val_if_fail (GNC_IS_TREE_MODEL_SPLIT_REG (model), FALSE);
@@ -853,7 +853,7 @@
FALSE is returned and iter is set to be invalid. parent will remain a valid
node after this function has been called. */
GncTreeModelSplitReg *model = GNC_TREE_MODEL_SPLIT_REG (tree_model);
- GList *tnode, *snode;
+ GList *tnode = NULL, *snode = NULL;
gint flags = TROW1;
Transaction *trans;
SplitList *slist;
Modified: gnucash/trunk/src/gnome-utils/gnc-tree-view-split-reg.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-tree-view-split-reg.c 2012-08-10 05:31:30 UTC (rev 22300)
+++ gnucash/trunk/src/gnome-utils/gnc-tree-view-split-reg.c 2012-08-10 16:06:21 UTC (rev 22301)
@@ -600,7 +600,7 @@
GtkTreePath *path;
ViewCol viewcol;
gboolean is_split, is_blank, is_trow1, is_trow2;
- gboolean editable, expanded;
+ gboolean editable = FALSE, expanded = FALSE;
gchar *cell_color;
gint depth, *indices;
More information about the gnucash-changes
mailing list