Go to the GUP proposed ordering of buttons with [OK] in the lower right

Fri Nov  2 14:55:53 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/{gtkcolorseldialog.c,gtkfilesel.c,gtkfontsel.c,
	gtkgamma.c,gtkmessagedialog.c}: Go to the GUP
	proposed ordering of buttons with [OK] in the lower
	right hand corner. Patch from Gregory Merchan,
	#56331.

diff --git a/ChangeLog b/ChangeLog
index 949db8d94dcdf6a718991c296ff8d85c85c649b2..b04af65e894722df8055c3b367c2c95f2f494e07 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Fri Nov  2 14:55:53 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/{gtkcolorseldialog.c,gtkfilesel.c,gtkfontsel.c,
+       gtkgamma.c,gtkmessagedialog.c}: Go to the GUP
+       proposed ordering of buttons with [OK] in the lower
+       right hand corner. Patch from Gregory Merchan,
+       #56331.
+
 Fri Nov  2 11:51:49 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtklabel.c (gtk_label_select_region_index): remove

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 949db8d94dcdf6a718991c296ff8d85c85c649b2..b04af65e894722df8055c3b367c2c95f2f494e07 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+Fri Nov  2 14:55:53 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/{gtkcolorseldialog.c,gtkfilesel.c,gtkfontsel.c,
+       gtkgamma.c,gtkmessagedialog.c}: Go to the GUP
+       proposed ordering of buttons with [OK] in the lower
+       right hand corner. Patch from Gregory Merchan,
+       #56331.
+
 Fri Nov  2 11:51:49 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtklabel.c (gtk_label_select_region_index): remove

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 949db8d94dcdf6a718991c296ff8d85c85c649b2..b04af65e894722df8055c3b367c2c95f2f494e07 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Fri Nov  2 14:55:53 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/{gtkcolorseldialog.c,gtkfilesel.c,gtkfontsel.c,
+       gtkgamma.c,gtkmessagedialog.c}: Go to the GUP
+       proposed ordering of buttons with [OK] in the lower
+       right hand corner. Patch from Gregory Merchan,
+       #56331.
+
 Fri Nov  2 11:51:49 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtklabel.c (gtk_label_select_region_index): remove

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 949db8d94dcdf6a718991c296ff8d85c85c649b2..b04af65e894722df8055c3b367c2c95f2f494e07 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+Fri Nov  2 14:55:53 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/{gtkcolorseldialog.c,gtkfilesel.c,gtkfontsel.c,
+       gtkgamma.c,gtkmessagedialog.c}: Go to the GUP
+       proposed ordering of buttons with [OK] in the lower
+       right hand corner. Patch from Gregory Merchan,
+       #56331.
+
 Fri Nov  2 11:51:49 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtklabel.c (gtk_label_select_region_index): remove

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 949db8d94dcdf6a718991c296ff8d85c85c649b2..b04af65e894722df8055c3b367c2c95f2f494e07 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Fri Nov  2 14:55:53 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/{gtkcolorseldialog.c,gtkfilesel.c,gtkfontsel.c,
+       gtkgamma.c,gtkmessagedialog.c}: Go to the GUP
+       proposed ordering of buttons with [OK] in the lower
+       right hand corner. Patch from Gregory Merchan,
+       #56331.
+
 Fri Nov  2 11:51:49 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtklabel.c (gtk_label_select_region_index): remove

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 949db8d94dcdf6a718991c296ff8d85c85c649b2..b04af65e894722df8055c3b367c2c95f2f494e07 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Fri Nov  2 14:55:53 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/{gtkcolorseldialog.c,gtkfilesel.c,gtkfontsel.c,
+       gtkgamma.c,gtkmessagedialog.c}: Go to the GUP
+       proposed ordering of buttons with [OK] in the lower
+       right hand corner. Patch from Gregory Merchan,
+       #56331.
+
 Fri Nov  2 11:51:49 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtklabel.c (gtk_label_select_region_index): remove

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 949db8d94dcdf6a718991c296ff8d85c85c649b2..b04af65e894722df8055c3b367c2c95f2f494e07 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Fri Nov  2 14:55:53 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/{gtkcolorseldialog.c,gtkfilesel.c,gtkfontsel.c,
+       gtkgamma.c,gtkmessagedialog.c}: Go to the GUP
+       proposed ordering of buttons with [OK] in the lower
+       right hand corner. Patch from Gregory Merchan,
+       #56331.
+
 Fri Nov  2 11:51:49 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtklabel.c (gtk_label_select_region_index): remove

