callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Owen Taylor
2001-11-02 20:02:44 +00:00
committed by Owen Taylor
parent 1b1b2e8264
commit 782107bc11
12 changed files with 112 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -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> Fri Nov 2 11:51:49 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtklabel.c (gtk_label_select_region_index): remove * gtk/gtklabel.c (gtk_label_select_region_index): remove

8
ChangeLog.pre-2-0
View File

@ -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> Fri Nov 2 11:51:49 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtklabel.c (gtk_label_select_region_index): remove * gtk/gtklabel.c (gtk_label_select_region_index): remove

8
ChangeLog.pre-2-10
View File

@ -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> Fri Nov 2 11:51:49 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtklabel.c (gtk_label_select_region_index): remove * gtk/gtklabel.c (gtk_label_select_region_index): remove

8
ChangeLog.pre-2-2
View File

@ -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> Fri Nov 2 11:51:49 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtklabel.c (gtk_label_select_region_index): remove * gtk/gtklabel.c (gtk_label_select_region_index): remove

8
ChangeLog.pre-2-4
View File

@ -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> Fri Nov 2 11:51:49 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtklabel.c (gtk_label_select_region_index): remove * gtk/gtklabel.c (gtk_label_select_region_index): remove

8
ChangeLog.pre-2-6
View File

@ -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> Fri Nov 2 11:51:49 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtklabel.c (gtk_label_select_region_index): remove * gtk/gtklabel.c (gtk_label_select_region_index): remove

8
ChangeLog.pre-2-8
View File

@ -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> Fri Nov 2 11:51:49 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtklabel.c (gtk_label_select_region_index): remove * gtk/gtklabel.c (gtk_label_select_region_index): remove

8
gtk/gtkcolorseldialog.c
View File

@ -96,16 +96,16 @@ gtk_color_selection_dialog_init (GtkColorSelectionDialog *colorseldiag)
action_area_button_box = GTK_DIALOG (colorseldiag)->action_area; 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), colorseldiag->ok_button = gtk_dialog_add_button (GTK_DIALOG (colorseldiag),
GTK_STOCK_OK, GTK_STOCK_OK,
GTK_RESPONSE_OK); GTK_RESPONSE_OK);
gtk_widget_grab_default (colorseldiag->ok_button); 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), colorseldiag->help_button = gtk_dialog_add_button (GTK_DIALOG (colorseldiag),
GTK_STOCK_HELP, GTK_STOCK_HELP,
GTK_RESPONSE_HELP); GTK_RESPONSE_HELP);

63
gtk/gtkfilesel.c
View File

@ -684,6 +684,10 @@ gtk_file_selection_init (GtkFileSelection *filesel)
/* The OK/Cancel button area */ /* The OK/Cancel button area */
confirm_area = dialog->action_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 */ /* The OK button */
filesel->ok_button = gtk_dialog_add_button (dialog, filesel->ok_button = gtk_dialog_add_button (dialog,
GTK_STOCK_OK, GTK_STOCK_OK,
@ -691,11 +695,6 @@ gtk_file_selection_init (GtkFileSelection *filesel)
gtk_widget_grab_default (filesel->ok_button); 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 */ /* The selection entry widget */
entry_vbox = gtk_vbox_new (FALSE, 2); entry_vbox = gtk_vbox_new (FALSE, 2);
gtk_box_pack_end (GTK_BOX (filesel->main_vbox), entry_vbox, FALSE, 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); gtk_widget_show (fs->fileop_entry);
/* buttons */ /* 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")); button = gtk_button_new_with_label (_("Cancel"));
gtk_signal_connect_object (GTK_OBJECT (button), "clicked", gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
(GtkSignalFunc) gtk_widget_destroy, (GtkSignalFunc) gtk_widget_destroy,
@ -1330,6 +1320,15 @@ gtk_file_selection_create_dir (GtkWidget *widget,
gtk_widget_grab_focus (fs->fileop_entry); 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); gtk_widget_show (dialog);
} }
@ -1437,15 +1436,6 @@ gtk_file_selection_delete_file (GtkWidget *widget,
g_free (buf); g_free (buf);
/* buttons */ /* 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")); button = gtk_button_new_with_label (_("Cancel"));
gtk_signal_connect_object (GTK_OBJECT (button), "clicked", gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
(GtkSignalFunc) gtk_widget_destroy, (GtkSignalFunc) gtk_widget_destroy,
@ -1456,6 +1446,15 @@ gtk_file_selection_delete_file (GtkWidget *widget,
gtk_widget_grab_default (button); gtk_widget_grab_default (button);
gtk_widget_show (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); gtk_widget_show (dialog);
} }
@ -1591,15 +1590,6 @@ gtk_file_selection_rename_file (GtkWidget *widget,
0, strlen (fs->fileop_file)); 0, strlen (fs->fileop_file));
/* buttons */ /* 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")); button = gtk_button_new_with_label (_("Cancel"));
gtk_signal_connect_object (GTK_OBJECT (button), "clicked", gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
(GtkSignalFunc) gtk_widget_destroy, (GtkSignalFunc) gtk_widget_destroy,
@ -1612,6 +1602,15 @@ gtk_file_selection_rename_file (GtkWidget *widget,
gtk_widget_grab_focus (fs->fileop_entry); 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); gtk_widget_show (dialog);
} }

15
gtk/gtkfontsel.c
View File

@ -1041,20 +1041,19 @@ gtk_font_selection_dialog_init (GtkFontSelectionDialog *fontseldiag)
/* Create the action area */ /* Create the action area */
fontseldiag->action_area = dialog->action_area; fontseldiag->action_area = dialog->action_area;
fontseldiag->ok_button = gtk_dialog_add_button (dialog, fontseldiag->cancel_button = gtk_dialog_add_button (dialog,
GTK_STOCK_OK, GTK_STOCK_CANCEL,
GTK_RESPONSE_OK); GTK_RESPONSE_CANCEL);
gtk_widget_grab_default (fontseldiag->ok_button);
fontseldiag->apply_button = gtk_dialog_add_button (dialog, fontseldiag->apply_button = gtk_dialog_add_button (dialog,
GTK_STOCK_APPLY, GTK_STOCK_APPLY,
GTK_RESPONSE_APPLY); GTK_RESPONSE_APPLY);
gtk_widget_hide (fontseldiag->apply_button); gtk_widget_hide (fontseldiag->apply_button);
fontseldiag->ok_button = gtk_dialog_add_button (dialog,
fontseldiag->cancel_button = gtk_dialog_add_button (dialog, GTK_STOCK_OK,
GTK_STOCK_CANCEL, GTK_RESPONSE_OK);
GTK_RESPONSE_CANCEL); gtk_widget_grab_default (fontseldiag->ok_button);
gtk_window_set_title (GTK_WINDOW (fontseldiag), gtk_window_set_title (GTK_WINDOW (fontseldiag),
_("Font Selection")); _("Font Selection"));

12
gtk/gtkgamma.c
View File

@ -414,6 +414,12 @@ button_clicked_callback (GtkWidget *w, gpointer data)
/* fill in action area: */ /* fill in action area: */
hbox = GTK_DIALOG (c->gamma_dialog)->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")); button = gtk_button_new_with_label (_("OK"));
GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
gtk_signal_connect (GTK_OBJECT (button), "clicked", gtk_signal_connect (GTK_OBJECT (button), "clicked",
@ -422,12 +428,6 @@ button_clicked_callback (GtkWidget *w, gpointer data)
gtk_widget_grab_default (button); gtk_widget_grab_default (button);
gtk_widget_show (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); gtk_widget_show (c->gamma_dialog);
} }
} }

12
gtk/gtkmessagedialog.c
View File

@ -245,21 +245,21 @@ gtk_message_dialog_new (GtkWindow *parent,
break; break;
case GTK_BUTTONS_YES_NO: case GTK_BUTTONS_YES_NO:
gtk_dialog_add_button (dialog,
GTK_STOCK_YES,
GTK_RESPONSE_YES);
gtk_dialog_add_button (dialog, gtk_dialog_add_button (dialog,
GTK_STOCK_NO, GTK_STOCK_NO,
GTK_RESPONSE_NO); GTK_RESPONSE_NO);
gtk_dialog_add_button (dialog,
GTK_STOCK_YES,
GTK_RESPONSE_YES);
break; break;
case GTK_BUTTONS_OK_CANCEL: case GTK_BUTTONS_OK_CANCEL:
gtk_dialog_add_button (dialog,
GTK_STOCK_OK,
GTK_RESPONSE_OK);
gtk_dialog_add_button (dialog, gtk_dialog_add_button (dialog,
GTK_STOCK_CANCEL, GTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL); GTK_RESPONSE_CANCEL);
gtk_dialog_add_button (dialog,
GTK_STOCK_OK,
GTK_RESPONSE_OK);
break; break;
default: default: