IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Follow up on bug #563565

Browse Source 
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.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22326 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Geert Janssens 2012-08-16 18:13:26 +00:00
parent 9cc04f1fdf
commit d14b02242c
2 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gnome/ui/gnc-reconcile-window-ui.xml
View File

@ -18,8 +18,7 @@
</menu> </menu>
<menu name="Transaction" action="TransactionMenuAction"> <menu name="Transaction" action="TransactionMenuAction">
<menuitem name="TransNew" action="TransNewAction"/> <menuitem name="TransNew" action="TransBalanceAction"/>
<menuitem name="TransBalance" action="TransBalanceAction"/>
<menuitem name="TransEdit" action="TransEditAction"/> <menuitem name="TransEdit" action="TransEditAction"/>
<menuitem name="TransRec" action="TransRecAction"/> <menuitem name="TransRec" action="TransRecAction"/>
<menuitem name="TransUnRec" action="TransUnRecAction"/> <menuitem name="TransUnRec" action="TransUnRecAction"/>
@ -32,7 +31,7 @@
</menubar> </menubar>
<popup name="MainPopup" action="FakeToplevel"> <popup name="MainPopup" action="FakeToplevel">
<menuitem name="TransNew" action="TransNewAction"/> <menuitem name="TransNew" action="TransBalanceAction"/>
<menuitem name="TransEdit" action="TransEditAction"/> <menuitem name="TransEdit" action="TransEditAction"/>
<menuitem name="TransRec" action="TransRecAction"/> <menuitem name="TransRec" action="TransRecAction"/>
<menuitem name="TransUnRec" action="TransUnRecAction"/> <menuitem name="TransUnRec" action="TransUnRecAction"/>
@ -40,8 +39,7 @@
</popup> </popup>
<toolbar name="DefaultToolbar"> <toolbar name="DefaultToolbar">
<toolitem name="TransNew" action="TransNewAction"/> <toolitem name="TransNew" action="TransBalanceAction"/>
<toolitem name="TransBalance" action="TransBalanceAction"/>
<toolitem name="TransEdit" action="TransEditAction"/> <toolitem name="TransEdit" action="TransEditAction"/>
<toolitem name="TransRec" action="TransRecAction"/> <toolitem name="TransRec" action="TransRecAction"/>
<toolitem name="TransUnRec" action="TransUnRecAction"/> <toolitem name="TransUnRec" action="TransUnRecAction"/>

20
src/gnome/window-reconcile.c
View File

@ -1195,19 +1195,6 @@ gnc_ui_reconcile_window_change_cb(GtkAction *action, gpointer data)
} }
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 static void
gnc_ui_reconcile_window_balance_cb(GtkButton *button, gpointer data) gnc_ui_reconcile_window_balance_cb(GtkButton *button, gpointer data)
{ {
@ -2266,12 +2253,7 @@ static GtkActionEntry recnWindow_actions [] =
/* Transaction menu */ /* Transaction menu */
{ {
"TransNewAction", GTK_STOCK_NEW, N_("_New"), "<control>n", "TransBalanceAction", GTK_STOCK_NEW, N_("_Balance"), "<control>b",
N_("Add a new transaction to the account"),
G_CALLBACK(gnc_ui_reconcile_window_new_cb)
},
{
"TransBalanceAction", GTK_STOCK_EXECUTE, N_("_Balance"), "<control>b",
N_("Add a new balancing entry to the account"), N_("Add a new balancing entry to the account"),
G_CALLBACK(gnc_ui_reconcile_window_balance_cb) G_CALLBACK(gnc_ui_reconcile_window_balance_cb)
}, },