diff --git a/gtk/gtkcolorseldialog.c b/gtk/gtkcolorseldialog.c
index 7dd1e97e6e01834e462c000672009991f6d6d1d5..aa010b02d28af4ee5caf061878b3dca0e3b522b2 100644 (file)
--- a/gtk/gtkcolorseldialog.c
+++ b/gtk/gtkcolorseldialog.c
@@ -96,16 +96,16 @@ gtk_color_selection_dialog_init (GtkColorSelectionDialog *colorseldiag)
   
   action_area_button_box = GTK_DIALOG (colorseldiag)->action_area;
 
+  colorseldiag->cancel_button = gtk_dialog_add_button (GTK_DIALOG (colorseldiag),
+                                                       GTK_STOCK_CANCEL,
+                                                       GTK_RESPONSE_CANCEL);
+
   colorseldiag->ok_button = gtk_dialog_add_button (GTK_DIALOG (colorseldiag),
                                                    GTK_STOCK_OK,
                                                    GTK_RESPONSE_OK);
                                                    
   gtk_widget_grab_default (colorseldiag->ok_button);
   
-  colorseldiag->cancel_button = gtk_dialog_add_button (GTK_DIALOG (colorseldiag),
-                                                       GTK_STOCK_CANCEL,
-                                                       GTK_RESPONSE_CANCEL);
-  
   colorseldiag->help_button = gtk_dialog_add_button (GTK_DIALOG (colorseldiag),
                                                      GTK_STOCK_HELP,
                                                      GTK_RESPONSE_HELP);

diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c
index baeba13b34a2759e1c3099b36e6d8ecde5c055b8..554e3068ede58c17996548b3263768059e6eea45 100644 (file)
--- a/gtk/gtkfilesel.c
+++ b/gtk/gtkfilesel.c
@@ -684,6 +684,10 @@ gtk_file_selection_init (GtkFileSelection *filesel)
   /*  The OK/Cancel button area */
   confirm_area = dialog->action_area;
 
+  /*  The Cancel button  */
+  filesel->cancel_button = gtk_dialog_add_button (dialog,
+                                                  GTK_STOCK_CANCEL,
+                                                  GTK_RESPONSE_CANCEL);
   /*  The OK button  */
   filesel->ok_button = gtk_dialog_add_button (dialog,
                                               GTK_STOCK_OK,
@@ -691,11 +695,6 @@ gtk_file_selection_init (GtkFileSelection *filesel)
   
   gtk_widget_grab_default (filesel->ok_button);
 
-  /*  The Cancel button  */
-  filesel->cancel_button = gtk_dialog_add_button (dialog,
-                                                  GTK_STOCK_CANCEL,
-                                                  GTK_RESPONSE_CANCEL);
-
   /*  The selection entry widget  */
   entry_vbox = gtk_vbox_new (FALSE, 2);
   gtk_box_pack_end (GTK_BOX (filesel->main_vbox), entry_vbox, FALSE, FALSE, 2);
@@ -1309,15 +1308,6 @@ gtk_file_selection_create_dir (GtkWidget *widget,
   gtk_widget_show (fs->fileop_entry);
   
   /* buttons */
-  button = gtk_button_new_with_label (_("Create"));
-  gtk_signal_connect (GTK_OBJECT (button), "clicked",
-                     (GtkSignalFunc) gtk_file_selection_create_dir_confirmed, 
-                     (gpointer) fs);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area),
-                    button, TRUE, TRUE, 0);
-  GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
-  gtk_widget_show (button);
-  
   button = gtk_button_new_with_label (_("Cancel"));
   gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
                             (GtkSignalFunc) gtk_widget_destroy, 
