[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_7_4-76-gdef7b2c

[Pierre Biava]

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  def7b2cc9b31b6188af68d84ca76fcd4f6338722 (commit)
       via  7dd604c00546ffd5f5f3dc32156a290fb9941cae (commit)
      from  b01f89aeeabe08bc653bbe8e84669cb74c51e5d5 (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 def7b2cc9b31b6188af68d84ca76fcd4f6338722
Merge: 7dd604c00546ffd5f5f3dc32156a290fb9941cae b01f89aeeabe08bc653bbe8e84669cb74c51e5d5
Author: pbiava <pierre.biava at nerim.net>
Date:   Thu Nov 4 19:50:00 2010 +0100

    Merge branch 'master' of ssh://grisbi.git.sourceforge.net/gitroot/grisbi/grisbi

commit 7dd604c00546ffd5f5f3dc32156a290fb9941cae
Author: pbiava <pierre.biava at nerim.net>
Date:   Thu Nov 4 19:48:01 2010 +0100

    fixes a side effect of commit 5b7f48ebf5bdf and minor changes

-----------------------------------------------------------------------

Changes:
diff --git a/src/barre_outils.c b/src/barre_outils.c
index d6e5c50..f23eee3 100644
--- a/src/barre_outils.c
+++ b/src/barre_outils.c
@@ -44,6 +44,7 @@
 #include "utils_buttons.h"
 #include "structures.h"
 #include "include.h"
+#include "erreur.h"
 /*END_INCLUDE*/
 
 /*START_STATIC*/
@@ -156,11 +157,6 @@ GtkWidget *creation_barre_outils ( void )
 #endif
     gtk_box_pack_start ( GTK_BOX(hbox), menu, FALSE, FALSE, 0 );
 
-    /* set the button to show/hide R transactions */
-/*     if ( bouton_affiche_ope_r && GTK_IS_WIDGET ( bouton_affiche_ope_r ) ) */
-/* 	    gtk_box_pack_start ( GTK_BOX ( hbox ), bouton_affiche_ope_r, FALSE, FALSE, 0 ); */
-
-
     menu_import_rules = gsb_automem_stock_button_menu_new ( etat.display_toolbar,
 							    GTK_STOCK_EXECUTE, _("Import rules"),
 							    G_CALLBACK(popup_transaction_rules_menu),
@@ -244,17 +240,25 @@ static gboolean popup_transaction_view_mode_menu ( GtkWidget * button,
     menu_item = gtk_check_menu_item_new_with_label ( _("Show reconciled transactions") );
     gtk_check_menu_item_set_active ( GTK_CHECK_MENU_ITEM (menu_item),
 				        gsb_data_account_get_r ( current_account ) );
+    if ( etat.equilibrage == 1 )
+        gtk_widget_set_sensitive ( menu_item, FALSE );
+    else
+        gtk_widget_set_sensitive ( menu_item, TRUE );
+
     gtk_menu_shell_append ( GTK_MENU_SHELL ( menu ), menu_item );
     g_signal_connect ( G_OBJECT ( menu_item ),
                         "activate", 
 			            G_CALLBACK ( gsb_gui_toggle_show_reconciled ),
                         NULL );
 
-    gtk_menu_shell_append ( GTK_MENU_SHELL ( menu ), gtk_separator_menu_item_new ( ) );
-
     menu_item = gtk_check_menu_item_new_with_label ( _("Show lines archives") );
     gtk_check_menu_item_set_active ( GTK_CHECK_MENU_ITEM (menu_item),
 				        gsb_data_account_get_l ( current_account ) );
+    if ( etat.equilibrage == 1 )
+        gtk_widget_set_sensitive ( menu_item, FALSE );
+    else
+        gtk_widget_set_sensitive ( menu_item, TRUE );
+
     gtk_menu_shell_append ( GTK_MENU_SHELL ( menu ), menu_item );
     g_signal_connect ( G_OBJECT ( menu_item ),
                         "activate", 
diff --git a/src/gsb_reconcile.c b/src/gsb_reconcile.c
index ec3f24c..d00f735 100644
--- a/src/gsb_reconcile.c
+++ b/src/gsb_reconcile.c
@@ -641,6 +641,9 @@ void gsb_reconcile_sensitive ( gboolean sensitive )
     gtk_widget_set_sensitive ( gtk_ui_manager_get_widget ( ui_manager, 
                               "/menubar/ViewMenu/ShowReconciled/" ),
 			       sensitive );
+    gtk_widget_set_sensitive ( gtk_ui_manager_get_widget ( ui_manager, 
+                              "/menubar/ViewMenu/ShowArchived/" ),
+			       sensitive );
     gtk_widget_set_sensitive ( gtk_ui_manager_get_widget (ui_manager, 
 							  "/menubar/ViewMenu/ShowClosed/" ),
 			       sensitive );
diff --git a/src/menu.c b/src/menu.c
index e80ce81..5347e97 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -666,7 +666,7 @@ gboolean gsb_gui_toggle_show_reconciled ( void )
 	    return FALSE;
 
     current_account = gsb_gui_navigation_get_current_account ( );
-    if ( current_account == -1 )
+    if ( current_account == -1 || etat.equilibrage == 1 )
         return FALSE;
 
     if ( gsb_data_account_get_r ( current_account ) )
@@ -752,7 +752,7 @@ gboolean gsb_menu_update_view_menu ( gint account_number )
 				        gsb_form_is_visible ( ) );
     g_free ( tmpstr );
 
-    /* update the showing of reconciled transactions */
+    /* update the showing of archived transactions */
     tmpstr = menu_name ( "ViewMenu", "ShowArchived", NULL );
     gtk_toggle_action_set_active ( GTK_TOGGLE_ACTION (
                         gtk_ui_manager_get_action ( ui_manager, tmpstr) ), 
diff --git a/src/transaction_list.c b/src/transaction_list.c
index f6baeb8..0e06d9b 100644
--- a/src/transaction_list.c
+++ b/src/transaction_list.c
@@ -1460,6 +1460,15 @@ gboolean transaction_list_show_toggle_mark ( gboolean show )
     gint i;
     CustomList *custom_list;
 
+    if ( show )
+        /* remet le gtk_tree_view en mode normal */
+        gtk_tree_view_set_fixed_height_mode ( GTK_TREE_VIEW (
+                        gsb_transactions_list_get_tree_view ( ) ), FALSE );
+    else
+        /* remet le gtk_tree_view en mode ligne fixe */
+        gtk_tree_view_set_fixed_height_mode ( GTK_TREE_VIEW (
+                        gsb_transactions_list_get_tree_view ( ) ), TRUE );
+
     custom_list = transaction_model_get_model ();
 
     line_p = find_element_line (ELEMENT_MARK);


hooks/post-receive
-- 
grisbi