[grisbi-cvs] grisbi/src accueil.c, 1.225, 1.226 affichage.c, 1.172, 1.173 affichage_liste.c, 1.121, 1.122 balance_estimate_config.c, 1.11, 1.12 balance_estimate_config.h, 1.4, 1.5 balance_estimate_data.c, 1.19, 1.20 balance_estimate_data.h, 1.13, 1.14 balance_estimate_future.c, 1.6, 1.7 balance_estimate_hist.c, 1.20, 1.21 balance_estimate_hist.h, 1.8, 1.9 balance_estimate_tab.c, 1.60, 1.61 balance_estimate_tab.h, 1.12, 1.13 barre_outils.c, 1.132, 1.133 categories_onglet.c, 1.204, 1.205 csv_parse.h, 1.10, 1.11 dialog.h, 1.36, 1.37 erreur.h, 1.23, 1.24 etats_calculs.c, 1.136, 1.137 etats_calculs.h, 1.17, 1.18 etats_config.c, 1.176, 1.177 etats_csv.c, 1.30, 1.31 etats_gtktable.c, 1.101, 1.102 etats_onglet.c, 1.137, 1.138 export_csv.c, 1.27, 1.28 fenetre_principale.c, 1.131, 1.132 fenetre_principale.h, 1.31, 1.32 gsb_automem.c, 1.27, 1.28 gsb_automem.h, 1.6, 1.7 gsb_category.c, 1.23, 1.24 gsb_currency.c, 1.57, 1.58 gsb_currency.h, 1.11, 1.12 gsb_data_account.c, 1.101, 1.102 gsb_data_account.h, 1.42, 1.43 gsb_data_account_cunit.c, 1.4, 1.5 gsb_data_im port_rule.c, 1.4, 1.5 gsb_data_partial_balance.c, 1.11, 1.12 gsb_data_payment.c, 1.19, 1.20 gsb_data_reconcile.h, 1.12, 1.13 gsb_data_scheduled.c, 1.33, 1.34 gsb_data_scheduled.h, 1.19, 1.20 gsb_data_transaction.c, 1.85, 1.86 gsb_file.c, 1.63, 1.64 gsb_file_config.c, 1.95, 1.96 gsb_file_load.c, 1.216, 1.217 gsb_file_others.c, 1.34, 1.35 gsb_file_save.c, 1.162, 1.163 gsb_file_util.c, 1.43, 1.44 gsb_form.c, 1.156, 1.157 gsb_form.h, 1.28, 1.29 gsb_form_config.c, 1.35, 1.36 gsb_form_scheduler.c, 1.41, 1.42 gsb_form_scheduler.h, 1.6, 1.7 gsb_form_widget.c, 1.52, 1.53 gsb_form_widget.h, 1.9, 1.10 gsb_fyear.h, 1.9, 1.10 gsb_payment_method.c, 1.22, 1.23 gsb_payment_method_config.c, 1.40, 1.41 gsb_plugins.c, 1.22, 1.23 gsb_real.c, 1.73, 1.74 gsb_real.h, 1.24, 1.25 gsb_reconcile.c, 1.47, 1.48 gsb_scheduler.c, 1.29, 1.30 gsb_transactions_list.c, 1.205, 1.206 gsb_transactions_list.h, 1.39, 1.40 gsb_transactions_list_sort.c, 1.22, 1.23 gtk_combofix.c, 1.74, 1.75 import.c, 1.328, 1.329 import_csv.c, 1.65, 1.66 main.c, 1.170, 1.171 main.h, 1.10, 1.11 metatree. c, 1.147, 1.148 navigation.c, 1.142, 1.143 parametres.c, 1.213, 1.214 parametres.h, 1.34, 1.35 qif.c, 1.144, 1.145 qif.h, 1.15, 1.16 structures.h, 1.244, 1.245 tip.c, 1.33, 1.34 traitement_variables.c, 1.192, 1.193 transaction_list.c, 1.59, 1.60 transaction_list.h, 1.11, 1.12 transaction_list_select.c, 1.9, 1.10 transaction_list_sort.c, 1.2, 1.3 utils.c, 1.63, 1.64 utils.h, 1.28, 1.29 utils_dates.c, 1.67, 1.68 utils_dates.h, 1.24, 1.25 utils_files.c, 1.53, 1.54 utils_str.c, 1.83, 1.84 utils_str.h, 1.47, 1.48
Pierre Biava
pbiava at users.sourceforge.net
Mon Apr 5 23:24:55 CEST 2010
Update of /cvsroot/grisbi/grisbi/src
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv28695/src
Modified Files:
accueil.c affichage.c affichage_liste.c
balance_estimate_config.c balance_estimate_config.h
balance_estimate_data.c balance_estimate_data.h
balance_estimate_future.c balance_estimate_hist.c
balance_estimate_hist.h balance_estimate_tab.c
balance_estimate_tab.h barre_outils.c categories_onglet.c
csv_parse.h dialog.h erreur.h etats_calculs.c etats_calculs.h
etats_config.c etats_csv.c etats_gtktable.c etats_onglet.c
export_csv.c fenetre_principale.c fenetre_principale.h
gsb_automem.c gsb_automem.h gsb_category.c gsb_currency.c
gsb_currency.h gsb_data_account.c gsb_data_account.h
gsb_data_account_cunit.c gsb_data_import_rule.c
gsb_data_partial_balance.c gsb_data_payment.c
gsb_data_reconcile.h gsb_data_scheduled.c gsb_data_scheduled.h
gsb_data_transaction.c gsb_file.c gsb_file_config.c
gsb_file_load.c gsb_file_others.c gsb_file_save.c
gsb_file_util.c gsb_form.c gsb_form.h gsb_form_config.c
gsb_form_scheduler.c gsb_form_scheduler.h gsb_form_widget.c
gsb_form_widget.h gsb_fyear.h gsb_payment_method.c
gsb_payment_method_config.c gsb_plugins.c gsb_real.c
gsb_real.h gsb_reconcile.c gsb_scheduler.c
gsb_transactions_list.c gsb_transactions_list.h
gsb_transactions_list_sort.c gtk_combofix.c import.c
import_csv.c main.c main.h metatree.c navigation.c
parametres.c parametres.h qif.c qif.h structures.h tip.c
traitement_variables.c transaction_list.c transaction_list.h
transaction_list_select.c transaction_list_sort.c utils.c
utils.h utils_dates.c utils_dates.h utils_files.c utils_str.c
utils_str.h
Log Message:
various amendments to the budget module and minor bug fixes.
Index: metatree.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/metatree.c,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -d -r1.147 -r1.148
--- metatree.c 20 Feb 2010 08:54:00 -0000 1.147
+++ metatree.c 5 Apr 2010 21:24:53 -0000 1.148
@@ -44,6 +44,7 @@
#include "./transaction_list.h"
#include "./gsb_transactions_list.h"
#include "./fenetre_principale.h"
+#include "./gtk_combofix.h"
#include "./gsb_data_transaction.h"
#include "./include.h"
#include "./erreur.h"
Index: transaction_list.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/transaction_list.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- transaction_list.h 21 Jan 2010 22:16:52 -0000 1.11
+++ transaction_list.h 5 Apr 2010 21:24:53 -0000 1.12
@@ -11,6 +11,7 @@
void transaction_list_colorize (void);
gboolean transaction_list_create (void);
void transaction_list_filter ( gint account_number );
+gint transaction_list_get_last_line ( gint nb_rows );
gint transaction_list_get_n_children ( gint transaction_number );
gboolean transaction_list_redraw ( void );
gboolean transaction_list_remove_archive ( gint archive_number );
@@ -25,6 +26,5 @@
GValue *value );
gboolean transaction_list_update_element ( gint element_number );
gboolean transaction_list_update_transaction ( gint transaction_number );
-gint transaction_list_get_last_line ( gint nb_rows );
/* END_DECLARATION */
#endif
Index: dialog.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/dialog.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- dialog.h 26 Dec 2009 16:57:13 -0000 1.36
+++ dialog.h 5 Apr 2010 21:24:53 -0000 1.37
@@ -37,7 +37,7 @@
gchar *make_pango_attribut ( gchar *attribut, gchar *text );
gchar *make_red ( gchar *text );
gboolean question_conditional_yes_no ( gchar *var );
-gint question_conditional_yes_no_get_no_struct ( struct conditional_message *message,
+gint question_conditional_yes_no_get_no_struct ( struct conditional_message *msg,
gchar *name );
gboolean question_conditional_yes_no_with_struct ( struct conditional_message *message );
gboolean question_yes_no ( gchar *text, gint default_answer );
Index: transaction_list.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/transaction_list.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- transaction_list.c 3 Apr 2010 19:57:42 -0000 1.59
+++ transaction_list.c 5 Apr 2010 21:24:53 -0000 1.60
@@ -53,8 +53,8 @@
#include "./gsb_transactions_list.h"
#include "./gsb_data_transaction.h"
#include "./include.h"
-#include "./erreur.h"
#include "./structures.h"
+#include "./erreur.h"
#include "./gsb_real.h"
/*END_INCLUDE*/
Index: balance_estimate_future.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/balance_estimate_future.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- balance_estimate_future.c 3 Apr 2010 19:57:41 -0000 1.6
+++ balance_estimate_future.c 5 Apr 2010 21:24:53 -0000 1.7
@@ -31,40 +31,34 @@
/*START_INCLUDE*/
#include "balance_estimate_future.h"
#include "./balance_estimate_tab.h"
-#include "./balance_estimate_config.h"
#include "./balance_estimate_data.h"
-#include "./balance_estimate_hist.h"
-#include "./gsb_combo_box.h"
#include "./dialog.h"
-#include "./gsb_form.h"
-#include "./gsb_form_scheduler.h"
-#include "./gsb_form_widget.h"
-#include "./gsb_data_form.h"
#include "./utils_dates.h"
+#include "./gsb_calendar_entry.h"
+#include "./gsb_combo_box.h"
#include "./gsb_data_account.h"
#include "./gsb_data_budget.h"
-#include "./gsb_calendar_entry.h"
#include "./gsb_data_category.h"
-#include "./gsb_data_fyear.h"
#include "./gsb_data_payee.h"
-#include "./gsb_data_payment.h"
-#include "./gsb_data_scheduled.h"
-#include "./gsb_data_transaction.h"
+#include "./gsb_form.h"
+#include "./gsb_form_scheduler.h"
+#include "./gsb_form_widget.h"
#include "./gsb_fyear.h"
-#include "./gsb_real.h"
-#include "./gsb_scheduler.h"
+#include "./navigation.h"
#include "./gsb_payment_method.h"
-#include "./gsb_transactions_list_sort.h"
+#include "./gsb_real.h"
+#include "./utils_editables.h"
#include "./gtk_combofix.h"
-#include "./main.h"
-#include "./mouse.h"
-#include "./navigation.h"
-#include "./include.h"
+#include "./utils_str.h"
+#include "./gsb_data_payment.h"
+#include "./gtk_combofix.h"
+#include "./gsb_form_scheduler.h"
#include "./structures.h"
-#include "./utils_editables.h"
-#include "./traitement_variables.h"
+#include "./gsb_data_form.h"
+#include "./include.h"
#include "./erreur.h"
-#include "./utils.h"
+#include "./gsb_form_widget.h"
+#include "./balance_estimate_data.h"
/*END_INCLUDE*/
@@ -99,11 +93,6 @@
/*END_STATIC*/
/*START_EXTERN*/
-extern gboolean balances_with_scheduled;
-extern gchar* bet_duration_array[];
-extern GdkColor couleur_fond[0];
-extern GtkWidget *notebook_general;
-extern gsb_real null_real;
extern GtkWidget *window;
/*END_EXTERN*/
@@ -1276,6 +1265,7 @@
GtkWidget *widget;
GHashTable *future_list;
gchar *key;
+ const gchar *tmp_str;
struct_futur_data *scheduled;
if ( account_number == 0 )
@@ -1334,9 +1324,12 @@
widget = bet_form_widget_get_widget ( TRANSACTION_FORM_PARTY );
gsb_form_widget_set_empty ( GTK_COMBOFIX ( widget ) -> entry, FALSE );
- gtk_combofix_set_text ( GTK_COMBOFIX ( widget ),
- gsb_data_payee_get_name ( scheduled -> party_number, FALSE ) );
- gtk_editable_set_position ( GTK_EDITABLE ( GTK_COMBOFIX ( widget ) -> entry ), 0 );
+ tmp_str = gsb_data_payee_get_name ( scheduled -> party_number, TRUE );
+ if ( tmp_str && strlen ( tmp_str ) )
+ {
+ gtk_combofix_set_text ( GTK_COMBOFIX ( widget ), tmp_str );
+ gtk_editable_set_position ( GTK_EDITABLE ( GTK_COMBOFIX ( widget ) -> entry ), 0 );
+ }
if ( scheduled -> amount.mantissa < 0 )
{
Index: gsb_data_account.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_account.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- gsb_data_account.c 3 Apr 2010 19:57:41 -0000 1.101
+++ gsb_data_account.c 5 Apr 2010 21:24:53 -0000 1.102
@@ -32,6 +32,7 @@
/*START_INCLUDE*/
#include "gsb_data_account.h"
#include "./dialog.h"
+#include "./utils_dates.h"
#include "./gsb_data_currency.h"
#include "./gsb_data_form.h"
#include "./gsb_data_transaction.h"
@@ -44,11 +45,10 @@
#include "./custom_list.h"
#include "./gsb_transactions_list.h"
#include "./gsb_data_transaction.h"
-#include "./include.h"
#include "./structures.h"
+#include "./include.h"
#include "./erreur.h"
#include "./gsb_real.h"
-#include "./utils_dates.h"
/*END_INCLUDE*/
/** \struct
@@ -100,14 +100,14 @@
gchar *bank_account_iban;
/** @name reconcile sort */
- gint reconcile_sort_type; /**< 1 : sort by method of payment ; 0 : let the user sort by himself */
+ gint reconcile_sort_type; /**< 1 : sort by method of payment ; 0 : let the user sort by himself */
GSList *sort_list; /**< the method of payment numbers sorted in a list
- (if split neutral, the negative method has a negative method of payment number)*/
- gint split_neutral_payment; /**< if 1 : neutral payments are splitted into debits/credits */
+ (if split neutral, the negative method has a negative method of payment number)*/
+ gint split_neutral_payment; /**< if 1 : neutral payments are splitted into debits/credits */
/** @name tree_view sort stuff */
gint sort_type; /**< GTK_SORT_DESCENDING / GTK_SORT_ASCENDING */
- gint sort_column; /**< used to hide the arrow when change the column */
+ gint sort_column; /**< used to hide the arrow when change the column */
gint column_element_sort[CUSTOM_MODEL_VISIBLE_COLUMNS]; /**< contains for each column the element number used to sort the list */
/** @name current graphic position in the list (the row_align used with gtk_tree_view_scroll_to_cell) */
@@ -117,11 +117,14 @@
gpointer form_organization;
/** @name bet data */
- GDate *bet_start_date; /* date de début */
- gint bet_spin_range; /* echelle de la période 0 = mois 1 = années */
- gint bet_months; /* nombre de mois ou d'années */
- gint bet_hist_data; /* origine des données 0 = catégories 1 = IB */
- gint bet_hist_fyear; /* numéro d'exercice */
+ GDate *bet_start_date; /* date de début */
+ gint bet_spin_range; /* echelle de la période 0 = mois 1 = années */
+ gint bet_months; /* nombre de mois ou d'années */
+ gint bet_select_transaction_label; /* */
+ gint bet_select_scheduled_label; /* */
+ gint bet_select_futur_label; /* */
+ gint bet_hist_data; /* origine des données 0 = catégories 1 = IB */
+ gint bet_hist_fyear; /* numéro d'exercice */
} struct_account;
@@ -3023,6 +3026,70 @@
}
+/**
+ *
+ *
+ *
+ * */
+gint gsb_data_account_get_bet_select_label ( gint account_number, gint origine )
+{
+ struct_account *account;
+
+ account = gsb_data_account_get_structure ( account_number );
+
+ if (!account )
+ return 0;
+
+ switch ( origine )
+ {
+ case SPP_ORIGIN_TRANSACTION:
+ return account -> bet_select_transaction_label;
+ break;
+ case SPP_ORIGIN_SCHEDULED:
+ return account -> bet_select_scheduled_label;
+ break;
+ case SPP_ORIGIN_FUTURE:
+ return account -> bet_select_futur_label;
+ break;
+ }
+
+ return 0;
+}
+
+
+/**
+ *
+ *
+ *
+ * */
+gboolean gsb_data_account_set_bet_select_label ( gint account_number,
+ gint origine,
+ gint type )
+{
+ struct_account *account;
+
+ account = gsb_data_account_get_structure ( account_number );
+
+ if (!account )
+ return FALSE;
+
+ switch ( origine )
+ {
+ case SPP_ORIGIN_TRANSACTION:
+ account -> bet_select_transaction_label = type;
+ break;
+ case SPP_ORIGIN_SCHEDULED:
+ account -> bet_select_scheduled_label = type;
+ break;
+ case SPP_ORIGIN_FUTURE:
+ account -> bet_select_futur_label = type;
+ break;
+ }
+
+ return TRUE;
+}
+
+
/* Local Variables: */
/* c-basic-offset: 4 */
/* End: */
Index: gsb_scheduler.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_scheduler.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- gsb_scheduler.c 16 Mar 2010 11:48:43 -0000 1.29
+++ gsb_scheduler.c 5 Apr 2010 21:24:53 -0000 1.30
@@ -42,7 +42,6 @@
#include "./gsb_transactions_list.h"
#include "./main.h"
#include "./traitement_variables.h"
-#include "./utils_str.h"
#include "./gsb_scheduler_list.h"
#include "./erreur.h"
#include "./structures.h"
Index: gsb_data_account.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_account.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- gsb_data_account.h 7 Mar 2010 15:56:04 -0000 1.42
+++ gsb_data_account.h 5 Apr 2010 21:24:53 -0000 1.43
@@ -42,10 +42,10 @@
gchar *gsb_data_account_get_bank_account_key ( gint account_number );
gchar *gsb_data_account_get_bank_account_number ( gint account_number );
gchar *gsb_data_account_get_bank_branch_code ( gint account_number );
-gint gsb_data_account_get_bet_deb_period ( gint account_number );
gint gsb_data_account_get_bet_hist_data ( gint account_number );
gint gsb_data_account_get_bet_hist_fyear ( gint account_number );
gint gsb_data_account_get_bet_months ( gint account_number );
+gint gsb_data_account_get_bet_select_label ( gint account_number, gint origine );
gint gsb_data_account_get_bet_spin_range ( gint account_number );
GDate *gsb_data_account_get_bet_start_date ( gint account_number );
gint gsb_data_account_get_closed_account ( gint account_number );
@@ -100,10 +100,12 @@
const gchar *bank_account_number );
gboolean gsb_data_account_set_bank_branch_code ( gint account_number,
const gchar *bank_branch_code );
-gboolean gsb_data_account_set_bet_deb_period ( gint account_number, gint deb_period );
gboolean gsb_data_account_set_bet_hist_data ( gint account_number, gint hist_data );
gboolean gsb_data_account_set_bet_hist_fyear ( gint account_number, gint hist_fyear );
gboolean gsb_data_account_set_bet_months ( gint account_number, gint months );
+gboolean gsb_data_account_set_bet_select_label ( gint account_number,
+ gint origine,
+ gint type );
gboolean gsb_data_account_set_bet_spin_range ( gint account_number, gint spin_range );
gboolean gsb_data_account_set_bet_start_date ( gint account_number, const GDate *date );
gboolean gsb_data_account_set_closed_account ( gint account_number,
Index: structures.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/structures.h,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -d -r1.244 -r1.245
--- structures.h 13 Mar 2010 21:54:28 -0000 1.244
+++ structures.h 5 Apr 2010 21:24:53 -0000 1.245
@@ -184,4 +184,13 @@
LEFT, CENTER, RIGHT,
};
+
+enum bet_array_origin_data {
+ SPP_ORIGIN_TRANSACTION,
+ SPP_ORIGIN_SCHEDULED,
+ SPP_ORIGIN_HISTORICAL,
+ SPP_ORIGIN_FUTURE
+};
+
+
#endif
Index: import.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/import.c,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -d -r1.328 -r1.329
--- import.c 3 Apr 2010 19:57:42 -0000 1.328
+++ import.c 5 Apr 2010 21:24:53 -0000 1.329
@@ -42,8 +42,8 @@
#include "./gsb_currency_config.h"
#include "./gsb_currency.h"
#include "./gsb_data_account.h"
-#include "./gsb_data_category.h"
#include "./gsb_data_budget.h"
+#include "./gsb_data_category.h"
#include "./gsb_data_currency.h"
#include "./gsb_data_form.h"
#include "./gsb_data_fyear.h"
@@ -61,7 +61,6 @@
#include "./tiers_onglet.h"
#include "./gsb_real.h"
#include "./gsb_status.h"
-#include "./utils_files.h"
#include "./utils_str.h"
#include "./gsb_transactions_list.h"
#include "./gtk_combofix.h"
@@ -71,6 +70,7 @@
#include "./parametres.h"
#include "./qif.h"
#include "./transaction_list.h"
+#include "./utils_files.h"
#include "./structures.h"
#include "./gsb_transactions_list.h"
#include "./go-charmap-sel.h"
@@ -120,6 +120,7 @@
static gchar **gsb_import_by_rule_ask_filename ( gint rule );
static gboolean gsb_import_by_rule_get_file ( GtkWidget *button,
GtkWidget *entry );
+static void gsb_import_check_ope_import ( GtkWidget *widget, gpointer data );
static gboolean gsb_import_check_transaction_link ( gint transaction_number,
gint tested_transaction );
static GSList *gsb_import_create_file_chooser ( const char *enc, GtkWidget *parent );
@@ -131,6 +132,10 @@
GDate *first_date_import );
static GDate *gsb_import_get_first_date ( GSList *import_list );
static gboolean gsb_import_gunzip_file ( gchar *filename );
+static void gsb_import_lookup_budget ( struct struct_ope_importation *imported_transaction,
+ gint transaction_number);
+static gboolean gsb_import_ope_import_test_toggled ( GtkWidget *vbox , gboolean test );
+static void gsb_import_ope_import_toggled ( GtkWidget *button, GtkWidget *vbox );
static gboolean gsb_import_set_id_compte ( gint account_nb, gchar *imported_id );
static gboolean gsb_import_set_tmp_file ( gchar *filename,
gchar * pointeur_char );
@@ -150,11 +155,6 @@
static void pointe_opes_importees ( struct struct_compte_importation *imported_account,
gint account_number );
static void traitement_operations_importees ( void );
-static void gsb_import_lookup_budget ( struct struct_ope_importation *imported_transaction,
- gint transaction_number );
-static void gsb_import_check_ope_import ( GtkWidget *widget, gpointer data );
-static void gsb_import_ope_import_toggled ( GtkWidget *button, GtkWidget *vbox );
-static gboolean gsb_import_ope_import_test_toggled ( GtkWidget *vbox , gboolean test );
/*END_STATIC*/
/*START_EXTERN*/
Index: gsb_file_load.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_file_load.c,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -d -r1.216 -r1.217
--- gsb_file_load.c 3 Apr 2010 19:57:41 -0000 1.216
+++ gsb_file_load.c 5 Apr 2010 21:24:53 -0000 1.217
@@ -31,6 +31,7 @@
/*START_INCLUDE*/
#include "gsb_file_load.h"
+#include "./balance_estimate_data.h"
#include "./dialog.h"
#include "./gsb_assistant_archive.h"
#include "./gsb_assistant_first.h"
@@ -69,9 +70,9 @@
#include "./gsb_data_form.h"
#include "./gsb_data_transaction.h"
#include "./gsb_scheduler_list.h"
+#include "./structures.h"
#include "./include.h"
#include "./gsb_calendar.h"
-#include "./structures.h"
#include "./erreur.h"
#include "./gsb_plugins.h"
#include "./gsb_real.h"
@@ -89,12 +90,10 @@
const gchar **attribute_values );
static void gsb_file_load_bank ( const gchar **attribute_names,
const gchar **attribute_values );
-static void gsb_file_load_bet_part ( const gchar **attribute_names,
- const gchar **attribute_values );
-static void gsb_file_load_future_data ( const gchar **attribute_names,
- const gchar **attribute_values );
static void gsb_file_load_bet_historical ( const gchar **attribute_names,
const gchar **attribute_values );
+static void gsb_file_load_bet_part ( const gchar **attribute_names,
+ const gchar **attribute_values );
static gboolean gsb_file_load_check_new_structure ( gchar *file_content );
static void gsb_file_load_color_part ( const gchar **attribute_names,
const gchar **attribute_values );
@@ -109,6 +108,8 @@
GError **error);
static void gsb_file_load_financial_year ( const gchar **attribute_names,
const gchar **attribute_values );
+static void gsb_file_load_future_data ( const gchar **attribute_names,
+ const gchar **attribute_values );
static void gsb_file_load_general_part ( const gchar **attribute_names,
const gchar **attribute_values );
static void gsb_file_load_general_part_before_0_6 ( GMarkupParseContext *context,
@@ -166,8 +167,8 @@
extern GdkColor archive_background_color;
extern GdkColor calendar_entry_color;
extern GdkColor couleur_bet_division;
-extern GdkColor couleur_fond[2];
extern GdkColor couleur_bet_future;
+extern GdkColor couleur_fond[2];
extern GdkColor couleur_grise;
extern GdkColor couleur_jour;
extern GdkColor couleur_selection;
@@ -1800,6 +1801,33 @@
continue;
}
+ if ( !strcmp ( attribute_names[i], "Bet_select_transaction_label" ))
+ {
+ gsb_data_account_set_bet_select_label ( account_number,
+ SPP_ORIGIN_TRANSACTION,
+ utils_str_atoi ( attribute_values[i] ) );
+ i++;
+ continue;
+ }
+
+ if ( !strcmp ( attribute_names[i], "Bet_select_scheduled_label" ))
+ {
+ gsb_data_account_set_bet_select_label ( account_number,
+ SPP_ORIGIN_SCHEDULED,
+ utils_str_atoi ( attribute_values[i] ) );
+ i++;
+ continue;
+ }
+
+ if ( !strcmp ( attribute_names[i], "Bet_select_futur_label" ))
+ {
+ gsb_data_account_set_bet_select_label ( account_number,
+ SPP_ORIGIN_FUTURE,
+ utils_str_atoi ( attribute_values[i] ) );
+ i++;
+ continue;
+ }
+
if ( !strcmp ( attribute_names[i], "Bet_SD" ))
{
gsb_data_account_set_bet_hist_data ( account_number,
Index: gtk_combofix.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gtk_combofix.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- gtk_combofix.c 3 Apr 2010 19:57:42 -0000 1.74
+++ gtk_combofix.c 5 Apr 2010 21:24:53 -0000 1.75
@@ -30,8 +30,9 @@
#include "gtk_combofix.h"
#include "./dialog.h"
#include "./gsb_form_widget.h"
-#include "./structures.h"
#include "./utils_str.h"
+#include "./parametres.h"
+#include "./include.h"
#include "./erreur.h"
/*END_INCLUDE*/
@@ -108,7 +109,6 @@
};
/*START_EXTERN*/
-extern gint max;
extern GtkWidget *window;
/*END_EXTERN*/
Index: gsb_file.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_file.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- gsb_file.c 8 Mar 2010 21:30:00 -0000 1.63
+++ gsb_file.c 5 Apr 2010 21:24:53 -0000 1.64
@@ -63,8 +63,8 @@
#include "./utils_str.h"
#include "./fenetre_principale.h"
#include "./include.h"
-#include "./erreur.h"
#include "./structures.h"
+#include "./erreur.h"
/*END_INCLUDE*/
/*START_STATIC*/
@@ -93,7 +93,6 @@
extern gchar *initial_holder_title;
extern GtkWidget *main_hpaned;
extern GtkWidget *main_vbox;
-extern gint max;
extern GtkWidget * navigation_tree_view;
extern gsize nb_derniers_fichiers_ouverts;
extern gint nb_max_derniers_fichiers_ouverts;
Index: gsb_form_scheduler.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_form_scheduler.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gsb_form_scheduler.h 23 Mar 2010 22:15:21 -0000 1.6
+++ gsb_form_scheduler.h 5 Apr 2010 21:24:53 -0000 1.7
@@ -28,13 +28,13 @@
gboolean gsb_form_scheduler_button_press_event ( GtkWidget *entry,
GdkEventButton *ev,
gint *ptr_origin );
-gboolean gsb_form_scheduler_entry_lose_focus ( GtkWidget *entry,
- GdkEventFocus *ev,
- gint *ptr_origin );
gboolean gsb_form_scheduler_change_account ( GtkWidget *button,
gpointer null );
gboolean gsb_form_scheduler_clean ( void );
gboolean gsb_form_scheduler_create ( GtkWidget *table );
+gboolean gsb_form_scheduler_entry_lose_focus ( GtkWidget *entry,
+ GdkEventFocus *ev,
+ gint *ptr_origin );
gboolean gsb_form_scheduler_free_list ( void );
gint gsb_form_scheduler_get_account ( void );
GtkWidget *gsb_form_scheduler_get_element_widget ( gint element_number );
Index: gsb_form_scheduler.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_form_scheduler.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- gsb_form_scheduler.c 28 Mar 2010 14:40:29 -0000 1.41
+++ gsb_form_scheduler.c 5 Apr 2010 21:24:53 -0000 1.42
@@ -57,7 +57,7 @@
/*START_STATIC*/
static void gsb_form_scheduler_free_content_list ( GSList *content_list );
static gboolean gsb_form_scheduler_frequency_button_changed ( GtkWidget *combo_box,
- gpointer null );
+ gpointer null );
static gint gsb_form_scheduler_get_auto ( void );
static GSList *gsb_form_scheduler_get_content_list ( void );
static gint gsb_form_scheduler_get_frequency ( void );
Index: erreur.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/erreur.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- erreur.h 10 Jan 2010 15:56:39 -0000 1.23
+++ erreur.h 5 Apr 2010 21:24:53 -0000 1.24
@@ -1,7 +1,7 @@
#ifndef _ERREUR_H
#define _ERREUR_H (1)
/* START_INCLUDE_H */
-#include "./gsb_real.h"
+#include "././gsb_real.h"
/* END_INCLUDE_H */
/* constante de debug originale, obsolete il faudrait utiliser maintenant */
Index: gsb_file_save.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_file_save.c,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -d -r1.162 -r1.163
--- gsb_file_save.c 3 Apr 2010 19:57:41 -0000 1.162
+++ gsb_file_save.c 5 Apr 2010 21:24:53 -0000 1.163
@@ -33,8 +33,8 @@
/*START_INCLUDE*/
#include "gsb_file_save.h"
-#include "./dialog.h"
#include "./balance_estimate_data.h"
+#include "./dialog.h"
#include "./gsb_data_account.h"
#include "./gsb_data_archive.h"
#include "./gsb_data_bank.h"
@@ -70,7 +70,6 @@
#include "./gsb_calendar.h"
#include "./erreur.h"
#include "./gsb_plugins.h"
-#include "./gsb_real.h"
#include "./gsb_data_report.h"
/*END_INCLUDE*/
@@ -144,8 +143,8 @@
extern GdkColor archive_background_color;
extern GdkColor calendar_entry_color;
extern GdkColor couleur_bet_division;
-extern GdkColor couleur_fond[2];
extern GdkColor couleur_bet_future;
+extern GdkColor couleur_fond[2];
extern GdkColor couleur_grise;
extern GdkColor couleur_jour;
extern GdkColor couleur_selection;
@@ -1065,6 +1064,9 @@
"\t\tBet_start_date=\"%s\"\n"
"\t\tBet_months=\"%d\"\n"
"\t\tBet_UT=\"%d\"\n"
+ "\t\tBet_select_transaction_label=\"%d\"\n"
+ "\t\tBet_select_scheduled_label=\"%d\"\n"
+ "\t\tBet_select_futur_label=\"%d\"\n"
"\t\tBet_SD=\"%d\"\n"
"\t\tBet_Fi=\"%d\" />\n",
my_safe_null_str(gsb_data_account_get_name (account_number)),
@@ -1104,6 +1106,9 @@
gsb_data_account_get_bet_start_date ( account_number ) ) ),
gsb_data_account_get_bet_months ( account_number ),
gsb_data_account_get_bet_spin_range ( account_number ),
+ gsb_data_account_get_bet_select_label ( account_number, SPP_ORIGIN_TRANSACTION ),
+ gsb_data_account_get_bet_select_label ( account_number, SPP_ORIGIN_SCHEDULED ),
+ gsb_data_account_get_bet_select_label ( account_number, SPP_ORIGIN_FUTURE ),
gsb_data_account_get_bet_hist_data ( account_number ),
gsb_data_account_get_bet_hist_fyear ( account_number ) );
Index: gsb_data_transaction.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_transaction.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- gsb_data_transaction.c 16 Mar 2010 11:48:43 -0000 1.85
+++ gsb_data_transaction.c 5 Apr 2010 21:24:53 -0000 1.86
@@ -31,13 +31,14 @@
/*START_INCLUDE*/
#include "gsb_data_transaction.h"
+#include "./balance_estimate_data.h"
#include "./classement_echeances.h"
#include "./dialog.h"
+#include "./gsb_currency.h"
#include "./gsb_data_account.h"
#include "./gsb_data_budget.h"
#include "./gsb_data_category.h"
#include "./gsb_data_currency.h"
-#include "./gsb_currency.h"
#include "./gsb_data_currency_link.h"
#include "./gsb_data_payee.h"
#include "./gsb_data_payment.h"
@@ -46,8 +47,6 @@
#include "./utils_str.h"
#include "./include.h"
#include "./structures.h"
-#include "./gsb_real.h"
-#include "./balance_estimate_data.h"
/*END_INCLUDE*/
Index: traitement_variables.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/traitement_variables.c,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -d -r1.192 -r1.193
--- traitement_variables.c 28 Mar 2010 14:40:29 -0000 1.192
+++ traitement_variables.c 5 Apr 2010 21:24:53 -0000 1.193
@@ -29,6 +29,7 @@
/*START_INCLUDE*/
#include "traitement_variables.h"
+#include "./balance_estimate_data.h"
#include "./gsb_currency.h"
#include "./gsb_data_account.h"
#include "./gsb_data_archive.h"
@@ -66,7 +67,6 @@
#include "./gsb_calendar.h"
#include "./erreur.h"
#include "./structures.h"
-#include "./balance_estimate_data.h"
/*END_INCLUDE*/
/*START_STATIC*/
Index: etats_gtktable.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/etats_gtktable.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- etats_gtktable.c 7 Mar 2010 15:56:04 -0000 1.101
+++ etats_gtktable.c 5 Apr 2010 21:24:53 -0000 1.102
@@ -34,7 +34,6 @@
#include "./gsb_data_account.h"
#include "./gsb_data_transaction.h"
#include "./navigation.h"
-#include "./barre_outils.h"
#include "./menu.h"
#include "./gsb_transactions_list.h"
#include "./utils.h"
Index: balance_estimate_hist.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/balance_estimate_hist.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- balance_estimate_hist.h 16 Mar 2010 11:48:42 -0000 1.8
+++ balance_estimate_hist.h 5 Apr 2010 21:24:53 -0000 1.9
@@ -25,13 +25,8 @@
};
/* START_DECLARATION */
-gboolean bet_historical_affiche_div ( GHashTable *list_div,
- GtkWidget *tree_view );
GtkWidget *bet_historical_create_page ( void );
-void bet_historical_fyear_clicked ( GtkWidget *combo, gpointer data );
-gboolean bet_historical_fyear_create_combobox_store ( void );
gint bet_historical_get_fyear_from_combobox ( GtkWidget *combo_box );
-void bet_historical_origin_data_clicked ( GtkWidget *togglebutton, gpointer data );
void bet_historical_populate_data ( void );
void bet_historical_refresh_data ( GtkTreeModel *tab_model,
GDate *date_min,
Index: balance_estimate_hist.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/balance_estimate_hist.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- balance_estimate_hist.c 28 Mar 2010 14:40:28 -0000 1.20
+++ balance_estimate_hist.c 5 Apr 2010 21:24:53 -0000 1.21
@@ -30,29 +30,23 @@
/*START_INCLUDE*/
#include "balance_estimate_hist.h"
+#include "./balance_estimate_tab.h"
#include "./balance_estimate_config.h"
#include "./balance_estimate_data.h"
-#include "./balance_estimate_tab.h"
#include "./utils_dates.h"
#include "./gsb_data_account.h"
-#include "./gsb_data_budget.h"
-#include "./gsb_data_category.h"
#include "./gsb_data_fyear.h"
-#include "./gsb_data_payee.h"
-#include "./gsb_data_scheduled.h"
#include "./gsb_data_transaction.h"
#include "./gsb_fyear.h"
-#include "./gsb_real.h"
-#include "./gsb_scheduler.h"
-#include "./gsb_transactions_list_sort.h"
-#include "./main.h"
-#include "./mouse.h"
#include "./navigation.h"
-#include "./include.h"
-#include "./structures.h"
#include "./traitement_variables.h"
+#include "./utils_str.h"
+#include "./gsb_fyear.h"
+#include "./mouse.h"
+#include "./balance_estimate_data.h"
+#include "./structures.h"
+#include "./include.h"
#include "./erreur.h"
-#include "./utils.h"
/*END_INCLUDE*/
/*START_STATIC*/
@@ -60,6 +54,7 @@
GtkTreeSelection *tree_selection );
static void bet_historical_add_last_amount ( GtkWidget *menu_item,
GtkTreeSelection *tree_selection );
+static gboolean bet_historical_affiche_div ( GHashTable *list_div, GtkWidget *tree_view );
static gboolean bet_historical_amount_differ_average ( GtkTreeModel *model,
GtkTreeIter *iter );
static gboolean bet_historical_button_press ( GtkWidget *tree_view,
@@ -69,20 +64,21 @@
const gchar *path_string,
const gchar *new_text,
GtkWidget *tree_view );
-static void bet_historical_div_cell_editing_started ( GtkCellRenderer *cell,
+static void bet_historical_div_cell_editing_started (GtkCellRenderer *cell,
GtkCellEditable *editable,
const gchar *path_string,
GtkWidget *tree_view );
static gboolean bet_historical_div_toggle_clicked ( GtkCellRendererToggle *renderer,
gchar *path_string,
- GtkTreeModel *store );
-gsb_real bet_historical_get_children_amount ( GtkTreeModel *model, GtkTreeIter *parent );
+ GtkTreeModel *model );
+static gboolean bet_historical_fyear_create_combobox_store ( void );
+static gsb_real bet_historical_get_children_amount ( GtkTreeModel *model, GtkTreeIter *parent );
static GtkWidget *bet_historical_get_data ( GtkWidget *container );
static gboolean bet_historical_get_full_div ( GtkTreeModel *model, GtkTreeIter *parent );
static gboolean bet_historical_initializes_account_settings ( gint account_number );
static void bet_historical_populate_div_model ( gpointer key,
gpointer value,
- gpointer user_data);
+ gpointer user_data );
static void bet_historical_row_collapse_all ( GtkTreeView *tree_view,
GtkTreeIter *iter,
GtkTreeModel *model );
@@ -90,17 +86,15 @@
GtkTreeIter *iter,
GtkTreePath *path,
GtkTreeModel *model );
+static gboolean bet_historical_set_background_color ( GtkWidget *tree_view );
static gboolean bet_historical_set_empty_sub_div ( GtkTreeModel *model, GtkTreeIter *parent );
static gboolean bet_historical_set_full_sub_div ( GtkTreeModel *model, GtkTreeIter *parent );
-static gboolean bet_historical_set_background_color ( GtkWidget *tree_view );
/*END_STATIC*/
/*START_EXTERN*/
-extern gboolean balances_with_scheduled;
-extern GdkColor couleur_fond[0];
+extern GdkColor couleur_fond[2];
extern GtkWidget *notebook_general;
extern gsb_real null_real;
-extern GtkWidget *window;
/*END_EXTERN*/
/**
@@ -161,7 +155,8 @@
g_signal_connect ( G_OBJECT ( button_1 ),
"released",
G_CALLBACK ( bet_config_origin_data_clicked ),
- NULL );
+ GINT_TO_POINTER ( 1 ) );
+
button_2 = gtk_radio_button_new_with_label_from_widget (
GTK_RADIO_BUTTON ( button_1 ),
_("Budgetary lines") );
@@ -169,7 +164,7 @@
g_signal_connect ( G_OBJECT ( button_2 ),
"released",
G_CALLBACK ( bet_config_origin_data_clicked ),
- NULL );
+ GINT_TO_POINTER ( 1 ) );
g_object_set_data ( G_OBJECT ( notebook ), "button_1", button_1 );
g_object_set_data ( G_OBJECT ( notebook ), "button_2", button_2 );
@@ -201,7 +196,7 @@
g_signal_connect ( G_OBJECT ( widget ),
"changed",
G_CALLBACK (bet_config_fyear_clicked),
- NULL );
+ GINT_TO_POINTER ( 1 ) );
}
/* création de la liste des données */
Index: gsb_real.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_real.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- gsb_real.h 10 Jan 2010 20:11:38 -0000 1.24
+++ gsb_real.h 5 Apr 2010 21:24:53 -0000 1.25
@@ -16,7 +16,6 @@
/* END_INCLUDE_H */
/* START_DECLARATION */
-gsb_real gsb_str_to_real ( const gchar * str );
gsb_real gsb_real_abs ( gsb_real number );
G_MODULE_EXPORT gsb_real gsb_real_add ( gsb_real number_1,
gsb_real number_2 );
@@ -27,13 +26,15 @@
gsb_real gsb_real_div ( gsb_real number_1,
gsb_real number_2 );
G_MODULE_EXPORT gsb_real gsb_real_double_to_real ( gdouble number );
-gsb_real gsb_real_double_to_real_add_exponent ( gdouble number, gint exp_add );
+gchar *gsb_real_format_string ( gsb_real number,
+ gint currency_number,
+ gboolean show_symbol );
gsb_real gsb_real_get_from_string ( const gchar *string );
gchar *gsb_real_get_string ( gsb_real number );
gchar *gsb_real_get_string_with_currency ( gsb_real number,
gint currency_number,
gboolean show_symbol );
-gsb_real gsb_real_inverse ( gsb_real number );
+gsb_real gsb_real_import_from_string ( const gchar *string );
gsb_real gsb_real_mul ( gsb_real number_1,
gsb_real number_2 );
gsb_real gsb_real_new ( gint mantissa, gint exponent );
@@ -45,9 +46,9 @@
gsb_real gsb_real_raw_get_from_string ( const gchar *string,
const gchar *mon_thousands_sep,
const gchar *mon_decimal_point );
+gchar *gsb_real_save_real_to_string ( gsb_real number, gint default_exponent );
gsb_real gsb_real_sub ( gsb_real number_1,
gsb_real number_2 );
-gsb_real gsb_real_import_from_string ( const gchar *string );
-gchar *gsb_real_save_real_to_string ( gsb_real number, gint default_exponent );
+gsb_real gsb_str_to_real ( const gchar * str );
/* END_DECLARATION */
#endif
Index: gsb_real.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_real.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- gsb_real.c 29 Mar 2010 21:54:00 -0000 1.73
+++ gsb_real.c 5 Apr 2010 21:24:53 -0000 1.74
@@ -67,14 +67,11 @@
#endif//_MSC_VER
/*START_STATIC*/
-static gchar *gsb_real_format_string ( gsb_real number,
- gint currency_number,
- gboolean show_symbol );
+static gsb_real gsb_real_double_to_real_add_exponent ( gdouble number, gint exp_add );
static gboolean gsb_real_grow_exponent( gsb_real *num, guint target_exponent );
static void gsb_real_minimize_exponent ( gsb_real *num );
static void gsb_real_raw_minimize_exponent ( gint64 *mantissa, gint *exponent );
static gboolean gsb_real_raw_truncate_number ( gint64 *mantissa, gint *exponent );
-static gdouble gsb_real_real_to_double ( gsb_real number );
/*END_STATIC*/
/*START_EXTERN*/
@@ -863,7 +860,7 @@
*
* \return the number in double format
* */
-gdouble gsb_real_real_to_double ( gsb_real number )
+/*gdouble gsb_real_real_to_double ( gsb_real number )
{
gdouble double_number;
gint i;
@@ -872,7 +869,7 @@
for ( i=0 ; i<number.exponent ; i++ )
double_number = double_number / 10;
return double_number;
-}
+}*/
/**
@@ -970,14 +967,14 @@
*
* \return reverse of number
* */
-gsb_real gsb_real_inverse ( gsb_real number )
+/*gsb_real gsb_real_inverse ( gsb_real number )
{
gsb_real number_tmp;
number_tmp = gsb_real_double_to_real ( 1.00 / gsb_real_real_to_double ( number ) );
return number_tmp;
-}
+}*/
/* Function to transform string into gsb_real */
gsb_real gsb_str_to_real ( const gchar * str )
Index: affichage.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/affichage.c,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- affichage.c 28 Mar 2010 14:40:28 -0000 1.172
+++ affichage.c 5 Apr 2010 21:24:53 -0000 1.173
@@ -82,15 +82,15 @@
extern GdkColor archive_background_color;
extern GdkColor calendar_entry_color;
extern GdkColor couleur_bet_division;
-extern GdkColor couleur_fond[2];
extern GdkColor couleur_bet_future;
-extern GdkColor default_couleur_bet_future;
+extern GdkColor couleur_fond[2];
extern GdkColor couleur_grise;
extern GdkColor couleur_jour;
extern GdkColor couleur_selection;
extern GdkColor default_archive_background_color;
-extern GdkColor default_couleur_bet_division;
extern GdkColor default_calendar_entry_color;
+extern GdkColor default_couleur_bet_division;
+extern GdkColor default_couleur_bet_future;
extern GdkColor default_couleur_fond[2];
extern GdkColor default_couleur_grise;
extern GdkColor default_couleur_jour;
Index: balance_estimate_data.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/balance_estimate_data.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- balance_estimate_data.h 3 Apr 2010 22:28:17 -0000 1.13
+++ balance_estimate_data.h 5 Apr 2010 21:24:53 -0000 1.14
@@ -4,8 +4,7 @@
#include <gtk/gtk.h>
/* START_INCLUDE_H */
-#include "./gsb_data_scheduled.h"
-#include "./gsb_real.h"
+#include "././gsb_real.h"
/* END_INCLUDE_H */
@@ -68,10 +67,8 @@
/* START_DECLARATION */
GDate *bet_data_array_get_date_max ( gint account_number );
+gboolean bet_data_future_add_lines ( struct_futur_data *scheduled );
GHashTable *bet_data_future_get_list ( void );
-gboolean bet_data_future_add_lines ( struct_futur_data *sfd );
-GDate *bet_data_futur_get_next_date ( struct_futur_data *scheduled,
- const GDate *date );
struct_futur_data *bet_data_future_get_struct ( gint account_number, gint number );
gboolean bet_data_future_modify_lines ( struct_futur_data *scheduled );
gboolean bet_data_future_remove_line ( gint account_number, gint number );
@@ -79,13 +76,8 @@
gint number,
gint mother_row );
gboolean bet_data_future_set_lines_from_file ( struct_futur_data *scheduled );
-gboolean bet_data_hist_add_div ( gint account_nb,
- gint div_number,
- gint sub_div_nb );
-gsb_real bet_data_hist_get_div_amount ( gint account_nb, gint div_number, gint sub_div_nb );
-gint bet_data_get_div_children ( gint account_nb, gint div_number );
gboolean bet_data_get_div_edited ( gint account_nb, gint div_number, gint sub_div_nb );
-gchar *bet_data_get_div_name (gint div_num,
+gchar *bet_data_get_div_name ( gint div_num,
gint sub_div,
const gchar *return_value_error );
gint bet_data_get_div_number ( gint transaction_number, gboolean is_transaction );
@@ -93,6 +85,10 @@
gint bet_data_get_selected_currency ( void );
GPtrArray *bet_data_get_strings_to_save ( void );
gint bet_data_get_sub_div_nb ( gint transaction_number, gboolean is_transaction );
+gboolean bet_data_hist_add_div ( gint account_nb,
+ gint div_number,
+ gint sub_div_nb );
+gsb_real bet_data_hist_get_div_amount ( gint account_nb, gint div_number, gint sub_div_nb );
gboolean bet_data_init_variables ( void );
void bet_data_insert_div_hist ( struct_hist_div *shd, struct_hist_div *sub_shd );
gboolean bet_data_populate_div ( gint transaction_number,
@@ -112,13 +108,10 @@
gboolean bet_data_set_div_ptr ( gint type_div );
void bet_data_set_maj ( gboolean maj );
void bet_data_synchronise_hist_div_list ( GHashTable *list_div );
+void struct_free_bet_historical ( SH *sh );
struct_futur_data *struct_initialise_bet_future ( void );
SBR *struct_initialise_bet_range ( void );
-SH *struct_initialise_bet_historical ( void );
struct_hist_div *struct_initialise_hist_div ( void );
-void struct_free_bet_range ( SBR *sbr );
-void struct_free_bet_historical ( SH *sh );
-void struct_free_bet_future ( struct_futur_data *sfd );
/* END_DECLARATION */
Index: accueil.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/accueil.c,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -d -r1.225 -r1.226
--- accueil.c 28 Mar 2010 14:40:28 -0000 1.225
+++ accueil.c 5 Apr 2010 21:24:52 -0000 1.226
@@ -24,9 +24,9 @@
/*START_INCLUDE*/
#include "accueil.h"
-#include "./gsb_automem.h"
#include "./classement_echeances.h"
#include "./dialog.h"
+#include "./gsb_automem.h"
#include "./gsb_data_account.h"
#include "./gsb_data_currency.h"
#include "./gsb_data_partial_balance.h"
@@ -48,6 +48,7 @@
#include "./fenetre_principale.h"
#include "./gsb_data_account.h"
#include "./gsb_select_icon.h"
+#include "./gsb_form_scheduler.h"
#include "./include.h"
#include "./erreur.h"
#include "./gsb_real.h"
Index: balance_estimate_data.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/balance_estimate_data.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- balance_estimate_data.c 3 Apr 2010 22:28:17 -0000 1.19
+++ balance_estimate_data.c 5 Apr 2010 21:24:53 -0000 1.20
@@ -32,44 +32,40 @@
#include "balance_estimate_data.h"
#include "./balance_estimate_tab.h"
#include "./dialog.h"
-#include "./utils_dates.h"
#include "./gsb_data_account.h"
#include "./gsb_data_budget.h"
#include "./gsb_data_category.h"
-#include "./gsb_data_fyear.h"
#include "./gsb_data_mix.h"
-#include "./gsb_data_payee.h"
-#include "./gsb_data_scheduled.h"
#include "./gsb_data_transaction.h"
-#include "./gsb_file_save.h"
-#include "./gsb_fyear.h"
-#include "./gsb_scheduler.h"
-#include "./gsb_scheduler_list.h"
-#include "./gsb_transactions_list_sort.h"
-#include "./main.h"
+#include "./utils_dates.h"
#include "./navigation.h"
-#include "./include.h"
-#include "./structures.h"
+#include "./gsb_real.h"
#include "./traitement_variables.h"
+#include "./gsb_file_save.h"
+#include "./utils_str.h"
+#include "./gsb_data_account.h"
+#include "./gsb_scheduler_list.h"
#include "./erreur.h"
-#include "./utils.h"
+#include "./structures.h"
/*END_INCLUDE*/
/*START_STATIC*/
+static GDate *bet_data_futur_get_next_date ( struct_futur_data *scheduled,
+ const GDate *date );
static struct_futur_data *bet_data_future_copy_struct ( struct_futur_data *scheduled );
static void bet_data_future_set_max_number ( gint number );
-static gboolean bet_data_update_div ( SH *sh, gint transaction_number,
- gint sub_div );
-static void struct_free_hist_div ( struct_hist_div *bet_hist_div );
+static gboolean bet_data_update_div ( SH *sh, gint transaction_number, gint sub_div );
+static void struct_free_bet_future ( struct_futur_data *scheduled );
+static void struct_free_bet_range ( SBR *sbr );
+static void struct_free_hist_div ( struct_hist_div *shd );
+static SH *struct_initialise_bet_historical ( void );
/*END_STATIC*/
/*START_EXTERN*/
-extern gboolean balances_with_scheduled;
extern GtkWidget *notebook_general;
extern gsb_real null_real;
-extern GtkWidget *window;
/*END_EXTERN*/
@@ -491,32 +487,6 @@
*
*
* */
-gint bet_data_get_div_children ( gint account_nb, gint div_number )
-{
- gchar *key;
- struct_hist_div *shd;
-
- if ( account_nb == 0 )
- key = g_strconcat ("0:", utils_str_itoa ( div_number ), NULL );
- else
- key = g_strconcat ( utils_str_itoa ( account_nb ), ":",
- utils_str_itoa ( div_number ), NULL );
-
- if ( ( shd = g_hash_table_lookup ( bet_hist_div_list, key ) ) )
- {
- return g_hash_table_size ( shd -> sub_div_list );
- }
- else
- return 0;
-}
-
-
-/**
- *
- *
- *
- *
- * */
gsb_real bet_data_hist_get_div_amount ( gint account_nb, gint div_number, gint sub_div_nb )
{
gchar *key;
Index: export_csv.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/export_csv.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- export_csv.c 1 Jan 2010 13:21:31 -0000 1.27
+++ export_csv.c 5 Apr 2010 21:24:53 -0000 1.28
@@ -47,6 +47,7 @@
#include "./main.h"
#include "./utils_str.h"
#include "./utils_files.h"
+#include "./gsb_data_transaction.h"
#include "./include.h"
#include "./gsb_real.h"
/*END_INCLUDE*/
Index: gsb_transactions_list.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_transactions_list.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- gsb_transactions_list.h 7 Mar 2010 15:56:05 -0000 1.39
+++ gsb_transactions_list.h 5 Apr 2010 21:24:53 -0000 1.40
@@ -42,6 +42,7 @@
gpointer null );
GtkWidget *creation_fenetre_operations ( void );
gint find_element_col ( gint element_number );
+gint find_element_col_for_archive ( void );
gint find_element_col_split ( gint element_number );
gint find_element_line ( gint element_number );
gchar *gsb_transactions_get_category_real_name ( gint transaction_number );
@@ -82,6 +83,5 @@
void schedule_selected_transaction ();
gsb_real solde_debut_affichage ( gint account_number,
gint floating_point);
-gint find_element_col_for_archive ( void );
/* END_DECLARATION */
#endif
Index: fenetre_principale.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/fenetre_principale.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- fenetre_principale.h 8 Mar 2010 21:30:00 -0000 1.31
+++ fenetre_principale.h 5 Apr 2010 21:24:53 -0000 1.32
@@ -22,12 +22,12 @@
void gsb_gui_headings_update_suffix ( gchar * suffix );
void gsb_gui_headings_update_title ( gchar * title );
void gsb_gui_notebook_change_page ( GsbGeneralNotebookPages page );
-void gsb_gui_sensitive_headings ( gboolean sensitive );
-gboolean gsb_gui_update_show_headings ();
gboolean gsb_gui_on_account_switch_page ( GtkNotebook *notebook,
GtkNotebookPage *page,
guint page_number,
gpointer null );
+void gsb_gui_sensitive_headings ( gboolean sensitive );
+gboolean gsb_gui_update_show_headings ();
/*END_DECLARATION*/
#endif
Index: gsb_form_widget.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_form_widget.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- gsb_form_widget.c 3 Apr 2010 19:57:41 -0000 1.52
+++ gsb_form_widget.c 5 Apr 2010 21:24:53 -0000 1.53
@@ -54,14 +54,12 @@
/*END_INCLUDE*/
/*START_STATIC*/
-static gboolean gsb_form_widget_can_focus ( gint element_number );
-//~ static gboolean gsb_form_widget_entry_get_focus ( GtkWidget *entry,
- //~ GdkEventFocus *ev,
- //~ gint *ptr_origin );
-//~ static gboolean gsb_form_widget_amount_entry_changed ( GtkWidget *entry,
- //~ gpointer null );
static gboolean gsb_form_combo_selection_changed ( GtkTreeSelection *tree_selection,
- gint *ptr_origin );
+ gint *ptr_origin );
+static gboolean gsb_form_widget_can_focus ( gint element_number );
+static gboolean gsb_form_widget_entry_get_focus ( GtkWidget *entry,
+ GdkEventFocus *ev,
+ gint *ptr_origin );
/*END_STATIC*/
/*START_EXTERN*/
Index: parametres.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/parametres.c,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -d -r1.213 -r1.214
--- parametres.c 13 Mar 2010 21:06:58 -0000 1.213
+++ parametres.c 5 Apr 2010 21:24:53 -0000 1.214
@@ -30,9 +30,9 @@
/*START_INCLUDE*/
#include "parametres.h"
-#include "./balance_estimate_config.h"
#include "./menu.h"
#include "./utils.h"
+#include "./balance_estimate_config.h"
#include "./dialog.h"
#include "./gsb_archive_config.h"
#include "./gsb_automem.h"
@@ -540,11 +540,21 @@
gtk_tree_store_append (GTK_TREE_STORE (preference_tree_model), &iter2, &iter);
gtk_tree_store_set (GTK_TREE_STORE (preference_tree_model),
&iter2,
- 0, _("Accounts data"),
+ 0, _("General Options"),
1, BET_GENERAL_PAGE,
2, 400,
-1);
- gtk_notebook_append_page (preference_frame, bet_config_create_page (), NULL);
+ gtk_notebook_append_page (preference_frame, bet_config_create_general_page (), NULL);
+
+ gtk_tree_store_append (GTK_TREE_STORE (preference_tree_model), &iter2, &iter);
+ gtk_tree_store_set (GTK_TREE_STORE (preference_tree_model),
+ &iter2,
+ 0, _("Accounts data"),
+ 1, BET_ACCOUNT_PAGE,
+ 2, 400,
+ -1);
+ gtk_notebook_append_page (preference_frame, bet_config_create_account_page (), NULL);
+
#endif
/* select the page */
Index: fenetre_principale.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/fenetre_principale.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- fenetre_principale.c 20 Mar 2010 18:37:31 -0000 1.131
+++ fenetre_principale.c 5 Apr 2010 21:24:53 -0000 1.132
@@ -25,9 +25,9 @@
/*START_INCLUDE*/
#include "fenetre_principale.h"
+#include "./balance_estimate_tab.h"
#include "./balance_estimate_data.h"
#include "./balance_estimate_hist.h"
-#include "./balance_estimate_tab.h"
#include "./navigation.h"
#include "./gsb_transactions_list.h"
#include "./accueil.h"
Index: gsb_transactions_list.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_transactions_list.c,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -d -r1.205 -r1.206
--- gsb_transactions_list.c 3 Apr 2010 19:57:41 -0000 1.205
+++ gsb_transactions_list.c 5 Apr 2010 21:24:53 -0000 1.206
@@ -65,6 +65,7 @@
#include "./include.h"
#include "./gsb_data_transaction.h"
#include "./mouse.h"
+#include "./dialog.h"
#include "./erreur.h"
#include "./gsb_real.h"
/*END_INCLUDE*/
Index: parametres.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/parametres.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- parametres.h 24 Jan 2010 10:58:01 -0000 1.34
+++ parametres.h 5 Apr 2010 21:24:53 -0000 1.35
@@ -30,6 +30,7 @@
METHODS_OF_PAYMENT_PAGE,
#ifdef ENABLE_BALANCE_ESTIMATE
BET_GENERAL_PAGE,
+ BET_ACCOUNT_PAGE,
#endif
NUM_PREFERENCES_PAGES
};
Index: gsb_form_widget.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_form_widget.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- gsb_form_widget.h 3 Apr 2010 19:57:41 -0000 1.9
+++ gsb_form_widget.h 5 Apr 2010 21:24:53 -0000 1.10
@@ -17,9 +17,6 @@
/* END_INCLUDE_H */
/* START_DECLARATION */
-gboolean gsb_form_widget_entry_get_focus ( GtkWidget *entry,
- GdkEventFocus *ev,
- gint *ptr_origin );
gboolean gsb_form_widget_amount_entry_changed ( GtkWidget *entry,
gpointer null );
gboolean gsb_form_widget_check_empty ( GtkWidget *entry );
@@ -29,9 +26,10 @@
GSList *gsb_form_widget_get_list ( void );
gchar *gsb_form_widget_get_name ( gint element_number );
gchar *gsb_form_widget_get_old_credit ( void );
-gchar *gsb_form_widget_get_old_debit ( void );
gint gsb_form_widget_get_old_credit_payment ( void );
+gchar *gsb_form_widget_get_old_debit ( void );
gint gsb_form_widget_get_old_debit_payment ( void );
+gboolean gsb_form_widget_get_valide_amout_entry ( const gchar *string );
GtkWidget *gsb_form_widget_get_widget ( gint element_number );
gint gsb_form_widget_next_element ( gint account_number,
gint element_number,
@@ -39,7 +37,5 @@
void gsb_form_widget_set_empty ( GtkWidget *entry,
gboolean empty );
void gsb_form_widget_set_focus ( gint element_number );
-gboolean gsb_form_widget_get_valide_amout_entry ( const gchar *string );
-
/* END_DECLARATION */
#endif
Index: etats_csv.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/etats_csv.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- etats_csv.c 7 Feb 2010 20:04:16 -0000 1.30
+++ etats_csv.c 5 Apr 2010 21:24:53 -0000 1.31
@@ -26,14 +26,11 @@
/*START_INCLUDE*/
#include "etats_csv.h"
#include "./dialog.h"
-#include "./gsb_data_report.h"
-#include "./navigation.h"
#include "./utils_files.h"
#include "./etats_config.h"
#include "./include.h"
#include "./structures.h"
#include "./etats_affiche.h"
-#include "./erreur.h"
/*END_INCLUDE*/
/*START_STATIC*/
@@ -61,7 +58,6 @@
/*START_EXTERN*/
-extern gint nb_colonnes;
/*END_EXTERN*/
Index: gsb_transactions_list_sort.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_transactions_list_sort.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- gsb_transactions_list_sort.c 13 Feb 2010 21:36:10 -0000 1.22
+++ gsb_transactions_list_sort.c 5 Apr 2010 21:24:53 -0000 1.23
@@ -42,7 +42,6 @@
#include "./gsb_data_transaction.h"
#include "./navigation.h"
#include "./gsb_real.h"
-#include "./utils_str.h"
#include "./gsb_transactions_list.h"
#include "./custom_list.h"
#include "./gsb_transactions_list.h"
Index: utils_files.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/utils_files.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- utils_files.c 13 Feb 2010 17:44:59 -0000 1.53
+++ utils_files.c 5 Apr 2010 21:24:53 -0000 1.54
@@ -30,33 +30,32 @@
#include "utils_files.h"
#include "./dialog.h"
#include "./utils_file_selection.h"
-#include "./utils_dates.h"
+#include "./go-charmap-sel.h"
#include "./gsb_file.h"
-#include "./utils.h"
#include "./utils_str.h"
-#include "./go-charmap-sel.h"
#include "./gsb_file_config.h"
#include "./utils_file_selection.h"
+#include "./go-charmap-sel.h"
#include "./include.h"
#include "./erreur.h"
/*END_INCLUDE*/
/*START_STATIC*/
static void browse_file ( GtkButton *button, gpointer data );
-static void utils_files_file_chooser_cancel ( GtkWidget *bouton, GtkWidget *chooser);
static gboolean utils_files_charmap_active_toggled ( GtkCellRendererToggle *cell,
gchar *path_str,
gpointer model );
+static GSList *utils_files_check_UTF8_validity ( const gchar *contents,
+ const gchar *coding_system );
+static void utils_files_file_chooser_cancel ( GtkWidget *bouton, GtkWidget *chooser);
static void utils_files_go_charmap_sel_changed ( GtkWidget *go_charmap_sel,
const gchar *encoding,
GtkWidget *dialog );
-static GSList *utils_files_check_UTF8_validity ( const gchar *contents,
- const gchar *coding_system );
-
/*END_STATIC*/
/*START_EXTERN*/
+extern gchar *charmap_imported;
extern GtkWidget *window;
/*END_EXTERN*/
Index: gsb_data_import_rule.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_import_rule.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gsb_data_import_rule.c 7 Mar 2010 15:56:04 -0000 1.4
+++ gsb_data_import_rule.c 5 Apr 2010 21:24:53 -0000 1.5
@@ -30,8 +30,6 @@
/*START_INCLUDE*/
#include "gsb_data_import_rule.h"
#include "./dialog.h"
-#include "./gsb_data_account.h"
-#include "./barre_outils.h"
#include "./utils_str.h"
#include "./import.h"
/*END_INCLUDE*/
Index: gsb_form_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_form_config.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- gsb_form_config.c 6 Jan 2010 22:17:45 -0000 1.35
+++ gsb_form_config.c 5 Apr 2010 21:24:53 -0000 1.36
@@ -71,16 +71,12 @@
gpointer null );
static gboolean gsb_form_config_remove_column ( void );
static gboolean gsb_form_config_remove_line ( void );
-//~ static gboolean gsb_form_config_switch_general_to_several_form ( void );
static gboolean gsb_form_config_toggle_element_button ( GtkWidget *toggle_button );
-//~ static gboolean gsb_form_config_update_accounts ( GtkWidget *button,
- //~ GtkWidget *combobox );
static gboolean gsb_form_config_update_form_config ( gint account_number );
/*END_STATIC*/
/*START_EXTERN*/
extern GtkWidget *form_transaction_part;
-extern gint max;
extern gint saved_allocation_size;
extern GtkWidget *window;
/*END_EXTERN*/
Index: etats_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/etats_config.c,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -d -r1.176 -r1.177
--- etats_config.c 14 Feb 2010 17:48:49 -0000 1.176
+++ etats_config.c 5 Apr 2010 21:24:53 -0000 1.177
@@ -45,8 +45,8 @@
#include "./utils_dates.h"
#include "./navigation.h"
#include "./gsb_real.h"
-#include "./utils_str.h"
#include "./traitement_variables.h"
+#include "./utils_str.h"
#include "./structures.h"
#include "./fenetre_principale.h"
#include "./include.h"
Index: main.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/main.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- main.h 3 Nov 2009 20:58:47 -0000 1.10
+++ main.h 5 Apr 2010 21:24:53 -0000 1.11
@@ -5,7 +5,6 @@
/* START_DECLARATION */
-G_MODULE_EXPORT GtkWidget *window;
gboolean gsb_grisbi_close ( void );
int main (int argc, char **argv);
/* END_DECLARATION */
Index: tip.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/tip.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- tip.c 1 Jan 2010 13:21:31 -0000 1.33
+++ tip.c 5 Apr 2010 21:24:53 -0000 1.34
@@ -39,7 +39,7 @@
static gchar * get_next_tip ();
#define END_STATIC
-gint max;
+static gint max;
/**
* Display a tip forcefully, even if show_tip option has been disabled.
@@ -93,7 +93,7 @@
GTK_STOCK_CLOSE, 3,
NULL );
- gtk_widget_set_size_request ( dialog, 450, -1 );
+ //~ gtk_widget_set_size_request ( dialog, 450, -1 );
/* We iterate as user can select several tips. */
while ( TRUE )
{
Index: balance_estimate_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/balance_estimate_config.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- balance_estimate_config.c 13 Mar 2010 21:06:58 -0000 1.11
+++ balance_estimate_config.c 5 Apr 2010 21:24:53 -0000 1.12
@@ -30,40 +30,20 @@
/*START_INCLUDE*/
#include "balance_estimate_config.h"
+#include "./balance_estimate_tab.h"
#include "./balance_estimate_data.h"
#include "./balance_estimate_hist.h"
-#include "./balance_estimate_tab.h"
-#include "./gsb_account.h"
-#include "./parametres.h"
-#include "./menu.h"
-#include "./utils.h"
#include "./utils_dates.h"
-#include "./dialog.h"
-#include "./gsb_archive_config.h"
+#include "./gsb_account.h"
#include "./gsb_automem.h"
-#include "./gsb_bank.h"
-#include "./gsb_currency_config.h"
-#include "./gsb_currency_link_config.h"
#include "./gsb_data_account.h"
-#include "./gsb_file.h"
-#include "./gsb_form_config.h"
#include "./gsb_fyear.h"
-#include "./gsb_fyear_config.h"
#include "./navigation.h"
-#include "./import.h"
-#include "./gsb_payment_method_config.h"
-#include "./gsb_reconcile_config.h"
-#include "./gsb_reconcile_sort_config.h"
+#include "./dialog.h"
#include "./traitement_variables.h"
-#include "./utils_files.h"
-#include "./accueil.h"
-#include "./affichage_liste.h"
-#include "./affichage.h"
-#include "./tiers_onglet.h"
-#include "./categories_onglet.h"
-#include "./imputation_budgetaire.h"
+#include "./utils.h"
+#include "./utils_str.h"
#include "./structures.h"
-#include "./fenetre_principale.h"
#include "./include.h"
#include "./erreur.h"
/*END_INCLUDE*/
@@ -72,11 +52,14 @@
/*START_STATIC*/
static gboolean bet_config_change_account ( GtkWidget *combo,
gpointer null );
+static gint bet_config_get_account ( void );
static GtkWidget *bet_config_get_duration_widget ( GtkWidget *container );
static GtkWidget *bet_config_get_period_widget ( GtkWidget *container );
-static GtkWidget *bet_config_select_historical_data ( GtkWidget *container );
-static void bet_config_period_clicked ( GtkWidget *togglebutton,
- GtkWidget *button );
+static GtkWidget *bet_config_get_select_historical_data ( GtkWidget *container );
+static GtkWidget *bet_config_get_select_labels_widget ( GtkWidget *container );
+static void bet_config_period_clicked ( GtkWidget *togglebutton, GtkWidget *button );
+static gboolean bet_config_select_label_changed ( GtkWidget *checkbutton,
+ gpointer data );
/*END_STATIC*/
/*START_EXTERN*/
@@ -100,19 +83,16 @@
*
* */
-GtkWidget *bet_config_create_page ( void )
+GtkWidget *bet_config_create_general_page ( void )
{
GtkWidget *notebook;
GtkWidget *vbox_pref;
- GtkWidget *hbox;
- GtkWidget *combo;
GtkWidget *paddingbox;
- GtkWidget *label;
GtkWidget *widget;
notebook = g_object_get_data ( G_OBJECT ( notebook_general ), "account_notebook" );
- vbox_pref = new_vbox_with_title_and_icon ( _("Accounts data"),
+ vbox_pref = new_vbox_with_title_and_icon ( _("General Options"),
"balance_estimate.png" );
gtk_container_set_border_width ( GTK_CONTAINER ( vbox_pref ), 12 );
@@ -126,9 +106,39 @@
/* add a separator */
gtk_box_pack_start ( GTK_BOX ( vbox_pref ), gtk_hseparator_new (), FALSE, FALSE, 5 );
+ gtk_widget_show_all ( vbox_pref );
+
+ return vbox_pref;
+}
+
+
+/**
+ *
+ *
+ *
+ *
+ * */
+
+GtkWidget *bet_config_create_account_page ( void )
+{
+ GtkWidget *notebook;
+ GtkWidget *vbox_pref;
+ GtkWidget *hbox;
+ GtkWidget *combo;
+ GtkWidget *paddingbox;
+ GtkWidget *label;
+ GtkWidget *widget;
+ gint account_number;
+
+ notebook = g_object_get_data ( G_OBJECT ( notebook_general ), "account_notebook" );
+
+ vbox_pref = new_vbox_with_title_and_icon ( _("Accounts data"),
+ "balance_estimate.png" );
+ gtk_container_set_border_width ( GTK_CONTAINER ( vbox_pref ), 12 );
+
/* set the choice of account */
paddingbox = new_paddingbox_with_title ( vbox_pref, FALSE,
- _("Data Per Account") );
+ _("Select an account") );
hbox = gtk_hbox_new ( FALSE, 5 );
gtk_box_pack_start ( GTK_BOX ( paddingbox ), hbox, FALSE, FALSE, 5 );
@@ -140,15 +150,31 @@
combo = gsb_account_create_combo_list ( (GtkSignalFunc) bet_config_change_account,
NULL, FALSE );
- gtk_combo_box_set_active ( GTK_COMBO_BOX ( combo ), 0 );
+ g_object_set_data ( G_OBJECT ( notebook ), "account_combo", combo );
+ if ( ( account_number = gsb_gui_navigation_get_current_account ( ) ) == -1 )
+ gtk_combo_box_set_active ( GTK_COMBO_BOX ( combo ), 0 );
+ else
+ gsb_account_set_combo_account_number ( combo, account_number );
gtk_box_pack_start ( GTK_BOX (hbox ), combo, FALSE, FALSE, 0 );
-
+
+
+ /* set the choice of account */
+ paddingbox = new_paddingbox_with_title ( vbox_pref, FALSE,
+ _("Data for the forecast") );
+
/* Calculation of duration */
widget = bet_config_get_duration_widget ( paddingbox );
g_object_set_data ( G_OBJECT ( notebook ), "duration_widget", widget );
+ /* Select the labels of the list */
+ widget = bet_config_get_select_labels_widget ( paddingbox );
+ g_object_set_data ( G_OBJECT ( notebook ), "select_labels_widget", widget );
+
/* Sources of historical data */
- widget = bet_config_select_historical_data ( paddingbox );
+ paddingbox = new_paddingbox_with_title ( vbox_pref, FALSE,
+ _("Sources of historical data") );
+
+ widget = bet_config_get_select_historical_data ( paddingbox );
g_object_set_data ( G_OBJECT ( notebook ), "historical_data", widget );
gtk_widget_show_all ( vbox_pref );
@@ -167,25 +193,26 @@
* */
GtkWidget *bet_config_get_period_widget ( GtkWidget *container )
{
- GtkWidget *main_vbox;
+ GtkWidget *vbox;
GtkWidget *label;
GtkWidget *button_1, *button_2;
GtkWidget *hbox;
GtkSizeGroup *size_group;
+ gchar *text;
//~ devel_debug (NULL);
size_group = gtk_size_group_new ( GTK_SIZE_GROUP_HORIZONTAL );
- main_vbox = gtk_vbox_new ( FALSE, 5 );
- gtk_box_pack_start ( GTK_BOX ( container ), main_vbox, FALSE, FALSE, 5);
+ vbox = gtk_vbox_new ( FALSE, 5 );
+ gtk_box_pack_start ( GTK_BOX ( container ), vbox, FALSE, FALSE, 5);
label = gtk_label_new ( _("Beginning of period") );
gtk_misc_set_alignment ( GTK_MISC ( label ), 0, 0.5);
gtk_label_set_justify ( GTK_LABEL ( label ), GTK_JUSTIFY_LEFT );
- gtk_box_pack_start ( GTK_BOX ( main_vbox ), label, FALSE, FALSE, 5) ;
+ gtk_box_pack_start ( GTK_BOX ( vbox ), label, FALSE, FALSE, 5) ;
hbox = gtk_hbox_new ( FALSE, 5 );
- gtk_box_pack_start ( GTK_BOX ( main_vbox ), hbox, FALSE, FALSE, 5) ;
+ gtk_box_pack_start ( GTK_BOX ( vbox ), hbox, FALSE, FALSE, 5) ;
button_1 = gtk_radio_button_new_with_label ( NULL,
_("1st day of month") );
@@ -215,18 +242,20 @@
G_CALLBACK ( bet_config_period_clicked ),
NULL );
- label = gtk_label_new (
- _("Note: This option is used if no starting date for forecasts.") );
+ text = make_blue ( _("Note: This option is used if no starting date for forecasts.") );
+ label = gtk_label_new ( text );
+ gtk_label_set_use_markup ( GTK_LABEL(label), TRUE );
gtk_misc_set_alignment ( GTK_MISC ( label ), 0, 0.5);
gtk_label_set_justify ( GTK_LABEL ( label ), GTK_JUSTIFY_LEFT );
- gtk_box_pack_start ( GTK_BOX ( main_vbox ), label, FALSE, FALSE, 5) ;
-
+ gtk_box_pack_start ( GTK_BOX ( vbox ), label, FALSE, FALSE, 5) ;
+ g_free ( text );
- gtk_widget_show_all ( main_vbox );
+ gtk_widget_show_all ( vbox );
- return main_vbox;
+ return vbox;
}
+
/**
*
*
@@ -235,7 +264,7 @@
* */
GtkWidget *bet_config_get_duration_widget ( GtkWidget *container )
{
- GtkWidget* main_vbox;
+ GtkWidget* vbox;
GtkWidget *label;
GtkWidget *spin_button = NULL;
GtkWidget *widget = NULL;
@@ -246,22 +275,22 @@
size_group = gtk_size_group_new ( GTK_SIZE_GROUP_HORIZONTAL );
- main_vbox = gtk_vbox_new ( FALSE, 5 );
- gtk_box_pack_start ( GTK_BOX ( container ), main_vbox, FALSE, FALSE, 5);
+ vbox = gtk_vbox_new ( FALSE, 0 );
+ gtk_box_pack_start ( GTK_BOX ( container ), vbox, FALSE, FALSE, 0);
/* partie mensuelle */
label = gtk_label_new ( _("Duration estimation") );
gtk_misc_set_alignment ( GTK_MISC ( label ), 0, 0.5);
gtk_label_set_justify ( GTK_LABEL ( label ), GTK_JUSTIFY_LEFT );
- gtk_box_pack_start ( GTK_BOX ( main_vbox ), label, FALSE, FALSE, 5) ;
+ gtk_box_pack_start ( GTK_BOX ( vbox ), label, FALSE, FALSE, 5 ) ;
hbox = gtk_hbox_new ( FALSE, 5 );
- gtk_box_pack_start ( GTK_BOX ( main_vbox ), hbox, FALSE, FALSE, 5) ;
+ gtk_box_pack_start ( GTK_BOX ( vbox ), hbox, FALSE, FALSE, 0 ) ;
spin_button = gtk_spin_button_new_with_range ( 1.0, 240.0, 1.0);
gtk_spin_button_set_value ( GTK_SPIN_BUTTON ( spin_button ), 1.0 );
gtk_widget_set_name ( spin_button, "spin_button" );
- gtk_box_pack_start ( GTK_BOX ( hbox ), spin_button, FALSE, FALSE, 5 );
+ gtk_box_pack_start ( GTK_BOX ( hbox ), spin_button, FALSE, FALSE, 0 );
for (iduration = 0; bet_duration_array[iduration] != NULL; iduration++)
{
@@ -278,11 +307,12 @@
_(bet_duration_array[iduration]) );
}
gtk_widget_set_name ( widget, bet_duration_array[iduration] );
- gtk_box_pack_start ( GTK_BOX ( hbox ), widget, FALSE, FALSE, 5 );
+ gtk_box_pack_start ( GTK_BOX ( hbox ), widget, FALSE, FALSE, 0 );
g_signal_connect (G_OBJECT ( widget ),
"released",
G_CALLBACK ( bet_config_duration_button_clicked ),
spin_button );
+ g_object_set_data ( G_OBJECT ( spin_button ), "bet_origin_signal", GINT_TO_POINTER ( 0 ) );
}
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( previous ), TRUE );
@@ -290,11 +320,11 @@
g_signal_connect ( G_OBJECT ( spin_button ),
"value-changed",
G_CALLBACK ( bet_config_duration_number_changed ),
- widget );
+ GINT_TO_POINTER ( 0 ) );
- gtk_widget_show_all ( main_vbox );
+ gtk_widget_show_all ( vbox );
- return main_vbox;
+ return vbox;
}
@@ -304,27 +334,103 @@
*
*
* */
-GtkWidget *bet_config_select_historical_data ( GtkWidget *container )
+GtkWidget *bet_config_get_select_labels_widget ( GtkWidget *container )
{
- GtkWidget *main_vbox;
+ GtkWidget *vbox;
GtkWidget *label;
+ GtkWidget *button;
+ gchar *text;
+ gint origine;
+ gint select;
+
+ vbox = gtk_vbox_new ( FALSE, 0 );
+ gtk_box_pack_start ( GTK_BOX ( container ), vbox, FALSE, FALSE, 0 );
+
+ /* set labels for transactions */
+ origine = SPP_ORIGIN_TRANSACTION;
+ select = gsb_data_account_get_bet_select_label ( bet_config_get_account ( ), origine );
+ label = gtk_label_new ( _("Labels for transactions") );
+ gtk_misc_set_alignment ( GTK_MISC ( label ), 0, 0.5);
+ gtk_label_set_justify ( GTK_LABEL ( label ), GTK_JUSTIFY_LEFT );
+ gtk_box_pack_start ( GTK_BOX ( vbox ), label, FALSE, FALSE, 5 );
+
+ button = gsb_automem_radiobutton3_new ( _("By default"),
+ _("Categories"),
+ _("Budgetary lines"),
+ &select,
+ G_CALLBACK ( bet_config_select_label_changed ),
+ GINT_TO_POINTER ( origine ) );
+ gtk_box_pack_start ( GTK_BOX ( vbox ), button, FALSE, FALSE, 0 );
+
+
+ /* set labels for scheduled */
+ origine = SPP_ORIGIN_SCHEDULED;
+ select = gsb_data_account_get_bet_select_label ( bet_config_get_account ( ), origine );
+ label = gtk_label_new ( _("Labels for scheduled transactions") );
+ gtk_misc_set_alignment ( GTK_MISC ( label ), 0, 0.5);
+ gtk_label_set_justify ( GTK_LABEL ( label ), GTK_JUSTIFY_LEFT );
+ gtk_box_pack_start ( GTK_BOX ( vbox ), label, FALSE, FALSE, 5 );
+
+ button = gsb_automem_radiobutton3_new ( _("By default"),
+ _("Categories"),
+ _("Budgetary lines"),
+ &select,
+ G_CALLBACK ( bet_config_select_label_changed ),
+ GINT_TO_POINTER ( origine ) );
+ gtk_box_pack_start ( GTK_BOX ( vbox ), button, FALSE, FALSE, 0 );
+
+ /* set labels for futur data */
+ origine = SPP_ORIGIN_FUTURE;
+ select = gsb_data_account_get_bet_select_label ( bet_config_get_account ( ), origine );
+ label = gtk_label_new ( _("Labels for futur data") );
+ gtk_misc_set_alignment ( GTK_MISC ( label ), 0, 0.5);
+ gtk_label_set_justify ( GTK_LABEL ( label ), GTK_JUSTIFY_LEFT );
+ gtk_box_pack_start ( GTK_BOX ( vbox ), label, FALSE, FALSE, 5 );
+
+ button = gsb_automem_radiobutton3_new ( _("By default"),
+ _("Categories"),
+ _("Budgetary lines"),
+ &select,
+ G_CALLBACK ( bet_config_select_label_changed ),
+ GINT_TO_POINTER ( origine ) );
+ gtk_box_pack_start ( GTK_BOX ( vbox ), button, FALSE, FALSE, 0 );
+
+ text = make_blue ( _("Order by default if the data are not zero: notes, payee, "
+ "category and budgetary line.") );
+ label = gtk_label_new ( text );
+ gtk_label_set_use_markup ( GTK_LABEL(label), TRUE );
+ gtk_misc_set_alignment ( GTK_MISC ( label ), 0, 0.5);
+ gtk_label_set_justify ( GTK_LABEL ( label ), GTK_JUSTIFY_LEFT );
+ gtk_box_pack_start ( GTK_BOX ( vbox ), label, FALSE, FALSE, 5 ) ;
+ g_free ( text );
+
+ gtk_widget_show_all ( vbox );
+
+ return vbox;
+}
+
+
+/**
+ *
+ *
+ *
+ *
+ * */
+GtkWidget *bet_config_get_select_historical_data ( GtkWidget *container )
+{
+ GtkWidget *vbox;
GtkWidget *widget;
GtkWidget *hbox;
GtkWidget *button_1, *button_2;
gchar *str_year;
gint year;
- main_vbox = gtk_vbox_new ( FALSE, 5 );
- gtk_box_pack_start ( GTK_BOX ( container ), main_vbox, FALSE, FALSE, 5);
-
- label = gtk_label_new ( _("Sources of historical data") );
- gtk_misc_set_alignment ( GTK_MISC ( label ), 0, 0.5);
- gtk_label_set_justify ( GTK_LABEL ( label ), GTK_JUSTIFY_LEFT );
- gtk_box_pack_start ( GTK_BOX ( main_vbox ), label, FALSE, FALSE, 5) ;
+ vbox = gtk_vbox_new ( FALSE, 0 );
+ gtk_box_pack_start ( GTK_BOX ( container ), vbox, FALSE, FALSE, 0);
/* Choix des données sources */
hbox = gtk_hbox_new ( FALSE, 5 );
- gtk_box_pack_start ( GTK_BOX ( main_vbox ), hbox, FALSE, FALSE, 15 );
+ gtk_box_pack_start ( GTK_BOX ( vbox ), hbox, FALSE, FALSE, 0 );
button_1 = gtk_radio_button_new_with_label ( NULL,
_("Categories") );
@@ -332,7 +438,7 @@
g_signal_connect (G_OBJECT ( button_1 ),
"released",
G_CALLBACK ( bet_config_origin_data_clicked ),
- NULL );
+ GINT_TO_POINTER ( 0 ) );
button_2 = gtk_radio_button_new_with_label_from_widget (
GTK_RADIO_BUTTON ( button_1 ),
@@ -341,7 +447,7 @@
g_signal_connect (G_OBJECT ( button_2 ),
"released",
G_CALLBACK ( bet_config_origin_data_clicked ),
- NULL );
+ GINT_TO_POINTER ( 0 ) );
gtk_box_pack_start ( GTK_BOX ( hbox ), button_1, FALSE, FALSE, 5) ;
gtk_box_pack_start ( GTK_BOX ( hbox ), button_2, FALSE, FALSE, 5) ;
@@ -363,7 +469,7 @@
g_signal_connect ( G_OBJECT ( widget ),
"changed",
G_CALLBACK ( bet_config_fyear_clicked ),
- NULL );
+ GINT_TO_POINTER ( 0 ) );
return hbox;
}
@@ -405,7 +511,6 @@
/*
- * bet_config_duration_button_clicked
* This function is called when a radio button is called to change the estimate duration.
* It copies the new durations from the data parameter (of the radio button) into
* the bet_months property of the bet container
@@ -414,11 +519,17 @@
GtkWidget *spin_button )
{
const gchar *name;
+ gpointer data;
gint account_number;
gint months;
name = gtk_widget_get_name ( GTK_WIDGET ( togglebutton ) );
- account_number = gsb_gui_navigation_get_current_account ( );
+ data = g_object_get_data ( G_OBJECT ( spin_button ), "bet_origin_signal");
+
+ if ( GPOINTER_TO_INT ( data ) == 0 )
+ account_number = bet_config_get_account ( );
+ else
+ account_number = gsb_gui_navigation_get_current_account ( );
if ( g_strcmp0 ( name, "Year" ) == 0 )
{
@@ -461,7 +572,10 @@
gint account_number;
gint months;
- account_number = gsb_gui_navigation_get_current_account ( );
+ if ( GPOINTER_TO_INT ( data ) == 0 )
+ account_number = bet_config_get_account ( );
+ else
+ account_number = gsb_gui_navigation_get_current_account ( );
months = gtk_spin_button_get_value_as_int ( GTK_SPIN_BUTTON ( spin_button ) );
if ( gsb_data_account_get_bet_spin_range ( account_number ) == 1 )
@@ -492,9 +606,13 @@
gchar *title;
gint account_number;
- account_number = gsb_gui_navigation_get_current_account ( );
+ if ( GPOINTER_TO_INT ( data ) == 0 )
+ account_number = bet_config_get_account ( );
+ else
+ account_number = gsb_gui_navigation_get_current_account ( );
+
name = gtk_widget_get_name ( GTK_WIDGET ( togglebutton ) );
- //~ devel_debug (name);
+
notebook = g_object_get_data ( G_OBJECT ( notebook_general ), "account_notebook");
if ( g_strcmp0 ( name, "button_1" ) == 0 )
@@ -531,7 +649,11 @@
{
gint account_number;
- account_number = gsb_gui_navigation_get_current_account ( );
+ if ( GPOINTER_TO_INT ( data ) == 0 )
+ account_number = bet_config_get_account ( );
+ else
+ account_number = gsb_gui_navigation_get_current_account ( );
+
gsb_data_account_set_bet_hist_fyear ( account_number,
bet_historical_get_fyear_from_combobox ( combo ) );
@@ -548,7 +670,7 @@
*
*
* */
-gboolean bet_config_set_property_widget_mirror ( GtkWidget *widget,
+/*gboolean bet_config_set_property_widget_mirror ( GtkWidget *widget,
gchar *ancestor_name,
gint widget_type,
gboolean value )
@@ -573,7 +695,7 @@
}
return FALSE;
-}
+}*/
/**
@@ -639,6 +761,60 @@
return FALSE;
}
+
+
+/**
+ *
+ *
+ *
+ *
+ * */
+gint bet_config_get_account ( void )
+{
+ GtkWidget *notebook;
+ GtkWidget *combo;
+ gint account_number = -1;
+
+ notebook = g_object_get_data ( G_OBJECT ( notebook_general ), "account_notebook" );
+ combo = g_object_get_data ( G_OBJECT ( notebook ), "account_combo" );
+ account_number = gsb_account_get_combo_account_number ( combo );
+
+ return account_number;
+}
+
+
+/**
+ * called for a change in automem_radiobutton3
+ *
+ * \param checkbutton the button wich changed
+ * \param value_ptr a gint* wich is the value to set in the memory (0, 1 or 2)
+ *
+ * \return FALSE
+ * */
+static gboolean bet_config_select_label_changed ( GtkWidget *checkbutton,
+ gpointer data )
+{
+ gint value;
+ gint origine;
+ gint account_number;
+
+ devel_debug (NULL);
+
+ /* we are on the active button, so save the value for it */
+ value = GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( checkbutton ), "pointer" ) );
+ origine = GPOINTER_TO_INT ( data );
+ account_number = bet_config_get_account ( );
+
+ gsb_data_account_set_bet_select_label ( account_number, origine, value );
+
+ if ( etat.modification_fichier == 0 )
+ modification_fichier ( TRUE );
+ bet_array_refresh_estimate_tab ( );
+
+ return FALSE;
+}
+
+
/* Local Variables: */
/* c-basic-offset: 4 */
/* End: */
Index: balance_estimate_config.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/balance_estimate_config.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- balance_estimate_config.h 13 Mar 2010 21:06:58 -0000 1.4
+++ balance_estimate_config.h 5 Apr 2010 21:24:53 -0000 1.5
@@ -7,17 +7,14 @@
/* END_INCLUDE_H */
/* START_DECLARATION */
-GtkWidget *bet_config_create_page ( void );
+GtkWidget *bet_config_create_account_page ( void );
+GtkWidget *bet_config_create_general_page ( void );
void bet_config_duration_button_clicked ( GtkWidget *togglebutton,
GtkWidget *spin_button );
gboolean bet_config_duration_number_changed ( GtkWidget *spin_button,
gpointer data );
void bet_config_fyear_clicked ( GtkWidget *combo, gpointer data );
void bet_config_origin_data_clicked ( GtkWidget *togglebutton, gpointer data );
-gboolean bet_config_set_property_widget_mirror ( GtkWidget *widget,
- gchar *ancestor_name,
- gint widget_type,
- gboolean value );
/* END_DECLARATION */
Index: categories_onglet.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/categories_onglet.c,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -d -r1.204 -r1.205
--- categories_onglet.c 13 Mar 2010 21:06:58 -0000 1.204
+++ categories_onglet.c 5 Apr 2010 21:24:53 -0000 1.205
@@ -34,6 +34,7 @@
#include "./gsb_file.h"
#include "./gsb_file_others.h"
#include "./main.h"
+#include "./traitement_variables.h"
#include "./utils_str.h"
#include "./utils.h"
#include "./utils_buttons.h"
@@ -41,7 +42,6 @@
#include "./gsb_transactions_list.h"
#include "./metatree.h"
#include "./structures.h"
-#include "./traitement_variables.h"
#include "./include.h"
#include "./erreur.h"
/*END_INCLUDE*/
Index: balance_estimate_tab.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/balance_estimate_tab.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- balance_estimate_tab.h 28 Mar 2010 14:40:28 -0000 1.12
+++ balance_estimate_tab.h 5 Apr 2010 21:24:53 -0000 1.13
@@ -23,11 +23,10 @@
#include <gtk/gtk.h>
/* START_INCLUDE_H */
-#include "./gsb_data_scheduled.h"
/* END_INCLUDE_H */
/* START_DECLARATION */
-GtkWidget * bet_array_create_page ( void );
+GtkWidget *bet_array_create_page ( void );
void bet_array_list_add_new_hist_line ( GtkTreeModel *tab_model,
GtkTreeModel *model,
GtkTreeIter *iter,
Index: gsb_payment_method.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_payment_method.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- gsb_payment_method.c 16 Mar 2010 11:48:43 -0000 1.22
+++ gsb_payment_method.c 5 Apr 2010 21:24:53 -0000 1.23
@@ -34,7 +34,6 @@
#include "./gsb_data_payment.h"
#include "./gsb_form.h"
#include "./gsb_form_widget.h"
-#include "./utils_str.h"
#include "./gsb_data_payment.h"
#include "./gsb_data_form.h"
#include "./erreur.h"
Index: gsb_file_others.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_file_others.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- gsb_file_others.c 3 Apr 2010 19:57:41 -0000 1.34
+++ gsb_file_others.c 5 Apr 2010 21:24:53 -0000 1.35
@@ -37,11 +37,11 @@
#include "./gsb_file_load.h"
#include "./gsb_file_save.h"
#include "./navigation.h"
-#include "./utils_files.h"
#include "./utils_str.h"
#include "./traitement_variables.h"
#include "./categories_onglet.h"
#include "./imputation_budgetaire.h"
+#include "./utils_files.h"
#include "./structures.h"
#include "./include.h"
#include "./erreur.h"
Index: balance_estimate_tab.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/balance_estimate_tab.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- balance_estimate_tab.c 3 Apr 2010 22:28:17 -0000 1.60
+++ balance_estimate_tab.c 5 Apr 2010 21:24:53 -0000 1.61
@@ -44,29 +44,29 @@
#include "./balance_estimate_data.h"
#include "./balance_estimate_future.h"
#include "./balance_estimate_hist.h"
-#include "./fenetre_principale.h"
#include "./utils_dates.h"
+#include "./gsb_calendar_entry.h"
#include "./gsb_data_account.h"
#include "./gsb_data_budget.h"
-#include "./gsb_calendar_entry.h"
#include "./gsb_data_category.h"
-#include "./gsb_data_fyear.h"
#include "./gsb_data_payee.h"
#include "./gsb_data_scheduled.h"
#include "./gsb_data_transaction.h"
-#include "./gsb_fyear.h"
+#include "./navigation.h"
#include "./gsb_real.h"
#include "./gsb_scheduler.h"
#include "./gsb_scheduler_list.h"
-#include "./gsb_transactions_list_sort.h"
-#include "./main.h"
+#include "./gsb_transactions_list.h"
+#include "./traitement_variables.h"
+#include "./transaction_list_select.h"
+#include "./structures.h"
+#include "./fenetre_principale.h"
#include "./mouse.h"
-#include "./navigation.h"
+#include "./balance_estimate_data.h"
+#include "./balance_estimate_hist.h"
#include "./include.h"
-#include "./structures.h"
-#include "./traitement_variables.h"
#include "./erreur.h"
-#include "./utils.h"
+#include "./gsb_real.h"
/*END_INCLUDE*/
@@ -90,10 +90,13 @@
static void bet_array_list_change_menu ( GtkWidget *menu_item,
GtkTreeSelection *tree_selection );
static void bet_array_list_context_menu ( GtkWidget *tree_view );
-static void bet_array_list_delete_menu ( GtkWidget *menu_item,
- GtkTreeSelection *tree_selection );
static void bet_array_list_delete_all_menu ( GtkWidget *menu_item,
GtkTreeSelection *tree_selection );
+static void bet_array_list_delete_menu ( GtkWidget *menu_item,
+ GtkTreeSelection *tree_selection );
+static gchar *bet_array_list_get_description ( gint account_number,
+ gint origine,
+ gpointer value );
static void bet_array_list_insert_menu ( GtkWidget *menu_item,
GtkTreeSelection *tree_selection );
static void bet_array_list_redo_menu ( GtkWidget *menu_item,
@@ -102,7 +105,7 @@
static void bet_array_list_schedule_selected_line ( GtkWidget *menu_item,
GtkTreeSelection *tree_selection );
static gboolean bet_array_list_set_background_color ( GtkWidget *tree_view );
-void bet_array_list_traite_double_click ( GtkTreeView *tree_view );
+static void bet_array_list_traite_double_click ( GtkTreeView *tree_view );
static void bet_array_list_update_balance ( GtkTreeModel *model );
static gboolean bet_array_refresh_futur_data ( GtkTreeModel *tab_model,
GDate *date_min,
@@ -121,28 +124,26 @@
static gboolean bet_array_start_date_focus_out ( GtkWidget *entry,
GdkEventFocus *ev,
gpointer data );
-static gboolean bet_array_update_average_column (GtkTreeModel *model,
+static gboolean bet_array_update_average_column ( GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
- gpointer data);
+ gpointer data );
/*END_STATIC*/
/*START_EXTERN*/
-extern gboolean balances_with_scheduled;
extern gchar* bet_duration_array[];
-extern GdkColor couleur_fond[0];
extern GdkColor couleur_bet_division;
extern GdkColor couleur_bet_future;
+extern GdkColor couleur_fond[2];
extern gint mise_a_jour_liste_echeances_auto_accueil;
extern GtkWidget *notebook_general;
extern gsb_real null_real;
-extern GtkWidget *window;
/*END_EXTERN*/
enum bet_estimation_tree_columns {
SPP_ESTIMATE_TREE_SELECT_COLUMN, /* select column for the balance */
SPP_ESTIMATE_TREE_ORIGIN_DATA, /* origin of data : transaction, scheduled, hist, future */
- SPP_ESTIMATE_TREE_DIVISION_COLUMN, /* div_number */
+ SPP_ESTIMATE_TREE_DIVISION_COLUMN, /* div_number, transaction_number, futur_number, scheduled_number*/
SPP_ESTIMATE_TREE_SUB_DIV_COLUMN, /* sub_div_nb */
SPP_ESTIMATE_TREE_DATE_COLUMN,
SPP_ESTIMATE_TREE_DESC_COLUMN,
@@ -156,12 +157,6 @@
SPP_ESTIMATE_TREE_NUM_COLUMNS
};
-enum bet_array_origin_data {
- SPP_ORIGIN_TRANSACTION,
- SPP_ORIGIN_SCHEDULED,
- SPP_ORIGIN_HISTORICAL,
- SPP_ORIGIN_FUTURE
-};
/*
*
@@ -170,6 +165,7 @@
*/
void bet_array_update_estimate_tab ( void )
{
+ devel_debug ( NULL );
bet_historical_populate_data ( );
bet_array_refresh_estimate_tab ( );
}
@@ -311,7 +307,7 @@
SBR *tmp_range;
GValue date_value = {0, };
- //~ devel_debug (NULL);
+ devel_debug (NULL);
notebook = g_object_get_data ( G_OBJECT ( notebook_general ), "account_notebook");
tmp_range = struct_initialise_bet_range ( );
@@ -507,6 +503,7 @@
spin_button );
}
+ g_object_set_data ( G_OBJECT ( spin_button ), "bet_origin_signal", GINT_TO_POINTER ( 1 ) );
g_object_set_data ( G_OBJECT ( notebook ), "bet_account_previous", previous );
g_object_set_data ( G_OBJECT ( notebook ), "bet_account_widget", widget );
g_object_set_data ( G_OBJECT ( notebook ), "bet_account_spin_button", spin_button );
@@ -516,7 +513,7 @@
g_signal_connect ( G_OBJECT ( spin_button ),
"value-changed",
G_CALLBACK ( bet_config_duration_number_changed ),
- NULL );
+ GINT_TO_POINTER ( 1 ) );
label = gtk_label_new ( COLON ( _("Start date" ) ) );
gtk_misc_set_padding ( GTK_MISC (label), 5, 0 );
@@ -674,7 +671,7 @@
GtkTreeIter iter;
GSList* tmp_list;
- //~ devel_debug (NULL);
+ devel_debug (NULL);
tmp_list = gsb_data_scheduled_get_scheduled_list ( );
while (tmp_list)
@@ -743,11 +740,9 @@
}
else if ( account_number == selected_account )
{
- str_description = gsb_data_scheduled_get_notes ( scheduled_number );
-
- if ( !str_description || !strlen ( str_description ) )
- str_description = gsb_data_payee_get_name (
- gsb_data_scheduled_get_party_number ( scheduled_number ), TRUE );
+ str_description = bet_array_list_get_description ( account_number,
+ SPP_ORIGIN_SCHEDULED,
+ GINT_TO_POINTER ( scheduled_number ) );
amount = gsb_data_scheduled_get_amount ( scheduled_number );
}
@@ -791,7 +786,7 @@
&date_value );
gtk_tree_store_set ( GTK_TREE_STORE ( tab_model ), &iter,
SPP_ESTIMATE_TREE_ORIGIN_DATA, SPP_ORIGIN_SCHEDULED,
- SPP_ESTIMATE_TREE_DIVISION_COLUMN, 0,
+ SPP_ESTIMATE_TREE_DIVISION_COLUMN, scheduled_number,
SPP_ESTIMATE_TREE_SUB_DIV_COLUMN, 0,
SPP_ESTIMATE_TREE_DATE_COLUMN, str_date,
SPP_ESTIMATE_TREE_DESC_COLUMN, str_description,
@@ -829,7 +824,7 @@
GDate *date_comp;
GSList *tmp_list;
- //~ devel_debug (NULL);
+ devel_debug (NULL);
/* init dates */
date_jour_1 = gdate_today ( );
if ( g_date_get_day ( date_min ) > 1 )
@@ -848,7 +843,7 @@
gchar* str_amount;
gchar* str_debit = NULL;
gchar* str_credit = NULL;
- const gchar* str_description;
+ gchar* str_description;
gchar* str_date;
gint transaction_number;
gint transfer_number;
@@ -927,11 +922,9 @@
}
else
{
- str_description = gsb_data_transaction_get_notes ( transaction_number );
-
- if (!str_description || !strlen (str_description))
- str_description = gsb_data_payee_get_name (
- gsb_data_transaction_get_party_number ( transaction_number ), TRUE );
+ str_description = bet_array_list_get_description ( account_number,
+ SPP_ORIGIN_TRANSACTION,
+ GINT_TO_POINTER ( transaction_number ) );
}
/* add a line in the estimate array */
@@ -941,7 +934,7 @@
&date_value );
gtk_tree_store_set ( GTK_TREE_STORE ( tab_model ), &iter,
SPP_ESTIMATE_TREE_ORIGIN_DATA, SPP_ORIGIN_TRANSACTION,
- SPP_ESTIMATE_TREE_DIVISION_COLUMN, 0,
+ SPP_ESTIMATE_TREE_DIVISION_COLUMN, transaction_number,
SPP_ESTIMATE_TREE_SUB_DIV_COLUMN, 0,
SPP_ESTIMATE_TREE_DATE_COLUMN, str_date,
SPP_ESTIMATE_TREE_DESC_COLUMN, str_description,
@@ -953,6 +946,7 @@
g_value_unset ( &date_value );
g_free ( str_date );
g_free ( str_amount );
+ g_free ( str_description );
if ( str_debit )
g_free ( str_debit );
if ( str_credit )
@@ -1118,21 +1112,9 @@
if ( g_date_compare ( scheduled -> date, date_min ) < 0 )
continue;
- str_description = g_strdup ( scheduled -> notes );
-
- if ( !str_description || !strlen ( str_description ) )
- str_description = g_strdup ( gsb_data_payee_get_name (
- scheduled -> party_number, TRUE ) );
-
- if ( !str_description || !strlen ( str_description ) )
- {
- if ( gsb_data_account_get_bet_hist_data ( scheduled -> account_number ) == 0 )
- str_description = g_strdup ( gsb_data_category_get_name ( scheduled -> category_number,
- scheduled -> sub_category_number, NULL) );
- else
- str_description = g_strdup ( gsb_data_budget_get_name ( scheduled -> budgetary_number,
- scheduled -> sub_budgetary_number, NULL ) );
- }
+ str_description = bet_array_list_get_description ( account_number,
+ SPP_ORIGIN_FUTURE,
+ value );
str_amount = gsb_real_save_real_to_string ( scheduled -> amount, 2 );
@@ -1336,7 +1318,8 @@
gtk_menu_shell_append ( GTK_MENU_SHELL ( menu ), gtk_separator_menu_item_new() );
/* Convert to scheduled transaction */
- menu_item = gtk_image_menu_item_new_with_label ( _("Convert selection to scheduled transaction") );
+ menu_item = gtk_image_menu_item_new_with_label (
+ _("Convert selection to scheduled transaction") );
gtk_image_menu_item_set_image ( GTK_IMAGE_MENU_ITEM ( menu_item ),
gtk_image_new_from_stock ( GTK_STOCK_CONVERT,
GTK_ICON_SIZE_MENU ) );
@@ -1417,7 +1400,22 @@
SPP_ESTIMATE_TREE_SUB_DIV_COLUMN, &mother_row,
-1 );
- if ( origine == SPP_ORIGIN_FUTURE )
+ if ( origine == SPP_ORIGIN_TRANSACTION )
+ {
+ GtkNotebook *notebook;
+
+ notebook = g_object_get_data ( G_OBJECT ( notebook_general ), "account_notebook" );
+ gtk_notebook_set_current_page ( GTK_NOTEBOOK ( notebook ), 0 );
+ transaction_list_select ( number );
+ gsb_transactions_list_edit_transaction ( number );
+ }
+ else if ( origine == SPP_ORIGIN_SCHEDULED )
+ {
+ gsb_gui_navigation_set_selection ( GSB_SCHEDULER_PAGE, 0, NULL );
+ gsb_scheduler_list_select ( number );
+ gsb_scheduler_list_edit_transaction ( number );
+ }
+ else if ( origine == SPP_ORIGIN_FUTURE )
bet_future_modify_line ( gsb_gui_navigation_get_current_account ( ), number, mother_row );
}
@@ -1707,7 +1705,7 @@
*
*
* */
-gboolean bet_array_entry_key_press ( GtkWidget *entry,
+gboolean bet_array_entry_key_press ( GtkWidget *entry,
GdkEventKey *ev,
gpointer data )
{
@@ -1736,7 +1734,7 @@
*
*
* */
-gboolean bet_array_start_date_focus_out ( GtkWidget *entry,
+gboolean bet_array_start_date_focus_out ( GtkWidget *entry,
GdkEventFocus *ev,
gpointer data )
{
@@ -2003,6 +2001,7 @@
/* par défaut, on met en manuel, pour éviter si l'utilisateur se gourre dans la date,
* (c'est le cas, à 0 avec g_malloc0) que l'opé soit enregistrée immédiatement */
gsb_data_scheduled_set_frequency ( scheduled_number, scheduled -> frequency );
+
}
return scheduled_number;
@@ -2015,6 +2014,159 @@
*
*
* */
+gchar *bet_array_list_get_description ( gint account_number,
+ gint origine,
+ gpointer value )
+{
+ gchar *desc = NULL;
+ gint type;
+
+ type = gsb_data_account_get_bet_select_label ( account_number, origine );
+
+ if ( origine == SPP_ORIGIN_TRANSACTION )
+ {
+ gint transaction_number = GPOINTER_TO_INT ( value );
+
+ switch ( type )
+ {
+ case 0:
+ desc = g_strdup ( gsb_data_transaction_get_notes ( transaction_number ) );
+ if ( desc && strlen ( desc ) )
+ break;
+
+ desc = g_strdup ( gsb_data_payee_get_name (
+ gsb_data_transaction_get_party_number (
+ transaction_number ), TRUE ) );
+ if ( desc && strlen ( desc ) )
+ break;
+
+ desc = g_strdup ( gsb_data_category_get_name (
+ gsb_data_transaction_get_category_number (
+ transaction_number ),
+ gsb_data_transaction_get_sub_category_number (
+ transaction_number ), NULL) );
+ if ( desc && strlen ( desc ) )
+ break;
+
+ desc = g_strdup ( gsb_data_budget_get_name (
+ gsb_data_transaction_get_budgetary_number (
+ transaction_number ),
+ gsb_data_transaction_get_sub_category_number (
+ transaction_number ),
+ _("No data by default") ) );
+ break;
+ case 1:
+ desc = g_strdup ( gsb_data_category_get_name (
+ gsb_data_transaction_get_category_number (
+ transaction_number ),
+ gsb_data_transaction_get_sub_category_number (
+ transaction_number ),
+ _("No category") ) );
+ break;
+ case 2:
+ desc = g_strdup ( gsb_data_budget_get_name (
+ gsb_data_transaction_get_budgetary_number (
+ transaction_number ),
+ gsb_data_transaction_get_sub_category_number (
+ transaction_number ),
+ _("No budgetary line") ) );
+ break;
+ }
+ }
+ else if ( origine == SPP_ORIGIN_SCHEDULED )
+ {
+ gint scheduled_number = GPOINTER_TO_INT ( value );
+
+ switch ( type )
+ {
+ case 0:
+ desc = g_strdup ( gsb_data_scheduled_get_notes ( scheduled_number ) );
+ if ( desc && strlen ( desc ) )
+ break;
+
+ desc = g_strdup ( gsb_data_payee_get_name (
+ gsb_data_scheduled_get_party_number (
+ scheduled_number ), TRUE ) );
+ if ( desc && strlen ( desc ) )
+ break;
+
+ desc = g_strdup ( gsb_data_category_get_name (
+ gsb_data_scheduled_get_category_number (
+ scheduled_number ),
+ gsb_data_scheduled_get_sub_category_number (
+ scheduled_number ), NULL) );
+ if ( desc && strlen ( desc ) )
+ break;
+
+ desc = g_strdup ( gsb_data_budget_get_name (
+ gsb_data_scheduled_get_budgetary_number (
+ scheduled_number ),
+ gsb_data_scheduled_get_sub_category_number (
+ scheduled_number ),
+ _("No data by default") ) );
+ break;
+ case 1:
+ desc = g_strdup ( gsb_data_category_get_name (
+ gsb_data_scheduled_get_category_number (
+ scheduled_number ),
+ gsb_data_scheduled_get_sub_category_number (
+ scheduled_number ),
+ _("No category") ) );
+ break;
+ case 2:
+ desc = g_strdup ( gsb_data_budget_get_name (
+ gsb_data_scheduled_get_budgetary_number (
+ scheduled_number ),
+ gsb_data_scheduled_get_sub_category_number (
+ scheduled_number ),
+ _("No budgetary line") ) );
+ break;
+ }
+ }
+ else if ( origine == SPP_ORIGIN_FUTURE )
+ {
+ struct_futur_data *scheduled = ( struct_futur_data * ) value;
+
+ switch ( type )
+ {
+ case 0:
+ desc = g_strdup ( scheduled -> notes );
+ if ( desc && strlen ( desc ) )
+ break;
+
+ desc = g_strdup ( gsb_data_payee_get_name (
+ scheduled -> party_number, TRUE ) );
+ if ( desc && strlen ( desc ) )
+ break;
+
+ desc = g_strdup ( gsb_data_category_get_name (
+ scheduled -> category_number,
+ scheduled -> sub_category_number, NULL) );
+ if ( desc && strlen ( desc ) )
+ break;
+
+ desc = g_strdup ( gsb_data_budget_get_name (
+ scheduled -> budgetary_number,
+ scheduled -> sub_budgetary_number,
+ _("No data by default") ) );
+ break;
+ case 1:
+ desc = g_strdup ( gsb_data_category_get_name (
+ scheduled -> category_number,
+ scheduled -> sub_category_number,
+ _("No category") ) );
+ break;
+ case 2:
+ desc = g_strdup ( gsb_data_budget_get_name (
+ scheduled -> budgetary_number,
+ scheduled -> sub_budgetary_number,
+ _("No budgetary line") ) );
+ break;
+ }
+ }
+
+ return desc;
+}
/* Local Variables: */
/* c-basic-offset: 4 */
/* End: */
Index: etats_onglet.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/etats_onglet.c,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- etats_onglet.c 14 Feb 2010 17:48:49 -0000 1.137
+++ etats_onglet.c 5 Apr 2010 21:24:53 -0000 1.138
@@ -51,7 +51,6 @@
#include "./fenetre_principale.h"
#include "./print_config.h"
#include "./include.h"
-#include "./etats_csv.h"
/*END_INCLUDE*/
/*START_STATIC*/
Index: csv_parse.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/csv_parse.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- csv_parse.h 23 Nov 2009 15:15:47 -0000 1.10
+++ csv_parse.h 5 Apr 2010 21:24:53 -0000 1.11
@@ -7,8 +7,8 @@
/* START_DECLARATION */
gboolean csv_import_parse_balance ( struct struct_ope_importation * ope, gchar * string );
-gboolean csv_import_parse_category ( struct struct_ope_importation * ope, gchar * string );
gboolean csv_import_parse_budget ( struct struct_ope_importation * ope, gchar * string );
+gboolean csv_import_parse_category ( struct struct_ope_importation * ope, gchar * string );
gboolean csv_import_parse_credit ( struct struct_ope_importation * ope, gchar * string );
gboolean csv_import_parse_currency ( struct struct_ope_importation * ope, gchar * string );
gboolean csv_import_parse_date ( struct struct_ope_importation * ope, gchar * string );
@@ -17,8 +17,8 @@
gboolean csv_import_parse_p_r ( struct struct_ope_importation * ope, gchar * string );
gboolean csv_import_parse_payee ( struct struct_ope_importation * ope, gchar * string );
gboolean csv_import_parse_split ( struct struct_ope_importation * ope, gchar * string );
-gboolean csv_import_parse_sub_category ( struct struct_ope_importation * ope, gchar * string );
gboolean csv_import_parse_sub_budget ( struct struct_ope_importation * ope, gchar * string );
+gboolean csv_import_parse_sub_category ( struct struct_ope_importation * ope, gchar * string );
gboolean csv_import_parse_value_date ( struct struct_ope_importation * ope, gchar * string );
gboolean csv_import_parse_voucher ( struct struct_ope_importation * ope, gchar * string );
gboolean csv_import_validate_amount ( gchar * string );
Index: transaction_list_sort.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/transaction_list_sort.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- transaction_list_sort.c 10 Dec 2009 22:02:33 -0000 1.2
+++ transaction_list_sort.c 5 Apr 2010 21:24:53 -0000 1.3
@@ -31,6 +31,8 @@
/*START_INCLUDE*/
#include "transaction_list_sort.h"
+#include "./gsb_data_transaction.h"
+#include "./utils_dates.h"
#include "./gsb_reconcile_list.h"
#include "./gsb_transactions_list_sort.h"
#include "./gsb_transactions_list.h"
Index: gsb_automem.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_automem.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- gsb_automem.c 6 Feb 2010 08:49:46 -0000 1.27
+++ gsb_automem.c 5 Apr 2010 21:24:53 -0000 1.28
@@ -420,10 +420,11 @@
* \return A newly created paddingbox
*/
GtkWidget *gsb_automem_radiobutton_new_with_title ( GtkWidget *parent,
- const gchar *title,
- const gchar *choice1, const gchar *choice2,
- gboolean *value,
- GCallback hook, gpointer data )
+ const gchar *title,
+ const gchar *choice1, const gchar *choice2,
+ gboolean *value,
+ GCallback hook,
+ gpointer data )
{
GtkWidget *paddingbox;
@@ -452,10 +453,10 @@
* \return a vbox containing the radiobuttons
*/
GtkWidget *gsb_automem_radiobutton_new ( const gchar *choice1,
- const gchar *choice2,
- gboolean *value,
- GCallback hook,
- gpointer data )
+ const gchar *choice2,
+ gboolean *value,
+ GCallback hook,
+ gpointer data )
{
GtkWidget *button1, *button2, *vbox;
@@ -503,119 +504,106 @@
*
* \return A newly created paddingbox
*/
-/* comment by pbiava the 08/02/2009 : unused function
-GtkWidget *gsb_automem_radiobutton3_new_with_title ( GtkWidget *parent,
- const gchar *title,
- const gchar *choice1, const gchar *choice2, const gchar *choice3,
- gboolean *value )
+/*GtkWidget *gsb_automem_radiobutton3_new_with_title ( GtkWidget *parent,
+ const gchar *title,
+ const gchar *choice1, const gchar *choice2, const gchar *choice3,
+ gboolean *value,
+ GCallback hook,
+ gpointer data )
{
GtkWidget *paddingbox;
paddingbox = new_paddingbox_with_title (parent, FALSE, COLON(title));
gtk_box_pack_start (GTK_BOX(paddingbox),
gsb_automem_radiobutton3_new ( choice1, choice2, choice3,
- value ),
+ value, hook, data ),
FALSE, FALSE, 0 );
return paddingbox;
-} */
+}*/
/**
- * Creates a new radio buttons group with 3 choices. Toggling will
- * change the content of an integer passed as an argument.
+ * Creates a new radio buttons group with 3 choices.
*
* \param choice1 First choice label
* \param choice2 Second choice label
* \param choice3 Second choice label
* \param value A pointer to an integer that will be set to 0, 1 or 2
* according to buttons toggles.
+ * \param callback A callback function to run at each toggle
+ * \param data optional data to send to callback
*
- * \return a vbox containing the radiobuttons
+ * \return a hbox containing the radiobuttons
*/
-/* comment by pbiava the 08/02/2009 : unused function
+
GtkWidget *gsb_automem_radiobutton3_new ( const gchar *choice1,
- const gchar *choice2,
- const gchar *choice3,
- gboolean *value )
+ const gchar *choice2,
+ const gchar *choice3,
+ gint *value,
+ GCallback callback,
+ gpointer data )
{
- GtkWidget *button1, *button2, *button3, *vbox;
+ GtkWidget *hbox;
+ GtkWidget *button1;
+ GtkWidget *button2;
+ GtkWidget *button3 = NULL;
- vbox = gtk_vbox_new ( FALSE, 6 );
+ hbox = gtk_hbox_new ( FALSE, 6 );
button1 = gtk_radio_button_new_with_mnemonic ( NULL, choice1 );
- gtk_box_pack_start (GTK_BOX(vbox), button1, FALSE, FALSE, 0 );
- button2 = gtk_radio_button_new_with_mnemonic ( gtk_radio_button_get_group (GTK_RADIO_BUTTON(button1)),
- choice2 );
- gtk_box_pack_start (GTK_BOX(vbox), button2, FALSE, FALSE, 0 );
- button3 = gtk_radio_button_new_with_mnemonic ( gtk_radio_button_get_group (GTK_RADIO_BUTTON(button1)),
- choice3 );
- gtk_box_pack_start (GTK_BOX(vbox), button3, FALSE, FALSE, 0 );
+ gtk_box_pack_start ( GTK_BOX ( hbox ), button1, FALSE, FALSE, 0 );
+ button2 = gtk_radio_button_new_with_mnemonic ( gtk_radio_button_get_group (
+ GTK_RADIO_BUTTON ( button1 ) ),
+ choice2 );
+ gtk_box_pack_start ( GTK_BOX ( hbox ), button2, FALSE, FALSE, 0 );
- if (value)
+ if ( choice3 && strlen ( choice3 ) )
{
- switch (*value)
- {
- case 0:
- gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( button1 ), TRUE );
- break;
- case 1:
- gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( button2 ), TRUE );
- break;
- default:
- gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( button3 ), TRUE );
- }
+ button3 = gtk_radio_button_new_with_mnemonic ( gtk_radio_button_get_group (
+ GTK_RADIO_BUTTON ( button1 ) ),
+ choice3 );
+ gtk_box_pack_start ( GTK_BOX ( hbox ), button3, FALSE, FALSE, 0 );
}
- !* we associate the value for all the buttons *!
- g_object_set_data ( G_OBJECT ( button1 ),
- "pointer", value);
- g_object_set_data ( G_OBJECT ( button2 ),
- "pointer", value);
- g_object_set_data ( G_OBJECT ( button3 ),
- "pointer", value);
-
- g_signal_connect ( G_OBJECT ( button1 ), "toggled",
- G_CALLBACK (gsb_automem_radiobutton3_changed), GINT_TO_POINTER (0));
- g_signal_connect ( G_OBJECT ( button2 ), "toggled",
- G_CALLBACK (gsb_automem_radiobutton3_changed), GINT_TO_POINTER (1));
- g_signal_connect ( G_OBJECT ( button3 ), "toggled",
- G_CALLBACK (gsb_automem_radiobutton3_changed), GINT_TO_POINTER (2));
-
- return vbox;
-} */
-
-/**
- * called for a change in automem_radiobutton3
- *
- * \param checkbutton the button wich changed
- * \param value_ptr a gint* wich is the value to set in the memory (0, 1 or 2)
- *
- * \return FALSE
- * */
-/* comment by pbiava the 08/02/2009 : unused function
-static gboolean gsb_automem_radiobutton3_changed ( GtkWidget *checkbutton,
- gpointer value_ptr )
-{
- gboolean *value;
+ if (value)
+ {
+ switch ( *value )
+ {
+ case 0:
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( button1 ), TRUE );
+ break;
+ case 1:
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( button2 ), TRUE );
+ break;
+ case 2:
+ if ( button3 )
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( button3 ), TRUE );
+ else
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( button2 ), TRUE );
+ break;
+ }
+ }
+ else
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( button1 ), TRUE );
- !* as we have 3 buttons, this function will be always called 2 times,
- * one for unset the button, and one for set the button,
- * so we get only when the button is set *!
- if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbutton)))
- return FALSE;
+ /* we associate the value for the buttons */
+ g_object_set_data ( G_OBJECT ( button1 ), "pointer", GINT_TO_POINTER ( 0 ) );
+ g_object_set_data ( G_OBJECT ( button2 ), "pointer", GINT_TO_POINTER ( 1 ) );
+ if ( button3 )
+ g_object_set_data ( G_OBJECT ( button3 ), "pointer", GINT_TO_POINTER ( 2 ) );
- !* we are on the active button, so save the value for it *!
- value = g_object_get_data ( G_OBJECT (checkbutton), "pointer");
- if (value)
+ if ( callback )
{
- *value = GPOINTER_TO_INT (value_ptr);
- if ( etat.modification_fichier == 0 )
- modification_fichier ( TRUE );
+ g_signal_connect ( G_OBJECT ( button1 ), "released", G_CALLBACK ( callback ), data );
+ g_signal_connect ( G_OBJECT ( button2 ), "released", G_CALLBACK ( callback ), data );
+ if ( button3 )
+ g_signal_connect ( G_OBJECT ( button3 ), "released", G_CALLBACK ( callback ), data );
}
- return FALSE;
-}*/
+
+ return hbox;
+}
/**
Index: utils_dates.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/utils_dates.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- utils_dates.h 3 Apr 2010 19:57:42 -0000 1.24
+++ utils_dates.h 5 Apr 2010 21:24:53 -0000 1.25
@@ -12,15 +12,15 @@
GDate *gsb_date_copy ( const GDate *date );
void gsb_date_free_last_date ( void );
gchar *gsb_date_get_compiled_time ( void );
+GDate *gsb_date_get_last_day_of_month ( const GDate *date );
GDate *gsb_date_get_last_entry_date ( const gchar *string );
void gsb_date_set_last_date ( const gchar *date );
gchar *gsb_date_today ( void );
+GDate *gsb_date_tomorrow ( void );
gchar *gsb_format_date ( gint day, gint month, gint year );
gchar *gsb_format_gdate ( const GDate *date );
gchar *gsb_format_gdate_safe ( const GDate *date );
GDate *gsb_parse_date_string ( const gchar *date_string );
GDate *gsb_parse_date_string_safe ( const gchar *date_string );
-GDate *gsb_date_get_last_day_of_month ( const GDate *date );
-GDate *gsb_date_tomorrow ( void );
/* END_DECLARATION */
#endif
Index: etats_calculs.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/etats_calculs.c,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- etats_calculs.c 14 Mar 2010 20:57:14 -0000 1.136
+++ etats_calculs.c 5 Apr 2010 21:24:53 -0000 1.137
@@ -66,7 +66,6 @@
static void etape_finale_affichage_etat ( GSList *ope_selectionnees,
struct struct_etat_affichage *affichage,
gchar * filename );
-static void impression_etat ( gint report_number );
static const gchar *recupere_texte_test_etat ( gint transaction_number,
gint champ );
static gint verifie_chq_test_etat ( gint text_comparison_number,
@@ -2652,24 +2651,24 @@
/*****************************************************************************************************/
/* Fonction d'impression de l'état */
/*****************************************************************************************************/
-void impression_etat ( gint report_number )
+/*void impression_etat ( gint report_number )
{
if ( ! print_config() )
return;
affichage_etat ( report_number, &latex_affichage, NULL );
-}
+}*/
-void impression_etat_courant ( )
+/*void impression_etat_courant ( )
{
if ( gtk_notebook_get_current_page ( GTK_NOTEBOOK ( notebook_general)) != NAVIGATION_REPORT )
gtk_notebook_set_current_page ( GTK_NOTEBOOK ( notebook_general),
NAVIGATION_REPORT );
impression_etat (gsb_gui_navigation_get_current_report ());
-}
+}*/
Index: etats_calculs.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/etats_calculs.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- etats_calculs.h 10 Sep 2008 09:37:18 -0000 1.17
+++ etats_calculs.h 5 Apr 2010 21:24:53 -0000 1.18
@@ -13,7 +13,6 @@
gint cherche_string_equivalente_dans_slist ( gchar *string_list,
gchar *string_cmp );
void denote_struct_sous_jaccentes ( gint origine );
-void impression_etat_courant ( );
void rafraichissement_etat ( gint report_number );
GSList *recupere_opes_etat ( gint report_number );
/* END_DECLARATION */
Index: utils_dates.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/utils_dates.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- utils_dates.c 3 Apr 2010 19:57:42 -0000 1.67
+++ utils_dates.c 5 Apr 2010 21:24:53 -0000 1.68
@@ -42,7 +42,6 @@
/*START_EXTERN*/
-extern gint max;
/*END_EXTERN*/
Index: gsb_automem.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_automem.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gsb_automem.h 6 Feb 2010 08:49:46 -0000 1.6
+++ gsb_automem.h 5 Apr 2010 21:24:53 -0000 1.7
@@ -17,16 +17,23 @@
GtkWidget *gsb_automem_imagefile_button_new ( GsbButtonStyle style,
const gchar * name, const gchar * filename,
GCallback callback, gpointer data );
+GtkWidget *gsb_automem_radiobutton3_new ( const gchar *choice1,
+ const gchar *choice2,
+ const gchar *choice3,
+ gint *value,
+ GCallback callback,
+ gpointer data );
GtkWidget *gsb_automem_radiobutton_new ( const gchar *choice1,
- const gchar *choice2,
- gboolean *value,
- GCallback hook,
- gpointer data );
+ const gchar *choice2,
+ gboolean *value,
+ GCallback hook,
+ gpointer data );
GtkWidget *gsb_automem_radiobutton_new_with_title ( GtkWidget *parent,
- const gchar *title,
- const gchar *choice1, const gchar *choice2,
- gboolean *value,
- GCallback hook, gpointer data );
+ const gchar *title,
+ const gchar *choice1, const gchar *choice2,
+ gboolean *value,
+ GCallback hook,
+ gpointer data );
GtkWidget *gsb_automem_spin_button_new ( gint *value,
GCallback hook,
gpointer data );
Index: gsb_form.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_form.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- gsb_form.h 23 Mar 2010 22:15:21 -0000 1.28
+++ gsb_form.h 5 Apr 2010 21:24:53 -0000 1.29
@@ -21,7 +21,6 @@
/* START_DECLARATION */
-gint gsb_form_get_element_expandable ( gint element_number );
gboolean gsb_form_allocate_size ( GtkWidget *table,
GtkAllocation *allocation,
gpointer null );
@@ -47,6 +46,7 @@
gboolean gsb_form_fill_from_account ( gint account_number );
gboolean gsb_form_finish_edition ( void );
gint gsb_form_get_account_number ( void );
+gint gsb_form_get_element_expandable ( gint element_number );
GtkWidget *gsb_form_get_element_widget_from_list ( gint element_number,
GSList *list );
GtkWidget *gsb_form_get_form_widget ( void );
Index: gsb_data_scheduled.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_scheduled.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- gsb_data_scheduled.c 28 Mar 2010 14:45:16 -0000 1.33
+++ gsb_data_scheduled.c 5 Apr 2010 21:24:53 -0000 1.34
@@ -35,7 +35,6 @@
#include "./utils_dates.h"
#include "./utils_str.h"
#include "./include.h"
-#include "./gsb_real.h"
/*END_INCLUDE*/
@@ -83,7 +82,7 @@
/*START_STATIC*/
-static void _gsb_data_scheduled_free ( struct_scheduled *scheduled);
+static void _gsb_data_scheduled_free ( struct_scheduled *scheduled );
static void gsb_data_scheduled_delete_all_scheduled ();
static gint gsb_data_scheduled_get_last_number (void);
static gint gsb_data_scheduled_get_last_white_number (void);
Index: gsb_form.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_form.c,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -d -r1.156 -r1.157
--- gsb_form.c 3 Apr 2010 19:57:41 -0000 1.156
+++ gsb_form.c 5 Apr 2010 21:24:53 -0000 1.157
@@ -32,8 +32,8 @@
/*START_INCLUDE*/
#include "gsb_form.h"
#include "./accueil.h"
-#include "./dialog.h"
#include "./balance_estimate_data.h"
+#include "./dialog.h"
#include "./gsb_calendar_entry.h"
#include "./gsb_calendar.h"
#include "./gsb_currency.h"
@@ -95,7 +95,6 @@
static gboolean gsb_form_get_categories ( gint transaction_number,
gint new_transaction,
gboolean is_transaction );
-//~ static gint gsb_form_get_element_expandable ( gint element_number );
static gboolean gsb_form_hide ( void );
static gboolean gsb_form_size_allocate ( GtkWidget *widget,
GtkAllocation *allocation,
Index: gsb_data_partial_balance.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_partial_balance.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- gsb_data_partial_balance.c 28 Jan 2010 20:25:12 -0000 1.11
+++ gsb_data_partial_balance.c 5 Apr 2010 21:24:53 -0000 1.12
@@ -81,7 +81,6 @@
/*END_STATIC*/
/*START_EXTERN*/
-extern GtkWidget *main_vbox;
extern gsb_real null_real;
extern GtkWidget *window;
/*END_EXTERN*/
@@ -1492,7 +1491,7 @@
* */
GtkWidget *gsb_partial_balance_create_dialog ( gint action, gint spin_value )
{
- GtkWidget *dialog, *label, *table, *paddingbox, * main_vbox, * vbox;
+ GtkWidget *dialog, *label, *table, *paddingbox, *main_vbox, *vbox;
GtkWidget *entry_name, *entry_list, *account_list, *bouton;
devel_debug ( NULL);
Index: gsb_data_account_cunit.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_account_cunit.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gsb_data_account_cunit.c 9 Mar 2010 19:53:27 -0000 1.4
+++ gsb_data_account_cunit.c 5 Apr 2010 21:24:53 -0000 1.5
@@ -32,6 +32,7 @@
/* START_INCLUDE */
#include "gsb_data_account_cunit.h"
+#include "./utils_dates.h"
#include "./gsb_data_account.h"
#include "./gsb_data_currency.h"
#include "./gsb_data_transaction.h"
Index: utils_str.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/utils_str.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- utils_str.h 14 Feb 2010 17:48:51 -0000 1.47
+++ utils_str.h 5 Apr 2010 21:24:53 -0000 1.48
@@ -13,14 +13,13 @@
gchar *delimiter );
gboolean gsb_string_is_trouve ( const gchar *payee_name, const gchar *needle );
gchar * gsb_string_remplace_joker ( const gchar *chaine, gchar *new_str );
-gchar * gsb_string_remplace_string ( gchar * str, gchar *old_str, gchar *new_str );
+gchar * gsb_string_remplace_string ( gchar *str, gchar *old_str, gchar *new_str );
gchar * gsb_string_truncate ( gchar * string );
gchar *gsb_string_uniform_new_line ( const gchar *chaine, gint nbre_char );
G_MODULE_EXPORT gchar * latin2utf8 ( const gchar * inchar);
gchar *limit_string ( gchar *string,
gint length );
-gint my_strcasecmp ( const gchar *string_1,
- const gchar *string_2 );
+gint my_strcasecmp ( const gchar *string_1, const gchar *string_2 );
gint my_strcmp ( gchar *string_1, gchar *string_2 );
gchar *my_strdelimit ( const gchar *string,
const gchar *delimiters,
@@ -32,9 +31,9 @@
double my_strtod ( const char *nptr, const char **endptr );
G_MODULE_EXPORT gint utils_str_atoi ( const gchar *chaine );
gchar *utils_str_itoa ( gint integer );
+gchar *utils_str_localise_decimal_point_from_string ( const gchar *string );
gchar *utils_str_reduce_exponant_from_string ( const gchar *amount_string,
gint exponent );
-gchar *utils_str_localise_decimal_point_from_string ( const gchar *string );
/* END_DECLARATION */
typedef enum GSB_TITLE_NAME {
Index: gsb_data_reconcile.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_reconcile.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- gsb_data_reconcile.h 5 Dec 2009 06:54:43 -0000 1.12
+++ gsb_data_reconcile.h 5 Apr 2010 21:24:53 -0000 1.13
@@ -13,7 +13,6 @@
const GDate *gsb_data_reconcile_get_final_date ( gint reconcile_number );
gsb_real gsb_data_reconcile_get_init_balance ( gint reconcile_number );
const GDate *gsb_data_reconcile_get_init_date ( gint reconcile_number );
-
const gchar *gsb_data_reconcile_get_name ( gint reconcile_number );
gint gsb_data_reconcile_get_no_reconcile ( gpointer reconcile_ptr );
gint gsb_data_reconcile_get_number_by_date ( const GDate *date,
Index: utils_str.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/utils_str.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- utils_str.c 20 Mar 2010 18:37:31 -0000 1.83
+++ utils_str.c 5 Apr 2010 21:24:53 -0000 1.84
@@ -27,7 +27,6 @@
/*START_INCLUDE*/
#include "utils_str.h"
-#include "./include.h"
#include "./gsb_data_report.h"
/*END_INCLUDE*/
@@ -38,7 +37,6 @@
/*START_EXTERN*/
-extern gint max;
/*END_EXTERN*/
Index: navigation.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/navigation.c,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -d -r1.142 -r1.143
--- navigation.c 20 Mar 2010 18:37:31 -0000 1.142
+++ navigation.c 5 Apr 2010 21:24:53 -0000 1.143
@@ -26,7 +26,6 @@
/*START_INCLUDE*/
#include "navigation.h"
#include "./balance_estimate_data.h"
-#include "./balance_estimate_tab.h"
#include "./gsb_account_property.h"
#include "./gsb_calendar.h"
#include "./gsb_data_account.h"
@@ -41,6 +40,7 @@
#include "./menu.h"
#include "./etats_onglet.h"
#include "./accueil.h"
+#include "./gsb_real.h"
#include "./gsb_reconcile.h"
#include "./gsb_scheduler_list.h"
#include "./gsb_transactions_list.h"
Index: utils.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/utils.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- utils.c 23 Mar 2010 22:15:21 -0000 1.63
+++ utils.c 5 Apr 2010 21:24:53 -0000 1.64
@@ -32,8 +32,8 @@
#include "./utils_str.h"
#include "./gsb_file_config.h"
#include "./include.h"
-#include "./erreur.h"
#include "./structures.h"
+#include "./erreur.h"
/*END_INCLUDE*/
/*START_STATIC*/
@@ -362,7 +362,7 @@
* \returns A pointer to a vbox widget that will contain all created
* widgets and user defined widgets
*/
-GtkWidget *new_vbox_with_title_and_image ( gchar * title, GtkWidget *image )
+/*GtkWidget *new_vbox_with_title_and_image ( gchar * title, GtkWidget *image )
{
GtkWidget *vbox_pref, *hbox, *label, *eb;
GtkStyle * style;
@@ -378,13 +378,13 @@
gtk_box_pack_start ( GTK_BOX ( vbox_pref ), eb, FALSE, FALSE, 0);
- /* Title hbox */
+ !* Title hbox *!
hbox = gtk_hbox_new ( FALSE, 6 );
gtk_widget_show ( hbox );
gtk_container_add ( GTK_CONTAINER ( eb ), hbox );
gtk_container_set_border_width ( GTK_CONTAINER ( hbox ), 3 );
- /* Icon */
+ !* Icon *!
if ( image )
{
gtk_image_set_pixel_size ( GTK_IMAGE ( image ), 128 );
@@ -392,7 +392,7 @@
gtk_widget_show ( image );
}
- /* Nice huge title */
+ !* Nice huge title *!
label = gtk_label_new ( title );
tmpstr1 = g_markup_escape_text (title, strlen(title));
tmpstr2 = g_strconcat ("<span size=\"x-large\" weight=\"bold\">",
@@ -406,7 +406,7 @@
gtk_widget_show ( label );
return vbox_pref;
-}
+}*/
/**
Index: gsb_reconcile.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_reconcile.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- gsb_reconcile.c 5 Mar 2010 20:07:29 -0000 1.47
+++ gsb_reconcile.c 5 Apr 2010 21:24:53 -0000 1.48
@@ -36,12 +36,13 @@
#include "./gsb_data_account.h"
#include "./gsb_data_reconcile.h"
#include "./gsb_data_transaction.h"
+#include "./gsb_form_widget.h"
#include "./navigation.h"
#include "./fenetre_principale.h"
#include "./gsb_real.h"
#include "./gsb_reconcile_list.h"
#include "./gsb_transactions_list.h"
-#include "./gsb_form_widget.h"
+#include "./utils_editables.h"
#include "./traitement_variables.h"
#include "./utils_str.h"
#include "./transaction_list.h"
@@ -51,8 +52,6 @@
#include "./gsb_data_transaction.h"
#include "./include.h"
#include "./gsb_real.h"
-#include "./utils_editables.h"
-#include "./erreur.h"
/*END_INCLUDE*/
/*START_STATIC*/
Index: barre_outils.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/barre_outils.c,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- barre_outils.c 8 Mar 2010 21:30:00 -0000 1.132
+++ barre_outils.c 5 Apr 2010 21:24:53 -0000 1.133
@@ -44,7 +44,6 @@
#include "./utils_buttons.h"
#include "./structures.h"
#include "./include.h"
-#include "./erreur.h"
/*END_INCLUDE*/
/*START_STATIC*/
Index: qif.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/qif.c,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -d -r1.144 -r1.145
--- qif.c 13 Feb 2010 20:27:03 -0000 1.144
+++ qif.c 5 Apr 2010 21:24:53 -0000 1.145
@@ -118,13 +118,14 @@
do
{
GSList *tmp_list;
- gint order;
+ gint order = 0;
struct struct_ope_importation *imported_transaction;
do
{
- /* si ce n'est pas le premier imported_account du qif_file, tmp_str est déjà sur la ligne du nouveau imported_account */
- /* tans que pas_le_premier_compte = 1 ; du coup on le met à 2 s'il était à 1 */
+ /* si ce n'est pas le premier imported_account du qif_file,
+ * tmp_str est déjà sur la ligne du nouveau imported_account
+ * tant que pas_le_premier_compte = 1 ; du coup on le met à 2 s'il était à 1 */
if ( pas_le_premier_compte != 1 )
{
returned_value = get_utf8_line_from_file ( qif_file,
@@ -194,7 +195,7 @@
||
!my_strcasecmp ( tmp_str+6,
_("oth l)")))
- returned_value = -2;
+ returned_value = -2;
}
else
break;
@@ -248,13 +249,15 @@
!my_strcasecmp ( tmp_str+6,
_("invst)")))
{
- /* on considère le imported_account d'investissement comme un imported_account bancaire mais met un */
- /* warning car pas implémenté ; aucune idée si ça passe ou pas... */
+ /* on considère le imported_account d'investissement comme un imported_account
+ * bancaire mais met un warning car pas implémenté ; aucune idée si ça passe ou pas... */
gchar *tmpstr;
imported_account -> type_de_compte = 0;
- tmpstr = g_strdup_printf ( _("Grisbi found an investment account (%s), which is not implemented yet. Nevertheless, Grisbi will try to import it as a bank account." ),
- imported -> name );
+ tmpstr = g_strdup_printf ( _("Grisbi found an investment account (%s), "
+ "which is not implemented yet. Nevertheless, Grisbi will try "
+ "to import it as a bank account." ),
+ imported -> name );
dialogue_warning (tmpstr);
g_free (tmpstr);
}
@@ -317,7 +320,9 @@
imported -> coding_system );
/* a transaction never begin with ^ and ! */
- if ( returned_value != EOF
+ if ( strlen ( tmp_str )
+ &&
+ returned_value != EOF
&&
tmp_str[0] != '^'
&&
@@ -458,7 +463,9 @@
/* donc si on en est à eof ou !, on n'enregistre pas l'opé */
/* sometimes we have ^ and EOF, so we need in that case to take the transaction */
- if ( (returned_value != EOF || (tmp_str && tmp_str[0]=='^'))
+ if ( strlen ( tmp_str )
+ &&
+ (returned_value != EOF || (tmp_str && tmp_str[0]=='^'))
&&
tmp_str[0] != '!' )
{
@@ -495,50 +502,51 @@
&&
tmp_str[0] != '!' );
-
/* the struct_ope_importation has been filled */
/* first, we need to check if the first transaction is an opening balance
* or a normal transaction
* update : money sometimes translate Opening balance... */
- imported_transaction = imported_account -> operations_importees -> data;
- if (imported_transaction -> tiers
- &&
- (!g_ascii_strcasecmp (imported_transaction -> tiers, "Opening Balance")
- ||
- !g_ascii_strcasecmp (imported_transaction -> tiers, _("Opening Balance"))))
- {
- /* ok, we are on an opening balance, we transfer the first transaction
- * to the initial datas of the account */
-
- /* get the initial amount */
- imported_account -> solde = imported_transaction -> montant;
+ if ( g_slist_length ( imported_account -> operations_importees) > 0 )
+ {
+ imported_transaction = imported_account -> operations_importees -> data;
+ if (imported_transaction -> tiers
+ &&
+ (!g_ascii_strcasecmp (imported_transaction -> tiers, "Opening Balance")
+ ||
+ !g_ascii_strcasecmp (imported_transaction -> tiers, _("Opening Balance"))))
+ {
+ /* ok, we are on an opening balance, we transfer the first transaction
+ * to the initial datas of the account */
- /* get the name of account */
- tmp_str = my_strdelimit (imported_transaction -> categ, "[]", "");
- imported_account -> nom_de_compte = unique_imported_name (tmp_str);
- g_free (tmp_str);
+ /* get the initial amount */
+ imported_account -> solde = imported_transaction -> montant;
- /* get the date of the file */
- imported_account -> date_solde_qif = my_strdup (imported_transaction -> date_tmp);
+ /* get the name of account */
+ tmp_str = my_strdelimit (imported_transaction -> categ, "[]", "");
+ imported_account -> nom_de_compte = unique_imported_name (tmp_str);
+ g_free (tmp_str);
- /* now, we can remove the first imported transaction */
- imported_account -> operations_importees = g_slist_remove ( imported_account -> operations_importees,
- imported_transaction );
- g_free (imported_transaction);
- }
+ /* get the date of the file */
+ imported_account -> date_solde_qif = my_strdup (imported_transaction -> date_tmp);
- /* if no name, set a new name */
- if ( !imported_account -> nom_de_compte )
- imported_account -> nom_de_compte = unique_imported_name ( my_strdup ( _("Imported QIF account" )) );
+ /* now, we can remove the first imported transaction */
+ imported_account -> operations_importees = g_slist_remove ( imported_account -> operations_importees,
+ imported_transaction );
+ g_free (imported_transaction);
+ }
+ /* if no name, set a new name */
+ if ( !imported_account -> nom_de_compte )
+ imported_account -> nom_de_compte = unique_imported_name ( my_strdup ( _("Imported QIF account" )) );
- /* now we need to transform the dates of transaction
- * into gdate */
+ /* now we need to transform the dates of transaction
+ * into gdate */
- /* try to understand the order */
- order = gsb_qif_get_date_order (imported_account -> operations_importees);
- if (order == -1)
- dialogue_error (_("Grisbi couldn't determine the format of the date into the qif file.\nPlease contact the Grisbi team (devel at listes.grisbi.org) to find the problem.\nFor now, all the dates will be imported as 01.01.1970"));
+ /* try to understand the order */
+ order = gsb_qif_get_date_order (imported_account -> operations_importees);
+ if (order == -1)
+ dialogue_error (_("Grisbi couldn't determine the format of the date into the qif file.\nPlease contact the Grisbi team (devel at listes.grisbi.org) to find the problem.\nFor now, all the dates will be imported as 01.01.1970"));
+ }
tmp_list = imported_account -> operations_importees;
while (tmp_list)
Index: gsb_file_util.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_file_util.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- gsb_file_util.c 8 Mar 2010 21:30:01 -0000 1.43
+++ gsb_file_util.c 5 Apr 2010 21:24:53 -0000 1.44
@@ -31,8 +31,8 @@
#include "./utils_str.h"
#include "./utils_files.h"
#include "./include.h"
-#include "./erreur.h"
#include "./structures.h"
+#include "./erreur.h"
/*END_INCLUDE*/
/*START_STATIC*/
Index: gsb_payment_method_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_payment_method_config.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- gsb_payment_method_config.c 16 Mar 2010 11:48:43 -0000 1.40
+++ gsb_payment_method_config.c 5 Apr 2010 21:24:53 -0000 1.41
@@ -42,13 +42,11 @@
#include "./traitement_variables.h"
#include "./utils.h"
#include "./transaction_list.h"
-#include "./utils_str.h"
#include "./structures.h"
#include "./gsb_transactions_list.h"
#include "./gsb_data_payment.h"
#include "./gsb_data_form.h"
#include "./include.h"
-#include "./erreur.h"
/*END_INCLUDE*/
/*START_STATIC*/
Index: qif.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/qif.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- qif.h 17 Dec 2007 10:44:41 -0000 1.15
+++ qif.h 5 Apr 2010 21:24:53 -0000 1.16
@@ -7,10 +7,10 @@
/* START_DECLARATION */
gboolean gsb_qif_export_archive ( const gchar *filename,
- gint archive_number );
+ gint archive_number );
gboolean qif_export ( const gchar *filename,
- gint account_nb,
- gint archive_number );
-gboolean recuperation_donnees_qif ( GtkWidget * assistant, struct imported_file * imported );
+ gint account_nb,
+ gint archive_number );
+gboolean recuperation_donnees_qif ( GtkWidget *assistant, struct imported_file *imported );
/* END_DECLARATION */
#endif
Index: import_csv.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/import_csv.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- import_csv.c 22 Feb 2010 20:11:29 -0000 1.65
+++ import_csv.c 5 Apr 2010 21:24:53 -0000 1.66
@@ -40,7 +40,7 @@
/*START_EXTERN*/
extern GSList *liste_comptes_importes;
extern GSList *liste_comptes_importes_error;
-extern gint max;
+extern GtkWidget *window;
/*END_EXTERN*/
/*START_STATIC*/
@@ -48,13 +48,13 @@
static GSList * csv_get_next_line ( gchar ** contents, gchar * separator );
static gboolean csv_import_change_field ( GtkWidget * item, gint no_menu );
static gboolean csv_import_change_separator ( GtkEntry * entry,
- GtkWidget *assistant );
+ GtkWidget *assistant );
static gboolean csv_import_combo_changed ( GtkComboBox * combo, GtkEntry * entry );
static gint csv_import_count_columns ( gchar * contents, gchar * separator );
static GtkTreeModel * csv_import_create_model ( GtkTreeView * tree_preview, gchar * contents,
- gchar * separator );
+ gchar * separator );
static GtkWidget * csv_import_fields_menu ( GtkTreeViewColumn * col, gint field,
- GtkWidget * assistant );
+ GtkWidget * assistant );
static gint * csv_import_guess_fields_config ( gchar * contents, gint size, gchar * separator );
static gchar * csv_import_guess_separator ( gchar * contents );
static gboolean csv_import_header_on_click ( GtkWidget * button, gint *no_column );
@@ -65,7 +65,7 @@
static gint csv_skip_lines ( gchar ** contents, gint num_lines, gchar * separator );
static gboolean safe_contains ( gchar * original, gchar * substring );
static void skip_line_toggled ( GtkCellRendererToggle * cell, gchar * path_str,
- GtkTreeView * tree_preview );
+ GtkTreeView * tree_preview );
/*END_STATIC*/
Index: gsb_plugins.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_plugins.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- gsb_plugins.c 3 Nov 2009 17:28:57 -0000 1.22
+++ gsb_plugins.c 5 Apr 2010 21:24:53 -0000 1.23
@@ -28,9 +28,9 @@
/*END_INCLUDE*/
/*START_EXTERN*/
-extern G_MODULE_EXPORT const gchar plugin_name[];
-extern G_MODULE_EXPORT const gchar plugin_name[];
-extern G_MODULE_EXPORT const gchar plugin_name[];
+extern const gchar plugin_name[];
+extern const gchar plugin_name[];
+extern const gchar plugin_name[];
/*END_EXTERN*/
/*START_STATIC*/
Index: main.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/main.c,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -d -r1.170 -r1.171
--- main.c 3 Apr 2010 19:57:42 -0000 1.170
+++ main.c 5 Apr 2010 21:24:53 -0000 1.171
@@ -52,12 +52,12 @@
#include "./structures.h"
#include "./include.h"
#include "./erreur.h"
+/*END_INCLUDE*/
+
// including resources so that the exe generated with MSVC has the right icon.
#ifdef _MSC_VER
#include "resource.h"
#endif
-/*END_INCLUDE*/
-
/*START_STATIC*/
static gboolean gsb_grisbi_change_state_window ( GtkWidget *window,
Index: transaction_list_select.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/transaction_list_select.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- transaction_list_select.c 7 Mar 2010 15:56:05 -0000 1.9
+++ transaction_list_select.c 5 Apr 2010 21:24:53 -0000 1.10
@@ -33,7 +33,6 @@
#include "transaction_list_select.h"
#include "./gsb_data_account.h"
#include "./gsb_data_transaction.h"
-#include "./barre_outils.h"
#include "./menu.h"
#include "./gsb_transactions_list.h"
#include "./transaction_model.h"
Index: utils.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/utils.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- utils.h 30 Jan 2010 17:04:12 -0000 1.28
+++ utils.h 5 Apr 2010 21:24:53 -0000 1.29
@@ -16,13 +16,15 @@
GdkEventMotion *event,
gpointer pointeur );
GtkWidget *new_paddingbox_with_title (GtkWidget * parent, gboolean fill, gchar * title);
-GtkWidget *new_vbox_with_title_and_icon ( gchar * title, gchar * image_filename);
-GtkWidget *new_vbox_with_title_and_image ( gchar * title, GtkWidget *image );
+GtkWidget *new_vbox_with_title_and_icon ( gchar * title,
+ gchar * image_filename);
gboolean radio_set_active_linked_widgets ( GtkWidget * widget );
void register_button_as_linked ( GtkWidget * widget, GtkWidget * linked );
-gboolean sens_desensitive_pointeur ( GtkWidget *bouton, GtkWidget *widget );
-gboolean sensitive_widget ( gpointer object, GtkWidget *widget );
-GtkWidget *utils_get_child_widget_by_name ( GtkWidget *ancestor, const gchar *name );
+gboolean sens_desensitive_pointeur ( GtkWidget *bouton,
+ GtkWidget *widget );
+gboolean sensitive_widget ( gpointer object,
+ GtkWidget *widget );
void update_ecran ( void );
+GtkWidget *utils_get_child_widget_by_name ( GtkWidget *ancestor, const gchar *name );
/* END_DECLARATION */
#endif
Index: affichage_liste.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/affichage_liste.c,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- affichage_liste.c 3 Apr 2010 19:57:41 -0000 1.121
+++ affichage_liste.c 5 Apr 2010 21:24:53 -0000 1.122
@@ -77,7 +77,6 @@
/*START_EXTERN*/
extern GSList *liste_labels_titres_colonnes_liste_ope;
-extern gint max;
extern gchar *tips_col_liste_operations[CUSTOM_MODEL_N_VISIBLES_COLUMN];
extern gchar *titres_colonnes_liste_operations[CUSTOM_MODEL_N_VISIBLES_COLUMN];
/*END_EXTERN*/
Index: gsb_fyear.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_fyear.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- gsb_fyear.h 28 Jan 2010 20:25:12 -0000 1.9
+++ gsb_fyear.h 5 Apr 2010 21:24:53 -0000 1.10
@@ -17,6 +17,8 @@
gboolean gsb_fyear_hide_iter_by_name ( GtkTreeModel *model, gchar *name );
void gsb_fyear_init_variables ( void );
GtkWidget *gsb_fyear_make_combobox ( gboolean set_automatic );
+GtkWidget *gsb_fyear_make_combobox_new ( GtkTreeModel *model,
+ gboolean set_automatic );
gboolean gsb_fyear_select_iter_by_number ( GtkWidget *combo_box,
GtkTreeModel *model,
GtkTreeModel *model_filter,
@@ -25,8 +27,6 @@
gboolean gsb_fyear_set_combobox_history ( GtkWidget *combo_box,
gint fyear_number );
gboolean gsb_fyear_update_fyear_list ( void );
-GtkWidget *gsb_fyear_make_combobox_new ( GtkTreeModel *model,
- gboolean set_automatic );
gboolean gsb_fyear_update_fyear_list_new ( GtkTreeModel *model,
GtkTreeModel *model_filter,
gchar *title );
Index: gsb_data_scheduled.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_scheduled.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- gsb_data_scheduled.h 28 Mar 2010 14:40:28 -0000 1.19
+++ gsb_data_scheduled.h 5 Apr 2010 21:24:53 -0000 1.20
@@ -3,7 +3,7 @@
/* START_INCLUDE_H */
-#include "./gsb_real.h"
+#include "././gsb_real.h"
/* END_INCLUDE_H */
/* START_DECLARATION */
Index: gsb_category.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_category.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- gsb_category.c 14 Feb 2010 17:48:50 -0000 1.23
+++ gsb_category.c 5 Apr 2010 21:24:53 -0000 1.24
@@ -37,6 +37,7 @@
#include "./gsb_file_others.h"
#include "./gsb_form_widget.h"
#include "./gtk_combofix.h"
+#include "./utils_str.h"
#include "./gsb_data_category.h"
#include "./utils_files.h"
#include "./gtk_combofix.h"
Index: gsb_currency.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_currency.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- gsb_currency.h 13 Jan 2010 19:30:14 -0000 1.11
+++ gsb_currency.h 5 Apr 2010 21:24:53 -0000 1.12
@@ -16,13 +16,13 @@
gsb_real exchange_fees,
gboolean force );
gint gsb_currency_get_currency_from_combobox ( GtkWidget *combo_box );
+gsb_real gsb_currency_get_current_exchange ( void );
+gsb_real gsb_currency_get_current_exchange_fees ( void );
void gsb_currency_init_exchanges ( void );
void gsb_currency_init_variables ( void );
GtkWidget *gsb_currency_make_combobox ( gboolean set_name );
gboolean gsb_currency_set_combobox_history ( GtkWidget *combo_box,
gint currency_number );
gboolean gsb_currency_update_combobox_currency_list ( void );
-gsb_real gsb_currency_get_current_exchange ( void );
-gsb_real gsb_currency_get_current_exchange_fees ( void );
/* END_DECLARATION */
#endif
Index: gsb_currency.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_currency.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- gsb_currency.c 24 Jan 2010 10:58:01 -0000 1.57
+++ gsb_currency.c 5 Apr 2010 21:24:53 -0000 1.58
@@ -31,8 +31,8 @@
/*START_INCLUDE*/
#include "gsb_currency.h"
-#include "./gsb_autofunc.h"
#include "./dialog.h"
+#include "./gsb_autofunc.h"
#include "./gsb_data_account.h"
#include "./gsb_data_currency.h"
#include "./gsb_data_currency_link.h"
@@ -63,7 +63,6 @@
GtkWidget *combobox_2 );
static gboolean gsb_currency_select_double_amount ( GtkWidget *entry_1,
GtkWidget *entry_2 );
-
/*END_STATIC*/
/**
Index: gsb_file_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_file_config.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- gsb_file_config.c 28 Mar 2010 14:40:28 -0000 1.95
+++ gsb_file_config.c 5 Apr 2010 21:24:53 -0000 1.96
@@ -64,7 +64,6 @@
extern struct conditional_message delete_msg[];
extern gboolean execute_scheduled_of_month;
extern GtkWidget *main_hpaned;
-extern gint max;
extern struct conditional_message messages[];
extern gint nb_days_before_scheduled;
extern gchar *nom_fichier_comptes;
Index: gsb_data_payment.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_payment.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- gsb_data_payment.c 3 Apr 2010 19:57:41 -0000 1.19
+++ gsb_data_payment.c 5 Apr 2010 21:24:53 -0000 1.20
@@ -35,7 +35,6 @@
#include "./utils_str.h"
#include "./gsb_data_account.h"
#include "./include.h"
-#include "./erreur.h"
/*END_INCLUDE*/
More information about the cvs
mailing list