@@ -1330,6 +1320,15 @@ gtk_file_selection_create_dir (GtkWidget *widget,
 
   gtk_widget_grab_focus (fs->fileop_entry);
 
+  button = gtk_button_new_with_label (_("Create"));
+  gtk_signal_connect (GTK_OBJECT (button), "clicked",
+                     (GtkSignalFunc) gtk_file_selection_create_dir_confirmed, 
+                     (gpointer) fs);
+  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area),
+                    button, TRUE, TRUE, 0);
+  GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+  gtk_widget_show (button);
+  
   gtk_widget_show (dialog);
 }
 
@@ -1437,15 +1436,6 @@ gtk_file_selection_delete_file (GtkWidget *widget,
   g_free (buf);
   
   /* buttons */
-  button = gtk_button_new_with_label (_("Delete"));
-  gtk_signal_connect (GTK_OBJECT (button), "clicked",
-                     (GtkSignalFunc) gtk_file_selection_delete_file_confirmed, 
-                     (gpointer) fs);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area),
-                     button, TRUE, TRUE, 0);
-  GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
-  gtk_widget_show (button);
-  
   button = gtk_button_new_with_label (_("Cancel"));
   gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
                             (GtkSignalFunc) gtk_widget_destroy, 
@@ -1456,6 +1446,15 @@ gtk_file_selection_delete_file (GtkWidget *widget,
   gtk_widget_grab_default (button);
   gtk_widget_show (button);
 
+  button = gtk_button_new_with_label (_("Delete"));
+  gtk_signal_connect (GTK_OBJECT (button), "clicked",
+                     (GtkSignalFunc) gtk_file_selection_delete_file_confirmed, 
+                     (gpointer) fs);
+  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area),
+                     button, TRUE, TRUE, 0);
+  GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+  gtk_widget_show (button);
+  
   gtk_widget_show (dialog);
 
 }
@@ -1591,15 +1590,6 @@ gtk_file_selection_rename_file (GtkWidget *widget,
                              0, strlen (fs->fileop_file));
 
   /* buttons */
-  button = gtk_button_new_with_label (_("Rename"));
-  gtk_signal_connect (GTK_OBJECT (button), "clicked",
-                     (GtkSignalFunc) gtk_file_selection_rename_file_confirmed, 
-                     (gpointer) fs);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area),
-                     button, TRUE, TRUE, 0);
-  GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
-  gtk_widget_show (button);
-  
   button = gtk_button_new_with_label (_("Cancel"));
   gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
                             (GtkSignalFunc) gtk_widget_destroy, 
@@ -1612,6 +1602,15 @@ gtk_file_selection_rename_file (GtkWidget *widget,
 
   gtk_widget_grab_focus (fs->fileop_entry);
 
+  button = gtk_button_new_with_label (_("Rename"));
+  gtk_signal_connect (GTK_OBJECT (button), "clicked",
+                     (GtkSignalFunc) gtk_file_selection_rename_file_confirmed, 
+                     (gpointer) fs);
+  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area),
+                     button, TRUE, TRUE, 0);
+  GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+  gtk_widget_show (button);
+  
   gtk_widget_show (dialog);
 }
 

diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c
index 95c43472f71310ac6b234172245dadaf731cfc03..f9a67a88e0c44c9c31ef97508771d1508677499a 100644 (file)
--- a/gtk/gtkfontsel.c
+++ b/gtk/gtkfontsel.c
@@ -1040,22 +1040,21 @@ gtk_font_selection_dialog_init (GtkFontSelectionDialog *fontseldiag)
   
   /* Create the action area */
   fontseldiag->action_area = dialog->action_area;
