[grisbi-cvs] grisbi/src accueil.c, 1.220, 1.221 balance_estimate_data.c, 1.2, 1.3 gsb_automem.c, 1.26, 1.27 gsb_automem.h, 1.5, 1.6 gtk_combofix.c, 1.70, 1.71 structures.h, 1.238, 1.239
Pierre Biava
pbiava at users.sourceforge.net
Sat Feb 6 09:49:49 CET 2010
Update of /cvsroot/grisbi/grisbi/src
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13490/src
Modified Files:
accueil.c balance_estimate_data.c gsb_automem.c gsb_automem.h
gtk_combofix.c structures.h
Log Message:
Added select of plural for final in french and minor corrections
Index: structures.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/structures.h,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -d -r1.238 -r1.239
--- structures.h 28 Jan 2010 20:25:12 -0000 1.238
+++ structures.h 6 Feb 2010 08:49:46 -0000 1.239
@@ -160,7 +160,10 @@
/* general part */
gint r_modifiable; /* Changes in reconciled transactions */
- /* variables pour la liste des opérations */
+ /* pluriel pour final */
+ gint pluriel_final; /* 0 = finals 1 = finaux */
+
+ /* variables for the list of transactions */
gint show_transaction_selected_in_form; /* TRUE will show the selected transaction in the form */
gint show_transaction_gives_balance; /* TRUE si on visualise l'opération qui donne le solde du jour */
gboolean transactions_list_sort_by_date; /* Options for sorting by date */
Index: gtk_combofix.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gtk_combofix.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- gtk_combofix.c 4 Feb 2010 20:59:38 -0000 1.70
+++ gtk_combofix.c 6 Feb 2010 08:49:46 -0000 1.71
@@ -241,9 +241,7 @@
else
{
gsb_form_widget_set_empty ( GTK_WIDGET ( combofix -> entry ), TRUE );
- gtk_entry_set_text ( GTK_ENTRY ( combofix -> entry ),
- _("Categories : Sub-categories") );
- gtk_editable_select_region ( GTK_EDITABLE (combofix -> entry), 0, -1 );
+ gtk_entry_set_text ( GTK_ENTRY ( combofix -> entry ), "" );
}
g_signal_handlers_unblock_by_func ( G_OBJECT (combofix -> entry),
G_CALLBACK (gtk_combofix_entry_insert),
@@ -1175,14 +1173,13 @@
gtk_combofix_hide_popup (combofix);
/* check the entry if force is set */
- if ( combofix -> force )
- gtk_combofix_set_text ( combofix,
- gtk_combofix_update_visible_rows ( combofix,
- gtk_entry_get_text (GTK_ENTRY (entry))));
+ if ( gsb_form_widget_check_empty ( entry ) == 0 && combofix -> force )
+ gtk_combofix_set_text ( combofix,
+ gtk_combofix_update_visible_rows ( combofix,
+ gtk_entry_get_text ( GTK_ENTRY ( entry ) ) ) );
/* hide the selection */
- gtk_editable_select_region ( GTK_EDITABLE (entry),
- 0,
- 0 );
+ gtk_editable_select_region ( GTK_EDITABLE (entry), 0, 0 );
+
return ( FALSE );
}
Index: gsb_automem.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_automem.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- gsb_automem.c 10 May 2009 13:06:56 -0000 1.26
+++ gsb_automem.c 6 Feb 2010 08:49:46 -0000 1.27
@@ -49,11 +49,6 @@
gpointer null );
static gboolean gsb_automem_entry_changed (GtkWidget *entry,
gpointer null );
-static GtkWidget *gsb_automem_radiobutton_new ( const gchar *choice1,
- const gchar *choice2,
- gboolean *value,
- GCallback hook,
- gpointer data );
static gboolean gsb_automem_spin_button_changed ( GtkWidget *spin,
gpointer null);
static GtkWidget *gsb_automem_spin_button_new_full ( gint *value,
Index: accueil.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/accueil.c,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -d -r1.220 -r1.221
--- accueil.c 4 Feb 2010 20:04:51 -0000 1.220
+++ accueil.c 6 Feb 2010 08:49:46 -0000 1.221
@@ -24,6 +24,7 @@
/*START_INCLUDE*/
#include "accueil.h"
+#include "./gsb_automem.h"
#include "./classement_echeances.h"
#include "./dialog.h"
#include "./gsb_data_account.h"
@@ -1083,9 +1084,11 @@
/* Première colonne */
if ( nb_comptes == 1 )
- label = gtk_label_new ( COLON(_("Global balance")));
+ label = gtk_label_new ( COLON ( _("Global balance") ) );
+ else if ( conf.pluriel_final )
+ label = gtk_label_new ( COLON ("Soldes finaux") );
else
- label = gtk_label_new ( COLON(_("Global balances")));
+ label = gtk_label_new ( COLON ( _("Global balances") ) );
gtk_misc_set_alignment ( GTK_MISC ( label ), MISC_LEFT, MISC_VERT_CENTER );
gtk_size_group_add_widget ( GTK_SIZE_GROUP ( size_group_accueil ), label );
gtk_table_attach_defaults ( GTK_TABLE ( table ), label, 0, 1, i, i+1 );
@@ -1945,6 +1948,18 @@
gtk_box_pack_start ( GTK_BOX ( vbox_pref ), vbox, TRUE, TRUE, 0 );
gtk_container_set_border_width ( GTK_CONTAINER ( vbox ), 12 );
+ /* pour les francophones ;-) */
+ if ( g_strstr_len ( ( g_ascii_strup ( gdk_set_locale ( ), -1 ) ), -1, "FR" ) )
+ {
+ paddingbox = new_paddingbox_with_title (vbox, FALSE, "Pluriel de final" );
+
+ gtk_box_pack_start ( GTK_BOX ( paddingbox ),
+ gsb_automem_radiobutton_new ( "Soldes finals",
+ "Soldes finaux",
+ &conf.pluriel_final,
+ G_CALLBACK (gsb_gui_navigation_update_home_page), NULL ),
+ FALSE, FALSE, 0 );
+ }
/* Data partial balance settings */
paddingbox = new_paddingbox_with_title (vbox, FALSE,
_("Balances partials of the list of accounts") );
Index: gsb_automem.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_automem.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- gsb_automem.h 30 Apr 2008 15:29:27 -0000 1.5
+++ gsb_automem.h 6 Feb 2010 08:49:46 -0000 1.6
@@ -17,6 +17,11 @@
GtkWidget *gsb_automem_imagefile_button_new ( GsbButtonStyle style,
const gchar * name, const gchar * filename,
GCallback callback, gpointer data );
+GtkWidget *gsb_automem_radiobutton_new ( const gchar *choice1,
+ 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,
Index: balance_estimate_data.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/balance_estimate_data.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- balance_estimate_data.c 31 Jan 2010 20:47:24 -0000 1.2
+++ balance_estimate_data.c 6 Feb 2010 08:49:46 -0000 1.3
@@ -65,6 +65,9 @@
gint (*ptr_sub_div) ( gint transaction_num );
gchar* (*ptr_div_name) ( gint div_num, gint sub_div, const gchar *return_value_error );
+/* liste des div et sub_div cochées dans la vue des divisions */
+static GSList *list_div_hist;
+
/**
*
More information about the cvs
mailing list