fix bug 4239, 'Preferences: Text Options Header Display modal is not modal' (sic)

[claws.git] / src / prefs_matcher.c

diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
index 874cc4fa4be15f0f635d65f99cda2fb1eb0d2d29..830df350cca93a657f101d96c5c95a4645cf1511 100644 (file)
--- a/src/prefs_matcher.c
+++ b/src/prefs_matcher.c
@@ -32,13 +32,12 @@
 #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"
@@ -98,14 +97,16 @@ static struct Matcher {
        GtkWidget *addressbook_folder_combo;
        GtkWidget *case_checkbtn;
        GtkWidget *regexp_checkbtn;
-#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;
@@ -186,7 +187,10 @@ enum {
        CRITERIA_AGE_LOWER_HOURS = 40,
 
        CRITERIA_MESSAGEID = 41,
-       CRITERIA_HEADERS_CONT = 42
+       CRITERIA_HEADERS_CONT = 42,
+
+       CRITERIA_DATE_AFTER = 43,
+       CRITERIA_DATE_BEFORE = 44
 };
 
 enum {
@@ -202,7 +206,8 @@ enum {
        MATCH_PARTIAL   = 9,
        MATCH_ABOOK     = 10,
        MATCH_TAGS      = 11,
-       MATCH_TEST      = 12
+       MATCH_TEST      = 12,
+       MATCH_DATE      = 13
 };
 
 enum {
@@ -337,6 +342,11 @@ static void prefs_matcher_models_create(void)
        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);
@@ -448,11 +458,9 @@ void prefs_matcher_open(MatcherList *matchers, PrefsMatcherSignal *cb)
                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));
@@ -541,9 +549,12 @@ static void prefs_matcher_create(void)
 
        GtkWidget *test_btn;
        GtkWidget *addressbook_select_btn;
-#if !GTK_CHECK_VERSION(3, 0, 0)
        GtkWidget *color_optmenu;
-#endif
+       GtkWidget *calendar;
+       GtkWidget *time_label;
+       GtkWidget *time_entry;
+       GtkWidget *date_hbox;
+       GtkWidget *date_vbox;
 
        static GdkGeometry geometry;
        GtkSizeGroup *size_group;
@@ -555,6 +566,7 @@ static void prefs_matcher_create(void)
        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);
@@ -618,19 +630,20 @@ static void prefs_matcher_create(void)
        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);
@@ -692,13 +705,11 @@ static void prefs_matcher_create(void)
        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,
@@ -743,6 +754,21 @@ static void prefs_matcher_create(void)
        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);
@@ -855,12 +881,13 @@ static void prefs_matcher_create(void)
        matcher.regexp_checkbtn = regexp_checkbtn;
        matcher.bool_op_combo = bool_op_combo;
        matcher.test_btn = test_btn;
+       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
-#if !GTK_CHECK_VERSION(3, 0, 0)
        matcher.color_optmenu = color_optmenu;
-#endif
        matcher.match_label = match_label;
        matcher.criteria_label2 = criteria_label2;
        matcher.headers_combo = headers_combo;
@@ -950,9 +977,7 @@ static void prefs_matcher_reset_condition(void)
                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), "");
@@ -960,6 +985,9 @@ static void prefs_matcher_reset_condition(void)
        gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((matcher.addressbook_folder_combo)))), "");
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.regexp_checkbtn), FALSE);
        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);
 }
 
 /*!
@@ -1093,11 +1121,9 @@ static gint prefs_matcher_get_criteria_from_matching(gint matching_id)
        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;
@@ -1160,6 +1186,10 @@ static gint prefs_matcher_get_criteria_from_matching(gint matching_id)
                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:
@@ -1218,10 +1248,8 @@ static gint prefs_matcher_get_matching_from_criteria(gint criteria_id)
                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:
@@ -1256,6 +1284,10 @@ static gint prefs_matcher_get_matching_from_criteria(gint criteria_id)
                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:
@@ -1320,10 +1352,8 @@ static gint prefs_matcher_not_criteria(gint matcher_criteria)
                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:
@@ -1381,6 +1411,7 @@ static gint prefs_matcher_get_criteria(void)
        case MATCH_ALL:
                return CRITERIA_ALL;
        case MATCH_AGE:
+       case MATCH_DATE:
        case MATCH_SCORE:
        case MATCH_SIZE:
        case MATCH_FLAG:
@@ -1389,10 +1420,8 @@ static gint prefs_matcher_get_criteria(void)
        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:
@@ -1469,6 +1498,7 @@ static MatcherProp *prefs_matcher_dialog_to_matcher(void)
        const gchar *header;
        const gchar *expr;
        gint value, sel;
+       gint year, month, day, hour, minute;
 
        if (value_criteria == -1)
                return NULL;
@@ -1533,6 +1563,20 @@ static MatcherProp *prefs_matcher_dialog_to_matcher(void)
                }
                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));
                
@@ -1576,13 +1620,11 @@ static MatcherProp *prefs_matcher_dialog_to_matcher(void)
                        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));
@@ -1928,6 +1970,12 @@ static void prefs_matcher_criteria_select(GtkWidget *widget,
        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,
@@ -1944,10 +1992,8 @@ static void prefs_matcher_criteria_select(GtkWidget *widget,
                                    (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,
@@ -1965,6 +2011,12 @@ static void prefs_matcher_criteria_select(GtkWidget *widget,
                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);
@@ -1988,14 +2040,12 @@ static void prefs_matcher_criteria_select(GtkWidget *widget,
                gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.regexp_checkbtn), FALSE);
                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:"));
@@ -2301,6 +2351,10 @@ static void prefs_matcher_set_criteria(const gint criteria)
        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:
@@ -2332,11 +2386,9 @@ static void prefs_matcher_set_criteria(const gint criteria)
        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;
@@ -2373,6 +2425,7 @@ static void prefs_matcher_set_criteria(const gint criteria)
                                                criteria);
                break;
        case MATCH_AGE:
+       case MATCH_DATE:
        case MATCH_SCORE:
        case MATCH_SIZE:
        case MATCH_FLAG:
@@ -2400,6 +2453,8 @@ static gboolean prefs_matcher_selected(GtkTreeSelection *selector,
        GtkWidget *menu;
        GtkTreeIter iter;
        gboolean is_valid;
+       struct tm lt;
+       char  zone[6];
 
        if (currently_selected)
                return TRUE;
@@ -2503,6 +2558,16 @@ static gboolean prefs_matcher_selected(GtkTreeSelection *selector,
                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, &lt, 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:
        {
@@ -2579,7 +2644,6 @@ static gboolean prefs_matcher_selected(GtkTreeSelection *selector,
                }
                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),
@@ -2587,7 +2651,6 @@ static gboolean prefs_matcher_selected(GtkTreeSelection *selector,
                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: