[grisbi-cvs] grisbi/src barre_outils.c, 1.118, 1.119 gsb_real.c, 1.28, 1.29 traitement_variables.c, 1.161, 1.162

[Pierre Biava]

Update of /cvsroot/grisbi/grisbi/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2894/src

Modified Files:
	barre_outils.c gsb_real.c traitement_variables.c 
Log Message:
modification de gsb_real.c pour affichage correct du 0 et diverses corrections du fichier fr.po

Index: traitement_variables.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/traitement_variables.c,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -d -r1.161 -r1.162
--- traitement_variables.c	27 Oct 2008 23:40:59 -0000	1.161
+++ traitement_variables.c	23 Nov 2008 13:16:41 -0000	1.162
@@ -124,9 +124,6 @@
 GdkColor couleur_bleue;
 GdkColor couleur_jaune;
 
-/* ajouté pour la gestion des boutons afficher/masquer les opérations rapprochées */
-GtkIconFactory *gsb_factory;
-
 GSList *liste_labels_titres_colonnes_liste_ope = NULL;
 
 gchar *nom_fichier_comptes = NULL;

Index: gsb_real.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_real.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- gsb_real.c	24 Oct 2008 20:33:53 -0000	1.28
+++ gsb_real.c	23 Nov 2008 13:16:41 -0000	1.29
@@ -127,6 +127,17 @@
      * locale is much more complicated */
     if (currency_number && show_symbol)
 	currency_symbol = gsb_data_currency_get_code (currency_number);
+    
+    /* First of all if number = 0 I return 0 with the symbol of the currency if necessary */
+    if (number.mantissa == 0)
+    {
+        if (currency_symbol && conv -> p_cs_precedes)
+            return g_strdup_printf ( "%s %s", currency_symbol, "0" );
+        else if (currency_symbol && ! conv -> p_cs_precedes)
+            return g_strdup_printf ( "%s %s", "0", currency_symbol );
+        else
+            return g_strdup ("0");
+    }
 
     /* first we need to adapt the exponent to the currency */
     if (currency_number

Index: barre_outils.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/barre_outils.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -d -r1.118 -r1.119
--- barre_outils.c	16 Nov 2008 21:33:10 -0000	1.118
+++ barre_outils.c	23 Nov 2008 13:16:41 -0000	1.119
@@ -227,8 +227,8 @@
 
     gtk_menu_append ( GTK_MENU ( menu ), gtk_separator_menu_item_new ( ) );
 
-    menu_item = gtk_check_menu_item_new_with_label ( _("Display reconciled transactions") );
-    gtk_check_menu_item_set_active ( menu_item,
+    menu_item = gtk_check_menu_item_new_with_label ( _("Display reconciled transactions (Alt+R)") );
+    gtk_check_menu_item_set_active ( GTK_CHECK_MENU_ITEM (menu_item),
 				     gsb_data_account_get_r ( gsb_gui_navigation_get_current_account () ) );
     gtk_menu_append ( GTK_MENU ( menu ), menu_item );
     g_signal_connect_swapped ( G_OBJECT(menu_item), "activate",