as we alreadey discussed on #gimp

--Sven

ChangeLog

@@ -1,3 +1,11 @@
+Wed Nov 24 01:23:34 MET 1999  Sven Neumann <sven@gimp.org>
+
+	* app/preferences_dialog.c: be more instructive about the
+	speed tradeoff of the interpolation type.
+
+	* plug-ins/common/jpeg.c: reorder the menu for DCT setting, so
+	the order matches the speed/quality
+
 Wed Nov 24 00:45:27 MET 1999  Sven Neumann <sven@gimp.org>
 
 	* plug-ins/AlienMap/AlienMap.c

app/dialogs/preferences-dialog.c

@@ -1436,11 +1436,11 @@ file_pref_cmd_callback (GtkWidget *widget,
   optionmenu =
     gimp_option_menu_new (file_prefs_toggle_callback,
 			  (gpointer) interpolation_type,
-			  _("Nearest Neighbor"), &interpolation_type,
+			  _("Nearest Neighbor (Fast)"), &interpolation_type,
 			  (gpointer) NEAREST_NEIGHBOR_INTERPOLATION,
 			  _("Linear"), &interpolation_type,
 			  (gpointer) LINEAR_INTERPOLATION,
-			  _("Cubic"), &interpolation_type,
+			  _("Cubic (Slow)"), &interpolation_type,
 			  (gpointer) CUBIC_INTERPOLATION,
 			  NULL);
   gimp_table_attach_aligned (GTK_TABLE (table), 0,

app/gui/preferences-dialog.c

@@ -1436,11 +1436,11 @@ file_pref_cmd_callback (GtkWidget *widget,
   optionmenu =
     gimp_option_menu_new (file_prefs_toggle_callback,
 			  (gpointer) interpolation_type,
-			  _("Nearest Neighbor"), &interpolation_type,
+			  _("Nearest Neighbor (Fast)"), &interpolation_type,
 			  (gpointer) NEAREST_NEIGHBOR_INTERPOLATION,
 			  _("Linear"), &interpolation_type,
 			  (gpointer) LINEAR_INTERPOLATION,
-			  _("Cubic"), &interpolation_type,
+			  _("Cubic (Slow)"), &interpolation_type,
 			  (gpointer) CUBIC_INTERPOLATION,
 			  NULL);
   gimp_table_attach_aligned (GTK_TABLE (table), 0,

app/preferences_dialog.c

@@ -1436,11 +1436,11 @@ file_pref_cmd_callback (GtkWidget *widget,
   optionmenu =
     gimp_option_menu_new (file_prefs_toggle_callback,
 			  (gpointer) interpolation_type,
-			  _("Nearest Neighbor"), &interpolation_type,
+			  _("Nearest Neighbor (Fast)"), &interpolation_type,
 			  (gpointer) NEAREST_NEIGHBOR_INTERPOLATION,
 			  _("Linear"), &interpolation_type,
 			  (gpointer) LINEAR_INTERPOLATION,
-			  _("Cubic"), &interpolation_type,
+			  _("Cubic (Slow)"), &interpolation_type,
 			  (gpointer) CUBIC_INTERPOLATION,
 			  NULL);
   gimp_table_attach_aligned (GTK_TABLE (table), 0,

plug-ins/common/jpeg.c

@@ -1729,12 +1729,12 @@ save_dialog ()
   /* DCT method */
   menu = gtk_menu_new ();
 
-  add_menu_item(menu, _("Integer"), 0, dct_callback);
-  add_menu_item(menu, _("Fast integer"), 1, dct_callback);
+  add_menu_item(menu, _("Fast integer"),   1, dct_callback);
+  add_menu_item(menu, _("Integer"),        0, dct_callback);
   add_menu_item(menu, _("Floating-point"), 2, dct_callback);
 
   dct_menu = gtk_option_menu_new ();
-
+ 
   label = gtk_label_new (_("DCT method (speed/quality tradeoff)"));
   gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
   gtk_table_attach (GTK_TABLE (table), label, 0, 1, 8, 9, GTK_FILL | GTK_EXPAND, GTK_FILL, 5, 0);
@@ -1742,6 +1742,7 @@ save_dialog ()
   gtk_widget_show (label);
   gtk_widget_show (dct_menu);
   gtk_option_menu_set_menu (GTK_OPTION_MENU (dct_menu), menu);
+  gtk_option_menu_set_history (GTK_OPTION_MENU (dct_menu), 1);
 
   dtype = gimp_drawable_type (drawable_ID_global);
   if (dtype != RGB_IMAGE && dtype != RGBA_IMAGE) 

plug-ins/jpeg/jpeg-load.c

@@ -1729,12 +1729,12 @@ save_dialog ()
   /* DCT method */
   menu = gtk_menu_new ();
 
-  add_menu_item(menu, _("Integer"), 0, dct_callback);
-  add_menu_item(menu, _("Fast integer"), 1, dct_callback);
+  add_menu_item(menu, _("Fast integer"),   1, dct_callback);
+  add_menu_item(menu, _("Integer"),        0, dct_callback);
   add_menu_item(menu, _("Floating-point"), 2, dct_callback);
 
   dct_menu = gtk_option_menu_new ();
-
+ 
   label = gtk_label_new (_("DCT method (speed/quality tradeoff)"));
   gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
   gtk_table_attach (GTK_TABLE (table), label, 0, 1, 8, 9, GTK_FILL | GTK_EXPAND, GTK_FILL, 5, 0);
@@ -1742,6 +1742,7 @@ save_dialog ()
   gtk_widget_show (label);
   gtk_widget_show (dct_menu);
   gtk_option_menu_set_menu (GTK_OPTION_MENU (dct_menu), menu);
+  gtk_option_menu_set_history (GTK_OPTION_MENU (dct_menu), 1);
 
   dtype = gimp_drawable_type (drawable_ID_global);
   if (dtype != RGB_IMAGE && dtype != RGBA_IMAGE) 

plug-ins/jpeg/jpeg-load.h

@@ -1729,12 +1729,12 @@ save_dialog ()
   /* DCT method */
   menu = gtk_menu_new ();
 
-  add_menu_item(menu, _("Integer"), 0, dct_callback);
-  add_menu_item(menu, _("Fast integer"), 1, dct_callback);
+  add_menu_item(menu, _("Fast integer"),   1, dct_callback);
+  add_menu_item(menu, _("Integer"),        0, dct_callback);
   add_menu_item(menu, _("Floating-point"), 2, dct_callback);
 
   dct_menu = gtk_option_menu_new ();
-
+ 
   label = gtk_label_new (_("DCT method (speed/quality tradeoff)"));
   gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
   gtk_table_attach (GTK_TABLE (table), label, 0, 1, 8, 9, GTK_FILL | GTK_EXPAND, GTK_FILL, 5, 0);
@@ -1742,6 +1742,7 @@ save_dialog ()
   gtk_widget_show (label);
   gtk_widget_show (dct_menu);
   gtk_option_menu_set_menu (GTK_OPTION_MENU (dct_menu), menu);
+  gtk_option_menu_set_history (GTK_OPTION_MENU (dct_menu), 1);
 
   dtype = gimp_drawable_type (drawable_ID_global);
   if (dtype != RGB_IMAGE && dtype != RGBA_IMAGE) 

plug-ins/jpeg/jpeg-save.c

@@ -1729,12 +1729,12 @@ save_dialog ()
   /* DCT method */
   menu = gtk_menu_new ();
 
-  add_menu_item(menu, _("Integer"), 0, dct_callback);
-  add_menu_item(menu, _("Fast integer"), 1, dct_callback);
+  add_menu_item(menu, _("Fast integer"),   1, dct_callback);
+  add_menu_item(menu, _("Integer"),        0, dct_callback);
   add_menu_item(menu, _("Floating-point"), 2, dct_callback);
 
   dct_menu = gtk_option_menu_new ();
-
+ 
   label = gtk_label_new (_("DCT method (speed/quality tradeoff)"));
   gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
   gtk_table_attach (GTK_TABLE (table), label, 0, 1, 8, 9, GTK_FILL | GTK_EXPAND, GTK_FILL, 5, 0);
@@ -1742,6 +1742,7 @@ save_dialog ()
   gtk_widget_show (label);
   gtk_widget_show (dct_menu);
   gtk_option_menu_set_menu (GTK_OPTION_MENU (dct_menu), menu);
+  gtk_option_menu_set_history (GTK_OPTION_MENU (dct_menu), 1);
 
   dtype = gimp_drawable_type (drawable_ID_global);
   if (dtype != RGB_IMAGE && dtype != RGBA_IMAGE) 

plug-ins/jpeg/jpeg-save.h

@@ -1729,12 +1729,12 @@ save_dialog ()
   /* DCT method */
   menu = gtk_menu_new ();
 
-  add_menu_item(menu, _("Integer"), 0, dct_callback);
-  add_menu_item(menu, _("Fast integer"), 1, dct_callback);
+  add_menu_item(menu, _("Fast integer"),   1, dct_callback);
+  add_menu_item(menu, _("Integer"),        0, dct_callback);
   add_menu_item(menu, _("Floating-point"), 2, dct_callback);
 
   dct_menu = gtk_option_menu_new ();
-
+ 
   label = gtk_label_new (_("DCT method (speed/quality tradeoff)"));
   gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
   gtk_table_attach (GTK_TABLE (table), label, 0, 1, 8, 9, GTK_FILL | GTK_EXPAND, GTK_FILL, 5, 0);
@@ -1742,6 +1742,7 @@ save_dialog ()
   gtk_widget_show (label);
   gtk_widget_show (dct_menu);
   gtk_option_menu_set_menu (GTK_OPTION_MENU (dct_menu), menu);
+  gtk_option_menu_set_history (GTK_OPTION_MENU (dct_menu), 1);
 
   dtype = gimp_drawable_type (drawable_ID_global);
   if (dtype != RGB_IMAGE && dtype != RGBA_IMAGE) 

plug-ins/jpeg/jpeg.c

@@ -1729,12 +1729,12 @@ save_dialog ()
   /* DCT method */
   menu = gtk_menu_new ();
 
-  add_menu_item(menu, _("Integer"), 0, dct_callback);
-  add_menu_item(menu, _("Fast integer"), 1, dct_callback);
+  add_menu_item(menu, _("Fast integer"),   1, dct_callback);
+  add_menu_item(menu, _("Integer"),        0, dct_callback);
   add_menu_item(menu, _("Floating-point"), 2, dct_callback);
 
   dct_menu = gtk_option_menu_new ();
-
+ 
   label = gtk_label_new (_("DCT method (speed/quality tradeoff)"));
   gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
   gtk_table_attach (GTK_TABLE (table), label, 0, 1, 8, 9, GTK_FILL | GTK_EXPAND, GTK_FILL, 5, 0);
@@ -1742,6 +1742,7 @@ save_dialog ()
   gtk_widget_show (label);
   gtk_widget_show (dct_menu);
   gtk_option_menu_set_menu (GTK_OPTION_MENU (dct_menu), menu);
+  gtk_option_menu_set_history (GTK_OPTION_MENU (dct_menu), 1);
 
   dtype = gimp_drawable_type (drawable_ID_global);
   if (dtype != RGB_IMAGE && dtype != RGBA_IMAGE) 

plug-ins/jpeg/jpeg.h

@@ -1729,12 +1729,12 @@ save_dialog ()
   /* DCT method */
   menu = gtk_menu_new ();
 
-  add_menu_item(menu, _("Integer"), 0, dct_callback);
-  add_menu_item(menu, _("Fast integer"), 1, dct_callback);
+  add_menu_item(menu, _("Fast integer"),   1, dct_callback);
+  add_menu_item(menu, _("Integer"),        0, dct_callback);
   add_menu_item(menu, _("Floating-point"), 2, dct_callback);
 
   dct_menu = gtk_option_menu_new ();
-
+ 
   label = gtk_label_new (_("DCT method (speed/quality tradeoff)"));
   gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
   gtk_table_attach (GTK_TABLE (table), label, 0, 1, 8, 9, GTK_FILL | GTK_EXPAND, GTK_FILL, 5, 0);
@@ -1742,6 +1742,7 @@ save_dialog ()
   gtk_widget_show (label);
   gtk_widget_show (dct_menu);
   gtk_option_menu_set_menu (GTK_OPTION_MENU (dct_menu), menu);
+  gtk_option_menu_set_history (GTK_OPTION_MENU (dct_menu), 1);
 
   dtype = gimp_drawable_type (drawable_ID_global);
   if (dtype != RGB_IMAGE && dtype != RGBA_IMAGE)