Use Delete button instead of Remove (tooltips and other places already

[claws.git] / src / prefs_matcher.c

diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
index 272cad8c39007f8b7b90cdf1ebd29f13db01f4a9..9c2d1807cae5d5993ad100577dfbdf68a2cada19 100644 (file)
--- a/src/prefs_matcher.c
+++ b/src/prefs_matcher.c
@@ -55,11 +55,11 @@
 #include "matcher_parser.h"
 #include "colorlabel.h"
 #include "tags.h"
-#ifndef USE_NEW_ADDRBOOK
+#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);
@@ -98,9 +98,7 @@ static struct Matcher {
        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
@@ -524,9 +522,7 @@ static void prefs_matcher_create(void)
        GtkWidget *numeric_entry;
        GtkWidget *numeric_label;
        
-#ifndef G_OS_WIN32
        GtkWidget *regexp_checkbtn;
-#endif
        GtkWidget *case_checkbtn;
 
        GtkWidget *reg_hbox;
@@ -682,7 +678,7 @@ static void prefs_matcher_create(void)
 
        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);
@@ -744,9 +740,7 @@ static void prefs_matcher_create(void)
 
        vbox = gtk_vbox_new(FALSE, VSPACING_NARROW);
        PACK_CHECK_BUTTON(vbox, case_checkbtn, _("Case sensitive"));
-#ifndef G_OS_WIN32
        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);
@@ -782,7 +776,7 @@ static void prefs_matcher_create(void)
                         G_CALLBACK(prefs_matcher_substitute_cb),
                         NULL);
 
-       del_btn = gtk_button_new_with_mnemonic (_("Re_move"));
+       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);
@@ -862,12 +856,10 @@ static void prefs_matcher_create(void)
        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
+#ifndef USE_ALT_ADDRBOOK
        matcher.addressbook_select_btn = addressbook_select_btn;
 #endif
 #if !GTK_CHECK_VERSION(3, 0, 0)
@@ -970,9 +962,7 @@ static void prefs_matcher_reset_condition(void)
        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);
 }
 
@@ -1485,11 +1475,7 @@ static MatcherProp *prefs_matcher_dialog_to_matcher(void)
        if (value_criteria == -1)
                return NULL;
 
-#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) {
@@ -1875,19 +1861,15 @@ static void prefs_matcher_second_criteria_sel(GtkWidget *widget,
                        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);
                }
@@ -1958,10 +1940,8 @@ static void prefs_matcher_criteria_select(GtkWidget *widget,
                                    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,
@@ -2007,9 +1987,7 @@ static void prefs_matcher_criteria_select(GtkWidget *widget,
                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)
@@ -2028,9 +2006,7 @@ static void prefs_matcher_criteria_select(GtkWidget *widget,
                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;  
@@ -2221,7 +2197,7 @@ static void prefs_matcher_test_info(GtkWidget *widget, GtkWidget *parent)
        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;
@@ -2678,30 +2654,22 @@ static gboolean prefs_matcher_selected(GtkTreeSelection *selector,
 
        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;
        }