#include "alertpanel.h"
#include "folder.h"
+#include "matcher_parser.h"
+
static struct Matcher {
GtkWidget *window;
GtkWidget *case_chkbtn;
GtkWidget *regexp_chkbtn;
+ GtkWidget *exec_btn;
+
GtkWidget *cond_clist;
} matcher;
CRITERIA_FORWARDED = 20,
CRITERIA_SCORE_GREATER = 21,
- CRITERIA_SCORE_LOWER = 22
+ CRITERIA_SCORE_LOWER = 22,
+ CRITERIA_SCORE_EQUAL = 23,
+
+ CRITERIA_EXECUTE = 24,
+
+ CRITERIA_SIZE_GREATER = 25,
+ CRITERIA_SIZE_SMALLER = 26,
+ CRITERIA_SIZE_EQUAL = 27
};
enum {
};
gchar * bool_op_text [] = {
- "or", "and"
+ N_("or"), N_("and")
};
enum {
};
gchar * predicate_text [] = {
- "contains", "does not contain"
+ N_("contains"), N_("does not contain")
};
enum {
};
gchar * predicate_flag_text [] = {
- "flag enabled", "flag disabled"
+ N_("yes"), N_("no")
};
gchar * criteria_text [] = {
- "All messages", "Subject",
- "From", "To", "Cc", "To or Cc",
- "Newsgroups", "In reply to", "References",
- "Age greater than", "Age lower than",
- "Header", "Headers part",
- "Body part", "Whole message",
- "Unread flag", "New flag",
- "Marked flag", "Deleted flag",
- "Replied flag", "Forwarded flag",
- "Score greater than", "Score lower than"
+ N_("All messages"), N_("Subject"),
+ N_("From"), N_("To"), N_("Cc"), N_("To or Cc"),
+ N_("Newsgroups"), N_("In reply to"), N_("References"),
+ N_("Age greater than"), N_("Age lower than"),
+ N_("Header"), N_("Headers part"),
+ N_("Body part"), N_("Whole message"),
+ N_("Unread flag"), N_("New flag"),
+ N_("Marked flag"), N_("Deleted flag"),
+ N_("Replied flag"), N_("Forwarded flag"),
+ N_("Score greater than"), N_("Score lower than"),
+ N_("Score equal to"),
+ N_("Execute"),
+ N_("Size greater than"),
+ N_("Size smaller than"),
+ N_("Size exactly")
};
static gint get_sel_from_list(GtkList * list)
static PrefsMatcherSignal * matchers_callback;
-#define VSPACING 12
-#define VSPACING_NARROW 4
-#define DEFAULT_ENTRY_WIDTH 80
-#define PREFSBUFSIZE 1024
-
/* widget creating functions */
static void prefs_matcher_create (void);
GtkWidget *widget,
gpointer user_data);
static MatcherList * prefs_matcher_get_list(void);
+static void prefs_matcher_exec_info_create(void);
void prefs_matcher_open(MatcherList * matchers, PrefsMatcherSignal * cb)
{
- inc_autocheck_timer_remove();
+ inc_lock();
if (!matcher.window) {
prefs_matcher_create();
GtkWidget *up_btn;
GtkWidget *down_btn;
+ GtkWidget *exec_btn;
+
GList *combo_items;
gint i;
- gchar *title[] = {_("Registered rules")};
+ 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",
gtk_box_pack_start (GTK_BOX (vbox), vbox1, TRUE, TRUE, 0);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), 2);
- table1 = gtk_table_new (2, 3, FALSE);
+ table1 = gtk_table_new (2, 4, FALSE);
gtk_widget_show (table1);
gtk_box_pack_start (GTK_BOX (vbox1), table1, FALSE, FALSE, 0);
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_table_attach (GTK_TABLE (table1), value_entry, 2, 3, 1, 2,
GTK_FILL | GTK_SHRINK | GTK_EXPAND, 0, 0, 0);
+ exec_btn = gtk_button_new_with_label (_("Info ..."));
+ gtk_widget_show (exec_btn);
+ gtk_table_attach (GTK_TABLE (table1), exec_btn, 3, 4, 1, 2,
+ GTK_FILL | GTK_SHRINK | GTK_EXPAND, 0, 0, 0);
+ gtk_signal_connect (GTK_OBJECT (exec_btn), "clicked",
+ GTK_SIGNAL_FUNC (prefs_matcher_exec_info),
+ NULL);
/* predicate */
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] = _("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);
matcher.case_chkbtn = case_chkbtn;
matcher.regexp_chkbtn = regexp_chkbtn;
matcher.bool_op_list = bool_op_list;
+ matcher.exec_btn = exec_btn;
matcher.cond_clist = cond_clist;
}
gchar * matcher_str;
MatcherProp * prop;
gint row = 1;
- gchar * tmp;
gboolean bool_and;
GSList * matcher_list;
MatcherList * matchers;
row, 0, &matcher_str)) {
if (strcmp(matcher_str, _("(New)")) != 0) {
- tmp = matcher_str;
- prop = matcherprop_parse(&tmp);
+ /* tmp = matcher_str; */
+ prop = matcher_parser_get_prop(matcher_str);
- if (tmp == NULL)
+ if (prop == NULL)
break;
matcher_list = g_slist_append(matcher_list, prop);
static gint prefs_matcher_get_criteria_from_matching(gint matching_id)
{
switch(matching_id) {
- case MATCHING_ALL:
+ case MATCHCRITERIA_ALL:
return CRITERIA_ALL;
- case MATCHING_NOT_UNREAD:
- case MATCHING_UNREAD:
+ case MATCHCRITERIA_NOT_UNREAD:
+ case MATCHCRITERIA_UNREAD:
return CRITERIA_UNREAD;
- case MATCHING_NOT_NEW:
- case MATCHING_NEW:
+ case MATCHCRITERIA_NOT_NEW:
+ case MATCHCRITERIA_NEW:
return CRITERIA_NEW;
- case MATCHING_NOT_MARKED:
- case MATCHING_MARKED:
+ case MATCHCRITERIA_NOT_MARKED:
+ case MATCHCRITERIA_MARKED:
return CRITERIA_MARKED;
- case MATCHING_NOT_DELETED:
- case MATCHING_DELETED:
+ case MATCHCRITERIA_NOT_DELETED:
+ case MATCHCRITERIA_DELETED:
return CRITERIA_DELETED;
break;
- case MATCHING_NOT_REPLIED:
- case MATCHING_REPLIED:
+ case MATCHCRITERIA_NOT_REPLIED:
+ case MATCHCRITERIA_REPLIED:
return CRITERIA_REPLIED;
- case MATCHING_NOT_FORWARDED:
- case MATCHING_FORWARDED:
+ case MATCHCRITERIA_NOT_FORWARDED:
+ case MATCHCRITERIA_FORWARDED:
return CRITERIA_FORWARDED;
- case MATCHING_NOT_SUBJECT:
- case MATCHING_SUBJECT:
+ case MATCHCRITERIA_NOT_SUBJECT:
+ case MATCHCRITERIA_SUBJECT:
return CRITERIA_SUBJECT;
- case MATCHING_NOT_FROM:
- case MATCHING_FROM:
+ case MATCHCRITERIA_NOT_FROM:
+ case MATCHCRITERIA_FROM:
return CRITERIA_FROM;
- case MATCHING_NOT_TO:
- case MATCHING_TO:
+ case MATCHCRITERIA_NOT_TO:
+ case MATCHCRITERIA_TO:
return CRITERIA_TO;
- case MATCHING_NOT_CC:
- case MATCHING_CC:
+ case MATCHCRITERIA_NOT_CC:
+ case MATCHCRITERIA_CC:
return CRITERIA_CC;
- case MATCHING_NOT_NEWSGROUPS:
- case MATCHING_NEWSGROUPS:
+ case MATCHCRITERIA_NOT_NEWSGROUPS:
+ case MATCHCRITERIA_NEWSGROUPS:
return CRITERIA_NEWSGROUPS;
- case MATCHING_NOT_INREPLYTO:
- case MATCHING_INREPLYTO:
+ case MATCHCRITERIA_NOT_INREPLYTO:
+ case MATCHCRITERIA_INREPLYTO:
return CRITERIA_INREPLYTO;
- case MATCHING_NOT_REFERENCES:
- case MATCHING_REFERENCES:
+ case MATCHCRITERIA_NOT_REFERENCES:
+ case MATCHCRITERIA_REFERENCES:
return CRITERIA_REFERENCES;
- case MATCHING_NOT_TO_AND_NOT_CC:
- case MATCHING_TO_OR_CC:
+ case MATCHCRITERIA_NOT_TO_AND_NOT_CC:
+ case MATCHCRITERIA_TO_OR_CC:
return CRITERIA_TO_OR_CC;
- case MATCHING_NOT_BODY_PART:
- case MATCHING_BODY_PART:
+ case MATCHCRITERIA_NOT_BODY_PART:
+ case MATCHCRITERIA_BODY_PART:
return CRITERIA_BODY_PART;
- case MATCHING_NOT_MESSAGE:
- case MATCHING_MESSAGE:
+ case MATCHCRITERIA_NOT_MESSAGE:
+ case MATCHCRITERIA_MESSAGE:
return CRITERIA_MESSAGE;
break;
- case MATCHING_NOT_HEADERS_PART:
- case MATCHING_HEADERS_PART:
+ case MATCHCRITERIA_NOT_HEADERS_PART:
+ case MATCHCRITERIA_HEADERS_PART:
return CRITERIA_HEADERS_PART;
- case MATCHING_NOT_HEADER:
- case MATCHING_HEADER:
+ case MATCHCRITERIA_NOT_HEADER:
+ case MATCHCRITERIA_HEADER:
return CRITERIA_HEADER;
- case MATCHING_AGE_GREATER:
+ case MATCHCRITERIA_AGE_GREATER:
return CRITERIA_AGE_GREATER;
- case MATCHING_AGE_LOWER:
+ case MATCHCRITERIA_AGE_LOWER:
return CRITERIA_AGE_LOWER;
- case MATCHING_SCORE_GREATER:
+ case MATCHCRITERIA_SCORE_GREATER:
return CRITERIA_SCORE_GREATER;
- case MATCHING_SCORE_LOWER:
+ case MATCHCRITERIA_SCORE_LOWER:
return CRITERIA_SCORE_LOWER;
+ case MATCHCRITERIA_SCORE_EQUAL:
+ return CRITERIA_SCORE_EQUAL;
+ case MATCHCRITERIA_NOT_EXECUTE:
+ case MATCHCRITERIA_EXECUTE:
+ return CRITERIA_EXECUTE;
+ 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;
}
{
switch (criteria_id) {
case CRITERIA_ALL:
- return MATCHING_ALL;
+ return MATCHCRITERIA_ALL;
case CRITERIA_UNREAD:
- return MATCHING_UNREAD;
+ return MATCHCRITERIA_UNREAD;
case CRITERIA_NEW:
- return MATCHING_NEW;
+ return MATCHCRITERIA_NEW;
case CRITERIA_MARKED:
- return MATCHING_MARKED;
+ return MATCHCRITERIA_MARKED;
case CRITERIA_DELETED:
- return MATCHING_DELETED;
+ return MATCHCRITERIA_DELETED;
case CRITERIA_REPLIED:
- return MATCHING_REPLIED;
+ return MATCHCRITERIA_REPLIED;
case CRITERIA_FORWARDED:
- return MATCHING_FORWARDED;
+ return MATCHCRITERIA_FORWARDED;
case CRITERIA_SUBJECT:
- return MATCHING_SUBJECT;
+ return MATCHCRITERIA_SUBJECT;
case CRITERIA_FROM:
- return MATCHING_FROM;
+ return MATCHCRITERIA_FROM;
case CRITERIA_TO:
- return MATCHING_TO;
+ return MATCHCRITERIA_TO;
case CRITERIA_CC:
- return MATCHING_CC;
+ return MATCHCRITERIA_CC;
case CRITERIA_TO_OR_CC:
- return MATCHING_TO_OR_CC;
+ return MATCHCRITERIA_TO_OR_CC;
case CRITERIA_NEWSGROUPS:
- return MATCHING_NEWSGROUPS;
+ return MATCHCRITERIA_NEWSGROUPS;
case CRITERIA_INREPLYTO:
- return MATCHING_INREPLYTO;
+ return MATCHCRITERIA_INREPLYTO;
case CRITERIA_REFERENCES:
- return MATCHING_REFERENCES;
+ return MATCHCRITERIA_REFERENCES;
case CRITERIA_AGE_GREATER:
- return MATCHING_AGE_GREATER;
+ return MATCHCRITERIA_AGE_GREATER;
case CRITERIA_AGE_LOWER:
- return MATCHING_AGE_LOWER;
+ return MATCHCRITERIA_AGE_LOWER;
case CRITERIA_SCORE_GREATER:
- return MATCHING_SCORE_GREATER;
+ return MATCHCRITERIA_SCORE_GREATER;
case CRITERIA_SCORE_LOWER:
- return MATCHING_SCORE_LOWER;
+ return MATCHCRITERIA_SCORE_LOWER;
+ case CRITERIA_SCORE_EQUAL:
+ return MATCHCRITERIA_SCORE_EQUAL;
case CRITERIA_HEADER:
- return MATCHING_HEADER;
+ return MATCHCRITERIA_HEADER;
case CRITERIA_HEADERS_PART:
- return MATCHING_HEADERS_PART;
+ return MATCHCRITERIA_HEADERS_PART;
case CRITERIA_BODY_PART:
- return MATCHING_BODY_PART;
+ return MATCHCRITERIA_BODY_PART;
case CRITERIA_MESSAGE:
- return MATCHING_MESSAGE;
+ 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;
}
static gint prefs_matcher_not_criteria(gint matcher_criteria)
{
switch(matcher_criteria) {
- case MATCHING_UNREAD:
- return MATCHING_NOT_UNREAD;
- case MATCHING_NEW:
- return MATCHING_NOT_NEW;
- case MATCHING_MARKED:
- return MATCHING_NOT_MARKED;
- case MATCHING_DELETED:
- return MATCHING_NOT_DELETED;
- case MATCHING_REPLIED:
- return MATCHING_NOT_REPLIED;
- case MATCHING_FORWARDED:
- return MATCHING_NOT_FORWARDED;
- case MATCHING_SUBJECT:
- return MATCHING_NOT_SUBJECT;
- case MATCHING_FROM:
- return MATCHING_NOT_FROM;
- case MATCHING_TO:
- return MATCHING_NOT_TO;
- case MATCHING_CC:
- return MATCHING_NOT_CC;
- case MATCHING_TO_OR_CC:
- return MATCHING_NOT_TO_AND_NOT_CC;
- case MATCHING_NEWSGROUPS:
- return MATCHING_NOT_NEWSGROUPS;
- case MATCHING_INREPLYTO:
- return MATCHING_NOT_INREPLYTO;
- case MATCHING_REFERENCES:
- return MATCHING_NOT_REFERENCES;
- case MATCHING_HEADER:
- return MATCHING_NOT_HEADER;
- case MATCHING_HEADERS_PART:
- return MATCHING_NOT_HEADERS_PART;
- case MATCHING_MESSAGE:
- return MATCHING_NOT_MESSAGE;
- case MATCHING_BODY_PART:
- return MATCHING_NOT_BODY_PART;
+ case MATCHCRITERIA_UNREAD:
+ return MATCHCRITERIA_NOT_UNREAD;
+ case MATCHCRITERIA_NEW:
+ return MATCHCRITERIA_NOT_NEW;
+ case MATCHCRITERIA_MARKED:
+ return MATCHCRITERIA_NOT_MARKED;
+ case MATCHCRITERIA_DELETED:
+ return MATCHCRITERIA_NOT_DELETED;
+ case MATCHCRITERIA_REPLIED:
+ return MATCHCRITERIA_NOT_REPLIED;
+ case MATCHCRITERIA_FORWARDED:
+ return MATCHCRITERIA_NOT_FORWARDED;
+ case MATCHCRITERIA_SUBJECT:
+ return MATCHCRITERIA_NOT_SUBJECT;
+ case MATCHCRITERIA_FROM:
+ return MATCHCRITERIA_NOT_FROM;
+ case MATCHCRITERIA_TO:
+ return MATCHCRITERIA_NOT_TO;
+ case MATCHCRITERIA_CC:
+ return MATCHCRITERIA_NOT_CC;
+ case MATCHCRITERIA_TO_OR_CC:
+ return MATCHCRITERIA_NOT_TO_AND_NOT_CC;
+ case MATCHCRITERIA_NEWSGROUPS:
+ return MATCHCRITERIA_NOT_NEWSGROUPS;
+ case MATCHCRITERIA_INREPLYTO:
+ return MATCHCRITERIA_NOT_INREPLYTO;
+ case MATCHCRITERIA_REFERENCES:
+ return MATCHCRITERIA_NOT_REFERENCES;
+ case MATCHCRITERIA_HEADER:
+ return MATCHCRITERIA_NOT_HEADER;
+ case MATCHCRITERIA_HEADERS_PART:
+ return MATCHCRITERIA_NOT_HEADERS_PART;
+ case MATCHCRITERIA_MESSAGE:
+ return MATCHCRITERIA_NOT_MESSAGE;
+ case MATCHCRITERIA_EXECUTE:
+ return MATCHCRITERIA_NOT_EXECUTE;
+ case MATCHCRITERIA_BODY_PART:
+ return MATCHCRITERIA_NOT_BODY_PART;
default:
return matcher_criteria;
}
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;
if (use_regexp) {
if (case_sensitive)
- matchtype = MATCHING_REGEXP;
+ matchtype = MATCHTYPE_REGEXP;
else
- matchtype = MATCHING_REGEXPCASE;
+ matchtype = MATCHTYPE_REGEXPCASE;
}
else {
if (case_sensitive)
- matchtype = MATCHING_MATCH;
+ matchtype = MATCHTYPE_MATCH;
else
- matchtype = MATCHING_MATCHCASE;
+ matchtype = MATCHTYPE_MATCHCASE;
}
header = NULL;
case CRITERIA_HEADERS_PART:
case CRITERIA_BODY_PART:
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_AGE_LOWER:
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;
}
if (!clist->selection) return;
row = GPOINTER_TO_INT(clist->selection->data);
- if (row > 1)
+ if (row > 1) {
gtk_clist_row_move(clist, row, row - 1);
+ if(gtk_clist_row_is_visible(clist, row - 1) != GTK_VISIBILITY_FULL) {
+ gtk_clist_moveto(clist, row - 1, 0, 0, 0);
+ }
+ }
}
static void prefs_matcher_down(void)
if (!clist->selection) return;
row = GPOINTER_TO_INT(clist->selection->data);
- if (row >= 1 && row < clist->rows - 1)
+ if (row >= 1 && row < clist->rows - 1) {
gtk_clist_row_move(clist, row, row + 1);
+ if(gtk_clist_row_is_visible(clist, row + 1) != GTK_VISIBILITY_FULL) {
+ gtk_clist_moveto(clist, row + 1, 0, 1, 0);
+ }
+ }
}
static void prefs_matcher_select(GtkCList *clist, gint row, gint column,
GdkEvent *event)
{
gchar * matcher_str;
- gchar * tmp;
MatcherProp * prop;
gboolean negative_cond;
gint criteria;
return;
}
- tmp = matcher_str;
- prop = matcherprop_parse(&tmp);
- if (tmp == NULL)
+ // tmp = matcher_str;
+ prop = matcher_parser_get_prop(matcher_str);
+ if (prop == NULL)
return;
criteria = prefs_matcher_get_criteria_from_matching(prop->criteria);
criteria);
switch(prop->criteria) {
- case MATCHING_NOT_UNREAD:
- case MATCHING_NOT_NEW:
- case MATCHING_NOT_MARKED:
- case MATCHING_NOT_DELETED:
- case MATCHING_NOT_REPLIED:
- case MATCHING_NOT_FORWARDED:
- case MATCHING_NOT_SUBJECT:
- case MATCHING_NOT_FROM:
- case MATCHING_NOT_TO:
- case MATCHING_NOT_CC:
- case MATCHING_NOT_NEWSGROUPS:
- case MATCHING_NOT_INREPLYTO:
- case MATCHING_NOT_REFERENCES:
- case MATCHING_NOT_TO_AND_NOT_CC:
- case MATCHING_NOT_BODY_PART:
- case MATCHING_NOT_MESSAGE:
- case MATCHING_NOT_HEADERS_PART:
- case MATCHING_NOT_HEADER:
+ case MATCHCRITERIA_NOT_UNREAD:
+ case MATCHCRITERIA_NOT_NEW:
+ case MATCHCRITERIA_NOT_MARKED:
+ case MATCHCRITERIA_NOT_DELETED:
+ case MATCHCRITERIA_NOT_REPLIED:
+ case MATCHCRITERIA_NOT_FORWARDED:
+ case MATCHCRITERIA_NOT_SUBJECT:
+ case MATCHCRITERIA_NOT_FROM:
+ case MATCHCRITERIA_NOT_TO:
+ case MATCHCRITERIA_NOT_CC:
+ case MATCHCRITERIA_NOT_NEWSGROUPS:
+ case MATCHCRITERIA_NOT_INREPLYTO:
+ case MATCHCRITERIA_NOT_REFERENCES:
+ case MATCHCRITERIA_NOT_TO_AND_NOT_CC:
+ case MATCHCRITERIA_NOT_BODY_PART:
+ case MATCHCRITERIA_NOT_MESSAGE:
+ case MATCHCRITERIA_NOT_HEADERS_PART:
+ case MATCHCRITERIA_NOT_HEADER:
negative_cond = TRUE;
break;
}
switch(prop->criteria) {
- case MATCHING_ALL:
+ case MATCHCRITERIA_ALL:
break;
- case MATCHING_NOT_SUBJECT:
- case MATCHING_NOT_FROM:
- case MATCHING_NOT_TO:
- case MATCHING_NOT_CC:
- case MATCHING_NOT_TO_AND_NOT_CC:
- case MATCHING_NOT_NEWSGROUPS:
- case MATCHING_NOT_INREPLYTO:
- case MATCHING_NOT_REFERENCES:
- case MATCHING_NOT_HEADERS_PART:
- case MATCHING_NOT_BODY_PART:
- case MATCHING_NOT_MESSAGE:
- case MATCHING_SUBJECT:
- case MATCHING_FROM:
- case MATCHING_TO:
- case MATCHING_CC:
- case MATCHING_TO_OR_CC:
- case MATCHING_NEWSGROUPS:
- case MATCHING_INREPLYTO:
- case MATCHING_REFERENCES:
- case MATCHING_HEADERS_PART:
- case MATCHING_BODY_PART:
- case MATCHING_MESSAGE:
+ case MATCHCRITERIA_NOT_SUBJECT:
+ case MATCHCRITERIA_NOT_FROM:
+ case MATCHCRITERIA_NOT_TO:
+ case MATCHCRITERIA_NOT_CC:
+ case MATCHCRITERIA_NOT_TO_AND_NOT_CC:
+ case MATCHCRITERIA_NOT_NEWSGROUPS:
+ case MATCHCRITERIA_NOT_INREPLYTO:
+ case MATCHCRITERIA_NOT_REFERENCES:
+ case MATCHCRITERIA_NOT_HEADERS_PART:
+ case MATCHCRITERIA_NOT_BODY_PART:
+ case MATCHCRITERIA_NOT_MESSAGE:
+ case MATCHCRITERIA_SUBJECT:
+ case MATCHCRITERIA_FROM:
+ case MATCHCRITERIA_TO:
+ case MATCHCRITERIA_CC:
+ case MATCHCRITERIA_TO_OR_CC:
+ case MATCHCRITERIA_NEWSGROUPS:
+ case MATCHCRITERIA_INREPLYTO:
+ case MATCHCRITERIA_REFERENCES:
+ case MATCHCRITERIA_HEADERS_PART:
+ case MATCHCRITERIA_BODY_PART:
+ case MATCHCRITERIA_MESSAGE:
gtk_entry_set_text(GTK_ENTRY(matcher.value_entry), prop->expr);
break;
- case MATCHING_AGE_GREATER:
- case MATCHING_AGE_LOWER:
- case MATCHING_SCORE_GREATER:
- case MATCHING_SCORE_LOWER:
+ case MATCHCRITERIA_AGE_GREATER:
+ case MATCHCRITERIA_AGE_LOWER:
+ 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 MATCHING_NOT_HEADER:
- case MATCHING_HEADER:
+ case MATCHCRITERIA_NOT_HEADER:
+ case MATCHCRITERIA_HEADER:
gtk_entry_set_text(GTK_ENTRY(matcher.header_entry), prop->header);
gtk_entry_set_text(GTK_ENTRY(matcher.value_entry), prop->expr);
break;
gtk_list_select_item(GTK_LIST(matcher.predicate_list), 0);
switch(prop->matchtype) {
- case MATCHING_MATCH:
+ case MATCHTYPE_MATCH:
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.regexp_chkbtn), FALSE);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.case_chkbtn), TRUE);
break;
- case MATCHING_MATCHCASE:
+ case MATCHTYPE_MATCHCASE:
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.regexp_chkbtn), FALSE);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.case_chkbtn), FALSE);
break;
- case MATCHING_REGEXP:
+ case MATCHTYPE_REGEXP:
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.regexp_chkbtn), TRUE);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.case_chkbtn), TRUE);
break;
- case MATCHING_REGEXPCASE:
+ case MATCHTYPE_REGEXPCASE:
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.regexp_chkbtn), TRUE);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.case_chkbtn), FALSE);
break;
gtk_widget_show(matcher.predicate_flag_combo);
gtk_widget_set_sensitive(matcher.case_chkbtn, FALSE);
gtk_widget_set_sensitive(matcher.regexp_chkbtn, FALSE);
+ gtk_widget_set_sensitive(matcher.exec_btn, FALSE);
break;
case CRITERIA_UNREAD:
gtk_widget_show(matcher.predicate_flag_combo);
gtk_widget_set_sensitive(matcher.case_chkbtn, FALSE);
gtk_widget_set_sensitive(matcher.regexp_chkbtn, FALSE);
+ gtk_widget_set_sensitive(matcher.exec_btn, FALSE);
break;
case CRITERIA_SUBJECT:
gtk_widget_hide(matcher.predicate_flag_combo);
gtk_widget_set_sensitive(matcher.case_chkbtn, TRUE);
gtk_widget_set_sensitive(matcher.regexp_chkbtn, TRUE);
+ gtk_widget_set_sensitive(matcher.exec_btn, FALSE);
+ break;
+
+ case CRITERIA_EXECUTE:
+ gtk_widget_set_sensitive(matcher.header_combo, FALSE);
+ gtk_widget_set_sensitive(matcher.header_label, FALSE);
+ gtk_widget_set_sensitive(matcher.value_label, TRUE);
+ gtk_widget_set_sensitive(matcher.value_entry, TRUE);
+ gtk_widget_set_sensitive(matcher.predicate_label, TRUE);
+ gtk_widget_set_sensitive(matcher.predicate_combo, FALSE);
+ gtk_widget_set_sensitive(matcher.predicate_flag_combo, TRUE);
+ gtk_widget_hide(matcher.predicate_combo);
+ gtk_widget_show(matcher.predicate_flag_combo);
+ gtk_widget_set_sensitive(matcher.case_chkbtn, FALSE);
+ gtk_widget_set_sensitive(matcher.regexp_chkbtn, FALSE);
+ gtk_widget_set_sensitive(matcher.exec_btn, TRUE);
break;
case CRITERIA_AGE_GREATER:
case CRITERIA_AGE_LOWER:
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);
gtk_widget_hide(matcher.predicate_flag_combo);
gtk_widget_set_sensitive(matcher.case_chkbtn, FALSE);
gtk_widget_set_sensitive(matcher.regexp_chkbtn, FALSE);
+ gtk_widget_set_sensitive(matcher.exec_btn, FALSE);
break;
case CRITERIA_HEADER:
gtk_widget_hide(matcher.predicate_flag_combo);
gtk_widget_set_sensitive(matcher.case_chkbtn, TRUE);
gtk_widget_set_sensitive(matcher.regexp_chkbtn, TRUE);
+ gtk_widget_set_sensitive(matcher.exec_btn, FALSE);
break;
}
}
static void prefs_matcher_cancel(void)
{
gtk_widget_hide(matcher.window);
+ inc_unlock();
}
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();
+
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);
}
- else {
- gtk_widget_hide(matcher.window);
- }
}
static gint prefs_matcher_deleted(GtkWidget *widget, GdkEventAny *event,
prefs_matcher_cancel();
return TRUE;
}
+
+static GtkWidget * exec_info_win;
+
+void prefs_matcher_exec_info(void)
+{
+ if (!exec_info_win)
+ prefs_matcher_exec_info_create();
+
+ gtk_widget_show(exec_info_win);
+ gtk_main();
+ gtk_widget_hide(exec_info_win);
+}
+
+static void prefs_matcher_exec_info_create(void)
+{
+ GtkWidget *vbox;
+ GtkWidget *hbox;
+ GtkWidget *hbbox;
+ GtkWidget *label;
+ GtkWidget *ok_btn;
+
+ exec_info_win = gtk_window_new(GTK_WINDOW_DIALOG);
+ gtk_window_set_title(GTK_WINDOW(exec_info_win),
+ _("Description of symbols"));
+ gtk_container_set_border_width(GTK_CONTAINER(exec_info_win), 8);
+ gtk_window_set_position(GTK_WINDOW(exec_info_win), GTK_WIN_POS_CENTER);
+ gtk_window_set_modal(GTK_WINDOW(exec_info_win), TRUE);
+ gtk_window_set_policy(GTK_WINDOW(exec_info_win), FALSE, TRUE, FALSE);
+
+ vbox = gtk_vbox_new(FALSE, 8);
+ gtk_container_add(GTK_CONTAINER(exec_info_win), vbox);
+
+ hbox = gtk_hbox_new(FALSE, 4);
+ gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
+
+ label = gtk_label_new
+ ("%%:\n"
+ "%s:\n"
+ "%f:\n"
+ "%t:\n"
+ "%c:\n"
+ "%d:\n"
+ "%i:\n"
+ "%n:\n"
+ "%r:\n"
+ "%F:\n"
+ "\\n:\n"
+ "\\:\n"
+ "\\\":\n"
+ "%%:");
+
+ gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
+ gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
+
+ label = gtk_label_new
+ (_("%\n"
+ "Subject\n"
+ "From\n"
+ "To\n"
+ "Cc\n"
+ "Date\n"
+ "Message-ID\n"
+ "Newsgroups\n"
+ "References\n"
+ "Filename - should not be modified\n"
+ "new line\n"
+ "escape character for quotes\n"
+ "quote character\n"
+ "%"));
+
+ gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
+ gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
+
+ gtkut_button_set_create(&hbbox, &ok_btn, _("OK"),
+ NULL, NULL, NULL, NULL);
+ gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
+
+ gtk_widget_grab_default(ok_btn);
+ gtk_signal_connect(GTK_OBJECT(ok_btn), "clicked",
+ GTK_SIGNAL_FUNC(gtk_main_quit), NULL);
+
+ gtk_signal_connect(GTK_OBJECT(exec_info_win), "delete_event",
+ GTK_SIGNAL_FUNC(gtk_main_quit), NULL);
+
+ gtk_widget_show_all(vbox);
+}
projects / claws.git / blobdiff