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

[sylvain cresto]

Index: graveman/current/src/interface.c
diff -u graveman/current/src/interface.c:1.14 
graveman/current/src/interface.c:1.15
--- graveman/current/src/interface.c:1.14       Thu Feb  3 03:20:34 2005
+++ graveman/current/src/interface.c    Sat Feb  5 17:31:48 2005
@@ -69,6 +69,12 @@
   { NULL }
 };
 
+static Tmyentry Gtypedvddata[] = {
+  { "4482", N_("4.7 gb"), TRUE },
+  { "8964", N_("9.4 gb"), FALSE },
+  { NULL }
+};
+
 static Tmyentry Gtypeicosize[] = {
   { "16", N_("16x16 px"), FALSE },
   { "24", N_("24x24 px"), FALSE },
@@ -216,7 +222,8 @@
  
   for (Lcur = Glistdrives, i=0; Lcur; Lcur = g_slist_next(Lcur), i++) { 
     Ldrive = (Tdriveinfo *)Lcur->data;
-    if ((Aquoi & GRAVEUR_ONLY) && (! DRIVE_WRITER(Ldrive))) continue;
+    if ((Aquoi & TYPE_ALLWRITER) && (! DRIVE_WRITER(Ldrive))) continue;
+    if ((Aquoi & TYPE_DVDWRITER) && (! DRIVE_DVDWRITER(Ldrive))) continue;
     
     gtk_list_store_append(Ldata, &Liter);
 
@@ -233,7 +240,7 @@
     }
   }
   