-  
-  fontseldiag->ok_button = gtk_dialog_add_button (dialog,
-                                                  GTK_STOCK_OK,
-                                                  GTK_RESPONSE_OK);
-  gtk_widget_grab_default (fontseldiag->ok_button);
-  
+
+  fontseldiag->cancel_button = gtk_dialog_add_button (dialog,
+                                                      GTK_STOCK_CANCEL,
+                                                      GTK_RESPONSE_CANCEL);
+
   fontseldiag->apply_button = gtk_dialog_add_button (dialog,
                                                      GTK_STOCK_APPLY,
                                                      GTK_RESPONSE_APPLY);
   gtk_widget_hide (fontseldiag->apply_button);
 
+  fontseldiag->ok_button = gtk_dialog_add_button (dialog,
+                                                  GTK_STOCK_OK,
+                                                  GTK_RESPONSE_OK);
+  gtk_widget_grab_default (fontseldiag->ok_button);
   
-  fontseldiag->cancel_button = gtk_dialog_add_button (dialog,
-                                                      GTK_STOCK_CANCEL,
-                                                      GTK_RESPONSE_CANCEL);
-
   gtk_window_set_title (GTK_WINDOW (fontseldiag),
                         _("Font Selection"));
 

diff --git a/gtk/gtkgamma.c b/gtk/gtkgamma.c
index 2eb3c4e795149e606594cf82030abfde6fea5151..eb5ab659d30d9fe732673723098ddf4d6f204d07 100644 (file)
--- a/gtk/gtkgamma.c
+++ b/gtk/gtkgamma.c
@@ -413,6 +413,12 @@ button_clicked_callback (GtkWidget *w, gpointer data)
          
          /* fill in action area: */
          hbox = GTK_DIALOG (c->gamma_dialog)->action_area;
+
+         button = gtk_button_new_with_label (_("Cancel"));
+         gtk_signal_connect (GTK_OBJECT (button), "clicked",
+                             (GtkSignalFunc) gamma_cancel_callback, c);
+         gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
+         gtk_widget_show (button);
          
          button = gtk_button_new_with_label (_("OK"));
          GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
@@ -422,12 +428,6 @@ button_clicked_callback (GtkWidget *w, gpointer data)
          gtk_widget_grab_default (button);
          gtk_widget_show (button);
          
-         button = gtk_button_new_with_label (_("Cancel"));
-         gtk_signal_connect (GTK_OBJECT (button), "clicked",
-                             (GtkSignalFunc) gamma_cancel_callback, c);
-         gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
-         gtk_widget_show (button);
-         
          gtk_widget_show (c->gamma_dialog);
        }
     }

diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c
index 06f954f1214b12df60ea61e5711eec259fb042c9..3fdb91ef3b61b20930c3f8f85aedf9abf1004f36 100644 (file)
--- a/gtk/gtkmessagedialog.c
+++ b/gtk/gtkmessagedialog.c
@@ -245,21 +245,21 @@ gtk_message_dialog_new (GtkWindow     *parent,
       break;
 
     case GTK_BUTTONS_YES_NO:
-      gtk_dialog_add_button (dialog,
-                             GTK_STOCK_YES,
-                             GTK_RESPONSE_YES);
       gtk_dialog_add_button (dialog,
                              GTK_STOCK_NO,
                              GTK_RESPONSE_NO);
+      gtk_dialog_add_button (dialog,
+                             GTK_STOCK_YES,
+                             GTK_RESPONSE_YES);
       break;
 
     case GTK_BUTTONS_OK_CANCEL:
-      gtk_dialog_add_button (dialog,
-                             GTK_STOCK_OK,
-                             GTK_RESPONSE_OK);
       gtk_dialog_add_button (dialog,
                              GTK_STOCK_CANCEL,
                              GTK_RESPONSE_CANCEL);
+      gtk_dialog_add_button (dialog,
+                             GTK_STOCK_OK,
+                             GTK_RESPONSE_OK);
       break;
       
     default: