[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.21 
graveman/current/src/interface.c:1.22
--- graveman/current/src/interface.c:1.21       Fri Feb 11 01:34:15 2005
+++ graveman/current/src/interface.c    Sat Feb 12 16:22:47 2005
@@ -50,38 +50,38 @@
 #endif
 
 static Tmyentry Gtypecdaudio[] = {
-  { "1260", N_("21 min"), FALSE },
-  { "1380", N_("23 min"), FALSE },
-  { "4440", N_("74 min"), FALSE },
-  { "4800", N_("80 min"), TRUE },
-  { "5400", N_("90 min"), FALSE },
-  { "5940", N_("99 min"), FALSE },
-  { "6000", N_("100 min"), FALSE },
+  { "1260", N_("21 min"), FALSE, 0 },
+  { "1380", N_("23 min"), FALSE, 0 },
+  { "4440", N_("74 min"), FALSE, 0 },
+  { "4800", N_("80 min"), TRUE, 0 },
+  { "5400", N_("90 min"), FALSE, 0 },
+  { "5940", N_("99 min"), FALSE, 0 },
+  { "6000", N_("100 min"), FALSE, 0 },
   { NULL }
 };
 
 static Tmyentry Gtypecddata[] = {
-  { "180", N_("180 mb"), FALSE },
-  { "202", N_("202 mb"), FALSE },
-  { "650", N_("650 mb"), FALSE },
-  { "700", N_("700 mb"), TRUE  },
-  { "790", N_("790 mb"), FALSE },
-  { "869", N_("869 mb"), FALSE },
-  { "878", N_("878 mb"), FALSE },
+  { "180", N_("180 mb"), FALSE, 0 },
+  { "202", N_("202 mb"), FALSE, 0 },
+  { "650", N_("650 mb"), FALSE, 0 },
+  { "700", N_("700 mb"), TRUE, 0 },
+  { "790", N_("790 mb"), FALSE ,0 },
+  { "869", N_("869 mb"), FALSE, 0 },
+  { "878", N_("878 mb"), FALSE, 0 },
   { NULL }
 };
 
 static Tmyentry Gtypedvddata[] = {
-  { "4482", N_("4.7 gb"), TRUE },
-  { "8964", N_("9.4 gb"), FALSE },
+  { "4482", N_("4.7 gb"), TRUE, 0 },
+  { "8964", N_("9.4 gb"), FALSE, 0 },
   { NULL }
 };
 
 static Tmyentry Gtypeicosize[] = {
-  { "16", N_("16x16 px"), FALSE },
-  { "24", N_("24x24 px"), FALSE },
-  { "32", N_("32x32 px"), FALSE },
-  { "48", N_("48x48 px"), FALSE },
+  { "16", N_("16x16 px"), FALSE, 0 },
+  { "24", N_("24x24 px"), FALSE, 0 },
+  { "32", N_("32x32 px"), FALSE, 0 },
+  { "48", N_("48x48 px"), FALSE, 0 },
   { NULL }
 };
 
@@ -93,27 +93,27 @@
 };*/
 
 static Tmyentry Gmodburn[] = {
-    { "dao", N_("Disk At Once - DAO (default)"), TRUE },
-    { "tao", N_("Track At Once  - TAO"), FALSE },
-    { "raw96r", N_("RAW writing - raw96r"), FALSE },
-    { "raw96", N_("RAW writing - raw96"), FALSE },
-    { "raw96p", N_("RAW writing - raw96p"), FALSE },
+    { "dao", N_("Disk At Once - DAO (default)"), TRUE, 0 },
+    { "tao", N_("Track At Once  - TAO"), FALSE, 0 },
+    { "raw96r", N_("RAW writing - raw96r"), FALSE, 0 },
+    { "raw96", N_("RAW writing - raw96"), FALSE, 0 },
+    { "raw96p", N_("RAW writing - raw96p"), FALSE, 0 },
     { NULL }
   };
 
 static Tmyentry Gisolevel[] = {
-  { "1", N_("ISO 9660 level 1"), FALSE },
-  { "2", N_("ISO 9660 level 2 (default)"), TRUE },
-  { "3", N_("ISO 9660 level 3"), FALSE },
-  { "4", N_("ISO 9660 version 2"), FALSE },
+  { "1", N_("ISO 9660 level 1"), FALSE, 0 },
+  { "2", N_("ISO 9660 level 2 (default)"), TRUE, 0 },
+  { "3", N_("ISO 9660 level 3"), FALSE, 0 },
+  { "4", N_("ISO 9660 version 2"), FALSE, 1 },
   { NULL }
 };
 
 static Tmyentry Gformatcd[] = {
-    { "data", N_("CD-Rom Mode 1 (default)"), TRUE},
-    { "mode2", N_("CD-Rom Mode 2"), FALSE },
-    { "xa1", N_("CD-Rom XA Mode 1"), FALSE },
-    { "xa2", N_("CD-Rom XA Mode 2"), FALSE },
+    { "data", N_("CD-Rom Mode 1 (default)"), TRUE, 0 },
+    { "mode2", N_("CD-Rom Mode 2"), FALSE, 0 },
+    { "xa1", N_("CD-Rom XA Mode 1"), FALSE, 0 },
+    { "xa2", N_("CD-Rom XA Mode 2"), FALSE, 0 },
     { NULL }
   };
 
