2012-11-20 [colin] 3.9.0cvs17

[claws.git] / src / prefs_matcher.c

diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
index bb5cc8789e2fd90f44b703e7691853d40cc6384d..23a961d786972f1a9da41cdb1e8fb638417d8f6b 100644 (file)
--- a/src/prefs_matcher.c
+++ b/src/prefs_matcher.c
@@ -183,7 +183,10 @@ enum {
        CRITERIA_TAGGED = 36,
 
        CRITERIA_HAS_ATTACHMENT = 37,
-       CRITERIA_SIGNED = 38
+       CRITERIA_SIGNED = 38,
+
+       CRITERIA_AGE_GREATER_HOURS = 39,
+       CRITERIA_AGE_LOWER_HOURS = 40
 };
 
 enum {
@@ -203,8 +206,9 @@ enum {
 };
 
 enum {
-       AGE_DAYS  = 0,
-       AGE_WEEKS = 1
+       AGE_HOURS = 0,
+       AGE_DAYS  = 1,
+       AGE_WEEKS = 2
 };
 
 enum {
@@ -326,6 +330,7 @@ static void prefs_matcher_models_create(void)
        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);
@@ -647,6 +652,10 @@ static void prefs_matcher_create(void)
        headers_combo = gtk_combo_box_entry_new_with_model(matcher.model_headers, 0);
 #else
        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(headers_combo, 0);
 #endif
        gtk_widget_set_size_request(headers_combo, 100, -1);
        gtk_box_pack_start(GTK_BOX(upper_hbox), headers_combo, TRUE, TRUE, 0);
@@ -695,7 +704,7 @@ static void prefs_matcher_create(void)
        
        /* address header name */
        header_addr_combo = combobox_text_new(TRUE,
-                             Q_("Filtering Matcher Menu|All"), _("Any"),
+                             C_("Filtering Matcher Menu", "All"), _("Any"),
                              "From", "To", "Cc", "Reply-To", "Sender", 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)));
@@ -1136,6 +1145,10 @@ static gint prefs_matcher_get_criteria_from_matching(gint matching_id)
        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:
@@ -1230,6 +1243,10 @@ static gint prefs_matcher_get_matching_from_criteria(gint criteria_id)
                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_SCORE_GREATER:
                return MATCHCRITERIA_SCORE_GREATER;
        case CRITERIA_SCORE_LOWER:
@@ -1439,12 +1456,6 @@ static MatcherProp *prefs_matcher_dialog_to_matcher(void)
        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
@@ -1523,6 +1534,12 @@ static MatcherProp *prefs_matcher_dialog_to_matcher(void)
                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:
@@ -1578,7 +1595,7 @@ static MatcherProp *prefs_matcher_dialog_to_matcher(void)
                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)
@@ -1593,7 +1610,7 @@ static MatcherProp *prefs_matcher_dialog_to_matcher(void)
                    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)
@@ -1603,6 +1620,12 @@ static MatcherProp *prefs_matcher_dialog_to_matcher(void)
                break;
        }
 
+       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);
 
@@ -1935,6 +1958,7 @@ static void prefs_matcher_criteria_select(GtkWidget *widget,
                gtk_spin_button_set_range(GTK_SPIN_BUTTON(
                                  matcher.numeric_entry), 0, 1000);
                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:
@@ -2139,6 +2163,7 @@ static gchar *test_desc_strings[] = {
 static DescriptionWindow test_desc_win = { 
        NULL,
         NULL, 
+       TRUE,
         2,
         N_("Match Type: 'Test'"),
        N_("'Test' allows you to test a message or message element "
@@ -2260,6 +2285,8 @@ static void prefs_matcher_set_criteria(const gint criteria)
                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_SCORE_GREATER:
@@ -2465,7 +2492,7 @@ static gboolean prefs_matcher_selected(GtkTreeSelection *selector,
                /* 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");
@@ -2496,6 +2523,14 @@ static gboolean prefs_matcher_selected(GtkTreeSelection *selector,
                }
                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: