r22326 - gnucash/trunk/src/gnome - Follow up on bug #563565

[Geert Janssens]

Author: gjanssens
Date: 2012-08-16 14:13:26 -0400 (Thu, 16 Aug 2012)
New Revision: 22326
Trac: http://svn.gnucash.org/trac/changeset/22326

Modified:
   gnucash/trunk/src/gnome/ui/gnc-reconcile-window-ui.xml
   gnucash/trunk/src/gnome/window-reconcile.c
Log:
Follow up on bug #563565

Keep only one button in reconcile to create a new transaction. This
button will automatically create a transaction that balances the
currently ongoing reconciliation. The new button has been removed as it
is just as easy to simply enter a transaction in the still open
register.

Modified: gnucash/trunk/src/gnome/ui/gnc-reconcile-window-ui.xml
===================================================================
--- gnucash/trunk/src/gnome/ui/gnc-reconcile-window-ui.xml	2012-08-16 16:21:08 UTC (rev 22325)
+++ gnucash/trunk/src/gnome/ui/gnc-reconcile-window-ui.xml	2012-08-16 18:13:26 UTC (rev 22326)
@@ -18,8 +18,7 @@
     </menu>
 
     <menu name="Transaction" action="TransactionMenuAction">
-      <menuitem name="TransNew"     action="TransNewAction"/>
-      <menuitem name="TransBalance" action="TransBalanceAction"/>
+      <menuitem name="TransNew"     action="TransBalanceAction"/>
       <menuitem name="TransEdit"    action="TransEditAction"/>
       <menuitem name="TransRec"     action="TransRecAction"/>
       <menuitem name="TransUnRec"   action="TransUnRecAction"/>
@@ -32,7 +31,7 @@
   </menubar>
 
   <popup name="MainPopup" action="FakeToplevel">
-    <menuitem name="TransNew"    action="TransNewAction"/>
+    <menuitem name="TransNew"    action="TransBalanceAction"/>
     <menuitem name="TransEdit"   action="TransEditAction"/>
     <menuitem name="TransRec"    action="TransRecAction"/>
     <menuitem name="TransUnRec"  action="TransUnRecAction"/>
@@ -40,8 +39,7 @@
   </popup>
 
   <toolbar name="DefaultToolbar">
-    <toolitem name="TransNew"      action="TransNewAction"/>
-    <toolitem name="TransBalance"  action="TransBalanceAction"/>
+    <toolitem name="TransNew"      action="TransBalanceAction"/>
     <toolitem name="TransEdit"     action="TransEditAction"/>
     <toolitem name="TransRec"      action="TransRecAction"/>
     <toolitem name="TransUnRec"    action="TransUnRecAction"/>

Modified: gnucash/trunk/src/gnome/window-reconcile.c
===================================================================
--- gnucash/trunk/src/gnome/window-reconcile.c	2012-08-16 16:21:08 UTC (rev 22325)
+++ gnucash/trunk/src/gnome/window-reconcile.c	2012-08-16 18:13:26 UTC (rev 22326)
@@ -1196,19 +1196,6 @@
 
 
 static void
-gnc_ui_reconcile_window_new_cb(GtkButton *button, gpointer data)
-{
-    RecnWindow *recnData = data;
-    GNCSplitReg *gsr;
-
-    gsr = gnc_reconcile_window_open_register(recnData);
-    if (gsr == NULL)
-        return;
-    gnc_split_reg_jump_to_blank( gsr );
-}
-
-
-static void
 gnc_ui_reconcile_window_balance_cb(GtkButton *button, gpointer data)
 {
     RecnWindow *recnData = data;
@@ -2266,12 +2253,7 @@
     /* Transaction menu */
 
     {
-        "TransNewAction", GTK_STOCK_NEW, N_("_New"),  "<control>n",
-        N_("Add a new transaction to the account"),
-        G_CALLBACK(gnc_ui_reconcile_window_new_cb)
-    },
-    {
-        "TransBalanceAction", GTK_STOCK_EXECUTE, N_("_Balance"), "<control>b",
+        "TransBalanceAction", GTK_STOCK_NEW, N_("_Balance"), "<control>b",
         N_("Add a new balancing entry to the account"),
         G_CALLBACK(gnc_ui_reconcile_window_balance_cb)
     },