[grisbi-cvs] grisbi/src Makefile.am, 1.163, 1.164 balance_estimate_hist.c, 1.6, 1.7 balance_estimate_tab.c, 1.43, 1.44 gsb_data_category.c, 1.72, 1.73 gsb_form.c, 1.149, 1.150 navigation.c, 1.135, 1.136

Pierre Biava pbiava at users.sourceforge.net
Tue Feb 23 22:36:47 CET 2010


Update of /cvsroot/grisbi/grisbi/src
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv14622/src

Modified Files:
	Makefile.am balance_estimate_hist.c balance_estimate_tab.c 
	gsb_data_category.c gsb_form.c navigation.c 
Log Message:
fixed bug 968 and modification files configure.in and makefiles

Index: gsb_form.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_form.c,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -d -r1.149 -r1.150
--- gsb_form.c	13 Feb 2010 17:44:59 -0000	1.149
+++ gsb_form.c	23 Feb 2010 21:36:45 -0000	1.150
@@ -2380,7 +2380,7 @@
             transaction_number = gsb_data_mix_new_transaction (account_number, is_transaction);
             if ( source_transaction_number == -1 )
                 source_transaction_number = transaction_number;
-            printf ("transaction_number = %d\n", transaction_number);
+
             gsb_data_mix_set_mother_transaction_number ( transaction_number,
                                  mother_transaction,
                                  is_transaction );

Index: navigation.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/navigation.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- navigation.c	20 Feb 2010 08:54:00 -0000	1.135
+++ navigation.c	23 Feb 2010 21:36:45 -0000	1.136
@@ -123,7 +123,7 @@
 /* contains the number of the last account
  * when switching between 2 accounts
  * at the end of the switch, contains the current account number */
-static gint buffer_last_account;
+static gint buffer_last_account = -1;
 
 
 /**

Index: gsb_data_category.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_category.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- gsb_data_category.c	14 Feb 2010 17:48:50 -0000	1.72
+++ gsb_data_category.c	23 Feb 2010 21:36:45 -0000	1.73
@@ -650,43 +650,45 @@
 {
     gchar **tab_char;
     gint category_number = 0;
-    
+
     if (!string
 	||
 	!strlen (string))
     {
-	/* no string so set no category */
-	gsb_data_mix_set_category_number ( transaction_number,
-					   0,
-					   is_transaction );
-	gsb_data_mix_set_sub_category_number ( transaction_number,
-					       0,
-					       is_transaction );
-	return TRUE;
+        /* no string so set no category */
+        gsb_data_mix_set_category_number ( transaction_number,
+                            0,
+                            is_transaction );
+        gsb_data_mix_set_sub_category_number ( transaction_number,
+                            0,
+                            is_transaction );
+	    return TRUE;
     }
 
-    tab_char = g_strsplit ( string,
-			    " : ",
-			    2 );
+    tab_char = g_strsplit ( string, " : ", 2 );
     if (tab_char[0])
     {
-	category_number = gsb_data_category_get_number_by_name ( tab_char[0],
-                        TRUE,
-                        gsb_data_mix_get_amount (transaction_number, is_transaction).mantissa <0 );
-	gsb_data_mix_set_category_number ( transaction_number,
-					   category_number,
-					   is_transaction );
+        category_number = gsb_data_category_get_number_by_name ( tab_char[0],
+                            TRUE,
+                            gsb_data_mix_get_amount (
+                            transaction_number, is_transaction).mantissa <0 );
+	    gsb_data_mix_set_category_number ( transaction_number,
+                            category_number,
+                            is_transaction );
     }
 
