[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_9_2-17-g368ed8c
Pierre Biava
nobody at users.sourceforge.net
Fri Jun 17 20:04:59 CEST 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grisbi".
The branch, master has been updated
via 368ed8c8cd7be87b66499839c1b44345d9a1289b (commit)
from 64e6989fd15fd670c5c9b597cefb1f37e31b3dbb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 368ed8c8cd7be87b66499839c1b44345d9a1289b
Author: pbiava <pierre.biava at nerim.net>
Date: Fri Jun 17 20:02:47 2011 +0200
Remove the menu "Use selected transaction as a template"
-----------------------------------------------------------------------
Changes:
diff --git a/src/gsb_transactions_list.c b/src/gsb_transactions_list.c
index 1b29602..e9eb422 100644
--- a/src/gsb_transactions_list.c
+++ b/src/gsb_transactions_list.c
@@ -94,8 +94,9 @@ static gboolean gsb_transactions_list_change_sort_type ( GtkWidget *menu_item,
static gboolean gsb_transactions_list_check_mark ( gint transaction_number );
static gint gsb_transactions_list_choose_reconcile ( gint account_number,
gint transaction_number );
-static gboolean gsb_transactions_list_clone_template ( GtkWidget *menu_item,
- gpointer null );
+/* static gboolean gsb_transactions_list_clone_template ( GtkWidget *menu_item,
+ * gpointer null );
+ */
static gint gsb_transactions_list_clone_transaction ( gint transaction_number,
gint mother_transaction_number );
static GtkWidget *gsb_transactions_list_create_tree_view ( GtkTreeModel *model );
@@ -2513,15 +2514,16 @@ void popup_transaction_context_menu ( gboolean full, int x, int y )
gtk_menu_shell_append ( GTK_MENU_SHELL ( menu ), menu_item );
/* use transaction as template */
- menu_item = gtk_image_menu_item_new_with_label ( _("Use selected transaction as a template") );
- gtk_image_menu_item_set_image ( GTK_IMAGE_MENU_ITEM(menu_item),
- gtk_image_new_from_stock ( GTK_STOCK_COPY,
- GTK_ICON_SIZE_MENU ));
- g_signal_connect ( G_OBJECT(menu_item), "activate",
- G_CALLBACK (gsb_transactions_list_clone_template), NULL );
- gtk_widget_set_sensitive ( menu_item, full );
- gtk_menu_shell_append ( GTK_MENU_SHELL ( menu ), menu_item );
-
+/* menu_item = gtk_image_menu_item_new_with_label ( _("Use selected transaction as a template") );
+ * gtk_image_menu_item_set_image ( GTK_IMAGE_MENU_ITEM(menu_item),
+ * gtk_image_new_from_stock ( GTK_STOCK_COPY,
+ * GTK_ICON_SIZE_MENU ));
+ * g_signal_connect ( G_OBJECT(menu_item), "activate",
+ * G_CALLBACK (gsb_transactions_list_clone_template), NULL );
+ * gtk_widget_set_sensitive ( menu_item, full );
+ * gtk_menu_shell_append ( GTK_MENU_SHELL ( menu ), menu_item );
+ *
+ */
/* Clone transaction */
menu_item = gtk_image_menu_item_new_with_label ( _("Clone transaction") );
gtk_image_menu_item_set_image ( GTK_IMAGE_MENU_ITEM(menu_item),
@@ -2780,7 +2782,13 @@ gboolean clone_selected_transaction ( GtkWidget *menu_item,
update_transaction_in_trees (new_transaction_number);
- gtk_notebook_set_current_page ( GTK_NOTEBOOK ( gsb_gui_get_general_notebook ( ) ), 1 );
+/* gtk_notebook_set_current_page ( GTK_NOTEBOOK ( gsb_gui_get_general_notebook ( ) ), 1 ); */
+
+ transaction_list_select ( new_transaction_number );
+ gsb_transactions_list_edit_transaction ( new_transaction_number );
+ g_object_set_data ( G_OBJECT ( gsb_form_get_form_widget ( ) ),
+ "transaction_selected_in_form",
+ GINT_TO_POINTER ( -1 ) );
/* force the update module budget */
gsb_data_account_set_bet_maj ( gsb_gui_navigation_get_current_account ( ), BET_MAJ_ALL );
@@ -2798,33 +2806,34 @@ gboolean clone_selected_transaction ( GtkWidget *menu_item,
*
* \return FALSE
* */
-static gboolean gsb_transactions_list_clone_template ( GtkWidget *menu_item,
- gpointer null )
-{
- gint new_transaction_number;
-
- if ( !assert_selected_transaction ( ) )
- return FALSE;
-
- new_transaction_number = gsb_transactions_list_clone_transaction (
- gsb_data_account_get_current_transaction_number (
- gsb_gui_navigation_get_current_account ( ) ),
- 0 );
-
- update_transaction_in_trees ( new_transaction_number );
-
- transaction_list_select ( new_transaction_number );
- gsb_transactions_list_edit_transaction ( new_transaction_number );
- g_object_set_data ( G_OBJECT ( gsb_form_get_form_widget ( ) ),
- "transaction_selected_in_form",
- GINT_TO_POINTER ( -1 ) );
+/* static gboolean gsb_transactions_list_clone_template ( GtkWidget *menu_item,
+ * gpointer null )
+ * {
+ * gint new_transaction_number;
+ *
+ * if ( !assert_selected_transaction ( ) )
+ * return FALSE;
+ *
+ * new_transaction_number = gsb_transactions_list_clone_transaction (
+ * gsb_data_account_get_current_transaction_number (
+ * gsb_gui_navigation_get_current_account ( ) ),
+ * 0 );
+ *
+ * update_transaction_in_trees ( new_transaction_number );
+ *
+ * transaction_list_select ( new_transaction_number );
+ * gsb_transactions_list_edit_transaction ( new_transaction_number );
+ * g_object_set_data ( G_OBJECT ( gsb_form_get_form_widget ( ) ),
+ * "transaction_selected_in_form",
+ * GINT_TO_POINTER ( -1 ) );
+ */
/* force the update module budget */
- gsb_data_account_set_bet_maj ( gsb_gui_navigation_get_current_account ( ), BET_MAJ_ALL );
+/* gsb_data_account_set_bet_maj ( gsb_gui_navigation_get_current_account ( ), BET_MAJ_ALL );
gsb_file_set_modified ( TRUE );
return FALSE;
-}
+}*/
/**
diff --git a/src/menu.c b/src/menu.c
index 00ee72c..f1c306c 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -113,10 +113,11 @@ static const gchar *ui_manager_buffer =
" <menuitem name='Quit' action='QuitAction'/>"
" </menu>"
" <menu name='EditMenu' action='EditMenuAction' >"
+" <menuitem name='EditTransaction' action='EditTransactionAction'/>"
+" <separator/>"
" <menuitem name='NewTransaction' action='NewTransactionAction'/>"
" <menuitem name='RemoveTransaction' action='RemoveTransactionAction'/>"
" <menuitem name='CloneTransaction' action='CloneTransactionAction'/>"
-" <menuitem name='EditTransaction' action='EditTransactionAction'/>"
" <separator/>"
" <menuitem name='ConvertToScheduled' action='ConvertToScheduledAction'/>"
" <menu name='MoveToAnotherAccount' action='MoveToAnotherAccountAction'>"
@@ -212,14 +213,14 @@ GtkWidget *init_menus ( GtkWidget *vbox )
/* Editmenu */
{"EditMenuAction", NULL, _("_Edit"), NULL, NULL, NULL },
+ {"EditTransactionAction", GTK_STOCK_EDIT, _("_Edit transaction"), "", NULL,
+ G_CALLBACK ( gsb_transactions_list_edit_current_transaction ) },
{"NewTransactionAction", GTK_STOCK_NEW, _("_New transaction"), "", NULL,
G_CALLBACK ( new_transaction ) },
{"RemoveTransactionAction", GTK_STOCK_DELETE, _("_Remove transaction"), "", NULL,
G_CALLBACK ( remove_transaction ) },
{"CloneTransactionAction", GTK_STOCK_COPY, _("_Clone transaction"), "", NULL,
G_CALLBACK ( clone_selected_transaction ) },
- {"EditTransactionAction", GTK_STOCK_EDIT, _("_Edit transaction"), "", NULL,
- G_CALLBACK ( gsb_transactions_list_edit_current_transaction ) },
{"ConvertToScheduledAction", GTK_STOCK_CONVERT, _("Convert to _scheduled transaction"), NULL, NULL,
G_CALLBACK ( schedule_selected_transaction ) },
{"MoveToAnotherAccountAction", NULL, _("_Move transaction to another account"), NULL, NULL, NULL },
hooks/post-receive
--
grisbi
More information about the cvs
mailing list