remove all gtk3 conditionals

[claws.git] / src / prefs_matcher.c

diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
index f80d2b1d65c42961da3e34ae201be9441758ea35..78cbf7aa00e07697a4a4ee8d94a6f4710126de98 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,9 +97,10 @@ 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;
@@ -458,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));
@@ -551,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;
@@ -703,13 +704,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,
@@ -754,6 +753,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);
@@ -866,12 +880,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;
@@ -961,9 +976,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), "");
@@ -971,6 +984,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);
 }
 
 /*!
@@ -1104,11 +1120,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;
@@ -1233,10 +1247,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:
@@ -1339,10 +1351,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:
@@ -1409,10 +1419,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:
@@ -1489,6 +1497,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;
@@ -1544,8 +1553,6 @@ static MatcherProp *prefs_matcher_dialog_to_matcher(void)
        case CRITERIA_HEADERS_PART:
        case CRITERIA_HEADERS_CONT:
        case CRITERIA_BODY_PART:
-       case CRITERIA_DATE_AFTER:
-       case CRITERIA_DATE_BEFORE:
        case CRITERIA_MESSAGE:
                expr = gtk_entry_get_text(GTK_ENTRY(matcher.string_entry));
                
@@ -1555,6 +1562,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));
                
@@ -1598,13 +1619,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));
@@ -1949,7 +1968,13 @@ static void prefs_matcher_criteria_select(GtkWidget *widget,
                                    (value == MATCH_ABOOK));
        prefs_matcher_enable_widget(matcher.string_entry,
                                    (MATCH_CASE_REGEXP(value) ||
-                                    value == MATCH_TEST || value == MATCH_DATE));
+                                    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,
@@ -1966,10 +1991,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,
@@ -1990,6 +2013,8 @@ static void prefs_matcher_criteria_select(GtkWidget *widget,
        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);
@@ -2014,14 +2039,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:"));
@@ -2362,11 +2385,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;
@@ -2431,6 +2452,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;
@@ -2531,9 +2554,17 @@ static gboolean prefs_matcher_selected(GtkTreeSelection *selector,
        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:
-               gtk_entry_set_text(GTK_ENTRY(matcher.string_entry), prop->expr);
+               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:
@@ -2612,7 +2643,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),
@@ -2620,7 +2650,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: