From 8c18975c231c23e348fc687f085ac24c4cdf7354 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Tue, 14 Jan 2003 22:47:19 +0000 Subject: Change dialog from OK/Cancel to Cancel/OK to match HIG. (rule_edit): * rule-editor.c (rule_add): Change dialog from OK/Cancel to Cancel/OK to match HIG. (rule_edit): Likewise. (rule_editor_construct): Likewise. * rule-context.c (rule_context_add_rule_gui): Change dialog from OK/Cancel to Cancel/OK to match HIG. * filter-datespec.c (button_clicked): Change dialog from OK/Cancel to Cancel/OK to match HIG. svn path=/trunk/; revision=19470 --- filter/ChangeLog | 13 +++++++++++++ filter/filter-datespec.c | 6 ++++-- filter/rule-context.c | 6 ++++-- filter/rule-editor.c | 18 ++++++++++++------ 4 files changed, 33 insertions(+), 10 deletions(-) diff --git a/filter/ChangeLog b/filter/ChangeLog index 8f3083d99f..80ce8adae3 100644 --- a/filter/ChangeLog +++ b/filter/ChangeLog @@ -1,3 +1,16 @@ +2003-01-14 Ettore Perazzoli + + * rule-editor.c (rule_add): Change dialog from OK/Cancel to + Cancel/OK to match HIG. + (rule_edit): Likewise. + (rule_editor_construct): Likewise. + + * rule-context.c (rule_context_add_rule_gui): Change dialog from + OK/Cancel to Cancel/OK to match HIG. + + * filter-datespec.c (button_clicked): Change dialog from OK/Cancel + to Cancel/OK to match HIG. + 2003-01-03 Jeffrey Stedfast * rule-editor.c (add_editor_response): Scroll to the newly added diff --git a/filter/filter-datespec.c b/filter/filter-datespec.c index 058bcb6407..21435c37be 100644 --- a/filter/filter-datespec.c +++ b/filter/filter-datespec.c @@ -415,8 +415,10 @@ button_clicked (GtkButton *button, FilterDatespec *fds) dialog = (GtkDialog *) gtk_dialog_new (); gtk_window_set_title ((GtkWindow *) dialog, _("Select a time to compare against")); - gtk_dialog_add_buttons (dialog, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, - GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL); + gtk_dialog_add_buttons (dialog, + GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, + GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, + NULL); p->notebook_type = glade_xml_get_widget (gui, "notebook_type"); p->option_type = glade_xml_get_widget (gui, "option_type"); diff --git a/filter/rule-context.c b/filter/rule-context.c index 4cf8071f5a..37f682230e 100644 --- a/filter/rule-context.c +++ b/filter/rule-context.c @@ -681,8 +681,10 @@ rule_context_add_rule_gui (RuleContext *rc, FilterRule *rule, const char *title, gtk_widget_show (widget); dialog = (GtkDialog *) gtk_dialog_new (); - gtk_dialog_add_buttons (dialog, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, - GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL); + gtk_dialog_add_buttons (dialog, + GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, + GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, + NULL); gtk_window_set_title ((GtkWindow *) dialog, title); gtk_window_set_default_size ((GtkWindow *) dialog, 600, 400); diff --git a/filter/rule-editor.c b/filter/rule-editor.c index 8b9f4396c8..fbda6e0141 100644 --- a/filter/rule-editor.c +++ b/filter/rule-editor.c @@ -283,8 +283,10 @@ rule_add (GtkWidget *widget, RuleEditor *re) rules = filter_rule_get_widget (re->edit, re->context); re->dialog = gtk_dialog_new (); - gtk_dialog_add_buttons ((GtkDialog *) re->dialog, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, - GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL); + gtk_dialog_add_buttons ((GtkDialog *) re->dialog, + GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, + GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, + NULL); gtk_window_set_title ((GtkWindow *) re->dialog, _("Add Rule")); gtk_window_set_default_size (GTK_WINDOW (re->dialog), 650, 400); @@ -362,8 +364,10 @@ rule_edit (GtkWidget *widget, RuleEditor *re) rules = filter_rule_get_widget (re->edit, re->context); re->dialog = gtk_dialog_new (); - gtk_dialog_add_buttons ((GtkDialog *) re->dialog, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, - GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL); + gtk_dialog_add_buttons ((GtkDialog *) re->dialog, + GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, + GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, + NULL); gtk_window_set_title ((GtkWindow *) re->dialog, _("Edit Rule")); gtk_window_set_default_size (GTK_WINDOW (re->dialog), 650, 400); @@ -730,8 +734,10 @@ rule_editor_construct (RuleEditor *re, RuleContext *context, GladeXML *gui, cons rule_editor_set_source (re, source); if (enable_undo) { - gtk_dialog_add_buttons ((GtkDialog *) re, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, - GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL); + gtk_dialog_add_buttons ((GtkDialog *) re, + GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, + GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, + NULL); } else gtk_dialog_add_buttons ((GtkDialog *) re, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); } -- cgit