r22447 - gnucash/trunk/src/gnome - Register rewrite: make separate menu item for general ledger based on

[Geert Janssens]

Author: gjanssens
Date: 2012-10-18 03:56:15 -0400 (Thu, 18 Oct 2012)
New Revision: 22447
Trac: http://svn.gnucash.org/trac/changeset/22447

Modified:
   gnucash/trunk/src/gnome/gnc-plugin-register2.c
   gnucash/trunk/src/gnome/ui/gnc-plugin-register2-ui.xml
Log:
Register rewrite: make separate menu item for general ledger based on
new register code.

This should restore the original general ledger which was replaced by
the new register rewrite code.

Author: Robert Fewell <14ubobit at gmail.com>

Modified: gnucash/trunk/src/gnome/gnc-plugin-register2.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-plugin-register2.c	2012-10-17 19:21:13 UTC (rev 22446)
+++ gnucash/trunk/src/gnome/gnc-plugin-register2.c	2012-10-18 07:56:15 UTC (rev 22447)
@@ -32,7 +32,10 @@
 #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);
@@ -46,11 +49,13 @@
 
 static GtkActionEntry gnc_plugin_actions [] =
 {
+#ifdef REG2ENABLE
     {
-        "ToolsGeneralLedgerAction", NULL, N_("_General Ledger"), NULL,
-        N_("Open a general ledger window"),
+        "ToolsGeneralLedger2Action", NULL, N_("_General Ledger2"), NULL,
+        N_("Open a general ledger2 window"),
         G_CALLBACK (gnc_plugin_register2_cmd_general_ledger)
     },
+#endif
 };
 static guint gnc_plugin_n_actions = G_N_ELEMENTS (gnc_plugin_actions);
 
@@ -154,12 +159,13 @@
     /* 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-register2-ui.xml
===================================================================
--- gnucash/trunk/src/gnome/ui/gnc-plugin-register2-ui.xml	2012-10-17 19:21:13 UTC (rev 22446)
+++ gnucash/trunk/src/gnome/ui/gnc-plugin-register2-ui.xml	2012-10-18 07:56:15 UTC (rev 22447)
@@ -2,7 +2,7 @@
   <menubar>
     <menu name="Tools" action="ToolsAction">
       <placeholder name="ToolsPlaceholder">
-        <menuitem name="ToolsGeneralLedger" action="ToolsGeneralLedgerAction"/>
+        <menuitem name="ToolsGeneralLedger2" action="ToolsGeneralLedger2Action"/>
       </placeholder>
     </menu>
   </menubar>