[grisbi-cvs] grisbi/src gsb_account_property.c, 1.32, 1.33 gsb_bank.c, 1.18, 1.19 gsb_bank.h, 1.3, 1.4 gsb_data_payee.h, 1.20, 1.21 gsb_file_save.c, 1.121, 1.122 metatree.c, 1.131, 1.132 metatree.h, 1.41, 1.42 navigation.c, 1.114, 1.115
Pierre Biava
pbiava at users.sourceforge.net
Fri Apr 17 23:49:08 CEST 2009
- Previous message: [grisbi-cvs] grisbi NEWS,1.38,1.39
- Next message: [grisbi-cvs] grisbi/po cs.po, 1.29, 1.30 da.po, 1.36, 1.37 de.po, 1.80, 1.81 es.po, 1.73, 1.74 fa.po, 1.23, 1.24 fr.po, 1.152, 1.153 grisbi.pot, 1.71, 1.72 he.po, 1.29, 1.30 it.po, 1.29, 1.30 nl.po, 1.28, 1.29 pl.po, 1.34, 1.35 pt_BR.po, 1.31, 1.32 ro.po, 1.29, 1.30 ru.po, 1.28, 1.29 zh_CN.po, 1.23, 1.24
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/grisbi/grisbi/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15783/src
Modified Files:
gsb_account_property.c gsb_bank.c gsb_bank.h gsb_data_payee.h
gsb_file_save.c metatree.c metatree.h navigation.c
Log Message:
fix bug payee_list and minor corrections
Index: metatree.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/metatree.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- metatree.h 31 Mar 2009 19:23:55 -0000 1.41
+++ metatree.h 17 Apr 2009 21:49:06 -0000 1.42
@@ -88,37 +88,40 @@
/*START_DECLARATION*/
void appui_sur_ajout_sub_division ( GtkTreeModel * model );
gboolean division_activated ( GtkTreeView * treeview, GtkTreePath * path,
- GtkTreeViewColumn * col, gpointer userdata );
+ GtkTreeViewColumn * col, gpointer userdata );
gboolean division_column_expanded ( GtkTreeView * treeview, GtkTreeIter * iter,
- GtkTreePath * tree_path, gpointer user_data ) ;
+ GtkTreePath * tree_path, gpointer user_data ) ;
gboolean division_drag_data_received ( GtkTreeDragDest * drag_dest, GtkTreePath * dest_path,
- GtkSelectionData * selection_data );
+ GtkSelectionData * selection_data );
gboolean division_row_drop_possible ( GtkTreeDragDest * drag_dest, GtkTreePath * dest_path,
- GtkSelectionData * selection_data );
+ GtkSelectionData * selection_data );
void expand_arbre_division ( GtkWidget *bouton, gint depth );
void fill_division_row ( GtkTreeModel * model, MetatreeInterface * iface,
- GtkTreeIter * iter, gint division );
+ GtkTreeIter * iter, gint division );
void fill_sub_division_row ( GtkTreeModel * model, MetatreeInterface * iface,
- GtkTreeIter * iter,
- gint division,
- gint sub_division );
+ GtkTreeIter * iter,
+ gint division,
+ gint sub_division );
GtkTreeIter *get_iter_from_div ( GtkTreeModel * model, int div, int sub_div );
void metatree_new_division ( GtkTreeModel * model );
-void metatree_register_widget_as_linked ( GtkTreeModel * model, GtkWidget * widget,
- gchar * link_type );
+void metatree_register_widget_as_linked ( GtkTreeModel * model,
+ GtkWidget * widget,
+ gchar * link_type );
void metatree_remove_transaction ( GtkTreeView * tree_view,
- MetatreeInterface * iface,
- gint transaction,
- gboolean delete_transaction );
+ MetatreeInterface * iface,
+ gint transaction,
+ gboolean delete_transaction );
gboolean metatree_selection_changed ( GtkTreeSelection * selection, GtkTreeModel * model );
-void metatree_set_linked_widgets_sensitive ( GtkTreeModel * model, gboolean sensitive,
- gchar * link_type );
-gboolean metatree_sort_column ( GtkTreeModel * model,
- GtkTreeIter * a, GtkTreeIter * b,
- gpointer user_data );
+void metatree_set_linked_widgets_sensitive ( GtkTreeModel * model,
+ gboolean sensitive,
+ gchar * link_type );
+gboolean metatree_sort_column ( GtkTreeModel * model,
+ GtkTreeIter * a, GtkTreeIter * b,
+ gpointer user_data );
gboolean supprimer_division ( GtkTreeView * tree_view );
-void update_transaction_in_tree ( MetatreeInterface * iface, GtkTreeModel * model,
- gint transaction_number );
+void update_transaction_in_tree ( MetatreeInterface * iface,
+ GtkTreeModel * model,
+ gint transaction_number );
/*END_DECLARATION*/
#endif
Index: gsb_bank.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_bank.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gsb_bank.h 9 Jun 2008 22:00:37 -0000 1.3
+++ gsb_bank.h 17 Apr 2009 21:49:06 -0000 1.4
@@ -6,16 +6,16 @@
/* START_DECLARATION */
GtkWidget *gsb_bank_create_combobox ( gint index,
- GCallback hook,
- gpointer data,
- GCallback default_func,
- gint number_for_func );
+ GCallback hook,
+ gpointer data,
+ GCallback default_func,
+ gint number_for_func );
GtkWidget *gsb_bank_create_page ( gboolean default_sensitive );
gboolean gsb_bank_edit_from_button ( GtkWidget *button,
- GtkWidget *combobox );
+ GtkWidget *combobox );
gint gsb_bank_list_get_bank_number ( GtkWidget *combobox );
gboolean gsb_bank_list_set_bank ( GtkWidget *combobox,
- gint bank_number,
- gint number_for_func );
+ gint bank_number,
+ gint number_for_func );
/* END_DECLARATION */
#endif
Index: metatree.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/metatree.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- metatree.c 16 Apr 2009 21:13:30 -0000 1.131
+++ metatree.c 17 Apr 2009 21:49:06 -0000 1.132
@@ -104,6 +104,9 @@
static void move_transaction_to_sub_division_zero ( gint transaction_number,
MetatreeInterface * iface,
GtkTreeModel * model, gint no_division );
+static void move_transactions_to_division_payee (GtkTreeModel * model,
+ MetatreeInterface * iface,
+ gint orig_div, gint dest_div );
static gboolean search_for_div_or_subdiv ( GtkTreeModel *model, GtkTreePath *path,
GtkTreeIter *iter, gpointer * pointers);
static gboolean search_for_transaction ( GtkTreeModel *model, GtkTreePath *path,
@@ -765,7 +768,6 @@
/* on regarde s'il y a des transactions sans sous-division */
nbre_trans_s_s_div = iface -> sub_div_nb_transactions ( no_division, 0 );
- printf ("nbre d'operations sans sous division %d\n", nbre_trans_s_s_div);
if ( nbre_trans_s_s_div > 0 )
{
while ( list_tmp_transactions )
@@ -1494,11 +1496,6 @@
if ( !model )
return;
- gchar *tmpstr = g_strdup_printf ("dest div:%d - orig div:%d - orig sub-div:%d",
- no_dest_division, no_orig_division, no_orig_sub_division );
- devel_debug (tmpstr);
- g_free (tmpstr);
-
iface = g_object_get_data ( G_OBJECT(model), "metatree-interface" );
/* create the new sub-division in memory with the same name of the origin sub-division */
@@ -1536,6 +1533,7 @@
iface -> transaction_sub_div_id (transaction_number_tmp) == no_orig_sub_division )
{
GtkTreePath * path;
+
path = gtk_tree_model_get_path ( model, &iter );
move_transaction_to_sub_division ( transaction_number_tmp, model,
NULL, path,
@@ -1600,8 +1598,8 @@
* directly move the sub-division (transactions) the the new division */
if (!iface -> content)
{
- move_sub_division_to_division (model, dest_division,
- orig_division, 0 );
+ move_transactions_to_division_payee (model, iface,
+ orig_division, dest_division );
return;
}
@@ -2349,11 +2347,12 @@
while ( links )
{
- if ( links -> data && GTK_IS_WIDGET ( links -> data ) )
- {
- gtk_widget_set_sensitive ( GTK_WIDGET ( links -> data ), sensitive );
- }
- links = links -> next;
+ if ( links -> data && GTK_IS_WIDGET ( links -> data ) )
+ {
+ gtk_widget_set_sensitive ( GTK_WIDGET (
+ links -> data ), sensitive );
+ }
+ links = links -> next;
}
}
@@ -2402,22 +2401,22 @@
return 1;
if (!string_b)
- return 1;
+ return 1;
if (!string_a)
- return -1;
+ return -1;
if ( ! date_a && ! date_b )
{
- return g_utf8_collate ( string_a, string_b );
+ return g_utf8_collate ( string_a, string_b );
}
if ( ! date_b )
{
- return 1;
+ return 1;
}
else if ( ! date_a )
{
- return -1;
+ return -1;
}
return g_date_compare ( date_a, date_b );
@@ -2519,7 +2518,6 @@
string_tmp = iface -> sub_div_name (division, 0);
/* on a affaire à un tiers */
- printf ("sub_div_name = %s\n", string_tmp);
if ( string_tmp == NULL)
return;
@@ -2599,6 +2597,13 @@
}
+/**
+ *
+ *
+ *
+ *
+ *
+ * */
GtkTreeIter *get_iter_from_sub_div_zero ( GtkTreeModel * model,
MetatreeInterface * iface,
GtkTreeIter * parent_iter, int div )
@@ -2616,13 +2621,63 @@
gtk_tree_model_get ( model, &child_iter,
META_TREE_TEXT_COLUMN, &name, -1 );
- if ( g_utf8_collate ( name, _(iface->no_sub_div_label) ) == 0 )
+ if ( name && g_utf8_collate (
+ name, _(iface->no_sub_div_label) ) == 0 )
break;
}
}
return gtk_tree_iter_copy (&child_iter);
}
+
+
+/**
+ *
+ *
+ *
+ *
+ *
+ * */
+void move_transactions_to_division_payee (GtkTreeModel * model,
+ MetatreeInterface * iface,
+ gint orig_div, gint dest_div )
+{
+ GSList *list_tmp_transactions;
+
+ devel_debug_int ( dest_div);
+
+ if ( !model )
+ return;
+
+ iface = g_object_get_data ( G_OBJECT(model), "metatree-interface" );
+
+ /* fill the dest division for payee with the transactions */
+ list_tmp_transactions = gsb_data_transaction_get_transactions_list ();
+
+ while ( list_tmp_transactions )
+ {
+ gint transaction_number_tmp;
+ transaction_number_tmp = gsb_data_transaction_get_transaction_number (
+ list_tmp_transactions -> data);
+
+ if ( transaction_number_tmp &&
+ iface -> transaction_div_id (transaction_number_tmp) == orig_div )
+ {
+ iface -> transaction_set_div_id (
+ transaction_number_tmp, dest_div );
+ iface -> transaction_set_sub_div_id (
+ transaction_number_tmp, 0 );
+ gsb_transactions_list_update_transaction (
+ transaction_number_tmp );
+ iface -> add_transaction_to_div ( transaction_number_tmp,
+ dest_div );
+ }
+ list_tmp_transactions = list_tmp_transactions -> next;
+ }
+
+ /* We did some modifications */
+ modification_fichier ( TRUE );
+}
/* Local Variables: */
/* c-basic-offset: 4 */
/* End: */
Index: gsb_file_save.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_file_save.c,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- gsb_file_save.c 7 Apr 2009 21:07:40 -0000 1.121
+++ gsb_file_save.c 17 Apr 2009 21:49:06 -0000 1.122
@@ -2409,18 +2409,21 @@
gchar **file_content )
{
GdkPixbuf *pixbuf = NULL;
- gchar *new_string;
+ gchar *new_string = NULL;
gchar * str64;
pixbuf = gsb_select_icon_get_logo_pixbuf ( );
if ( ! pixbuf )
pixbuf = gsb_select_icon_get_default_logo_pixbuf ( );
-
- str64 = gsb_select_icon_create_chaine_base64_from_pixbuf ( pixbuf );
- new_string = g_markup_printf_escaped ( "\t<Logo\n"
+ if ( pixbuf )
+ {
+ str64 = gsb_select_icon_create_chaine_base64_from_pixbuf ( pixbuf );
+
+ new_string = g_markup_printf_escaped ( "\t<Logo\n"
"\t\tImage=\"%s\" />\n",
str64 );
+ }
iterator = gsb_file_save_append_part ( iterator,
length_calculated,
Index: navigation.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/navigation.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- navigation.c 7 Apr 2009 21:07:40 -0000 1.114
+++ navigation.c 17 Apr 2009 21:49:06 -0000 1.115
@@ -101,14 +101,11 @@
/*START_EXTERN*/
-extern GtkTreeStore *budgetary_line_tree_model;
-extern GtkTreeStore * categ_tree_model;
extern GtkWidget *label_last_statement;
extern GtkWidget *label_titre_fichier;
extern GtkWidget *menu_import_rules;
extern gint mise_a_jour_liste_comptes_accueil;
extern GtkWidget *notebook_general;
-extern GtkTreeStore *payee_tree_model;
extern gchar *titre_fichier;
/*END_EXTERN*/
@@ -1228,11 +1225,7 @@
title = g_strdup(_("Payees"));
/* what to be done if switch to that page */
- gsb_form_set_expander_visible (FALSE,
- FALSE );
- /* comment by pbiava the 02/08/2009 bug 428 */
- //~ if ( ! gtk_tree_model_get_iter_first ( GTK_TREE_MODEL (payee_tree_model),
- //~ &dummy_iter ) )
+ gsb_form_set_expander_visible (FALSE, FALSE );
payee_fill_tree ();
break;
@@ -1256,11 +1249,7 @@
title = g_strdup(_("Categories"));
/* what to be done if switch to that page */
- gsb_form_set_expander_visible (FALSE,
- FALSE );
- /* comment by pbiava the 02/08/2009 bug 428 */
- //~ if ( ! gtk_tree_model_get_iter_first ( GTK_TREE_MODEL (categ_tree_model),
- //~ &dummy_iter ) )
+ gsb_form_set_expander_visible (FALSE, FALSE );
remplit_arbre_categ ();
break;
@@ -1271,11 +1260,7 @@
title = g_strdup(_("Budgetary lines"));
/* what to be done if switch to that page */
- gsb_form_set_expander_visible (FALSE,
- FALSE );
- /* comment by pbiava the 02/08/2009 bug 428 */
- //~ if ( ! gtk_tree_model_get_iter_first ( GTK_TREE_MODEL (budgetary_line_tree_model),
- //~ &dummy_iter ) )
+ gsb_form_set_expander_visible (FALSE, FALSE );
remplit_arbre_imputation ();
break;
Index: gsb_data_payee.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_payee.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- gsb_data_payee.h 22 Mar 2009 18:53:25 -0000 1.20
+++ gsb_data_payee.h 17 Apr 2009 21:49:06 -0000 1.21
@@ -3,7 +3,7 @@
/* START_INCLUDE_H */
-#include "././gsb_real.h"
+#include "./gsb_real.h"
/* END_INCLUDE_H */
Index: gsb_account_property.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_account_property.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- gsb_account_property.c 10 Apr 2009 19:22:50 -0000 1.32
+++ gsb_account_property.c 17 Apr 2009 21:49:06 -0000 1.33
@@ -105,13 +105,25 @@
struct iso_13616_iban iso_13616_ibans [] = {
{ "XX", "XXkk XXXX XXXX XXXX XXXX XXXX XXXX XXXX XX", 34 },
+ { "AD", "ADkk BBBB SSSS CCCC CCCC CCCC", 24 },
{ "AT", "ATkk BBBB BCCC CCCC CCCC", 20 },
+ { "BA", "BAkk BBBS SSCC CCCC CCKK", 20 },
{ "BE", "BEkk BBBC CCCC CCKK", 16 },
+ { "BG", "BGkk BBBB SSSS DDCC CCCC CC", 22 },
{ "CH", "CHkk BBBB BCCC CCCC CCCC C", 21 },
+ { "CY", "CYkk BBBS SSSS CCCC CCCC CCCC CCCC", 28 },
+ { "CZ", "CZkk BBBB CCCC CCCC CCCC CCCC", 24 },
{ "DE", "DEkk BBBB BBBB CCCC CCCC CC", 22 },
+ { "DK", "DKkk BBBB CCCC CCCC CC", 18 },
+ { "EE", "EEkk BBBB CCCC CCCC CCCK", 20 },
{ "ES", "ESkk BBBB GGGG KKCC CCCC CCCC", 24 },
+ { "FI", "FIkk BBBB BBCC CCCC CK", 18 },
+ { "FO", "FOkk CCCC CCCC CCCC CC", 18 },
{ "FR", "FRkk BBBB BGGG GGCC CCCC CCCC CKK", 27 },
{ "GB", "GBkk BBBB SSSS SSCC CCCC CC", 22 },
+ { "GI", "GIkk BBBB CCCC CCCC CCCC CCC", 23 },
+ { "GR", "GRkk BBB BBBB CCCC CCCC CCCC CCCC", 27 },
+ { "HR", "HRkk BBBB BBBC CCCC CCCC C", 21 },
{ "IE", "IEkk AAAA BBBB BBCC CCCC CC", 22 },
{ "LU", "LUkk BBBC CCCC CCCC CCCC", 20 },
{ "NL", "NLkk BBBB CCCC CCCC CC", 18 },
Index: gsb_bank.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_bank.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- gsb_bank.c 7 Apr 2009 21:07:40 -0000 1.18
+++ gsb_bank.c 17 Apr 2009 21:49:06 -0000 1.19
@@ -62,7 +62,7 @@
static gboolean gsb_bank_list_changed ( GtkWidget *combobox,
gpointer null );
static gboolean gsb_bank_list_check_separator ( GtkTreeModel *model,
- GtkTreeIter *iter,
+ GtkTreeIter *iter,
gpointer null );
static gboolean gsb_bank_update_form ( gint bank_number,
GtkWidget *frame );
- Previous message: [grisbi-cvs] grisbi NEWS,1.38,1.39
- Next message: [grisbi-cvs] grisbi/po cs.po, 1.29, 1.30 da.po, 1.36, 1.37 de.po, 1.80, 1.81 es.po, 1.73, 1.74 fa.po, 1.23, 1.24 fr.po, 1.152, 1.153 grisbi.pot, 1.71, 1.72 he.po, 1.29, 1.30 it.po, 1.29, 1.30 nl.po, 1.28, 1.29 pl.po, 1.34, 1.35 pt_BR.po, 1.31, 1.32 ro.po, 1.29, 1.30 ru.po, 1.28, 1.29 zh_CN.po, 1.23, 1.24
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the cvs
mailing list