aboutsummaryrefslogtreecommitdiffstats
path: root/filter
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2003-03-18 03:53:56 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2003-03-18 03:53:56 +0800
commit32f1cfd13fe2d745cc18b71e32c2c19305c480f7 (patch)
treee668ac1fd5a1bd28bd034a55c0f3864eea3ea056 /filter
parentfa49e3e67306a194aebb24554c122252f959eb74 (diff)
downloadgsoc2013-evolution-32f1cfd13fe2d745cc18b71e32c2c19305c480f7.tar
gsoc2013-evolution-32f1cfd13fe2d745cc18b71e32c2c19305c480f7.tar.gz
gsoc2013-evolution-32f1cfd13fe2d745cc18b71e32c2c19305c480f7.tar.bz2
gsoc2013-evolution-32f1cfd13fe2d745cc18b71e32c2c19305c480f7.tar.lz
gsoc2013-evolution-32f1cfd13fe2d745cc18b71e32c2c19305c480f7.tar.xz
gsoc2013-evolution-32f1cfd13fe2d745cc18b71e32c2c19305c480f7.tar.zst
gsoc2013-evolution-32f1cfd13fe2d745cc18b71e32c2c19305c480f7.zip
Always add a Cancel button here, but if !enable_undo - make the response
2003-03-17 Jeffrey Stedfast <fejj@ximian.com> * rule-editor.c (rule_editor_construct): Always add a Cancel button here, but if !enable_undo - make the response id GTK_RESPONSE_CANCEL rather than GTK_RESPONSE_REJECT (which does undo). This mimics the behaviour that was done in the mail/ code previously. Fixes bug #39809. svn path=/trunk/; revision=20315
Diffstat (limited to 'filter')
-rw-r--r--filter/ChangeLog8
-rw-r--r--filter/filter.glade38
-rw-r--r--filter/libfilter-i18n.h44
-rw-r--r--filter/rule-editor.c8
4 files changed, 55 insertions, 43 deletions
diff --git a/filter/ChangeLog b/filter/ChangeLog
index 9cb0eefc5c..bdfa2d776b 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,3 +1,11 @@
+2003-03-17 Jeffrey Stedfast <fejj@ximian.com>
+
+ * rule-editor.c (rule_editor_construct): Always add a Cancel
+ button here, but if !enable_undo - make the response id
+ GTK_RESPONSE_CANCEL rather than GTK_RESPONSE_REJECT (which does
+ undo). This mimics the behaviour that was done in the mail/ code
+ previously. Fixes bug #39809.
+
2003-03-11 Not Zed <NotZed@Ximian.com>
* rule-context.c (revert): go to the proper level of child node
diff --git a/filter/filter.glade b/filter/filter.glade
index ff1927a7b7..a5fa0f5ad1 100644
--- a/filter/filter.glade
+++ b/filter/filter.glade
@@ -25,26 +25,26 @@
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <widget class="GtkButton" id="button1">
+ <widget class="GtkButton" id="cancel_button">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-ok</property>
+ <property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="response_id">0</property>
+ <property name="response_id">-6</property>
</widget>
</child>
<child>
- <widget class="GtkButton" id="button3">
+ <widget class="GtkButton" id="ok_button">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-cancel</property>
+ <property name="label">gtk-ok</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="response_id">0</property>
+ <property name="response_id">-5</property>
</widget>
</child>
</widget>
@@ -270,26 +270,26 @@
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <widget class="GtkButton" id="button13">
+ <widget class="GtkButton" id="cancel_button">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-ok</property>
+ <property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="response_id">0</property>
+ <property name="response_id">-6</property>
</widget>
</child>
<child>
- <widget class="GtkButton" id="button15">
+ <widget class="GtkButton" id="ok_button">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-cancel</property>
+ <property name="label">gtk-ok</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="response_id">0</property>
+ <property name="response_id">-5</property>
</widget>
</child>
</widget>
@@ -480,19 +480,19 @@
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <widget class="GtkButton" id="button16">
+ <widget class="GtkButton" id="cancel_button">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-ok</property>
+ <property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="response_id">0</property>
+ <property name="response_id">-6</property>
</widget>
</child>
<child>
- <widget class="GtkButton" id="button17">
+ <widget class="GtkButton" id="apply_button">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
@@ -504,14 +504,14 @@
</child>
<child>
- <widget class="GtkButton" id="button18">
+ <widget class="GtkButton" id="ok_button">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-cancel</property>
+ <property name="label">gtk-ok</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="response_id">0</property>
+ <property name="response_id">-5</property>
</widget>
</child>
</widget>
diff --git a/filter/libfilter-i18n.h b/filter/libfilter-i18n.h
index ea7ff03b0e..d965e03184 100644
--- a/filter/libfilter-i18n.h
+++ b/filter/libfilter-i18n.h
@@ -4,17 +4,34 @@ char *s = N_("Assign Color");
char *s = N_("Assign Score");
char *s = N_("Attachments");
char *s = N_("Beep");
+char *s = N_("contains");
char *s = N_("Copy to Folder");
char *s = N_("Date received");
char *s = N_("Date sent");
char *s = N_("Delete");
char *s = N_("Deleted");
+char *s = N_("does not contain");
+char *s = N_("does not end with");
+char *s = N_("does not exist");
+char *s = N_("does not return");
+char *s = N_("does not sound like");
+char *s = N_("does not start with");
char *s = N_("Do Not Exist");
char *s = N_("Draft");
+char *s = N_("ends with");
char *s = N_("Exist");
+char *s = N_("exists");
char *s = N_("Expression");
char *s = N_("Follow Up");
char *s = N_("Important");
+char *s = N_("is");
+char *s = N_("is after");
+char *s = N_("is before");
+char *s = N_("is Flagged");
+char *s = N_("is greater than");
+char *s = N_("is less than");
+char *s = N_("is not");
+char *s = N_("is not Flagged");
char *s = N_("Label");
char *s = N_("Mailing list");
char *s = N_("Message Body");
@@ -26,36 +43,19 @@ char *s = N_("Read");
char *s = N_("Recipients");
char *s = N_("Regex Match");
char *s = N_("Replied to");
+char *s = N_("returns");
+char *s = N_("returns greater than");
+char *s = N_("returns less than");
char *s = N_("Score");
char *s = N_("Sender");
char *s = N_("Set Status");
char *s = N_("Shell Command");
char *s = N_("Size (kB)");
+char *s = N_("sounds like");
char *s = N_("Source Account");
char *s = N_("Specific header");
+char *s = N_("starts with");
char *s = N_("Status");
char *s = N_("Stop Processing");
char *s = N_("Subject");
char *s = N_("Unset Status");
-char *s = N_("contains");
-char *s = N_("does not contain");
-char *s = N_("does not end with");
-char *s = N_("does not exist");
-char *s = N_("does not return");
-char *s = N_("does not sound like");
-char *s = N_("does not start with");
-char *s = N_("ends with");
-char *s = N_("exists");
-char *s = N_("is Flagged");
-char *s = N_("is after");
-char *s = N_("is before");
-char *s = N_("is greater than");
-char *s = N_("is less than");
-char *s = N_("is not Flagged");
-char *s = N_("is not");
-char *s = N_("is");
-char *s = N_("returns greater than");
-char *s = N_("returns less than");
-char *s = N_("returns");
-char *s = N_("sounds like");
-char *s = N_("starts with");
diff --git a/filter/rule-editor.c b/filter/rule-editor.c
index 903eab8cec..3e9290801f 100644
--- a/filter/rule-editor.c
+++ b/filter/rule-editor.c
@@ -737,6 +737,10 @@ rule_editor_construct (RuleEditor *re, RuleContext *context, GladeXML *gui, cons
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);
+ } else {
+ gtk_dialog_add_buttons ((GtkDialog *) re,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
+ NULL);
+ }
}