[grisbi-cvs] grisbi/src fenetre_principale.c, 1.107, 1.108 gsb_account_property.c, 1.19, 1.20 utils.c, 1.48, 1.49 utils.h, 1.22, 1.23
Pierre Biava
pbiava at users.sourceforge.net
Sun Jan 11 17:01:44 CET 2009
Update of /cvsroot/grisbi/grisbi/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2131/src
Modified Files:
fenetre_principale.c gsb_account_property.c utils.c utils.h
Log Message:
WARNING : modification configure.in with PACKAGE=grisbi-0.6
modification function gsb_account_property_create_page ( ) with step backwards for the gtk_viewport
Index: fenetre_principale.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/fenetre_principale.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- fenetre_principale.c 10 Jan 2009 06:11:12 -0000 1.107
+++ fenetre_principale.c 11 Jan 2009 16:01:42 -0000 1.108
@@ -28,7 +28,6 @@
#include "./balance_estimate_tab.h"
#include "./navigation.h"
#include "./gsb_transactions_list.h"
-#include "./gsb_account_property.h"
#include "./accueil.h"
#include "./comptes_onglet.h"
#include "./etats_onglet.h"
Index: gsb_account_property.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_account_property.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- gsb_account_property.c 10 Jan 2009 06:11:13 -0000 1.19
+++ gsb_account_property.c 11 Jan 2009 16:01:42 -0000 1.20
@@ -127,6 +127,7 @@
GtkWidget *onglet, *vbox, *scrolled_window, *hbox, *vbox2;
GtkWidget *label, *scrolled_window_text, *paddingbox;
GtkSizeGroup * size_group;
+ GtkWidget *align;
devel_debug ( NULL );
@@ -135,9 +136,18 @@
gtk_container_set_border_width ( GTK_CONTAINER ( onglet ), 10 );
size_group = gtk_size_group_new ( GTK_SIZE_GROUP_HORIZONTAL );
+
+
+ /* Création du bouton pour modifier l'icône de compte. C'est un moyen de
+ * contourner le bug du gtk_viewport */
+ align = gtk_alignment_new (0.5, 0.0, 0.0, 0.0);
+ bouton_icon = gtk_button_new ( );
+ gtk_widget_set_size_request ( bouton_icon, -1, 40 );
+ gtk_button_set_relief ( GTK_BUTTON ( bouton_icon ), GTK_RELIEF_NORMAL );
+ gtk_container_add ( GTK_CONTAINER ( align ), bouton_icon );
+ gtk_box_pack_start ( GTK_BOX ( onglet ), align, FALSE, FALSE, 0);
/* partie du haut avec les détails du compte */
-
scrolled_window = gtk_scrolled_window_new ( FALSE, FALSE );
gtk_scrolled_window_set_policy ( GTK_SCROLLED_WINDOW ( scrolled_window ),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );
@@ -145,19 +155,12 @@
vbox = gtk_vbox_new ( FALSE, 5 );
- /* 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 */
+ 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 );
/* création de la ligne des détails du compte */
- paddingbox = new_paddingbox_with_button_title (vbox, FALSE, _("Account details"));
- bouton_icon = g_object_get_data ( G_OBJECT ( paddingbox ), "bouton_icon" );
+ paddingbox = new_paddingbox_with_title (vbox, FALSE, _("Account details"));
/* création de la ligne du nom du compte */
hbox = gtk_hbox_new ( FALSE, 6 );
@@ -483,7 +486,7 @@
/* 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_button_set_image ( GTK_BUTTON ( bouton_icon ), image );
-
+
gsb_autofunc_currency_set_currency_number (detail_devise_compte,
gsb_data_account_get_currency (current_account), current_account);
Index: utils.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/utils.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- utils.c 10 Jan 2009 06:11:13 -0000 1.48
+++ utils.c 11 Jan 2009 16:01:42 -0000 1.49
@@ -266,54 +266,6 @@
return paddingbox;
}
-GtkWidget *new_paddingbox_with_button_title (GtkWidget * parent,
- gboolean fill, gchar * title)
-{
- GtkWidget *vbox, *hbox, *paddingbox, *label, *align, *button;
-
- vbox = gtk_vbox_new ( FALSE, 0 );
- if ( GTK_IS_BOX(parent) )
- {
- gtk_box_pack_start ( GTK_BOX ( parent ), vbox,
- fill, fill, 0);
- }
-
- /* Creating label */
- label = gtk_label_new ( NULL );
- gtk_misc_set_alignment ( GTK_MISC ( label ), 0, 1 );
- gchar* tmp_str = g_strconcat ("<span weight=\"bold\">",
- title, "</span>", NULL );
- gtk_label_set_markup ( GTK_LABEL ( label ), tmp_str );
- g_free(tmp_str);
- gtk_box_pack_start ( GTK_BOX ( vbox ), label,
- FALSE, FALSE, 0);
- gtk_widget_show ( label );
-
- /* Creating horizontal box */
- hbox = gtk_hbox_new ( FALSE, 0 );
- gtk_box_pack_start ( GTK_BOX ( vbox ), hbox,
- fill, fill, 0);
-
- /* add the button */
- align = gtk_alignment_new (0.5, 0.1, 0.0, 0.0);
- button = gtk_button_new ( );
- gtk_container_add (GTK_CONTAINER (align), button);
- gtk_box_pack_start ( GTK_BOX ( hbox ), align, FALSE, FALSE, 20 );
-
- /* Then make the vbox itself */
- paddingbox = gtk_vbox_new ( FALSE, 6 );
- g_object_set_data ( G_OBJECT ( paddingbox ), "bouton_icon", button );
- gtk_box_pack_start ( GTK_BOX ( hbox ), paddingbox,
- TRUE, TRUE, 0);
-
- if ( GTK_IS_BOX(parent) )
- {
- gtk_box_set_spacing ( GTK_BOX(parent), 18 );
- }
-
- return paddingbox;
-}
-
/**
* Function that makes a nice title with an optional icon. It is
* mainly used to automate preference tabs with titles.
Index: utils.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/utils.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- utils.h 5 Jan 2009 22:17:51 -0000 1.22
+++ utils.h 11 Jan 2009 16:01:42 -0000 1.23
@@ -15,8 +15,6 @@
gboolean met_en_prelight ( GtkWidget *event_box,
GdkEventMotion *event,
gpointer pointeur );
-GtkWidget *new_paddingbox_with_button_title (GtkWidget * parent,
- gboolean fill, gchar * title);
GtkWidget *new_paddingbox_with_title (GtkWidget * parent, gboolean fill, gchar * title);
GtkWidget *new_vbox_with_title_and_icon ( gchar * title,
gchar * image_filename);
More information about the cvs
mailing list