Applied a patch from Patrice Tremblay that makes (almost) all dialogs obey

2005-02-08  Sven Neumann  <sven@gimp.org>

	Applied a patch from Patrice Tremblay that makes (almost) all
	dialogs obey the "gtk-alternative-button-order" setting
	(bug #166678). Changes too many files to list them all...

ChangeLog

+2005-02-08  Sven Neumann  <sven@gimp.org>
+
+	Applied a patch from Patrice Tremblay that makes (almost) all
+	dialogs obey the "gtk-alternative-button-order" setting
+	(bug #166678). Changes too many files to list them all...
+
 2005-02-08  Sven Neumann  <sven@gimp.org>
 
 	* tools/gimp-remote.c: add the gtk+ options to the GOptionContext.

app/dialogs/channel-options-dialog.c

@@ -115,6 +115,11 @@ channel_options_dialog_new (GimpImage     *gimage,
 		     (GWeakNotify) g_free,
 		     options);
 
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (options->dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
   hbox = gtk_hbox_new (FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
   gtk_container_add (GTK_CONTAINER (GTK_DIALOG (options->dialog)->vbox), hbox);

app/dialogs/convert-dialog.c

@@ -129,6 +129,11 @@ convert_dialog_new (GimpImage    *gimage,
 
                               NULL);
 
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog->dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
   gtk_window_set_resizable (GTK_WINDOW (dialog->dialog), FALSE);
 
   g_object_weak_ref (G_OBJECT (dialog->dialog),

app/dialogs/file-open-dialog.c

@@ -81,6 +81,11 @@ file_open_dialog_new (Gimp *gimp)
                     G_CALLBACK (file_open_dialog_response),
                     gimp);
 
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
   return dialog;
 }
 

app/dialogs/file-open-location-dialog.c

@@ -83,6 +83,11 @@ file_open_location_dialog_new (Gimp *gimp)
                     G_CALLBACK (file_open_location_response),
                     gimp);
 
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG(dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
   hbox = gtk_hbox_new (FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
   gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),

app/dialogs/file-save-dialog.c

@@ -79,6 +79,11 @@ file_save_dialog_new (Gimp *gimp)
                                  GTK_STOCK_SAVE,
                                  GIMP_HELP_FILE_SAVE);
 
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
   uri = g_object_get_data (G_OBJECT (gimp), "gimp-file-save-last-uri");
 
   if (uri)
@@ -191,6 +196,11 @@ file_save_overwrite (GtkWidget   *save_dialog,
 
                              NULL);
 
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
   g_signal_connect (dialog, "response",
                     G_CALLBACK (file_save_overwrite_response),
                     overwrite_data);

app/dialogs/grid-dialog.c

@@ -91,6 +91,12 @@ grid_dialog_new (GimpImage *gimage,
 
   gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
 
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           GRID_RESPONSE_RESET,
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
   g_signal_connect (dialog, "response",
                     G_CALLBACK (grid_dialog_response),
                     dialog);

app/dialogs/image-merge-layers-dialog.c

@@ -74,6 +74,11 @@ image_merge_layers_dialog_new (GimpImage     *image,
   g_object_weak_ref (G_OBJECT (dialog->dialog),
                      (GWeakNotify) g_free, dialog);
 
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog->dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
   frame = gimp_int_radio_group_new (TRUE, _("Final, Merged Layer should be:"),
                                     G_CALLBACK (gimp_radio_button_update),
                                     &dialog->merge_type, dialog->merge_type,

app/dialogs/image-new-dialog.c

@@ -112,6 +112,12 @@ image_new_dialog_new (Gimp *gimp)
                     G_CALLBACK (image_new_response),
                     dialog);
 
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog->dialog),
+                                           RESPONSE_RESET,
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
   main_vbox = gtk_vbox_new (FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog->dialog)->vbox),

app/dialogs/image-scale-dialog.c

@@ -177,6 +177,11 @@ image_scale_confirm_dialog (ImageScaleDialog *dialog)
                     G_CALLBACK (image_scale_confirm_response),
                     dialog);
 
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (widget),
+                                              GTK_RESPONSE_OK,
+                                              GTK_RESPONSE_CANCEL,
+                                              -1);
+
   return widget;
 }
 

app/dialogs/layer-add-mask-dialog.c

@@ -75,6 +75,11 @@ layer_add_mask_dialog_new (GimpLayer       *layer,
   g_object_weak_ref (G_OBJECT (dialog->dialog),
 		     (GWeakNotify) g_free, dialog);
 
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog->dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
   vbox = gtk_vbox_new (FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
   gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog->dialog)->vbox), vbox);

app/dialogs/layer-options-dialog.c

@@ -97,6 +97,11 @@ layer_options_dialog_new (GimpImage    *gimage,
 		     (GWeakNotify) g_free,
 		     options);
 
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (options->dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
   vbox = gtk_vbox_new (FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
   gtk_container_add (GTK_CONTAINER (GTK_DIALOG (options->dialog)->vbox),

app/dialogs/offset-dialog.c

@@ -117,6 +117,11 @@ offset_dialog_new (GimpDrawable *drawable,
 
                               NULL);
 
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog->dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
   gtk_window_set_resizable (GTK_WINDOW (dialog->dialog), FALSE);
 
   g_object_weak_ref (G_OBJECT (dialog->dialog),

app/dialogs/palette-import-dialog.c

@@ -182,6 +182,11 @@ palette_import_dialog_new (Gimp *gimp)
 
                               NULL);
 
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (import_dialog->dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
   g_signal_connect (import_dialog->dialog, "response",
                     G_CALLBACK (palette_import_response),
                     import_dialog);

app/dialogs/preferences-dialog.c

@@ -1200,6 +1200,11 @@ prefs_dialog_new (Gimp       *gimp,
                     G_CALLBACK (prefs_response),
                     dialog);
 
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
   /* The main hbox */
   hbox = gtk_hbox_new (FALSE, 12);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);

app/dialogs/print-size-dialog.c

@@ -119,6 +119,12 @@ print_size_dialog_new (GimpImage              *image,
                     G_CALLBACK (print_size_dialog_response),
                     private);
 
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           RESPONSE_RESET,
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
   private->image     = image;
   private->callback  = callback;
   private->user_data = user_data;

app/dialogs/quit-dialog.c

@@ -109,6 +109,11 @@ quit_dialog_new (Gimp *gimp)
                            G_CALLBACK (quit_dialog_container_changed),
                            box, 0);
 
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
   preview_size = gimp->config->layer_preview_size;
   rows         = CLAMP (gimp_container_num_children (images), 3, 6);
 

app/dialogs/resize-dialog.c

@@ -143,6 +143,12 @@ resize_dialog_new (GimpViewable       *viewable,
 
   gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
 
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+					      RESPONSE_RESET,
+                                              GTK_RESPONSE_OK,
+                                              GTK_RESPONSE_CANCEL,
+                                              -1);
+
   private = g_new0 (ResizeDialog, 1);
 
   g_object_weak_ref (G_OBJECT (dialog), (GWeakNotify) g_free, private);

app/dialogs/resolution-calibrate-dialog.c

@@ -75,6 +75,11 @@ resolution_calibrate_dialog (GtkWidget  *resolution_entry,
 
 			    NULL);
 
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
   screen = gtk_widget_get_screen (dialog);
 
   ruler_width  = gdk_screen_get_width (screen);

app/dialogs/scale-dialog.c

@@ -122,6 +122,12 @@ scale_dialog_new (GimpViewable          *viewable,
 
                                      NULL);
 
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           RESPONSE_RESET,
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
   gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
 
   private = g_new0 (ScaleDialog, 1);