[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_9_5-133-gb3b846c
Pierre Biava
nobody at users.sourceforge.net
Sun Sep 2 20:24:37 CEST 2012
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 b3b846c980285fda50cb78daa28c2b41d32e51b7 (commit)
via 4f8007b9b03de3ae8b931cc0c5de0ad5db9068db (commit)
via 8df91b0a5397a3fbae24c866670d28a10aa8183f (commit)
via 9e7481a6477baf09a942298bf3d7c58d631f4b0c (commit)
via 7da2a03d6c03a5d7b890a6900099f6c01a05ef7b (commit)
via 8f197781d78e4daeae1ee08f2ec2c200d9a293aa (commit)
via 39c8f2e502e05cb39e1f314a3e164e4f43ba031f (commit)
via d65348c72002c7a50bee45a92d8666a8f3994711 (commit)
via 037e7f26b456ab72e45cd76c7944a7e63b6ce98a (commit)
from 8f1fcd0df8180a89901f3d48263bfea382138703 (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 b3b846c980285fda50cb78daa28c2b41d32e51b7
Author: pbiava <pierre.biava at nerim.net>
Date: Sun Sep 2 20:12:58 2012 +0200
moving the variables "show_tip, last_tip" in structure conf_t
commit 4f8007b9b03de3ae8b931cc0c5de0ad5db9068db
Author: pbiava <pierre.biava at nerim.net>
Date: Sun Sep 2 20:11:15 2012 +0200
moving the variable "show_closed_accounts" in structure conf_t
commit 8df91b0a5397a3fbae24c866670d28a10aa8183f
Author: pbiava <pierre.biava at nerim.net>
Date: Sun Sep 2 19:58:16 2012 +0200
moving the variable "show_headings_bar" in structure conf_t
commit 9e7481a6477baf09a942298bf3d7c58d631f4b0c
Author: pbiava <pierre.biava at nerim.net>
Date: Sun Sep 2 19:54:11 2012 +0200
moving the variable "display_toolbar" in structure conf_t
commit 7da2a03d6c03a5d7b890a6900099f6c01a05ef7b
Author: pbiava <pierre.biava at nerim.net>
Date: Sun Sep 2 19:44:18 2012 +0200
moving the variable "affichage_exercice_automatique" in structure conf_t
commit 8f197781d78e4daeae1ee08f2ec2c200d9a293aa
Author: pbiava <pierre.biava at nerim.net>
Date: Sun Sep 2 19:36:08 2012 +0200
moving the variable "formulaire_toujours_affiche" in structure conf_t
commit 39c8f2e502e05cb39e1f314a3e164e4f43ba031f
Author: pbiava <pierre.biava at nerim.net>
Date: Sun Sep 2 19:12:22 2012 +0200
remove variable "largeur_auto_colonnes"
commit d65348c72002c7a50bee45a92d8666a8f3994711
Author: pbiava <pierre.biava at nerim.net>
Date: Sun Sep 2 19:04:07 2012 +0200
Fixed a bug of storage the variable "Remind_display_per_account"
commit 037e7f26b456ab72e45cd76c7944a7e63b6ce98a
Author: pbiava <pierre.biava at nerim.net>
Date: Sun Sep 2 18:26:55 2012 +0200
adding a radio button for the view of lines for transactions
-----------------------------------------------------------------------
Changes:
diff --git a/src/accueil.c b/src/accueil.c
index 39f49f6..1e69a21 100644
--- a/src/accueil.c
+++ b/src/accueil.c
@@ -1545,7 +1545,7 @@ void update_soldes_minimaux ( gboolean force )
i = gsb_data_account_get_no_account ( list_tmp -> data );
- if ( gsb_data_account_get_closed_account ( i ) && !etat.show_closed_accounts )
+ if ( gsb_data_account_get_closed_account ( i ) && !conf.show_closed_accounts )
{
list_tmp = list_tmp -> next;
continue;
@@ -1826,7 +1826,7 @@ void update_fin_comptes_passifs ( gboolean force )
gtk_notebook_remove_page ( GTK_NOTEBOOK(frame_etat_fin_compte_passif), 0 );
hide_paddingbox ( frame_etat_fin_compte_passif );
- if ( !etat.show_closed_accounts )
+ if ( !conf.show_closed_accounts )
return;
list_tmp = gsb_data_account_get_list_accounts ();
diff --git a/src/affichage.c b/src/affichage.c
index 295e385..01ce7b0 100644
--- a/src/affichage.c
+++ b/src/affichage.c
@@ -679,7 +679,7 @@ gboolean change_toolbar_display_mode ( GtkRadioButton *button )
return FALSE;
/* save the new parameter */
- etat.display_toolbar = GPOINTER_TO_INT (g_object_get_data ( G_OBJECT(button), "display" ));
+ conf.display_toolbar = GPOINTER_TO_INT (g_object_get_data ( G_OBJECT(button), "display" ));
/* update toolbars */
gsb_gui_update_all_toolbars ( );
@@ -711,7 +711,7 @@ GtkWidget *tab_display_toolbar ( void )
gtk_box_pack_start ( GTK_BOX ( vbox_pref ), vbox, FALSE, FALSE, 0 );
button = gsb_automem_checkbutton_new ( _("Display headings bar"),
- &(etat.show_headings_bar),
+ &(conf.show_headings_bar),
G_CALLBACK ( preferences_switch_headings_bar ),
NULL );
gtk_box_pack_start ( GTK_BOX ( vbox ), button, FALSE, FALSE, 5 );
@@ -735,7 +735,7 @@ GtkWidget *tab_display_toolbar ( void )
radiogroup = radio = gtk_radio_button_new_with_label ( NULL, _("Text") );
g_object_set_data ( G_OBJECT ( radio ), "display", GINT_TO_POINTER ( GSB_BUTTON_TEXT ) );
gtk_box_pack_start ( GTK_BOX ( paddingbox ), radio, FALSE, FALSE, 0 );
- if ( etat.display_toolbar == GSB_BUTTON_TEXT )
+ if ( conf.display_toolbar == GSB_BUTTON_TEXT )
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( radio ), TRUE );
g_signal_connect ( G_OBJECT ( radio ),
@@ -746,7 +746,7 @@ GtkWidget *tab_display_toolbar ( void )
radio = gtk_radio_button_new_with_label_from_widget ( GTK_RADIO_BUTTON ( radiogroup ), _("Icons") );
g_object_set_data ( G_OBJECT ( radio ), "display", GINT_TO_POINTER ( GSB_BUTTON_ICON ) );
gtk_box_pack_start ( GTK_BOX ( paddingbox ), radio, FALSE, FALSE, 0 );
- if ( etat.display_toolbar == GSB_BUTTON_ICON )
+ if ( conf.display_toolbar == GSB_BUTTON_ICON )
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( radio ), TRUE );
g_signal_connect ( G_OBJECT ( radio ),
@@ -757,7 +757,7 @@ GtkWidget *tab_display_toolbar ( void )
radio = gtk_radio_button_new_with_label_from_widget ( GTK_RADIO_BUTTON ( radiogroup ), _("Both") );
g_object_set_data ( G_OBJECT ( radio ), "display", GINT_TO_POINTER ( GSB_BUTTON_BOTH ) );
gtk_box_pack_start ( GTK_BOX ( paddingbox ), radio, FALSE, FALSE, 0 );
- if ( etat.display_toolbar == GSB_BUTTON_BOTH )
+ if ( conf.display_toolbar == GSB_BUTTON_BOTH )
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( radio ), TRUE );
g_signal_connect ( G_OBJECT ( radio ),
diff --git a/src/affichage_liste.c b/src/affichage_liste.c
index da3360d..7d217f9 100644
--- a/src/affichage_liste.c
+++ b/src/affichage_liste.c
@@ -528,7 +528,7 @@ GtkWidget *onglet_diverse_form_and_lists ( void )
_("Automatic financial year is set"),
_("according to transaction date"),
_("according to transaction value date"),
- &etat.affichage_exercice_automatique,
+ &conf.affichage_exercice_automatique,
NULL, NULL);
/* automatic amount separatior fields */
diff --git a/src/bet_finance_ui.c b/src/bet_finance_ui.c
index 1f98372..a8f805b 100644
--- a/src/bet_finance_ui.c
+++ b/src/bet_finance_ui.c
@@ -1772,7 +1772,7 @@ GtkWidget *bet_finance_create_simulator_toolbar ( GtkWidget *parent,
if ( simulator )
{
/* création du bouton calculer */
- button = gsb_automem_stock_button_new ( etat.display_toolbar,
+ button = gsb_automem_stock_button_new ( conf.display_toolbar,
GTK_STOCK_EXECUTE,
_("Calculate"),
NULL,
@@ -1787,7 +1787,7 @@ GtkWidget *bet_finance_create_simulator_toolbar ( GtkWidget *parent,
/* création du bouton afficher le tableau d'amortissement */
selection = gtk_tree_view_get_selection ( GTK_TREE_VIEW ( tree_view ) );
- button = gsb_automem_imagefile_button_new ( etat.display_toolbar,
+ button = gsb_automem_imagefile_button_new ( conf.display_toolbar,
_("Amortization"),
"ac_liability_16.png",
NULL,
@@ -1802,7 +1802,7 @@ GtkWidget *bet_finance_create_simulator_toolbar ( GtkWidget *parent,
else if ( amortization )
{
/* création du bouton afficher le simulateur de crédits */
- button = gsb_automem_imagefile_button_new ( etat.display_toolbar,
+ button = gsb_automem_imagefile_button_new ( conf.display_toolbar,
_("Credits"),
"ac_liability_16.png",
NULL,
@@ -1819,7 +1819,7 @@ GtkWidget *bet_finance_create_simulator_toolbar ( GtkWidget *parent,
gboolean amortization_initial_date = FALSE;
/* création du bouton afficher le simulateur de crédits */
- button = gsb_automem_imagefile_button_new ( etat.display_toolbar,
+ button = gsb_automem_imagefile_button_new ( conf.display_toolbar,
_("Amortization"),
"ac_liability_16.png",
NULL,
@@ -1837,7 +1837,7 @@ GtkWidget *bet_finance_create_simulator_toolbar ( GtkWidget *parent,
}
/* création du bouton print */
- button = gsb_automem_stock_button_new ( etat.display_toolbar,
+ button = gsb_automem_stock_button_new ( conf.display_toolbar,
GTK_STOCK_PRINT,
_("Print"),
NULL,
@@ -1850,7 +1850,7 @@ GtkWidget *bet_finance_create_simulator_toolbar ( GtkWidget *parent,
gtk_box_pack_start ( GTK_BOX ( hbox ), button, FALSE, FALSE, 5 );
/* Export button */
- button = gsb_automem_stock_button_new ( etat.display_toolbar,
+ button = gsb_automem_stock_button_new ( conf.display_toolbar,
GTK_STOCK_SAVE,
_("Export"),
NULL,
diff --git a/src/bet_graph.c b/src/bet_graph.c
index 2269f1a..9fb0c2e 100644
--- a/src/bet_graph.c
+++ b/src/bet_graph.c
@@ -1135,7 +1135,7 @@ void bet_graph_popup_choix_graph_activate ( GtkMenuItem *menuitem,
gtk_container_foreach ( GTK_CONTAINER ( self->box ), ( GtkCallback ) gtk_widget_destroy, NULL );
self->is_visible = TRUE;
- self->button = gsb_automem_imagefile_button_new ( etat.display_toolbar,
+ self->button = gsb_automem_imagefile_button_new ( conf.display_toolbar,
self->name,
self->filename,
NULL,
diff --git a/src/bet_hist.c b/src/bet_hist.c
index 401bc8d..4ec1b65 100644
--- a/src/bet_hist.c
+++ b/src/bet_hist.c
@@ -1926,7 +1926,7 @@ GtkWidget *bet_historical_create_toolbar ( GtkWidget *parent,
hbox = gtk_hbox_new ( FALSE, 0 );
/* print button */
- button = gsb_automem_stock_button_new ( etat.display_toolbar,
+ button = gsb_automem_stock_button_new ( conf.display_toolbar,
GTK_STOCK_PRINT,
_("Print"),
NULL,
@@ -1939,7 +1939,7 @@ GtkWidget *bet_historical_create_toolbar ( GtkWidget *parent,
gtk_box_pack_start ( GTK_BOX ( hbox ), button, FALSE, FALSE, 5 );
/* Export button */
- button = gsb_automem_stock_button_new ( etat.display_toolbar,
+ button = gsb_automem_stock_button_new ( conf.display_toolbar,
GTK_STOCK_SAVE,
_("Export"),
NULL,
@@ -1953,7 +1953,7 @@ GtkWidget *bet_historical_create_toolbar ( GtkWidget *parent,
#ifdef HAVE_GOFFICE
/* graph button */
- button = gsb_automem_imagefile_button_new ( etat.display_toolbar,
+ button = gsb_automem_imagefile_button_new ( conf.display_toolbar,
_("Data graph"),
"graph-sectors.png",
NULL,
diff --git a/src/bet_tab.c b/src/bet_tab.c
index c704924..b271fe0 100644
--- a/src/bet_tab.c
+++ b/src/bet_tab.c
@@ -2905,7 +2905,7 @@ GtkWidget *bet_array_list_create_toolbar ( GtkWidget *parent, GtkWidget *tree_vi
hbox = gtk_hbox_new ( FALSE, 0 );
/* print button */
- button = gsb_automem_stock_button_new ( etat.display_toolbar,
+ button = gsb_automem_stock_button_new ( conf.display_toolbar,
GTK_STOCK_PRINT,
_("Print"),
NULL,
@@ -2918,7 +2918,7 @@ GtkWidget *bet_array_list_create_toolbar ( GtkWidget *parent, GtkWidget *tree_vi
gtk_box_pack_start ( GTK_BOX ( hbox ), button, FALSE, FALSE, 5 );
/* Export button */
- button = gsb_automem_stock_button_new ( etat.display_toolbar,
+ button = gsb_automem_stock_button_new ( conf.display_toolbar,
GTK_STOCK_SAVE,
_("Export"),
NULL,
@@ -2932,7 +2932,7 @@ GtkWidget *bet_array_list_create_toolbar ( GtkWidget *parent, GtkWidget *tree_vi
#ifdef HAVE_GOFFICE
/* graph button */
- button = bet_graph_button_menu_new ( etat.display_toolbar,
+ button = bet_graph_button_menu_new ( conf.display_toolbar,
"forecast_graph",
G_CALLBACK ( bet_graph_line_graph_new ),
tree_view );
diff --git a/src/categories_onglet.c b/src/categories_onglet.c
index 777abde..392a285 100644
--- a/src/categories_onglet.c
+++ b/src/categories_onglet.c
@@ -523,7 +523,7 @@ GtkWidget *creation_barre_outils_categ ( void )
hbox = gtk_hbox_new ( FALSE, 0 );
/* New category button */
- button = gsb_automem_imagefile_button_new ( etat.display_toolbar,
+ button = gsb_automem_imagefile_button_new ( conf.display_toolbar,
_("New\ncategory"),
"new-categ.png",
G_CALLBACK ( appui_sur_ajout_category ),
@@ -534,7 +534,7 @@ GtkWidget *creation_barre_outils_categ ( void )
g_object_set_data ( G_OBJECT ( button ), "type", GINT_TO_POINTER (1) );
/* New sub category button */
- button = gsb_automem_imagefile_button_new ( etat.display_toolbar,
+ button = gsb_automem_imagefile_button_new ( conf.display_toolbar,
_("New sub\ncategory"),
"new-sub-categ.png",
G_CALLBACK (appui_sur_ajout_category),
@@ -547,7 +547,7 @@ GtkWidget *creation_barre_outils_categ ( void )
g_object_set_data ( G_OBJECT ( button ), "type", GINT_TO_POINTER (2) );
/* Import button */
- button = gsb_automem_stock_button_new ( etat.display_toolbar,
+ button = gsb_automem_stock_button_new ( conf.display_toolbar,
GTK_STOCK_OPEN,
_("Import"),
G_CALLBACK ( categories_importer_list ),
@@ -557,7 +557,7 @@ GtkWidget *creation_barre_outils_categ ( void )
gtk_box_pack_start ( GTK_BOX ( hbox ), button, FALSE, TRUE, 0 );
/* Export button */
- button = gsb_automem_stock_button_new ( etat.display_toolbar,
+ button = gsb_automem_stock_button_new ( conf.display_toolbar,
GTK_STOCK_SAVE,
_("Export"),
G_CALLBACK ( categories_exporter_list ),
@@ -567,7 +567,7 @@ GtkWidget *creation_barre_outils_categ ( void )
gtk_box_pack_start ( GTK_BOX ( hbox ), button, FALSE, TRUE, 0 );
/* Delete button */
- button = gsb_automem_stock_button_new ( etat.display_toolbar,
+ button = gsb_automem_stock_button_new ( conf.display_toolbar,
GTK_STOCK_DELETE, _("Delete"),
G_CALLBACK ( supprimer_division ), arbre_categ );
metatree_register_widget_as_linked ( GTK_TREE_MODEL ( categ_tree_model ), button, "selection" );
@@ -576,7 +576,7 @@ GtkWidget *creation_barre_outils_categ ( void )
gtk_box_pack_start ( GTK_BOX ( hbox ), button, FALSE, TRUE, 0 );
/* Properties button */
- button = gsb_automem_stock_button_new ( etat.display_toolbar,
+ button = gsb_automem_stock_button_new ( conf.display_toolbar,
GTK_STOCK_EDIT, _("Edit"),
G_CALLBACK ( edit_category ), arbre_categ );
metatree_register_widget_as_linked ( GTK_TREE_MODEL ( categ_tree_model ), button, "selection" );
@@ -585,7 +585,7 @@ GtkWidget *creation_barre_outils_categ ( void )
gtk_box_pack_start ( GTK_BOX ( hbox ), button, FALSE, TRUE, 0 );
/* View button */
- button = gsb_automem_stock_button_menu_new ( etat.display_toolbar,
+ button = gsb_automem_stock_button_menu_new ( conf.display_toolbar,
GTK_STOCK_SELECT_COLOR,
_("View"),
G_CALLBACK ( popup_category_view_mode_menu ),
diff --git a/src/etats_onglet.c b/src/etats_onglet.c
index 55e68e3..666fdfe 100644
--- a/src/etats_onglet.c
+++ b/src/etats_onglet.c
@@ -144,7 +144,7 @@ GtkWidget *gsb_gui_create_report_toolbar ( void )
hbox = gtk_hbox_new ( FALSE, 5 );
/* Add various icons */
- button = gsb_automem_imagefile_button_new ( etat.display_toolbar,
+ button = gsb_automem_imagefile_button_new ( conf.display_toolbar,
_("New report"),
"new-report.png",
G_CALLBACK ( ajout_etat ),
@@ -153,7 +153,7 @@ GtkWidget *gsb_gui_create_report_toolbar ( void )
_("Create a new report") );
gtk_box_pack_start ( GTK_BOX ( hbox ), button, FALSE, FALSE, 0 );
- button = gsb_automem_stock_button_new ( etat.display_toolbar,
+ button = gsb_automem_stock_button_new ( conf.display_toolbar,
GTK_STOCK_OPEN,
_("Import"),
G_CALLBACK (importer_etat),
@@ -162,7 +162,7 @@ GtkWidget *gsb_gui_create_report_toolbar ( void )
_("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 ( etat.display_toolbar,
+ bouton_exporter_etat = gsb_automem_stock_button_new ( conf.display_toolbar,
GTK_STOCK_SAVE,
_("Export"),
G_CALLBACK (exporter_etat),
@@ -172,7 +172,7 @@ GtkWidget *gsb_gui_create_report_toolbar ( void )
gtk_box_pack_start ( GTK_BOX ( hbox ), bouton_exporter_etat, FALSE, FALSE, 0 );
/* print button */
- bouton_imprimer_etat = gsb_automem_stock_button_new ( etat.display_toolbar,
+ bouton_imprimer_etat = gsb_automem_stock_button_new ( conf.display_toolbar,
GTK_STOCK_PRINT,
_("Print"),
G_CALLBACK (print_report),
@@ -182,7 +182,7 @@ GtkWidget *gsb_gui_create_report_toolbar ( void )
gtk_box_pack_start ( GTK_BOX ( hbox ), bouton_imprimer_etat, FALSE, FALSE, 0 );
- bouton_effacer_etat = gsb_automem_stock_button_new ( etat.display_toolbar,
+ bouton_effacer_etat = gsb_automem_stock_button_new ( conf.display_toolbar,
GTK_STOCK_DELETE,
_("Delete"),
G_CALLBACK ( efface_etat ),
@@ -191,7 +191,7 @@ GtkWidget *gsb_gui_create_report_toolbar ( void )
_("Delete selected report") );
gtk_box_pack_start ( GTK_BOX ( hbox ), bouton_effacer_etat, FALSE, FALSE, 0 ); e_menu ), " ); =+ r9Ú
=+ Ýcÿ Ýcÿ uºÙ
=+ ÚÚ
=+ Õú
=+ Èö=+ Ýcÿ à=+ pÝcÿ @~Ýcÿ kÐÙ
=+ 6 è è! è! Ýcÿ Ýcÿ xö=+ pÝcÿ ²Ù
=+ ÐÙ
=+ Ýcÿ `²Ù
=+ OÝcÿ ÀZ=+ uºÙ
=+ pZ=+ ØtZ=+ ¨yZ=+ ÚÚ
=+ xö=+ pÝcÿ @Ýcÿ kÐÙ
=+ à! à! Ýcÿ Ýcÿ HNÖ=+ PÝcÿ ²Ù
=+ ÐÙ
=+ Ýcÿ `²Ù
=+ OÝcÿ @Ýcÿ 8Ýcÿ 8Ûú
=+ p Ýcÿ uºÙ
=+ ÚÚ
=+ PÝcÿ Ýcÿ kÐÙ
=+ G H I J K M N O P Ýcÿ Ýcÿ H=+ ðÝcÿ ²Ù
=+ ÐÙ
=+ Ýcÿ 0Z=+ uºÙ
=+ ö=+ 9=+ pZ=+ ØtZ=+ ¨yZ=+ ÚÚ
=+ H=+ ðÝcÿ 0Ýcÿ kÐÙ
=+ 8=+ ðÝcÿ `Ýcÿ kÐÙ
=+ (=+ ðÝcÿ Ýcÿ kÐÙ
=+ =+ ðÝcÿ ÀÝcÿ kÐÙ
=+ ¨~Z=+ uºÙ
=+ ¨yZ=+ @|Ýcÿ =+ e¹Ù
=+ ØtZ=+ `Ýcÿ y=+ e¹Ù
=+ pZ=+ Ýcÿ Z=+ e¹Ù
=+ Ø4=+ ö=+ 9=+ pZ=+ Øö=+ ØtZ=+ ¨yZ=+ ÚÚ
=+ 8Ûú
=+ ýU=+ Ýcÿ pË=+ @Ýcÿ Ýcÿ kÐÙ
=+ 5 6 7 8 : < = > ? @ B D Ýcÿ Ýcÿ àýR=+ Ýcÿ uºÙ
=+ Õú
=+ ÀÝcÿ ýU=+ e¹Ù
=+ Õú
=+ Õ_ at fÆS Qöl±íÁ"=+ Ýcÿ àýR=+ P
Ýcÿ Ýcÿ kÐÙ
=+ u]ÞÓ 4Q ÷U^Qʧ ¶uª¹ñìò*ÄvÝcÿ Ýcÿ HN=+ [=+ ÀÝcÿ ¦ ½=+ ¦ ½=+ æX=+ OÝcÿ Ýcÿ 8Ýcÿ Ýcÿ ö=+ uºÙ
=+ Øö=+ Ýcÿ ¢ ½=+ ÐÝcÿ `Ýcÿ ÿÿÿÿÿÿÿÿ¢ ½=+ Ýcÿ );
- bouton_personnaliser_etat = gsb_automem_stock_button_new ( etat.display_toolbar,
+ bouton_personnaliser_etat = gsb_automem_stock_button_new ( conf.display_toolbar,
GTK_STOCK_PROPERTIES,
_("Properties"),
G_CALLBACK (personnalisation_etat),
@@ -200,7 +200,7 @@ GtkWidget *gsb_gui_create_report_toolbar ( void )
_("Edit selected report") );
gtk_box_pack_start ( GTK_BOX ( hbox ), bouton_personnaliser_etat, FALSE, FALSE, 0 );
- bouton_dupliquer_etat = gsb_automem_stock_button_new ( etat.display_toolbar,
+ bouton_dupliquer_etat = gsb_automem_stock_button_new ( conf.display_toolbar,
GTK_STOCK_COPY,
_("Clone"),
G_CALLBACK (dupliquer_etat),
diff --git a/src/fenetre_principale.c b/src/fenetre_principale.c
index 1dcc7f3..517a8f6 100644
--- a/src/fenetre_principale.c
+++ b/src/fenetre_principale.c
@@ -436,7 +436,7 @@ void gsb_gui_headings_update_suffix ( gchar * suffix )
*/
gboolean gsb_gui_update_show_headings ( void )
{
- if ( etat.show_headings_bar )
+ if ( conf.show_headings_bar )
{
gtk_widget_show_all ( headings_eb );
}
diff --git a/src/gsb_file_config.c b/src/gsb_file_config.c
index 55d7b7d..2317af7 100644
--- a/src/gsb_file_config.c
+++ b/src/gsb_file_config.c
@@ -380,7 +380,7 @@ gboolean gsb_file_config_load_config ( void )
err = NULL;
/* get shown section */
- etat.formulaire_toujours_affiche = g_key_file_get_integer ( config,
+ conf.formulaire_toujours_affiche = g_key_file_get_integer ( config,
"Display",
"Show transaction form",
NULL );
@@ -405,12 +405,7 @@ gboolean gsb_file_config_load_config ( void )
"Transactions_list_secondary_sorting",
NULL );
- etat.largeur_auto_colonnes = g_key_file_get_integer ( config,
- "Display",
- "Columns width auto",
- NULL );
-
- etat.affichage_exercice_automatique = g_key_file_get_integer ( config,
+ conf.affichage_exercice_automatique = g_key_file_get_integer ( config,
"Display",
"Show automatic financial year",
NULL );
@@ -439,7 +434,7 @@ gboolean gsb_file_config_load_config ( void )
"Automatic_erase_credit_debit",
NULL );
- etat.display_toolbar = g_key_file_get_integer ( config,
+ conf.display_toolbar = g_key_file_get_integer ( config,
"Display",
"Display toolbar",
NULL );
@@ -449,12 +444,12 @@ gboolean gsb_file_config_load_config ( void )
"Active_scrolling_left_pane",
NULL );
- etat.show_headings_bar = g_key_file_get_integer ( config,
+ conf.show_headings_bar = g_key_file_get_integer ( config,
"Display",
"Show headings bar",
NULL );
- etat.show_closed_accounts = g_key_file_get_integer ( config,
+ conf.show_closed_accounts = g_key_file_get_integer ( config,
"Display",
"Show closed accounts",
NULL );
@@ -485,12 +480,12 @@ gboolean gsb_file_config_load_config ( void )
g_free ( name );
}
- etat.last_tip = g_key_file_get_integer ( config,
+ conf.last_tip = g_key_file_get_integer ( config,
"Messages",
"Last tip",
NULL );
- etat.show_tip = g_key_file_get_integer ( config,
+ conf.show_tip = g_key_file_get_integer ( config,
"Messages",
"Show tip",
NULL );
@@ -744,7 +739,7 @@ gboolean gsb_file_config_save_config ( void )
g_key_file_set_integer ( config,
"Display",
"Show transaction form",
- etat.formulaire_toujours_affiche );
+ conf.formulaire_toujours_affiche );
g_key_file_set_integer ( config,
"Display",
@@ -769,7 +764,7 @@ gboolean gsb_file_config_save_config ( void )
g_key_file_set_integer ( config,
"Display",
"Show automatic financial year",
- etat.affichage_exercice_automatique );
+ conf.affichage_exercice_automatique );
g_key_file_set_integer ( config,
"Display",
@@ -794,7 +789,7 @@ gboolean gsb_file_config_save_config ( void )
g_key_file_set_integer ( config,
"Display",
"Display toolbar",
- etat.display_toolbar );
+ conf.display_toolbar );
g_key_file_set_integer ( config,
"Display",
@@ -804,12 +799,12 @@ gboolean gsb_file_config_save_config ( void )
g_key_file_set_integer ( config,
"Display",
"Show headings bar",
- etat.show_headings_bar );
+ conf.show_headings_bar );
g_key_file_set_integer ( config,
"Display",
"Show closed accounts",
- etat.show_closed_accounts );
+ conf.show_closed_accounts );
g_key_file_set_integer ( config,
"Display",
@@ -835,12 +830,12 @@ gboolean gsb_file_config_save_config ( void )
g_key_file_set_integer ( config,
"Messages",
"Last tip",
- etat.last_tip );
+ conf.last_tip );
g_key_file_set_integer ( config,
"Messages",
"Show tip",
- etat.show_tip );
+ conf.show_tip );
/* save into a file */
file_content = g_key_file_to_data ( config, &length, NULL );
@@ -1149,49 +1144,42 @@ void gsb_file_config_get_xml_text_element ( GMarkupParseContext *context,
if ( !strcmp ( element_name,
"Affichage_formulaire" ))
{
- etat.formulaire_toujours_affiche = utils_str_atoi (text);
- return;
- }
-
- if ( !strcmp ( element_name,
- "Largeur_auto_colonnes" ))
- {
- etat.largeur_auto_colonnes = utils_str_atoi (text);
+ conf.formulaire_toujours_affiche = utils_str_atoi (text);
return;
}
if ( !strcmp ( element_name,
"Affichage_exercice_automatique" ))
{
- etat.affichage_exercice_automatique = utils_str_atoi (text);
+ conf.affichage_exercice_automatique = utils_str_atoi (text);
return;
}
if ( !strcmp ( element_name,
"display_toolbar" ))
{
- etat.display_toolbar = utils_str_atoi (text);
+ conf.display_toolbar = utils_str_atoi (text);
return;
}
if ( !strcmp ( element_name,
"show_closed_accounts" ))
{
- etat.show_closed_accounts = utils_str_atoi (text);
+ conf.show_closed_accounts = utils_str_atoi (text);
return;
}
if ( !strcmp ( element_name,
"show_tip" ))
{
- etat.show_tip = utils_str_atoi (text);
+ conf.show_tip = utils_str_atoi (text);
return;
}
if ( !strcmp ( element_name,
"last_tip" ))
{
- etat.last_tip = utils_str_atoi (text);
+ conf.last_tip = utils_str_atoi (text);
return;
}
@@ -1228,22 +1216,22 @@ void gsb_file_config_clean_config ( void )
nb_days_before_scheduled = 0; /* nb de jours avant l'échéance pour prévenir */
execute_scheduled_of_month = FALSE;
conf.balances_with_scheduled = TRUE;
- etat.formulaire_toujours_affiche = 0; /* le formulaire ne s'affiche que lors de l'edition d'1 opé */
- etat.affichage_exercice_automatique = 0; /* l'exercice est choisi en fonction de la date */
+ conf.formulaire_toujours_affiche = 0; /* le formulaire ne s'affiche que lors de l'edition d'1 opé */
+ conf.affichage_exercice_automatique = 0; /* l'exercice est choisi en fonction de la date */
conf.automatic_completion_payee = 1; /* by default automatic completion */
conf.limit_completion_to_current_account = 0; /* By default, do full search */
conf.automatic_recover_splits = 1;
conf.automatic_erase_credit_debit = 0;
conf.display_grisbi_title = GSB_ACCOUNTS_TITLE; /* show Accounts file title par défaut */
- etat.display_toolbar = GSB_BUTTON_BOTH; /* How to display toolbar icons. */
+ conf.display_toolbar = GSB_BUTTON_BOTH; /* How to display toolbar icons. */
conf.active_scrolling_left_pane = FALSE; /* Active_scrolling_left_pane or not. */
- etat.show_headings_bar = TRUE; /* Show toolbar or not. */
+ conf.show_headings_bar = TRUE; /* Show toolbar or not. */
conf.show_transaction_selected_in_form = 1; /* show selected transaction in form */
conf.show_transaction_gives_balance = 1; /* show transaction that gives the balance of the day */
conf.transactions_list_primary_sorting = 1; /* Primary sorting option for the transactions */
conf.transactions_list_secondary_sorting = 0; /* Secondary sorting option for the transactions */
- etat.show_closed_accounts = FALSE;
+ conf.show_closed_accounts = FALSE;
if ( conf.font_string )
{
@@ -1274,11 +1262,8 @@ void gsb_file_config_clean_config ( void )
conf.check_for_archival = TRUE;
conf.max_non_archived_transactions_for_check = 3000;
- etat.largeur_auto_colonnes = 0;
- etat.retient_affichage_par_compte = 0;
-
- etat.last_tip = -1;
- etat.show_tip = FALSE;
+ conf.last_tip = -1;
+ conf.show_tip = FALSE;
/* mise en conformité avec les recommandations FreeDesktop. */
if ( conf.browser_command )
diff --git a/src/gsb_file_load.c b/src/gsb_file_load.c
index eb3b306..7542e6a 100644
--- a/src/gsb_file_load.c
+++ b/src/gsb_file_load.c
@@ -1012,6 +1012,9 @@ void gsb_file_load_general_part ( const gchar **attribute_names,
case 'R':
if ( !strcmp ( attribute_names[i], "Reconcile_end_date" ) )
etat.reconcile_end_date = utils_str_atoi ( attribute_values[i] );
+
+ else if ( !strcmp ( attribute_names[i], "Remind_display_per_account" ) )
+ etat.retient_affichage_par_compte = utils_str_atoi ( attribute_values[i] );
else
unknown = 1;
break;
diff --git a/src/gsb_form.c b/src/gsb_form.c
index 51ddbdd..970138e 100644
--- a/src/gsb_form.c
+++ b/src/gsb_form.c
@@ -174,7 +174,7 @@ GtkWidget *gsb_form_new ( void )
/* Create the expander */
form_expander = gtk_expander_new ( "" );
gtk_expander_set_expanded ( GTK_EXPANDER ( form_expander ),
- etat.formulaire_toujours_affiche );
+ conf.formulaire_toujours_affiche );
g_signal_connect_after( G_OBJECT(form_expander),
"activate",
G_CALLBACK (gsb_form_activate_expander),
@@ -1005,7 +1005,7 @@ gboolean gsb_form_activate_expander ( GtkWidget *expander,
GtkWidget *date_entry;
gsb_form_show ( TRUE );
- etat.formulaire_toujours_affiche = TRUE;
+ conf.formulaire_toujours_affiche = TRUE;
gsb_form_widget_set_focus ( TRANSACTION_FORM_DATE );
date_entry = gsb_form_widget_get_widget ( TRANSACTION_FORM_DATE );
gsb_form_widget_set_empty ( date_entry, TRUE );
@@ -1018,7 +1018,7 @@ gboolean gsb_form_activate_expander ( GtkWidget *expander,
else
{
gsb_form_show ( FALSE );
- etat.formulaire_toujours_affiche = FALSE;
+ conf.formulaire_toujours_affiche = FALSE;
}
gsb_menu_update_view_menu ( gsb_gui_navigation_get_current_account () );
@@ -1085,7 +1085,7 @@ gboolean gsb_form_is_visible ( void )
/**
- * hide the form, depending to the variable etat.formulaire_toujours_affiche
+ * hide the form, depending to the variable conf.formulaire_toujours_affiche
* if the user wants the form always showed, that function does nothing
* else, destroy the form and hide the expander
*
@@ -3128,7 +3128,7 @@ void gsb_form_take_datas_from_form ( gint transaction_number,
break;
case TRANSACTION_FORM_EXERCICE:
- if (etat.affichage_exercice_automatique && value_date)
+ if (conf.affichage_exercice_automatique && value_date)
{
if ( gsb_form_widget_check_empty ( gsb_form_widget_get_widget (
TRANSACTION_FORM_VALUE_DATE) ) )
@@ -3523,7 +3523,7 @@ gboolean gsb_form_escape_form ( void )
/* in all case clean the scheduler part of the form */
gsb_form_scheduler_clean ();
- if ( etat.formulaire_toujours_affiche )
+ if ( conf.formulaire_toujours_affiche )
{
gsb_form_clean ( gsb_form_get_account_number ( ) );
}
diff --git a/src/gsb_scheduler_list.c b/src/gsb_scheduler_list.c
index 3a58e3f..def9096 100644
--- a/src/gsb_scheduler_list.c
+++ b/src/gsb_scheduler_list.c
@@ -260,7 +260,7 @@ GtkWidget *creation_barre_outils_echeancier ( void )
hbox = gtk_hbox_new ( FALSE, 0 );
/* Common actions */
- button = gsb_automem_imagefile_button_new ( etat.display_toolbar,
+ button = gsb_automem_imagefile_button_new ( conf.display_toolbar,
_("_New scheduled"),
"new-scheduled.png",
G_CALLBACK (gsb_scheduler_list_edit_transaction),
@@ -269,7 +269,7 @@ GtkWidget *creation_barre_outils_echeancier ( void )
_("Prepare form to create a new scheduled transaction"));
gtk_box_pack_start ( GTK_BOX ( hbox ), button, FALSE, FALSE, 0 );
- scheduler_button_delete = gsb_automem_stock_button_new ( etat.display_toolbar,
+ scheduler_button_delete = gsb_automem_stock_button_new ( conf.display_toolbar,
GTK_STOCK_DELETE,
_("Delete"),
G_CALLBACK ( gsb_scheduler_list_delete_scheduled_transaction_by_menu ),
@@ -279,7 +279,7 @@ GtkWidget *creation_barre_outils_echeancier ( void )
_("Delete selected scheduled transaction"));
gtk_box_pack_start ( GTK_BOX ( hbox ), scheduler_button_delete, FALSE, FALSE, 0 );
- scheduler_button_edit = gsb_automem_stock_button_new ( etat.display_toolbar,
+ scheduler_button_edit = gsb_automem_stock_button_new ( conf.display_toolbar,
GTK_STOCK_EDIT,
_("Edit"),
G_CALLBACK ( gsb_scheduler_list_edit_transaction ),
@@ -290,7 +290,7 @@ GtkWidget *creation_barre_outils_echeancier ( void )
gtk_box_pack_start ( GTK_BOX ( hbox ), scheduler_button_edit, FALSE, FALSE, 0 );
/* Display/hide comments */
- scheduler_display_hide_comments = gsb_automem_imagefile_button_new ( etat.display_toolbar,
+ scheduler_display_hide_comments = gsb_automem_imagefile_button_new ( conf.display_toolbar,
_("Comments"),
"comments.png",
G_CALLBACK ( gsb_scheduler_list_show_notes ),
@@ -301,7 +301,7 @@ GtkWidget *creation_barre_outils_echeancier ( void )
FALSE, FALSE, 0 );
/* Execute transaction */
- scheduler_button_execute = gsb_automem_stock_button_new ( etat.display_toolbar,
+ scheduler_button_execute = gsb_automem_stock_button_new ( conf.display_toolbar,
GTK_STOCK_EXECUTE,
_("Execute"),
G_CALLBACK ( gsb_scheduler_list_execute_transaction ),
@@ -311,7 +311,7 @@ GtkWidget *creation_barre_outils_echeancier ( void )
_("Execute current scheduled transaction"));
gtk_box_pack_start ( GTK_BOX ( hbox ), scheduler_button_execute, FALSE, FALSE, 0 );
- button = gsb_automem_stock_button_menu_new ( etat.display_toolbar,
+ button = gsb_automem_stock_button_menu_new ( conf.display_toolbar,
GTK_STOCK_SELECT_COLOR, _("View"),
G_CALLBACK (popup_scheduled_view_mode_menu),
NULL );
diff --git a/src/gsb_transactions_list.c b/src/gsb_transactions_list.c
index db17d29..a9b3b93 100644
--- a/src/gsb_transactions_list.c
+++ b/src/gsb_transactions_list.c
@@ -339,7 +339,7 @@ GtkWidget *creation_barre_outils_transaction ( void )
hbox = gtk_hbox_new ( FALSE, 0 );
/* Add various icons */
- button = gsb_automem_imagefile_button_new ( etat.display_toolbar,
+ button = gsb_automem_imagefile_button_new ( conf.display_toolbar,
_("New transaction"),
"new-transaction.png",
G_CALLBACK ( new_transaction ),
@@ -348,7 +348,7 @@ GtkWidget *creation_barre_outils_transaction ( void )
_("Blank the form to create a new transaction"));
gtk_box_pack_start ( GTK_BOX ( hbox ), button, FALSE, FALSE, 0 );
- button = gsb_automem_stock_button_new ( etat.display_toolbar,
+ button = gsb_automem_stock_button_new ( conf.display_toolbar,
GTK_STOCK_DELETE,
_("Delete"),
G_CALLBACK ( remove_transaction ),
@@ -357,7 +357,7 @@ GtkWidget *creation_barre_outils_transaction ( void )
_("Delete selected transaction"));
gtk_box_pack_start ( GTK_BOX ( hbox ), button, FALSE, FALSE, 0 );
- button = gsb_automem_stock_button_new ( etat.display_toolbar,
+ button = gsb_automem_stock_button_new ( conf.display_toolbar,
GTK_STOCK_EDIT,
_("Edit"),
G_CALLBACK ( gsb_transactions_list_edit_current_transaction ),
@@ -366,7 +366,7 @@ GtkWidget *creation_barre_outils_transaction ( void )
_("Edit current transaction"));
gtk_box_pack_start ( GTK_BOX ( hbox ), button, FALSE, FALSE, 0 );
- button = gsb_automem_imagefile_button_new ( etat.display_toolbar,
+ button = gsb_automem_imagefile_button_new ( conf.display_toolbar,
_("Reconcile"),
"reconciliation.png",
G_CALLBACK (gsb_reconcile_run_reconciliation),
@@ -376,7 +376,7 @@ GtkWidget *creation_barre_outils_transaction ( void )
gtk_box_pack_start ( GTK_BOX ( hbox ), button, FALSE, FALSE, 0 );
/* This stuff needs GTK+ 2.10 to work. */
- button = gsb_automem_stock_button_new ( etat.display_toolbar,
+ button = gsb_automem_stock_button_new ( conf.display_toolbar,
GTK_STOCK_PRINT,
_("Print"),
G_CALLBACK (print_transactions_list),
@@ -385,7 +385,7 @@ GtkWidget *creation_barre_outils_transaction ( void )
_("Print the transactions list"));
gtk_box_pack_start ( GTK_BOX ( hbox ), button, FALSE, FALSE, 0 );
- menu = gsb_automem_stock_button_menu_new ( etat.display_toolbar,
+ menu = gsb_automem_stock_button_menu_new ( conf.display_toolbar,
GTK_STOCK_SELECT_COLOR, _("View"),
G_CALLBACK (popup_transaction_view_mode_menu),
NULL );
@@ -393,7 +393,7 @@ GtkWidget *creation_barre_outils_transaction ( void )
_("Change display mode of the list"));
gtk_box_pack_start ( GTK_BOX(hbox), menu, FALSE, FALSE, 0 );
- menu_import_rules = gsb_automem_stock_button_menu_new ( etat.display_toolbar,
+ menu_import_rules = gsb_automem_stock_button_menu_new ( conf.display_toolbar,
GTK_STOCK_EXECUTE, _("Import rules"),
G_CALLBACK (popup_transaction_rules_menu),
NULL );
@@ -404,7 +404,7 @@ GtkWidget *creation_barre_outils_transaction ( void )
alignement = gtk_alignment_new ( 1, 0, 0, 0 );
gtk_box_pack_start ( GTK_BOX ( hbox ), alignement, TRUE, TRUE, 0 );
- button = gsb_automem_imagefile_button_new ( etat.display_toolbar,
+ button = gsb_automem_imagefile_button_new ( conf.display_toolbar,
_("Recreates archive"),
"archive_24.png",
G_CALLBACK ( gsb_transactions_list_hide_transactions_in_archive_line ),
@@ -513,41 +513,94 @@ gboolean popup_transaction_rules_menu ( GtkWidget * button,
/**
+ * Fonction appelée lorsqu'on change le nombre de lignes des opérations
*
+ * \param menu_item concerné
+ * \param pointeur sur l'index du bouton
*
+ * \return
+ */
+static void gsb_transaction_list_radio_button_activate ( GtkMenuItem *menu_item,
+ gpointer data )
+{
+ if ( gtk_check_menu_item_get_active ( GTK_CHECK_MENU_ITEM ( menu_item ) ) )
+ {
+ gint demande = 0;
+
+ if ( data )
+ demande = GPOINTER_TO_INT ( data );
+ change_aspect_liste ( demande );
+ }
+}
+
+
+/**
+ * Création du bouton de sélection de l'affichage de la liste des opérations.
+ *
+ * \param bouton sur lequel on attache le menu
+ * \param pointeur NULL
*
+ * \return FALSE
*/
-static gboolean popup_transaction_view_mode_menu ( GtkWidget * button,
+static gboolean popup_transaction_view_mode_menu ( GtkWidget *button,
gpointer null )
{
- GtkWidget *menu, *menu_item;
+ GSList *group = NULL;
+ GtkWidget *menu;
+ GtkWidget *menu_item, *menu_item_1, *menu_item_2, *menu_item_3;
gint current_account;
+ gint nb_rows_by_transaction;
+
+ current_account = gsb_gui_navigation_get_current_account ( );
+ nb_rows_by_transaction = gsb_data_account_get_nb_rows ( current_account );
menu = gtk_menu_new ();
- menu_item = gtk_menu_item_new_with_label ( _("Simple view") );
+ menu_item_1 = gtk_radio_menu_item_new_with_label ( group, _("Simple view") );
+ group = gtk_radio_menu_item_get_group ( GTK_RADIO_MENU_ITEM ( menu_item_1 ) );
+ if ( nb_rows_by_transaction == 1 )
+ gtk_check_menu_item_set_active ( GTK_CHECK_MENU_ITEM ( menu_item_1 ), TRUE );
+ gtk_menu_shell_append ( GTK_MENU_SHELL ( menu ), menu_item_1 );
+
+ menu_item_2 = gtk_radio_menu_item_new_with_label ( group, _("Two lines view") );
+ group = gtk_radio_menu_item_get_group ( GTK_RADIO_MENU_ITEM ( menu_item_2 ) );
+ if ( nb_rows_by_transaction == 2 )
+ gtk_check_menu_item_set_active ( GTK_CHECK_MENU_ITEM ( menu_item_2 ), TRUE );
+ gtk_menu_shell_append ( GTK_MENU_SHELL ( menu ), menu_item_2 );
+
+ menu_item_3 = gtk_radio_menu_item_new_with_label ( group, _("Three lines view") );
+ group = gtk_radio_menu_item_get_group ( GTK_RADIO_MENU_ITEM ( menu_item_3 ) );
+ if ( nb_rows_by_transaction == 3 )
+ gtk_check_menu_item_set_active ( GTK_CHECK_MENU_ITEM ( menu_item_3 ), TRUE );
+ gtk_menu_shell_append ( GTK_MENU_SHELL ( menu ), menu_item_3 );
+
+ menu_item = gtk_radio_menu_item_new_with_label ( group, _("Complete view") );
+ group = gtk_radio_menu_item_get_group ( GTK_RADIO_MENU_ITEM ( menu_item ) );
+ if ( nb_rows_by_transaction == 4 )
+ gtk_check_menu_item_set_active ( GTK_CHECK_MENU_ITEM ( menu_item ), TRUE );
gtk_menu_shell_append ( GTK_MENU_SHELL ( menu ), menu_item );
- g_signal_connect_swapped ( G_OBJECT(menu_item), "activate",
- G_CALLBACK (change_aspect_liste), GINT_TO_POINTER (1) );
- menu_item = gtk_menu_item_new_with_label ( _("Two lines view") );
- gtk_menu_shell_append ( GTK_MENU_SHELL ( menu ), menu_item );
- g_signal_connect_swapped ( G_OBJECT(menu_item), "activate",
- G_CALLBACK (change_aspect_liste), GINT_TO_POINTER (2) );
+ g_signal_connect ( G_OBJECT ( menu_item ),
+ "activate",
+ G_CALLBACK ( gsb_transaction_list_radio_button_activate ),
+ GINT_TO_POINTER (4) );
- menu_item = gtk_menu_item_new_with_label ( _("Three lines view") );
- gtk_menu_shell_append ( GTK_MENU_SHELL ( menu ), menu_item );
- g_signal_connect_swapped ( G_OBJECT(menu_item), "activate",
- G_CALLBACK (change_aspect_liste), GINT_TO_POINTER (3) );
+ g_signal_connect ( G_OBJECT ( menu_item_1 ),
+ "activate",
+ G_CALLBACK ( gsb_transaction_list_radio_button_activate ),
+ GINT_TO_POINTER ( 1 ) );
- menu_item = gtk_menu_item_new_with_label ( _("Complete view") );
- gtk_menu_shell_append ( GTK_MENU_SHELL ( menu ), menu_item );
- g_signal_connect_swapped ( G_OBJECT(menu_item), "activate",
- G_CALLBACK (change_aspect_liste), GINT_TO_POINTER (4) );
+ g_signal_connect ( G_OBJECT ( menu_item_2 ),
+ "activate",
+ G_CALLBACK ( gsb_transaction_list_radio_button_activate ),
+ GINT_TO_POINTER (2) );
- gtk_menu_shell_append ( GTK_MENU_SHELL ( menu ), gtk_separator_menu_item_new ( ) );
+ g_signal_connect ( G_OBJECT ( menu_item_3 ),
+ "activate",
+ G_CALLBACK ( gsb_transaction_list_radio_button_activate ),
+ GINT_TO_POINTER (3) );
- current_account = gsb_gui_navigation_get_current_account ( );
+ gtk_menu_shell_append ( GTK_MENU_SHELL ( menu ), gtk_separator_menu_item_new ( ) );
menu_item = gtk_check_menu_item_new_with_label ( _("Show reconciled transactions") );
gtk_check_menu_item_set_active ( GTK_CHECK_MENU_ITEM (menu_item),
@@ -559,7 +612,7 @@ static gboolean popup_transaction_view_mode_menu ( GtkWidget * button,
gtk_menu_shell_append ( GTK_MENU_SHELL ( menu ), menu_item );
g_signal_connect ( G_OBJECT ( menu_item ),
- "activate",
+ "activate",
G_CALLBACK ( gsb_gui_toggle_show_reconciled ),
NULL );
@@ -573,17 +626,18 @@ static gboolean popup_transaction_view_mode_menu ( GtkWidget * button,
gtk_menu_shell_append ( GTK_MENU_SHELL ( menu ), menu_item );
g_signal_connect ( G_OBJECT ( menu_item ),
- "activate",
+ "activate",
G_CALLBACK ( gsb_gui_toggle_show_archived ),
NULL );
- gtk_menu_set_active ( GTK_MENU(menu),
+ gtk_menu_set_active ( GTK_MENU(menu),
gsb_data_account_get_nb_rows ( gsb_gui_navigation_get_current_account () ) );
gtk_widget_show_all ( menu );
- gtk_menu_popup ( GTK_MENU( menu ), NULL, button, set_popup_position, button, 1,
- gtk_get_current_event_time ( ) );
+ gtk_menu_popup ( GTK_MENU( menu ), NULL, button, set_popup_position, button, 1,
+ gtk_get_current_event_time ( ) );
+ /* return */
return FALSE;
}
@@ -4281,32 +4335,40 @@ gboolean change_aspect_liste ( gint demande )
/* 1, 2, 3 et 4 sont les nb de lignes qu'on demande à afficher */
case 1 :
+ gsb_menu_set_block_menu_cb ( TRUE );
gtk_toggle_action_set_active ( GTK_TOGGLE_ACTION (
gtk_ui_manager_get_action ( ui_manager,
"/menubar/ViewMenu/ShowOneLine" ) ),
TRUE );
gsb_transactions_list_set_visible_rows_number ( demande );
+ gsb_menu_set_block_menu_cb ( FALSE );
break;
case 2 :
+ gsb_menu_set_block_menu_cb ( TRUE );
gtk_toggle_action_set_active ( GTK_TOGGLE_ACTION (
gtk_ui_manager_get_action ( ui_manager,
"/menubar/ViewMenu/ShowTwoLines" ) ),
TRUE );
gsb_transactions_list_set_visible_rows_number ( demande );
+ gsb_menu_set_block_menu_cb ( FALSE );
break;
case 3 :
+ gsb_menu_set_block_menu_cb ( TRUE );
gtk_toggle_action_set_active ( GTK_TOGGLE_ACTION (
gtk_ui_manager_get_action ( ui_manager,
"/menubar/ViewMenu/ShowThreeLines" ) ),
TRUE );
gsb_transactions_list_set_visible_rows_number ( demande );
+ gsb_menu_set_block_menu_cb ( FALSE );
break;
case 4 :
+ gsb_menu_set_block_menu_cb ( TRUE );
gtk_toggle_action_set_active ( GTK_TOGGLE_ACTION (
gtk_ui_manager_get_action ( ui_manager,
"/menubar/ViewMenu/ShowFourLines" ) ),
TRUE );
gsb_transactions_list_set_visible_rows_number ( demande );
+ gsb_menu_set_block_menu_cb ( FALSE );
break;
case 5 :
@@ -4605,6 +4667,13 @@ void gsb_transactions_list_process_orphan_list ( GSList *orphan_list )
}
+/**
+ *
+ *
+ * \param
+ *
+ * \return
+ */
/* Local Variables: */
/* c-basic-offset: 4 */
/* End: */
diff --git a/src/imputation_budgetaire.c b/src/imputation_budgetaire.c
index d5747ae..6542d7d 100644
--- a/src/imputation_budgetaire.c
+++ b/src/imputation_budgetaire.c
@@ -559,7 +559,7 @@ GtkWidget *creation_barre_outils_ib ( void )
hbox = gtk_hbox_new ( FALSE, 0 );
/* New budgetary line button */
- button = gsb_automem_imagefile_button_new ( etat.display_toolbar,
+ button = gsb_automem_imagefile_button_new ( conf.display_toolbar,
_("New\nbudgetary line"), "new-ib.png",
G_CALLBACK ( appui_sur_ajout_imputation ),
budgetary_line_tree_model );
@@ -569,7 +569,7 @@ GtkWidget *creation_barre_outils_ib ( void )
g_object_set_data ( G_OBJECT ( button ), "type", GINT_TO_POINTER (1) );
/* New sub budgetary line button */
- button = gsb_automem_imagefile_button_new ( etat.display_toolbar,
+ button = gsb_automem_imagefile_button_new ( conf.display_toolbar,
_("New sub\nbudgetary line"),
"new-sub-ib.png",
G_CALLBACK ( appui_sur_ajout_imputation ),
@@ -582,7 +582,7 @@ GtkWidget *creation_barre_outils_ib ( void )
g_object_set_data ( G_OBJECT ( button ), "type", GINT_TO_POINTER (2) );
/* Import button */
- button = gsb_automem_stock_button_new ( etat.display_toolbar,
+ button = gsb_automem_stock_button_new ( conf.display_toolbar,
GTK_STOCK_OPEN,
_("Import"),
G_CALLBACK ( budgetary_lines_importer_list ),
@@ -594,7 +594,7 @@ GtkWidget *creation_barre_outils_ib ( void )
gtk_box_pack_start ( GTK_BOX ( hbox ), button, FALSE, TRUE, 0 );
/* Export button */
- button = gsb_automem_stock_button_new ( etat.display_toolbar,
+ button = gsb_automem_stock_button_new ( conf.display_toolbar,
GTK_STOCK_SAVE,
_("Export"),
G_CALLBACK ( budgetary_lines_exporter_list ),
@@ -605,7 +605,7 @@ GtkWidget *creation_barre_outils_ib ( void )
gtk_box_pack_start ( GTK_BOX ( hbox ), button, FALSE, TRUE, 0 );
/* Delete button */
- button = gsb_automem_stock_button_new ( etat.display_toolbar,
+ button = gsb_automem_stock_button_new ( conf.display_toolbar,
GTK_STOCK_DELETE, _("Delete"),
G_CALLBACK ( supprimer_division ),
budgetary_line_tree );
@@ -615,7 +615,7 @@ GtkWidget *creation_barre_outils_ib ( void )
gtk_box_pack_start ( GTK_BOX ( hbox ), button, FALSE, TRUE, 0 );
/* Properties button */
- button = gsb_automem_stock_button_new ( etat.display_toolbar,
+ button = gsb_automem_stock_button_new ( conf.display_toolbar,
GTK_STOCK_EDIT, _("Edit"),
G_CALLBACK ( edit_budgetary_line ),
budgetary_line_tree );
@@ -625,7 +625,7 @@ GtkWidget *creation_barre_outils_ib ( void )
gtk_box_pack_start ( GTK_BOX ( hbox ), button, FALSE, TRUE, 0 );
/* View button */
- button = gsb_automem_stock_button_menu_new ( etat.display_toolbar,
+ button = gsb_automem_stock_button_menu_new ( conf.display_toolbar,
GTK_STOCK_SELECT_COLOR,
_("View"),
G_CALLBACK(popup_budgetary_line_view_mode_menu),
diff --git a/src/menu.c b/src/menu.c
index a90c1d4..b074bfe 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -279,7 +279,7 @@ GtkWidget *init_menus ( GtkWidget *vbox )
{"DebugModeAction", NULL, _("Debug mode"), NULL, NULL,
G_CALLBACK ( gsb_debug_start_log ), etat.debug_mode },
{"ShowTransactionFormAction", NULL, _("Show transaction _form"), NULL, NULL,
- G_CALLBACK ( gsb_gui_toggle_show_form ), etat.formulaire_toujours_affiche },
+ G_CALLBACK ( gsb_gui_toggle_show_form ), conf.formulaire_toujours_affiche },
#ifdef GTKOSXAPPLICATION
{"ShowReconciledAction", NULL, _("Show _reconciled"), "<Meta>R", NULL,
G_CALLBACK ( gsb_gui_toggle_show_reconciled ), 0 },
@@ -292,7 +292,7 @@ GtkWidget *init_menus ( GtkWidget *vbox )
G_CALLBACK ( gsb_gui_toggle_show_archived ), 0 },
#endif
{"ShowClosedAction", NULL, _("Show _closed accounts"), NULL, NULL,
- G_CALLBACK ( gsb_gui_toggle_show_closed_accounts ), etat.show_closed_accounts }
+ G_CALLBACK ( gsb_gui_toggle_show_closed_accounts ), conf.show_closed_accounts }
};
ui_manager = gtk_ui_manager_new ();
@@ -657,7 +657,7 @@ gboolean gsb_gui_toggle_show_archived ( void )
*/
gboolean gsb_gui_toggle_show_closed_accounts ( void )
{
- etat.show_closed_accounts = ! etat.show_closed_accounts;
+ conf.show_closed_accounts = !conf.show_closed_accounts;
gsb_gui_navigation_create_account_list ( gsb_gui_navigation_get_model ( ) );
gsb_gui_navigation_update_home_page ( );
diff --git a/src/navigation.c b/src/navigation.c
index 121b231..954628d 100644
--- a/src/navigation.c
+++ b/src/navigation.c
@@ -521,7 +521,7 @@ void gsb_gui_navigation_create_account_list ( GtkTreeModel *model )
{
gint i = gsb_data_account_get_no_account ( list_tmp -> data );
- if ( etat.show_closed_accounts ||
+ if ( conf.show_closed_accounts ||
! gsb_data_account_get_closed_account ( i ) )
{
gsb_gui_navigation_add_account ( i, FALSE );
diff --git a/src/parametres.c b/src/parametres.c
index e6a8d60..31b87ff 100644
--- a/src/parametres.c
+++ b/src/parametres.c
@@ -667,7 +667,7 @@ GtkWidget *onglet_messages_and_warnings ( void )
/* Display or not tips */
tip_checkbox = gsb_automem_checkbutton_new ( _("Display tip of the day"),
- &(etat.show_tip),
+ &(conf.show_tip),
NULL, NULL );
gtk_box_pack_start ( GTK_BOX ( paddingbox ), tip_checkbox, FALSE, FALSE, 0 );
diff --git a/src/structures.h b/src/structures.h
index 27e7705..902be09 100644
--- a/src/structures.h
+++ b/src/structures.h
@@ -43,10 +43,7 @@ struct gsb_etat_t
gint reconcile_end_date; /* Date initiale + 1 mois par défaut */
/* formulaire */
- gint formulaire_toujours_affiche;
- gint affichage_exercice_automatique; /* automatic fyear :0 to set according to the date, 2 according to value date */
gint affiche_nb_ecritures_listes;
- gint largeur_auto_colonnes;
gint retient_affichage_par_compte; /* à 1 si les caractéristiques de l'affichage (R, non R ...) diffèrent par compte */
/* Fonts & logo */
@@ -54,9 +51,6 @@ struct gsb_etat_t
gboolean is_pixmaps_dir; /* TRUE if path_icon == gsb_dirs_get_pixmaps_dir ( ) */
gchar *name_logo;
- gint display_toolbar; /** Display mode of toolbar. */
- gboolean show_headings_bar; /** Show headings bar or not. */
- gboolean show_closed_accounts;
gboolean automatic_separator; /* TRUE if do automatic separator */
/* Various display message stuff */
@@ -97,10 +91,6 @@ struct gsb_etat_t
/* variables sur l'échéancier */
gint affichage_commentaire_echeancier; /* à 1 si le commentaire est affiché */
- /* Tips */
- gint last_tip;
- gint show_tip;
-
/* variables pour les metatree */
gint metatree_sort_transactions; /* 1 = sorting by increasing date 2 = Sort by date descending */
gint add_archive_in_total_balance; /* Add transactions archived in the totals */
@@ -151,7 +141,11 @@ struct gsb_conf_t
gint pluriel_final; /* 0 = finals 1 = finaux */
gint display_grisbi_title; /* selection du titre principal de grisbi */
- gboolean active_scrolling_left_pane; /** active mouse scrolling in the left_pane. */
+ gboolean active_scrolling_left_pane; /* active mouse scrolling in the left_pane. */
+
+ gint display_toolbar; /* Display mode of toolbar. */
+ gboolean show_headings_bar; /* Show headings bar or not. */
+ gboolean show_closed_accounts;
/* files part */
gint sauvegarde_demarrage; /* utilisé pour enregistrer le fichier s'il s'est bien ouvert */
@@ -175,6 +169,8 @@ struct gsb_conf_t
gboolean limit_completion_to_current_account; /* Limit payee completion to current account or do a full search. */
gboolean automatic_recover_splits; /* 1 pour recréer automatiquement les sous opérations */
gboolean automatic_erase_credit_debit; /* 1 pour effacer les champs crédit et débit */
+ gboolean formulaire_toujours_affiche; /* TRUE formulaire toujours affiché */
+ gint affichage_exercice_automatique; /* automatic fyear :0 to set according to the date, 1 according to value date */
#if IS_DEVELOPMENT_VERSION == 1
/* config file */
@@ -197,6 +193,9 @@ struct gsb_conf_t
gint check_for_archival; /* TRUE if we want to check the number of non archived transactions at the opening */
gint max_non_archived_transactions_for_check; /* the max number of transaction before grisbi warm at the opening */
+ /* Tips */
+ gint last_tip;
+ gint show_tip;
};
/* declared in gsb_file_config.c */
diff --git a/src/tiers_onglet.c b/src/tiers_onglet.c
index 1acaf6e..9a7d4e5 100644
--- a/src/tiers_onglet.c
+++ b/src/tiers_onglet.c
@@ -314,7 +314,7 @@ GtkWidget *creation_barre_outils_tiers ( void )
hbox = gtk_hbox_new ( FALSE, 0 );
/* Add various icons */
- button = gsb_automem_imagefile_button_new ( etat.display_toolbar,
+ button = gsb_automem_imagefile_button_new ( conf.display_toolbar,
_("New payee"), "new-payee.png",
G_CALLBACK ( appui_sur_ajout_payee ),
payee_tree_model );
@@ -322,7 +322,7 @@ GtkWidget *creation_barre_outils_tiers ( void )
_("Create a new payee"));
gtk_box_pack_start ( GTK_BOX ( hbox ), button, FALSE, TRUE, 0 );
- button = gsb_automem_stock_button_new ( etat.display_toolbar,
+ button = gsb_automem_stock_button_new ( conf.display_toolbar,
GTK_STOCK_DELETE, _("Delete"),
G_CALLBACK ( supprimer_division ),
payee_tree );
@@ -331,7 +331,7 @@ GtkWidget *creation_barre_outils_tiers ( void )
_("Delete selected payee"));
gtk_box_pack_start ( GTK_BOX ( hbox ), button, FALSE, TRUE, 0 );
- button = gsb_automem_stock_button_new ( etat.display_toolbar,
+ button = gsb_automem_stock_button_new ( conf.display_toolbar,
GTK_STOCK_EDIT, _("Edit"),
G_CALLBACK ( edit_payee ),
payee_tree );
@@ -340,7 +340,7 @@ GtkWidget *creation_barre_outils_tiers ( void )
_("Edit selected payee"));
gtk_box_pack_start ( GTK_BOX ( hbox ), button, FALSE, TRUE, 0 );
- button = gsb_automem_stock_button_menu_new ( etat.display_toolbar,
+ button = gsb_automem_stock_button_menu_new ( conf.display_toolbar,
GTK_STOCK_SELECT_COLOR,
_("View"),
G_CALLBACK ( popup_payee_view_mode_menu ),
@@ -349,7 +349,7 @@ GtkWidget *creation_barre_outils_tiers ( void )
_("Change view mode"));
gtk_box_pack_start ( GTK_BOX ( hbox ), button, FALSE, TRUE, 0 );
- button = gsb_automem_imagefile_button_new ( etat.display_toolbar,
+ button = gsb_automem_imagefile_button_new ( conf.display_toolbar,
_("Manage payees"), "payeesmg.png",
G_CALLBACK ( payees_manage_payees ),
NULL );
@@ -357,7 +357,7 @@ GtkWidget *creation_barre_outils_tiers ( void )
_("Manage the payees"));
gtk_box_pack_start ( GTK_BOX ( hbox ), button, FALSE, TRUE, 0 );
- button = gsb_automem_stock_button_new ( etat.display_toolbar,
+ button = gsb_automem_stock_button_new ( conf.display_toolbar,
GTK_STOCK_DELETE, _("Remove unused payees"),
G_CALLBACK ( payees_remove_unused_payees ),
NULL );
diff --git a/src/tip.c b/src/tip.c
index 8f0f12e..31e4b37 100644
--- a/src/tip.c
+++ b/src/tip.c
@@ -126,19 +126,19 @@ void display_tip ( gboolean force )
GtkWidget *btn_back, *btn_forward, *btn_close;
gchar *tmpstr;
- if ( !force && !etat.show_tip )
+ if ( !force && !conf.show_tip )
return;
- etat.last_tip = CLAMP (etat.last_tip+1, 0, sizeof(tips)/sizeof(gpointer)-1);
+ conf.last_tip = CLAMP ( conf.last_tip+1, 0, sizeof(tips)/sizeof(gpointer)-1);
dialog = dialogue_special_no_run ( GTK_MESSAGE_INFO, GTK_BUTTONS_NONE,
make_hint ( _("Did you know that..."),
/* We use the grisbi-tips catalog */
- g_dgettext(NULL, tips[etat.last_tip]) ) );
+ g_dgettext(NULL, tips[conf.last_tip]) ) );
gtk_window_set_modal ( GTK_WINDOW ( dialog ), FALSE );
checkbox = gsb_automem_checkbutton_new ( _("Display tips at next start"),
- &(etat.show_tip), NULL, NULL );
+ &(conf.show_tip), NULL, NULL );
gtk_box_pack_start ( GTK_BOX ( GTK_DIALOG(dialog) -> vbox ), checkbox, FALSE, FALSE, 6 );
gtk_widget_show ( checkbox );
@@ -150,21 +150,21 @@ void display_tip ( gboolean force )
/* We iterate as user can select several tips. */
while ( TRUE )
{
- if (etat.last_tip == sizeof(tips)/sizeof(gpointer)-1)
+ if ( conf.last_tip == sizeof(tips)/sizeof(gpointer)-1)
gtk_widget_set_sensitive (btn_forward, FALSE);
- if (etat.last_tip == 0)
+ if ( conf.last_tip == 0)
gtk_widget_set_sensitive (btn_back, FALSE);
switch ( gtk_dialog_run ( GTK_DIALOG(dialog) ) )
{
case 1:
- if ( etat.last_tip > 0 )
- etat.last_tip--;
+ if ( conf.last_tip > 0 )
+ conf.last_tip--;
gtk_widget_set_sensitive (btn_forward, TRUE);
tmpstr = g_strconcat ( make_pango_attribut (
"size=\"larger\" weight=\"bold\"", _("Did you know that...") ),
"\n\n",
- g_dgettext (NULL, tips[etat.last_tip] ),
+ g_dgettext (NULL, tips[conf.last_tip] ),
NULL );
gtk_label_set_markup ( GTK_LABEL ( GTK_MESSAGE_DIALOG(dialog) -> label ),
@@ -173,12 +173,12 @@ void display_tip ( gboolean force )
break;
case 2:
- if (etat.last_tip < sizeof(tips)/sizeof(gpointer)-1)
- etat.last_tip++;
+ if ( conf.last_tip < sizeof(tips)/sizeof(gpointer)-1)
+ conf.last_tip++;
tmpstr = g_strconcat ( make_pango_attribut (
"size=\"larger\" weight=\"bold\"", _("Did you know that...") ),
"\n\n",
- g_dgettext (NULL, tips[etat.last_tip] ),
+ g_dgettext (NULL, tips[conf.last_tip] ),
NULL );
gtk_label_set_markup ( GTK_LABEL ( GTK_MESSAGE_DIALOG(dialog) -> label ),
diff --git a/src/traitement_variables.c b/src/traitement_variables.c
index 7363a83..cb3ed7c 100644
--- a/src/traitement_variables.c
+++ b/src/traitement_variables.c
@@ -233,6 +233,8 @@ void init_variables ( void )
etat.utilise_logo = 1;
gsb_select_icon_init_logo_variables ();
+ etat.retient_affichage_par_compte = 0;
+
/* reconcile (etat) */
run.reconcile_account_number = -1;
g_free ( run.reconcile_final_balance );
@@ -244,7 +246,6 @@ void init_variables ( void )
adresse_commune = NULL;
adresse_secondaire = NULL;
- etat.largeur_auto_colonnes = 1;
current_tree_view_width = 0;
scheduler_current_tree_view_width = 0;
hooks/post-receive
--
grisbi
More information about the cvs
mailing list