/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2018 Hiroyuki Yamamoto and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#include "defs.h"
#include <string.h>
#include <errno.h>
-#if !GTK_CHECK_VERSION(3, 0, 0)
#include "gtkcmoptionmenu.h"
-#endif
#include "main.h"
#include "prefs_gtk.h"
#include "prefs_matcher.h"
#include "prefs_common.h"
+#include "procheader.h"
#include "mainwindow.h"
#include "foldersel.h"
#include "manage_window.h"
#include "matcher_parser.h"
#include "colorlabel.h"
#include "tags.h"
+#ifndef USE_ALT_ADDRBOOK
+ #include "addressbook.h"
+#endif
-#ifndef USE_NEW_ADDRBOOK
+#ifndef USE_ALT_ADDRBOOK
static void prefs_matcher_addressbook_select(void);
#endif
static void prefs_matcher_test_info(GtkWidget *widget, GtkWidget *parent);
GtkWidget *numeric_label;
GtkWidget *addressbook_folder_combo;
GtkWidget *case_checkbtn;
-#ifndef G_OS_WIN32
GtkWidget *regexp_checkbtn;
-#endif
-#if !GTK_CHECK_VERSION(3, 0, 0)
GtkWidget *color_optmenu;
-#endif
+ GtkWidget *calendar;
+ GtkWidget *time_label;
+ GtkWidget *time_entry;
GtkWidget *test_btn;
GtkWidget *addressbook_select_btn;
GtkTreeModel *model_age;
+ GtkTreeModel *model_date;
GtkTreeModel *model_age_units;
GtkTreeModel *model_contain;
GtkTreeModel *model_found;
CRITERIA_TAGGED = 36,
CRITERIA_HAS_ATTACHMENT = 37,
- CRITERIA_SIGNED = 38
+ CRITERIA_SIGNED = 38,
+
+ CRITERIA_AGE_GREATER_HOURS = 39,
+ CRITERIA_AGE_LOWER_HOURS = 40,
+
+ CRITERIA_MESSAGEID = 41,
+ CRITERIA_HEADERS_CONT = 42,
+
+ CRITERIA_DATE_AFTER = 43,
+ CRITERIA_DATE_BEFORE = 44
};
enum {
MATCH_PARTIAL = 9,
MATCH_ABOOK = 10,
MATCH_TAGS = 11,
- MATCH_TEST = 12
+ MATCH_TEST = 12,
+ MATCH_DATE = 13
};
enum {
- AGE_DAYS = 0,
- AGE_WEEKS = 1
+ AGE_HOURS = 0,
+ AGE_DAYS = 1,
+ AGE_WEEKS = 2
};
enum {
return CRITERIA_CC;
if (!strcasecmp(header, "To or Cc"))
return CRITERIA_TO_OR_CC;
+ if (!strcasecmp(header, "Message-ID"))
+ return CRITERIA_MESSAGEID;
if (!strcasecmp(header, "In-Reply-To"))
return CRITERIA_INREPLYTO;
if (!strcasecmp(header, "Newsgroups"))
matcher.model_age = GTK_TREE_MODEL(store);
store = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN);
+ COMBOBOX_ADD(store, _("hours"), AGE_HOURS);
COMBOBOX_ADD(store, _("days"), AGE_DAYS);
COMBOBOX_ADD(store, _("weeks"), AGE_WEEKS);
matcher.model_age_units = GTK_TREE_MODEL(store);
+ store = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN);
+ COMBOBOX_ADD(store, _("after"), CRITERIA_DATE_AFTER);
+ COMBOBOX_ADD(store, _("before"), CRITERIA_DATE_BEFORE);
+ matcher.model_date = GTK_TREE_MODEL(store);
+
store = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN);
COMBOBOX_ADD(store, _("higher than"), CRITERIA_SCORE_GREATER);
COMBOBOX_ADD(store, _("lower than"), CRITERIA_SCORE_LOWER);
COMBOBOX_ADD(store, "To", CRITERIA_TO);
COMBOBOX_ADD(store, "Cc", CRITERIA_CC);
COMBOBOX_ADD(store, "To or Cc", CRITERIA_TO_OR_CC);
+ COMBOBOX_ADD(store, "Message-ID", CRITERIA_MESSAGEID);
COMBOBOX_ADD(store, "In-Reply-To", CRITERIA_INREPLYTO);
COMBOBOX_ADD(store, "Newsgroups", CRITERIA_NEWSGROUPS);
COMBOBOX_ADD(store, "References", CRITERIA_REFERENCES);
store = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN);
COMBOBOX_ADD(store, _("headers part"), CRITERIA_HEADERS_PART);
+ COMBOBOX_ADD(store, _("headers values"), CRITERIA_HEADERS_CONT);
COMBOBOX_ADD(store, _("body part"), CRITERIA_BODY_PART);
COMBOBOX_ADD(store, _("whole message"), CRITERIA_MESSAGE);
matcher.model_phrase = GTK_TREE_MODEL(store);
prefs_matcher_models_create();
prefs_matcher_create();
} else {
-#if !GTK_CHECK_VERSION(3, 0, 0)
/* update color label menu */
gtk_cmoption_menu_set_menu(GTK_CMOPTION_MENU(matcher.color_optmenu),
colorlabel_create_color_menu());
-#endif
}
manage_window_set_transient(GTK_WINDOW(matcher.window));
GtkWidget *numeric_entry;
GtkWidget *numeric_label;
-#ifndef G_OS_WIN32
GtkWidget *regexp_checkbtn;
-#endif
GtkWidget *case_checkbtn;
GtkWidget *reg_hbox;
GtkWidget *test_btn;
GtkWidget *addressbook_select_btn;
GtkWidget *color_optmenu;
+ GtkWidget *calendar;
+ GtkWidget *time_label;
+ GtkWidget *time_entry;
+ GtkWidget *date_hbox;
+ GtkWidget *date_vbox;
static GdkGeometry geometry;
GtkSizeGroup *size_group;
window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "prefs_matcher");
gtk_container_set_border_width(GTK_CONTAINER(window), 4);
gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+ gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
vbox = gtk_vbox_new(FALSE, 6);
gtk_container_add(GTK_CONTAINER(window), vbox);
table = gtk_table_new(3, 3, FALSE);
gtk_container_add(GTK_CONTAINER(frame), table);
- gtk_widget_set_size_request(frame, -1, 105);
+ gtk_widget_set_size_request(frame, -1, -1);
upper_hbox = gtk_hbox_new(FALSE, HSPACING_NARROW);
hbox = gtk_hbox_new(FALSE, 0);
hbox = gtk_hbox_new(FALSE, 0);
gtk_box_pack_start(GTK_BOX(hbox), lower_hbox, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(hbox), gtk_label_new(""), TRUE, TRUE, 0);
- gtk_table_attach(GTK_TABLE(table), hbox,2, 3, 1, 2,
+ gtk_table_attach(GTK_TABLE(table), hbox, 2, 3, 1, 2,
GTK_FILL, GTK_SHRINK, 2, 2);
size_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
gtk_size_group_add_widget(size_group, lower_hbox);
/* criteria combo box */
- criteria_label = gtk_label_new(_("Match criteria:"));
+ criteria_label = gtk_label_new(_("Match criteria"));
gtk_misc_set_alignment(GTK_MISC(criteria_label), 1, 0.5);
- gtk_widget_set_size_request(criteria_label, 100, -1);
+ gtk_widget_set_size_request(criteria_label, -1, -1);
gtk_table_attach(GTK_TABLE(table), criteria_label, 0, 1, 0, 1,
GTK_FILL, GTK_SHRINK, 2, 2);
criteria_combo = gtkut_sc_combobox_create(NULL, FALSE);
store = GTK_LIST_STORE(gtk_combo_box_get_model(
GTK_COMBO_BOX(criteria_combo)));
- COMBOBOX_ADD(store, _("All messages"), 0);
- COMBOBOX_ADD(store, _("Header"), 1);
- COMBOBOX_ADD(store, _("Age"), 2);
- COMBOBOX_ADD(store, _("Phrase"), 3);
- COMBOBOX_ADD(store, _("Flags"), 4);
- COMBOBOX_ADD(store, _("Color labels"), 5);
- COMBOBOX_ADD(store, _("Thread"), 6);
- COMBOBOX_ADD(store, _("Score"), 7);
- COMBOBOX_ADD(store, _("Size"), 8);
- COMBOBOX_ADD(store, _("Partially downloaded"), 9);
- COMBOBOX_ADD(store, _("Address book"), 10);
- COMBOBOX_ADD(store, _("Tags"), 11);
- COMBOBOX_ADD(store, _("External program test"), 12);
+ COMBOBOX_ADD(store, _("All messages"), MATCH_ALL);
+ COMBOBOX_ADD(store, _("Header"), MATCH_HEADER);
+ COMBOBOX_ADD(store, _("Age"), MATCH_AGE);
+ COMBOBOX_ADD(store, _("Phrase"), MATCH_PHRASE);
+ COMBOBOX_ADD(store, _("Flags"), MATCH_FLAG);
+ COMBOBOX_ADD(store, _("Color labels"), MATCH_LABEL);
+ COMBOBOX_ADD(store, _("Thread"), MATCH_THREAD);
+ COMBOBOX_ADD(store, _("Score"), MATCH_SCORE);
+ COMBOBOX_ADD(store, _("Size"), MATCH_SIZE);
+ COMBOBOX_ADD(store, _("Partially downloaded"), MATCH_PARTIAL);
+ COMBOBOX_ADD(store, _("Address book"), MATCH_ABOOK);
+ COMBOBOX_ADD(store, _("Tags"), MATCH_TAGS);
+ COMBOBOX_ADD(store, _("External program test"), MATCH_TEST);
+ COMBOBOX_ADD(store, _("Date"), MATCH_DATE);
gtk_widget_set_size_request(criteria_combo, 150, -1);
gtk_combo_box_set_active(GTK_COMBO_BOX(criteria_combo), MATCH_ALL);
gtk_box_pack_start(GTK_BOX(upper_hbox), criteria_label2, FALSE, FALSE, 0);
/* headers combo box entry */
- headers_combo = gtk_combo_box_entry_new_with_model(matcher.model_headers, 0);
+ headers_combo = gtk_combo_box_new_with_model_and_entry(matcher.model_headers);
+ GtkCellRenderer *cell = gtk_cell_renderer_text_new();
+ gtk_cell_renderer_set_alignment(cell, 0.0, 0.5);
+ gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(headers_combo), cell, TRUE);
+ gtk_combo_box_set_entry_text_column(GTK_COMBO_BOX(headers_combo), 0);
gtk_widget_set_size_request(headers_combo, 100, -1);
gtk_box_pack_start(GTK_BOX(upper_hbox), headers_combo, TRUE, TRUE, 0);
header_entry = gtk_bin_get_child(GTK_BIN((headers_combo)));
/* book/folder value */
addressbook_folder_combo = combobox_text_new(TRUE, _("Any"), NULL);
- gtk_widget_set_size_request(addressbook_folder_combo, 150, -1);
+ gtk_widget_set_size_request(addressbook_folder_combo, 250, -1);
gtk_box_pack_start(GTK_BOX(upper_hbox), addressbook_folder_combo, TRUE, TRUE, 0);
- addressbook_select_btn = gtk_button_new_with_label(_("Select ..."));
+ addressbook_select_btn = gtk_button_new_with_label(_("Select..."));
gtk_box_pack_start(GTK_BOX(upper_hbox), addressbook_select_btn, FALSE, FALSE, 0);
-#ifndef USE_NEW_ADDRBOOK
+#ifndef USE_ALT_ADDRBOOK
g_signal_connect(G_OBJECT (addressbook_select_btn), "clicked",
G_CALLBACK(prefs_matcher_addressbook_select),
NULL);
match_combo = gtkut_sc_combobox_create(NULL, TRUE);
gtk_box_pack_start(GTK_BOX(match_hbox), match_combo, TRUE, TRUE, 0);
-#if !GTK_CHECK_VERSION(3, 0, 0)
/* color labels combo */
color_optmenu = gtk_cmoption_menu_new();
gtk_cmoption_menu_set_menu(GTK_CMOPTION_MENU(color_optmenu),
colorlabel_create_color_menu());
gtk_box_pack_start(GTK_BOX(match_hbox), color_optmenu, FALSE, FALSE, 0);
-#endif
/* address header name */
header_addr_combo = combobox_text_new(TRUE,
- Q_("Filtering Matcher Menu|All"), _("Any"),
- "From", "To", "Cc", "Reply-To", "Sender", NULL);
+ C_("Filtering Matcher Menu", "All"), _("Any"),
+ "From", "To", "Cc", "Reply-To", "Sender", "Resent-From", "Resent-To", NULL);
gtk_box_pack_start(GTK_BOX(match_hbox), header_addr_combo, FALSE, FALSE, 0);
header_addr_entry = gtk_bin_get_child(GTK_BIN((header_addr_combo)));
gtk_widget_set_size_request(header_addr_combo, 150, -1);
/* string value */
string_entry = gtk_entry_new();
gtk_box_pack_start(GTK_BOX(lower_hbox), string_entry, TRUE, TRUE, 0);
+ gtk_widget_set_size_request(string_entry, 300, -1);
hbox = gtk_hbox_new(FALSE, HSPACING_NARROW);
gtk_size_group_add_widget(size_group, hbox);
- PACK_CHECK_BUTTON(hbox, case_checkbtn, _("Case sensitive"));
-#ifndef G_OS_WIN32
- PACK_CHECK_BUTTON(hbox, regexp_checkbtn, _("Use regexp"));
-#endif
+
+ vbox = gtk_vbox_new(FALSE, VSPACING_NARROW);
+ PACK_CHECK_BUTTON(vbox, case_checkbtn, _("Case sensitive"));
+ PACK_CHECK_BUTTON(vbox, regexp_checkbtn, _("Use regexp"));
+ gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);
+
gtk_box_pack_end(GTK_BOX(hbox), gtk_label_new(""), TRUE, TRUE, 0);
gtk_table_attach(GTK_TABLE(table), hbox, 2, 3, 2, 3,
GTK_FILL, GTK_SHRINK, 4, 0);
+ /* Date widgets */
+ date_vbox = gtk_vbox_new(FALSE, VSPACING_NARROW);
+ calendar = gtk_calendar_new();
+ gtk_box_pack_start(GTK_BOX(hbox), calendar, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(lower_hbox), date_vbox, FALSE, FALSE, 0);
+
+ date_hbox = gtk_hbox_new(FALSE, HSPACING_NARROW);
+ gtk_box_pack_start(GTK_BOX(date_vbox), date_hbox, FALSE, FALSE, 0);
+
+ time_entry = gtkut_time_select_combo_new();
+ gtk_box_pack_start(GTK_BOX(date_hbox), time_entry, FALSE, FALSE, 0);
+ time_label = gtk_label_new(_("on:"));
+ gtk_misc_set_alignment(GTK_MISC(time_label), 0, 0.5);
+ gtk_box_pack_start(GTK_BOX(date_hbox), time_label, FALSE, FALSE, 0);
+
/* test info button */
test_btn = gtk_button_new_from_stock(GTK_STOCK_INFO);
gtk_box_pack_start(GTK_BOX(lower_hbox), test_btn, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(reg_btn), "clicked",
G_CALLBACK(prefs_matcher_register_cb), NULL);
- subst_btn = gtkut_get_replace_btn(_("Replace"));
+ subst_btn = gtkut_get_replace_btn(_("_Replace"));
gtk_box_pack_start(GTK_BOX(btn_hbox), subst_btn, FALSE, TRUE, 0);
g_signal_connect(G_OBJECT(subst_btn), "clicked",
G_CALLBACK(prefs_matcher_substitute_cb),
NULL);
- del_btn = gtk_button_new_from_stock(GTK_STOCK_DELETE);
+ del_btn = gtk_button_new_with_mnemonic (_("D_elete"));
+ gtk_button_set_image(GTK_BUTTON(del_btn),
+ gtk_image_new_from_stock(GTK_STOCK_REMOVE,GTK_ICON_SIZE_BUTTON));
gtk_box_pack_start(GTK_BOX(btn_hbox), del_btn, FALSE, TRUE, 0);
g_signal_connect(G_OBJECT(del_btn), "clicked",
G_CALLBACK(prefs_matcher_delete_cb), NULL);
TRUE, TRUE, 0);
if (!geometry.min_height) {
- geometry.min_width = 550;
+ geometry.min_width = 630;
geometry.min_height = 368;
}
matcher.addressbook_folder_combo = addressbook_folder_combo;
matcher.match_combo = match_combo;
matcher.case_checkbtn = case_checkbtn;
-#ifndef G_OS_WIN32
matcher.regexp_checkbtn = regexp_checkbtn;
-#endif
matcher.bool_op_combo = bool_op_combo;
matcher.test_btn = test_btn;
-#ifndef USE_NEW_ADDRBOOK
+ matcher.calendar = calendar;
+ matcher.time_label = time_label;
+ matcher.time_entry = time_entry;
+#ifndef USE_ALT_ADDRBOOK
matcher.addressbook_select_btn = addressbook_select_btn;
#endif
matcher.color_optmenu = color_optmenu;
gtk_combo_box_set_active(GTK_COMBO_BOX(matcher.match_combo), 0);
if (match_combo2_model_set())
gtk_combo_box_set_active(GTK_COMBO_BOX(matcher.match_combo2), 0);
-#if !GTK_CHECK_VERSION(3, 0, 0)
gtk_cmoption_menu_set_history(GTK_CMOPTION_MENU(matcher.color_optmenu), 0);
-#endif
gtk_spin_button_set_value(GTK_SPIN_BUTTON(matcher.numeric_entry), 0);
gtk_entry_set_text(GTK_ENTRY(matcher.header_entry), "");
gtk_entry_set_text(GTK_ENTRY(matcher.header_addr_entry), "");
gtk_entry_set_text(GTK_ENTRY(matcher.string_entry), "");
gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((matcher.addressbook_folder_combo)))), "");
-#ifndef G_OS_WIN32
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.regexp_checkbtn), FALSE);
-#endif
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.case_checkbtn), FALSE);
+
+ gtk_calendar_select_today(GTK_CALENDAR(matcher.calendar));
+ gtkut_time_select_select_by_time(GTK_COMBO_BOX(matcher.time_entry), 0, 0);
}
/*!
if (is_valid) {
/* tmp = matcher_str; */
prop = matcher_parser_get_prop(matcher_str);
- g_free(matcher_str);
- if (prop == NULL)
+ if (prop == NULL) {
+ g_free(matcher_str);
break;
+ }
matcher_list = g_slist_append(matcher_list, prop);
}
+ g_free(matcher_str);
} while (gtk_tree_model_iter_next(model, &iter));
bool_and = gtk_combo_box_get_active(GTK_COMBO_BOX(matcher.bool_op_combo));
case MATCHCRITERIA_PARTIAL:
case MATCHCRITERIA_NOT_PARTIAL:
return CRITERIA_PARTIAL;
-#if !GTK_CHECK_VERSION(3, 0, 0)
case MATCHCRITERIA_COLORLABEL:
case MATCHCRITERIA_NOT_COLORLABEL:
return CRITERIA_COLORLABEL;
-#endif
case MATCHCRITERIA_IGNORE_THREAD:
case MATCHCRITERIA_NOT_IGNORE_THREAD:
return CRITERIA_IGNORE_THREAD;
case MATCHCRITERIA_NOT_NEWSGROUPS:
case MATCHCRITERIA_NEWSGROUPS:
return CRITERIA_NEWSGROUPS;
+ case MATCHCRITERIA_NOT_MESSAGEID:
+ case MATCHCRITERIA_MESSAGEID:
+ return CRITERIA_MESSAGEID;
case MATCHCRITERIA_NOT_INREPLYTO:
case MATCHCRITERIA_INREPLYTO:
return CRITERIA_INREPLYTO;
case MATCHCRITERIA_NOT_HEADERS_PART:
case MATCHCRITERIA_HEADERS_PART:
return CRITERIA_HEADERS_PART;
+ case MATCHCRITERIA_NOT_HEADERS_CONT:
+ case MATCHCRITERIA_HEADERS_CONT:
+ return CRITERIA_HEADERS_CONT;
case MATCHCRITERIA_NOT_HEADER:
case MATCHCRITERIA_HEADER:
return CRITERIA_HEADER;
+ case MATCHCRITERIA_AGE_GREATER_HOURS:
+ return CRITERIA_AGE_GREATER_HOURS;
+ case MATCHCRITERIA_AGE_LOWER_HOURS:
+ return CRITERIA_AGE_LOWER_HOURS;
case MATCHCRITERIA_AGE_GREATER:
return CRITERIA_AGE_GREATER;
case MATCHCRITERIA_AGE_LOWER:
return CRITERIA_AGE_LOWER;
+ case MATCHCRITERIA_DATE_AFTER:
+ return CRITERIA_DATE_AFTER;
+ case MATCHCRITERIA_DATE_BEFORE:
+ return CRITERIA_DATE_BEFORE;
case MATCHCRITERIA_SCORE_GREATER:
return CRITERIA_SCORE_GREATER;
case MATCHCRITERIA_SCORE_LOWER:
return MATCHCRITERIA_SIGNED;
case CRITERIA_PARTIAL:
return MATCHCRITERIA_PARTIAL;
-#if !GTK_CHECK_VERSION(3, 0, 0)
case CRITERIA_COLORLABEL:
return MATCHCRITERIA_COLORLABEL;
-#endif
case CRITERIA_IGNORE_THREAD:
return MATCHCRITERIA_IGNORE_THREAD;
case CRITERIA_WATCH_THREAD:
return MATCHCRITERIA_TAGGED;
case CRITERIA_NEWSGROUPS:
return MATCHCRITERIA_NEWSGROUPS;
+ case CRITERIA_MESSAGEID:
+ return MATCHCRITERIA_MESSAGEID;
case CRITERIA_INREPLYTO:
return MATCHCRITERIA_INREPLYTO;
case CRITERIA_REFERENCES:
return MATCHCRITERIA_AGE_GREATER;
case CRITERIA_AGE_LOWER:
return MATCHCRITERIA_AGE_LOWER;
+ case CRITERIA_AGE_GREATER_HOURS:
+ return MATCHCRITERIA_AGE_GREATER_HOURS;
+ case CRITERIA_AGE_LOWER_HOURS:
+ return MATCHCRITERIA_AGE_LOWER_HOURS;
+ case CRITERIA_DATE_AFTER:
+ return MATCHCRITERIA_DATE_AFTER;
+ case CRITERIA_DATE_BEFORE:
+ return MATCHCRITERIA_DATE_BEFORE;
case CRITERIA_SCORE_GREATER:
return MATCHCRITERIA_SCORE_GREATER;
case CRITERIA_SCORE_LOWER:
return MATCHCRITERIA_HEADER;
case CRITERIA_HEADERS_PART:
return MATCHCRITERIA_HEADERS_PART;
+ case CRITERIA_HEADERS_CONT:
+ return MATCHCRITERIA_HEADERS_CONT;
case CRITERIA_BODY_PART:
return MATCHCRITERIA_BODY_PART;
case CRITERIA_MESSAGE:
return MATCHCRITERIA_NOT_SIGNED;
case MATCHCRITERIA_PARTIAL:
return MATCHCRITERIA_NOT_PARTIAL;
-#if !GTK_CHECK_VERSION(3, 0, 0)
case MATCHCRITERIA_COLORLABEL:
return MATCHCRITERIA_NOT_COLORLABEL;
-#endif
case MATCHCRITERIA_IGNORE_THREAD:
return MATCHCRITERIA_NOT_IGNORE_THREAD;
case MATCHCRITERIA_WATCH_THREAD:
return MATCHCRITERIA_NOT_TAGGED;
case MATCHCRITERIA_NEWSGROUPS:
return MATCHCRITERIA_NOT_NEWSGROUPS;
+ case MATCHCRITERIA_MESSAGEID:
+ return MATCHCRITERIA_NOT_MESSAGEID;
case MATCHCRITERIA_INREPLYTO:
return MATCHCRITERIA_NOT_INREPLYTO;
case MATCHCRITERIA_REFERENCES:
return MATCHCRITERIA_NOT_HEADER;
case MATCHCRITERIA_HEADERS_PART:
return MATCHCRITERIA_NOT_HEADERS_PART;
+ case MATCHCRITERIA_HEADERS_CONT:
+ return MATCHCRITERIA_NOT_HEADERS_CONT;
case MATCHCRITERIA_MESSAGE:
return MATCHCRITERIA_NOT_MESSAGE;
case MATCHCRITERIA_TEST:
case MATCH_ALL:
return CRITERIA_ALL;
case MATCH_AGE:
+ case MATCH_DATE:
case MATCH_SCORE:
case MATCH_SIZE:
case MATCH_FLAG:
case MATCH_HEADER:
header = gtk_entry_get_text(GTK_ENTRY(matcher.header_entry));
return header_name_to_crit(header);
-#if !GTK_CHECK_VERSION(3, 0, 0)
case MATCH_LABEL:
return CRITERIA_COLORLABEL;
-#endif
case MATCH_PARTIAL:
return CRITERIA_PARTIAL;
case MATCH_TEST:
case CRITERIA_CC:
case CRITERIA_TO_OR_CC:
case CRITERIA_NEWSGROUPS:
+ case CRITERIA_MESSAGEID:
case CRITERIA_INREPLYTO:
case CRITERIA_REFERENCES:
case CRITERIA_HEADER:
case CRITERIA_HEADERS_PART:
+ case CRITERIA_HEADERS_CONT:
case CRITERIA_BODY_PART:
case CRITERIA_MESSAGE:
case CRITERIA_TAG:
const gchar *header;
const gchar *expr;
gint value, sel;
+ gint year, month, day, hour, minute;
if (value_criteria == -1)
return NULL;
- criteria = prefs_matcher_get_matching_from_criteria(value_criteria);
-
- value_pred = prefs_matcher_get_pred(value_criteria);
- if(value_pred)
- criteria = prefs_matcher_not_criteria(criteria);
-
-#ifndef G_OS_WIN32
use_regexp = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(matcher.regexp_checkbtn));
-#else
- use_regexp = FALSE;
-#endif
case_sensitive = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(matcher.case_checkbtn));
if (use_regexp) {
case CRITERIA_TO_OR_CC:
case CRITERIA_TAG:
case CRITERIA_NEWSGROUPS:
+ case CRITERIA_MESSAGEID:
case CRITERIA_INREPLYTO:
case CRITERIA_REFERENCES:
case CRITERIA_HEADERS_PART:
+ case CRITERIA_HEADERS_CONT:
case CRITERIA_BODY_PART:
case CRITERIA_MESSAGE:
expr = gtk_entry_get_text(GTK_ENTRY(matcher.string_entry));
}
break;
+ case CRITERIA_DATE_AFTER:
+ case CRITERIA_DATE_BEFORE:
+ expr = NULL;
+ gtk_calendar_get_date(GTK_CALENDAR(matcher.calendar), &year, &month, &day);
+ if (gtkut_time_select_get_time(GTK_COMBO_BOX(matcher.time_entry), &hour, &minute))
+ expr = g_strdup_printf("%4d-%02d-%02d %02d:%02d:00",
+ year, month + 1, day, hour, minute);
+
+ if (expr == NULL) {
+ alertpanel_error(_("Invalid hour."));
+ return NULL;
+ }
+ break;
+
case CRITERIA_TEST:
expr = gtk_entry_get_text(GTK_ENTRY(matcher.string_entry));
sel = gtk_combo_box_get_active(GTK_COMBO_BOX(matcher.match_combo2));
if(sel == AGE_WEEKS)
value *= 7;
+ else if (sel == AGE_HOURS) {
+ if (value_criteria == CRITERIA_AGE_GREATER)
+ value_criteria = CRITERIA_AGE_GREATER_HOURS;
+ else
+ value_criteria = CRITERIA_AGE_LOWER_HOURS;
+ }
break;
case CRITERIA_SCORE_GREATER:
value *= KB_SIZE;
break;
-#if !GTK_CHECK_VERSION(3, 0, 0)
case CRITERIA_COLORLABEL:
value = colorlabel_get_color_menu_active_item
(gtk_cmoption_menu_get_menu(GTK_CMOPTION_MENU
(matcher.color_optmenu)));
break;
-#endif
case CRITERIA_HEADER:
header = gtk_entry_get_text(GTK_ENTRY(matcher.header_entry));
if (*expr == '\0') {
gchar *tmp;
- if (g_utf8_collate(header, Q_("Filtering Matcher Menu|All")) == 0)
+ if (g_utf8_collate(header, C_("Filtering Matcher Menu", "All")) == 0)
tmp = g_strdup(_("all addresses in all headers"));
else
if (g_utf8_collate(header, _("Any")) == 0)
return NULL;
}
/* store UNtranslated "Any"/"All" in matcher expressions */
- if (g_utf8_collate(header, Q_("Filtering Matcher Menu|All")) == 0)
+ if (g_utf8_collate(header, C_("Filtering Matcher Menu", "All")) == 0)
header = "All";
else
if (g_utf8_collate(header, _("Any")) == 0)
break;
}
- matcherprop = matcherprop_new_create(criteria, header, matchtype,
+ criteria = prefs_matcher_get_matching_from_criteria(value_criteria);
+
+ value_pred = prefs_matcher_get_pred(value_criteria);
+ if(value_pred)
+ criteria = prefs_matcher_not_criteria(criteria);
+
+ matcherprop = matcherprop_new(criteria, header, matchtype,
expr, value);
return matcherprop;
gtk_label_set_text(GTK_LABEL(matcher.match_label),
_("Headers part"));
break;
+ case CRITERIA_HEADERS_CONT:
+ gtk_label_set_text(GTK_LABEL(matcher.match_label),
+ _("Headers values"));
+ break;
case CRITERIA_BODY_PART:
gtk_label_set_text(GTK_LABEL(matcher.match_label),
_("Body part"));
prefs_matcher_enable_widget(matcher.match_label2, TRUE);
prefs_matcher_enable_widget(matcher.string_entry, FALSE);
prefs_matcher_enable_widget(matcher.case_checkbtn, FALSE);
-#ifndef G_OS_WIN32
prefs_matcher_enable_widget(matcher.regexp_checkbtn, FALSE);
-#endif
} else {
prefs_matcher_enable_widget(matcher.upper_filler, TRUE);
prefs_matcher_enable_widget(matcher.match_label2, FALSE);
prefs_matcher_enable_widget(matcher.string_entry, TRUE);
prefs_matcher_enable_widget(matcher.case_checkbtn, TRUE);
-#ifndef G_OS_WIN32
prefs_matcher_enable_widget(matcher.regexp_checkbtn, TRUE);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
matcher.regexp_checkbtn), FALSE);
-#endif
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
matcher.case_checkbtn), FALSE);
}
prefs_matcher_enable_widget(matcher.string_entry,
(MATCH_CASE_REGEXP(value) ||
value == MATCH_TEST));
+ prefs_matcher_enable_widget(matcher.calendar,
+ (value == MATCH_DATE));
+ prefs_matcher_enable_widget(matcher.time_label,
+ (value == MATCH_DATE));
+ prefs_matcher_enable_widget(matcher.time_entry,
+ (value == MATCH_DATE));
prefs_matcher_enable_widget(matcher.numeric_entry,
MATCH_NUMERIC(value));
prefs_matcher_enable_widget(matcher.numeric_label,
MATCH_COMBO_IS_ENABLED(value));
prefs_matcher_enable_widget(matcher.case_checkbtn,
MATCH_CASE_REGEXP(value));
-#ifndef G_OS_WIN32
prefs_matcher_enable_widget(matcher.regexp_checkbtn,
MATCH_CASE_REGEXP(value));
-#endif
prefs_matcher_enable_widget(matcher.test_btn,
(value == MATCH_TEST));
prefs_matcher_enable_widget(matcher.addressbook_select_btn,
(value == MATCH_ABOOK));
-#if !GTK_CHECK_VERSION(3, 0, 0)
prefs_matcher_enable_widget(matcher.color_optmenu,
(value == MATCH_LABEL));
-#endif
prefs_matcher_enable_widget(matcher.upper_filler,
MATCH_CASE_REGEXP(value));
prefs_matcher_enable_widget(matcher.lower_filler,
gtk_label_set_text(GTK_LABEL(matcher.match_label), _("Header"));
gtk_label_set_text(GTK_LABEL(matcher.match_label2), _("content is"));
break;
+ case MATCH_DATE:
+ prefs_matcher_set_model(matcher.match_combo, matcher.model_date);
+ gtk_label_set_text(GTK_LABEL(matcher.match_label), _("Date is"));
+ gtk_calendar_select_today(GTK_CALENDAR(matcher.calendar));
+ gtkut_time_select_select_by_time(GTK_COMBO_BOX(matcher.time_entry), 0, 0);
+ break;
case MATCH_AGE:
prefs_matcher_set_model(matcher.match_combo, matcher.model_age);
prefs_matcher_set_model(matcher.match_combo2, matcher.model_age_units);
gtk_spin_button_set_range(GTK_SPIN_BUTTON(
- matcher.numeric_entry), 0, 1000);
+ matcher.numeric_entry), 0, 10000);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(matcher.numeric_entry), 0);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(matcher.match_combo2), AGE_DAYS);
gtk_label_set_text(GTK_LABEL(matcher.match_label), _("Age is"));
break;
case MATCH_FLAG:
prefs_matcher_set_model(matcher.match_combo, matcher.model_contain);
gtk_label_set_text(GTK_LABEL(matcher.criteria_label2), _("Name:"));
gtk_label_set_text(GTK_LABEL(matcher.match_label), _("Header"));
-#ifndef G_OS_WIN32
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.regexp_checkbtn), FALSE);
-#endif
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.case_checkbtn), FALSE);
break;
-#if !GTK_CHECK_VERSION(3, 0, 0)
case MATCH_LABEL:
gtk_cmoption_menu_set_history(GTK_CMOPTION_MENU(matcher.color_optmenu), 0);
prefs_matcher_set_model(matcher.match_combo2, matcher.model_set);
gtk_label_set_text(GTK_LABEL(matcher.match_label), _("Label"));
gtk_label_set_text(GTK_LABEL(matcher.match_label2), _("is"));
break;
-#endif
case MATCH_PARTIAL:
prefs_matcher_set_model(matcher.criteria_combo2, matcher.model_partial);
gtk_label_set_text(GTK_LABEL(matcher.criteria_label2), _("Value:"));
prefs_matcher_set_model(matcher.criteria_combo2, matcher.model_phrase);
prefs_matcher_set_model(matcher.match_combo, matcher.model_contain);
gtk_label_set_text(GTK_LABEL(matcher.criteria_label2), _("in"));
-#ifndef G_OS_WIN32
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.regexp_checkbtn), FALSE);
-#endif
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.case_checkbtn), FALSE);
prefs_matcher_second_criteria_sel(NULL, NULL);
break;
if (!matcher_str || strcmp(matcher_str, str) != 0) {
val = alertpanel(_("Entry not saved"),
_("The entry was not saved.\nClose anyway?"),
- GTK_STOCK_CLOSE, _("+_Continue editing"), NULL);
+ GTK_STOCK_CLOSE,
+ _("_Continue editing"),
+ NULL,
+ ALERTFOCUS_SECOND);
if (G_ALERTDEFAULT != val) {
g_free(matcher_str);
g_free(str);
static DescriptionWindow test_desc_win = {
NULL,
NULL,
+ TRUE,
2,
N_("Match Type: 'Test'"),
N_("'Test' allows you to test a message or message element "
description_window_create(&test_desc_win);
}
-#ifndef USE_NEW_ADDRBOOK
+#ifndef USE_ALT_ADDRBOOK
static void prefs_matcher_addressbook_select(void)
{
const gchar *folderpath = NULL;
break;
case CRITERIA_AGE_GREATER:
case CRITERIA_AGE_LOWER:
+ case CRITERIA_AGE_GREATER_HOURS:
+ case CRITERIA_AGE_LOWER_HOURS:
match_criteria = MATCH_AGE;
break;
+ case CRITERIA_DATE_AFTER:
+ case CRITERIA_DATE_BEFORE:
+ match_criteria = MATCH_DATE;
+ break;
case CRITERIA_SCORE_GREATER:
case CRITERIA_SCORE_LOWER:
case CRITERIA_SCORE_EQUAL:
case CRITERIA_CC:
case CRITERIA_TO_OR_CC:
case CRITERIA_NEWSGROUPS:
+ case CRITERIA_MESSAGEID:
case CRITERIA_INREPLYTO:
case CRITERIA_REFERENCES:
case CRITERIA_HEADER:
match_criteria = MATCH_HEADER;
break;
case CRITERIA_HEADERS_PART:
+ case CRITERIA_HEADERS_CONT:
case CRITERIA_BODY_PART:
case CRITERIA_MESSAGE:
match_criteria = MATCH_PHRASE;
case CRITERIA_TEST:
match_criteria = MATCH_TEST;
break;
-#if !GTK_CHECK_VERSION(3, 0, 0)
case CRITERIA_COLORLABEL:
match_criteria = MATCH_LABEL;
break;
-#endif
case CRITERIA_TAG:
case CRITERIA_TAGGED:
match_criteria = MATCH_TAGS;
criteria);
break;
case MATCH_AGE:
+ case MATCH_DATE:
case MATCH_SCORE:
case MATCH_SIZE:
case MATCH_FLAG:
GtkWidget *menu;
GtkTreeIter iter;
gboolean is_valid;
+ struct tm lt;
+ char zone[6];
if (currently_selected)
return TRUE;
case MATCHCRITERIA_NOT_TAG:
case MATCHCRITERIA_NOT_TAGGED:
case MATCHCRITERIA_NOT_NEWSGROUPS:
+ case MATCHCRITERIA_NOT_MESSAGEID:
case MATCHCRITERIA_NOT_INREPLYTO:
case MATCHCRITERIA_NOT_REFERENCES:
case MATCHCRITERIA_NOT_HEADER:
case MATCHCRITERIA_NOT_HEADERS_PART:
+ case MATCHCRITERIA_NOT_HEADERS_CONT:
case MATCHCRITERIA_NOT_MESSAGE:
case MATCHCRITERIA_NOT_BODY_PART:
case MATCHCRITERIA_NOT_TEST:
case MATCHCRITERIA_NOT_TO_AND_NOT_CC:
case MATCHCRITERIA_NOT_TAG:
case MATCHCRITERIA_NOT_NEWSGROUPS:
+ case MATCHCRITERIA_NOT_MESSAGEID:
case MATCHCRITERIA_NOT_INREPLYTO:
case MATCHCRITERIA_NOT_REFERENCES:
case MATCHCRITERIA_NOT_HEADERS_PART:
+ case MATCHCRITERIA_NOT_HEADERS_CONT:
case MATCHCRITERIA_NOT_BODY_PART:
case MATCHCRITERIA_NOT_MESSAGE:
case MATCHCRITERIA_NOT_TEST:
case MATCHCRITERIA_TO_OR_CC:
case MATCHCRITERIA_TAG:
case MATCHCRITERIA_NEWSGROUPS:
+ case MATCHCRITERIA_MESSAGEID:
case MATCHCRITERIA_INREPLYTO:
case MATCHCRITERIA_REFERENCES:
case MATCHCRITERIA_HEADERS_PART:
+ case MATCHCRITERIA_HEADERS_CONT:
case MATCHCRITERIA_BODY_PART:
case MATCHCRITERIA_MESSAGE:
case MATCHCRITERIA_TEST:
gtk_entry_set_text(GTK_ENTRY(matcher.string_entry), prop->expr);
break;
+ case MATCHCRITERIA_DATE_AFTER:
+ case MATCHCRITERIA_DATE_BEFORE:
+ zone[0] = '\0';
+ procheader_date_parse_to_tm(prop->expr, <, zone);
+ gtk_calendar_select_day(GTK_CALENDAR(matcher.calendar), lt.tm_mday);
+ gtk_calendar_select_month(GTK_CALENDAR(matcher.calendar), lt.tm_mon, lt.tm_year + 1900);
+ gtkut_time_select_select_by_time(GTK_COMBO_BOX(matcher.time_entry), lt.tm_hour, lt.tm_min);
+
+ break;
+
case MATCHCRITERIA_FOUND_IN_ADDRESSBOOK:
case MATCHCRITERIA_NOT_FOUND_IN_ADDRESSBOOK:
{
/* matcher expressions contain UNtranslated "Any"/"All",
select the relevant translated combo item */
if (strcasecmp(prop->header, "All") == 0)
- header = (gchar*)Q_("Filtering Matcher Menu|All");
+ header = (gchar*)C_("Filtering Matcher Menu", "All");
else
if (strcasecmp(prop->header, "Any") == 0)
header = _("Any");
}
break;
+ case MATCHCRITERIA_AGE_GREATER_HOURS:
+ case MATCHCRITERIA_AGE_LOWER_HOURS:
+ gtk_combo_box_set_active(GTK_COMBO_BOX(matcher.match_combo2),
+ AGE_HOURS);
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(
+ matcher.numeric_entry), prop->value);
+ break;
+
case MATCHCRITERIA_SCORE_GREATER:
case MATCHCRITERIA_SCORE_LOWER:
case MATCHCRITERIA_SCORE_EQUAL:
}
break;
-#if !GTK_CHECK_VERSION(3, 0, 0)
case MATCHCRITERIA_NOT_COLORLABEL:
case MATCHCRITERIA_COLORLABEL:
gtk_cmoption_menu_set_history(GTK_CMOPTION_MENU(matcher.color_optmenu),
menu = gtk_cmoption_menu_get_menu(GTK_CMOPTION_MENU(matcher.color_optmenu));
g_signal_emit_by_name(G_OBJECT(menu), "selection-done", menu);
break;
-#endif
case MATCHCRITERIA_NOT_HEADER:
case MATCHCRITERIA_HEADER:
case CRITERIA_CC:
case CRITERIA_TO_OR_CC:
case CRITERIA_NEWSGROUPS:
+ case CRITERIA_MESSAGEID:
case CRITERIA_INREPLYTO:
case CRITERIA_REFERENCES:
case CRITERIA_HEADER:
case CRITERIA_HEADERS_PART:
+ case CRITERIA_HEADERS_CONT:
case CRITERIA_BODY_PART:
case CRITERIA_MESSAGE:
case CRITERIA_TAG:
switch(prop->matchtype) {
case MATCHTYPE_MATCH:
-#ifndef G_OS_WIN32
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.regexp_checkbtn), FALSE);
-#endif
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.case_checkbtn), TRUE);
break;
case MATCHTYPE_MATCHCASE:
-#ifndef G_OS_WIN32
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.regexp_checkbtn), FALSE);
-#endif
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.case_checkbtn), FALSE);
break;
case MATCHTYPE_REGEXP:
-#ifndef G_OS_WIN32
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.regexp_checkbtn), TRUE);
-#endif
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.case_checkbtn), TRUE);
break;
case MATCHTYPE_REGEXPCASE:
-#ifndef G_OS_WIN32
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.regexp_checkbtn), TRUE);
-#endif
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.case_checkbtn), FALSE);
break;
}
projects / claws.git / blobdiff