@@ -168,7 +168,7 @@
   if (Lselok == FALSE) gtk_combo_box_set_active_iter(Acombo, &Liter);
 }
 
-void remplirecombo (GtkComboBox *Acombo, gchar *Abasename, Tmyentry *Aentry, 
gboolean Adoinit, gchar *Aselvalue)
+void remplirecombo_full (GtkComboBox *Acombo, gchar *Abasename, Tmyentry 
*Aentry, gboolean Adoinit, gchar *Aselvalue, gint Afiltre)
 {
   GtkListStore *Ldata;
   gchar *Lident;
@@ -194,6 +194,8 @@
   gtk_list_store_clear(Ldata);
   
   for (Lcurentry = Aentry; Lcurentry->label; Lcurentry++) {
+    if (Afiltre > -1 && Lcurentry->filtre > Afiltre) continue;
+    
     Lident = g_strdup_printf("%s%s", Abasename, Lcurentry->basecode);
     gtk_list_store_append(Ldata, &Liter);
     gtk_list_store_set(Ldata, &Liter, 0, Lident, 1, _(Lcurentry->label), -1); 
@@ -687,8 +689,10 @@
   Ltopmenu = GTK_TREE_VIEW(glade_to_hash(Lxml, Lhash, "topmenu"));
   glade_to_hash(Lxml, Lhash, "statusbar");
 
-  manage_top_menu(Lhash, MENU_NEW);
+  glade_to_hash(Lxml, Lhash, "dataisolevel");
+  manage_interface(Lhash, MENU_NEW + COMBO_UPDATE);
   update_status_bar_display(Lhash);
+
   g_signal_connect(G_OBJECT(Ltopmenu), "button-press-event", 
G_CALLBACK(gtk_do_eventbuttonpress), Lhash);
   g_signal_connect(G_OBJECT(Ltopmenu), "popup-menu", 
G_CALLBACK(key_popupmenu_display), Lhash);
 
@@ -764,8 +768,6 @@
       TRUE, conf_get_string("dataformat"));
   remplirecombo(GTK_COMBO_BOX(glade_to_hash(Lxml, Lhash, "datamodburn")), "", 
Gmodburn,
       TRUE, conf_get_string("datamodburn"));
-  remplirecombo(GTK_COMBO_BOX(glade_to_hash(Lxml, Lhash, "dataisolevel")), "", 
Gisolevel,
-      TRUE, conf_get_string("dataisolevel"));
   Lcombo = GTK_COMBO_BOX(glade_to_hash(Lxml, Lhash, "listeremplidata"));
   remplirecombo(Lcombo, "", Gtypecddata, TRUE, 
conf_get_string("listeremplidata")); 
   g_signal_connect(G_OBJECT(Lcombo), "changed", 
G_CALLBACK(change_remplissage), Lhash);
@@ -963,6 +965,7 @@
 {
   GtkWidget *fileselection1;
   GtkFileFilter *filterall, *filterwav, *filteraudio;
+  gchar *Ltxt;
 #ifdef ENABLE_MP3
   GtkFileFilter *filtermp3;
 #endif
@@ -976,29 +979,34 @@
   gtk_file_filter_add_pattern(filterall, "*");
 
   filteraudio = gtk_file_filter_new ();
-  gtk_file_filter_set_name (filteraudio,
-#if (defined ENABLE_MP3) && (defined ENABLE_OGG)
-      _("All audio files (*.mp3 *.ogg *.wav)")
-#elif defined ENABLE_MP3
-      _("All audio files (*.mp3 *.wav)")
-#elif defined ENABLE_OGG
-      _("All audio files (*.ogg *.wav)")
-#else
-      _("All audio files (*.wav)")
-#endif
-  );
+
+  if (GsupportMp3 && GsupportOgg) {
+    Ltxt = _("All audio files (*.mp3 *.ogg *.wav)");
+  } else if (GsupportMp3) {
+    Ltxt = _("All audio files (*.mp3 *.wav)");
+  } else if (GsupportOgg) {
+    Ltxt = _("All audio files (*.ogg *.wav)");
+  } else {
+    Ltxt = _("All audio files (*.wav)");
+  }
+  
+  gtk_file_filter_set_name (filteraudio, Ltxt);
 
 #ifdef ENABLE_MP3
-  gtk_file_filter_add_pattern(filteraudio, "*.mp3");
-  filtermp3 = gtk_file_filter_new ();
-  gtk_file_filter_set_name (filtermp3, _("Mp3 files (*.mp3)"));
-  gtk_file_filter_add_pattern(filtermp3, "*.mp3");
+  if (GsupportMp3) {
+    gtk_file_filter_add_pattern(filteraudio, "*.mp3");
+    filtermp3 = gtk_file_filter_new ();
+    gtk_file_filter_set_name (filtermp3, _("Mp3 files (*.mp3)"));
+    gtk_file_filter_add_pattern(filtermp3, "*.mp3");
+  }
 #endif
 #ifdef ENABLE_OGG
-  gtk_file_filter_add_pattern(filteraudio, "*.ogg");
-  filterogg = gtk_file_filter_new ();
-  gtk_file_filter_set_name (filterogg, _("Ogg files (*.ogg)"));
-  gtk_file_filter_add_pattern(filterogg, "*.ogg");
+  if (GsupportOgg) {
+    gtk_file_filter_add_pattern(filteraudio, "*.ogg");
+    filterogg = gtk_file_filter_new ();
+    gtk_file_filter_set_name (filterogg, _("Ogg files (*.ogg)"));
+    gtk_file_filter_add_pattern(filterogg, "*.ogg");
+  }
 #endif
   gtk_file_filter_add_pattern(filteraudio, "*.wav");
 
@@ -1014,10 +1022,14 @@
   gtk_dialog_set_default_response (GTK_DIALOG (fileselection1), 
GTK_RESPONSE_ACCEPT);
   gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (fileselection1), filteraudio);
 #ifdef ENABLE_MP3
-  gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (fileselection1), filtermp3);
+  if (GsupportMp3) {
+    gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (fileselection1), filtermp3);
+  }
 #endif
 #ifdef ENABLE_OGG
