[grisbi-cvs] grisbi/src gsb_file_config.c, 1.63, 1.64 gsb_file_config.h, 1.7, 1.8 gsb_reconcile_config.c, 1.23, 1.24 gsb_select_icon.c, 1.6, 1.7 main.c, 1.135, 1.136
Pierre Biava
pbiava at users.sourceforge.net
Sun Jan 18 19:20:05 CET 2009
- Previous message: [grisbi-cvs] grisbi/po fr.po,1.118,1.119
- Next message: [grisbi-cvs] grisbi/po cs.po, 1.13, 1.14 da.po, 1.20, 1.21 de.po, 1.52, 1.53 es.po, 1.52, 1.53 fa.po, 1.7, 1.8 fr.po, 1.119, 1.120 he.po, 1.13, 1.14 it.po, 1.13, 1.14 nl.po, 1.12, 1.13 pl.po, 1.18, 1.19 pt_BR.po, 1.15, 1.16 ro.po, 1.13, 1.14 ru.po, 1.12, 1.13 zh_CN.po, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/grisbi/grisbi/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25511/src
Modified Files:
gsb_file_config.c gsb_file_config.h gsb_reconcile_config.c
gsb_select_icon.c main.c
Log Message:
reprise de la gestion du fichier de configuration. update strings fr.po
Index: gsb_file_config.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_file_config.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- gsb_file_config.h 17 Jan 2009 07:23:53 -0000 1.7
+++ gsb_file_config.h 18 Jan 2009 18:20:03 -0000 1.8
@@ -19,7 +19,6 @@
/* START_DECLARATION */
-gboolean gsb_file_config_create_config_rep ( void );
gboolean gsb_file_config_load_config ( void );
gboolean gsb_file_config_save_config ( void );
/* END_DECLARATION */
Index: main.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/main.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- main.c 17 Jan 2009 07:23:53 -0000 1.135
+++ main.c 18 Jan 2009 18:20:03 -0000 1.136
@@ -174,10 +174,7 @@
/* on crée ici le nouveau répertoire de conf */
if ( ! gsb_file_config_load_config () )
- {
- gsb_file_config_create_config_rep ( );
first_use = TRUE;
- }
/* create the toplevel window */
window = gtk_window_new ( GTK_WINDOW_TOPLEVEL );
Index: gsb_select_icon.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_select_icon.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gsb_select_icon.c 17 Jan 2009 07:23:53 -0000 1.6
+++ gsb_select_icon.c 18 Jan 2009 18:20:03 -0000 1.7
@@ -259,7 +259,6 @@
GdkPixbuf *pixbuf;
GSList *liste = NULL;
gint i = 0;
-
const gchar *name = NULL;
while ( (name = g_dir_read_name ( dir ) ) )
@@ -518,7 +517,7 @@
/**
- * Convertit un pixbuf en chaine codéé en base 64
+ * Convertit un pixbuf en chaine codée en base 64
*
* \param pixbuf
*
Index: gsb_file_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_file_config.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- gsb_file_config.c 17 Jan 2009 10:58:29 -0000 1.63
+++ gsb_file_config.c 18 Jan 2009 18:20:03 -0000 1.64
@@ -46,13 +46,16 @@
/*END_INCLUDE*/
/*START_STATIC*/
+static gchar *gsb_config_get_old_conf_name ( void );
static void gsb_file_config_clean_config ( void );
+static gboolean gsb_file_config_create_config_rep ( void );
static void gsb_file_config_get_xml_text_element ( GMarkupParseContext *context,
const gchar *text,
gsize text_len,
gpointer user_data,
GError **error);
static gboolean gsb_file_config_load_last_xml_config ( gchar *filename );
+static void gsb_file_config_remove_old_config_file ( gchar *filename );
/*END_STATIC*/
@@ -107,9 +110,19 @@
if (!result)
{
/* On recherche le fichier dans HOME */
+ #ifndef _WIN32
+ /* On recherche les fichiers possibles seulement sous linux */
+ g_free ( filename );
+ filename = gsb_config_get_old_conf_name ( );
+ devel_debug (filename);
+ if ( ! filename || strlen ( filename ) == 0 )
+ return FALSE;
+ #else
filename = g_strconcat ( my_get_grisbirc_dir(), C_OLD_GRISBIRC, NULL );
+ #endif
+
config = g_key_file_new ();
-
+
result = g_key_file_load_from_file ( config,
filename,
G_KEY_FILE_KEEP_COMMENTS,
@@ -117,21 +130,14 @@
/* si on ne le trouve pas on recherche le fichier au format xml */
if (!result)
{
- result = gsb_file_config_load_last_xml_config (filename);
- g_free (filename);
- g_key_file_free (config);
+ result = gsb_file_config_load_last_xml_config ( filename );
if ( result )
- {
- gsb_file_config_create_config_rep ( );
- g_remove ( filename );
- }
+ gsb_file_config_remove_old_config_file ( filename );
+ g_free (filename);
return result;
}
else
- {
- gsb_file_config_create_config_rep ( );
- g_remove ( filename );
- }
+ g_unlink ( filename );
}
/* get the geometry */
@@ -710,6 +716,12 @@
conf_file = fopen ( filename,
"w" );
+ if ( !conf_file )
+ {
+ gsb_file_config_create_config_rep ( );
+ conf_file = fopen ( filename, "w" );
+ }
+
if ( !conf_file
||
!fwrite ( file_content,
@@ -1245,6 +1257,171 @@
else
return FALSE;
}
+
+static void gsb_file_config_remove_old_config_file ( gchar *filename )
+{
+ GtkWidget *dialog;
+ GtkWidget *content_area;
+ GtkWidget *hbox;
+ GtkWidget *image;
+ GtkWidget *label;
+ gint resultat;
+
+ dialog = gtk_dialog_new_with_buttons ( _("Delete an old config file"),
+ GTK_WINDOW ( window ),
+ GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_STOCK_NO, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_YES, GTK_RESPONSE_OK,
+ NULL );
+
+ gtk_window_set_position ( GTK_WINDOW ( dialog ), GTK_WIN_POS_CENTER_ON_PARENT );
+ gtk_window_set_resizable ( GTK_WINDOW ( dialog ), FALSE );
+
+ content_area = GTK_DIALOG(dialog) -> vbox;
+ hbox = gtk_hbox_new ( FALSE, 5);
+ gtk_container_set_border_width ( GTK_CONTAINER( hbox ), 6 );
+ gtk_box_pack_start ( GTK_BOX ( content_area ), hbox, FALSE, FALSE, 5 );
+
+ image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING,
+ GTK_ICON_SIZE_DIALOG );
+ gtk_box_pack_start ( GTK_BOX ( hbox ), image, FALSE, FALSE, 5 );
+
+ gchar *tmpstr = g_strconcat (
+ _("Careful, you are about to deleting the file\n"
+ "of configuration of an old version of Grisbi.\n"
+ "\n<b>Do you want to continue ?</b>"),
+ NULL );
+
+ label = gtk_label_new ( tmpstr );
+ gtk_label_set_use_markup ( GTK_LABEL( label ), TRUE );
+ gtk_box_pack_start ( GTK_BOX ( hbox ), label, FALSE, FALSE, 5 );
+ g_free ( tmpstr );
+
+ gtk_widget_show_all ( dialog );
+
+ resultat = gtk_dialog_run ( GTK_DIALOG ( dialog ));
+
+ if ( resultat == GTK_RESPONSE_OK )
+ g_unlink ( filename );
+ if ( GTK_IS_DIALOG ( dialog ) )
+ gtk_widget_destroy ( GTK_WIDGET ( dialog ) );
+}
+
+
+gchar *gsb_config_get_old_conf_name ( void )
+{
+ GtkWidget *dialog;
+ GtkWidget *hbox;
+ GtkWidget *image;
+ GtkWidget *label;
+ GtkWidget *combo;
+ GtkWidget *content_area;
+ GDir *dir;
+ gchar *filename = NULL;
+ GSList *liste = NULL;
+ GtkListStore *store;
+ GtkTreeIter iter;
+ GtkCellRenderer *renderer;
+ GError *error = NULL;
+ gint resultat;
+ gint i = 0, j = 0;
+
+ dir = g_dir_open ( my_get_grisbirc_dir ( ), 0, &error );
+ if ( dir )
+ {
+ const gchar *name = NULL;
+
+ while ( (name = g_dir_read_name ( dir ) ) )
+ {
+ if ( g_strstr_len ( name, -1, ".grisbi" ) &&
+ g_str_has_suffix ( name, "rc" ) )
+ liste = g_slist_append ( liste, g_strdup ( name ) );
+ }
+ }
+ else
+ dialogue_error ( error -> message );
+ if ( g_slist_length ( liste ) == 1 )
+ return g_strconcat ( my_get_grisbirc_dir ( ),
+ G_DIR_SEPARATOR_S,
+ g_slist_nth_data ( liste, 0 ),
+ NULL );
+
+ dialog = gtk_dialog_new_with_buttons ( _("Choose a file"),
+ GTK_WINDOW ( window ),
+ GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OK, GTK_RESPONSE_OK,
+ NULL );
+
+ gtk_window_set_position ( GTK_WINDOW ( dialog ), GTK_WIN_POS_CENTER_ON_PARENT );
+ gtk_window_set_resizable ( GTK_WINDOW ( dialog ), FALSE );
+ gtk_window_set_position ( GTK_WINDOW ( dialog ),
+ GTK_WIN_POS_CENTER_ON_PARENT );
+
+ content_area = GTK_DIALOG(dialog) -> vbox;
+
+ hbox = gtk_hbox_new ( FALSE, 5);
+ gtk_container_set_border_width ( GTK_CONTAINER( hbox ), 6 );
+ gtk_box_pack_start ( GTK_BOX ( content_area ), hbox, FALSE, FALSE, 5 );
+
+ image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_INFO,
+ GTK_ICON_SIZE_DIALOG );
+ gtk_box_pack_start ( GTK_BOX ( hbox ), image, FALSE, FALSE, 5 );
+
+ gchar *tmpstr = g_strconcat (
+ _("Please Choose the name of file\n"
+ "of configuration.\n\n"
+ "and press the 'OK' button."),
+ NULL );
+
+ label = gtk_label_new ( tmpstr );
+ gtk_label_set_use_markup ( GTK_LABEL( label ), TRUE );
+ gtk_box_pack_start ( GTK_BOX ( hbox ), label, FALSE, FALSE, 5 );
+ g_free ( tmpstr );
+
+ store = gtk_list_store_new ( 2, G_TYPE_STRING, G_TYPE_INT );
+ while ( liste )
+ {
+ gtk_list_store_append ( store, &iter );
+ gtk_list_store_set (store, &iter,
+ 0, (gchar *) liste -> data,
+ -1);
+ if ( g_strcmp0 ( (gchar *) liste -> data,
+ ( C_OLD_GRISBIRC + 1 ) ) == 0 )
+ j = i;
+ liste = liste -> next;
+ i++;
+ }
+
+ combo = gtk_combo_box_new_with_model ( GTK_TREE_MODEL ( store ) );
+ renderer = gtk_cell_renderer_text_new ();
+ gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE);
+ gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), renderer,
+ "text", 0,
+ NULL);
+ gtk_combo_box_set_active ( GTK_COMBO_BOX ( combo ), j );
+ gtk_box_pack_start ( GTK_BOX ( content_area ), combo, FALSE, FALSE, 5 );
+
+ gtk_widget_show_all ( dialog );
+
+ resultat = gtk_dialog_run ( GTK_DIALOG ( dialog ));
+ if ( resultat == GTK_RESPONSE_OK )
+ {
+ gtk_combo_box_get_active_iter ( GTK_COMBO_BOX ( combo ), &iter );
+ gtk_tree_model_get ( GTK_TREE_MODEL ( store ),
+ &iter,
+ 0, &filename,
+ -1 );
+ filename = g_strconcat ( my_get_grisbirc_dir ( ),
+ G_DIR_SEPARATOR_S,
+ filename,
+ NULL );
+ }
+ if ( GTK_IS_DIALOG ( dialog ) )
+ gtk_widget_destroy ( GTK_WIDGET ( dialog ) );
+
+ return filename;
+}
/* Local Variables: */
/* c-basic-offset: 4 */
/* End: */
Index: gsb_reconcile_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_reconcile_config.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- gsb_reconcile_config.c 25 Dec 2008 23:14:58 -0000 1.23
+++ gsb_reconcile_config.c 18 Jan 2009 18:20:03 -0000 1.24
@@ -507,7 +507,7 @@
{
/* we are on a reconcile,
* we ask if the user want to continue and warn him */
- gchar* tmpstr = g_strdup_printf (_("Carreful, you are about to deleting a reconcile.\nIf you continue, the reconcile %s will be erased and all the transactions marked by this reconcile will be un-reconciled and marked P.\nAre you sure you want to continue ?"),
+ gchar* tmpstr = g_strdup_printf (_("Careful, you are about to deleting a reconcile.\nIf you continue, the reconcile %s will be erased and all the transactions marked by this reconcile will be un-reconciled and marked P.\nAre you sure you want to continue ?"),
gsb_data_reconcile_get_name (reconcile_number));
if (!question_yes_no_hint ( _("Deleting a reconcile"),
tmpstr,
- Previous message: [grisbi-cvs] grisbi/po fr.po,1.118,1.119
- Next message: [grisbi-cvs] grisbi/po cs.po, 1.13, 1.14 da.po, 1.20, 1.21 de.po, 1.52, 1.53 es.po, 1.52, 1.53 fa.po, 1.7, 1.8 fr.po, 1.119, 1.120 he.po, 1.13, 1.14 it.po, 1.13, 1.14 nl.po, 1.12, 1.13 pl.po, 1.18, 1.19 pt_BR.po, 1.15, 1.16 ro.po, 1.13, 1.14 ru.po, 1.12, 1.13 zh_CN.po, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the cvs
mailing list