[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_9_5-215-g7281975
Pierre Biava
nobody at users.sourceforge.net
Sun Dec 9 15:40:49 CET 2012
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grisbi".
The branch, master has been updated
via 7281975c87c06e56e7f2e73ea748eeb8e36d43d0 (commit)
via 134b371004c498bb227e2fbfc7da9e61b263d75f (commit)
via 1b3c9bd55031f723f72fe2568e87d1d13f117686 (commit)
via 60c9ba549ae268038cd767dd41b2e6fd41efc669 (commit)
from ab46502eb5f3f986427a8dd8b2268a78e0a21d05 (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 7281975c87c06e56e7f2e73ea748eeb8e36d43d0
Author: pbiava <pierre.biava at nerim.net>
Date: Sun Dec 9 12:37:05 2012 +0100
Initialize global variables of the list of scheduled transactions
commit 134b371004c498bb227e2fbfc7da9e61b263d75f
Author: pbiava <pierre.biava at nerim.net>
Date: Sun Dec 9 12:36:00 2012 +0100
Initialize global variables of the list of categories
commit 1b3c9bd55031f723f72fe2568e87d1d13f117686
Author: pbiava <pierre.biava at nerim.net>
Date: Sun Dec 9 12:34:09 2012 +0100
remove global variable: no_devise_totaux_categ
commit 60c9ba549ae268038cd767dd41b2e6fd41efc669
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Dec 8 07:33:27 2012 +0100
Fixed a display bug of tips for graphics with dual series
-----------------------------------------------------------------------
Changes:
diff --git a/src/bet_data_finance.c b/src/bet_data_finance.c
index bca631f..de553d6 100644
--- a/src/bet_data_finance.c
+++ b/src/bet_data_finance.c
@@ -42,7 +42,6 @@
/*END_STATIC*/
/*START_EXTERN*/
-extern gint no_devise_totaux_categ;
/*END_EXTERN*/
/**
@@ -299,7 +298,7 @@ struct_amortissement *bet_data_finance_structure_amortissement_init ( void )
void bet_data_finance_data_simulator_init ( void )
{
etat.bet_capital = 1000.0;
- etat.bet_currency = no_devise_totaux_categ;
+ etat.bet_currency = etat.no_devise_totaux_categ;
etat.bet_taux_annuel = 4.0;
etat.bet_index_duree = 0;
etat.bet_frais = 0;
diff --git a/src/bet_graph.c b/src/bet_graph.c
index e16e1ae..827a067 100644
--- a/src/bet_graph.c
+++ b/src/bet_graph.c
@@ -643,19 +643,30 @@ static gboolean bet_graph_on_motion ( GtkWidget *event_box,
if ( strcmp ( self->service_id, "GogBarColPlot" ) == 0 )
{
index = gog_plot_view_get_data_at_point ( GOG_PLOT_VIEW ( view ), event->x, event->y, &series );
-
if ( index == -1 )
buf = NULL;
else
+ {
+ double const *x;
+ double const *y;
+
+ gog_series_get_xy_data ( series, &x, &y );
buf = g_strdup_printf ( _("date %s : value %s"), self->tab_vue_libelle[index],
utils_real_get_string_with_currency_from_double (
- self->tab_Y[index], self->currency_number ) );
+ y[index], self->currency_number ) );
+ }
}
-
else if ( strcmp ( self->service_id, "GogLinePlot") == 0 )
{
GogAxis *x_axis, *y_axis;
+ /* correction manque fonction _get_data_at_point () pour les graphes lignes */
+ if ( self->double_axe )
+ {
+ gtk_widget_set_tooltip_text ( GTK_WIDGET ( self->widget ), "" );
+ return TRUE;
+ }
+
x_axis = GOG_AXIS ( gog_object_get_child_by_name ( GOG_OBJECT ( self->chart ), "X-Axis" ) );
y_axis = GOG_AXIS ( gog_object_get_child_by_name ( GOG_OBJECT ( self->chart ), "Y-Axis" ) );
@@ -682,15 +693,20 @@ static gboolean bet_graph_on_motion ( GtkWidget *event_box,
}
else if ( strcmp ( self->service_id, "GogPiePlot" ) == 0 )
{
-
index = gog_plot_view_get_data_at_point ( GOG_PLOT_VIEW ( view ), event->x, event->y, &series );
if ( index == -1 )
buf = NULL;
else
+ {
+ double const *x;
+ double const *y;
+
+ gog_series_get_xy_data ( series, &x, &y );
buf = g_strdup_printf ("%s : %s (%.2f%%)", self->tab_vue_libelle[index],
utils_real_get_string_with_currency_from_double (
- self->tab_Y[index], self->currency_number ),
- ( 100*self->tab_Y[index]/self->montant ) );
+ y[index], self->currency_number ),
+ ( 100*y[index]/self->montant ) );
+ }
}
if ( buf )
@@ -701,6 +717,7 @@ static gboolean bet_graph_on_motion ( GtkWidget *event_box,
else
gtk_widget_set_tooltip_text ( GTK_WIDGET ( self->widget ), "" );
+ /* return value */
return TRUE;
}
diff --git a/src/categories_onglet.c b/src/categories_onglet.c
index 9070b7d..906833e 100644
--- a/src/categories_onglet.c
+++ b/src/categories_onglet.c
@@ -71,10 +71,9 @@ static void selectionne_sub_category ( GtkTreeModel *model );
/* Category toolbar, tree model & tree view */
-static GtkWidget *category_toolbar;
+static GtkWidget *category_toolbar = NULL;
static GtkTreeStore *categ_tree_model = NULL;
static GtkWidget *arbre_categ = NULL;
-gint no_devise_totaux_categ;
/* variable for the management of the cancelled edition */
static gboolean sortie_edit_category = FALSE;
@@ -88,6 +87,25 @@ struct metatree_hold_position *category_hold_position;
/**
+ * réinitialisation des variables globales
+ *
+ * \param
+ *
+ * \return
+ * */
+void categories_init_variables_list ( void )
+{
+ categ_tree_model = NULL;
+
+ category_toolbar = NULL; _list ( void ) n *category_hold_position; el ); x], ent->y, &series ); x+ r¹Xx+ `ø
¸ÿ Ðø
¸ÿ u:Xx+ ZXx+ U<Xx+ H8Yx+ Ðø
¸ÿ `ZYx+ Àí
¸ÿ ì
¸ÿ kPXx+ 6 è è! è! `ø
¸ÿ Ðø
¸ÿ x8Yx+ Àî
¸ÿ 2Xx+ PXx+ `ø
¸ÿ `2Xx+ ø
¸ÿ ÀÿYx+ u:Xx+ ðYx+ ØôYx+ ¨ùYx+ ZXx+ x8Yx+ Àî
¸ÿ í
¸ÿ kPXx+ à! à! `ø
¸ÿ Ðø
¸ÿ HÎYx+ ï
¸ÿ 2Xx+ PXx+ `ø
¸ÿ `2Xx+ ø
¸ÿ ø
¸ÿ ø
¸ÿ 8[<Xx+ p Ðø
¸ÿ u:Xx+ ZXx+ ï
¸ÿ pî
¸ÿ kPXx+ G H I J K M N O P `ø
¸ÿ Ðø
¸ÿ H
îXx+ @ñ
¸ÿ 2Xx+ PXx+ `ø
¸ÿ 0ÿYx+ u:Xx+ 8Yx+ ¹ËXx+ ðYx+ ØôYx+ ¨ùYx+ ZXx+ H
îXx+ @ñ
¸ÿ ï
¸ÿ kPXx+ 8
îXx+ @ñ
¸ÿ °ï
¸ÿ kPXx+ (
îXx+ @ñ
¸ÿ àï
¸ÿ kPXx+
îXx+ @ñ
¸ÿ ð
¸ÿ kPXx+ ¨þYx+ u:Xx+ ¨ùYx+ ê
¸ÿ ÌXx+ e9Xx+ ØôYx+ °ð
¸ÿ yÌXx+ e9Xx+ ðYx+ àð
¸ÿ ZÌXx+ e9Xx+ Ø´ËXx+ 8Yx+ ¹ËXx+ ðYx+ Ø8Yx+ ØôYx+ ¨ùYx+ ZXx+ 8[<Xx+ }Xx+ Ðø
¸ÿ pKËXx+ ò
¸ÿ `ñ
¸ÿ kPXx+ 5 6 7 8 : < = > ? @ B D `ø
¸ÿ Ðø
¸ÿ à}Xx+ Ðø
¸ÿ u:Xx+ U<Xx+ ñ
¸ÿ }Xx+ e9Xx+ U<Xx+ Õ_ at fÆS Qöl±íÁcXx+ Ðø
¸ÿ à}Xx+ ó
¸ÿ pò
¸ÿ kPXx+ u]ÞÓ 4Q ÷U^Qʧ ¶uª¹ñìò*Äv`ø
¸ÿ Ðø
¸ÿ HÎ`Xx+ Xx+ ú
¸ÿ ¦ ÿYx+ ¦ ÿYx+ fXx+ ø
¸ÿ Ðù
¸ÿ ø
¸ÿ ðô
¸ÿ 8Yx+ u:Xx+ Ø8Yx+ Pû
¸ÿ ¢ ÿYx+ ú
¸ÿ °õ
¸ÿ ÿÿÿÿÿÿÿÿ¢ ÿYx+ Øø
¸ÿ NULL;
+ arbre_categ = NULL;
+ etat.no_devise_totaux_categ = 1;
+
+ sortie_edit_category = FALSE;
+}
+
+
+/**
* Create and return contents of the "Category" notebook page.
*
* \return A newly allocated hbox.
@@ -1212,6 +1230,13 @@ void categories_edit_category ( void )
}
+/**
+ *
+ *
+ * \param
+ *
+ * \return
+ * */
/* Local Variables: */
/* c-basic-offset: 4 */
/* End: */
diff --git a/src/categories_onglet.h b/src/categories_onglet.h
index bc4e424..4e51550 100644
--- a/src/categories_onglet.h
+++ b/src/categories_onglet.h
@@ -9,9 +9,10 @@
/* START_DECLARATION */
GtkWidget *categories_create_list ( void );
-void categories_fill_list ( void );
void categories_exporter_list ( void );
+void categories_fill_list ( void );
void categories_importer_list ( void );
+void categories_init_variables_list ( void );
void categories_update_toolbar_list ( void );
GtkTreeStore *categories_get_tree_store ( void );
GtkWidget *categories_get_tree_view ( void );
diff --git a/src/gsb_currency_config.c b/src/gsb_currency_config.c
index 411043a..2691ece 100644
--- a/src/gsb_currency_config.c
+++ b/src/gsb_currency_config.c
@@ -80,7 +80,6 @@ static gboolean gsb_currency_config_update_list ( GtkWidget * checkbox,
/*END_STATIC*/
/*START_EXTERN*/
-extern gint no_devise_totaux_categ;
extern gint no_devise_totaux_ib;
extern gint no_devise_totaux_tiers;
/*END_EXTERN*/
@@ -836,7 +835,7 @@ GtkWidget *gsb_currency_config_create_totals_page ( void )
gtk_label_set_justify ( GTK_LABEL (label), GTK_JUSTIFY_LEFT );
gtk_table_attach ( GTK_TABLE ( table ), label,
0, 1, 1, 2, GTK_SHRINK | GTK_FILL, 0, 0, 0 );
- combo_devise_totaux_categ = gsb_currency_config_new_combobox ( &no_devise_totaux_categ,
+ combo_devise_totaux_categ = gsb_currency_config_new_combobox ( &etat.no_devise_totaux_categ,
categories_fill_list );
gtk_table_attach ( GTK_TABLE ( table ), combo_devise_totaux_categ,
1, 2, 1, 2, GTK_SHRINK | GTK_FILL, 0, 0, 0 );
diff --git a/src/gsb_file_load.c b/src/gsb_file_load.c
index 165a23f..6742ee8 100644
--- a/src/gsb_file_load.c
+++ b/src/gsb_file_load.c
@@ -180,7 +180,6 @@ extern gint display_three_lines;
extern gint display_two_lines;
extern struct iso_4217_currency iso_4217_currencies[];
extern GtkWidget *logo_accueil;
-extern gint no_devise_totaux_categ;
extern gint no_devise_totaux_ib;
extern gint no_devise_totaux_tiers;
extern gint tab_affichage_ope[TRANSACTION_LIST_ROWS_NB][CUSTOM_MODEL_VISIBLE_COLUMNS];
@@ -818,7 +817,7 @@ void gsb_file_load_general_part ( const gchar **attribute_names,
case 'C':
if ( !strcmp ( attribute_names[i], "Category_list_currency_number" ))
- no_devise_totaux_categ = utils_str_atoi ( attribute_values[i]);
+ etat.no_devise_totaux_categ = utils_str_atoi ( attribute_values[i] );
else if ( !strcmp ( attribute_names[i], "Combofix_mixed_sort" ))
etat.combofix_mixed_sort = utils_str_atoi( attribute_values[i]);
@@ -3051,14 +3050,14 @@ void gsb_file_load_currency ( const gchar **attribute_names,
no_devise_totaux_tiers = gsb_data_currency_get_no_currency (
g_slist_nth_data ( tmp_list, 0 ) );
}
- if ( no_devise_totaux_categ == 0 )
+ if ( etat.no_devise_totaux_categ == 0 )
{
GSList *tmp_list;
tmp_list = gsb_data_currency_get_currency_list ( );
if ( g_slist_length ( tmp_list ) > 0 )
- no_devise_totaux_categ = gsb_data_currency_get_no_currency (
- g_slist_nth_data ( tmp_list, 0 ) );
+ etat.no_devise_totaux_categ = gsb_data_currency_get_no_currency (
+ g_slist_nth_data ( tmp_list, 0 ) );
}
if ( no_devise_totaux_ib == 0 )
{
diff --git a/src/gsb_file_save.c b/src/gsb_file_save.c
index 6bce503..b3552d7 100644
--- a/src/gsb_file_save.c
+++ b/src/gsb_file_save.c
@@ -160,7 +160,6 @@ extern gint bet_array_col_width[BET_ARRAY_COLUMNS];
extern gint dis @@ extern gint bet_array_col_width[BET_ARRAY_COLUMNS]; ncy ( mes, ); ateg, ies ); x+ r¹Xx+ `ø
¸ÿ Ðø
¸ÿ u:Xx+ ZXx+ U<Xx+ H8Yx+ Ðø
¸ÿ `ZYx+ Àí
¸ÿ ì
¸ÿ kPXx+ 6 è è! è! `ø
¸ÿ Ðø
¸ÿ x8Yx+ Àî
¸ÿ 2Xx+ PXx+ `ø
¸ÿ `2Xx+ ø
¸ÿ ÀÿYx+ u:Xx+ ðYx+ ØôYx+ ¨ùYx+ ZXx+ x8Yx+ Àî
¸ÿ í
¸ÿ kPXx+ à! à! `ø
¸ÿ Ðø
¸ÿ HÎYx+ ï
¸ÿ 2Xx+ PXx+ `ø
¸ÿ `2Xx+ ø
¸ÿ ø
¸ÿ ø
¸ÿ 8[<Xx+ p Ðø
¸ÿ u:Xx+ ZXx+ ï
¸ÿ pî
¸ÿ kPXx+ G H I J K M N O P `ø
¸ÿ Ðø
¸ÿ H
îXx+ @ñ
¸ÿ 2Xx+ PXx+ `ø
¸ÿ 0ÿYx+ u:Xx+ 8Yx+ ¹ËXx+ ðYx+ ØôYx+ ¨ùYx+ ZXx+ H
îXx+ @ñ
¸ÿ ï
¸ÿ kPXx+ 8
îXx+ @ñ
¸ÿ °ï
¸ÿ kPXx+ (
îXx+ @ñ
¸ÿ àï
¸ÿ kPXx+
îXx+ @ñ
¸ÿ ð
¸ÿ kPXx+ ¨þYx+ u:Xx+ ¨ùYx+ ê
¸ÿ ÌXx+ e9Xx+ ØôYx+ °ð
¸ÿ yÌXx+ e9Xx+ ðYx+ àð
¸ÿ ZÌXx+ e9Xx+ Ø´ËXx+ 8Yx+ ¹ËXx+ ðYx+ Ø8Yx+ ØôYx+ ¨ùYx+ ZXx+ 8[<Xx+ }Xx+ Ðø
¸ÿ pKËXx+ ò
¸ÿ `ñ
¸ÿ kPXx+ 5 6 7 8 : < = > ? @ B D `ø
¸ÿ Ðø
¸ÿ à}Xx+ Ðø
¸ÿ u:Xx+ U<Xx+ ñ
¸ÿ }Xx+ e9Xx+ U<Xx+ Õ_ at fÆS Qöl±íÁcXx+ Ðø
¸ÿ à}Xx+ ó
¸ÿ pò
¸ÿ kPXx+ u]ÞÓ 4Q ÷U^Qʧ ¶uª¹ñìò*Äv`ø
¸ÿ Ðø
¸ÿ HÎ`Xx+ Xx+ ú
¸ÿ ¦ ÿYx+ ¦ ÿYx+ fXx+ ø
¸ÿ Ðù
¸ÿ ø
¸ÿ ðô
¸ÿ 8Yx+ u:Xx+ Ø8Yx+ Pû
¸ÿ ¢ ÿYx+ ú
¸ÿ °õ
¸ÿ ÿÿÿÿÿÿÿÿ¢ ÿYx+ Øø
¸ÿ play_one_line;
extern gint display_three_lines;
extern gint display_two_lines;
-extern gint no_devise_totaux_categ;
extern gint no_devise_totaux_ib;
extern gint no_devise_totaux_tiers;
extern gint scheduler_col_width[SCHEDULER_COL_VISIBLE_COLUMNS];
@@ -799,7 +798,7 @@ gulong gsb_file_save_general_part ( gulong iterator,
my_safe_null_str ( mon_decimal_point ),
my_safe_null_str ( mon_thousands_sep ),
no_devise_totaux_tiers,
- no_devise_totaux_categ,
+ etat.no_devise_totaux_categ,
no_devise_totaux_ib,
my_safe_null_str ( navigation_order_list ),
affichage_echeances,
diff --git a/src/gsb_scheduler_list.c b/src/gsb_scheduler_list.c
index d6dd1b4..9c9da9c 100644
--- a/src/gsb_scheduler_list.c
+++ b/src/gsb_scheduler_list.c
@@ -179,6 +179,12 @@ void gsb_scheduler_list_init_variables ( void )
g_slist_free ( scheduled_transactions_taken );
scheduled_transactions_taken = NULL;
}
+
+ /* on réinitialise tous les widgets */
+ scheduler_display_hide_notes = NULL;
+ scheduler_button_execute = NULL;
+ scheduler_button_delete = NULL;
+ scheduler_button_edit = NULL;
}
/**
diff --git a/src/import.c b/src/import.c
index 9101e83..9ec4482 100644
--- a/src/import.c
+++ b/src/import.c
@@ -165,7 +165,6 @@ static void traitement_operations_importees ( void );
/*START_EXTERN*/
extern GtkWidget *menu_import_rules;
-extern gint no_devise_totaux_categ;
extern gint no_devise_totaux_ib;
extern gint no_devise_totaux_tiers;
/*END_EXTERN*/
@@ -1447,7 +1446,7 @@ gint gsb_import_add_currency ( struct struct_compte_importation * compte )
if ( gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON ( checkbox ) ) )
{
no_devise_totaux_tiers = currency_number;
- no_devise_totaux_categ = currency_number;
+ etat.no_devise_totaux_categ = currency_number;
no_devise_totaux_ib = currency_number;
}
}
diff --git a/src/meta_categories.c b/src/meta_categories.c
index 9f8398b..7d0e42f 100644
--- a/src/meta_categories.c
+++ b/src/meta_categories.c
@@ -34,8 +34,9 @@
#include "gsb_data_category.h"
#include "gsb_data_scheduled.h"
#include "gsb_data_transaction.h"
-#include "utils_str.h"
#include "gsb_real.h"
+#include "structures.h"
+#include "utils_str.h"
/*END_INCLUDE*/
@@ -56,7 +57,6 @@ static gint category_transaction_div_id ( gint transaction_number );
/*END_STATIC*/
/*START_EXTERN*/
-extern gint no_devise_totaux_categ;
/*END_EXTERN*/
static MetatreeInterface _category_interface = {
@@ -115,7 +115,7 @@ static MetatreeInterface *category_interface = &_category_interface;
*/
gint category_tree_currency ( )
{
- return no_devise_totaux_categ;
+ return etat.no_devise_totaux_categ;
}
diff --git a/src/structures.h b/src/structures.h
index 28d5647..56e2df1 100644
--- a/src/structures.h
+++ b/src/structures.h
@@ -41,6 +41,9 @@ struct gsb_etat_t
gint crypt_file; /* TRUE if we want to crypt the file */
gint fichier_deja_ouvert; /* à un si lors de l'ouverture, le fichier semblait déjà ouvert */
+ /* devises pour les catégories, imputations budgétaires et les tiers */
+ gint no_devise_totaux_categ;
+
/* reconciliation */
gint reconcile_end_date; /* Date initiale + 1 mois par défaut */
diff --git a/src/traitement_variables.c b/src/traitement_variables.c
index 06488e1..a525588 100644
--- a/src/traitement_variables.c
+++ b/src/traitement_variables.c
@@ -39,6 +39,7 @@
#include "bet_data_finance.h"
#include "bet_future.h"
#include "bet_graph.h"
+#include "categories_onglet.h"
#include "custom_list.h"
#include "fenetre_principale.h"
#include "gsb_calendar.h"
@@ -109,7 +110,6 @@ extern gint display_one_line;
extern gint display_three_lines;
extern gint display_two_lines;
extern gint id_timeout;
-extern gint no_devise_totaux_categ;
extern gint no_devise_totaux_ib;
extern gint no_devise_totaux_tiers;
extern GSList *orphan_child_transactions;
@@ -163,6 +163,7 @@ void init_variables ( void )
gsb_data_transaction_init_variables ();
gsb_data_payee_init_variables ();
gsb_data_category_init_variables ();
+ categories_init_variables_list ();
gsb_data_budget_init_variables ();
gsb_data_report_init_variables ();
gsb_data_report_amount_comparison_init_variables ();
@@ -213,7 +214,6 @@ void init_variables ( void )
affichage_echeances_perso_j_m_a = PERIODICITY_DAYS;
no_devise_totaux_tiers = 1;
- no_devise_totaux_categ = 1;
no_devise_totaux_ib = 1;
/* initialization of titles and logo part */
hooks/post-receive
--
grisbi
More information about the cvs
mailing list