CRITERIA_SCORE_LOWER = 22,
CRITERIA_SCORE_EQUAL = 23,
- CRITERIA_EXECUTE = 24
+ CRITERIA_EXECUTE = 24,
+
+ CRITERIA_SIZE_GREATER = 25,
+ CRITERIA_SIZE_SMALLER = 26,
+ CRITERIA_SIZE_EQUAL = 27
};
enum {
N_("Replied flag"), N_("Forwarded flag"),
N_("Score greater than"), N_("Score lower than"),
N_("Score equal to"),
- N_("Execute")
+ N_("Execute"),
+ N_("Size greater than"),
+ N_("Size smaller than"),
+ N_("Size exactly")
};
static gint get_sel_from_list(GtkList * list)
gchar *title[1];
- debug_print(_("Creating matcher setting window...\n"));
+ debug_print("Creating matcher configuration window...\n");
window = gtk_window_new (GTK_WINDOW_DIALOG);
gtk_container_set_border_width (GTK_CONTAINER (window), 8);
gtk_widget_grab_default (ok_btn);
gtk_window_set_title (GTK_WINDOW(window),
- _("Condition setting"));
+ _("Condition configuration"));
gtk_signal_connect (GTK_OBJECT(window), "delete_event",
GTK_SIGNAL_FUNC(prefs_matcher_deleted), NULL);
gtk_signal_connect (GTK_OBJECT(window), "key_press_event",
GTK_SIGNAL_FUNC(prefs_matcher_key_pressed), NULL);
- gtk_signal_connect (GTK_OBJECT(window), "focus_in_event",
- GTK_SIGNAL_FUNC(manage_window_focus_in), NULL);
- gtk_signal_connect (GTK_OBJECT(window), "focus_out_event",
- GTK_SIGNAL_FUNC(manage_window_focus_out), NULL);
+ MANAGE_WINDOW_SIGNALS_CONNECT (window);
gtk_signal_connect (GTK_OBJECT(ok_btn), "clicked",
GTK_SIGNAL_FUNC(prefs_matcher_ok), NULL);
gtk_signal_connect (GTK_OBJECT(cancel_btn), "clicked",
gtkut_combo_set_items (GTK_COMBO (header_combo),
"Subject", "From", "To", "Cc", "Reply-To",
"Sender", "X-ML-Name", "X-List", "X-Sequence",
- "X-Mailer",
+ "X-Mailer","X-BeenThere",
NULL);
gtk_table_attach (GTK_TABLE (table1), header_combo, 1, 2, 1, 2,
0, 0, 0, 0);
gtk_widget_show (btn_hbox);
gtk_box_pack_start (GTK_BOX (reg_hbox), btn_hbox, FALSE, FALSE, 0);
- reg_btn = gtk_button_new_with_label (_("Register"));
+ reg_btn = gtk_button_new_with_label (_("Add"));
gtk_widget_show (reg_btn);
gtk_box_pack_start (GTK_BOX (btn_hbox), reg_btn, FALSE, TRUE, 0);
gtk_signal_connect (GTK_OBJECT (reg_btn), "clicked",
GTK_SIGNAL_FUNC (prefs_matcher_register_cb), NULL);
- subst_btn = gtk_button_new_with_label (_(" Substitute "));
+ subst_btn = gtk_button_new_with_label (_(" Replace "));
gtk_widget_show (subst_btn);
gtk_box_pack_start (GTK_BOX (btn_hbox), subst_btn, FALSE, TRUE, 0);
gtk_signal_connect (GTK_OBJECT (subst_btn), "clicked",
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
- title[0] = ("Registered rules");
+ title[0] = _("Current condition rules");
cond_clist = gtk_clist_new_with_titles(1, title);
gtk_widget_show (cond_clist);
gtk_container_add (GTK_CONTAINER (cond_scrolledwin), cond_clist);
gchar * matcher_str;
MatcherProp * prop;
gint row = 1;
- gchar * tmp;
gboolean bool_and;
GSList * matcher_list;
MatcherList * matchers;
case MATCHCRITERIA_NOT_EXECUTE:
case MATCHCRITERIA_EXECUTE:
return CRITERIA_EXECUTE;
- break;
+ case MATCHCRITERIA_SIZE_GREATER:
+ return CRITERIA_SIZE_GREATER;
+ case MATCHCRITERIA_SIZE_SMALLER:
+ return CRITERIA_SIZE_SMALLER;
+ case MATCHCRITERIA_SIZE_EQUAL:
+ return CRITERIA_SIZE_EQUAL;
default:
return -1;
}
return MATCHCRITERIA_MESSAGE;
case CRITERIA_EXECUTE:
return MATCHCRITERIA_EXECUTE;
+ case CRITERIA_SIZE_GREATER:
+ return MATCHCRITERIA_SIZE_GREATER;
+ case CRITERIA_SIZE_SMALLER:
+ return MATCHCRITERIA_SIZE_SMALLER;
+ case CRITERIA_SIZE_EQUAL:
+ return MATCHCRITERIA_SIZE_EQUAL;
default:
return -1;
}
case CRITERIA_DELETED:
case CRITERIA_REPLIED:
case CRITERIA_FORWARDED:
+ case CRITERIA_EXECUTE:
if (value_pred_flag == PREDICATE_FLAG_DISABLED)
criteria = prefs_matcher_not_criteria(criteria);
break;
case CRITERIA_HEADERS_PART:
case CRITERIA_BODY_PART:
case CRITERIA_MESSAGE:
- case CRITERIA_EXECUTE:
case CRITERIA_AGE_GREATER:
case CRITERIA_AGE_LOWER:
case CRITERIA_HEADER:
case CRITERIA_MESSAGE:
case CRITERIA_EXECUTE:
expr = gtk_entry_get_text(GTK_ENTRY(matcher.value_entry));
-
- /*
- if (*expr == '\0') {
- alertpanel_error(_("Match string is not set."));
- return NULL;
- }
- */
break;
case CRITERIA_AGE_GREATER:
case CRITERIA_SCORE_GREATER:
case CRITERIA_SCORE_LOWER:
case CRITERIA_SCORE_EQUAL:
+ case CRITERIA_SIZE_GREATER:
+ case CRITERIA_SIZE_SMALLER:
+ case CRITERIA_SIZE_EQUAL:
value_str = gtk_entry_get_text(GTK_ENTRY(matcher.value_entry));
if (*value_str == '\0') {
alertpanel_error(_("Header name is not set."));
return NULL;
}
- /*
- if (*expr == '\0') {
- alertpanel_error(_("Match string is not set."));
- return NULL;
- }
- */
break;
}
GdkEvent *event)
{
gchar * matcher_str;
- gchar * tmp;
MatcherProp * prop;
gboolean negative_cond;
gint criteria;
case MATCHCRITERIA_SCORE_GREATER:
case MATCHCRITERIA_SCORE_LOWER:
case MATCHCRITERIA_SCORE_EQUAL:
+ case MATCHCRITERIA_SIZE_GREATER:
+ case MATCHCRITERIA_SIZE_SMALLER:
+ case MATCHCRITERIA_SIZE_EQUAL:
gtk_entry_set_text(GTK_ENTRY(matcher.value_entry), itos(prop->value));
break;
case CRITERIA_SCORE_GREATER:
case CRITERIA_SCORE_LOWER:
case CRITERIA_SCORE_EQUAL:
+ case CRITERIA_SIZE_GREATER:
+ case CRITERIA_SIZE_SMALLER:
+ case CRITERIA_SIZE_EQUAL:
gtk_widget_set_sensitive(matcher.header_combo, FALSE);
gtk_widget_set_sensitive(matcher.header_label, FALSE);
gtk_widget_set_sensitive(matcher.value_label, TRUE);
static void prefs_matcher_ok(void)
{
MatcherList * matchers;
+ MatcherProp * matcherprop;
+ AlertValue val;
+ gint criteria;
+ gint value_criteria;
+ gchar * matcher_str;
+ gchar * str;
+ gint row = 1;
matchers = prefs_matcher_get_list();
- gtk_widget_hide(matcher.window);
- inc_unlock();
+
if (matchers != NULL) {
+ matcherprop = prefs_matcher_dialog_to_matcher();
+ if (matcherprop != NULL) {
+ str = matcherprop_to_string(matcherprop);
+ if(strcmp(str, "all") != 0) {
+ while (gtk_clist_get_text(GTK_CLIST(matcher.cond_clist),
+ row, 0, &matcher_str)) {
+ if (strcmp(matcher_str, str) == 0) break;
+ row++;
+ }
+ if (strcmp(matcher_str, str) != 0) {
+ val = alertpanel(_("Entry not registered"),
+ _("The entry was not registered\nAre you really finished?"),
+ _("Yes"), _("No"), NULL);
+ if (G_ALERTDEFAULT != val) {
+ g_free(str);
+ return;
+ }
+ }
+ }
+ }
+ g_free(str);
+ gtk_widget_hide(matcher.window);
+ inc_unlock();
if (matchers_callback != NULL)
matchers_callback(matchers);
matcherlist_free(matchers);
projects / claws.git / blobdiff