[grisbi-cvs] [git push]Grisbi branch master updated. upstream_version_1_1_1-136-gdb5ece0

Pierre Biava noreply at sourceforge.net
Tue Mar 5 22:33:02 CET 2013


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  db5ece08cb6d36a14504b87ef9d9fbe6c4576722 (commit)
       via  4f52faa568d2895fed6986643c6f0400b6593dc1 (commit)
       via  115b4c2fc04633ba118ac08d6dd750378570d867 (commit)
       via  afe2864d1220f848092f191b1e4e1d5423304a26 (commit)
       via  601e50971044ab56e53910d1a59c30bf5d346e51 (commit)
       via  0b252c25f9610d4d67a6acb43b9222f991314dd1 (commit)
       via  25fb47f6b9e5d86a653003e2232b42d129d61191 (commit)
       via  5d091b558a813c0265f49d00d913c8b781d79159 (commit)
       via  db7c911e8ef780b2325fedd4d8a7c08416c43d45 (commit)
       via  ab0bb687a4bbba155332ca87aca91f1c949a03c0 (commit)
      from  928df5e183ff97d6c15ccff2d31eea7bf139c43f (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 -----------------------------------------------------------------
http://grisbi.git.sourceforge.net/git/gitweb.cgi?p=grisbi/code;a=commitdiff;h=

commit db5ece08cb6d36a14504b87ef9d9fbe6c4576722
Author: pbiava <pierre.biava at nerim.net>
Date:   Sun Mar 3 18:20:05 2013 +0100

    Rewriting the toolbar of reports

diff --git a/src/etats_onglet.c b/src/etats_onglet.c
index c737593..d586d05 100644
--- a/src/etats_onglet.c
+++ b/src/etats_onglet.c
@@ -100,13 +100,13 @@ enum report_export_formats {
 GtkWidget *creation_onglet_etats ( void )
 {
     GtkWidget *tab, *vbox;
+    GtkWidget *frame;
 
     tab = gtk_box_new ( GTK_ORIENTATION_VERTICAL, 6 );
 
-    /* création de la barre d'outils */
-    reports_toolbar = gtk_handle_box_new ( );
-    gtk_widget_show ( reports_toolbar );
-    gtk_box_pack_start ( GTK_BOX ( tab ), reports_toolbar, FALSE, FALSE, 0 );
+    /* frame pour la barre d'outils */
+    frame = gtk_frame_new ( NULL );
+    gtk_box_pack_start ( GTK_BOX ( tab ), frame, FALSE, FALSE, 0 );
 
     /* création du notebook contenant l'état et la config */
     notebook_etats = gtk_notebook_new ();
@@ -126,6 +126,10 @@ GtkWidget *creation_onglet_etats ( void )
 				     GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );
     gtk_box_pack_start ( GTK_BOX ( vbox ), scrolled_window_etat, TRUE, TRUE, 0 );
 
+    /* création de la barre d'outils */
+    reports_toolbar = gsb_gui_create_report_toolbar ();
+    gtk_container_add ( GTK_CONTAINER ( frame ), reports_toolbar );
+
     gtk_widget_show_all ( tab );
 
     return ( tab );
@@ -139,81 +143,89 @@ GtkWidget *creation_onglet_etats ( void )
  */
 GtkWidget *gsb_gui_create_report_toolbar ( void )
 {
-    GtkWidget *hbox, *button;
-
-    hbox = gtk_box_new ( GTK_ORIENTATION_HORIZONTAL, 5 );
-
-    /* Add various icons */
-    button = gsb_automem_imagefile_button_new ( conf.display_toolbar,
-					       _("New report"),
-					       "new-report.png",
-					       G_CALLBACK ( ajout_etat ),
-					       NULL );
-    gtk_widget_set_tooltip_text ( GTK_WIDGET (button),
-				  _("Create a new report") );
-    gtk_box_pack_start ( GTK_BOX ( hbox ), button, FALSE, FALSE, 0 );
-
-    button = gsb_automem_stock_button_new ( conf.display_toolbar,
-					   GTK_STOCK_OPEN,
-					   _("Import"),
-					   G_CALLBACK (importer_etat),
-					   NULL );
-    gtk_widget_set_tooltip_text ( GTK_WIDGET (button),
-				  _("Import a Grisbi report file (.egsb)") );
-    gtk_box_pack_start ( GTK_BOX ( hbox ), button, FALSE, FALSE, 0 );
-
-    bouton_exporter_etat = gsb_automem_stock_button_new ( conf.display_toolbar,
-							 GTK_STOCK_SAVE,
-							 _("Export"),
-							 G_CALLBACK (exporter_etat),
-							 NULL );
-    gtk_widget_set_tooltip_text ( GTK_WIDGET (bouton_exporter_etat),
-				  _("Export selected report to egsb, HTML, Tex, CSV, PostScript") );
-    gtk_box_pack_start ( GTK_BOX ( hbox ), bouton_exporter_etat, FALSE, FALSE, 0 );
+    GtkWidget *toolbar;
+    GtkToolItem *item;
+
+    toolbar = gtk_toolbar_new ();
+
+    /* New report button */
+    item = utils_buttons_new_from_image_label ( "new-report.png", _("New report") );
+    gtk_widget_set_tooltip_text ( GTK_WIDGET ( item ), _("Create a new report") );
+    g_signal_connect ( G_OBJECT ( item ),
+                        "clicked",
+                        G_CALLBACK ( ajout_etat ),
+                        NULL );
+    gtk_toolbar_insert ( GTK_TOOLBAR ( toolbar ), item, -1 );
+
+    /* Import button */
+    item = gtk_tool_button_new_from_stock ( GTK_STOCK_OPEN );
+    gtk_tool_button_set_label ( GTK_TOOL_BUTTON ( item ), _("Import") );
+    gtk_widget_set_tooltip_text ( GTK_WIDGET ( item ), _("Import a Grisbi report file (.egsb)") );
+    g_signal_connect ( G_OBJECT ( item ),
+                        "clicked",
+                        G_CALLBACK ( importer_etat ),
+                        NULL );
+    gtk_toolbar_insert ( GTK_TOOLBAR ( toolbar ), item, -1 );
+
+    /* Export button */
+    bouton_exporter_etat = GTK_WIDGET ( gtk_tool_button_new_from_stock ( GTK_STOCK_SAVE ) );
+    gtk_tool_button_set_label ( GTK_TOOL_BUTTON ( bouton_exporter_etat ), _("Export") );
+    gtk_widget_set_tooltip_text ( GTK_WIDGET ( bouton_exporter_etat ),
+                        _("Export selected report to egsb, HTML, Tex, CSV, PostScript") );
+    g_signal_connect ( G_OBJECT ( bouton_exporter_etat ),
+                        "clicked",
+                        G_CALLBACK ( exporter_etat ),
+                        NULL );
+    gtk_toolbar_insert ( GTK_TOOLBAR ( toolbar ), GTK_TOOL_ITEM ( bouton_exporter_etat ), -1 );
 
     /* print button */
-    bouton_imprimer_etat = gsb_automem_stock_button_new ( conf.display_toolbar,
-							  GTK_STOCK_PRINT,
-							  _("Print"),
-							  G_CALLBACK (print_report),
-							  NULL );
-    gtk_widget_set_tooltip_text ( GTK_WIDGET (bouton_imprimer_etat),
-                   _("Print selected report") );
-
-    gtk_box_pack_start ( GTK_BOX ( hbox ), bouton_imprimer_etat, FALSE, FALSE, 0 );
-
-    bouton_effacer_etat = gsb_automem_stock_button_new ( conf.display_toolbar,
-							 GTK_STOCK_DELETE,
-							 _("Delete"),
-							 G_CALLBACK ( efface_etat ),
-							 NULL );
-    gtk_widget_set_tooltip_text ( GTK_WIDGET (bouton_effacer_etat),
-				   _("Delete selected report") );
-    gtk_box_pack_start ( GTK_BOX ( hbox ), bouton_effacer_etat, FALSE, FALSE, 0 );
-
-    bouton_personnaliser_etat = gsb_automem_stock_button_new ( conf.display_toolbar,
-							      GTK_STOCK_PROPERTIES,
-							      _("Properties"),
-							      G_CALLBACK (etats_config_personnalisation_etat),
-							      NULL ),
-    gtk_widget_set_tooltip_text ( GTK_WIDGET (bouton_personnaliser_etat),
-				  _("Edit selected report") );
-    gtk_box_pack_start ( GTK_BOX ( hbox ), bouton_personnaliser_etat, FALSE, FALSE, 0 );
-
+    bouton_imprimer_etat = GTK_WIDGET ( gtk_tool_button_new_from_stock ( GTK_STOCK_PRINT ) );
+    gtk_widget_set_tooltip_text ( GTK_WIDGET ( bouton_imprimer_etat ), _("Print selected report") );
+    g_signal_connect ( G_OBJECT ( bouton_imprimer_etat ),
+                        "clicked",
+                        G_CALLBACK ( print_report ),
+                        NULL );
+    gtk_toolbar_insert ( GTK_TOOLBAR ( toolbar ), GTK_TOOL_ITEM ( bouton_imprimer_etat ), -1 );
+
+    /* delete button */
+    bouton_effacer_etat = GTK_WIDGET ( gtk_tool_button_new_from_stock ( GTK_STOCK_DELETE ) );
+    gtk_widget_set_tooltip_text ( GTK_WIDGET ( bouton_effacer_etat ),
+                        _("Delete selected report") );
+    g_signal_connect ( G_OBJECT ( bouton_effacer_etat ),
+                        "clicked",
+                        G_CALLBACK ( efface_etat ),
+                        NULL );
+    gtk_toolbar_insert ( GTK_TOOLBAR ( toolbar ), GTK_TOOL_ITEM ( bouton_effacer_etat ), -1 );
+
+    /* edit button */
+    bouton_personnaliser_etat = GTK_WIDGET ( gtk_tool_button_new_from_stock ( GTK_STOCK_PROPERTIES ) );
+    gtk_widget_set_tooltip_text ( GTK_WIDGET ( bouton_personnaliser_etat ),
+                        _("Edit selected report") );
+    g_signal_connect ( G_OBJECT ( bouton_personnaliser_etat ),
+                        "clicked",
+                        G_CALLBACK ( etats_config_personnalisation_etat ),
+                        NULL );
+    gtk_toolbar_insert ( GTK_TOOLBAR ( toolbar ), GTK_TOOL_ITEM ( bouton_personnaliser_etat ), -1 );
+
+    /* clone button */
     bouton_dupliquer_etat = gsb_automem_stock_button_new ( conf.display_toolbar,
 							  GTK_STOCK_COPY,
 							  _("Clone"),
 							  G_CALLBACK (dupliquer_etat),
 							  NULL ),
-    gtk_widget_set_tooltip_text ( GTK_WIDGET (bouton_dupliquer_etat),
-				  _("Clone selected report") );
-    gtk_box_pack_start ( GTK_BOX ( hbox ), bouton_dupliquer_etat, FALSE, FALSE, 0 );
-
-    gtk_widget_show_all ( hbox );
+    bouton_dupliquer_etat = GTK_WIDGET ( gtk_tool_button_new_from_stock ( GTK_STOCK_COPY ) );
+    gtk_tool_button_set_label ( GTK_TOOL_BUTTON ( bouton_dupliquer_etat ), _("Clone") );
+    gtk_widget_set_tooltip_text ( GTK_WIDGET ( bouton_dupliquer_etat ),
+                        _("Clone selected report") );
+    g_signal_connect ( G_OBJECT ( bouton_dupliquer_etat ),
+                        "clicked",
+                        G_CALLBACK ( dupliquer_etat ),
+                        NULL );
+    gtk_toolbar_insert ( GTK_TOOLBAR ( toolbar ), GTK_TOOL_ITEM ( bouton_dupliquer_etat ), -1 );
 
     gsb_gui_unsensitive_report_widgets ();
 
-    return ( hbox );
+    return toolbar;
 }
 
 
@@ -222,24 +234,9 @@ GtkWidget *gsb_gui_create_report_toolbar ( void )
  *
  *
  */
-void gsb_gui_update_reports_toolbar ( void )
+void gsb_gui_reports_toolbar_set_style ( gint toolbar_style )
 {
-    GList * list = NULL;
-    gint current_report;
-
-    list = gtk_container_get_children ( GTK_CONTAINER ( reports_toolbar ) );
-
-    if ( list )
-    {
-        gtk_container_remove ( GTK_CONTAINER ( reports_toolbar ),
-                        GTK_WIDGET ( list -> data ) );
-	g_list_free ( list );
-    }
-
-    gtk_container_add ( GTK_CONTAINER ( reports_toolbar ), gsb_gui_create_report_toolbar ( ) );
-
-    if ( ( current_report = gsb_report_get_current ( ) ) > 0 )
-        gsb_gui_update_gui_to_report ( current_report );
+    gtk_toolbar_set_style ( GTK_TOOLBAR ( reports_toolbar ), toolbar_style );
 }
 
 
diff --git a/src/etats_onglet.h b/src/etats_onglet.h
index e84cb56..04729b7 100644
--- a/src/etats_onglet.h
+++ b/src/etats_onglet.h
@@ -12,8 +12,8 @@ gboolean ajout_etat ( void );
 GtkWidget *creation_onglet_etats ( void );
 void efface_etat ( void );
 GtkWidget *etats_onglet_get_notebook_etats ( void );
+void gsb_gui_reports_toolbar_set_style ( gint toolbar_style );
 void gsb_gui_unsensitive_report_widgets ();
 void gsb_gui_update_gui_to_report ( gint report_number );
-void gsb_gui_update_reports_toolbar ( void );
 /* END_DECLARATION */
 #endif
diff --git a/src/fenetre_principale.c b/src/fenetre_principale.c
index 3e8176e..fcc1933 100644
--- a/src/fenetre_principale.c
+++ b/src/fenetre_principale.c
@@ -575,7 +575,7 @@ void gsb_gui_update_all_toolbars ( void )
     gsb_gui_payees_toolbar_set_style ( toolbar_style );
     gsb_gui_categories_toolbar_set_style ( toolbar_style );
     gsb_gui_budgetary_lines_toolbar_set_style ( toolbar_style );
-    gsb_gui_update_reports_toolbar ( );
+    gsb_gui_reports_toolbar_set_style ( toolbar_style );
     bet_array_update_toolbar ( toolbar_style );
     bet_historical_update_toolbar ( toolbar_style );
     bet_finance_update_all_finance_toolbars ( toolbar_style );

http://grisbi.git.sourceforge.net/git/gitweb.cgi?p=grisbi/code;a=commitdiff;h=

commit db5ece08cb6d36a14504b87ef9d9fbe6c4576722
Author: pbiava <pierre.biava at nerim.net>
Date:   Sun Mar 3 18:20:05 2013 +0100

    Rewriting the toolbar of reports

diff --git a/src/etats_onglet.c b/src/etats_onglet.c
index c737593..d586d05 100644
--- a/src/etats_onglet.c
+++ b/src/etats_onglet.c
@@ -100,13 +100,13 @@ enum report_export_formats {
 GtkWidget *creation_onglet_etats ( void )
 {
     GtkWidget *tab, *vbox;
+    GtkWidget *frame;
 
     tab = gtk_box_new ( GTK_ORIENTATION_VERTICAL, 6 );
 
-    /* création de la barre d'outils */
-    reports_toolbar = gtk_handle_box_new ( );
-    gtk_widget_show ( reports_toolbar );
-    gtk_box_pack_start ( GTK_BOX ( tab ), reports_toolbar, FALSE, FALSE, 0 );
+    /* frame pour la barre d'outils */
+    frame = gtk_frame_new ( NULL );
+    gtk_box_pack_start ( GTK_BOX ( tab ), frame, FALSE, FALSE, 0 );
 
     /* création du notebook contenant l'état et la config */
     notebook_etats = gtk_notebook_new ();
@@ -126,6 +126,10 @@ GtkWidget *creation_onglet_etats ( void )
 				     GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );
     gtk_box_pack_start ( GTK_BOX ( vbox ), scrolled_window_etat, TRUE, TRUE, 0 );
 
+    /* création de la barre d'outils */
+    reports_toolbar = gsb_gui_create_report_toolbar ();
+    gtk_container_add ( GTK_CONTAINER ( frame ), reports_toolbar );
+
     gtk_widget_show_all ( tab );
 
     return ( tab );
@@ -139,81 +143,89 @@ GtkWidget *creation_onglet_etats ( void )
  */
 GtkWidget *gsb_gui_create_report_toolbar ( void )
 {
-    GtkWidget *hbox, *button;
-
-    hbox = gtk_box_new ( GTK_ORIENTATION_HORIZONTAL, 5 );
-
-    /* Add various icons */
-    button = gsb_automem_imagefile_button_new ( conf.display_toolbar,
-					       _("New report"),
-					       "new-report.png",
-					       G_CALLBACK ( ajout_etat ),
-					       NULL );
-    gtk_widget_set_tooltip_text ( GTK_WIDGET (button),
-				  _("Create a new report") );
-    gtk_box_pack_start ( GTK_BOX ( hbox ), button, FALSE, FALSE, 0 );
-
-    button = gsb_automem_stock_button_new ( conf.display_toolbar,
-					   GTK_STOCK_OPEN,
-					   _("Import"),
-					   G_CALLBACK (importer_etat),
-					   NULL );
-    gtk_widget_set_tooltip_text ( GTK_WIDGET (button),
-				  _("Import a Grisbi report file (.egsb)") );
-    gtk_box_pack_start ( GTK_BOX ( hbox ), button, FALSE, FALSE, 0 );
-
-    bouton_exporter_etat = gsb_automem_stock_button_new ( conf.display_toolbar,
-							 GTK_STOCK_SAVE,
-							 _("Export"),
-							 G_CALLBACK (exporter_etat),
-							 NULL );
-    gtk_widget_set_tooltip_text ( GTK_WIDGET (bouton_exporter_etat),
-				  _("Export selected report to egsb, HTML, Tex, CSV, PostScript") );
-    gtk_box_pack_start ( GTK_BOX ( hbox ), bouton_exporter_etat, FALSE, FALSE, 0 );
+    GtkWidget *toolbar;
+    GtkToolItem *item;
+
+    toolbar = gtk_toolbar_new ();
+
+    /* New report button */
+    item = utils_buttons_new_from_image_label ( "new-report.png", _("New report") );
+    gtk_widget_set_tooltip_text ( GTK_WIDGET ( item ), _("Create a new report") );
+    g_signal_connect ( G_OBJECT ( item ),
+                        "clicked",
+                        G_CALLBACK ( ajout_etat ),
+                        NULL );
+    gtk_toolbar_insert ( GTK_TOOLBAR ( toolbar ), item, -1 );
+
+    /* Import button */
+    item = gtk_tool_button_new_from_stock ( GTK_STOCK_OPEN );
+    gtk_tool_button_set_label ( GTK_TOOL_BUTTON ( item ), _("Import") );
+    gtk_widget_set_tooltip_text ( GTK_WIDGET ( item ), _("Import a Grisbi report file (.egsb)") );
+    g_signal_connect ( G_OBJECT ( item ),
+                        "clicked",
+                        G_CALLBACK ( importer_etat ),
+                        NULL );
+    gtk_toolbar_insert ( GTK_TOOLBAR ( toolbar ), item, -1 );
+
+    /* Export button */
+    bouton_exporter_etat = GTK_WIDGET ( gtk_tool_button_new_from_stock ( GTK_STOCK_SAVE ) );
+    gtk_tool_button_set_label ( GTK_TOOL_BUTTON ( bouton_exporter_etat ), _("Export") );
+    gtk_widget_set_tooltip_text ( GTK_WIDGET ( bouton_exporter_etat ),
+                        _("Export selected report to egsb, HTML, Tex, CSV, PostScript") );
+    g_signal_connect ( G_OBJECT ( bouton_exporter_etat ),
+                        "clicked",
+                        G_CALLBACK ( exporter_etat ),
+                        NULL );
+    gtk_toolbar_insert ( GTK_TOOLBAR ( toolbar ), GTK_TOOL_ITEM ( bouton_exporter_etat ), -1 );
 
     /* print button */
-    bouton_imprimer_etat = gsb_automem_stock_button_new ( conf.display_toolbar,
-							  GTK_STOCK_PRINT,
-							  _("Print"),
-							  G_CALLBACK (print_report),
-							  NULL );
-    gtk_widget_set_tooltip_text ( GTK_WIDGET (bouton_imprimer_etat),
-                   _("Print selected report") );
-
-    gtk_box_pack_start ( GTK_BOX ( hbox ), bouton_imprimer_etat, FALSE, FALSE, 0 );
-
-    bouton_effacer_etat = gsb_automem_stock_button_new ( conf.display_toolbar,
-							 GTK_STOCK_DELETE,
-							 _("Delete"),
-							 G_CALLBACK ( efface_etat ),
-							 NULL );
-    gtk_widget_set_tooltip_text ( GTK_WIDGET (bouton_effacer_etat),
-				   _("Delete selected report") );
-    gtk_box_pack_start ( GTK_BOX ( hbox ), bouton_effacer_etat, FALSE, FALSE, 0 );
-
-    bouton_personnaliser_etat = gsb_automem_stock_button_new ( conf.display_toolbar,
-							      GTK_STOCK_PROPERTIES,
-							      _("Properties"),
-							      G_CALLBACK (etats_config_personnalisation_etat),
-							      NULL ),
-    gtk_widget_set_tooltip_text ( GTK_WIDGET (bouton_personnaliser_etat),
-				  _("Edit selected report") );
-    gtk_box_pack_start ( GTK_BOX ( hbox ), bouton_personnaliser_etat, FALSE, FALSE, 0 );
-
+    bouton_imprimer_etat = GTK_WIDGET ( gtk_tool_button_new_from_stock ( GTK_STOCK_PRINT ) );
+    gtk_widget_set_tooltip_text ( GTK_WIDGET ( bouton_imprimer_etat ), _("Print selected report") );
+    g_signal_connect ( G_OBJECT ( bouton_imprimer_etat ),
+                        "clicked",
+                        G_CALLBACK ( print_report ),
+                        NULL );
+    gtk_toolbar_insert ( GTK_TOOLBAR ( toolbar ), GTK_TOOL_ITEM ( bouton_imprimer_etat ), -1 );
+
+    /* delete button */
+    bouton_effacer_etat = GTK_WIDGET ( gtk_tool_button_new_from_stock ( GTK_STOCK_DELETE ) );
+    gtk_widget_set_tooltip_text ( GTK_WIDGET ( bouton_effacer_etat ),
+                        _("Delete selected report") );
+    g_signal_connect ( G_OBJECT ( bouton_effacer_etat ),
+                        "clicked",
+                        G_CALLBACK ( efface_etat ),
+                        NULL );
+    gtk_toolbar_insert ( GTK_TOOLBAR ( toolbar ), GTK_TOOL_ITEM ( bouton_effacer_etat ), -1 );
+
+    /* edit button */
+    bouton_personnaliser_etat = GTK_WIDGET ( gtk_tool_button_new_from_stock ( GTK_STOCK_PROPERTIES ) );
+    gtk_widget_set_tooltip_text ( GTK_WIDGET ( bouton_personnaliser_etat ),
+                        _("Edit selected report") );
+    g_signal_connect ( G_OBJECT ( bouton_personnaliser_etat ),
+                        "clicked",
+                        G_CALLBACK ( etats_config_personnalisation_etat ),
+                        NULL );
+    gtk_toolbar_insert ( GTK_TOOLBAR ( toolbar ), GTK_TOOL_ITEM ( bouton_personnaliser_etat ), -1 );
+
+    /* clone button */
     bouton_dupliquer_etat = gsb_automem_stock_button_new ( conf.display_toolbar,
 							  GTK_STOCK_COPY,
 							  _("Clone"),
 							  G_CALLBACK (dupliquer_etat),
 							  NULL ),
-    gtk_widget_set_tooltip_text ( GTK_WIDGET (bouton_dupliquer_etat),
-				  _("Clone selected report") );
-    gtk_box_pack_start ( GTK_BOX ( hbox ), bouton_dupliquer_etat, FALSE, FALSE, 0 );
-
-    gtk_widget_show_all ( hbox );
+    bouton_dupliquer_etat = GTK_WIDGET ( gtk_tool_button_new_from_stock ( GTK_STOCK_COPY ) );
+    gtk_tool_button_set_label ( GTK_TOOL_BUTTON ( bouton_dupliquer_etat ), _("Clone") );
+    gtk_widget_set_tooltip_text ( GTK_WIDGET ( bouton_dupliquer_etat ),
+                        _("Clone selected report") );
+    g_signal_connect ( G_OBJECT ( bouton_dupliquer_etat ),
+                        "clicked",
+                        G_CALLBACK ( dupliquer_etat ),
+                        NULL );
+    gtk_toolbar_insert ( GTK_TOOLBAR ( toolbar ), GTK_TOOL_ITEM ( bouton_dupliquer_etat ), -1 );
 
     gsb_gui_unsensitive_report_widgets ();
 
-    return ( hbox );
+    return toolbar;
 }
 
 
@@ -222,24 +234,9 @@ GtkWidget *gsb_gui_create_report_toolbar ( void )
  *
  *
  */
-void gsb_gui_update_reports_toolbar ( void )
+void gsb_gui_reports_toolbar_set_style ( gint toolbar_style )
 {
-    GList * list = NULL;
-    gint current_report;
-
-    list = gtk_container_get_children ( GTK_CONTAINER ( reports_toolbar ) );
-
-    if ( list )
-    {
-        gtk_container_remove ( GTK_CONTAINER ( reports_toolbar ),
-                        GTK_WIDGET ( list -> data ) );
-	g_list_free ( list );
-    }
-
-    gtk_container_add ( GTK_CONTAINER ( reports_toolbar ), gsb_gui_create_report_toolbar ( ) );
-
-    if ( ( current_report = gsb_report_get_current ( ) ) > 0 )
-        gsb_gui_update_gui_to_report ( current_report );
+    gtk_toolbar_set_style ( GTK_TOOLBAR ( reports_toolbar ), toolbar_style );
 }
 
 
diff --git a/src/etats_onglet.h b/src/etats_onglet.h
index e84cb56..04729b7 100644
--- a/src/etats_onglet.h
+++ b/src/etats_onglet.h
@@ -12,8 +12,8 @@ gboolean ajout_etat ( void );
 GtkWidget *creation_onglet_etats ( void );
 void efface_etat ( void );
 GtkWidget *etats_onglet_get_notebook_etats ( void );
+void gsb_gui_reports_toolbar_set_style ( gint toolbar_style );
... 2048 lines suppressed ...


hooks/post-receive
-- 
Grisbi


More information about the cvs mailing list