/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2009 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2011 Hiroyuki Yamamoto and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#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 "colorlabel.h"
#include "tags.h"
+#ifndef USE_NEW_ADDRBOOK
static void prefs_matcher_addressbook_select(void);
+#endif
static void prefs_matcher_test_info(GtkWidget *widget, GtkWidget *parent);
enum {
#ifndef G_OS_WIN32
GtkWidget *regexp_checkbtn;
#endif
+#if !GTK_CHECK_VERSION(3, 0, 0)
GtkWidget *color_optmenu;
+#endif
GtkWidget *test_btn;
GtkWidget *addressbook_select_btn;
COMBOBOX_ADD(store, "X-Mailer", CRITERIA_HEADER);
COMBOBOX_ADD(store, "X-BeenThere", CRITERIA_HEADER);
COMBOBOX_ADD(store, "List-Post", CRITERIA_HEADER);
+ COMBOBOX_ADD(store, "List-Id", CRITERIA_HEADER);
matcher.model_headers = GTK_TREE_MODEL(store);
store = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN);
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));
GtkWidget *test_btn;
GtkWidget *addressbook_select_btn;
-
GtkWidget *color_optmenu;
static GdkGeometry geometry;
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",
G_CALLBACK(prefs_matcher_addressbook_select),
NULL);
-
+#else
+ gtk_widget_set_sensitive(GTK_WIDGET(addressbook_select_btn), FALSE);
+#endif
match_label = gtk_label_new("");
gtk_misc_set_alignment(GTK_MISC(match_label), 1, 0.5);
gtk_table_attach(GTK_TABLE(table), match_label, 0, 1, 1, 2,
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,
#endif
matcher.bool_op_combo = bool_op_combo;
matcher.test_btn = test_btn;
+#ifndef USE_NEW_ADDRBOOK
matcher.addressbook_select_btn = addressbook_select_btn;
+#endif
matcher.color_optmenu = color_optmenu;
matcher.match_label = match_label;
matcher.criteria_label2 = criteria_label2;
g_free(matcher_str);
}
+static gboolean match_combo2_model_set(void)
+{
+ GtkTreeModel *model = gtk_combo_box_get_model(GTK_COMBO_BOX(matcher.match_combo2));
+ if (model == matcher.model_age_units ||
+ model == matcher.model_found ||
+ model == matcher.model_partial ||
+ model == matcher.model_phrase ||
+ model == matcher.model_set ||
+ model == matcher.model_size_units ||
+ model == matcher.model_tags ||
+ model == matcher.model_thread)
+ return TRUE;
+ else
+ debug_print("match_combo2 model unset.\n");
+
+ return FALSE;
+}
+
+static gboolean match_combo_model_set(void)
+{
+ GtkTreeModel *model = gtk_combo_box_get_model(GTK_COMBO_BOX(matcher.match_combo));
+ if (model == matcher.model_age ||
+ model == matcher.model_contain ||
+ model == matcher.model_flags ||
+ model == matcher.model_score ||
+ model == matcher.model_size ||
+ model == matcher.model_test)
+ return TRUE;
+ else
+ debug_print("match_combo model unset.\n");
+
+ return FALSE;
+}
+
/*!
*\brief Clears a condition in the list widget
*/
{
gtk_combo_box_set_active(GTK_COMBO_BOX(matcher.criteria_combo), MATCH_ALL);
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);
+ if (match_combo_model_set())
+ 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), "");
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;
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:
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:
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:
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));
(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,
#endif
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:"));
static gboolean prefs_matcher_key_pressed(GtkWidget *widget, GdkEventKey *event,
gpointer data)
{
- if (event && event->keyval == GDK_Escape) {
+ if (event && event->keyval == GDK_KEY_Escape) {
prefs_matcher_cancel();
return TRUE;
}
description_window_create(&test_desc_win);
}
+#ifndef USE_NEW_ADDRBOOK
static void prefs_matcher_addressbook_select(void)
{
const gchar *folderpath = NULL;
g_free(new_path);
}
}
-
+#endif
/*
* list view
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;
}
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),
- prop->value);
+ prop->value + 1);
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:
projects / claws.git / blobdiff