[Graveman-cvs] Changes to graveman/current/src/config.c

[sylvain cresto]

Index: graveman/current/src/config.c
diff -u graveman/current/src/config.c:1.10 graveman/current/src/config.c:1.11
--- graveman/current/src/config.c:1.10  Tue Feb  8 02:32:57 2005
+++ graveman/current/src/config.c       Wed Feb  9 00:27:30 2005
@@ -78,6 +78,14 @@
   { CONF_STRING, "datanotfix", "", CONF_SAVEONEXIT + CONF_CHECK },
   { CONF_STRING, "datasimul", "", CONF_SAVEONEXIT + CONF_CHECK },
 
+  /* onglet dvd data */
+  { CONF_STRING, "dstdvddatacombo", "", CONF_SAVEONEXIT + CONF_COMBO },
+  { CONF_STRING, "dstdvddataspeed", "", CONF_SAVEONEXIT + CONF_COMBO },
+  { CONF_STRING, "nbrdvddata", "1", CONF_SAVEONEXIT + CONF_SPIN },
+  { CONF_STRING, "dvddatanotfix", "1", CONF_SAVEONEXIT + CONF_CHECK },
+  { CONF_STRING, "dvddatasimul", "1", CONF_SAVEONEXIT + CONF_CHECK },
+
+
  /* onglet copier */
   { CONF_STRING, "srccopycombo", "", CONF_SAVEONEXIT + CONF_COMBO },
   { CONF_STRING, "dstcopycombo", "", CONF_SAVEONEXIT + CONF_COMBO },
@@ -91,6 +99,7 @@
 #if 0
   { CONF_STRING, "extended", FALSE, "1" },
 #endif
+  { CONF_STRING, "version", "1", CONF_SAVEALWAYS },
   { CONF_IGNORE, NULL, NULL, 0 },
 };
 
@@ -156,6 +165,7 @@
   fprintf(Lfic, "name=%s\n", Ldrive->name);  
   fprintf(Lfic, "type=%d\n", Ldrive->type);
   fprintf(Lfic, "vitesse=%d\n", Ldrive->vitesse);
+  fprintf(Lfic, "vitessedvd=%d\n", Ldrive->vitessedvd);
   fprintf(Lfic, "manual=%d\n", Ldrive->manual == TRUE ? 1 : 0);
 }
 
@@ -175,6 +185,7 @@
   }
 
   fprintf(Lfic, "[general]\n");
+  fprintf(Lfic, "confversion=%s\n", VERSION);
   g_hash_table_foreach(Gconfigprog, foreachconfig, (gpointer *)(Lfic));
 
 /*  g_slist_foreach(Gmedialist, foreachmedia, (gpointer *)(fic)); */
@@ -198,7 +209,7 @@
   conf_store_value("fastblank", "1");
   conf_store_value("tmpdir", "/tmp");
   conf_store_value("lastdir", "");
-  conf_store_value("iconsize", "48");
+  conf_store_value("iconsize", "24");
   conf_store_value("statusbar", "1");
   conf_store_value("saveconfig", "1");
   if (s) {
@@ -589,6 +600,8 @@
   g_strfreev(Llignes);
   g_free(Lcontents);
   clean_config();
+
+  if (!test_version()) return FALSE;  
   
   return TRUE;
 }
@@ -690,6 +703,21 @@
   if (Llastdir) conf_store_value("lastdir", Llastdir);
 }
 
+/* test sur la version du fichier de configuration .. */
+gboolean test_version()
+{
+  if (!conf_get_string("confversion")) {
+    gchar *Lerrmsg = g_strdup_printf(_("graveman update !\n\nYou must remove 
your old configuration file '%s'.\nThen you can restart graveman..\n\nThanks ! 
:-)"), Gfileconf);
+    GtkWidget *Lerr = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL, 
GTK_MESSAGE_WARNING,
+                          GTK_BUTTONS_OK, Lerrmsg);
+    gtk_dialog_run(GTK_DIALOG(Lerr));
+    gtk_widget_destroy(Lerr);
+   
+    return FALSE;
+  }
+
+  return TRUE;
+}
 /*
  * vim:et:ts=8:sts=2:sw=2
  */