-    if (tab_char[1]
-	&&
-	category_number)
-	gsb_data_mix_set_sub_category_number ( transaction_number,
-					       gsb_data_category_get_sub_category_number_by_name ( category_number,
-												   tab_char[1],
-												   TRUE ),
-					       is_transaction );
+    if ( tab_char[1] && category_number )
+    {
+        gsb_data_mix_set_sub_category_number ( transaction_number,
+					        gsb_data_category_get_sub_category_number_by_name (
+                            category_number, tab_char[1], TRUE ),
+					        is_transaction );
+    }
+    else
+        gsb_data_mix_set_sub_category_number ( transaction_number, 0, is_transaction );
+
     g_strfreev (tab_char);
+
     return TRUE;
 }
 

Index: Makefile.am
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/Makefile.am,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -d -r1.163 -r1.164
--- Makefile.am	14 Feb 2010 17:48:49 -0000	1.163
+++ Makefile.am	23 Feb 2010 21:36:45 -0000	1.164
@@ -1,7 +1,7 @@
 # Process this file with automake to produce Makefile.in
 
 localedir = $(datadir)/locale
-INCLUDES = -I$(top_srcdir) -I$(includedir) -I../intl -DLOCALEDIR=\"$(localedir)\" -DPIXMAPS_DIR="\"$(datadir)/pixmaps/@PACKAGE@\"" -DPLUGINS_DIR="\"$(prefix)/lib/@PACKAGE@\"" -DLOGO_PATH="\"$(datadir)/pixmaps/@PACKAGE@/grisbi-logo.png\"" -DDATA_PATH="\"$(datadir)/@PACKAGE@\"" -DHELP_PATH="\"$(datadir)/doc/@PACKAGE@\"" -Wall
+AM_CPPFLAGS = -I$(top_srcdir) -I$(includedir) -I../intl -DLOCALEDIR=\"$(localedir)\" -DPIXMAPS_DIR="\"$(datadir)/pixmaps/@PACKAGE@\"" -DPLUGINS_DIR="\"$(prefix)/lib/@PACKAGE@\"" -DLOGO_PATH="\"$(datadir)/pixmaps/@PACKAGE@/grisbi-logo.png\"" -DDATA_PATH="\"$(datadir)/@PACKAGE@\"" -DHELP_PATH="\"$(datadir)/doc/@PACKAGE@\"" -Wall
 bin_PROGRAMS = grisbi
 
 # TODO: This manual setting of -Wl is a hack, I cannot get it from
@@ -305,13 +305,13 @@
 	gsb_real_cunit.h	\
 	utils_dates_cunit.h
 
+grisbi_SOURCES = $(sources) $(sources_config) $(grisbi_INCLUDES)
+
 if HAVE_CUNIT
-grisbi_SOURCES = $(sources) $(sources_config) $(cunit_sources)
-else#HAVE_CUNIT
-grisbi_SOURCES = $(sources) $(sources_config) 
-endif#HAVE_CUNIT
+grisbi_SOURCES += $(cunit_sources)
+endif
 
-EXTRA_DIST = grisbi.desktop grisbi.keys grisbi.mime $(grisbi_INCLUDES) $(cunit_sources) $(cunit_includes)
+EXTRA_DIST = grisbi.desktop grisbi.keys grisbi.mime
 
 mimedir = $(datadir)/mime-info
 mime_DATA = grisbi.keys grisbi.mime

Index: balance_estimate_tab.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/balance_estimate_tab.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- balance_estimate_tab.c	20 Feb 2010 22:19:46 -0000	1.43
+++ balance_estimate_tab.c	23 Feb 2010 21:36:45 -0000	1.44
@@ -56,6 +56,7 @@
 #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"
@@ -193,12 +194,15 @@
     GtkTreeModel *tree_model;
 
     //~ devel_debug (NULL);
-    /* find the selected account */
+     /* fill the account list */
     tree_view = g_object_get_data ( G_OBJECT ( bet_container ), "bet_account_treeview" );
     tree_model = gtk_tree_view_get_model ( GTK_TREE_VIEW ( tree_view ) );
 
