#include <string.h>
#include <errno.h>
+#include "gtkcmoptionmenu.h"
#include "main.h"
#include "prefs_gtk.h"
#include "prefs_matcher.h"
#include "matcher_parser.h"
#include "colorlabel.h"
+#include "tags.h"
static void prefs_matcher_addressbook_select(void);
-static void prefs_matcher_test_info(void);
+static void prefs_matcher_test_info(GtkWidget *widget, GtkWidget *parent);
enum {
PREFS_MATCHER_COND,
GtkWidget *numeric_label;
GtkWidget *addressbook_folder_combo;
GtkWidget *case_checkbtn;
+#ifndef G_OS_WIN32
GtkWidget *regexp_checkbtn;
+#endif
GtkWidget *color_optmenu;
GtkWidget *test_btn;
matcher.model_contain = GTK_TREE_MODEL(store);
store = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN);
- COMBOBOX_ADD(store, "Subject", CRITERIA_HEADER);
- COMBOBOX_ADD(store, "From", CRITERIA_HEADER);
- COMBOBOX_ADD(store, "To", CRITERIA_HEADER);
- COMBOBOX_ADD(store, "Cc", CRITERIA_HEADER);
- COMBOBOX_ADD(store, "To or Cc", CRITERIA_HEADER);
- COMBOBOX_ADD(store, "In-Reply-To", CRITERIA_HEADER);
- COMBOBOX_ADD(store, "Newsgroups", CRITERIA_HEADER);
- COMBOBOX_ADD(store, "References", CRITERIA_HEADER);
+ COMBOBOX_ADD(store, "Subject", CRITERIA_SUBJECT);
+ COMBOBOX_ADD(store, "From", CRITERIA_FROM);
+ COMBOBOX_ADD(store, "To", CRITERIA_TO);
+ COMBOBOX_ADD(store, "Cc", CRITERIA_CC);
+ COMBOBOX_ADD(store, "To or Cc", CRITERIA_TO_OR_CC);
+ COMBOBOX_ADD(store, "In-Reply-To", CRITERIA_INREPLYTO);
+ COMBOBOX_ADD(store, "Newsgroups", CRITERIA_NEWSGROUPS);
+ COMBOBOX_ADD(store, "References", CRITERIA_REFERENCES);
COMBOBOX_ADD(store, "Sender", CRITERIA_HEADER);
COMBOBOX_ADD(store, "X-ML-Name", CRITERIA_HEADER);
COMBOBOX_ADD(store, "X-List", CRITERIA_HEADER);
matcher.model_headers = GTK_TREE_MODEL(store);
store = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN);
- COMBOBOX_ADD(store, "headers part", CRITERIA_HEADERS_PART);
- COMBOBOX_ADD(store, "body part", CRITERIA_BODY_PART);
- COMBOBOX_ADD(store, "whole message", CRITERIA_MESSAGE);
+ COMBOBOX_ADD(store, _("headers part"), CRITERIA_HEADERS_PART);
+ COMBOBOX_ADD(store, _("body part"), CRITERIA_BODY_PART);
+ COMBOBOX_ADD(store, _("whole message"), CRITERIA_MESSAGE);
matcher.model_phrase = GTK_TREE_MODEL(store);
store = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN);
prefs_matcher_create();
} else {
/* update color label menu */
- gtk_option_menu_set_menu(GTK_OPTION_MENU(matcher.color_optmenu),
+ gtk_cmoption_menu_set_menu(GTK_CMOPTION_MENU(matcher.color_optmenu),
colorlabel_create_color_menu());
}
GtkWidget *numeric_entry;
GtkWidget *numeric_label;
+#ifndef G_OS_WIN32
GtkWidget *regexp_checkbtn;
+#endif
GtkWidget *case_checkbtn;
GtkWidget *reg_hbox;
static GdkGeometry geometry;
GtkSizeGroup *size_group;
+ GtkListStore *store;
+ GtkTreeIter iter;
debug_print("Creating matcher configuration window...\n");
gtk_table_attach(GTK_TABLE(table), criteria_label, 0, 1, 0, 1,
GTK_FILL, GTK_SHRINK, 2, 2);
- criteria_combo = combobox_text_new(FALSE, _("All messages"), _("Header"),
- _("Age"), _("Phrase"), _("Flags"),
- _("Color labels"), _("Thread"),
- _("Score"), _("Size"),
- _("Partially downloaded"),
- _("Address book"), _("Tags"),
- _("External program test"),
- NULL);
+ 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);
+
gtk_widget_set_size_request(criteria_combo, 150, -1);
gtk_combo_box_set_active(GTK_COMBO_BOX(criteria_combo), MATCH_ALL);
gtk_table_attach(GTK_TABLE(table), criteria_combo, 1, 2, 0, 1,
headers_combo = gtk_combo_box_entry_new_with_model(matcher.model_headers, 0);
gtk_widget_set_size_request(headers_combo, 100, -1);
gtk_box_pack_start(GTK_BOX(upper_hbox), headers_combo, TRUE, TRUE, 0);
- header_entry = GTK_BIN (headers_combo)->child;
+ header_entry = gtk_bin_get_child(GTK_BIN((headers_combo)));
criteria_combo2 = gtkut_sc_combobox_create(NULL, TRUE);
prefs_matcher_set_model(criteria_combo2, matcher.model_phrase);
gtk_box_pack_start(GTK_BOX(match_hbox), match_combo, TRUE, TRUE, 0);
/* color labels combo */
- color_optmenu = gtk_option_menu_new();
- gtk_option_menu_set_menu(GTK_OPTION_MENU(color_optmenu),
+ 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);
Q_("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(header_addr_combo)->child;
+ header_addr_entry = gtk_bin_get_child(GTK_BIN((header_addr_combo)));
gtk_widget_set_size_request(header_addr_combo, 150, -1);
match_label2 = gtk_label_new("");
hbox = gtk_hbox_new(FALSE, HSPACING_NARROW);
gtk_size_group_add_widget(size_group, hbox);
PACK_CHECK_BUTTON(hbox, case_checkbtn, _("Case sensitive"));
+#ifndef G_OS_WIN32
PACK_CHECK_BUTTON(hbox, regexp_checkbtn, _("Use regexp"));
+#endif
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);
gtk_box_pack_start(GTK_BOX(lower_hbox), test_btn, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT (test_btn), "clicked",
G_CALLBACK(prefs_matcher_test_info),
- NULL);
+ window);
/* register / substitute / delete */
reg_hbox = gtk_hbox_new(FALSE, HSPACING_NARROW);
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;
matcher.addressbook_select_btn = addressbook_select_btn;
gtk_combo_box_set_active(GTK_COMBO_BOX(matcher.criteria_combo2), 0);
gtk_combo_box_set_active(GTK_COMBO_BOX(matcher.match_combo), 0);
gtk_combo_box_set_active(GTK_COMBO_BOX(matcher.match_combo2), 0);
- gtk_option_menu_set_history(GTK_OPTION_MENU(matcher.color_optmenu), 0);
+ gtk_cmoption_menu_set_history(GTK_CMOPTION_MENU(matcher.color_optmenu), 0);
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), "");
gtk_entry_set_text(GTK_ENTRY(matcher.string_entry), "");
- gtk_entry_set_text(GTK_ENTRY(GTK_BIN(matcher.addressbook_folder_combo)->child), "");
+ 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);
}
gtk_combo_box_set_active(GTK_COMBO_BOX(matcher.bool_op_combo), bool_op);
prefs_matcher_reset_condition();
+
+ combobox_set_sensitive(GTK_COMBO_BOX(matcher.criteria_combo), MATCH_TAGS,
+ (tags_get_size() > 0) ? TRUE : FALSE);
}
/*!
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
+ use_regexp = FALSE;
+#endif
case_sensitive = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(matcher.case_checkbtn));
if (use_regexp) {
case CRITERIA_COLORLABEL:
value = colorlabel_get_color_menu_active_item
- (gtk_option_menu_get_menu(GTK_OPTION_MENU
+ (gtk_cmoption_menu_get_menu(GTK_CMOPTION_MENU
(matcher.color_optmenu)));
break;
case CRITERIA_FOUND_IN_ADDRESSBOOK:
header = gtk_entry_get_text(GTK_ENTRY(matcher.header_addr_entry));
- expr = gtk_entry_get_text(GTK_ENTRY(GTK_BIN(matcher.addressbook_folder_combo)->child));
+ expr = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((matcher.addressbook_folder_combo)))));
if (*header == '\0') {
alertpanel_error(_("Header name is not set."));
if (*expr == '\0') {
gchar *tmp;
- if (strcasecmp(header, Q_("Filtering Matcher Menu|All")) == 0)
+ if (g_utf8_collate(header, Q_("Filtering Matcher Menu|All")) == 0)
tmp = g_strdup(_("all addresses in all headers"));
else
- if (strcasecmp(header, _("Any")) == 0)
+ if (g_utf8_collate(header, _("Any")) == 0)
tmp = g_strdup(_("any address in any header"));
else
tmp = g_strdup_printf(_("the address(es) in header '%s'"), header);
alertpanel_error(_("Book/folder path is not set.\n\n"
"If you want to match %s against the whole address book, "
- "you have to select 'Any' from the book/folder drop-down list."),
- tmp);
+ "you have to select '%s' from the book/folder drop-down list."),
+ tmp, _("Any"));
g_free(tmp);
return NULL;
}
- /* don't store translated "Any"/"All" in matcher expressions */
- if (strcasecmp(header, Q_("Filtering Matcher Menu|All")) == 0)
+ /* store UNtranslated "Any"/"All" in matcher expressions */
+ if (g_utf8_collate(header, Q_("Filtering Matcher Menu|All")) == 0)
header = "All";
else
- if (strcasecmp(header, _("Any")) == 0)
+ if (g_utf8_collate(header, _("Any")) == 0)
header = "Any";
- if (strcasecmp(expr, _("Any")) == 0)
+ if (g_utf8_collate(expr, _("Any")) == 0)
expr = "Any";
break;
}
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);
}
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,
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;
case MATCH_LABEL:
- gtk_option_menu_set_history(GTK_OPTION_MENU(matcher.color_optmenu), 0);
+ 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"));
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;
}
g_free(str);
gtk_widget_hide(matcher.window);
- inc_unlock();
if (matchers_callback != NULL)
matchers_callback(matchers);
matcherlist_free(matchers);
}
+ inc_unlock();
}
/*!
/*!
*\brief Show Test action's info
*/
-static void prefs_matcher_test_info(void)
+static void prefs_matcher_test_info(GtkWidget *widget, GtkWidget *parent)
{
+ test_desc_win.parent = parent;
description_window_create(&test_desc_win);
}
const gchar *folderpath = NULL;
gchar *new_path = NULL;
- folderpath = gtk_entry_get_text(GTK_ENTRY(GTK_BIN(matcher.addressbook_folder_combo)->child));
+ folderpath = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((matcher.addressbook_folder_combo)))));
new_path = addressbook_folder_selection(folderpath);
if (new_path) {
- gtk_entry_set_text(GTK_ENTRY(GTK_BIN(matcher.addressbook_folder_combo)->child), new_path);
+ gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((matcher.addressbook_folder_combo)))), new_path);
g_free(new_path);
}
}
g_object_unref(model);
gtk_tree_view_set_rules_hint(list_view, prefs_common.use_stripes_everywhere);
+ gtk_tree_view_set_reorderable(list_view, TRUE);
selector = gtk_tree_view_get_selection(list_view);
gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE);
expr = prop->expr;
gtk_entry_set_text(GTK_ENTRY(matcher.header_addr_entry), header);
- gtk_entry_set_text(GTK_ENTRY(GTK_BIN(matcher.addressbook_folder_combo)->child), expr);
+ gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((matcher.addressbook_folder_combo)))), expr);
break;
}
case MATCHCRITERIA_NOT_COLORLABEL:
case MATCHCRITERIA_COLORLABEL:
- gtk_option_menu_set_history(GTK_OPTION_MENU(matcher.color_optmenu),
+ gtk_cmoption_menu_set_history(GTK_CMOPTION_MENU(matcher.color_optmenu),
prop->value);
- menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(matcher.color_optmenu));
+ menu = gtk_cmoption_menu_get_menu(GTK_CMOPTION_MENU(matcher.color_optmenu));
g_signal_emit_by_name(G_OBJECT(menu), "selection-done", menu);
break;
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;
}
projects / claws.git / blobdiff