[grisbi-cvs] [SCM] grisbi branch, pbiava_new_etats, updated. upstream_version_0_9.0-137-gc481e9d
Pierre Biava
nobody at users.sourceforge.net
Wed Mar 30 20:26:33 CEST 2011
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, pbiava_new_etats has been updated
via c481e9ddead52ce8b3711544c932728b580cde3c (commit)
via 1d93b03360d517c96a5f24e8af87f7212eee80d1 (commit)
via 7cc3ce8bd8bdd1d9492e23780eafa1de12fdc122 (commit)
via 2aa563f97af1a98c085d9d551af4c8fd2ed49fda (commit)
via e779f4809086a2f6041820cff152ad74546b869f (commit)
via 541ee26679c33a289ff3a513e91badba56b9f27e (commit)
via d168dd4b1b12f04395a8215867a5d8204ef494ab (commit)
via 00fe097df5f9da7a5e8a202b4f116a8ec7f241c7 (commit)
via 759ffce25e38789022bb8ee24b5c2c9572c83216 (commit)
via 92b1d19098e514a2d44f5cfaf4838ab43c36124c (commit)
via 219dacd8cb797f70d213b967569863a30171dbff (commit)
via 8a98d7563377c19bc4b0bbc6a1a3888d9b44028e (commit)
via 015ab47aebd7a1e98bc47b6729f501c278f667d7 (commit)
from 3e4fe88f5a9a773a63131d8b244a70f0c907e908 (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 c481e9ddead52ce8b3711544c932728b580cde3c
Merge: 7cc3ce8bd8bdd1d9492e23780eafa1de12fdc122 1d93b03360d517c96a5f24e8af87f7212eee80d1
Author: pbiava <pierre.biava at nerim.net>
Date: Wed Mar 30 20:25:23 2011 +0200
Merge branch 'master' into pbiava_new_etats
commit 7cc3ce8bd8bdd1d9492e23780eafa1de12fdc122
Author: pbiava <pierre.biava at nerim.net>
Date: Wed Mar 30 20:03:05 2011 +0200
provisoire
commit 2aa563f97af1a98c085d9d551af4c8fd2ed49fda
Author: pbiava <pierre.biava at nerim.net>
Date: Wed Mar 30 20:01:36 2011 +0200
Uniformise background and text colors of selection of a line of tree_view
commit e779f4809086a2f6041820cff152ad74546b869f
Merge: 541ee26679c33a289ff3a513e91badba56b9f27e 00fe097df5f9da7a5e8a202b4f116a8ec7f241c7
Author: pbiava <pierre.biava at nerim.net>
Date: Tue Mar 29 21:25:50 2011 +0200
Merge branch 'master' into pbiava_new_etats
commit 541ee26679c33a289ff3a513e91badba56b9f27e
Author: pbiava <pierre.biava at nerim.net>
Date: Tue Mar 29 21:23:14 2011 +0200
mise en forme etats_config.c
commit d168dd4b1b12f04395a8215867a5d8204ef494ab
Author: pbiava <pierre.biava at nerim.net>
Date: Sun Mar 27 23:01:53 2011 +0200
provisoire
-----------------------------------------------------------------------
Changes:
diff --git a/src/barre_outils.c b/src/barre_outils.c
index 76f20b4..1635363 100644
--- a/src/barre_outils.c
+++ b/src/barre_outils.c
@@ -79,7 +79,6 @@ GtkWidget *menu_import_rules;
/*START_EXTERN*/
extern GtkWidget *barre_outils;
extern gboolean block_menu_cb;
-extern GtkUIManager * ui_manager;
/*END_EXTERN*/
@@ -319,6 +318,7 @@ gboolean popup_transaction_rules_menu ( GtkWidget * button,
/****************************************************************************************************/
gboolean change_aspect_liste ( gint demande )
{
+ GtkUIManager *ui_manager = gsb_menu_get_ui_manager ( );
switch ( demande )
{
case 0:
@@ -330,7 +330,7 @@ gboolean change_aspect_liste ( gint demande )
case 1 :
gtk_toggle_action_set_active ( GTK_TOGGLE_ACTION (
gtk_ui_manager_get_action ( ui_manager,
- menu_name ( "ViewMenu", "ShowOneLine", NULL ) ) ),
+ "/menubar/ViewMenu/ShowOneLine" ) ),
TRUE );
gsb_transactions_list_set_visible_rows_number ( demande );
if ( etat.modification_fichier == 0 )
@@ -339,7 +339,7 @@ gboolean change_aspect_liste ( gint demande )
case 2 :
gtk_toggle_action_set_active ( GTK_TOGGLE_ACTION (
gtk_ui_manager_get_action ( ui_manager,
- menu_name ( "ViewMenu", "ShowTwoLines", NULL ) ) ),
+ "/menubar/ViewMenu/ShowTwoLines" ) ),
TRUE );
gsb_transactions_list_set_visible_rows_number ( demande );
if ( etat.modification_fichier == 0 )
@@ -348,7 +348,7 @@ gboolean change_aspect_liste ( gint demande )
case 3 :
gtk_toggle_action_set_active ( GTK_TOGGLE_ACTION (
gtk_ui_manager_get_action ( ui_manager,
- menu_name ( "ViewMenu", "ShowThreeLines", NULL ) ) ),
+ "/menubar/ViewMenu/ShowThreeLines" ) ),
TRUE );
gsb_transactions_list_set_visible_rows_number ( demande );
if ( etat.modification_fichier == 0 )
@@ -357,7 +357,7 @@ gboolean change_aspect_liste ( gint demande )
case 4 :
gtk_toggle_action_set_active ( GTK_TOGGLE_ACTION (
gtk_ui_manager_get_action ( ui_manager,
- menu_name ( "ViewMenu", "ShowFourLines", NULL ) ) ),
+ "/menubar/ViewMenu/ShowFourLines" ) ),
TRUE );
gsb_transactions_list_set_visible_rows_number ( demande );
if ( etat.modification_fichier == 0 )
@@ -375,7 +375,7 @@ gboolean change_aspect_liste ( gint demande )
block_menu_cb = TRUE;
gtk_toggle_action_set_active ( GTK_TOGGLE_ACTION (
gtk_ui_manager_get_action ( ui_manager,
- menu_name ( "ViewMenu", "ShowReconciled", NULL ) ) ),
+ "/menubar/ViewMenu/ShowReconciled" ) ),
TRUE );
block_menu_cb = FALSE;
@@ -392,7 +392,7 @@ gboolean change_aspect_liste ( gint demande )
block_menu_cb = TRUE;
gtk_toggle_action_set_active ( GTK_TOGGLE_ACTION (
gtk_ui_manager_get_action ( ui_manager,
- menu_name ( "ViewMenu", "ShowReconciled", NULL ) ) ),
+ "/menubar/ViewMenu/ShowReconciled" ) ),
FALSE );
block_menu_cb = FALSE;
@@ -408,7 +408,7 @@ gboolean change_aspect_liste ( gint demande )
block_menu_cb = TRUE;
gtk_toggle_action_set_active ( GTK_TOGGLE_ACTION (
gtk_ui_manager_get_action ( ui_manager,
- menu_name ( "ViewMenu", "ShowArchived", NULL ) ) ),
+ "/menubar/ViewMenu/ShowArchived" ) ),
TRUE );
block_menu_cb = FALSE;
@@ -425,7 +425,7 @@ gboolean change_aspect_liste ( gint demande )
block_menu_cb = TRUE;
gtk_toggle_action_set_active ( GTK_TOGGLE_ACTION (
gtk_ui_manager_get_action ( ui_manager,
- menu_name ( "ViewMenu", "ShowArchived", NULL ) ) ),
+ "/menubar/ViewMenu/ShowArchived" ) ),
FALSE );
block_menu_cb = FALSE;
diff --git a/src/bet_finance_ui.c b/src/bet_finance_ui.c
index 69e4e38..8d21d89 100644
--- a/src/bet_finance_ui.c
+++ b/src/bet_finance_ui.c
@@ -38,6 +38,7 @@
#include "gsb_combo_box.h"
#include "gsb_currency.h"
#include "gsb_data_account.h"
+#include "gsb_dirs.h"
#include "gsb_file.h"
#include "gsb_form_widget.h"
#include "gsb_real.h"
@@ -51,7 +52,6 @@
#include "utils_file_selection.h"
#include "utils_str.h"
#include "erreur.h"
-#include "gsb_dirs.h"
/*END_INCLUDE*/
/*START_STATIC*/
@@ -302,8 +302,7 @@ GtkWidget *bet_finance_create_simulator_page ( void )
g_object_set_data ( G_OBJECT ( tree_view ), "label_title", label_title );
/* set the color of selected row */
- gtk_widget_modify_base ( tree_view, GTK_STATE_SELECTED, &couleur_selection );
- gtk_widget_modify_base ( tree_view, GTK_STATE_ACTIVE, &couleur_selection );
+ utils_set_tree_view_selection_and_text_color ( tree_view );
/* on y ajoute la barre d'outils */
toolbar = bet_finance_create_simulator_toolbar ( page, tree_view, TRUE, FALSE );
@@ -1168,8 +1167,7 @@ GtkWidget *bet_finance_create_amortization_page ( void )
g_object_set_data ( G_OBJECT ( tree_view ), "label_title", label_title );
/* set the color of selected row */
- gtk_widget_modify_base ( tree_view, GTK_STATE_SELECTED, &couleur_selection );
- gtk_widget_modify_base ( tree_view, GTK_STATE_ACTIVE, &couleur_selection );
+ utils_set_tree_view_selection_and_text_color ( tree_view );
/* on y ajoute la barre d'outils */
toolbar = bet_finance_create_simulator_toolbar ( page, tree_view, FALSE, TRUE );
@@ -1608,8 +1606,7 @@ GtkWidget *bet_finance_create_account_page ( void )
g_object_set_data ( G_OBJECT ( tree_view ), "label_title", label_title );
/* set the color of selected row */
- gtk_widget_modify_base ( tree_view, GTK_STATE_SELECTED, &couleur_selection );
- gtk_widget_modify_base ( tree_view, GTK_STATE_ACTIVE, &couleur_selection );
+ utils_set_tree_view_selection_and_text_color ( tree_view );
/* on y ajoute la barre d'outils */
toolbar = bet_finance_create_simulator_toolbar ( page, tree_view, FALSE, FALSE );
diff --git a/src/bet_hist.c b/src/bet_hist.c
index 821a288..201d972 100644
--- a/src/bet_hist.c
+++ b/src/bet_hist.c
@@ -44,6 +44,7 @@
#include "navigation.h"
#include "structures.h"
#include "traitement_variables.h"
+#include "utils.h"
#include "utils_dates.h"
#include "utils_str.h"
#include "erreur.h"
@@ -214,8 +215,7 @@ GtkWidget *bet_historical_create_page ( void )
g_object_set_data ( G_OBJECT ( account_page ), "bet_historical_treeview", tree_view );
/* set the color of selected row */
- gtk_widget_modify_base ( tree_view, GTK_STATE_SELECTED, &couleur_selection );
- gtk_widget_modify_base ( tree_view, GTK_STATE_ACTIVE, &couleur_selection );
+ utils_set_tree_view_selection_and_text_color ( tree_view );
gtk_widget_show_all ( page );
diff --git a/src/bet_tab.c b/src/bet_tab.c
index 653b937..c992483 100644
--- a/src/bet_tab.c
+++ b/src/bet_tab.c
@@ -48,6 +48,7 @@
#include "gsb_data_payee.h"
#include "gsb_data_scheduled.h"
#include "gsb_data_transaction.h"
+#include "gsb_dirs.h"
#include "gsb_file.h"
#include "gsb_real.h"
#include "gsb_scheduler.h"
@@ -64,7 +65,6 @@
#include "utils_file_selection.h"
#include "utils_str.h"
#include "erreur.h"
-#include "gsb_dirs.h"
/*END_INCLUDE*/
@@ -626,8 +626,7 @@ GtkWidget *bet_array_create_tree_view ( GtkWidget *container )
GINT_TO_POINTER ( SPP_ESTIMATE_TREE_COLOR_STRING ) );
/* set the color of selected row */
- gtk_widget_modify_base ( tree_view, GTK_STATE_SELECTED, &couleur_selection );
- gtk_widget_modify_base ( tree_view, GTK_STATE_ACTIVE, &couleur_selection );
+ utils_set_tree_view_selection_and_text_color ( tree_view );
/* create the model */
tree_model = gtk_tree_store_new ( SPP_ESTIMATE_TREE_NUM_COLUMNS,
diff --git a/src/categories_onglet.c b/src/categories_onglet.c
index 15ade45..b32d283 100644
--- a/src/categories_onglet.c
+++ b/src/categories_onglet.c
@@ -106,7 +106,7 @@ GtkWidget *onglet_categories ( void )
arbre_categ = gtk_tree_view_new();
/* set the color of selected row */
- gtk_widget_modify_base ( arbre_categ, GTK_STATE_SELECTED, &couleur_selection );
+ utils_set_tree_view_selection_and_text_color ( arbre_categ );
categ_tree_model = gtk_tree_store_new ( META_TREE_NUM_COLUMNS, META_TREE_COLUMN_TYPES );
diff --git a/src/erreur.c b/src/erreur.c
index 082073f..0ac58e4 100644
--- a/src/erreur.c
+++ b/src/erreur.c
@@ -45,6 +45,7 @@
#include "main.h"
#include "utils.h"
#include "utils_str.h"
+#include "menu.h"
/*END_INCLUDE*/
#ifdef HAVE_BACKTRACE
@@ -59,7 +60,6 @@ static GtkWidget * print_backtrace ( void );
/*START_EXTERN*/
extern gchar *nom_fichier_comptes;
-extern GtkUIManager * ui_manager;
/*END_EXTERN*/
static gint debugging_grisbi;
@@ -488,6 +488,7 @@ gboolean gsb_debug_start_log ( void )
{
GtkWidget *widget;
gchar *tmp_str_2;
+ GtkUIManager *ui_manager = gsb_menu_get_ui_manager ( );
widget = gtk_ui_manager_get_widget ( ui_manager, "/menubar/FileMenu/DebugMode" );
etat.debug_mode = TRUE;
diff --git a/src/etats_config.c b/src/etats_config.c
index 1e85f59..e8c4ac2 100644
--- a/src/etats_config.c
+++ b/src/etats_config.c
@@ -4,7 +4,6 @@
/* */
/* Copyright (C) 2000-2008 Cédric Auger (cedric at grisbi.org) */
/* 2006-2008 Benjamin Drieu (bdrieu at april.org) */
-/* 20010 Pierre Biava (grisbi at pierre.biava.name) */
/* http://www.grisbi.org/ */
/* */
/* This program is free software; you can redistribute it and/or modify */
@@ -61,14 +60,14 @@
static void ajoute_ligne_liste_comparaisons_montants_etat ( gint last_amount_comparison_number );
static void ajoute_ligne_liste_comparaisons_textes_etat ( gint last_text_comparison_number );
static void change_comparaison_montant ( GtkWidget *menu_item,
- gint amount_comparison_number );
+ gint amount_comparison_number );
static void change_comparaison_texte ( GtkWidget *menu_item,
- gint text_comparison_number );
+ gint text_comparison_number );
static void click_bas_classement_etat ( void );
static void click_haut_classement_etat ( void );
static void click_liste_etat ( GtkCList *liste,
- GdkEventButton *evenement,
- gint origine );
+ GdkEventButton *evenement,
+ gint origine );
static GtkWidget *cree_bouton_champ ( gint text_comparison_number );
static GtkWidget *cree_bouton_comparateur_montant ( gint amount_comparison_number );
static GtkWidget *cree_bouton_comparateur_texte ( gint text_comparison_number );
@@ -103,44 +102,44 @@ static void remplissage_liste_tiers_etats ( void );
static void remplit_liste_comparaisons_montants_etat ( void );
static void remplit_liste_comparaisons_textes_etat ( void );
static gboolean report_config_budget_select_all ( GtkWidget *button,
- gboolean *select_ptr );
+ gboolean *select_ptr );
static gboolean report_config_budget_select_type ( GtkWidget *button,
- gboolean *type_ptr );
+ gboolean *type_ptr );
static GSList *report_config_categ_budget_get_selected ( gboolean is_categ );
static gboolean report_config_categ_budget_toggled ( GtkCellRendererToggle *radio_renderer,
- gchar *path_str,
- GtkTreeStore *store );
+ gchar *path_str,
+ GtkTreeStore *store );
static gboolean report_config_category_select_all ( GtkWidget *button,
- gboolean *select_ptr );
+ gboolean *select_ptr );
static gboolean report_config_category_select_type ( GtkWidget *button,
- gboolean *type_ptr );
+ gboolean *type_ptr );
static void report_config_category_toggle_categ ( struct_categ_budget_sel *categ_budget_struct,
- gboolean is_categ );
+ gboolean is_categ );
static void report_config_category_update_treeview ( gboolean is_categ );
static GtkWidget *report_config_create_categ_budget_list ( void );
static gboolean report_config_fill_categ_budget_list ( gboolean is_categ );
static gboolean report_config_mix_select_all ( GtkTreeModel *model,
- gboolean toggle_value );
+ gboolean toggle_value );
static gboolean report_config_mix_select_type ( gboolean is_categ,
- gboolean type );
+ gboolean type );
static void report_config_mixed_list_add_div ( gboolean is_categ,
- const gchar *name,
- gint number );
+ const gchar *name,
+ gint number );
static void report_config_mixed_list_add_sub_div ( gboolean is_categ,
- const gchar *name,
- gint number );
+ const gchar *name,
+ gint number );
static gboolean report_tree_selectable_func (GtkTreeSelection *selection,
- GtkTreeModel *model,
- GtkTreePath *path,
- gboolean path_currently_selected,
- gpointer data);
+ GtkTreeModel *model,
+ GtkTreePath *path,
+ gboolean path_currently_selected,
+ gpointer data);
static gboolean report_tree_update_style ( gint * page_number );
static gboolean report_tree_update_style_iterator ( GtkTreeModel * tree_model,
- GtkTreePath *path,
- GtkTreeIter *iter,
- gpointer data );
+ GtkTreePath *path,
+ GtkTreeIter *iter,
+ gpointer data );
static gboolean report_tree_view_selection_changed ( GtkTreeSelection *selection,
- GtkTreeModel *model );
+ GtkTreeModel *model );
static void retire_ligne_liste_comparaisons_montants_etat ( gint last_amount_comparison_number );
static void retire_ligne_liste_comparaisons_textes_etat ( gint last_text_comparison_number );
static void selectionne_devise_categ_etat_courant ( void );
@@ -178,6 +177,8 @@ enum report_tree_columns {
};
+
+
/***********************************/
/* fichier etats_config.c */
/***********************************/
@@ -360,8 +361,8 @@ static GtkWidget *vbox_mode_paiement_etat = NULL;
static GtkWidget *liste_mode_paiement_etat = NULL;
-static GtkTreeStore *report_tree_model = NULL;
-static GtkWidget *report_tree_view = NULL;
+static GtkTreeStore * report_tree_model = NULL;
+static GtkWidget * report_tree_view = NULL;
/** globals used to speed up the category/budget list
* and clarify the code */
@@ -371,7 +372,7 @@ static GtkTreeIter parent_iter;
/*START_EXTERN*/
-extern GtkWidget *navigation_tree_view;
+extern GtkWidget * navigation_tree_view;
extern GtkWidget *notebook_config_etat;
extern GtkWidget *notebook_etats;
extern GtkWidget *notebook_general;
@@ -379,12 +380,11 @@ extern GtkWidget *window;
/*END_EXTERN*/
-/**
- * affiche la fenetre de personnalisation
- *
- *
- *
- * */
+
+/******************************************************************************/
+/* Fontion personnalistation_etat */
+/* affiche la fenetre de personnalisation */
+/******************************************************************************/
void personnalisation_etat (void)
{
GtkWidget * dialog, *sw, *paned;
@@ -396,98 +396,102 @@ void personnalisation_etat (void)
GtkTreeIter iter, iter2;
GtkTreeSelection *selection ;
- if ( !( current_report_number = gsb_gui_navigation_get_current_report ( ) ) )
- return;
+ if ( !(current_report_number = gsb_gui_navigation_get_current_report()))
+ return;
if ( gtk_notebook_get_current_page ( GTK_NOTEBOOK ( notebook_general)) != GSB_REPORTS_PAGE )
- gtk_notebook_set_current_page ( GTK_NOTEBOOK ( notebook_general), GSB_REPORTS_PAGE );
+ gtk_notebook_set_current_page ( GTK_NOTEBOOK ( notebook_general),
+ GSB_REPORTS_PAGE );
dialog = gtk_dialog_new_with_buttons ( _("Report properties"),
- GTK_WINDOW ( window ),
- GTK_DIALOG_MODAL,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
- NULL );
+ GTK_WINDOW ( window ),
+ GTK_DIALOG_MODAL,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OK, GTK_RESPONSE_OK,
+ NULL );
gtk_window_set_position ( GTK_WINDOW ( dialog ), GTK_WIN_POS_CENTER_ON_PARENT );
gtk_window_set_resizable ( GTK_WINDOW ( dialog ), TRUE );
/* Create model */
report_tree_model = gtk_tree_store_new ( REPORT_TREE_NUM_COLUMNS,
- G_TYPE_STRING,
- G_TYPE_INT,
- G_TYPE_INT,
- G_TYPE_INT );
-
+ G_TYPE_STRING,
+ G_TYPE_INT,
+ G_TYPE_INT,
+ G_TYPE_INT );
/* Create container + TreeView */
- sw = gtk_scrolled_window_new ( NULL, NULL );
- gtk_scrolled_window_set_shadow_type ( GTK_SCROLLED_WINDOW ( sw ), GTK_SHADOW_IN );
- gtk_scrolled_window_set_policy ( GTK_SCROLLED_WINDOW ( sw ),
- GTK_POLICY_NEVER,
- GTK_POLICY_AUTOMATIC );
-
- report_tree_view = gtk_tree_view_new_with_model ( GTK_TREE_MODEL (report_tree_model ) );
- g_object_unref ( G_OBJECT ( report_tree_model ) );
+ sw = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
+ GTK_SHADOW_IN);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
+ GTK_POLICY_NEVER,
+ GTK_POLICY_AUTOMATIC);
+ report_tree_view = gtk_tree_view_new();
+ gtk_tree_view_set_model (GTK_TREE_VIEW (report_tree_view),
+ GTK_TREE_MODEL (report_tree_model));
+ g_object_unref (G_OBJECT(report_tree_model));
/* Make column */
- cell = gtk_cell_renderer_text_new ( );
- column = gtk_tree_view_column_new_with_attributes ( "Categories",
- cell,
- "text", REPORT_TREE_TEXT_COLUMN,
- "weight", REPORT_TREE_BOLD_COLUMN,
- "style", REPORT_TREE_ITALIC_COLUMN,
- NULL );
- gtk_tree_view_append_column ( GTK_TREE_VIEW ( report_tree_view ),
- GTK_TREE_VIEW_COLUMN ( column ) );
- gtk_tree_view_set_headers_visible ( GTK_TREE_VIEW ( report_tree_view ), FALSE );
+ cell = gtk_cell_renderer_text_new ();
+ column =
+ gtk_tree_view_column_new_with_attributes ("Categories",
+ cell,
+ "text", REPORT_TREE_TEXT_COLUMN,
+ "weight", REPORT_TREE_BOLD_COLUMN,
+ "style", REPORT_TREE_ITALIC_COLUMN,
+ NULL);
+ gtk_tree_view_append_column (GTK_TREE_VIEW (report_tree_view),
+ GTK_TREE_VIEW_COLUMN (column));
+ gtk_tree_view_set_headers_visible ( GTK_TREE_VIEW (report_tree_view), FALSE );
/* Handle select */
- selection = gtk_tree_view_get_selection ( GTK_TREE_VIEW ( report_tree_view ) );
- g_signal_connect ( selection,
- "changed",
- G_CALLBACK ( report_tree_view_selection_changed ),
- report_tree_model);
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (report_tree_view));
+ g_signal_connect (selection, "changed",
+ ((GCallback) report_tree_view_selection_changed),
+ report_tree_model);
/* Choose which entries will be selectable */
- gtk_tree_selection_set_select_function ( selection, report_tree_selectable_func, NULL, NULL );
+ gtk_tree_selection_set_select_function ( selection, report_tree_selectable_func,
+ NULL, NULL );
/* Put the tree in the scroll */
- gtk_container_add ( GTK_CONTAINER ( sw ), report_tree_view );
+ gtk_container_add (GTK_CONTAINER (sw), report_tree_view);
/* expand all rows after the treeview widget has been realized */
- g_signal_connect ( report_tree_view,
- "realize",
- G_CALLBACK ( gtk_tree_view_expand_all ),
- NULL );
+ g_signal_connect (report_tree_view, "realize",
+ ((GCallback)gtk_tree_view_expand_all), NULL);
- paned = gtk_hpaned_new ( );
- gtk_box_pack_start ( GTK_BOX ( GTK_DIALOG ( dialog ) -> vbox ), paned, TRUE, TRUE, 0 );
+ paned = gtk_hpaned_new();
+ gtk_box_pack_start ( GTK_BOX ( GTK_DIALOG ( dialog ) -> vbox ), paned,
+ TRUE, TRUE, 0 );
gtk_box_set_spacing ( GTK_BOX ( GTK_DIALOG ( dialog ) -> vbox ), 6 );
gtk_container_set_border_width ( GTK_CONTAINER ( paned ), 0 );
- gtk_paned_add1 ( GTK_PANED ( paned ), sw) ;
+ gtk_paned_add1(GTK_PANED(paned), sw);
/* on commence par créer le notebook parent de la config des états */
- notebook_config_etat = gtk_notebook_new ( );
- gtk_paned_add2 ( GTK_PANED ( paned ), notebook_config_etat );
+ notebook_config_etat = gtk_notebook_new ();
+ gtk_paned_add2(GTK_PANED(paned), notebook_config_etat );
- gtk_notebook_set_show_tabs ( GTK_NOTEBOOK ( notebook_config_etat ), FALSE );
- gtk_notebook_set_show_border ( GTK_NOTEBOOK ( notebook_config_etat ), FALSE );
+ gtk_notebook_set_show_tabs ( GTK_NOTEBOOK ( notebook_config_etat ),
+ FALSE );
+ gtk_notebook_set_show_border ( GTK_NOTEBOOK ( notebook_config_etat ),
+ FALSE );
gtk_container_set_border_width ( GTK_CONTAINER ( notebook_config_etat ), 0 );
/* on ajoute les onglets dans l'onglet de base correspondant */
/* remplissage de l'onglet de sélection */
+
/* Display subtree */
- gtk_tree_store_append ( GTK_TREE_STORE ( report_tree_model ), &iter, NULL );
- gtk_tree_store_set (GTK_TREE_STORE ( report_tree_model ), &iter,
- REPORT_TREE_TEXT_COLUMN, _("Data selection"),
- REPORT_TREE_PAGE_COLUMN, -1,
- REPORT_TREE_BOLD_COLUMN, 800,
- -1 );
-
- /* append page Dates */
+ gtk_tree_store_append (GTK_TREE_STORE (report_tree_model), &iter, NULL);
+ gtk_tree_store_set (GTK_TREE_STORE (report_tree_model), &iter,
+ REPORT_TREE_TEXT_COLUMN, _("Data selection"),
+ REPORT_TREE_PAGE_COLUMN, -1,
+ REPORT_TREE_BOLD_COLUMN, 800,
+ -1);
+
gtk_notebook_append_page ( GTK_NOTEBOOK ( notebook_config_etat ),
onglet_etat_dates (),
gtk_label_new ( _("Dates") ) );
@@ -497,14 +501,6 @@ void personnalisation_etat (void)
REPORT_TREE_PAGE_COLUMN, page++,
REPORT_TREE_BOLD_COLUMN, 400, -1);
- gtk_tree_store_append ( GTK_TREE_STORE ( report_tree_model ), &iter2, &iter );
- gtk_tree_store_set ( GTK_TREE_STORE ( report_tree_model ), &iter2,
- REPORT_TREE_TEXT_COLUMN, _("Dates"),
- REPORT_TREE_PAGE_COLUMN, page++,
- REPORT_TREE_BOLD_COLUMN, 400,
- -1 );
-
- /* append page Transferts */
gtk_notebook_append_page ( GTK_NOTEBOOK ( notebook_config_etat ),
onglet_etat_virements (),
gtk_label_new ( _("Transfers") ) );
@@ -514,7 +510,6 @@ void personnalisation_etat (void)
REPORT_TREE_PAGE_COLUMN, page++,
REPORT_TREE_BOLD_COLUMN, 400, -1);
- /* append page Accounts */
gtk_notebook_append_page ( GTK_NOTEBOOK ( notebook_config_etat ),
onglet_etat_comptes (),
gtk_label_new ( _("Accounts") ) );
@@ -524,7 +519,6 @@ void personnalisation_etat (void)
REPORT_TREE_PAGE_COLUMN, page++,
REPORT_TREE_BOLD_COLUMN, 400, -1);
- /* append page Payee */
gtk_notebook_append_page ( GTK_NOTEBOOK ( notebook_config_etat ),
onglet_etat_tiers (),
gtk_label_new ( _("Payee") ) );
@@ -534,7 +528,6 @@ void personnalisation_etat (void)
REPORT_TREE_PAGE_COLUMN, page++,
REPORT_TREE_BOLD_COLUMN, 400, -1);
- /* append page Categories */
gtk_notebook_append_page ( GTK_NOTEBOOK ( notebook_config_etat ),
onglet_etat_categories (),
gtk_label_new ( _("Categories") ) );
@@ -544,14 +537,6 @@ void personnalisation_etat (void)
REPORT_TREE_PAGE_COLUMN, page++,
REPORT_TREE_BOLD_COLUMN, 400, -1);
- gtk_tree_store_append ( GTK_TREE_STORE ( report_tree_model ), &iter2, &iter );
- gtk_tree_store_set ( GTK_TREE_STORE ( report_tree_model ), &iter2,
- REPORT_TREE_TEXT_COLUMN, _("Categories"),
- REPORT_TREE_PAGE_COLUMN, page++,
- REPORT_TREE_BOLD_COLUMN, 400,
- -1 );
-
- /* append page Budgetary lines */
gtk_notebook_append_page ( GTK_NOTEBOOK ( notebook_config_etat ),
onglet_etat_ib (),
gtk_label_new ( _("Budgetary lines") ) );
@@ -561,7 +546,6 @@ void personnalisation_etat (void)
REPORT_TREE_PAGE_COLUMN, page++,
REPORT_TREE_BOLD_COLUMN, 400, -1);
- /* append page Texts */
gtk_notebook_append_page ( GTK_NOTEBOOK ( notebook_config_etat ),
onglet_etat_texte (),
gtk_label_new ( _("Texts") ) );
@@ -571,7 +555,6 @@ void personnalisation_etat (void)
REPORT_TREE_PAGE_COLUMN, page++,
REPORT_TREE_BOLD_COLUMN, 400, -1);
- /* append page Amounts */
gtk_notebook_append_page ( GTK_NOTEBOOK ( notebook_config_etat ),
onglet_etat_montant (),
gtk_label_new ( _("Amounts") ) );
@@ -581,14 +564,6 @@ void personnalisation_etat (void)
REPORT_TREE_PAGE_COLUMN, page++,
REPORT_TREE_BOLD_COLUMN, 400, -1);
- gtk_tree_store_append ( GTK_TREE_STORE ( report_tree_model ), &iter2, &iter );
- gtk_tree_store_set ( GTK_TREE_STORE ( report_tree_model ), &iter2,
- REPORT_TREE_TEXT_COLUMN, _("Amounts"),
- REPORT_TREE_PAGE_COLUMN, page++,
- REPORT_TREE_BOLD_COLUMN, 400,
- -1 );
-
- /* append page Payment methods */
gtk_notebook_append_page ( GTK_NOTEBOOK ( notebook_config_etat ),
onglet_etat_mode_paiement (),
gtk_label_new ( _("Payment methods") ) );
@@ -598,14 +573,6 @@ void personnalisation_etat (void)
REPORT_TREE_PAGE_COLUMN, page++,
REPORT_TREE_BOLD_COLUMN, 400, -1);
- gtk_tree_store_append ( GTK_TREE_STORE ( report_tree_model ), &iter2, &iter );
- gtk_tree_store_set ( GTK_TREE_STORE ( report_tree_model ), &iter2,
- REPORT_TREE_TEXT_COLUMN, _("Payment methods"),
- REPORT_TREE_PAGE_COLUMN, page++,
- REPORT_TREE_BOLD_COLUMN, 400,
- -1 );
-
- /* append page Misc. */
gtk_notebook_append_page ( GTK_NOTEBOOK ( notebook_config_etat ),
onglet_etat_divers (),
gtk_label_new ( _("Misc.") ) );
@@ -615,24 +582,17 @@ void personnalisation_etat (void)
REPORT_TREE_PAGE_COLUMN, page++,
REPORT_TREE_BOLD_COLUMN, 400, -1);
- gtk_tree_store_append ( GTK_TREE_STORE ( report_tree_model ), &iter2, &iter );
- gtk_tree_store_set ( GTK_TREE_STORE ( report_tree_model ), &iter2,
- REPORT_TREE_TEXT_COLUMN, _("Miscellaneous"),
- REPORT_TREE_PAGE_COLUMN, page++,
- REPORT_TREE_BOLD_COLUMN, 400,
- -1 );
/* remplissage de l'onglet d'organisation */
- gtk_tree_store_append ( GTK_TREE_STORE ( report_tree_model ), &iter, NULL );
- gtk_tree_store_set (GTK_TREE_STORE ( report_tree_model ), &iter,
- REPORT_TREE_TEXT_COLUMN, _("Data organization"),
- REPORT_TREE_PAGE_COLUMN, -1,
- REPORT_TREE_BOLD_COLUMN, 800,
- -1 );
+ gtk_tree_store_append (GTK_TREE_STORE (report_tree_model), &iter, NULL);
+ gtk_tree_store_set (GTK_TREE_STORE (report_tree_model), &iter,
+ REPORT_TREE_TEXT_COLUMN, _("Data organization"),
+ REPORT_TREE_PAGE_COLUMN, -1,
+ REPORT_TREE_BOLD_COLUMN, 800, -1);
/* Data grouping */
- gtk_tree_store_append (GTK_TREE_STORE ( report_tree_model ), &iter2, &iter );
- gtk_tree_store_set (GTK_TREE_STORE ( report_tree_model ), &iter2,
+ gtk_tree_store_append (GTK_TREE_STORE (report_tree_model), &iter2, &iter );
+ gtk_tree_store_set (GTK_TREE_STORE (report_tree_model), &iter2,
REPORT_TREE_TEXT_COLUMN, _("Data grouping"),
REPORT_TREE_PAGE_COLUMN, page++,
REPORT_TREE_BOLD_COLUMN, 400, -1);
@@ -641,25 +601,22 @@ void personnalisation_etat (void)
gtk_label_new (_("Data grouping")) );
/* Data separation */
+ gtk_tree_store_append (GTK_TREE_STORE (report_tree_model), &iter2, &iter);
+ gtk_tree_store_set (GTK_TREE_STORE (report_tree_model), &iter2,
+ REPORT_TREE_TEXT_COLUMN, _("Data separation"),
+ REPORT_TREE_PAGE_COLUMN, page++,
+ REPORT_TREE_BOLD_COLUMN, 400, -1);
gtk_notebook_append_page ( GTK_NOTEBOOK ( notebook_config_etat ),
page_data_separation(),
gtk_label_new (_("Data separation")) );
- gtk_tree_store_append ( GTK_TREE_STORE ( report_tree_model ), &iter2, &iter );
- gtk_tree_store_set ( GTK_TREE_STORE ( report_tree_model ), &iter2,
- REPORT_TREE_TEXT_COLUMN, _("Data separation"),
- REPORT_TREE_PAGE_COLUMN, page++,
- REPORT_TREE_BOLD_COLUMN, 400,
- -1 );
-
/* remplissage de l'onglet d'affichage */
- gtk_tree_store_append ( GTK_TREE_STORE ( report_tree_model ), &iter, NULL );
- gtk_tree_store_set (GTK_TREE_STORE ( report_tree_model ), &iter,
- REPORT_TREE_TEXT_COLUMN, _("Data display"),
- REPORT_TREE_PAGE_COLUMN, -1,
- REPORT_TREE_BOLD_COLUMN, 800,
- -1 );
- /* append page Generalities */
+ gtk_tree_store_append (GTK_TREE_STORE (report_tree_model), &iter, NULL);
+ gtk_tree_store_set (GTK_TREE_STORE (report_tree_model), &iter,
+ REPORT_TREE_TEXT_COLUMN, _("Data display"),
+ REPORT_TREE_PAGE_COLUMN, -1,
+ REPORT_TREE_BOLD_COLUMN, 800, -1);
+
gtk_notebook_append_page ( GTK_NOTEBOOK ( notebook_config_etat ),
onglet_affichage_etat_generalites (),
gtk_label_new (_("Generalities")) );
@@ -669,7 +626,6 @@ void personnalisation_etat (void)
REPORT_TREE_PAGE_COLUMN, page++,
REPORT_TREE_BOLD_COLUMN, 400, -1);
- /* append page Titles */
gtk_notebook_append_page ( GTK_NOTEBOOK ( notebook_config_etat ),
onglet_affichage_etat_divers (),
gtk_label_new (_("Titles")) );
@@ -679,14 +635,6 @@ void personnalisation_etat (void)
REPORT_TREE_PAGE_COLUMN, page++,
REPORT_TREE_BOLD_COLUMN, 400, -1);
- gtk_tree_store_append ( GTK_TREE_STORE ( report_tree_model ), &iter2, &iter );
- gtk_tree_store_set ( GTK_TREE_STORE ( report_tree_model ), &iter2,
- REPORT_TREE_TEXT_COLUMN, _("Titles"),
- REPORT_TREE_PAGE_COLUMN, page++,
- REPORT_TREE_BOLD_COLUMN, 400,
- -1 );
-
- /* append page Transactions */
gtk_notebook_append_page ( GTK_NOTEBOOK ( notebook_config_etat ),
onglet_affichage_etat_operations (),
gtk_label_new (_("Transactions")) );
@@ -696,14 +644,6 @@ void personnalisation_etat (void)
REPORT_TREE_PAGE_COLUMN, page++,
REPORT_TREE_BOLD_COLUMN, 400, -1);
- gtk_tree_store_append ( GTK_TREE_STORE ( report_tree_model ), &iter2, &iter );
- gtk_tree_store_set ( GTK_TREE_STORE ( report_tree_model ), &iter2,
- REPORT_TREE_TEXT_COLUMN, _("Transactions"),
- REPORT_TREE_PAGE_COLUMN, page++,
- REPORT_TREE_BOLD_COLUMN, 400,
- -1 );
-
- /* append page Currencies */
gtk_notebook_append_page ( GTK_NOTEBOOK ( notebook_config_etat ),
onglet_affichage_etat_devises (),
gtk_label_new (_("Currencies")) );
@@ -713,12 +653,6 @@ void personnalisation_etat (void)
REPORT_TREE_PAGE_COLUMN, page++,
REPORT_TREE_BOLD_COLUMN, 400, -1);
- gtk_tree_store_append (GTK_TREE_STORE (report_tree_model), &iter2, &iter);
- gtk_tree_store_append ( GTK_TREE_STORE ( report_tree_model ), &iter2, &iter );
- gtk_tree_store_set ( GTK_TREE_STORE ( report_tree_model ), &iter2,
- REPORT_TREE_PAGE_COLUMN, page++,
- REPORT_TREE_BOLD_COLUMN, 400,
- -1);
/* on va maintenant remplir toutes les infos de l'état */
@@ -726,436 +660,499 @@ void personnalisation_etat (void)
/* on met le name de l'état */
gtk_entry_set_text ( GTK_ENTRY ( entree_nom_etat ),
- gsb_data_report_get_report_name ( current_report_number ) );
+ gsb_data_report_get_report_name (current_report_number) );
/* on remplit le ctree en fonction du classement courant */
- list_tmp = gsb_data_report_get_sorting_type ( current_report_number );
+
+ list_tmp = gsb_data_report_get_sorting_type (current_report_number);
parent = NULL;
gtk_clist_clear ( GTK_CLIST ( liste_type_classement_etat ));
while ( list_tmp )
{
- gchar *text[1];
-
- text[0] = NULL;
-
- switch ( GPOINTER_TO_INT ( list_tmp -> data ))
- {
- case 1:
- text[0] = _("Category");
- break;
-
- case 3:
- text[0] = _("Budgetary line");
- break;
-
- case 5:
- text[0] = _("Account");
- break;
-
- case 6:
- text[0] = _("Payee");
- break;
-
- }
-
- if ( text[0] )
- {
- parent = gtk_ctree_insert_node ( GTK_CTREE ( liste_type_classement_etat ),
- parent,
- NULL,
- text,
- 5,
- NULL,
- NULL,
- NULL,
- NULL,
- FALSE,
- TRUE );
- gtk_ctree_node_set_row_data ( GTK_CTREE ( liste_type_classement_etat ),
- GTK_CTREE_NODE ( parent ),
- list_tmp -> data );
- }
-
- list_tmp = list_tmp -> next;
+ gchar *text[1];
+
+ text[0] = NULL;
+
+ switch ( GPOINTER_TO_INT ( list_tmp -> data ))
+ {
+ case 1:
+ text[0] = _("Category");
+ break;
+
+ case 3:
+ text[0] = _("Budgetary line");
+ break;
+
+ case 5:
+ text[0] = _("Account");
+ break;
+
+ case 6:
+ text[0] = _("Payee");
+ break;
+
+ }
+
+ if ( text[0] )
+ {
+ parent = gtk_ctree_insert_node ( GTK_CTREE ( liste_type_classement_etat ),
+ parent,
+ NULL,
+ text,
+ 5,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ FALSE,
+ TRUE );
+ gtk_ctree_node_set_row_data ( GTK_CTREE ( liste_type_classement_etat ),
+ GTK_CTREE_NODE ( parent ),
+ list_tmp -> data );
+ }
+
+ list_tmp = list_tmp -> next;
}
- gtk_clist_select_row ( GTK_CLIST ( liste_type_classement_etat ), 0, 0 );
+ gtk_clist_select_row ( GTK_CLIST ( liste_type_classement_etat ),
+ 0,
+ 0 );
- if ( gsb_data_report_get_show_r ( current_report_number ) )
+ if ( gsb_data_report_get_show_r (current_report_number))
{
- if ( gsb_data_report_get_show_r (current_report_number) == 1 )
- gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_opes_non_r_etat ),
- TRUE );
- else
- if (gsb_data_report_get_show_r (current_report_number))
- gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_opes_r_etat ),
- TRUE );
+ if ( gsb_data_report_get_show_r (current_report_number) == 1 )
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_opes_non_r_etat ),
+ TRUE );
+ else
+ if (gsb_data_report_get_show_r (current_report_number))
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_opes_r_etat ),
+ TRUE );
}
else
- gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_opes_r_et_non_r_etat ),
- TRUE );
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_opes_r_et_non_r_etat ),
+ TRUE );
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_opes ),
- gsb_data_report_get_show_report_transactions ( current_report_number ) );
+ gsb_data_report_get_show_report_transactions (current_report_number));
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_nb_opes ),
- gsb_data_report_get_show_report_transaction_amount ( current_report_number ) );
+ gsb_data_report_get_show_report_transaction_amount (current_report_number));
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_no_ope ),
- gsb_data_report_get_show_report_transaction_number ( current_report_number ) );
+ gsb_data_report_get_show_report_transaction_number (current_report_number));
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_date_opes ),
- gsb_data_report_get_show_report_date ( current_report_number ) );
+ gsb_data_report_get_show_report_date (current_report_number));
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_value_date_opes ),
- gsb_data_report_get_show_report_value_date ( current_report_number ) );
+ gsb_data_report_get_show_report_value_date (current_report_number));
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_tiers_opes ),
- gsb_data_report_get_show_report_payee ( current_report_number ) );
+ gsb_data_report_get_show_report_payee (current_report_number));
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_categ_opes ),
- gsb_data_report_get_show_report_category ( current_report_number ) );
+ gsb_data_report_get_show_report_category (current_report_number));
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_sous_categ_opes ),
- gsb_data_report_get_show_report_sub_category ( current_report_number ) );
+ gsb_data_report_get_show_report_sub_category (current_report_number));
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_type_ope ),
- gsb_data_report_get_show_report_method_of_payment ( current_report_number ) );
+ gsb_data_report_get_show_report_method_of_payment (current_report_number));
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_ib_opes ),
- gsb_data_report_get_show_report_budget ( current_report_number ) );
+ gsb_data_report_get_show_report_budget (current_report_number));
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_sous_ib_opes ),
- gsb_data_report_get_show_report_sub_budget ( current_report_number ) );
+ gsb_data_report_get_show_report_sub_budget (current_report_number));
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_no_cheque ),
- gsb_data_report_get_show_report_method_of_payment_content ( current_report_number ) );
+ gsb_data_report_get_show_report_method_of_payment_content (current_report_number));
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_notes_opes ),
- gsb_data_report_get_show_report_note ( current_report_number ) );
+ gsb_data_report_get_show_report_note (current_report_number));
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_pc_opes ),
- gsb_data_report_get_show_report_voucher ( current_report_number ) );
+ gsb_data_report_get_show_report_voucher (current_report_number));
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_no_rappr ),
- gsb_data_report_get_show_report_marked ( current_report_number ) );
+ gsb_data_report_get_show_report_marked (current_report_number));
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_infobd_opes ),
- gsb_data_report_get_show_report_bank_references ( current_report_number ) );
+ gsb_data_report_get_show_report_bank_references (current_report_number));
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_pas_detailler_ventilation ),
- gsb_data_report_get_not_detail_split ( current_report_number ) );
+ gsb_data_report_get_not_detail_split (current_report_number));
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_separer_revenus_depenses ),
- gsb_data_report_get_split_credit_debit ( current_report_number ) );
+ gsb_data_report_get_split_credit_debit (current_report_number));
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_exo_opes ),
- gsb_data_report_get_show_report_financial_year ( current_report_number ) );
+ gsb_data_report_get_show_report_financial_year (current_report_number));
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_titres_colonnes ),
- gsb_data_report_get_column_title_show ( current_report_number ) );
+ gsb_data_report_get_column_title_show (current_report_number));
gtk_option_menu_set_history ( GTK_OPTION_MENU ( bouton_choix_classement_ope_etat ),
- gsb_data_report_get_sorting_report ( current_report_number ) );
+ gsb_data_report_get_sorting_report (current_report_number));
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_rendre_ope_clickables ),
- gsb_data_report_get_report_can_click ( current_report_number ) );
-
- if ( !gsb_data_report_get_column_title_type ( current_report_number ) )
- gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_titre_en_haut ), TRUE );
+ gsb_data_report_get_report_can_click (current_report_number));
+ if ( !gsb_data_report_get_column_title_type (current_report_number))
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_titre_en_haut ),
+ TRUE );
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_inclure_dans_tiers ),
- gsb_data_report_get_append_in_payee ( current_report_number ) );
+ gsb_data_report_get_append_in_payee (current_report_number));
/* on rend insensitif les sous qque choses si nécessaire */
- sens_desensitive_pointeur ( bouton_afficher_opes, vbox_show_transactions );
- sens_desensitive_pointeur ( bouton_afficher_categ_opes, bouton_afficher_sous_categ_opes );
- sens_desensitive_pointeur ( bouton_afficher_ib_opes, bouton_afficher_sous_ib_opes );
- sens_desensitive_pointeur ( bouton_afficher_titres_colonnes, bouton_titre_changement );
- sens_desensitive_pointeur ( bouton_afficher_titres_colonnes, bouton_titre_en_haut );
+ sens_desensitive_pointeur ( bouton_afficher_opes,
+ vbox_show_transactions );
+ sens_desensitive_pointeur ( bouton_afficher_categ_opes,
+ bouton_afficher_sous_categ_opes );
+ sens_desensitive_pointeur ( bouton_afficher_ib_opes,
+ bouton_afficher_sous_ib_opes );
+ sens_desensitive_pointeur ( bouton_afficher_titres_colonnes,
+ bouton_titre_changement );
+ sens_desensitive_pointeur ( bouton_afficher_titres_colonnes,
+ bouton_titre_en_haut );
/* mise en forme de la devise */
gsb_currency_set_combobox_history ( bouton_devise_general_etat,
- gsb_data_report_get_currency_general ( current_report_number ) );
+ gsb_data_report_get_currency_general (current_report_number));
/* onglet dates */
+
+
if ( gsb_data_report_get_use_financial_year (current_report_number))
{
- gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( radio_button_utilise_exo ), TRUE );
- gtk_widget_set_sensitive ( vbox_utilisation_date, FALSE );
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( radio_button_utilise_exo ),
+ TRUE );
+ gtk_widget_set_sensitive ( vbox_utilisation_date,
+ FALSE );
}
else
- gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( radio_button_utilise_dates ), TRUE );
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( radio_button_utilise_dates ),
+ TRUE );
- sens_desensitive_pointeur ( radio_button_utilise_exo, bouton_separe_exo_etat );
+ sens_desensitive_pointeur ( radio_button_utilise_exo,
+ bouton_separe_exo_etat );
- if ( gsb_data_report_get_financial_year_type ( current_report_number ) == 3 )
- gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_detaille_exo_etat ), TRUE );
+ if ( gsb_data_report_get_financial_year_type (current_report_number) == 3 )
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_detaille_exo_etat ),
+ TRUE );
else
{
- gtk_widget_set_sensitive ( vbox_generale_exo_etat, FALSE );
-
- if ( gsb_data_report_get_financial_year_type ( current_report_number ) )
- {
- if ( gsb_data_report_get_financial_year_type ( current_report_number ) == 1 )
- gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_exo_courant ), TRUE );
- else
- gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_exo_precedent ), TRUE );
- }
- else
- gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_exo_tous ), TRUE );
+ gtk_widget_set_sensitive ( vbox_generale_exo_etat,
+ FALSE );
+
+ if ( gsb_data_report_get_financial_year_type (current_report_number))
+ {
+ if ( gsb_data_report_get_financial_year_type (current_report_number) == 1 )
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_exo_courant ),
+ TRUE );
+ else
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_exo_precedent ),
+ TRUE );
+ }
+ else
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_exo_tous ),
+ TRUE );
}
+
/* on sélectionne les exercices */
- selectionne_liste_exo_etat_courant ( );
+
+ selectionne_liste_exo_etat_courant ();
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_separe_exo_etat ),
- gsb_data_report_get_financial_year_split ( current_report_number ) );
+ gsb_data_report_get_financial_year_split (current_report_number));
/* on sélectionne la plage de date */
+
gtk_clist_select_row ( GTK_CLIST ( liste_plages_dates_etat ),
- gsb_data_report_get_date_type ( current_report_number ),
- 0 );
+ gsb_data_report_get_date_type (current_report_number),
+ 0 );
- if ( gsb_data_report_get_date_type ( current_report_number ) != 1 )
+ if ( gsb_data_report_get_date_type (current_report_number) != 1 )
{
- gtk_widget_set_sensitive ( entree_date_init_etat, FALSE );
- gtk_widget_set_sensitive ( entree_date_finale_etat, FALSE );
+ gtk_widget_set_sensitive ( entree_date_init_etat,
+ FALSE );
+ gtk_widget_set_sensitive ( entree_date_finale_etat,
+ FALSE );
}
else
{
- gtk_widget_set_sensitive ( entree_date_init_etat, TRUE );
- gtk_widget_set_sensitive ( entree_date_finale_etat, TRUE );
+ gtk_widget_set_sensitive ( entree_date_init_etat,
+ TRUE );
+ gtk_widget_set_sensitive ( entree_date_finale_etat,
+ TRUE );
}
/* on remplit les dates perso si elles existent */
- if ( gsb_data_report_get_personal_date_start ( current_report_number ) )
- gsb_calendar_entry_set_date ( entree_date_init_etat,
- gsb_data_report_get_personal_date_start ( current_report_number ) );
+ if ( gsb_data_report_get_personal_date_start (current_report_number))
+ gsb_calendar_entry_set_date ( entree_date_init_etat,
+ gsb_data_report_get_personal_date_start (current_report_number));
- if ( gsb_data_report_get_personal_date_end ( current_report_number ) )
- gsb_calendar_entry_set_date ( entree_date_finale_etat,
- gsb_data_report_get_personal_date_end ( current_report_number ) );
+ if ( gsb_data_report_get_personal_date_end (current_report_number))
+ gsb_calendar_entry_set_date ( entree_date_finale_etat,
+ gsb_data_report_get_personal_date_end (current_report_number));
/* on remplit les détails de la séparation des dates */
- if ( gsb_data_report_get_period_split ( current_report_number ) )
+ if ( gsb_data_report_get_period_split (current_report_number))
{
- gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_separe_plages_etat ), TRUE );
-
- if ( gtk_option_menu_get_history ( GTK_OPTION_MENU ( bouton_type_separe_plages_etat ) ) == 1)
- gtk_widget_set_sensitive ( bouton_debut_semaine, TRUE );
- else
- gtk_widget_set_sensitive ( bouton_debut_semaine, FALSE );
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_separe_plages_etat ),
+ TRUE );
+ if (gtk_option_menu_get_history ( GTK_OPTION_MENU ( bouton_type_separe_plages_etat )) == 1)
+ gtk_widget_set_sensitive ( bouton_debut_semaine,
+ TRUE );
+ else
+ gtk_widget_set_sensitive ( bouton_debut_semaine,
+ FALSE );
}
else
{
- gtk_widget_set_sensitive ( bouton_type_separe_plages_etat, FALSE );
- gtk_widget_set_sensitive ( bouton_debut_semaine, FALSE );
+ gtk_widget_set_sensitive ( bouton_type_separe_plages_etat,
+ FALSE );
+ gtk_widget_set_sensitive ( bouton_debut_semaine,
+ FALSE );
}
gtk_option_menu_set_history ( GTK_OPTION_MENU ( bouton_type_separe_plages_etat ),
- gsb_data_report_get_period_split_type ( current_report_number ) );
+ gsb_data_report_get_period_split_type (current_report_number));
gtk_option_menu_set_history ( GTK_OPTION_MENU ( bouton_debut_semaine ),
- gsb_data_report_get_period_split_day ( current_report_number ) );
+ gsb_data_report_get_period_split_day (current_report_number));
/* onglet comptes */
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_detaille_comptes_etat ),
- gsb_data_report_get_account_use_chosen ( current_report_number ) );
+ gsb_data_report_get_account_use_chosen (current_report_number));
- sens_desensitive_pointeur ( bouton_detaille_comptes_etat, vbox_generale_comptes_etat );
+ sens_desensitive_pointeur ( bouton_detaille_comptes_etat,
+ vbox_generale_comptes_etat );
- selectionne_liste_comptes_etat_courant ( );
+ selectionne_liste_comptes_etat_courant ();
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_regroupe_ope_compte_etat ),
- gsb_data_report_get_account_group_reports ( current_report_number ) );
+ gsb_data_report_get_account_group_reports (current_report_number));
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_affiche_sous_total_compte ),
- gsb_data_report_get_account_show_amount ( current_report_number ) );
+ gsb_data_report_get_account_show_amount (current_report_number));
- sens_desensitive_pointeur ( bouton_regroupe_ope_compte_etat, bouton_affiche_sous_total_compte );
+ sens_desensitive_pointeur ( bouton_regroupe_ope_compte_etat,
+ bouton_affiche_sous_total_compte );
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_noms_comptes ),
- gsb_data_report_get_account_show_name ( current_report_number ) );
+ gsb_data_report_get_account_show_name (current_report_number));
/* onglet virements */
- if ( gsb_data_report_get_transfer_choice ( current_report_number ) )
+
+
+ if ( gsb_data_report_get_transfer_choice (current_report_number))
{
- if ( gsb_data_report_get_transfer_choice ( current_report_number ) == 1 )
- gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_inclusion_virements_actifs_etat ), TRUE );
- else
- {
- if ( gsb_data_report_get_transfer_choice ( current_report_number ) == 2 )
- gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_inclusion_virements_hors_etat ), TRUE );
- else
- gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_inclusion_virements_perso ), TRUE );
- }
+ if ( gsb_data_report_get_transfer_choice (current_report_number)== 1 )
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_inclusion_virements_actifs_etat ),
+ TRUE );
+ else
+ {
+ if ( gsb_data_report_get_transfer_choice (current_report_number)== 2 )
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_inclusion_virements_hors_etat ),
+ TRUE );
+ else
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_inclusion_virements_perso ),
+ TRUE );
+ }
}
else
{
- gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_non_inclusion_virements ), TRUE );
- gtk_widget_set_sensitive ( bouton_exclure_non_virements_etat, FALSE );
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_non_inclusion_virements ),
+ TRUE );
+ gtk_widget_set_sensitive ( bouton_exclure_non_virements_etat,
+ FALSE );
}
- sens_desensitive_pointeur ( bouton_inclusion_virements_perso, hbox_liste_comptes_virements );
+ sens_desensitive_pointeur ( bouton_inclusion_virements_perso,
+ hbox_liste_comptes_virements );
- selectionne_liste_virements_etat_courant ( );
+ selectionne_liste_virements_etat_courant ();
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_exclure_non_virements_etat ),
- gsb_data_report_get_transfer_reports_only ( current_report_number ) );
+ gsb_data_report_get_transfer_reports_only (current_report_number));
/* onglet catégories */
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( button_group_by_categ ),
- gsb_data_report_get_category_used ( current_report_number ) );
-
- sens_desensitive_pointeur ( button_group_by_categ, bouton_affiche_sous_total_categ );
- sens_desensitive_pointeur ( button_group_by_categ, bouton_afficher_sous_categ );
- sens_desensitive_pointeur ( button_group_by_categ, bouton_affiche_sous_total_sous_categ );
- sens_desensitive_pointeur ( button_group_by_categ, bouton_afficher_pas_de_sous_categ );
- sens_desensitive_pointeur ( button_group_by_categ, bouton_afficher_noms_categ );
+ gsb_data_report_get_category_used (current_report_number));
+
+ sens_desensitive_pointeur ( button_group_by_categ,
+ bouton_affiche_sous_total_categ );
+ sens_desensitive_pointeur ( button_group_by_categ,
+ bouton_afficher_sous_categ );
+ sens_desensitive_pointeur ( button_group_by_categ,
+ bouton_affiche_sous_total_sous_categ );
+ sens_desensitive_pointeur ( button_group_by_categ,
+ bouton_afficher_pas_de_sous_categ );
+ sens_desensitive_pointeur ( button_group_by_categ,
+ bouton_afficher_noms_categ );
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( button_detail_categ ),
- gsb_data_report_get_category_detail_used ( current_report_number ) );
+ gsb_data_report_get_category_detail_used (current_report_number));
- sens_desensitive_pointeur ( button_detail_categ, hbox_detaille_categ_etat );
+ sens_desensitive_pointeur ( button_detail_categ,
+ hbox_detaille_categ_etat );
/* select the categories and sub-categories */
- report_config_category_update_treeview ( TRUE );
+ report_config_category_update_treeview (TRUE);
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_affiche_sous_total_categ ),
- gsb_data_report_get_category_show_category_amount ( current_report_number ) );
+ gsb_data_report_get_category_show_category_amount (current_report_number));
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_sous_categ ),
- gsb_data_report_get_category_show_sub_category ( current_report_number ) );
+ gsb_data_report_get_category_show_sub_category (current_report_number));
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_affiche_sous_total_sous_categ ),
- gsb_data_report_get_category_show_sub_category_amount ( current_report_number ) );
+ gsb_data_report_get_category_show_sub_category_amount (current_report_number));
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_pas_de_sous_categ ),
- gsb_data_report_get_category_show_without_category ( current_report_number ) );
+ gsb_data_report_get_category_show_without_category (current_report_number));
/* mise en forme de la devise */
+
selectionne_devise_categ_etat_courant ();
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_noms_categ ),
- gsb_data_report_get_category_show_name ( current_report_number ) );
+ gsb_data_report_get_category_show_name (current_report_number));
+
/* onglet ib */
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_utilise_ib_etat ),
- gsb_data_report_get_budget_used ( current_report_number ) );
-
- sens_desensitive_pointeur ( bouton_utilise_ib_etat, bouton_affiche_sous_total_ib );
- sens_desensitive_pointeur ( bouton_utilise_ib_etat, bouton_afficher_sous_ib );
- sens_desensitive_pointeur ( bouton_utilise_ib_etat, bouton_affiche_sous_total_sous_ib );
- sens_desensitive_pointeur ( bouton_utilise_ib_etat, bouton_afficher_pas_de_sous_ib );
- sens_desensitive_pointeur ( bouton_utilise_ib_etat, bouton_afficher_noms_ib );
+ gsb_data_report_get_budget_used (current_report_number));
+
+ sens_desensitive_pointeur ( bouton_utilise_ib_etat,
+ bouton_affiche_sous_total_ib );
+ sens_desensitive_pointeur ( bouton_utilise_ib_etat,
+ bouton_afficher_sous_ib );
+ sens_desensitive_pointeur ( bouton_utilise_ib_etat,
+ bouton_affiche_sous_total_sous_ib );
+ sens_desensitive_pointeur ( bouton_utilise_ib_etat,
+ bouton_afficher_pas_de_sous_ib );
+ sens_desensitive_pointeur ( bouton_utilise_ib_etat,
+ bouton_afficher_noms_ib );
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_detaille_ib_etat ),
- gsb_data_report_get_budget_detail_used ( current_report_number ) );
+ gsb_data_report_get_budget_detail_used (current_report_number));
- sens_desensitive_pointeur ( bouton_detaille_ib_etat, hbox_detaille_ib_etat );
+ sens_desensitive_pointeur ( bouton_detaille_ib_etat,
+ hbox_detaille_ib_etat );
/* select the budgets and sub-budgets */
- report_config_category_update_treeview ( FALSE );
+ report_config_category_update_treeview (FALSE);
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_affiche_sous_total_ib ),
- gsb_data_report_get_budget_show_budget_amount ( current_report_number ) );
+ gsb_data_report_get_budget_show_budget_amount (current_report_number));
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_sous_ib ),
- gsb_data_report_get_budget_show_sub_budget ( current_report_number ) );
+ gsb_data_report_get_budget_show_sub_budget (current_report_number));
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_affiche_sous_total_sous_ib ),
- gsb_data_report_get_budget_show_sub_budget_amount ( current_report_number ) );
+ gsb_data_report_get_budget_show_sub_budget_amount (current_report_number));
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_pas_de_sous_ib ),
- gsb_data_report_get_budget_show_without_budget ( current_report_number ) );
+ gsb_data_report_get_budget_show_without_budget (current_report_number));
/* mise en forme de la devise */
+
selectionne_devise_ib_etat_courant ();
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_noms_ib ),
- gsb_data_report_get_budget_show_name ( current_report_number ) );
+ gsb_data_report_get_budget_show_name (current_report_number));
/* onglet tiers */
+
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_utilise_tiers_etat ),
- gsb_data_report_get_payee_used ( current_report_number ) );
+ gsb_data_report_get_payee_used (current_report_number));
- sens_desensitive_pointeur ( bouton_utilise_tiers_etat, bouton_afficher_noms_tiers );
- sens_desensitive_pointeur ( bouton_utilise_tiers_etat, bouton_affiche_sous_total_tiers );
+ sens_desensitive_pointeur ( bouton_utilise_tiers_etat,
+ bouton_afficher_noms_tiers );
+ sens_desensitive_pointeur ( bouton_utilise_tiers_etat,
+ bouton_affiche_sous_total_tiers );
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_detaille_tiers_etat ),
- gsb_data_report_get_payee_detail_used ( current_report_number ) );
+ gsb_data_report_get_payee_detail_used (current_report_number));
- sens_desensitive_pointeur ( bouton_detaille_tiers_etat, hbox_detaille_tiers_etat );
+ sens_desensitive_pointeur ( bouton_detaille_tiers_etat,
+ hbox_detaille_tiers_etat );
/* on sélectionne les tiers choisies */
- selectionne_liste_tiers_etat_courant ( );
+
+ selectionne_liste_tiers_etat_courant();
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_affiche_sous_total_tiers ),
- gsb_data_report_get_payee_show_payee_amount ( current_report_number ) );
+ gsb_data_report_get_payee_show_payee_amount (current_report_number));
/* mise en forme de la devise */
- selectionne_devise_tiers_etat_courant ( );
+
+ selectionne_devise_tiers_etat_courant ();
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_noms_tiers ),
- gsb_data_report_get_payee_show_name ( current_report_number ) );
+ gsb_data_report_get_payee_show_name (current_report_number));
/* onglet texte */
+
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_utilise_texte ),
- gsb_data_report_get_text_comparison_used ( current_report_number ) );
- sens_desensitive_pointeur ( bouton_utilise_texte, vbox_generale_textes_etat );
+ gsb_data_report_get_text_comparison_used (current_report_number));
+ sens_desensitive_pointeur ( bouton_utilise_texte,
+ vbox_generale_textes_etat );
+ remplit_liste_comparaisons_textes_etat ();
- remplit_liste_comparaisons_textes_etat ( );
/* onglet montant */
+
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_utilise_montant ),
- gsb_data_report_get_amount_comparison_used ( current_report_number ) );
+ gsb_data_report_get_amount_comparison_used (current_report_number));
gsb_currency_set_combobox_history ( bouton_devise_montant_etat,
- gsb_data_report_get_amount_comparison_currency ( current_report_number ) );
- sens_desensitive_pointeur ( bouton_utilise_montant, vbox_generale_montants_etat );
-
- remplit_liste_comparaisons_montants_etat ( );
+ gsb_data_report_get_amount_comparison_currency (current_report_number));
+ sens_desensitive_pointeur ( bouton_utilise_montant,
+ vbox_generale_montants_etat );
+ remplit_liste_comparaisons_montants_etat ();
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_exclure_ope_nulles_etat ),
- gsb_data_report_get_amount_comparison_only_report_non_null ( current_report_number ) );
+ gsb_data_report_get_amount_comparison_only_report_non_null (current_report_number));
/* onglet modes de paiement */
+
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( bouton_detaille_mode_paiement_etat ),
- gsb_data_report_get_method_of_payment_used ( current_report_number ) );
+ gsb_data_report_get_method_of_payment_used (current_report_number));
- sens_desensitive_pointeur ( bouton_detaille_mode_paiement_etat, vbox_mode_paiement_etat );
+ sens_desensitive_pointeur ( bouton_detaille_mode_paiement_etat,
+ vbox_mode_paiement_etat );
selectionne_liste_modes_paiement_etat_courant ();
gtk_widget_show_all ( dialog );
- switch ( gtk_dialog_run ( GTK_DIALOG ( dialog ) ) )
+ switch ( gtk_dialog_run ( GTK_DIALOG(dialog) ) )
{
- case GTK_RESPONSE_OK:
- recuperation_info_perso_etat ();
- break;
+ case GTK_RESPONSE_OK:
+ recuperation_info_perso_etat ();
+ break;
- default:
- break;
+ default:
+ break;
}
gtk_widget_destroy ( dialog );
}
+
/**
*
*
*
*/
gboolean report_tree_view_selection_changed ( GtkTreeSelection *selection,
- GtkTreeModel *model )
+ GtkTreeModel *model )
{
GtkTreeIter iter;
gint selected;
- if (! gtk_tree_selection_get_selected ( selection, NULL, &iter ) )
- return(FALSE);
+ if (! gtk_tree_selection_get_selected (selection, NULL, &iter))
+ return(FALSE);
gtk_tree_model_get ( model, &iter, 1, &selected, -1 );
- gtk_notebook_set_current_page ( GTK_NOTEBOOK ( notebook_config_etat ), selected );
+ gtk_notebook_set_current_page ( GTK_NOTEBOOK ( notebook_config_etat ), selected);
return FALSE;
}
-/**
- *
- *
- *
- */
+
gboolean report_tree_selectable_func (GtkTreeSelection *selection,
- GtkTreeModel *model,
- GtkTreePath *path,
- gboolean path_currently_selected,
- gpointer data)
+ GtkTreeModel *model,
+ GtkTreePath *path,
+ gboolean path_currently_selected,
+ gpointer data)
{
GtkTreeIter iter;
gint selectable;
@@ -1167,11 +1164,8 @@ gboolean report_tree_selectable_func (GtkTreeSelection *selection,
}
-/**
- *
- *
- *
- */
+
+/******************************************************************************/
void selectionne_liste_exo_etat_courant ( void )
{
GSList *pointeur_sliste;
@@ -1185,22 +1179,19 @@ void selectionne_liste_exo_etat_courant ( void )
while ( pointeur_sliste )
{
- gint row;
-
- row = gtk_clist_find_row_from_data ( GTK_CLIST ( liste_exo_etat ),
- pointeur_sliste -> data );
- gtk_clist_select_row ( GTK_CLIST ( liste_exo_etat ), row, 0 );
+ gint row;
- pointeur_sliste = pointeur_sliste -> next;
+ row = gtk_clist_find_row_from_data ( GTK_CLIST ( liste_exo_etat ),
+ pointeur_sliste -> data );
+ gtk_clist_select_row ( GTK_CLIST ( liste_exo_etat ),
+ row,
+ 0 );
+ pointeur_sliste = pointeur_sliste -> next;
}
}
+/******************************************************************************/
-
-/**
- *
- *
- *
- */
+/******************************************************************************/
void selectionne_liste_comptes_etat_courant ( void )
{
GSList *pointeur_sliste;
@@ -1210,7 +1201,7 @@ void selectionne_liste_comptes_etat_courant ( void )
if ( !liste_comptes_etat )
- return;
+ return;
gtk_clist_unselect_all ( GTK_CLIST ( liste_comptes_etat ));
@@ -1218,21 +1209,16 @@ void selectionne_liste_comptes_etat_courant ( void )
while ( pointeur_sliste )
{
- gtk_clist_select_row ( GTK_CLIST ( liste_comptes_etat ),
- gtk_clist_find_row_from_data ( GTK_CLIST ( liste_comptes_etat ),
- pointeur_sliste -> data ),
- 0 );
-
- pointeur_sliste = pointeur_sliste -> next;
+ gtk_clist_select_row ( GTK_CLIST ( liste_comptes_etat ),
+ gtk_clist_find_row_from_data ( GTK_CLIST ( liste_comptes_etat ),
+ pointeur_sliste -> data ),
+ 0 );
+ pointeur_sliste = pointeur_sliste -> next;
}
}
+/******************************************************************************/
-
-/**
- *
- *
- *
- */
+/******************************************************************************/
void selectionne_liste_virements_etat_courant ( void )
{
GSList *pointeur_sliste;
@@ -1247,53 +1233,40 @@ void selectionne_liste_virements_etat_courant ( void )
while ( pointeur_sliste )
{
- gtk_clist_select_row ( GTK_CLIST ( liste_comptes_virements ),
- gtk_clist_find_row_from_data ( GTK_CLIST ( liste_comptes_virements ),
- pointeur_sliste -> data ),
- 0 );
-
- pointeur_sliste = pointeur_sliste -> next;
+ gtk_clist_select_row ( GTK_CLIST ( liste_comptes_virements ),
+ gtk_clist_find_row_from_data ( GTK_CLIST ( liste_comptes_virements ),
+ pointeur_sliste -> data ),
+ 0 );
+ pointeur_sliste = pointeur_sliste -> next;
}
}
-/**
- *
- *
- *
- */
void selectionne_devise_categ_etat_courant ( void )
{
gint current_report_number;
- current_report_number = gsb_gui_navigation_get_current_report ( );
+ current_report_number = gsb_gui_navigation_get_current_report ();
gsb_currency_set_combobox_history ( bouton_devise_categ_etat,
- gsb_data_report_get_category_currency ( current_report_number ) );
+ gsb_data_report_get_category_currency (current_report_number));
}
+/******************************************************************************/
-/**
- *
- *
- *
- */
+/******************************************************************************/
void selectionne_devise_ib_etat_courant ( void )
{
gint current_report_number;
- current_report_number = gsb_gui_navigation_get_current_report ( );
+ current_report_number = gsb_gui_navigation_get_current_report ();
gsb_currency_set_combobox_history ( bouton_devise_ib_etat,
- gsb_data_report_get_budget_currency ( current_report_number ) );
+ gsb_data_report_get_budget_currency (current_report_number));
}
+/******************************************************************************/
-
-/**
- *
- *
- *
- */
+/******************************************************************************/
void selectionne_liste_tiers_etat_courant ( void )
{
GSList *pointeur_sliste;
@@ -1303,7 +1276,7 @@ void selectionne_liste_tiers_etat_courant ( void )
if ( !liste_tiers_etat )
- return;
+ return;
gtk_clist_unselect_all ( GTK_CLIST ( liste_tiers_etat ));
@@ -1311,36 +1284,27 @@ void selectionne_liste_tiers_etat_courant ( void )
while ( pointeur_sliste )
{
- gtk_clist_select_row ( GTK_CLIST ( liste_tiers_etat ),
- gtk_clist_find_row_from_data ( GTK_CLIST ( liste_tiers_etat ),
- pointeur_sliste -> data ),
- 0 );
-
- pointeur_sliste = pointeur_sliste -> next;
+ gtk_clist_select_row ( GTK_CLIST ( liste_tiers_etat ),
+ gtk_clist_find_row_from_data ( GTK_CLIST ( liste_tiers_etat ),
+ pointeur_sliste -> data ),
+ 0 );
+ pointeur_sliste = pointeur_sliste -> next;
}
}
+/******************************************************************************/
-
-/**
- *
- *
- *
- */
+/******************************************************************************/
void selectionne_devise_tiers_etat_courant ( void )
{
gint current_report_number;
- current_report_number = gsb_gui_navigation_get_current_report ( );
+ current_report_number = gsb_gui_navigation_get_current_report ();
gsb_currency_set_combobox_history ( bouton_devise_tiers_etat,
- gsb_data_report_get_payee_currency ( current_report_number ) );
+ gsb_data_report_get_payee_currency (current_report_number));
}
+/******************************************************************************/
-
-/**
- *
- *
- *
- */
+/******************************************************************************/
void recuperation_info_perso_etat ( void )
{
GSList *comparison_list;
@@ -1354,403 +1318,423 @@ void recuperation_info_perso_etat ( void )
/* Check that custom dates are OK, but only if custom date range
* has been selected. */
- if ( GPOINTER_TO_INT ( GTK_CLIST ( liste_plages_dates_etat ) -> selection -> data ) == 1
- &&
- !gsb_date_check_entry ( entree_date_init_etat ) )
+ if ( GPOINTER_TO_INT ( GTK_CLIST ( liste_plages_dates_etat ) -> selection -> data ) == 1 &&
+ !gsb_date_check_entry ( entree_date_init_etat ) )
{
- dialogue_error_hint ( _("Grisbi can't parse date. For a list of date formats that Grisbi can use, "
- "refer to Grisbi manual."),
- g_strdup_printf ( _("Invalid initial date '%s'"),
- gtk_entry_get_text ( GTK_ENTRY ( entree_date_init_etat ) ) ) );
- return;
+ dialogue_error_hint ( _("Grisbi can't parse date. For a list of date formats that Grisbi can use, refer to Grisbi manual."),
+ g_strdup_printf ( _("Invalid initial date '%s'"),
+ gtk_entry_get_text(GTK_ENTRY(entree_date_init_etat)) ) );
+ return;
}
- if ( GPOINTER_TO_INT ( GTK_CLIST ( liste_plages_dates_etat ) -> selection -> data ) == 1
- &&
- !gsb_date_check_entry (entree_date_finale_etat ) )
+ if ( GPOINTER_TO_INT ( GTK_CLIST ( liste_plages_dates_etat ) -> selection -> data ) == 1 &&
+ !gsb_date_check_entry (entree_date_finale_etat ) )
{
- dialogue_error_hint ( _("Grisbi can't parse date. For a list of date formats that Grisbi can use, "
- "refer to Grisbi manual."),
- g_strdup_printf ( _("Invalid final date '%s'"),
- gtk_entry_get_text ( GTK_ENTRY ( entree_date_finale_etat ) ) ) );
- return;
+ dialogue_error_hint ( _("Grisbi can't parse date. For a list of date formats that Grisbi can use, refer to Grisbi manual."),
+ g_strdup_printf ( _("Invalid final date '%s'"),
+ gtk_entry_get_text(GTK_ENTRY(entree_date_finale_etat)) ) );
+ return;
}
+
/* on récupère maintenant toutes les données */
/* récupération du name du rapport */
+
pointeur_char = gtk_entry_get_text ( GTK_ENTRY ( entree_nom_etat ));
if ( strlen ( pointeur_char )
- &&
- strcmp ( pointeur_char, gsb_data_report_get_report_name ( current_report_number) ) )
+ &&
+ strcmp ( pointeur_char,
+ gsb_data_report_get_report_name (current_report_number) ))
{
- gsb_data_report_set_report_name ( current_report_number, pointeur_char );
+ gsb_data_report_set_report_name ( current_report_number,
+ pointeur_char );
}
/* récupération du type de classement */
- g_slist_free ( gsb_data_report_get_sorting_type ( current_report_number ) );
- gsb_data_report_set_sorting_type ( current_report_number, NULL );
+ g_slist_free ( gsb_data_report_get_sorting_type (current_report_number));
+
+ gsb_data_report_set_sorting_type ( current_report_number,
+ NULL );
for ( i=0 ; i<GTK_CLIST ( liste_type_classement_etat ) -> rows ; i++ )
{
- gint no;
-
- no = GPOINTER_TO_INT ( gtk_ctree_node_get_row_data ( GTK_CTREE ( liste_type_classement_etat ),
- gtk_ctree_node_nth ( GTK_CTREE ( liste_type_classement_etat ), i ) ) );
-
- gsb_data_report_set_sorting_type ( current_report_number,
- g_slist_append ( gsb_data_report_get_sorting_type ( current_report_number ),
- GINT_TO_POINTER ( no ) ) );
-
- /* rajoute les ss categ et ss ib */
- if ( no == 1 )
- gsb_data_report_set_sorting_type ( current_report_number,
- g_slist_append ( gsb_data_report_get_sorting_type ( current_report_number ),
- GINT_TO_POINTER ( 2 ) ) );
- if ( no == 3 )
- gsb_data_report_set_sorting_type ( current_report_number,
- g_slist_append ( gsb_data_report_get_sorting_type ( current_report_number ),
- GINT_TO_POINTER ( 4 ) ) );
+ gint no;
+
+ no = GPOINTER_TO_INT ( gtk_ctree_node_get_row_data ( GTK_CTREE ( liste_type_classement_etat ),
+ gtk_ctree_node_nth ( GTK_CTREE ( liste_type_classement_etat ),
+ i )));
+
+ gsb_data_report_set_sorting_type ( current_report_number,
+ g_slist_append ( gsb_data_report_get_sorting_type (current_report_number),
+ GINT_TO_POINTER ( no )));
+
+ /* rajoute les ss categ et ss ib */
+
+ if ( no == 1 )
+ gsb_data_report_set_sorting_type ( current_report_number,
+ g_slist_append ( gsb_data_report_get_sorting_type (current_report_number),
+ GINT_TO_POINTER ( 2 )));
+ if ( no == 3 )
+ gsb_data_report_set_sorting_type ( current_report_number,
+ g_slist_append ( gsb_data_report_get_sorting_type (current_report_number),
+ GINT_TO_POINTER ( 4 )));
}
/* récupération de l'affichage ou non des R */
- if ( gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_opes_r_et_non_r_etat ) ) )
- gsb_data_report_set_show_r ( current_report_number, 0 );
+
+ if ( gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_opes_r_et_non_r_etat )) )
+ gsb_data_report_set_show_r ( current_report_number,
+ 0 );
else
{
- if ( gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_opes_non_r_etat ) ) )
- gsb_data_report_set_show_r ( current_report_number, 1 );
- else
- gsb_data_report_set_show_r ( current_report_number, 2 );
+ if ( gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_opes_non_r_etat )) )
+ gsb_data_report_set_show_r ( current_report_number,
+ 1 );
+ else
+ gsb_data_report_set_show_r ( current_report_number,
+ 2 );
}
/* récupération de l'affichage des opés */
+
gsb_data_report_set_show_report_transactions ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_opes ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_opes )));
gsb_data_report_set_show_report_transaction_amount ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_nb_opes ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_nb_opes )));
gsb_data_report_set_show_report_transaction_number ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_no_ope ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_no_ope )));
gsb_data_report_set_show_report_date ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_date_opes ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_date_opes )));
gsb_data_report_set_show_report_value_date ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_value_date_opes ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_value_date_opes )));
gsb_data_report_set_show_report_payee ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_tiers_opes ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_tiers_opes )));
gsb_data_report_set_show_report_category ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_categ_opes ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_categ_opes )));
gsb_data_report_set_show_report_sub_category ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_sous_categ_opes ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_sous_categ_opes )));
gsb_data_report_set_show_report_method_of_payment ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_type_ope ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_type_ope )));
gsb_data_report_set_show_report_budget ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_ib_opes ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_ib_opes )));
gsb_data_report_set_show_report_sub_budget ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_sous_ib_opes ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_sous_ib_opes )));
gsb_data_report_set_show_report_method_of_payment_content ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_no_cheque ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_no_cheque )));
gsb_data_report_set_show_report_note ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_notes_opes ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_notes_opes )));
gsb_data_report_set_show_report_voucher ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_pc_opes ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_pc_opes )));
gsb_data_report_set_show_report_marked ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_no_rappr ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_no_rappr )));
gsb_data_report_set_show_report_bank_references ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_infobd_opes ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_infobd_opes )));
gsb_data_report_set_not_detail_split ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_pas_detailler_ventilation ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_pas_detailler_ventilation )));
gsb_data_report_set_split_credit_debit ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_separer_revenus_depenses ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_separer_revenus_depenses )));
gsb_data_report_set_show_report_financial_year ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_exo_opes ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_exo_opes )));
gsb_data_report_set_column_title_show ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_titres_colonnes ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_titres_colonnes )));
gsb_data_report_set_column_title_type ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_titre_changement ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_titre_changement )));
gsb_data_report_set_sorting_report ( current_report_number,
- GPOINTER_TO_INT ( g_object_get_data (
- G_OBJECT ( GTK_OPTION_MENU ( bouton_choix_classement_ope_etat ) -> menu_item ),
- "no_classement" ) ) );
+ GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( GTK_OPTION_MENU ( bouton_choix_classement_ope_etat ) -> menu_item ),
+ "no_classement" )));
gsb_data_report_set_report_can_click ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_rendre_ope_clickables ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_rendre_ope_clickables )));
gsb_data_report_set_currency_general ( current_report_number,
- gsb_currency_get_currency_from_combobox (bouton_devise_general_etat) );
+ gsb_currency_get_currency_from_combobox (bouton_devise_general_etat));
gsb_data_report_set_append_in_payee ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_inclure_dans_tiers ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_inclure_dans_tiers )));
/* récupération des dates */
+
gsb_data_report_set_use_financial_year ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( radio_button_utilise_exo ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( radio_button_utilise_exo )));
- if ( gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_exo_tous ) ) )
- gsb_data_report_set_financial_year_type ( current_report_number, 0 );
+ if ( gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_exo_tous )) )
+ gsb_data_report_set_financial_year_type ( current_report_number,
+ 0 );
else
{
- if ( gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_exo_courant ) ) )
- gsb_data_report_set_financial_year_type ( current_report_number, 1 );
- else
- {
- if ( gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_exo_precedent ) ) )
- gsb_data_report_set_financial_year_type ( current_report_number, 2 );
- else
- gsb_data_report_set_financial_year_type ( current_report_number, 3 );
- }
+ if ( gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_exo_courant )) )
+ gsb_data_report_set_financial_year_type ( current_report_number,
+ 1 );
+ else
+ {
+ if ( gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_exo_precedent )) )
+ gsb_data_report_set_financial_year_type ( current_report_number,
+ 2 );
+ else
+ gsb_data_report_set_financial_year_type ( current_report_number,
+ 3 );
+ }
}
- if ( gsb_data_report_get_financial_year_list ( current_report_number) )
+ if ( gsb_data_report_get_financial_year_list (current_report_number))
{
- g_slist_free ( gsb_data_report_get_financial_year_list ( current_report_number ) );
- gsb_data_report_set_financial_year_list ( current_report_number, NULL );
+ g_slist_free ( gsb_data_report_get_financial_year_list (current_report_number));
+ gsb_data_report_set_financial_year_list ( current_report_number,
+ NULL );
}
list_tmp = GTK_CLIST ( liste_exo_etat ) -> selection;
while ( list_tmp )
{
- gsb_data_report_set_financial_year_list ( current_report_number,
- g_slist_append ( gsb_data_report_get_financial_year_list ( current_report_number ),
- gtk_clist_get_row_data ( GTK_CLIST ( liste_exo_etat ),
- GPOINTER_TO_INT ( list_tmp -> data ) ) ) );
-
- list_tmp = list_tmp -> next;
+ gsb_data_report_set_financial_year_list ( current_report_number,
+ g_slist_append ( gsb_data_report_get_financial_year_list (current_report_number),
+ gtk_clist_get_row_data ( GTK_CLIST ( liste_exo_etat ),
+ GPOINTER_TO_INT ( list_tmp -> data ))));
+ list_tmp = list_tmp -> next;
}
- /* si tous les exos ont été sélectionnés, on met bouton_detaille_exo_etat à 0 (plus rapide) */
+ /* si tous les exos ont été sélectionnés, on met bouton_detaille_exo_etat à 0 (plus rapide) */
+
if ( ( g_list_length ( GTK_CLIST ( liste_exo_etat ) -> selection )
- ==
- GTK_CLIST ( liste_exo_etat ) -> rows )
- &&
- gsb_data_report_get_financial_year_type (current_report_number) == 3 )
+ ==
+ GTK_CLIST ( liste_exo_etat ) -> rows )
+ &&
+ gsb_data_report_get_financial_year_type (current_report_number) == 3 )
{
- dialogue_special ( GTK_MESSAGE_INFO,
- make_hint ( _("Performance issue."),
- _("All financial years have been selected. Grisbi will run faster "
- "without the \"Detail financial years\" option activated.") ) );
-
- gsb_data_report_set_financial_year_type ( current_report_number, 0 );
+ dialogue_special ( GTK_MESSAGE_INFO,
+ make_hint ( _("Performance issue."),
+ _("All financial years have been selected. Grisbi will run faster without the \"Detail financial years\" option activated.") ) );
+ gsb_data_report_set_financial_year_type ( current_report_number,
+ 0 );
}
gsb_data_report_set_financial_year_split ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_separe_exo_etat ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_separe_exo_etat )));
gsb_data_report_set_date_type ( current_report_number,
- GPOINTER_TO_INT ( GTK_CLIST ( liste_plages_dates_etat ) -> selection -> data ) );
+ GPOINTER_TO_INT ( GTK_CLIST ( liste_plages_dates_etat ) -> selection -> data ));
gsb_data_report_set_personal_date_start ( current_report_number,
- gsb_calendar_entry_get_date ( entree_date_init_etat ) );
+ gsb_calendar_entry_get_date (entree_date_init_etat));
gsb_data_report_set_personal_date_end ( current_report_number,
- gsb_calendar_entry_get_date ( entree_date_finale_etat ) );
+ gsb_calendar_entry_get_date (entree_date_finale_etat));
gsb_data_report_set_period_split ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_separe_plages_etat ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_separe_plages_etat )));
gsb_data_report_set_period_split_type ( current_report_number,
- GPOINTER_TO_INT ( g_object_get_data (
- G_OBJECT ( GTK_OPTION_MENU ( bouton_type_separe_plages_etat ) -> menu_item ),
- "type" ) ) );
+ GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( GTK_OPTION_MENU ( bouton_type_separe_plages_etat ) -> menu_item ),
+ "type" )));
gsb_data_report_set_period_split_day ( current_report_number,
- GPOINTER_TO_INT ( g_object_get_data (
- G_OBJECT ( GTK_OPTION_MENU ( bouton_debut_semaine ) -> menu_item ),
- "day" ) ) );
+ GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( GTK_OPTION_MENU ( bouton_debut_semaine ) -> menu_item ),
+ "day" )));
/* récupération des comptes */
+
gsb_data_report_set_account_use_chosen ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_detaille_comptes_etat ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_detaille_comptes_etat )));
- if ( gsb_data_report_get_account_numbers ( current_report_number ) )
+ if ( gsb_data_report_get_account_numbers (current_report_number))
{
- g_slist_free ( gsb_data_report_get_account_numbers ( current_report_number ) );
- gsb_data_report_set_account_numbers ( current_report_number, NULL );
+ g_slist_free ( gsb_data_report_get_account_numbers (current_report_number));
+ gsb_data_report_set_account_numbers ( current_report_number,
+ NULL );
}
list_tmp = GTK_CLIST ( liste_comptes_etat ) -> selection;
while ( list_tmp )
{
- gsb_data_report_set_account_numbers ( current_report_number,
- g_slist_append ( gsb_data_report_get_account_numbers ( current_report_number ),
- gtk_clist_get_row_data ( GTK_CLIST ( liste_comptes_etat ),
- GPOINTER_TO_INT ( list_tmp -> data ) ) ) );
-
- list_tmp = list_tmp -> next;
+ gsb_data_report_set_account_numbers ( current_report_number,
+ g_slist_append ( gsb_data_report_get_account_numbers (current_report_number),
+ gtk_clist_get_row_data ( GTK_CLIST ( liste_comptes_etat ),
+ GPOINTER_TO_INT ( list_tmp -> data ))));
+ list_tmp = list_tmp -> next;
}
/* si tous les comptes ont été sélectionnés, on met utilise_detail_comptes à 0 (plus rapide) */
+
if ( ( g_list_length ( GTK_CLIST ( liste_comptes_etat ) -> selection )
- ==
- GTK_CLIST ( liste_comptes_etat ) -> rows )
- &&
- gsb_data_report_get_account_use_chosen (current_report_number))
+ ==
+ GTK_CLIST ( liste_comptes_etat ) -> rows )
+ &&
+ gsb_data_report_get_account_use_chosen (current_report_number))
{
- dialogue_special ( GTK_MESSAGE_INFO,
- make_hint ( _("Performance issue."),
- _("All accounts have been selected. Grisbi will run faster without "
- "the \"Detail accounts used\" option activated.") ) );
-
- gsb_data_report_set_account_use_chosen ( current_report_number, 0 );
+ dialogue_special ( GTK_MESSAGE_INFO,
+ make_hint ( _("Performance issue."),
+ _("All accounts have been selected. Grisbi will run faster without the \"Detail accounts used\" option activated.") ) );
+ gsb_data_report_set_account_use_chosen ( current_report_number,
+ 0 );
}
gsb_data_report_set_account_group_reports ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_regroupe_ope_compte_etat ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_regroupe_ope_compte_etat )));
gsb_data_report_set_account_show_amount ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_affiche_sous_total_compte ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_affiche_sous_total_compte )));
gsb_data_report_set_account_show_name ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_noms_comptes ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_noms_comptes )));
/* récupération des virements */
- if ( gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_inclusion_virements_actifs_etat ) ) )
- gsb_data_report_set_transfer_choice ( current_report_number, 1 );
+
+ if ( gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_inclusion_virements_actifs_etat )))
+ gsb_data_report_set_transfer_choice ( current_report_number,
+ 1 );
else
- {
- if ( gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_inclusion_virements_hors_etat ) ) )
- gsb_data_report_set_transfer_choice ( current_report_number, 2 );
- else
- {
- if ( gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_non_inclusion_virements ) ) )
- gsb_data_report_set_transfer_choice ( current_report_number, 0 );
- else
- gsb_data_report_set_transfer_choice ( current_report_number, 3 );
- }
- }
+ if ( gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_inclusion_virements_hors_etat )))
+ gsb_data_report_set_transfer_choice ( current_report_number,
+ 2 );
+ else
+ {
+ if ( gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_non_inclusion_virements )))
+ gsb_data_report_set_transfer_choice ( current_report_number,
+ 0 );
+ else
+ gsb_data_report_set_transfer_choice ( current_report_number,
+ 3 );
+ }
- if ( gsb_data_report_get_transfer_account_numbers ( current_report_number ) )
+ if ( gsb_data_report_get_transfer_account_numbers (current_report_number))
{
- g_slist_free ( gsb_data_report_get_transfer_account_numbers ( current_report_number ) );
- gsb_data_report_set_transfer_account_numbers ( current_report_number, NULL );
+ g_slist_free ( gsb_data_report_get_transfer_account_numbers (current_report_number));
+ gsb_data_report_set_transfer_account_numbers ( current_report_number,
+ NULL );
}
list_tmp = GTK_CLIST ( liste_comptes_virements ) -> selection;
while ( list_tmp )
{
- gsb_data_report_set_transfer_account_numbers ( current_report_number,
- g_slist_append ( gsb_data_report_get_transfer_account_numbers ( current_report_number ),
- gtk_clist_get_row_data ( GTK_CLIST ( liste_comptes_virements ),
- GPOINTER_TO_INT ( list_tmp -> data ) ) ) );
-
- list_tmp = list_tmp -> next;
+ gsb_data_report_set_transfer_account_numbers ( current_report_number,
+ g_slist_append ( gsb_data_report_get_transfer_account_numbers (current_report_number),
+ gtk_clist_get_row_data ( GTK_CLIST ( liste_comptes_virements ),
+ GPOINTER_TO_INT ( list_tmp -> data ))));
+ list_tmp = list_tmp -> next;
}
gsb_data_report_set_transfer_reports_only ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON (
- bouton_exclure_non_virements_etat ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_exclure_non_virements_etat )));
+
/* get the categories */
gsb_data_report_set_category_used ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( button_group_by_categ ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( button_group_by_categ )));
gsb_data_report_set_category_detail_used ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( button_detail_categ ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( button_detail_categ )));
- gsb_data_report_set_category_struct ( current_report_number,
- report_config_categ_budget_get_selected ( TRUE ) );
+ gsb_data_report_set_category_struct (current_report_number, report_config_categ_budget_get_selected (TRUE));
/* if all was selected, remove the category_detail_used */
- if (!gsb_data_report_get_category_struct ( current_report_number ) )
- gsb_data_report_set_category_detail_used ( current_report_number, FALSE );
+ if (!gsb_data_report_get_category_struct (current_report_number))
+ gsb_data_report_set_category_detail_used ( current_report_number,
+ FALSE );
gsb_data_report_set_category_show_category_amount ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_affiche_sous_total_categ ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_affiche_sous_total_categ )));
gsb_data_report_set_category_show_sub_category ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_sous_categ ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_sous_categ )));
gsb_data_report_set_category_show_sub_category_amount ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON (
- bouton_affiche_sous_total_sous_categ ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_affiche_sous_total_sous_categ )));
gsb_data_report_set_category_show_without_category ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_pas_de_sous_categ ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_pas_de_sous_categ )));
gsb_data_report_set_category_currency ( current_report_number,
- gsb_currency_get_currency_from_combobox ( bouton_devise_categ_etat ) );
+ gsb_currency_get_currency_from_combobox (bouton_devise_categ_etat));
gsb_data_report_set_category_show_name ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_noms_categ ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_noms_categ )));
+
/* get the budget */
gsb_data_report_set_budget_used ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_utilise_ib_etat ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_utilise_ib_etat )));
gsb_data_report_set_budget_detail_used ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_detaille_ib_etat ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_detaille_ib_etat )));
- gsb_data_report_set_budget_struct ( current_report_number,
- report_config_categ_budget_get_selected ( FALSE ) ) ;
+ gsb_data_report_set_budget_struct (current_report_number, report_config_categ_budget_get_selected (FALSE));
/* if all was selected, remove the budget_detail_used */
- if (!gsb_data_report_get_budget_struct ( current_report_number ) )
- gsb_data_report_set_budget_detail_used ( current_report_number, FALSE );
+ if (!gsb_data_report_get_budget_struct (current_report_number))
+ gsb_data_report_set_budget_detail_used ( current_report_number,
+ FALSE );
gsb_data_report_set_budget_show_budget_amount ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_affiche_sous_total_ib ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_affiche_sous_total_ib )));
gsb_data_report_set_budget_show_sub_budget ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_sous_ib ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON (bouton_afficher_sous_ib)));
gsb_data_report_set_budget_show_sub_budget_amount ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_affiche_sous_total_sous_ib ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_affiche_sous_total_sous_ib )));
gsb_data_report_set_budget_show_without_budget ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_pas_de_sous_ib ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_pas_de_sous_ib )));
gsb_data_report_set_budget_currency ( current_report_number,
- gsb_currency_get_currency_from_combobox ( bouton_devise_ib_etat ) );
+ gsb_currency_get_currency_from_combobox (bouton_devise_ib_etat));
gsb_data_report_set_budget_show_name ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_noms_ib ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_noms_ib )));
+
+
/* récupération des tiers */
gsb_data_report_set_payee_used ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_utilise_tiers_etat ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_utilise_tiers_etat )));
gsb_data_report_set_payee_detail_used ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_detaille_tiers_etat ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_detaille_tiers_etat )));
if ( gsb_data_report_get_payee_numbers (current_report_number))
{
- g_slist_free ( gsb_data_report_get_payee_numbers ( current_report_number ) );
- gsb_data_report_set_payee_numbers ( current_report_number, NULL );
+ g_slist_free ( gsb_data_report_get_payee_numbers (current_report_number));
+ gsb_data_report_set_payee_numbers ( current_report_number,
+ NULL );
}
list_tmp = GTK_CLIST ( liste_tiers_etat ) -> selection;
while ( list_tmp )
{
- gsb_data_report_set_payee_numbers ( current_report_number,
- g_slist_append ( gsb_data_report_get_payee_numbers ( current_report_number ),
- gtk_clist_get_row_data ( GTK_CLIST ( liste_tiers_etat ),
- GPOINTER_TO_INT ( list_tmp -> data ) ) ) );
-
- list_tmp = list_tmp -> next;
+ gsb_data_report_set_payee_numbers ( current_report_number,
+ g_slist_append ( gsb_data_report_get_payee_numbers (current_report_number),
+ gtk_clist_get_row_data ( GTK_CLIST ( liste_tiers_etat ),
+ GPOINTER_TO_INT ( list_tmp -> data ))));
+ list_tmp = list_tmp -> next;
}
/* si tous les tiers ont été sélectionnés, on met utilise_detail_tiers à 0 (plus rapide) */
+
if ( ( g_list_length ( GTK_CLIST ( liste_tiers_etat ) -> selection )
- ==
- GTK_CLIST ( liste_tiers_etat ) -> rows )
- &&
- gsb_data_report_get_payee_detail_used ( current_report_number ) )
+ ==
+ GTK_CLIST ( liste_tiers_etat ) -> rows )
+ &&
+ gsb_data_report_get_payee_detail_used (current_report_number))
{
- dialogue_special ( GTK_MESSAGE_INFO,
- make_hint ( _("Performance issue."),
- _("All payees have been selected. Grisbi will run faster without "
- "the \"Detail payees used\" option activated.") ) );
-
- gsb_data_report_set_payee_detail_used ( current_report_number, 0 );
+ dialogue_special ( GTK_MESSAGE_INFO,
+ make_hint ( _("Performance issue."),
+ _("All payees have been selected. Grisbi will run faster without the \"Detail payees used\" option activated.") ) );
+ gsb_data_report_set_payee_detail_used ( current_report_number,
+ 0 );
}
gsb_data_report_set_payee_show_payee_amount ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_affiche_sous_total_tiers ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_affiche_sous_total_tiers )));
gsb_data_report_set_payee_currency ( current_report_number,
- gsb_currency_get_currency_from_combobox ( bouton_devise_tiers_etat) );
+ gsb_currency_get_currency_from_combobox (bouton_devise_tiers_etat));
gsb_data_report_set_payee_show_name ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_noms_tiers ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_afficher_noms_tiers )));
+
+
/* récupération du texte */
+
gsb_data_report_set_text_comparison_used ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_utilise_texte ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_utilise_texte )));
/* récupération de la liste des comparaisons de texte */
/* il y a au moins une structure de créée, si celle si a l'entrée txt et 2 montants vides, */
@@ -1761,243 +1745,217 @@ void recuperation_info_perso_etat ( void )
/* on a rentré au moins une comparaison */
/* on rempli les champs de la structure */
- comparison_list = gsb_data_report_get_text_comparison_list ( current_report_number );
+ comparison_list = gsb_data_report_get_text_comparison_list (current_report_number);
while ( comparison_list )
{
- const gchar *string;
- gint text_comparison_number;
-
- text_comparison_number = GPOINTER_TO_INT (comparison_list -> data);
-
- if ( gsb_data_report_text_comparison_get_button_link (text_comparison_number))
- gsb_data_report_text_comparison_set_link_to_last_text_comparison ( text_comparison_number,
- GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT (
- GTK_OPTION_MENU ( gsb_data_report_text_comparison_get_button_link (
- text_comparison_number) ) -> menu_item ),
- "no_lien" ) ) );
- else
- gsb_data_report_text_comparison_set_link_to_last_text_comparison ( text_comparison_number, -1 );
-
- gsb_data_report_text_comparison_set_field ( text_comparison_number,
- GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT (
- GTK_OPTION_MENU ( gsb_data_report_text_comparison_get_button_field (
- text_comparison_number ) ) -> menu_item ),
- "no_champ" ) ) );
-
- gsb_data_report_text_comparison_set_use_text ( text_comparison_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON (
- gsb_data_report_text_comparison_get_button_use_text ( text_comparison_number) ) ) );
-
- gsb_data_report_text_comparison_set_operator ( text_comparison_number,
- GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT (
- GTK_OPTION_MENU ( gsb_data_report_text_comparison_get_button_operator (
- text_comparison_number ) ) -> menu_item ),
- "no_operateur" )));
-
- string = gtk_entry_get_text ( GTK_ENTRY (
- gsb_data_report_text_comparison_get_entry_text ( text_comparison_number ) ) );
- gsb_data_report_text_comparison_set_text ( text_comparison_number, string );
-
- gsb_data_report_text_comparison_set_first_comparison ( text_comparison_number,
- GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT (
- GTK_OPTION_MENU ( gsb_data_report_text_comparison_get_button_first_comparison (
- text_comparison_number ) ) -> menu_item ),
- "no_comparateur" ) ) );
-
- gsb_data_report_text_comparison_set_link_first_to_second_part ( text_comparison_number,
- GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT (
- GTK_OPTION_MENU ( gsb_data_report_text_comparison_get_button_link_first_to_second_part (
- text_comparison_number ) ) -> menu_item ),
- "no_lien" ) ) );
-
- gsb_data_report_text_comparison_set_second_comparison ( text_comparison_number,
- GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( GTK_OPTION_MENU (gsb_data_report_text_comparison_get_button_second_comparison (text_comparison_number)) -> menu_item ),
- "no_comparateur" )));
- gsb_data_report_text_comparison_set_first_amount ( text_comparison_number,
- utils_str_atoi ( gtk_entry_get_text ( GTK_ENTRY (gsb_data_report_text_comparison_get_entry_first_amount (text_comparison_number)))));
- gsb_data_report_text_comparison_set_second_amount ( text_comparison_number,
- utils_str_atoi (gtk_entry_get_text ( GTK_ENTRY (gsb_data_report_text_comparison_get_entry_second_amount (text_comparison_number)))));
-
- comparison_list = comparison_list -> next;
+ const gchar *string;
+ gint text_comparison_number;
+
+ text_comparison_number = GPOINTER_TO_INT (comparison_list -> data);
+
+ if ( gsb_data_report_text_comparison_get_button_link (text_comparison_number))
+ gsb_data_report_text_comparison_set_link_to_last_text_comparison ( text_comparison_number,
+ GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( GTK_OPTION_MENU (gsb_data_report_text_comparison_get_button_link (text_comparison_number)) -> menu_item ),
+ "no_lien" )));
+ else
+ gsb_data_report_text_comparison_set_link_to_last_text_comparison ( text_comparison_number,
+ -1 );
+
+ gsb_data_report_text_comparison_set_field ( text_comparison_number,
+ GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( GTK_OPTION_MENU (gsb_data_report_text_comparison_get_button_field (text_comparison_number)) -> menu_item ),
+ "no_champ" )));
+ gsb_data_report_text_comparison_set_use_text ( text_comparison_number,
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON (gsb_data_report_text_comparison_get_button_use_text (text_comparison_number))));
+ gsb_data_report_text_comparison_set_operator ( text_comparison_number,
+ GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( GTK_OPTION_MENU (gsb_data_report_text_comparison_get_button_operator (text_comparison_number)) -> menu_item ),
+ "no_operateur" )));
+
+ string = gtk_entry_get_text ( GTK_ENTRY (gsb_data_report_text_comparison_get_entry_text (text_comparison_number)));
+ gsb_data_report_text_comparison_set_text ( text_comparison_number,
+ string );
+
+ gsb_data_report_text_comparison_set_first_comparison ( text_comparison_number,
+ GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( GTK_OPTION_MENU (gsb_data_report_text_comparison_get_button_first_comparison (text_comparison_number)) -> menu_item ),
+ "no_comparateur" )));
+ gsb_data_report_text_comparison_set_link_first_to_second_part ( text_comparison_number,
+ GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( GTK_OPTION_MENU (gsb_data_report_text_comparison_get_button_link_first_to_second_part (text_comparison_number)) -> menu_item ),
+ "no_lien" )));
+ gsb_data_report_text_comparison_set_second_comparison ( text_comparison_number,
+ GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( GTK_OPTION_MENU (gsb_data_report_text_comparison_get_button_second_comparison (text_comparison_number)) -> menu_item ),
+ "no_comparateur" )));
+ gsb_data_report_text_comparison_set_first_amount ( text_comparison_number,
+ utils_str_atoi ( gtk_entry_get_text ( GTK_ENTRY (gsb_data_report_text_comparison_get_entry_first_amount (text_comparison_number)))));
+ gsb_data_report_text_comparison_set_second_amount ( text_comparison_number,
+ utils_str_atoi (gtk_entry_get_text ( GTK_ENTRY (gsb_data_report_text_comparison_get_entry_second_amount (text_comparison_number)))));
+
+ comparison_list = comparison_list -> next;
}
/* récupération du montant */
gsb_data_report_set_amount_comparison_used ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_utilise_montant ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_utilise_montant )));
gsb_data_report_set_amount_comparison_currency ( current_report_number,
- gsb_currency_get_currency_from_combobox ( bouton_devise_montant_etat ) );
+ gsb_currency_get_currency_from_combobox (bouton_devise_montant_etat));
/* récupération de la liste des comparaisons de montant */
/* il y a au moins une structure de créé, si celle si a les 2 montants vides, */
/* c'est qu'il n'y a aucune liste */
- amount_comparison_number = GPOINTER_TO_INT (
- gsb_data_report_get_amount_comparison_list ( current_report_number ) -> data );
+
+ amount_comparison_number = GPOINTER_TO_INT (gsb_data_report_get_amount_comparison_list (current_report_number)-> data);
if ( g_slist_length ( gsb_data_report_get_amount_comparison_list (current_report_number)) == 1
- &&
- !strlen ( gtk_entry_get_text ( GTK_ENTRY (gsb_data_report_amount_comparison_get_entry_first_amount (amount_comparison_number))))
- &&
- !strlen ( gtk_entry_get_text ( GTK_ENTRY (gsb_data_report_amount_comparison_get_entry_second_amount (amount_comparison_number))))
- &&
- GTK_WIDGET_SENSITIVE (gsb_data_report_amount_comparison_get_entry_first_amount (amount_comparison_number))
- &&
- GTK_WIDGET_SENSITIVE (gsb_data_report_amount_comparison_get_entry_second_amount (amount_comparison_number)))
+ &&
+ !strlen ( gtk_entry_get_text ( GTK_ENTRY (gsb_data_report_amount_comparison_get_entry_first_amount (amount_comparison_number))))
+ &&
+ !strlen ( gtk_entry_get_text ( GTK_ENTRY (gsb_data_report_amount_comparison_get_entry_second_amount (amount_comparison_number))))
+ &&
+ GTK_WIDGET_SENSITIVE (gsb_data_report_amount_comparison_get_entry_first_amount (amount_comparison_number))
+ &&
+ GTK_WIDGET_SENSITIVE (gsb_data_report_amount_comparison_get_entry_second_amount (amount_comparison_number)))
{
- g_slist_free ( gsb_data_report_get_amount_comparison_list ( current_report_number ) );
- gsb_data_report_set_amount_comparison_list ( current_report_number, NULL );
+ g_slist_free ( gsb_data_report_get_amount_comparison_list (current_report_number));
+ gsb_data_report_set_amount_comparison_list ( current_report_number,
+ NULL );
}
else
{
- /* on a rentré au moins une comparaison */
- /* on rempli les champs de la structure */
- GSList *comparison_list;
-
- comparison_list = gsb_data_report_get_amount_comparison_list ( current_report_number );
-
- while ( comparison_list )
- {
- amount_comparison_number = GPOINTER_TO_INT (comparison_list -> data);
-
- if ( gsb_data_report_amount_comparison_get_button_link (amount_comparison_number ) )
- gsb_data_report_amount_comparison_set_link_to_last_amount_comparison (
- amount_comparison_number,
- GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT (
- GTK_OPTION_MENU ( gsb_data_report_amount_comparison_get_button_link (
- amount_comparison_number ) ) -> menu_item ),
- "no_lien" ) ) );
- else
- gsb_data_report_amount_comparison_set_link_to_last_amount_comparison (
- amount_comparison_number,
- -1 );
-
- gsb_data_report_amount_comparison_set_first_comparison ( amount_comparison_number,
- GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( GTK_OPTION_MENU (
- gsb_data_report_amount_comparison_get_button_first_comparison (
- amount_comparison_number ) ) -> menu_item ),
- "no_comparateur" ) ) );
-
- gsb_data_report_amount_comparison_set_link_first_to_second_part ( amount_comparison_number,
- GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( GTK_OPTION_MENU (
- gsb_data_report_amount_comparison_get_button_link_first_to_second_part (
- amount_comparison_number ) ) -> menu_item ),
- "no_lien" ) ) );
-
- gsb_data_report_amount_comparison_set_second_comparison ( amount_comparison_number,
- GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( GTK_OPTION_MENU (
- gsb_data_report_amount_comparison_get_button_second_comparison (
- amount_comparison_number ) ) -> menu_item ),
- "no_comparateur" ) ) );
-
- gsb_data_report_amount_comparison_set_first_amount ( amount_comparison_number,
- gsb_real_get_from_string ( gtk_entry_get_text (
- GTK_ENTRY (gsb_data_report_amount_comparison_get_entry_first_amount (
- amount_comparison_number ) ) ) ) );
-
- gsb_data_report_amount_comparison_set_second_amount ( amount_comparison_number,
- gsb_real_get_from_string ( gtk_entry_get_text (
- GTK_ENTRY (gsb_data_report_amount_comparison_get_entry_second_amount (
- amount_comparison_number ) ) ) ) );
-
- comparison_list = comparison_list -> next;
- }
+ /* on a rentré au moins une comparaison */
+ /* on rempli les champs de la structure */
+
+ GSList *comparison_list;
+
+ comparison_list = gsb_data_report_get_amount_comparison_list (current_report_number);
+
+ while ( comparison_list )
+ {
+ amount_comparison_number = GPOINTER_TO_INT (comparison_list -> data);
+
+ if ( gsb_data_report_amount_comparison_get_button_link (amount_comparison_number))
+ gsb_data_report_amount_comparison_set_link_to_last_amount_comparison ( amount_comparison_number,
+ GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( GTK_OPTION_MENU (gsb_data_report_amount_comparison_get_button_link (amount_comparison_number)) -> menu_item ),
+ "no_lien" )));
+ else
+ gsb_data_report_amount_comparison_set_link_to_last_amount_comparison ( amount_comparison_number,
+ -1 );
+
+ gsb_data_report_amount_comparison_set_first_comparison ( amount_comparison_number,
+ GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( GTK_OPTION_MENU (gsb_data_report_amount_comparison_get_button_first_comparison (amount_comparison_number)) -> menu_item ),
+ "no_comparateur" )));
+
+ gsb_data_report_amount_comparison_set_link_first_to_second_part ( amount_comparison_number,
+ GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( GTK_OPTION_MENU (gsb_data_report_amount_comparison_get_button_link_first_to_second_part (amount_comparison_number)) -> menu_item ),
+ "no_lien" )));
+ gsb_data_report_amount_comparison_set_second_comparison ( amount_comparison_number,
+ GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( GTK_OPTION_MENU (gsb_data_report_amount_comparison_get_button_second_comparison (amount_comparison_number)) -> menu_item ),
+ "no_comparateur" )));
+ gsb_data_report_amount_comparison_set_first_amount ( amount_comparison_number,
+ gsb_real_get_from_string (gtk_entry_get_text ( GTK_ENTRY (gsb_data_report_amount_comparison_get_entry_first_amount (amount_comparison_number)))));
+ gsb_data_report_amount_comparison_set_second_amount ( amount_comparison_number,
+ gsb_real_get_from_string (gtk_entry_get_text ( GTK_ENTRY (gsb_data_report_amount_comparison_get_entry_second_amount (amount_comparison_number)))));
+
+ comparison_list = comparison_list -> next;
+ }
}
gsb_data_report_set_amount_comparison_only_report_non_null ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_exclure_ope_nulles_etat ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_exclure_ope_nulles_etat )));
/* récupération des modes de paiement */
gsb_data_report_set_method_of_payment_used ( current_report_number,
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_detaille_mode_paiement_etat ) ) );
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_detaille_mode_paiement_etat )));
- if ( gsb_data_report_get_method_of_payment_list ( current_report_number ) )
+ if ( gsb_data_report_get_method_of_payment_list (current_report_number))
{
- g_slist_free ( gsb_data_report_get_method_of_payment_list ( current_report_number ) );
- gsb_data_report_set_method_of_payment_list ( current_report_number, NULL );
+ g_slist_free ( gsb_data_report_get_method_of_payment_list (current_report_number));
+ gsb_data_report_set_method_of_payment_list ( current_report_number,
+ NULL );
}
list_tmp = GTK_CLIST ( liste_mode_paiement_etat ) -> selection;
while ( list_tmp )
{
- gsb_data_report_set_method_of_payment_list ( current_report_number,
- g_slist_append ( gsb_data_report_get_method_of_payment_list ( current_report_number ),
- gtk_clist_get_row_data ( GTK_CLIST ( liste_mode_paiement_etat ),
- GPOINTER_TO_INT ( list_tmp -> data ) ) ) );
-
- list_tmp = list_tmp -> next;
+ gsb_data_report_set_method_of_payment_list ( current_report_number,
+ g_slist_append ( gsb_data_report_get_method_of_payment_list (current_report_number),
+ gtk_clist_get_row_data ( GTK_CLIST ( liste_mode_paiement_etat ),
+ GPOINTER_TO_INT ( list_tmp -> data ))));
+ list_tmp = list_tmp -> next;
}
/* si tous les modes de paiement ont été sélectionnés, on met utilise_mode_paiement à 0 (plus rapide) */
if ( ( g_list_length ( GTK_CLIST ( liste_mode_paiement_etat ) -> selection )
- ==
- GTK_CLIST ( liste_mode_paiement_etat ) -> rows )
- &&
- gsb_data_report_get_method_of_payment_used ( current_report_number ) )
+ ==
+ GTK_CLIST ( liste_mode_paiement_etat ) -> rows )
+ &&
+ gsb_data_report_get_method_of_payment_used (current_report_number))
{
- dialogue_special ( GTK_MESSAGE_INFO,
- make_hint ( _("Performance issue."),
- _("All methods of payment have been selected. Grisbi will run faster without"
- "the \"Detail methods of payment used\" option activated.") ) );
-
- gsb_data_report_set_method_of_payment_used ( current_report_number, 0 );
+ dialogue_special ( GTK_MESSAGE_INFO,
+ make_hint ( _("Performance issue."),
+ _("All methods of payment have been selected. Grisbi will run faster without the \"Detail methods of payment used\" option activated.") ) );
+ gsb_data_report_set_method_of_payment_used ( current_report_number,
+ 0 );
}
/* update the payee combofix in the form, to add that report if asked */
- gsb_payee_update_combofix ( );
+ gsb_payee_update_combofix ();
if ( etat.modification_fichier == 0 )
modification_fichier ( TRUE );
-
/* on réaffiche l'état */
- rafraichissement_etat ( gsb_gui_navigation_get_current_report ( ) );
+
+ rafraichissement_etat ( gsb_gui_navigation_get_current_report ());
/* on repasse à la 1ère page du notebook */
- gtk_notebook_set_current_page ( GTK_NOTEBOOK ( notebook_etats ), 0 );
+ gtk_notebook_set_current_page ( GTK_NOTEBOOK ( notebook_etats ),
+ 0 );
gtk_widget_set_sensitive ( navigation_tree_view, TRUE );
- gsb_gui_navigation_update_report ( gsb_gui_navigation_get_current_report ( ) );
+ gsb_gui_navigation_update_report ( gsb_gui_navigation_get_current_report ());
}
+/******************************************************************************/
+
/**
* If applicable, update report navigation tree style to reflect which
* pages have been changed.
*
- * \param page_number Page that contained an interface element just
- * changed that triggered this event.
+ * \param page_number Page that contained an interface element just
+ * changed that triggered this event.
*
- * \return FALSE
+ * \return FALSE
*/
gboolean report_tree_update_style ( gint * page_number )
{
gtk_tree_model_foreach ( GTK_TREE_MODEL(report_tree_model),
- (GtkTreeModelForeachFunc) report_tree_update_style_iterator,
- GINT_TO_POINTER ( page_number ) );
+ (GtkTreeModelForeachFunc) report_tree_update_style_iterator,
+ GINT_TO_POINTER ( page_number ) );
return FALSE;
}
+
/**
* Iterator that iterates over the report tree model and updates
* iter of report that is equal to `data'.
*
- * \param tree_model Pointer to the model of the navigation tree.
- * \param path Not used.
- * \param iter Current iter to test.
- * \param data Page to be updated.
+ * \param tree_model Pointer to the model of the navigation tree.
+ * \param path Not used.
+ * \param iter Current iter to test.
+ * \param data Page to be updated.
*
* \return TRUE if this iter matches.
*/
gboolean report_tree_update_style_iterator ( GtkTreeModel * tree_model,
- GtkTreePath *path,
- GtkTreeIter *iter,
- gpointer data )
+ GtkTreePath *path,
+ GtkTreeIter *iter,
+ gpointer data )
{
gint page_number = GPOINTER_TO_INT(data);
gint iter_page_number;
@@ -2007,87 +1965,90 @@ gboolean report_tree_update_style_iterator ( GtkTreeModel * tree_model,
if ( iter_page_number != page_number )
{
- return FALSE;
+ return FALSE;
}
switch ( iter_page_number )
{
- /* rien pour l'instant */
- break;
-
- case 1:
- /* page des virements */
- if ( !gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_non_inclusion_virements ) ) )
- italic = TRUE;
- break;
-
- case 2:
- /* page des comptes */
- if ( gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_detaille_comptes_etat ) ) )
- italic = TRUE;
- break;
-
- case 3:
- /* page des tiers */
- if ( gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_detaille_tiers_etat ) ) )
- italic = TRUE;
- break;
-
- case 4:
- /* page des catégories */
- if ( gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( button_detail_categ )) )
- italic = TRUE;
- break;
-
- case 5:
- /* page des ib */
- if ( gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_detaille_ib_etat ) ) )
- italic = TRUE;
- break;
-
- case 6:
- /* page des textes */
- if ( gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_utilise_texte ) ) )
- italic = TRUE;
- break;
-
- case 7:
- /* page des montants */
- if ( gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_utilise_montant ) )
- ||
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_exclure_ope_nulles_etat ) ) )
- italic = TRUE;
- break;
-
- case 8:
- /* page des modes de paiement */
- if ( gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_detaille_mode_paiement_etat ) ) )
- italic = TRUE;
- break;
-
- case 9:
- /* page des divers */
- if ( !gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_opes_r_et_non_r_etat ) )
- ||
- gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_pas_detailler_ventilation ) ) )
- italic = TRUE;
- break;
+ /* rien pour l'instant */
+ break;
+
+ case 1:
+ /* page des virements */
+ if ( !gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_non_inclusion_virements )))
+ italic = TRUE;
+ break;
+
+ case 2:
+ /* page des comptes */
+
+ if ( gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_detaille_comptes_etat )))
+ italic = TRUE;
+ break;
+
+ case 3:
+ /* page des tiers */
+
+ if ( gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_detaille_tiers_etat )))
+ italic = TRUE;
+ break;
+
+ case 4:
+ /* page des catégories */
+
+ if ( gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( button_detail_categ )))
+ italic = TRUE;
+ break;
+
+ case 5:
+ /* page des ib */
+
+ if ( gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_detaille_ib_etat )))
+ italic = TRUE;
+ break;
+
+ case 6:
+ /* page des textes */
+
+ if ( gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_utilise_texte )))
+ italic = TRUE;
+ break;
+
+ case 7:
+ /* page des montants */
+
+ if ( gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_utilise_montant ))
+ ||
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_exclure_ope_nulles_etat )))
+ italic = TRUE;
+ break;
+
+ case 8:
+ /* page des modes de paiement */
+
+ if ( gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_detaille_mode_paiement_etat )))
+ italic = TRUE;
+ break;
+
+ case 9:
+ /* page des divers */
+
+ if ( !gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_opes_r_et_non_r_etat ))
+ ||
+ gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( bouton_pas_detailler_ventilation )))
+ italic = TRUE;
+ break;
}
gtk_tree_store_set ( GTK_TREE_STORE ( tree_model ),
- iter, REPORT_TREE_ITALIC_COLUMN, italic,
- -1 );
+ iter, REPORT_TREE_ITALIC_COLUMN, italic,
+ -1 );
return TRUE;
}
-/**
- *
- *
- *
- */
GtkWidget *onglet_etat_dates ( void )
{
GtkWidget *scrolled_window, *separateur, *vbox;
@@ -2099,73 +2060,114 @@ GtkWidget *onglet_etat_dates ( void )
vbox_onglet = new_vbox_with_title_and_icon ( _("Date selection"), "scheduler.png" );
gtk_widget_show ( vbox_onglet );
- hbox_onglet = gtk_hbox_new ( FALSE, 5 );
+ hbox_onglet = gtk_hbox_new ( FALSE,
+ 5 );
gtk_widget_show ( hbox_onglet );
- gtk_box_pack_start ( GTK_BOX ( vbox_onglet ), hbox_onglet, TRUE, TRUE, 0 );
+ gtk_box_pack_start ( GTK_BOX ( vbox_onglet ),
+ hbox_onglet,
+ TRUE,
+ TRUE,
+ 0 );
+
/* mise en place de la plage de dates */
- vbox = gtk_vbox_new ( FALSE, 5 );
- gtk_box_pack_start ( GTK_BOX ( hbox_onglet ), vbox, TRUE, TRUE, 0 );
+
+ vbox = gtk_vbox_new ( FALSE,
+ 5 );
+ gtk_box_pack_start ( GTK_BOX ( hbox_onglet ),
+ vbox,
+ TRUE,
+ TRUE,
+ 0 );
gtk_widget_show ( vbox );
- radio_button_utilise_dates = gtk_radio_button_new_with_label ( NULL, _("Use dates ranges") );
- gtk_box_pack_start ( GTK_BOX ( vbox ), radio_button_utilise_dates, FALSE, FALSE, 0 );
+ radio_button_utilise_dates = gtk_radio_button_new_with_label ( NULL,
+ _("Use dates ranges") );
+ gtk_box_pack_start ( GTK_BOX ( vbox ),
+ radio_button_utilise_dates,
+ FALSE,
+ FALSE,
+ 0 );
gtk_widget_show ( radio_button_utilise_dates );
/* on met en dessous une liste avec les plages de date proposées */
- frame = gtk_frame_new ( NULL );
- gtk_box_pack_start ( GTK_BOX ( vbox ), frame, TRUE, TRUE, 0 );
+
+ frame = gtk_frame_new (NULL);
+ gtk_box_pack_start ( GTK_BOX ( vbox ),
+ frame,
+ TRUE,
+ TRUE,
+ 0 );
gtk_widget_show ( frame );
vbox_utilisation_date = gtk_vbox_new ( FALSE, 5 );
- gtk_container_set_border_width ( GTK_CONTAINER ( vbox_utilisation_date ), 10 );
- gtk_container_add ( GTK_CONTAINER ( frame ), vbox_utilisation_date );
+ gtk_container_set_border_width ( GTK_CONTAINER ( vbox_utilisation_date ),
+ 10 );
+ gtk_container_add ( GTK_CONTAINER ( frame ),
+ vbox_utilisation_date );
gtk_widget_show ( vbox_utilisation_date );
/* on met la connection pour rendre sensitif cette frame */
+
g_signal_connect ( G_OBJECT ( radio_button_utilise_dates ),
- "toggled",
- G_CALLBACK ( sens_desensitive_pointeur ),
- vbox_utilisation_date );
+ "toggled",
+ G_CALLBACK ( sens_desensitive_pointeur ),
+ vbox_utilisation_date );
- scrolled_window = gtk_scrolled_window_new ( FALSE, FALSE );
+ scrolled_window = gtk_scrolled_window_new ( FALSE,
+ FALSE );
gtk_scrolled_window_set_policy ( GTK_SCROLLED_WINDOW ( scrolled_window ),
- GTK_POLICY_AUTOMATIC,
- GTK_POLICY_AUTOMATIC );
- gtk_box_pack_start ( GTK_BOX ( vbox_utilisation_date ), scrolled_window, TRUE, TRUE, 0 );
+ GTK_POLICY_AUTOMATIC,
+ GTK_POLICY_AUTOMATIC );
+ gtk_box_pack_start ( GTK_BOX ( vbox_utilisation_date ),
+ scrolled_window,
+ TRUE,
+ TRUE,
+ 0 );
gtk_widget_show ( scrolled_window );
liste_plages_dates_etat = gtk_clist_new ( 1 );
- gtk_clist_set_column_auto_resize ( GTK_CLIST ( liste_plages_dates_etat ), 0, TRUE );
+ gtk_clist_set_column_auto_resize ( GTK_CLIST ( liste_plages_dates_etat ),
+ 0,
+ TRUE );
g_signal_connect ( G_OBJECT ( liste_plages_dates_etat ),
- "button_press_event",
- G_CALLBACK ( click_liste_etat ),
- NULL );
- gtk_container_add ( GTK_CONTAINER ( scrolled_window ), liste_plages_dates_etat );
+ "button_press_event",
+ G_CALLBACK ( click_liste_etat ),
+ NULL );
+ gtk_container_add ( GTK_CONTAINER ( scrolled_window ),
+ liste_plages_dates_etat );
gtk_widget_show ( liste_plages_dates_etat );
/* on remplit la liste des dates */
+
plages_dates = liste_plages_dates;
i = 0;
while ( plages_dates[i] )
{
- gint row;
- gchar *plage = _(plages_dates[i]);
+ gint row;
+ gchar * plage = _(plages_dates[i]);
- row = gtk_clist_append ( GTK_CLIST ( liste_plages_dates_etat ), &plage );
- i++;
+ row = gtk_clist_append ( GTK_CLIST ( liste_plages_dates_etat ),
+ &plage );
+ i++;
}
/* séparation gauche-droite */
+
separateur = gtk_vseparator_new ();
- gtk_box_pack_start ( GTK_BOX ( hbox_onglet ), separateur, FALSE, FALSE, 0 );
+ gtk_box_pack_start ( GTK_BOX ( hbox_onglet ),
+ separateur,
+ FALSE,
+ FALSE,
+ 0 );
gtk_widget_show ( separateur );
/* on met en forme la partie de droite : utilisation des exercices */
+
vbox = gtk_vbox_new ( FALSE,
5 );
gtk_box_pack_start ( GTK_BOX ( hbox_onglet ),
@@ -2196,6 +2198,7 @@ GtkWidget *onglet_etat_dates ( void )
/* on met la connection pour rendre sensitif cette frame */
+
g_signal_connect ( G_OBJECT (radio_button_utilise_exo ),
"toggled",
G_CALLBACK ( sens_desensitive_pointeur ),
@@ -2357,8 +2360,8 @@ GtkWidget *onglet_etat_dates ( void )
/* vérifie où l'on clique et empèche la désélection de row */
/******************************************************************************/
void click_liste_etat ( GtkCList *liste,
- GdkEventButton *evenement,
- gint origine )
+ GdkEventButton *evenement,
+ gint origine )
{
gint colonne, x, y;
gint row;
@@ -3315,8 +3318,8 @@ static gboolean report_config_fill_categ_budget_list ( gboolean is_categ )
* \return
* */
static void report_config_mixed_list_add_div ( gboolean is_categ,
- const gchar *name,
- gint number )
+ const gchar *name,
+ gint number )
{
GtkTreeModel *model;
@@ -3346,8 +3349,8 @@ static void report_config_mixed_list_add_div ( gboolean is_categ,
* \return
* */
static void report_config_mixed_list_add_sub_div ( gboolean is_categ,
- const gchar *name,
- gint number )
+ const gchar *name,
+ gint number )
{
GtkTreeModel *model;
GtkTreeIter child_iter;
@@ -3381,8 +3384,8 @@ static void report_config_mixed_list_add_sub_div ( gboolean is_categ,
* \return FALSE
* */
static gboolean report_config_categ_budget_toggled ( GtkCellRendererToggle *radio_renderer,
- gchar *path_str,
- GtkTreeStore *store )
+ gchar *path_str,
+ GtkTreeStore *store )
{
GtkTreePath *path;
GtkTreeIter iter;
@@ -3443,7 +3446,7 @@ static gboolean report_config_categ_budget_toggled ( GtkCellRendererToggle *radi
* \return FALSE
* */
static gboolean report_config_category_select_all ( GtkWidget *button,
- gboolean *select_ptr )
+ gboolean *select_ptr )
{
return (report_config_mix_select_all (model_categ, GPOINTER_TO_INT (select_ptr)));
}
@@ -3459,7 +3462,7 @@ static gboolean report_config_category_select_all ( GtkWidget *button,
* \return FALSE
* */
static gboolean report_config_budget_select_all ( GtkWidget *button,
- gboolean *select_ptr )
+ gboolean *select_ptr )
{
return (report_config_mix_select_all (model_budget, GPOINTER_TO_INT (select_ptr)));
}
@@ -3475,7 +3478,7 @@ static gboolean report_config_budget_select_all ( GtkWidget *button,
* \return FALSE
* */
static gboolean report_config_mix_select_all ( GtkTreeModel *model,
- gboolean toggle_value )
+ gboolean toggle_value )
{
if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), &parent_iter))
return FALSE;
@@ -3514,7 +3517,7 @@ static gboolean report_config_mix_select_all ( GtkTreeModel *model,
* \return FALSE
* */
static gboolean report_config_category_select_type ( GtkWidget *button,
- gboolean *type_ptr )
+ gboolean *type_ptr )
{
return (report_config_mix_select_type (TRUE, GPOINTER_TO_INT (type_ptr)));
@@ -3529,7 +3532,7 @@ static gboolean report_config_category_select_type ( GtkWidget *button,
* \return FALSE
* */
static gboolean report_config_budget_select_type ( GtkWidget *button,
- gboolean *type_ptr )
+ gboolean *type_ptr )
{
return (report_config_mix_select_type (FALSE, GPOINTER_TO_INT (type_ptr)));
}
@@ -3543,7 +3546,7 @@ static gboolean report_config_budget_select_type ( GtkWidget *button,
* \return FALSE
* */
static gboolean report_config_mix_select_type ( gboolean is_categ,
- gboolean type )
+ gboolean type )
{
GtkTreeModel *model;
@@ -3733,7 +3736,7 @@ static void report_config_category_update_treeview ( gboolean is_categ )
* \return
* */
static void report_config_category_toggle_categ ( struct_categ_budget_sel *categ_budget_struct,
- gboolean is_categ )
+ gboolean is_categ )
{
GtkTreeModel *model;
@@ -6001,7 +6004,7 @@ GtkWidget *cree_bouton_comparateur_texte ( gint text_comparison_number )
/* donc si on choisit nul, non nul, pos ou nég, on grise l' ( gint text_comparison_number ) radi ) ) of payment used\" option activated.") ) ); )); on_number)) -> menu_item ), item ), item ), øgå* p¢ÿ å* ü¡ÿ Pû¡ÿ ëKå* 6 è è! è! ¢ÿ p¢ÿ x´gå* ý¡ÿ "Kå* Kå* ¢ÿ ð Kå* ?¢ÿ À¯Ëå* óKå* Ëå* ؤËå* ¨©Ëå* ÈLå* x´gå* ý¡ÿ Pü¡ÿ ëKå* à! à! ¢ÿ p¢ÿ È}Gå* `þ¡ÿ "Kå* Kå* ¢ÿ ð Kå* ?¢ÿ 0¢ÿ (¢ÿ lå* p p¢ÿ óKå* ÈLå* `þ¡ÿ 0ý¡ÿ ëKå* G H I J K M N O P ¢ÿ p¢ÿ H5å* ¢ÿ "Kå* Kå* ¢ÿ 0¯Ëå* óKå* Àgå* iûå* Ëå* ؤËå* ¨©Ëå* ÈLå*
H5å* ¢ÿ @þ¡ÿ ëKå* 85å* ¢ÿ pþ¡ÿ ëKå* (5å* ¢ÿ þ¡ÿ ëKå* 5å* ¢ÿ Ðþ¡ÿ ëKå* ¨®Ëå* óKå* ¨©Ëå* Pù¡ÿ ¸ûå* æKå* ؤËå* pÿ¡ÿ y¸ûå* æKå* Ëå* ÿ¡ÿ Z¸ûå* æKå* Ødûå* Àgå* iûå* Ëå* ØÄgå* ؤËå* ¨©Ëå* ÈLå* àùå* ¢ÿ ðÿ¡ÿ ëKå* # % ' ) * - . 0 3 5 6 7 8 : < = ¢ÿ p¢ÿ pëÅå* @¢ÿ "Kå* 8Ïgå* óKå* ØÄgå* Égå* ÈLå* c f -å* p¢ÿ pëÅå* @¢ÿ ¢ÿ ëKå* Ó%°æ§ìwqÒ-øÒ êÓïs¨Ó,~9×u]ÞÓ 4Q ÷U^Qʧ ¶uª¹ñìò*Äv´Âå* °¢ÿ FÐ.å* FÐ.å* ?å* p¢ÿ Ðÿ¡ÿ ¢ÿ -å* æKå* èlå* ð ¢ÿ BÐ.å* À¢ÿ ?¢ÿ õ¬l
å* p¢ÿ ÿÿÿÿÿÿÿÿBÐ.å* x¢ÿ ëK entrée */
/******************************************************************************/
void change_comparaison_texte ( GtkWidget *menu_item,
- gint text_comparison_number )
+ gint text_comparison_number )
{
gint sensitif;
diff --git a/src/gsb_account_property.c b/src/gsb_account_property.c
index 5bd7356..21e6295 100644
--- a/src/gsb_account_property.c
+++ b/src/gsb_account_property.c
@@ -115,7 +115,7 @@ struct iso_13616_iban
gint nbre_char;
};
-struct iso_13616_iban iso_13616_ibans [] = {
+static struct iso_13616_iban iso_13616_ibans [] = {
{ "XX", "XXkk XXXX XXXX XXXX XXXX XXXX XXXX XXXX XX", 34 },
{ "AD", "ADkk BBBB SSSS CCCC CCCC CCCC", 24 },
{ "AT", "ATkk BBBB BCCC CCCC CCCC", 20 },
diff --git a/src/gsb_etats_config.c b/src/gsb_etats_config.c
index ac59600..d5afb92 100644
--- a/src/gsb_etats_config.c
+++ b/src/gsb_etats_config.c
@@ -69,6 +69,9 @@ static gint gsb_etats_config_categ_budget_sort_function ( GtkTreeModel *model,
GtkTreeIter *iter_1,
GtkTreeIter *iter_2,
gchar *sw_name );
+static gboolean gsb_etats_config_categ_budget_toggled ( GtkCellRendererToggle *radio_renderer,
+ gchar *path_str,
+ GtkTreeStore *store );
static gchar *gsb_etats_config_get_full_path ( const gchar *name );
static GtkWidget *gsb_etats_config_get_liste_categ_budget ( gchar *sw_name );
static GtkWidget *gsb_etats_config_onglet_get_liste_comptes ( gchar *sw_name );
@@ -101,7 +104,7 @@ static gboolean gsb_etats_config_report_tree_selectable_func (GtkTreeSelection *
static gboolean gsb_etats_config_report_tree_view_selection_changed ( GtkTreeSelection *selection,
GtkTreeModel *model );
static gboolean gsb_etats_config_selection_dates_changed ( GtkTreeSelection *selection, GtkWidget *widget );
-static void gsb_etats_config_togglebutton_categ_etat ( GtkToggleButton *togglebutton, GtkWidget *tree_view );
+static void gsb_etats_config_togglebutton_expand_categ ( GtkToggleButton *togglebutton, GtkWidget *tree_view );
/*END_STATIC*/
@@ -353,9 +356,12 @@ GtkWidget *gsb_etats_config_get_report_tree_view ( void )
G_TYPE_INT );
/* Create container + TreeView */
- tree_view = gtk_tree_view_new_with_model ( GTK_TREE_MODEL ( report_tree_model ) );
+ tree_view = gtk_tree_view_new_with_model ( GTK_TREE_MODEL ( report_tree_model ) );
g_object_unref ( G_OBJECT ( report_tree_model ) );
+ /* set the color of selected row */
+ utils_set_tree_view_selection_and_text_color ( tree_view );
+
/* make column */
cell = gtk_cell_renderer_text_new ( );
column = gtk_tree_view_column_new_with_attributes ( "Categories",
@@ -637,6 +643,7 @@ GtkWidget *gsb_etats_config_onglet_etat_dates ( void )
gsb_etats_config_get_variable_by_name ( "vbox_utilisation_exo", NULL ) ),
10 );
+ gtk_widget_set_sensitive ( gsb_etats_config_get_variable_by_name ( "vbox_utilisation_exo", NULL ), FALSE );
gtk_widget_set_sensitive ( gsb_etats_config_get_variable_by_name ( "sw_exer", NULL ), FALSE );
/* on met la connection pour rendre sensitif la frame vbox_utilisation_date */
@@ -698,7 +705,7 @@ GtkWidget *gsb_etats_config_onglet_get_liste_dates ( void )
sw = gsb_etats_config_get_scrolled_window_with_tree_view ( "sw_dates", GTK_TREE_MODEL ( list_store ) );
- tree_view = gsb_etats_config_get_variable_by_name ( "sw_dates", "tree_view_dates" );
+ tree_view = gsb_etats_config_get_variable_by_name ( "sw_dates", "tree_view" );
selection = gtk_tree_view_get_selection ( GTK_TREE_VIEW ( tree_view ) );
gtk_tree_selection_set_mode ( selection, GTK_SELECTION_SINGLE );
g_signal_connect ( G_OBJECT ( selection ),
@@ -1030,7 +1037,7 @@ GtkWidget *gsb_etats_config_onglet_etat_categories ( void )
gsb_etats_config_get_variable_by_name ( "vbox_detaille_categ_etat", NULL ) );
/* on met la connection pour rendre sensitif la vbox_generale_comptes_etat */
- button = gsb_etats_config_get_variable_by_name ( "togglebutton_categ_etat", NULL );
+ button = gsb_etats_config_get_variable_by_name ( "togglebutton_expand_categ", NULL );
g_object_set_data ( G_OBJECT ( button ), "hbox_expand",
gsb_etats_config_get_variable_by_name ( "hbox_toggle_expand_categ", NULL ) );
g_object_set_data ( G_OBJECT ( button ), "hbox_collapse",
@@ -1038,8 +1045,8 @@ GtkWidget *gsb_etats_config_onglet_etat_categories ( void )
g_signal_connect ( G_OBJECT ( button ),
"toggled",
- G_CALLBACK ( gsb_etats_config_togglebutton_categ_etat ),
- gsb_etats_config_get_variable_by_name ( "sw_categ", "tree_view_categ" ) );
+ G_CALLBACK ( gsb_etats_config_togglebutton_expand_categ ),
+ gsb_etats_config_get_variable_by_name ( "sw_categ", "tree_view" ) );
return vbox_onglet;
}
@@ -1062,7 +1069,6 @@ GtkWidget *gsb_etats_config_get_liste_categ_budget ( gchar *sw_name )
GtkTreeViewColumn *column;
GtkCellRenderer *cell_renderer;
GtkCellRenderer *radio_renderer;
- gchar *tmp_name;
store = gtk_tree_store_new ( GSB_ETAT_CATEG_BUDGET_LIST_NB,
G_TYPE_STRING, /* GSB_ETAT_CATEG_BUDGET_LIST_NAME */
@@ -1083,6 +1089,10 @@ GtkWidget *gsb_etats_config_get_liste_categ_budget ( gchar *sw_name )
/* create the tree view */
tree_view = gtk_tree_view_new_with_model ( GTK_TREE_MODEL ( store ) );
gtk_tree_view_set_headers_visible ( GTK_TREE_VIEW ( tree_view ), FALSE );
+
+ /* set the color of selected row */
+ utils_set_tree_view_selection_and_text_color ( tree_view );
+
g_object_unref ( G_OBJECT ( store ) );
/* create the column */
@@ -1090,7 +1100,7 @@ GtkWidget *gsb_etats_config_get_liste_categ_budget ( gchar *sw_name )
/* create the toggle button part */
radio_renderer = gtk_cell_renderer_toggle_new ();
- g_object_set ( G_OBJECT (radio_renderer), "xalign", 0.0, NULL );
+ g_object_set ( G_OBJECT ( radio_renderer ), "xalign", 0.0, NULL );
gtk_tree_view_column_pack_start ( column,
radio_renderer,
@@ -1100,11 +1110,10 @@ GtkWidget *gsb_etats_config_get_liste_categ_budget ( gchar *sw_name )
"active", 1,
"activatable", 2,
NULL);
-/* g_signal_connect ( G_OBJECT ( radio_renderer ),
- * "toggled",
- * G_CALLBACK ( report_config_categ_budget_toggled ),
- * store );
- */
+ g_signal_connect ( G_OBJECT ( radio_renderer ),
+ "toggled",
+ G_CALLBACK ( gsb_etats_config_categ_budget_toggled ),
+ store );
/* create the text part */
cell_renderer = gtk_cell_renderer_text_new ( );
@@ -1125,10 +1134,7 @@ GtkWidget *gsb_etats_config_get_liste_categ_budget ( gchar *sw_name )
sw = GTK_WIDGET ( gtk_builder_get_object ( etat_config_builder, sw_name ) );
gtk_container_add ( GTK_CONTAINER ( sw ), tree_view );
- tmp_name = g_strconcat ( "tree_view", sw_name + 2, NULL);
- g_object_set_data ( G_OBJECT ( sw ), tmp_name, tree_view );
-
- g_free ( tmp_name );
+ g_object_set_data ( G_OBJECT ( sw ), "tree_view", tree_view );
gtk_widget_show_all ( sw );
@@ -1137,6 +1143,147 @@ GtkWidget *gsb_etats_config_get_liste_categ_budget ( gchar *sw_name )
/**
+ * callback if we toggle a checkbox in the category/budget list
+ * if we toggle a div, toggle all the sub-div
+ * if we toggle a sub-div, toggle also the div
+ *
+ * \param radio_renderer
+ * \param path the string of path
+ * \param store the GtkTreeStore of categ/budget
+ *
+ * \return FALSE
+ * */
+gboolean gsb_etats_config_categ_budget_toggled ( GtkCellRendererToggle *radio_renderer,
+ gchar *path_str,
+ GtkTreeStore *store )
+{
+ GtkTreePath *path;
+ GtkTreeIter iter;
+ GtkTreeIter iter_children;
+ gboolean toggle_value;
+
+ g_return_val_if_fail (path_str != NULL, FALSE);
+ g_return_val_if_fail (store != NULL && GTK_IS_TREE_STORE (store), FALSE);
+
+ /* first get the iter and the value of the checkbutton */
+ path = gtk_tree_path_new_from_string (path_str);
+ gtk_tree_model_get_iter ( GTK_TREE_MODEL ( store ), &iter, path );
+ gtk_tree_model_get ( GTK_TREE_MODEL ( store ),
+ &iter,
+ GSB_ETAT_CATEG_BUDGET_LIST_ACTIVE, &toggle_value,
+ -1 );
+
+ /* ok, we invert the button */
+ toggle_value = !toggle_value;
+
+ gtk_tree_store_set ( GTK_TREE_STORE ( store ),
+ &iter,
+ GSB_ETAT_CATEG_BUDGET_LIST_ACTIVE, toggle_value,
+ -1 );
+
+ /* if we are on a mother, we set the same value to all the children */
+ if (gtk_tree_model_iter_children ( GTK_TREE_MODEL ( store ), &iter_children, &iter ) )
+ {
+ /* we are on the children */
+ do
+ gtk_tree_store_set ( GTK_TREE_STORE (store),
+ &iter_children,
+ GSB_ETAT_CATEG_BUDGET_LIST_ACTIVE, toggle_value,
+ -1 );
+ while ( gtk_tree_model_iter_next ( GTK_TREE_MODEL ( store ), &iter_children ) );
+ }
+
+ /* if we are activating a child, activate the mother */
+ if (toggle_value
+ &&
+ gtk_tree_model_iter_parent ( GTK_TREE_MODEL ( store ), &iter_children, &iter ) )
+ gtk_tree_store_set ( GTK_TREE_STORE ( store ),
+ &iter_children,
+ GSB_ETAT_CATEG_BUDGET_LIST_ACTIVE, toggle_value,
+ -1 );
+
+ gtk_tree_path_free ( path );
+
+ return FALSE;
+}
+
+
+/**
+ * select or unselect all the categories
+ *
+ * \param button
+ * \param select_ptr TRUE or FALSE to select/unselect all
+ *
+ * \return FALSE
+ * */
+static gboolean gsb_etats_config_category_select_all ( GtkWidget *button,
+ gboolean *select_ptr )
+{
+/* return ( gsb_etats_config_mix_select_all ( model_categ, GPOINTER_TO_INT ( select_ptr ) ) ); */
+}
+
+
+
+/**
+ * select or unselect all the budgets
+ *
+ * \param button
+ * \param select_ptr TRUE or FALSE to select/unselect all
+ *
+ * \return FALSE
+ * */
+static gboolean gsb_etats_config_budget_select_all ( GtkWidget *button,
+ gboolean *select_ptr )
+{
+/* return ( gsb_etats_config_mix_select_all ( model_budget, GPOINTER_TO_INT ( select_ptr ) ) ); */
+}
+
+
+
+/**
+ * select or unselect all the budgets or categories
+ *
+ * \param model the model to fill (is model_categ or model_budget
+ * \param select_ptr TRUE or FALSE to select/unselect all
+ *
+ * \return FALSE
+ * */
+static gboolean gsb_etats_config_mix_select_all ( GtkTreeModel *model,
+ gboolean toggle_value )
+{
+ GtkTreeIter parent_iter;
+
+ if ( !gtk_tree_model_get_iter_first ( GTK_TREE_MODEL ( model ), &parent_iter ) )
+ return FALSE;
+
+ do
+ {
+ GtkTreeIter iter_children;
+
+ gtk_tree_store_set ( GTK_TREE_STORE ( model ),
+ &parent_iter,
+ GSB_ETAT_CATEG_BUDGET_LIST_ACTIVE, toggle_value,
+ -1 );
+
+ if ( gtk_tree_model_iter_children ( GTK_TREE_MODEL ( model ), &iter_children, &parent_iter ) )
+ {
+ /* we are on the children */
+ do
+ gtk_tree_store_set ( GTK_TREE_STORE ( model ),
+ &iter_children,
+ GSB_ETAT_CATEG_BUDGET_LIST_ACTIVE, toggle_value,
+ -1 );
+ while ( gtk_tree_model_iter_next ( GTK_TREE_MODEL ( model ), &iter_children ) );
+ }
+ }
+ while ( gtk_tree_model_iter_next ( GTK_TREE_MODEL ( model ), &parent_iter ) );
+
+ return FALSE;
+}
+
+
+
+/**
* fill the categories selection list for report
*
* \param is_categ TRUE for category, FALSE for budget
@@ -1158,7 +1305,7 @@ gboolean gsb_etats_config_fill_liste_categ_budget ( gboolean is_categ )
{
list_tmp = gsb_data_category_get_categories_list ( );
- tree_view = gsb_etats_config_get_variable_by_name ( "sw_categ", "tree_view_categ" );
+ tree_view = gsb_etats_config_get_variable_by_name ( "sw_categ", "tree_view" );
model = gtk_tree_view_get_model ( GTK_TREE_VIEW ( tree_view ) );
gtk_tree_store_clear ( GTK_TREE_STORE ( model ) );
@@ -1169,7 +1316,7 @@ gboolean gsb_etats_config_fill_liste_categ_budget ( gboolean is_categ )
else
{
list_tmp = gsb_data_budget_get_budgets_list ( );
- tree_view = gsb_etats_config_get_variable_by_name ( "sw_budget", "tree_view_budget" );
+ tree_view = gsb_etats_config_get_variable_by_name ( "sw_budget", "tree_view" );
model = gtk_tree_view_get_model ( GTK_TREE_VIEW ( tree_view ) );
gtk_tree_store_clear ( GTK_TREE_STORE ( model ) );
@@ -1281,7 +1428,7 @@ gboolean gsb_etats_config_fill_liste_categ_budget ( gboolean is_categ )
*
*
*/
-void gsb_etats_config_togglebutton_categ_etat ( GtkToggleButton *togglebutton, GtkWidget *tree_view )
+void gsb_etats_config_togglebutton_expand_categ ( GtkToggleButton *togglebutton, GtkWidget *tree_view )
{
GtkWidget *hbox_expand;
GtkWidget *hbox_collapse;
@@ -1348,8 +1495,8 @@ GtkWidget *gsb_etats_config_onglet_etat_ib ( void )
g_signal_connect ( G_OBJECT ( button ),
"toggled",
- G_CALLBACK ( gsb_etats_config_togglebutton_categ_etat ),
- gsb_etats_config_get_variable_by_name ( "sw_budget", "tree_view_budget" ) );
+ G_CALLBACK ( gsb_etats_config_togglebutton_expand_categ ),
+ gsb_etats_config_get_variable_by_name ( "sw_budget", "tree_view" ) );
return vbox_onglet;
}
@@ -1832,10 +1979,11 @@ GtkWidget *gsb_etats_config_get_scrolled_window_with_tree_view ( gchar *sw_name,
GtkWidget *tree_view;
GtkCellRenderer *cell;
GtkTreeViewColumn *column;
- gchar *tmp_name;
tree_view = gtk_tree_view_new_with_model ( GTK_TREE_MODEL ( model ) );
gtk_tree_view_set_headers_visible ( GTK_TREE_VIEW ( tree_view ), FALSE );
+ utils_set_tree_view_selection_and_text_color ( tree_view );
+
gtk_tree_selection_set_mode (
gtk_tree_view_get_selection ( GTK_TREE_VIEW ( tree_view ) ),
GTK_SELECTION_MULTIPLE );
@@ -1856,10 +2004,7 @@ GtkWidget *gsb_etats_config_get_scrolled_window_with_tree_view ( gchar *sw_name,
sw = GTK_WIDGET ( gtk_builder_get_object ( etat_config_builder, sw_name ) );
gtk_container_add ( GTK_CONTAINER ( sw ), tree_view );
- tmp_name = g_strconcat ( "tree_view", sw_name + 2, NULL);
- g_object_set_data ( G_OBJECT ( sw ), tmp_name, tree_view );
-
- g_free ( tmp_name );
+ g_object_set_data ( G_OBJECT ( sw ), "tree_view", tree_view );
gtk_widget_show_all ( sw );
diff --git a/src/gsb_reconcile.c b/src/gsb_reconcile.c
index c613e15..579c701 100644
--- a/src/gsb_reconcile.c
+++ b/src/gsb_reconcile.c
@@ -58,6 +58,7 @@
#include "transaction_list.h"
#include "transaction_list_sort.h"
#include "structures.h"
+#include "menu.h"
/*END_INCLUDE*/
/*START_STATIC*/
@@ -77,7 +78,6 @@ extern GtkWidget *label_last_statement;
extern gint mise_a_jour_liste_comptes_accueil;
extern GtkWidget * navigation_tree_view;
extern GtkWidget * reconcile_panel;
-extern GtkUIManager * ui_manager;
/*END_EXTERN*/
@@ -667,6 +667,7 @@ gboolean gsb_reconcile_finish_reconciliation ( GtkWidget *button,
* */
void gsb_reconcile_sensitive ( gboolean sensitive )
{
+ GtkUIManager *ui_manager = gsb_menu_get_ui_manager ( );
gtk_widget_set_sensitive ( navigation_tree_view, sensitive );
gsb_gui_sensitive_headings (sensitive);
/* add by pbiava 02/11/2009 */
diff --git a/src/gsb_scheduler_list.c b/src/gsb_scheduler_list.c
index 1afe13f..f29eead 100644
--- a/src/gsb_scheduler_list.c
+++ b/src/gsb_scheduler_list.c
@@ -205,8 +205,7 @@ GtkWidget *gsb_scheduler_list_create_list ( void )
gtk_container_add ( GTK_CONTAINER ( scrolled_window ), tree_view );
/* set the color of selected row */
- gtk_widget_modify_base ( tree_view, GTK_STATE_SELECTED, &couleur_selection );
- gtk_widget_modify_base ( tree_view, GTK_STATE_ACTIVE, &couleur_selection );
+ utils_set_tree_view_selection_and_text_color ( tree_view );
/* create the store and set it in the tree_view */
tree_model = gsb_scheduler_list_create_model ();
diff --git a/src/imputation_budgetaire.c b/src/imputation_budgetaire.c
index 16fd9a7..be6745d 100644
--- a/src/imputation_budgetaire.c
+++ b/src/imputation_budgetaire.c
@@ -114,7 +114,7 @@ GtkWidget *onglet_imputations ( void )
budgetary_line_tree = gtk_tree_view_new();
/* set the color of selected row */
- gtk_widget_modify_base ( budgetary_line_tree, GTK_STATE_SELECTED, &couleur_selection );
+ utils_set_tree_view_selection_and_text_color ( budgetary_line_tree );
budgetary_line_tree_model = gtk_tree_store_new ( META_TREE_NUM_COLUMNS,
META_TREE_COLUMN_TYPES );
diff --git a/src/menu.c b/src/menu.c
index 6ad1be3..17f548a 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -84,7 +84,7 @@ extern GtkWidget *window;
gboolean block_menu_cb = FALSE;
-GtkUIManager *ui_manager;
+static GtkUIManager *ui_manager;
static gint merge_id = -1;
static gint recent_files_merge_id = -1;
static gint move_to_account_merge_id = -1;
@@ -330,7 +330,7 @@ GtkWidget *init_menus ( GtkWidget *vbox )
menubar = gtk_ui_manager_get_widget ( ui_manager, "/menubar" );
gtk_box_pack_start ( GTK_BOX ( vbox ), menubar, FALSE, TRUE, 0 );
- gsb_gui_sensitive_menu_item ( "EditMenu", "NewTransaction", NULL, FALSE );
+ gsb_gui_sensitive_menu_item ( "/menubar/EditMenu/NewTransaction", FALSE );
gsb_menu_transaction_operations_set_sensitive ( FALSE );
return menubar;
@@ -529,39 +529,16 @@ gboolean help_bugreport ( void )
/**
- * Concatenate menu entry names to produce a valid menu path, like
- * /menubar/FileMenu/Save
- *
- * \param menu Name of the root menu.
- * \param submenu Name of the sub-menu.
- * \param subsubmenu Name of the sub-sub-menu.
- *
- * \return A newly-created string representing the menu path.
- */
-gchar *menu_name ( gchar *menu, gchar *submenu, gchar *subsubmenu )
-{
- if ( subsubmenu )
- return g_strconcat ( "/menubar/", menu, "/", submenu, "/", subsubmenu, NULL );
- else if ( submenu )
- return g_strconcat ( "/menubar/", menu, "/", submenu, NULL );
- else
- return g_strconcat ( "/menubar/", menu, NULL );
-}
-
-
-
-/**
* Set sensitiveness of a menu item according to a string
* representation of its position in the menu.
* menu.
*
- * \param root_menu_name Name of the menu.
- * \param submenu_name Name of the sub menu.
- * \param subsubmenu_name Name of the sub sub menu.
+ * \param item_name Path of the menu item.
+ * \param state Whether widget should be 'sensitive' or not.
*
* \return TRUE on success.
*/
-gboolean gsb_gui_sensitive_menu_item_from_string ( gchar *item_name, gboolean state )
+gboolean gsb_gui_sensitive_menu_item ( gchar *item_name, gboolean state )
{
GtkWidget * widget;
@@ -577,33 +554,6 @@ gboolean gsb_gui_sensitive_menu_item_from_string ( gchar *item_name, gboolean st
-/**
- * Set sensitiveness of a menu item according to its position in the
- * menu.
- *
- * \param root_menu_name Name of the menu.
- * \param submenu_name Name of the sub menu.
- * \param subsubmenu_name Name of the sub sub menu.
- *
- * \return TRUE on success.
- */
-gboolean gsb_gui_sensitive_menu_item ( gchar *root_menu_name,
- gchar *submenu_name,
- gchar *subsubmenu_name,
- gboolean state )
-{
- gchar* tmpstr;
- gboolean result;
-
- tmpstr = menu_name ( root_menu_name, submenu_name, subsubmenu_name );
- result = gsb_gui_sensitive_menu_item_from_string ( tmpstr, state );
-
- g_free ( tmpstr );
-
- return result;
-}
-
-
/**
* Callback called when an item of the "View/Show ... lines" menu is
* triggered.
@@ -740,48 +690,43 @@ gboolean gsb_menu_update_view_menu ( gint account_number )
block_menu_cb = TRUE;
/* update the showing of reconciled transactions */
- tmpstr = menu_name ( "ViewMenu", "ShowReconciled", NULL );
+ tmpstr = "/menubar/ViewMenu/ShowReconciled";
gtk_toggle_action_set_active ( GTK_TOGGLE_ACTION (
gtk_ui_manager_get_action ( ui_manager, tmpstr) ),
gsb_data_account_get_r ( account_number ) );
- g_free ( tmpstr );
- tmpstr = menu_name ( "ViewMenu", "ShowTransactionForm", NULL );
+ tmpstr = "/menubar/ViewMenu/ShowTransactionForm";
gtk_toggle_action_set_active ( GTK_TOGGLE_ACTION (
gtk_ui_manager_get_action ( ui_manager, tmpstr) ),
gsb_form_is_visible ( ) );
- g_free ( tmpstr );
/* update the showing of archived transactions */
- tmpstr = menu_name ( "ViewMenu", "ShowArchived", NULL );
+ tmpstr = "/menubar/ViewMenu/ShowArchived";
gtk_toggle_action_set_active ( GTK_TOGGLE_ACTION (
gtk_ui_manager_get_action ( ui_manager, tmpstr) ),
gsb_data_account_get_l ( account_number ) );
- g_free ( tmpstr );
/* update the number of line showed */
switch ( gsb_data_account_get_nb_rows (account_number))
{
default:
case 1 :
- item_name = menu_name ( "ViewMenu", "ShowOneLine", NULL );
+ item_name = "/menubar/ViewMenu/ShowOneLine";
break;
case 2 :
- item_name = menu_name ( "ViewMenu", "ShowTwoLines", NULL );
+ item_name = "/menubar/ViewMenu/ShowTwoLines";
break;
case 3 :
- item_name = menu_name ( "ViewMenu", "ShowThreeLines", NULL );
+ item_name = "/menubar/ViewMenu/ShowThreeLines";
break;
case 4 :
- item_name = menu_name ( "ViewMenu", "ShowFourLines", NULL );
+ item_name = "/menubar/ViewMenu/ShowFourLines";
break;
}
gtk_toggle_action_set_active ( GTK_TOGGLE_ACTION (
gtk_ui_manager_get_action ( ui_manager, item_name ) ),
TRUE );
- g_free ( item_name );
-
block_menu_cb = FALSE;
return FALSE;
@@ -865,11 +810,11 @@ gboolean gsb_menu_transaction_operations_set_sensitive ( gboolean sensitive )
{
devel_debug ( sensitive ? "item sensitive" : "item unsensitive" );
- gsb_gui_sensitive_menu_item ( "EditMenu", "RemoveTransaction", NULL, sensitive );
- gsb_gui_sensitive_menu_item ( "EditMenu", "CloneTransaction", NULL, sensitive );
- gsb_gui_sensitive_menu_item ( "EditMenu", "EditTransaction", NULL, sensitive );
- gsb_gui_sensitive_menu_item ( "EditMenu", "ConvertToScheduled", NULL, sensitive );
- gsb_gui_sensitive_menu_item ( "EditMenu", "MoveToAnotherAccount", NULL, sensitive );
+ gsb_gui_sensitive_menu_item ( "/menubar/EditMenu/RemoveTransaction", sensitive );
+ gsb_gui_sensitive_menu_item ( "/menubar/EditMenu/CloneTransaction", sensitive );
+ gsb_gui_sensitive_menu_item ( "/menubar/EditMenu/EditTransaction", sensitive );
+ gsb_gui_sensitive_menu_item ( "/menubar/EditMenu/ConvertToScheduled", sensitive );
+ gsb_gui_sensitive_menu_item ( "/menubar/EditMenu/MoveToAnotherAccount", sensitive );
return FALSE;
}
diff --git a/src/menu.h b/src/menu.h
index 1bbc5f0..3c78bf1 100644
--- a/src/menu.h
+++ b/src/menu.h
@@ -21,11 +21,7 @@ enum view_menu_action {
/* START_DECLARATION */
gboolean affiche_derniers_fichiers_ouverts ( void );
void efface_derniers_fichiers_ouverts ( void );
-gboolean gsb_gui_sensitive_menu_item ( gchar *root_menu_name,
- gchar *submenu_name,
- gchar *subsubmenu_name,
- gboolean state );
-gboolean gsb_gui_sensitive_menu_item_from_string ( gchar *item_name, gboolean state );
+gboolean gsb_gui_sensitive_menu_item ( gchar *item_name, gboolean state );
void gsb_gui_toggle_line_view_mode ( GtkRadioAction *action,
GtkRadioAction *current,
gpointer user_data );
@@ -36,6 +32,5 @@ gboolean gsb_menu_transaction_operations_set_sensitive ( gboolean sensitive );
gboolean gsb_menu_update_accounts_in_menus ( void );
gboolean gsb_menu_update_view_menu ( gint account_number );
GtkWidget *init_menus ( GtkWidget *vbox );
-gchar *menu_name ( gchar *menu, gchar *submenu, gchar *subsubmenu );
/* END_DECLARATION */
#endif
diff --git a/src/navigation.c b/src/navigation.c
index dfebeef..7719e20 100644
--- a/src/navigation.c
+++ b/src/navigation.c
@@ -937,6 +937,7 @@ gboolean navigation_change_account ( gint *no_account )
{
gint new_account;
gint current_account;
+ gchar *tmp_menu_path;
new_account = GPOINTER_TO_INT ( no_account );
devel_debug_int (new_account);
@@ -949,10 +950,13 @@ gboolean navigation_change_account ( gint *no_account )
current_account = gsb_gui_navigation_get_last_account ();
/* sensitive the last account in the menu */
- gsb_gui_sensitive_menu_item ( "EditMenu", "MoveToAnotherAccount",
- gsb_data_account_get_name (current_account),
- TRUE );
- gsb_gui_sensitive_menu_item ( "EditMenu", "NewTransaction", NULL, TRUE );
+ tmp_menu_path = g_strconcat (
+ "/menubar/EditMenu/MoveToAnotherAccount/",
+ gsb_data_account_get_name (current_account),
+ NULL );
+ gsb_gui_sensitive_menu_item ( tmp_menu_path, TRUE );
+ g_free ( tmp_menu_path );
+ gsb_gui_sensitive_menu_item ( "/menubar/EditMenu/NewTransaction", TRUE );
/* save the row_align of the last account */
gsb_data_account_set_row_align ( current_account,
@@ -968,9 +972,12 @@ gboolean navigation_change_account ( gint *no_account )
/* mise en place de la date du dernier relevé */
gsb_navigation_update_statement_label ( new_account );
- gsb_gui_sensitive_menu_item ( "EditMenu", "MoveToAnotherAccount",
- gsb_data_account_get_name ( new_account ),
- FALSE );
+ tmp_menu_path = g_strconcat (
+ "/menubar/EditMenu/MoveToAnotherAccount/",
+ gsb_data_account_get_name (new_account),
+ NULL );
+ gsb_gui_sensitive_menu_item ( tmp_menu_path, FALSE );
+ g_free ( tmp_menu_path );
/* Sensitive menu items if something is selected. */
if ( gsb_data_account_get_current_transaction_number ( new_account ) == -1 )
@@ -1112,8 +1119,8 @@ gboolean gsb_gui_navigation_select_line ( GtkTreeSelection *selection,
if ( page_number != GSB_ACCOUNT_PAGE )
{
- gsb_gui_sensitive_menu_item ( "EditMenu", "NewTransaction", NULL, FALSE );
- gsb_gui_sensitive_menu_item ( "EditMenu", "RemoveAccount", NULL, FALSE );
+ gsb_gui_sensitive_menu_item ( "/menubar/EditMenu/NewTransaction", FALSE );
+ gsb_gui_sensitive_menu_item ( "/menubar/EditMenu/RemoveAccount", FALSE );
menus_view_sensitifs ( FALSE );
}
@@ -1127,7 +1134,7 @@ gboolean gsb_gui_navigation_select_line ( GtkTreeSelection *selection,
case GSB_HOME_PAGE:
notice_debug ("Home page selected");
- gsb_gui_sensitive_menu_item ( "ViewMenu", "ShowClosed", NULL, TRUE );
+ gsb_gui_sensitive_menu_item ( "/menubar/ViewMenu/ShowClosed", TRUE );
/* what to be done if switch to that page */
mise_a_jour_accueil ( FALSE );
gsb_form_set_expander_visible ( FALSE, FALSE );
@@ -1137,7 +1144,7 @@ gboolean gsb_gui_navigation_select_line ( GtkTreeSelection *selection,
notice_debug ("Account page selected");
menus_view_sensitifs ( TRUE );
- gsb_gui_sensitive_menu_item ( "EditMenu", "RemoveAccount", NULL, TRUE );
+ gsb_gui_sensitive_menu_item ( "/menubar/EditMenu/RemoveAccount", TRUE );
account_number = gsb_gui_navigation_get_current_account ();
@@ -1188,7 +1195,7 @@ gboolean gsb_gui_navigation_select_line ( GtkTreeSelection *selection,
gtk_widget_show_all ( scheduler_calendar );
/* show menu InitwidthCol */
- gsb_gui_sensitive_menu_item ( "ViewMenu", "InitwidthCol", NULL, TRUE );
+ gsb_gui_sensitive_menu_item ( "/menubar/ViewMenu/InitwidthCol", TRUE );
break;
case GSB_PAYEES_PAGE:
diff --git a/src/tiers_onglet.c b/src/tiers_onglet.c
index 8735d7f..3806a43 100644
--- a/src/tiers_onglet.c
+++ b/src/tiers_onglet.c
@@ -181,7 +181,7 @@ GtkWidget *onglet_tiers ( void )
payee_tree = gtk_tree_view_new();
/* set the color of selected row */
- gtk_widget_modify_base ( payee_tree, GTK_STATE_SELECTED, &couleur_selection );
+ utils_set_tree_view_selection_and_text_color ( payee_tree );
payee_tree_model = gtk_tree_store_new ( META_TREE_NUM_COLUMNS, META_TREE_COLUMN_TYPES );
diff --git a/src/traitement_variables.c b/src/traitement_variables.c
index c542b31..744352c 100644
--- a/src/traitement_variables.c
+++ b/src/traitement_variables.c
@@ -188,6 +188,7 @@ GdkColor couleur_nom_compte_prelight;
GdkColor couleur_bleue;
GdkColor couleur_jaune;
+GdkColor couleur_noire;
/* colors for the balance estimate modul */
GdkColor couleur_bet_division;
@@ -265,13 +266,13 @@ void modification_fichier ( gboolean modif )
if ( ! etat.modification_fichier )
{
etat.modification_fichier = time ( NULL );
- gsb_gui_sensitive_menu_item ( "FileMenu", "Save", NULL, TRUE );
+ gsb_gui_sensitive_menu_item ( "/menubar/FileMenu/Save", TRUE );
}
}
else
{
etat.modification_fichier = 0;
- gsb_gui_sensitive_menu_item ( "FileMenu", "Save", NULL, FALSE );
+ gsb_gui_sensitive_menu_item ( "/menubar/FileMenu/Save", FALSE );
}
}
@@ -663,35 +664,35 @@ void initialisation_couleurs_listes ( void )
void menus_sensitifs ( gboolean sensitif )
{
gchar * items[] = {
- menu_name ( "FileMenu", "Save", NULL ),
- menu_name ( "FileMenu", "SaveAs", NULL ),
- menu_name ( "FileMenu", "DebugFile", NULL ),
- menu_name ( "FileMenu", "Obfuscate", NULL ),
- menu_name ( "FileMenu", "DebugMode", NULL ),
- menu_name ( "FileMenu", "ExportFile", NULL ),
- menu_name ( "FileMenu", "CreateArchive", NULL ),
- menu_name ( "FileMenu", "ExportArchive", NULL ),
- menu_name ( "FileMenu", "Close", NULL ),
- menu_name ( "EditMenu", "NewTransaction", NULL ),
- menu_name ( "EditMenu", "RemoveTransaction", NULL ),
- menu_name ( "EditMenu", "CloneTransaction", NULL ),
- menu_name ( "EditMenu", "EditTransaction", NULL ),
- menu_name ( "EditMenu", "ConvertToScheduled", NULL ),
- menu_name ( "EditMenu", "MoveToAnotherAccount", NULL ),
- menu_name ( "EditMenu", "Preferences", NULL ),
- menu_name ( "EditMenu", "RemoveAccount", NULL ),
- menu_name ( "EditMenu", "NewAccount", NULL ),
- menu_name ( "ViewMenu", "ShowTransactionForm", NULL ),
- menu_name ( "ViewMenu", "ShowGrid", NULL ),
- menu_name ( "ViewMenu", "ShowReconciled", NULL ),
- menu_name ( "ViewMenu", "ShowArchived", NULL ),
- menu_name ( "ViewMenu", "ShowClosed", NULL ),
- menu_name ( "ViewMenu", "ShowOneLine", NULL ),
- menu_name ( "ViewMenu", "ShowTwoLines", NULL ),
- menu_name ( "ViewMenu", "ShowThreeLines", NULL ),
- menu_name ( "ViewMenu", "ShowFourLines", NULL ),
- menu_name ( "ViewMenu", "InitwidthCol", NULL ),
- NULL,
+ "/menubar/FileMenu/Save",
+ "/menubar/FileMenu/SaveAs",
+ "/menubar/FileMenu/DebugFile",
+ "/menubar/FileMenu/Obfuscate",
+ "/menubar/FileMenu/DebugMode",
+ "/menubar/FileMenu/ExportFile",
+ "/menubar/FileMenu/CreateArchive",
+ "/menubar/FileMenu/ExportArchive",
+ "/menubar/FileMenu/Close",
+ "/menubar/EditMenu/NewTransaction",
+ "/menubar/EditMenu/RemoveTransaction",
+ "/menubar/EditMenu/CloneTransaction",
+ "/menubar/EditMenu/EditTransaction",
+ "/menubar/EditMenu/ConvertToScheduled",
+ "/menubar/EditMenu/MoveToAnotherAccount",
+ "/menubar/EditMenu/Preferences",
+ "/menubar/EditMenu/RemoveAccount",
+ "/menubar/EditMenu/NewAccount",
+ "/menubar/ViewMenu/ShowTransactionForm",
+ "/menubar/ViewMenu/ShowGrid",
+ "/menubar/ViewMenu/ShowReconciled",
+ "/menubar/ViewMenu/ShowArchived",
+ "/menubar/ViewMenu/ShowClosed",
+ "/menubar/ViewMenu/ShowOneLine",
+ "/menubar/ViewMenu/ShowTwoLines",
+ "/menubar/ViewMenu/ShowThreeLines",
+ "/menubar/ViewMenu/ShowFourLines",
+ "/menubar/ViewMenu/InitwidthCol",
+ NULL
};
gchar ** tmp = items;
@@ -699,31 +700,31 @@ void menus_sensitifs ( gboolean sensitif )
while ( *tmp )
{
- gsb_gui_sensitive_menu_item_from_string ( *tmp, sensitif );
- tmp++;
+ gsb_gui_sensitive_menu_item ( *tmp, sensitif );
+ tmp++;
}
/* As this function may only be called when a new account is
* created and the like, it is unlikely that we want to sensitive
* transaction-related menus. */
- gsb_gui_sensitive_menu_item ( "EditMenu", "NewTransaction", NULL, FALSE );
+ gsb_gui_sensitive_menu_item ( "/menubar/EditMenu/NewTransaction", FALSE );
gsb_menu_transaction_operations_set_sensitive ( FALSE );
}
void menus_view_sensitifs ( gboolean sensitif )
{
gchar * items[] = {
- menu_name ( "ViewMenu", "ShowTransactionForm", NULL ),
- menu_name ( "ViewMenu", "ShowGrid", NULL ),
- menu_name ( "ViewMenu", "ShowReconciled", NULL ),
- menu_name ( "ViewMenu", "ShowArchived", NULL ),
- menu_name ( "ViewMenu", "ShowClosed", NULL ),
- menu_name ( "ViewMenu", "ShowOneLine", NULL ),
- menu_name ( "ViewMenu", "ShowTwoLines", NULL ),
- menu_name ( "ViewMenu", "ShowThreeLines", NULL ),
- menu_name ( "ViewMenu", "ShowFourLines", NULL ),
- menu_name ( "ViewMenu", "InitwidthCol", NULL ),
- NULL,
+ "/menubar/ViewMenu/ShowTransactionForm",
+ "/menubar/ViewMenu/ShowGrid",
+ "/menubar/ViewMenu/ShowReconciled",
+ "/menubar/ViewMenu/ShowArchived",
+ "/menubar/ViewMenu/ShowClosed",
+ "/menubar/ViewMenu/ShowOneLine",
+ "/menubar/ViewMenu/ShowTwoLines",
+ "/menubar/ViewMenu/ShowThreeLines",
+ "/menubar/ViewMenu/ShowFourLines",
+ "/menubar/ViewMenu/InitwidthCol",
+ NULL
};
gchar **tmp = items;
@@ -731,7 +732,7 @@ void menus_view_sensitifs ( gboolean sensitif )
while ( *tmp )
{
- gsb_gui_sensitive_menu_item_from_string ( *tmp, sensitif );
+ gsb_gui_sensitive_menu_item ( *tmp, sensitif );
tmp++;
}
}
diff --git a/src/ui/gsb_etats_config.ui b/src/ui/gsb_etats_config.ui
index 723cecd..00ba46f 100644
--- a/src/ui/gsb_etats_config.ui
+++ b/src/ui/gsb_etats_config.ui
@@ -19,7 +19,7 @@
<property name="can_focus">True</property>
<child>
<object class="GtkVBox" id="vbox10">
- <property name="width_request">215</property>
+ <property name="width_request">220</property>
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
@@ -139,7 +139,7 @@
</child>
<child>
<object class="GtkFrame" id="frame-dates">
- <property name="width_request">270</property>
+ <property name="width_request">285</property>
<property name="height_request">410</property>
<property name="visible">True</property>
<property name="label_xalign">0</property>
@@ -289,8 +289,6 @@
<child>
<object class="GtkVBox" id="vbox_utilisation_exo">
<property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="no_show_all">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkRadioButton" id="bouton_exo_tous">
@@ -863,7 +861,7 @@
</child>
<child>
<object class="GtkButton" id="button2_categ">
- <property name="label" translatable="yes">Select all</property>
+ <property name="label" translatable="yes">Unselect all</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -910,7 +908,7 @@
</packing>
</child>
<child>
- <object class="GtkToggleButton" id="togglebutton_categ_etat">
+ <object class="GtkToggleButton" id="togglebutton_expand_categ">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
diff --git a/src/utils.c b/src/utils.c
index bee7d0a..78b2276 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -50,6 +50,8 @@
/*START_EXTERN*/
+extern GdkColor couleur_selection;
+extern GdkColor text_color[2];
extern GtkWidget *window;
/*END_EXTERN*/
@@ -258,7 +260,7 @@ gboolean lance_navigateur_web ( const gchar *url )
* \param fill Give all available space to padding box or not
* \param title Title to display on top of the paddingbox
*/
-GtkWidget *new_paddingbox_with_title (GtkWidget * parent, gboolean fill, const gchar *title)
+GtkWidget *new_paddingbox_with_title (GtkWidget *parent, gboolean fill, const gchar *title)
{
GtkWidget *vbox, *hbox, *paddingbox, *label;
gchar* tmp_str;
@@ -320,8 +322,8 @@ GtkWidget *new_paddingbox_with_title (GtkWidget * parent, gboolean fill, const g
* \returns A pointer to a vbox widget that will contain all created
* widgets and user defined widgets
*/
-GtkWidget *new_vbox_with_title_and_icon ( gchar * title,
- gchar * image_filename)
+GtkWidget *new_vbox_with_title_and_icon ( gchar *title,
+ gchar *image_filename)
{
GtkWidget *vbox_pref, *hbox, *label, *image, *eb;
GtkStyle * style;
@@ -457,7 +459,7 @@ void update_ecran ( void )
/******************************************************************************/
-void register_button_as_linked ( GtkWidget * widget, GtkWidget * linked )
+void register_button_as_linked ( GtkWidget *widget, GtkWidget *linked )
{
GSList * links;
@@ -474,7 +476,7 @@ void register_button_as_linked ( GtkWidget * widget, GtkWidget * linked )
*
*
*/
-gboolean radio_set_active_linked_widgets ( GtkWidget * widget )
+gboolean radio_set_active_linked_widgets ( GtkWidget *widget )
{
GSList * links;
@@ -532,6 +534,17 @@ void lance_mailer ( const gchar *uri )
g_free ( chaine );
}
+
+void utils_set_tree_view_selection_and_text_color ( GtkWidget *tree_view )
+{
+ gtk_widget_modify_base ( tree_view, GTK_STATE_SELECTED, &couleur_selection );
+ gtk_widget_modify_base ( tree_view, GTK_STATE_ACTIVE, &couleur_selection );
+
+ gtk_widget_modify_text ( tree_view, GTK_STATE_SELECTED, &text_color[0] );
+ gtk_widget_modify_text ( tree_view, GTK_STATE_ACTIVE, &text_color[0] );
+}
+
+
/* Local Variables: */
/* c-basic-offset: 4 */
/* End: */
diff --git a/src/utils.h b/src/utils.h
index 416a4bf..66ee0da 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -29,6 +29,6 @@ gboolean sens_desensitive_pointeur ( GtkWidget *bouton,
gboolean sensitive_widget ( gpointer object,
GtkWidget *widget );
void update_ecran ( void );
-
+void utils_set_tree_view_selection_and_text_color ( GtkWidget *tree_view );
/* END_DECLARATION */
#endif
hooks/post-receive
--
grisbi
More information about the cvs
mailing list