-  gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (fileselection1), filterogg);
+  if (GsupportOgg) {
+    gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (fileselection1), filterogg);
+  }
 #endif  
   gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (fileselection1), filterwav);
   gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (fileselection1), filterall);
@@ -1377,8 +1389,8 @@
   }
 }
 
-/* bar menu de gauche */
-void manage_top_menu(GHashTable *Ahash, gint Aaction)
+/* mise a jour interface */
+void manage_interface(GHashTable *Ahash, gint Aaction)
 {
   GtkListStore *Lmodel;
   GtkTreeView *Ltopmenu = g_hash_table_lookup(Ahash, "topmenu");
@@ -1386,8 +1398,9 @@
   GtkTreeIter Liter;
   GtkCellRenderer *Lcellrender;
   GtkTreeViewColumn *Lcell;
+  GtkComboBox *Lisolevel;
 
-  if (Aaction == MENU_NEW) {
+  if (Aaction & MENU_NEW) {
     Lmodel = gtk_list_store_new(3, G_TYPE_STRING, GDK_TYPE_PIXBUF, 
G_TYPE_STRING);
     gtk_tree_selection_set_mode(Lselection, GTK_SELECTION_BROWSE);
     gtk_tree_view_set_model(Ltopmenu, GTK_TREE_MODEL(Lmodel));
@@ -1430,6 +1443,13 @@
   gtk_list_store_set(Lmodel, &Liter, 0, "bodycdother", 1, GMenuOther, 2, 
_("Other operations"), -1);
  
   gtk_tree_view_columns_autosize(Ltopmenu); 
+
+  /* mise a jour combo "iso level" */
+  if (Aaction & COMBO_UPDATE) {
+    Lisolevel = g_hash_table_lookup(Ahash, "dataisolevel");
+    remplirecombo_full(Lisolevel, "", Gisolevel,
+        TRUE, conf_get_string("dataisolevel"), 
conf_get_int("mkisofs_support_isov2"));
+  }
 }