projects / claws.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fix overlapping labels and boxes when user has large GTK font
[claws.git] / src / prefs_matcher.c
diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
index e0cb02d19661efe5cd76a90c995dfd6e638ede07..1f2d30fc7781a753713d6554fd680835be7bc29c 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);
@@ -581,7 +586,7 @@ static void prefs_matcher_create(void)
        
        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);
@@ -604,7 +609,7 @@ static void prefs_matcher_create(void)
        /* criteria combo box */
        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);
 
@@ -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(GTK_COMBO_BOX(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);
@@ -664,7 +673,7 @@ static void prefs_matcher_create(void)
        gtk_widget_set_size_request(addressbook_folder_combo, 150, -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
        g_signal_connect(G_OBJECT (addressbook_select_btn), "clicked",
@@ -725,10 +734,14 @@ static void prefs_matcher_create(void)
 
        hbox = gtk_hbox_new(FALSE, HSPACING_NARROW);
        gtk_size_group_add_widget(size_group, hbox);
-       PACK_CHECK_BUTTON(hbox, case_checkbtn, _("Case sensitive"));
+
+       vbox = gtk_vbox_new(FALSE, VSPACING_NARROW);
+       PACK_CHECK_BUTTON(vbox, case_checkbtn, _("Case sensitive"));
 #ifndef G_OS_WIN32
-       PACK_CHECK_BUTTON(hbox, regexp_checkbtn, _("Use regexp"));
+       PACK_CHECK_BUTTON(vbox, regexp_checkbtn, _("Use regexp"));
 #endif
+       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);
@@ -756,13 +769,15 @@ static void prefs_matcher_create(void)
        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 (_("Re_move"));
+       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);
@@ -1136,6 +1151,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 +1249,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 +1462,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 +1540,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:
@@ -1603,6 +1626,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 +1964,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:
@@ -2261,6 +2291,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:
@@ -2497,6 +2529,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:
Claws Mail