[grisbi-cvs] grisbi/src fenetre_principale.c, 1.106, 1.107 gsb_account_property.c, 1.18, 1.19 gsb_data_account.c, 1.60, 1.61 utils.c, 1.47, 1.48

[Pierre Biava]

Update of /cvsroot/grisbi/grisbi/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4594/src

Modified Files:
	fenetre_principale.c gsb_account_property.c gsb_data_account.c 
	utils.c 
Log Message:
WARNING : version pour confirmation de bug gtk_viewport. plus de scrolled_window dans la page propriétés des comptes.
WARNING : version for confirmation of bug gtk_viewport. more of scrolled_window in the account page.

Index: fenetre_principale.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/fenetre_principale.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- fenetre_principale.c	6 Jan 2009 18:02:43 -0000	1.106
+++ fenetre_principale.c	10 Jan 2009 06:11:12 -0000	1.107
@@ -322,7 +322,6 @@
 	case 1:
 	    gsb_form_set_expander_visible (FALSE,
 					   FALSE );
-        gsb_account_property_fill_page ();
 	    break;
     }
     return ( FALSE );

Index: gsb_account_property.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_account_property.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- gsb_account_property.c	6 Jan 2009 18:02:43 -0000	1.18
+++ gsb_account_property.c	10 Jan 2009 06:11:13 -0000	1.19
@@ -140,16 +140,23 @@
 
     scrolled_window = gtk_scrolled_window_new ( FALSE, FALSE );
     gtk_scrolled_window_set_policy ( GTK_SCROLLED_WINDOW ( scrolled_window ),
-				     GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC );
+				     GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );
     gtk_box_pack_start ( GTK_BOX ( onglet ), scrolled_window, TRUE, TRUE, 0 );
 
     vbox = gtk_vbox_new ( FALSE, 5 );
-    gtk_scrolled_window_add_with_viewport ( GTK_SCROLLED_WINDOW ( scrolled_window ), vbox );
-    gtk_viewport_set_shadow_type ( GTK_VIEWPORT ( GTK_BIN ( scrolled_window ) -> child ),
-				   GTK_SHADOW_NONE );
+
+    /* WARNING test pour le bug affichage initial du bouton */
+    //~ gtk_scrolled_window_add_with_viewport ( GTK_SCROLLED_WINDOW ( scrolled_window ), vbox );
+    //~ gtk_viewport_set_shadow_type ( GTK_VIEWPORT ( GTK_BIN ( scrolled_window ) -> child ),
+				   //~ GTK_SHADOW_NONE );
+    /* suppression de la scrolled_window */
+    gtk_container_add ( GTK_CONTAINER ( scrolled_window ), vbox );
+    gtk_scrolled_window_set_shadow_type ( GTK_SCROLLED_WINDOW 
+                     ( scrolled_window ), GTK_SHADOW_NONE );
+    /* fin du WARNING                                                       */
 
     /* création de la ligne des détails du compte */
-    paddingbox = new_paddingbox_with_button_title (vbox, TRUE, _("Account details"));
+    paddingbox = new_paddingbox_with_button_title (vbox, FALSE, _("Account details"));
     bouton_icon = g_object_get_data ( G_OBJECT ( paddingbox ), "bouton_icon" );
 
     /* création de la ligne du nom du compte */
@@ -212,6 +219,12 @@
     gtk_box_pack_start ( GTK_BOX ( paddingbox ), detail_compte_cloture, FALSE, FALSE, 0 );
 
     /* set the callback for the button_icon */
+    g_signal_connect ( G_OBJECT (bouton_icon ), 
+                            "destroy",
+                            G_CALLBACK ( gtk_widget_destroyed), 
+                            &bouton_icon );
+    gtk_button_set_relief ( GTK_BUTTON ( bouton_icon ), GTK_RELIEF_NONE );
+
     g_signal_connect ( G_OBJECT( bouton_icon ), 
                             "pressed", 
                             G_CALLBACK(gsb_data_account_change_account_icon), 
@@ -440,6 +453,7 @@
     gtk_container_add ( GTK_CONTAINER ( scrolled_window_text ), detail_commentaire );
 
     gtk_widget_show_all ( onglet );
+    
     return ( onglet );
 }
 
@@ -468,9 +482,6 @@
     
     /* modification pour mettre à jour l'icône du sélecteur d'icône du compte */
     image = gsb_data_account_get_account_icon_image ( current_account );
-    gtk_image_set_pixel_size ( GTK_IMAGE (image ), 32 );
-    gint size = gtk_image_get_pixel_size ( GTK_IMAGE (image ) );
-    devel_debug_int ( size );
     gtk_button_set_image ( GTK_BUTTON ( bouton_icon ), image );
 
     gsb_autofunc_currency_set_currency_number (detail_devise_compte,

Index: gsb_data_account.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_account.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- gsb_data_account.c	4 Jan 2009 18:31:54 -0000	1.60
+++ gsb_data_account.c	10 Jan 2009 06:11:13 -0000	1.61
@@ -2613,7 +2613,10 @@
     devel_debug ( NULL );
     image = gtk_button_get_image ( GTK_BUTTON ( button ) );
     pixbuf = gtk_image_get_pixbuf ( GTK_IMAGE ( image ) );
-    name_icon = g_object_get_data ( G_OBJECT ( pixbuf ), "name_icon" );
+    if ( pixbuf )
+        name_icon = g_object_get_data ( G_OBJECT ( pixbuf ), "name_icon" );
+    else
+        name_icon = g_build_filename (PIXMAPS_DIR, "ac_bank.png", NULL);
     devel_debug (name_icon);
     new_icon = gsb_select_icon_create_window ( name_icon );
     devel_debug (new_icon);

Index: utils.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/utils.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- utils.c	5 Jan 2009 22:17:51 -0000	1.47
+++ utils.c	10 Jan 2009 06:11:13 -0000	1.48
@@ -270,7 +270,6 @@
                                 gboolean fill, gchar * title)
 {
     GtkWidget *vbox, *hbox, *paddingbox, *label, *align, *button;
-    //~ GtkWidget *image;
 
     vbox = gtk_vbox_new ( FALSE, 0 );
     if ( GTK_IS_BOX(parent) )
@@ -298,8 +297,6 @@
     /* add the button */
     align = gtk_alignment_new (0.5, 0.1, 0.0, 0.0);
     button = gtk_button_new ( );
-    gtk_widget_set_size_request ( button, 60, 60 );
-    gtk_widget_show (button);
     gtk_container_add (GTK_CONTAINER (align), button);
     gtk_box_pack_start ( GTK_BOX ( hbox ), align, FALSE, FALSE, 20 );