[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.17 
graveman/current/src/interface.c:1.18
--- graveman/current/src/interface.c:1.17       Tue Feb  8 18:06:51 2005
+++ graveman/current/src/interface.c    Wed Feb  9 00:27:30 2005
@@ -114,29 +114,34 @@
     { NULL }
   };
 
-void remplirecombovitesse(GtkComboBox *Acombo, gchar *Alecident, gchar 
*Aselvalue)
+void remplire_combo_vitesse(GtkComboBox *Acombo, gchar *Alecident, gchar 
*Aselvalue)
 {
   GtkListStore *Ldata = GTK_LIST_STORE(gtk_combo_box_get_model(Acombo));
+  const gchar *Lname = glade_get_widget_name(GTK_WIDGET(Acombo));
   gchar *Llabel, *Lident;  
   gint i;
   gint passe = 0;
   GtkTreeIter Liter;
   gint Lmaxspeed = MAX_SPEED;
   gboolean Lselok = FALSE;
+  gboolean Lisdvd = FALSE;
 
   
 
   if (Alecident && *Alecident) {
     Tdriveinfo *Lundrive = find_drive(Alecident);
 
-    Lmaxspeed = Lundrive->vitesse;
+    if (strstr(Lname, "dvd")) Lisdvd = TRUE;
+    Lmaxspeed = Lisdvd ? Lundrive->vitessedvd : Lundrive->vitesse;
   }
 
   gtk_list_store_clear(Ldata);
 
   for (i=1; 1; i++) {
-    passe = ! passe;
-    if (passe) continue;
+    if (!Lisdvd) {
+      passe = ! passe;
+      if (passe) continue;
+    }
     Llabel = g_strdup_printf("%dx", i);
     Lident = g_strdup_printf("%d", i);    
     gtk_list_store_append(Ldata, &Liter);
@@ -1566,24 +1571,25 @@
   GtkTreeViewColumn *Lcell;
 
   gtk_tree_selection_set_mode(Lselection, GTK_SELECTION_MULTIPLE);
+  gtk_tree_view_set_enable_search(Atreedata, TRUE);
   gtk_tree_view_set_model(Atreedata, GTK_TREE_MODEL(Lmodel));
 
   /* creation colonnes */
   Lcellrender = gtk_cell_renderer_pixbuf_new();
   Lcell = gtk_tree_view_column_new_with_attributes("", Lcellrender, "pixbuf", 
1, NULL);
-  gtk_tree_view_append_column(GTK_TREE_VIEW(Atreedata), Lcell);
+  gtk_tree_view_append_column(Atreedata, Lcell);
        
   Lcellrender = gtk_cell_renderer_text_new();
   Lcell = gtk_tree_view_column_new_with_attributes(_("Name"), Lcellrender, 
"text", 2, NULL);
-  gtk_tree_view_append_column(GTK_TREE_VIEW(Atreedata), Lcell);
+  gtk_tree_view_append_column(Atreedata, Lcell);
 
   Lcellrender = gtk_cell_renderer_text_new();
   Lcell = gtk_tree_view_column_new_with_attributes(_("Size"), Lcellrender, 
"text", 3, NULL);
-  gtk_tree_view_append_column(GTK_TREE_VIEW(Atreedata), Lcell);
+  gtk_tree_view_append_column(Atreedata, Lcell);
 
   Lcellrender = gtk_cell_renderer_text_new();
   Lcell = gtk_tree_view_column_new_with_attributes(_("Location"), Lcellrender, 
"text", 4, NULL);
-  gtk_tree_view_append_column(GTK_TREE_VIEW(Atreedata), Lcell);
+  gtk_tree_view_append_column(Atreedata, Lcell);
 
   /* icone de base dans la liste des fichiers */
   gtk_tree_store_append(GTK_TREE_STORE(Lmodel), &Liter, NULL);
@@ -1787,21 +1793,16 @@
 /* mise a jour d'une bar indicant le remplissage, passage en rouge si le cd 
est plein */
 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);
@@ -1813,7 +1814,6 @@
     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 */