-  if (Aquoi & ISO) { 
+  if (Aquoi & TYPE_ISO) { 
     gtk_list_store_append(Ldata, &Liter);
     gtk_list_store_set(Ldata, &Liter, 0, "iso", 1, GISOpetiteIcone, 2, _("ISO 
file..."), 3, -1, -1);
 
@@ -363,7 +370,7 @@
   return Lmenu;
 }
 
-/* creation popup "data" */
+/* creation popup "cd/dvd data" */
 GtkMenu *create_gtkpopupmenudata(GtkWidget *Aliste, GHashTable *Ahash)
 {
   GtkMenu *Lmenu = GTK_MENU(g_hash_table_lookup(Ahash, "popupdata"));
@@ -374,6 +381,7 @@
   gint type;
   gint Lnumsel = gtk_tree_selection_count_selected_rows(Lselection);
   gboolean Lonlyone = TRUE;
+  const gchar *Llistename = glade_get_widget_name(Aliste);
   GtkTreePath *Lpath = NULL;
 
   /* on cherche l'object selectionne, il peu y en avoir plusieur
@@ -406,10 +414,21 @@
 
   /* RENOMMER LE CD */
   Litem = g_hash_table_lookup(Ahash, "popupdata_renamecd");
-  if (type == TYPE_CD && Lonlyone) {
-    gtk_widget_show(Litem);
-  } else {
+  Litem2 = g_hash_table_lookup(Ahash, "popupdata_renamedvd");
+  if (!strcmp(Llistename, "LISTEDVDDATA")) {
+    if (type == TYPE_CD && Lonlyone) {
+      gtk_widget_show(Litem2);
+    } else {
+      gtk_widget_hide(Litem2);
+    } 
     gtk_widget_hide(Litem);
+  } else {
+    if (type == TYPE_CD && Lonlyone) {
+      gtk_widget_show(Litem);
+    } else {
+      gtk_widget_hide(Litem);
+    }
+    gtk_widget_hide(Litem2);
   }
 
   /* EXPAND */
@@ -512,6 +531,9 @@
   glade_to_hash(Axml, Ahash, "popupdata");
   g_signal_connect(G_OBJECT(glade_to_hash(Axml, Ahash, "popupdata_renamecd")),
       "activate", G_CALLBACK(gtk_data_renommerelement), Ahash);
+  g_signal_connect(G_OBJECT(glade_to_hash(Axml, Ahash, "popupdata_renamedvd")),
+      "activate", G_CALLBACK(gtk_data_renommerelement), Ahash);
+
   g_signal_connect(G_OBJECT(glade_to_hash(Axml, Ahash, "popupdata_expand")),
       "activate", G_CALLBACK(gtk_data_expandelement), Ahash);
   g_signal_connect(G_OBJECT(glade_to_hash(Axml, Ahash, 
"popupdata_renamefile")),
@@ -608,17 +630,17 @@
 }
 
 /* fenetre principal */
-GtkWidget* manage_main_window (guint32 *Aaudiolen, guint32 *Aaudiomaxlen,
-    guint32 *Adatasize, guint32 *Adatamaxsize)
+GtkWidget* manage_main_window (guint64 *Aaudiolen, guint64 *Aaudiomaxlen,
+    guint64 *Adatasize, guint64 *Adatamaxsize, guint64 *Advddatasize, guint64 
*Advddatamaxsize)
 {
   gchar *Ltemplate = PACKAGE_DATA_DIR "/" PACKAGE "/window_main.glade";
   GladeXML *Lxml = glade_xml_new(Ltemplate, NULL,NULL);
   GtkWidget *Lwindow;
-  GtkNotebook *Lbodycdaudio, *Lbodycddata, *Lbodycdcopy, *Lbodycdother;
+  GtkNotebook *Lbodycdaudio, *Lbodycddata, *Lbodycdcopy, *Lbodycdother, 
*Lbodydvddata;
   GtkHBox *Lmainbody;
   GtkComboBox *Lcombo;
   GtkButton *Lbtnerasecdrw, *Lbtnformatdvdrw;
-  GtkTreeView *Ltreeaudio, *Ltreedata, *Ltopmenu;
+  GtkTreeView *Ltreeaudio, *Ltreedata, *Ltopmenu, *Ltreedvddata;
   GHashTable *Lhash = _hash();
 
   if (!Lxml) {
@@ -632,12 +654,16 @@
   g_hash_table_insert(Lhash, "audiomaxlen", Aaudiomaxlen);
   g_hash_table_insert(Lhash, "datasize", Adatasize);
   g_hash_table_insert(Lhash, "datamaxsize", Adatamaxsize);
+  g_hash_table_insert(Lhash, "dvddatasize", Advddatasize);
+  g_hash_table_insert(Lhash, "dvddatamaxsize", Advddatamaxsize);
 
   /* onglets page de droite */
   Lbodycdaudio = GTK_NOTEBOOK(glade_to_hash(Lxml, Lhash, "bodycdaudio"));
   gtk_widget_reparent(GTK_WIDGET(Lbodycdaudio), GTK_WIDGET(Lmainbody));
   Lbodycddata = GTK_NOTEBOOK(glade_to_hash(Lxml, Lhash, "bodycddata"));
   gtk_widget_reparent(GTK_WIDGET(Lbodycddata), GTK_WIDGET(Lmainbody));
+  Lbodydvddata = GTK_NOTEBOOK(glade_to_hash(Lxml, Lhash, "bodydvddata"));
+  gtk_widget_reparent(GTK_WIDGET(Lbodydvddata), GTK_WIDGET(Lmainbody));
   Lbodycdcopy = GTK_NOTEBOOK(glade_to_hash(Lxml, Lhash, "bodycdcopy"));
   gtk_widget_reparent(GTK_WIDGET(Lbodycdcopy), GTK_WIDGET(Lmainbody));
   Lbodycdother = GTK_NOTEBOOK(glade_to_hash(Lxml, Lhash, "bodycdother"));
@@ -646,6 +672,8 @@
 
   /* mise a jour des label lorsque l'on change d'onglet dans la partie "graver 
un cd de donnee" */
   g_signal_connect(G_OBJECT(Lbodycddata), "switch-page", 
G_CALLBACK(switchpage), Lhash);
+  /* mise a jour des label lorsque l'on change d'onglet dans la partie "graver 
un dvd de donnee" */
+  g_signal_connect(G_OBJECT(Lbodydvddata), "switch-page", 
G_CALLBACK(switchpage), Lhash);
 
   /* bouttons barre de gauche */
   Ltopmenu = GTK_TREE_VIEW(glade_to_hash(Lxml, Lhash, "topmenu"));
@@ -665,6 +693,8 @@
       G_CALLBACK(menu_active_panel), Lhash);
   g_signal_connect(G_OBJECT(glade_xml_get_widget(Lxml, "menucddata")), 
"activate",
       G_CALLBACK(menu_active_panel), Lhash);
+  g_signal_connect(G_OBJECT(glade_xml_get_widget(Lxml, "menudvddata")), 
"activate",
+      G_CALLBACK(menu_active_panel), Lhash);
   g_signal_connect(G_OBJECT(glade_xml_get_widget(Lxml, "menucdcopy")), 
"activate",
       G_CALLBACK(menu_active_panel), Lhash);
   g_signal_connect(G_OBJECT(glade_xml_get_widget(Lxml, "menucdother")), 
"activate",
@@ -683,6 +713,8 @@
   glade_to_hash(Lxml, Lhash, "dstcopytable");
   prepare_combobox_vitesse(GTK_COMBO_BOX(glade_to_hash(Lxml, Lhash, 
"dstdataspeed")));
   glade_to_hash(Lxml, Lhash, "dstdatatable");
+  prepare_combobox_vitesse(GTK_COMBO_BOX(glade_to_hash(Lxml, Lhash, 
"dstdvddataspeed")));
+  glade_to_hash(Lxml, Lhash, "dstdvddatatable");
 
   /* onglet graver un cd audio */
   glade_to_hash_list(Lxml, Lhash, "audiosimul", "audionotfix", "audiodao", 
"nbrcdaudio", NULL);
@@ -691,7 +723,12 @@
   glade_to_hash_list(Lxml, Lhash, "datavoli", "datapubl", "dataprep", 
"databibl", "datacopy", "dataabst",
       "datarockridge", "datajoliet", NULL);
   glade_to_hash_list(Lxml, Lhash, "nbrcddata", "datamulti", "datanotfix", 
"datasimul", NULL);
-  
+
+  /* onglet graver un dvd de donnee */
+  glade_to_hash_list(Lxml, Lhash, "dvddatavoli", "dvddatapubl", "dvddataprep", 
"dvddatabibl", "dvddatacopy",
+      "dvddataabst", NULL);
+  glade_to_hash_list(Lxml, Lhash, "nbrdvddata", "dvddatanotfix", 
"dvddatasimul", NULL);
+ 
   /* onglet copier un cd */
   glade_to_hash_list(Lxml, Lhash, "nbrcdcopy", "copysimul", NULL);
 
@@ -701,6 +738,9 @@
   prepare_combobox_graveur(Lxml, Lhash, "dstdata");
   prepare_disable_when_iso(Lhash, "dstdatacombo", "nbrcddata", "datamulti", 
"datanotfix", "datasimul", NULL);
 
+  prepare_combobox_graveur(Lxml, Lhash, "dstdvddata");
+  prepare_disable_when_iso(Lhash, "dstdvddatacombo", "nbrdvddata", 
"dvddatanotfix", "dvddatasimul", NULL);
+
   prepare_combobox_graveur(Lxml, Lhash, "srccopy");
   prepare_combobox_graveur(Lxml, Lhash, "dstcopy");
   prepare_disable_when_iso(Lhash, "dstcopycombo", "nbrcdcopy", "copysimul", 
NULL);
@@ -725,6 +765,10 @@
   remplirecombo(Lcombo, "", Gtypecddata, TRUE, 
conf_get_string("listeremplidata")); 
   g_signal_connect(G_OBJECT(Lcombo), "changed", 
G_CALLBACK(change_remplissage), Lhash);
 
+  Lcombo = GTK_COMBO_BOX(glade_to_hash(Lxml, Lhash, "listeremplidvddata"));
+  remplirecombo(Lcombo, "", Gtypedvddata, TRUE, 
conf_get_string("listeremplidvddata")); 
+  g_signal_connect(G_OBJECT(Lcombo), "changed", 
G_CALLBACK(change_remplissage), Lhash);
+
   Lcombo = GTK_COMBO_BOX(glade_to_hash(Lxml, Lhash, "listerempliaudio"));
   remplirecombo(Lcombo, "", Gtypecdaudio, TRUE, 
conf_get_string("listerempliaudio"));
   g_signal_connect(G_OBJECT(Lcombo), "changed", 
G_CALLBACK(change_remplissage), Lhash);
@@ -733,11 +777,15 @@
   g_signal_connect(G_OBJECT(glade_xml_get_widget(Lxml, "btnnextaudio1")), 
"clicked", G_CALLBACK(gonextpage), Lbodycdaudio);
   g_signal_connect(G_OBJECT(glade_xml_get_widget(Lxml, "btnnextdata1")), 
"clicked", G_CALLBACK(gonextpage), Lbodycddata);
   g_signal_connect(G_OBJECT(glade_xml_get_widget(Lxml, "btnnextdata2")), 
"clicked", G_CALLBACK(gonextpage), Lbodycddata);
+  g_signal_connect(G_OBJECT(glade_xml_get_widget(Lxml, "btnnextdvddata1")), 
"clicked", G_CALLBACK(gonextpage), Lbodydvddata);
+  g_signal_connect(G_OBJECT(glade_xml_get_widget(Lxml, "btnnextdvddata2")), 
"clicked", G_CALLBACK(gonextpage), Lbodydvddata);
 
   /* boutons "graver" */
   g_signal_connect(G_OBJECT(glade_xml_get_widget(Lxml, "btnburnaudio2")), 
"clicked", G_CALLBACK(confirm_burn), Lhash);
   g_signal_connect(G_OBJECT(glade_xml_get_widget(Lxml, "btnburndata2")), 
"clicked", G_CALLBACK(confirm_burn), Lhash);
   g_signal_connect(G_OBJECT(glade_xml_get_widget(Lxml, "btnburndata3")), 
"clicked", G_CALLBACK(confirm_burn), Lhash);
+  g_signal_connect(G_OBJECT(glade_xml_get_widget(Lxml, "btnburndvddata2")), 
"clicked", G_CALLBACK(confirm_burn), Lhash);
+  g_signal_connect(G_OBJECT(glade_xml_get_widget(Lxml, "btnburndvddata3")), 
"clicked", G_CALLBACK(confirm_burn), Lhash);
   g_signal_connect(G_OBJECT(glade_xml_get_widget(Lxml, "btnburncopy1")), 
"clicked", G_CALLBACK(confirm_burn), Lhash);
 
   /* boutons de la page "autres operations" */
@@ -745,9 +793,8 @@
   g_signal_connect(G_OBJECT(Lbtnformatdvdrw), "clicked", 
G_CALLBACK(popup_formatdvdrw), Lhash);
   g_signal_connect(G_OBJECT(glade_xml_get_widget(Lxml, "btnfixcdother1")), 
"clicked", G_CALLBACK(confirm_fixcd), Lhash);
   
-  
   /* menu popup sur les listes */
-  glade_to_hash_list(Lxml, Lhash, "audiolenbar", "datasizebar", NULL);
+  glade_to_hash_list(Lxml, Lhash, "audiolenbar", "datasizebar", 
"dvddatasizebar", NULL);
   Ltreeaudio = GTK_TREE_VIEW(glade_to_hash(Lxml, Lhash, "LISTEAUDIO"));
   prepare_popups(Lxml, Lhash);
   prepare_listeaudio(Ltreeaudio);
@@ -756,36 +803,46 @@
   g_signal_connect(G_OBJECT(glade_xml_get_widget(Lxml, "btnaddtrack")), 
"clicked", G_CALLBACK(gtk_audio_addtrack), Lhash);
 
   Ltreedata = GTK_TREE_VIEW(glade_to_hash(Lxml, Lhash, "LISTEDATA"));
-  prepare_listedata(Ltreedata);
+  prepare_listedata(Ltreedata, _("New CD"));
   g_signal_connect(G_OBJECT(Ltreedata), "button-press-event", 
G_CALLBACK(gtk_do_eventbuttonpress), Lhash);
   g_signal_connect(G_OBJECT(Ltreedata), "popup-menu", 
G_CALLBACK(key_popupmenu_addfile), Lhash);
   g_signal_connect(G_OBJECT(glade_xml_get_widget(Lxml, "btnaddfile")), 
"clicked", G_CALLBACK(gtk_data_addfile), Lhash);
   g_signal_connect(G_OBJECT(glade_xml_get_widget(Lxml, "btnadddirectory")), 
"clicked",
       G_CALLBACK(gtk_data_adddirectory), Lhash);
 
+  Ltreedvddata = GTK_TREE_VIEW(glade_to_hash(Lxml, Lhash, "LISTEDVDDATA"));
+  prepare_listedata(Ltreedvddata, _("New DVD"));
+  g_signal_connect(G_OBJECT(Ltreedvddata), "button-press-event", 
G_CALLBACK(gtk_do_eventbuttonpress), Lhash);
+  g_signal_connect(G_OBJECT(Ltreedvddata), "popup-menu", 
G_CALLBACK(key_popupmenu_addfile), Lhash);
+  g_signal_connect(G_OBJECT(glade_xml_get_widget(Lxml, "btndvdaddfile")), 
"clicked", G_CALLBACK(gtk_data_addfile), Lhash);
+  g_signal_connect(G_OBJECT(glade_xml_get_widget(Lxml, "btndvdadddirectory")), 
"clicked",
+      G_CALLBACK(gtk_data_adddirectory), Lhash);
+
 
   /* drag and drop */
+  /* audio */
   gtk_tree_view_enable_model_drag_source (GTK_TREE_VIEW (Ltreeaudio),
            GDK_BUTTON1_MASK, Gdndaudio, G_N_ELEMENTS (Gdndaudio), 
GDK_ACTION_MOVE|GDK_ACTION_COPY);
   gtk_tree_view_enable_model_drag_dest (GTK_TREE_VIEW (Ltreeaudio),
                Gdndaudio, G_N_ELEMENTS (Gdndaudio), 
GDK_ACTION_MOVE|GDK_ACTION_COPY);
   g_signal_connect(G_OBJECT(Ltreeaudio), "drag-data-received", 
G_CALLBACK(audio_dnd_data_received), Lhash);
-//    g_signal_connect(G_OBJECT(Ltreeaudio), "drag_data_received", 
G_CALLBACK(audio_dnd_data_received),
-  //    Lhash);
 
-/*
-  gtk_drag_dest_set(GTK_WIDGET(Ltreedata),
-      GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT | 
GTK_DEST_DEFAULT_DROP, Gdnddata,
-      G_N_ELEMENTS(Gdnddata), GDK_ACTION_COPY | GDK_ACTION_MOVE);
-  g_signal_connect(G_OBJECT(Ltreedata), "drag_data_received", 
G_CALLBACK(data_dnd_data_received),
-      Lhash);*/
+  /* cd data */
   gtk_tree_view_enable_model_drag_source (GTK_TREE_VIEW (Ltreedata),
            GDK_BUTTON1_MASK, Gdnddata, G_N_ELEMENTS (Gdnddata), 
GDK_ACTION_MOVE|GDK_ACTION_COPY);
   gtk_tree_view_enable_model_drag_dest (GTK_TREE_VIEW (Ltreedata),
            Gdnddata, G_N_ELEMENTS (Gdnddata), GDK_ACTION_MOVE|GDK_ACTION_COPY);
   g_signal_connect(G_OBJECT(Ltreedata), "drag-data-received", 
G_CALLBACK(data_dnd_data_received),
       Lhash);
+  /* dvd data */
+  gtk_tree_view_enable_model_drag_source (GTK_TREE_VIEW (Ltreedvddata),
+           GDK_BUTTON1_MASK, Gdnddata, G_N_ELEMENTS (Gdnddata), 
GDK_ACTION_MOVE|GDK_ACTION_COPY);
+  gtk_tree_view_enable_model_drag_dest (GTK_TREE_VIEW (Ltreedvddata),
+           Gdnddata, G_N_ELEMENTS (Gdnddata), GDK_ACTION_MOVE|GDK_ACTION_COPY);
+  g_signal_connect(G_OBJECT(Ltreedvddata), "drag-data-received", 
G_CALLBACK(data_dnd_data_received),
+      Lhash);
 
+  /* evenement fermer la fenetre */
   g_signal_connect(G_OBJECT(Lwindow), "delete-event", 
G_CALLBACK(delete_event_quit), Lhash);
 
   /* on restaure la taille et la position que la fenetre avait lors de la 
derniere utilisation */ 
@@ -805,18 +862,21 @@
   GtkComboBox *Lsrccopycombo = GTK_COMBO_BOX(g_hash_table_lookup(Ahash, 
"srccopycombo"));
   GtkComboBox *Ldstcopycombo = GTK_COMBO_BOX(g_hash_table_lookup(Ahash, 
"dstcopycombo"));
   GtkComboBox *Ldstdatacombo = GTK_COMBO_BOX(g_hash_table_lookup(Ahash, 
"dstdatacombo"));
+  GtkComboBox *Ldstdvddatacombo = GTK_COMBO_BOX(g_hash_table_lookup(Ahash, 
"dstdvddatacombo"));
   GtkComboBox *Ldstaudiocombo = GTK_COMBO_BOX(g_hash_table_lookup(Ahash, 
"dstaudiocombo"));
   GtkComboBox *Ldstothercombo = GTK_COMBO_BOX(g_hash_table_lookup(Ahash, 
"dstothercombo"));
 
-  remplirecombograveur(Lsrccopycombo, ALL + ISO, 
conf_get_string("srccopycombo"));
+  remplirecombograveur(Lsrccopycombo, TYPE_ALL + TYPE_ISO, 
conf_get_string("srccopycombo"));
   
-  remplirecombograveur(Ldstcopycombo, GRAVEUR_ONLY + ISO, 
conf_get_string("dstcopycombo"));
+  remplirecombograveur(Ldstcopycombo, TYPE_ALLWRITER + TYPE_ISO, 
conf_get_string("dstcopycombo"));
   
-  remplirecombograveur(Ldstdatacombo, GRAVEUR_ONLY + ISO, 
conf_get_string("dstdatacombo"));
+  remplirecombograveur(Ldstdatacombo, TYPE_ALLWRITER + TYPE_ISO, 
conf_get_string("dstdatacombo"));
+
+  remplirecombograveur(Ldstdvddatacombo, TYPE_DVDWRITER + TYPE_ISO, 
conf_get_string("dstdvddatacombo"));
   
-  remplirecombograveur(Ldstaudiocombo, GRAVEUR_ONLY, 
conf_get_string("dstaudiocombo"));
+  remplirecombograveur(Ldstaudiocombo, TYPE_ALLWRITER, 
conf_get_string("dstaudiocombo"));
 
-  remplirecombograveur(Ldstothercombo, GRAVEUR_ONLY, 
conf_get_string("dstothercombo"));
+  remplirecombograveur(Ldstothercombo, TYPE_ALLWRITER, 
conf_get_string("dstothercombo"));
 }
 
 GtkWidget* create_fileselection1 (GtkWindow *AParent, GtkFileChooserAction 
AType)
@@ -1062,7 +1122,7 @@
   g_free(Lxml);
 }
 
-/* fenetre copie d'un cd en cours */
+/* fenetre gravure d'un cd en cours */
 void show_graverwindow (GHashTable *Ahash, gchar *Aaction, gchar *Atitle)
 {
   gchar *Ltemplate = PACKAGE_DATA_DIR "/" PACKAGE "/window_burn.glade";
@@ -1258,6 +1318,13 @@
     g_hash_table_replace(Lhash, "_lstclicked", Lnewclick);
 
     gtk_widget_show(GTK_WIDGET(Lnewclick));
+
+    /* pointeur sur la liste courante pour plus de simplicite */
+    if (!strcmp(Lident, "bodycddata")) {
+      g_hash_table_replace(Lhash, "_current_list", g_hash_table_lookup(Lhash, 
"LISTEDATA"));
+    } else if (!strcmp(Lident, "bodydvddata")) {
+      g_hash_table_replace(Lhash, "_current_list", g_hash_table_lookup(Lhash, 
"LISTEDVDDATA"));
+    }
   }
     
   g_free(Lident);
@@ -1320,6 +1387,9 @@
   gtk_list_store_set(Lmodel, &Liter, 0, "bodycddata", 1, GMenuData, 2, _("Data 
CD"), -1);
 
   gtk_list_store_append(Lmodel, &Liter);
+  gtk_list_store_set(Lmodel, &Liter, 0, "bodydvddata", 1, GMenuData, 2, 
_("Data DVD"), -1);
+
+  gtk_list_store_append(Lmodel, &Liter);
   gtk_list_store_set(Lmodel, &Liter, 0, "bodycdcopy", 1, GMenuCopy, 2, 
_("Duplicate CD"), -1);
 
   gtk_list_store_append(Lmodel, &Liter);
@@ -1458,7 +1528,7 @@
   gtk_tree_view_set_model(Atreeaudio, GTK_TREE_MODEL(Lmodel));
 }
 
-void prepare_listedata(GtkTreeView *Atreedata)
+void prepare_listedata(GtkTreeView *Atreedata, gchar *Atitle)
 {
   GtkTreeSelection *Lselection = 
gtk_tree_view_get_selection(GTK_TREE_VIEW(Atreedata));
   GtkTreeStore *Lmodel = gtk_tree_store_new(7, G_TYPE_INT, GDK_TYPE_PIXBUF, 
G_TYPE_STRING,
@@ -1489,7 +1559,7 @@
 
   /* icone de base dans la liste des fichiers */
   gtk_tree_store_append(GTK_TREE_STORE(Lmodel), &Liter, NULL);
-  gtk_tree_store_set(Lmodel, &Liter, 0, TYPE_CD, 1, GCDpetiteIcone, 2, _("New 
CD"), 3, "", 4, "", 5, "", 6, 0, -1);
+  gtk_tree_store_set(Lmodel, &Liter, 0, TYPE_CD, 1, GCDpetiteIcone, 2, Atitle, 
3, "", 4, "", 5, "", 6, 0, -1);
 }
 
 /* fenetre de confirmation avec une checkbox */
@@ -1527,6 +1597,31 @@
   return Lhash;
 }
 
+/* fenetre selection d'une operation sur un dvd */
+GHashTable *create_dialog_select_dvdoperation (GtkWidget *Aparent)
+{
+  gchar *Ltemplate = PACKAGE_DATA_DIR "/" PACKAGE 
"/dialog_select_operation.glade";
+  GladeXML *Lxml = glade_xml_new(Ltemplate, NULL,NULL);
+  GtkWidget *Ldialog;
+  GHashTable *Lhash = _hash();
+
+  if (!Lxml) {
+    g_error("Cannot load '%s': %s\n", Ltemplate, g_strerror(errno));
+  }
+
+  Ldialog = glade_xml_get_widget(Lxml, "dialog_select_operation");
+  gtk_window_set_transient_for(GTK_WINDOW(Ldialog), GTK_WINDOW(Aparent));
+  g_hash_table_insert(Lhash, "window", Ldialog);
+
+  /* titre */
+  glade_to_hash(Lxml, Lhash, "label");
+  
+  /* commencer une session ou merger ? */
+  glade_to_hash(Lxml, Lhash, "burninitial");
+  glade_to_hash(Lxml, Lhash, "burnmerge");
+
+  return Lhash;
+}
 /* fenetre proprietes */
 GHashTable *create_dialog_proprietes (GtkWidget *Aparent)
 {
@@ -1661,20 +1756,23 @@
 }
 
 /* mise a jour d'une bar indicant le remplissage, passage en rouge si le cd 
est plein */
-void switch_pbar_status(GtkProgressBar *Apbar, guint32 Amaxlen, guint32 
Acurlen, Ttypemajpbar Aupdatetext) {
+void switch_pbar_status(GtkProgressBar *Apbar, guint64 Amaxlen, guint64 
Acurlen, Ttypemajpbar Aupdatetext) {
   gdouble Lpremp = (1.0/Amaxlen)*Acurlen;
- 
+ printf("on donc ici [%lld] [%lld]\n", Amaxlen, Acurlen);
   if (Lpremp>1) { 
     GdkColor Lcolor;
     gdk_color_parse ("red", &Lcolor);
     Lpremp = 1;
-
+printf("la avant upd\n");
     gtk_widget_modify_bg (GTK_WIDGET(Apbar), GTK_STATE_NORMAL, &Lcolor);
     gtk_widget_modify_bg (GTK_WIDGET(Apbar), GTK_STATE_ACTIVE, &Lcolor);
     gtk_widget_modify_bg (GTK_WIDGET(Apbar), GTK_STATE_PRELIGHT, &Lcolor);
     gtk_widget_modify_bg (GTK_WIDGET(Apbar), GTK_STATE_SELECTED, &Lcolor);
+printf("la apres upd\n");
   } else {
+printf("la avant 000upd\n");
     gtk_widget_modify_bg (GTK_WIDGET(Apbar), GTK_STATE_NORMAL, NULL);
+printf("la avant 110upd\n");
     gtk_widget_modify_bg (GTK_WIDGET(Apbar), GTK_STATE_ACTIVE, NULL);
     gtk_widget_modify_bg (GTK_WIDGET(Apbar), GTK_STATE_PRELIGHT, NULL);
     gtk_widget_modify_bg (GTK_WIDGET(Apbar), GTK_STATE_SELECTED, NULL);
@@ -1686,6 +1784,7 @@
     gtk_progress_bar_set_text(GTK_PROGRESS_BAR(Apbar), Ltmp);
     g_free(Ltmp);
   }
+ printf("fin man [%lld]\n", (unsigned long long) Acurlen);
 }
 
 /* effacer un cd reinscriptible */