-    /* fill the account list */
-    bet_parameter_update_list_accounts ( tree_view, GTK_TREE_MODEL ( tree_model ) );
+    if ( etat.modification_fichier == 1 )
+        bet_array_refresh_estimate_tab ( );
+    else
+        bet_parameter_update_list_accounts ( tree_view, GTK_TREE_MODEL ( tree_model ) );
+
 }
 
 
@@ -367,7 +371,7 @@
     SBR *tmp_range;
     GValue date_value = {0, };
 
-    devel_debug (NULL);
+    //~ devel_debug (NULL);
     tmp_range = initialise_struct_bet_range ( );
 
     /* find the selected account */
@@ -960,8 +964,13 @@
     GtkTreeSelection *tree_selection;
     GtkTreeIter iter;
     GSList *tmp_list;
+    gint last_account;
 
     //~ devel_debug (NULL);
+    last_account = gsb_gui_navigation_get_last_account ( );
+    if ( last_account == -1 )
+        last_account = etat.bet_last_account;
+
     tree_selection = gtk_tree_view_get_selection ( GTK_TREE_VIEW ( tree_view ) );
     gtk_tree_store_clear ( GTK_TREE_STORE ( tree_model ) );
 
@@ -985,7 +994,7 @@
                         SPP_ACCOUNT_TREE_NUM_COLUMN, account_nb,
                         SPP_ACCOUNT_TREE_NAME_COLUMN, account_name,
                         -1);
-        if ( etat.bet_last_account == account_nb )
+        if ( last_account == account_nb )
             gtk_tree_selection_select_iter ( GTK_TREE_SELECTION ( tree_selection ),
                         &iter );
 

Index: balance_estimate_hist.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/balance_estimate_hist.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- balance_estimate_hist.c	22 Feb 2010 20:11:29 -0000	1.6
+++ balance_estimate_hist.c	23 Feb 2010 21:36:45 -0000	1.7
@@ -81,6 +81,10 @@
 static void bet_historical_populate_div_model ( gpointer key,
                         gpointer value,
                         gpointer user_data);
+static void bet_historical_row_expanded ( GtkTreeView *tree_view,
+                        GtkTreeIter *iter,
+                        GtkTreePath *path,
+                        GtkTreeModel *model );
 /*END_STATIC*/
 
 /*START_EXTERN*/
@@ -685,6 +689,11 @@
     gtk_tree_view_column_set_clickable ( GTK_TREE_VIEW_COLUMN ( column ), TRUE );
     gtk_tree_view_column_set_expand ( GTK_TREE_VIEW_COLUMN ( column ), TRUE );
 
+    g_signal_connect ( G_OBJECT ( tree_view ),
+                        "row-expanded",
+                        G_CALLBACK ( bet_historical_row_expanded ),
+                        tree_model );
+
     gtk_widget_show_all ( scrolled_window );
 
     return tree_view;
@@ -942,7 +951,7 @@
                 if ( str_amount )
                     g_free ( str_amount );
                 str_amount = gsb_real_get_string ( average );
-                printf ("str_amount = %s\n", str_amount );
+                //~ printf ("str_amount = %s\n", str_amount );
                 if ( str_average )
                     g_free ( str_average );
                 str_average = gsb_real_get_string_with_currency ( average,
@@ -1174,6 +1183,23 @@
  *
  *
  * */
+void bet_historical_row_expanded ( GtkTreeView *tree_view,
+                        GtkTreeIter *iter,
+                        GtkTreePath *path,
+                        GtkTreeModel *model )
+{
+    gboolean valeur;
+
+    gtk_tree_model_get ( GTK_TREE_MODEL ( model ), iter,
+                        SPP_HISTORICAL_SELECT_COLUMN, &valeur,
+                        -1 );
+
+    if ( valeur == 1 )
+    {
+        gtk_tree_view_collapse_row ( tree_view, path );
+        gtk_tree_selection_select_iter ( gtk_tree_view_get_selection ( tree_view ), iter );
+    }
+}
 /* Local Variables: */
 /* c-basic-offset: 4 */
 /* End: */



More information about the cvs mailing list