/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 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 <glib.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include <gtk/gtkoptionmenu.h>
#include <gdk/gdkkeysyms.h>
#include <stdio.h>
#include <stdlib.h>
static gboolean prefs_filtering_search_func_cb (GtkTreeModel *model, gint column,
const gchar *key, GtkTreeIter *iter,
gpointer search_data);
-static void prefs_filtering_register_cb (void);
-static void prefs_filtering_substitute_cb (void);
-static void prefs_filtering_delete_cb (void);
-static void prefs_filtering_delete_all_cb(void);
-static void prefs_filtering_clear_cb(void);
-static void prefs_filtering_duplicate_cb(void);
-static void prefs_filtering_top (void);
-static void prefs_filtering_page_up(void);
-static void prefs_filtering_up (void);
-static void prefs_filtering_down (void);
-static void prefs_filtering_page_down(void);
-static void prefs_filtering_bottom (void);
+static void prefs_filtering_register_cb (gpointer action, gpointer data);
+static void prefs_filtering_substitute_cb (gpointer action, gpointer data);
+static void prefs_filtering_delete_cb (gpointer action, gpointer data);
+static void prefs_filtering_delete_all_cb(gpointer action, gpointer data);
+static void prefs_filtering_clear_cb(gpointer action, gpointer data);
+static void prefs_filtering_duplicate_cb(gpointer action, gpointer data);
+static void prefs_filtering_top (gpointer action, gpointer data);
+static void prefs_filtering_page_up (gpointer action, gpointer data);
+static void prefs_filtering_up (gpointer action, gpointer data);
+static void prefs_filtering_down (gpointer action, gpointer data);
+static void prefs_filtering_page_down (gpointer action, gpointer data);
+static void prefs_filtering_bottom (gpointer action, gpointer data);
static gint prefs_filtering_deleted (GtkWidget *widget,
GdkEventAny *event,
gpointer data);
+static void prefs_filtering_row_selected(GtkTreeSelection *selection,
+ GtkTreeView *list_view);
static gboolean prefs_filtering_key_pressed(GtkWidget *widget,
GdkEventKey *event,
gpointer data);
-static void prefs_filtering_cancel (void);
-static void prefs_filtering_ok (void);
+static void prefs_filtering_cancel (gpointer action, gpointer data);
+static void prefs_filtering_ok (gpointer action, gpointer data);
-static void prefs_filtering_condition_define (void);
-static void prefs_filtering_action_define(void);
+static void prefs_filtering_condition_define (gpointer action, gpointer data);
+static void prefs_filtering_action_define (gpointer action, gpointer data);
static gint prefs_filtering_list_view_set_row (gint row, FilteringProp * prop);
static void prefs_filtering_reset_dialog (void);
}
gtk_widget_show(filtering.window);
+ gtk_window_set_modal(GTK_WINDOW(filtering.window), TRUE);
start_address_completion(NULL);
}
static void prefs_filtering_size_allocate_cb(GtkWidget *widget,
GtkAllocation *allocation)
{
- g_return_if_fail(allocation != NULL);
+ cm_return_if_fail(allocation != NULL);
prefs_common.filteringwin_width = allocation->width;
prefs_common.filteringwin_height = allocation->height;
(filtering.cond_list_view)));
gtk_list_store_clear(store);
gtk_widget_hide(filtering.window);
+ gtk_window_set_modal(GTK_WINDOW(filtering.window), FALSE);
inc_unlock();
}
accounts = account_get_list();
- g_return_if_fail(accounts != NULL);
+ cm_return_if_fail(accounts != NULL);
COMBOBOX_ADD(filtering.account_combobox_list, Q_("Filtering Account Menu|All"), 0);
+ COMBOBOX_ADD(filtering.account_combobox_list, NULL, 0);
for (; accounts != NULL; accounts = accounts->next) {
PrefsAccount *ac = (PrefsAccount *)accounts->data;
- if (ac->protocol != A_NONE)
- COMBOBOX_ADD_ESCAPED(filtering.account_combobox_list, ac->account_name, ac->account_id);
+ COMBOBOX_ADD_ESCAPED(filtering.account_combobox_list, ac->account_name, ac->account_id);
}
}
GtkWidget *bottom_btn;
GtkWidget *table;
static GdkGeometry geometry;
- CLAWS_TIP_DECL();
debug_print("Creating filtering configuration window...\n");
window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "prefs_filtering");
gtk_container_set_border_width (GTK_CONTAINER (window), 8);
gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
- gtk_window_set_modal (GTK_WINDOW (window), TRUE);
gtk_window_set_resizable(GTK_WINDOW (window), TRUE);
vbox = gtk_vbox_new (FALSE, 6);
gint oldpathlen;
GSList * action_cur;
GSList * cur;
-
+ const gchar *separator=G_DIR_SEPARATOR_S;
+ gboolean matched = FALSE;
+#ifdef G_OS_WIN32
+again:
+#endif
oldpathlen = strlen(old_path);
- old_path_with_sep = g_strconcat(old_path,G_DIR_SEPARATOR_S,NULL);
+ old_path_with_sep = g_strconcat(old_path,separator,NULL);
for (cur = filters; cur != NULL; cur = cur->next) {
FilteringProp *filtering = (FilteringProp *)cur->data;
while (*base == G_DIR_SEPARATOR) base++;
if (*base == '\0')
dest_path = g_strconcat(prefix,
- G_DIR_SEPARATOR_S,
+ separator,
new_path, NULL);
else
dest_path = g_strconcat(prefix,
- G_DIR_SEPARATOR_S,
+ separator,
new_path,
- G_DIR_SEPARATOR_S,
+ separator,
base, NULL);
g_free(prefix);
g_free(action->destination);
action->destination = dest_path;
+ matched = TRUE;
} else { /* for non-leaf folders */
/* compare with trailing slash */
if (!strncmp(old_path_with_sep, action->destination, oldpathlen+1)) {
suffix = action->destination + oldpathlen + 1;
dest_path = g_strconcat(new_path,
- G_DIR_SEPARATOR_S,
+ separator,
suffix, NULL);
g_free(action->destination);
action->destination = dest_path;
+ matched = TRUE;
}
}
} else {
dest_path = g_strdup(new_path);
g_free(action->destination);
action->destination = dest_path;
+ matched = TRUE;
}
}
}
}
+
+ g_free(old_path_with_sep);
+#ifdef G_OS_WIN32
+ if (!strcmp(separator, G_DIR_SEPARATOR_S) && !matched) {
+ separator = "/";
+ goto again;
+ }
+#endif
}
static gboolean prefs_filtering_rename_path_func(GNode *node, gpointer data)
old_path = paths[0];
new_path = paths[1];
- g_return_val_if_fail(old_path != NULL, FALSE);
- g_return_val_if_fail(new_path != NULL, FALSE);
- g_return_val_if_fail(node != NULL, FALSE);
+ cm_return_val_if_fail(old_path != NULL, FALSE);
+ cm_return_val_if_fail(new_path != NULL, FALSE);
+ cm_return_val_if_fail(node != NULL, FALSE);
item = node->data;
if (!item || !item->prefs)
return FALSE;
}
+static void rename_path_prefix(GSList *filters, const gchar *old_prefix,
+ const gchar *new_prefix)
+{
+ GSList *action_cur, *cur;
+ gchar *new_path;
+
+ for (cur = filters; cur != NULL; cur = cur->next) {
+ FilteringProp *filtering = (FilteringProp *)cur->data;
+
+ for(action_cur = filtering->action_list ; action_cur != NULL ;
+ action_cur = action_cur->next) {
+
+ FilteringAction *action = action_cur->data;
+
+ if (action->type == MATCHACTION_SET_TAG ||
+ action->type == MATCHACTION_UNSET_TAG)
+ continue;
+ if (!action->destination)
+ continue;
+ if (!g_str_has_prefix(action->destination, old_prefix))
+ continue;
+
+ new_path = g_strconcat(new_prefix,
+ (action->destination + strlen(old_prefix)), NULL);
+ g_free(action->destination);
+ action->destination = new_path;
+ }
+ }
+}
+
+static gboolean prefs_filtering_rename_path_prefix_func(GNode *node, gpointer data)
+{
+ GSList *filters;
+ const gchar * old_prefix;
+ const gchar * new_prefix;
+ const gchar ** paths;
+ FolderItem *item;
+
+ paths = data;
+ old_prefix = paths[0];
+ new_prefix = paths[1];
+
+ cm_return_val_if_fail(old_prefix != NULL, FALSE);
+ cm_return_val_if_fail(new_prefix != NULL, FALSE);
+ cm_return_val_if_fail(node != NULL, FALSE);
+
+ item = node->data;
+ if (!item || !item->prefs)
+ return FALSE;
+ filters = item->prefs->processing;
+
+ rename_path_prefix(filters, old_prefix, new_prefix);
+
+ return FALSE;
+}
+
+void prefs_filtering_rename_path_prefix(const gchar *old_prefix,
+ const gchar *new_prefix)
+{
+ GList * cur;
+ const gchar *paths[2] = {NULL, NULL};
+ paths[0] = old_prefix;
+ paths[1] = new_prefix;
+ for (cur = folder_get_list() ; cur != NULL ; cur = g_list_next(cur)) {
+ Folder *folder;
+ folder = (Folder *) cur->data;
+ g_node_traverse(folder->node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
+ prefs_filtering_rename_path_prefix_func, paths);
+ }
+
+ rename_path_prefix(pre_global_processing, old_prefix, new_prefix);
+ rename_path_prefix(post_global_processing, old_prefix, new_prefix);
+ rename_path_prefix(filtering_rules, old_prefix, new_prefix);
+
+ prefs_matcher_write_config();
+}
+
static void rename_tag(GSList * filters,
const gchar * old_tag, const gchar * new_tag)
{
old_tag = tags[0];
new_tag = tags[1];
- g_return_val_if_fail(old_tag != NULL, FALSE);
- g_return_val_if_fail(new_tag != NULL, FALSE);
- g_return_val_if_fail(node != NULL, FALSE);
+ cm_return_val_if_fail(old_tag != NULL, FALSE);
+ cm_return_val_if_fail(new_tag != NULL, FALSE);
+ cm_return_val_if_fail(node != NULL, FALSE);
item = node->data;
if (!item || !item->prefs)
FolderItem *item;
GSList ** p_filters;
- g_return_val_if_fail(path != NULL, FALSE);
- g_return_val_if_fail(node != NULL, FALSE);
+ cm_return_val_if_fail(path != NULL, FALSE);
+ cm_return_val_if_fail(node != NULL, FALSE);
item = node->data;
if (!item || !item->prefs)
GtkTreeIter *iter, gpointer search_data)
{
gchar *store_string;
- gint key_len;
gboolean retval;
+ GtkTreePath *path;
gtk_tree_model_get (model, iter, column, &store_string, -1);
- if (!store_string) return FALSE;
+ if (!store_string || !key) return FALSE;
- key_len = strlen (key);
- retval = (strncmp (key, store_string, key_len) != 0);
+ retval = (strncmp (key, store_string, strlen(key)) != 0);
g_free(store_string);
+ debug_print("selecting row\n");
+ path = gtk_tree_model_get_path(model, iter);
+ prefs_filtering_select_row(GTK_TREE_VIEW(filtering.cond_list_view), path);
+ gtk_tree_path_free(path);
return retval;
}
static gint prefs_filtering_list_view_set_row(gint row, FilteringProp * prop)
{
GtkTreeView *list_view = GTK_TREE_VIEW(filtering.cond_list_view);
- gchar *str;
+ gchar *str = NULL;
GtkListStore *list_store;
gchar *name = NULL;
gint account_id = 0;
gchar *account_name = (gchar *)Q_("Filtering Account Menu|All");
gboolean enabled = TRUE;
- str = filteringprop_to_string(prop);
+ if (prop)
+ str = filteringprop_to_string(prop);
if (str == NULL)
return -1;
}
}
-static void prefs_filtering_condition_define(void)
+static void prefs_filtering_condition_define(gpointer action, gpointer data)
{
gchar * cond_str;
MatcherList * matchers = NULL;
}
}
-static void prefs_filtering_action_define(void)
+static void prefs_filtering_action_define(gpointer action, gpointer data)
{
gchar * action_str;
GSList * action_list = NULL;
return prop;
}
-static void prefs_filtering_register_cb(void)
+static void prefs_filtering_register_cb(gpointer action, gpointer data)
{
FilteringProp *prop;
modified = TRUE;
}
-static void prefs_filtering_substitute_cb(void)
+static void prefs_filtering_substitute_cb(gpointer action, gpointer data)
{
gint selected_row = gtkut_list_view_get_selected_row
(filtering.cond_list_view);
filteringprop_free(prop);
- prefs_filtering_reset_dialog();
+ prefs_filtering_row_selected(gtk_tree_view_get_selection(
+ GTK_TREE_VIEW(filtering.cond_list_view)),
+ GTK_TREE_VIEW(filtering.cond_list_view));
modified = TRUE;
}
-static void prefs_filtering_delete_cb(void)
+static void prefs_filtering_delete_cb(gpointer action, gpointer data)
{
GtkTreeView *list_view = GTK_TREE_VIEW(filtering.cond_list_view);
GtkTreeModel *model;
modified = TRUE;
}
-static void prefs_filtering_delete_all_cb(void)
+static void prefs_filtering_delete_all_cb(gpointer action, gpointer data)
{
GtkListStore *list_store;
modified = TRUE;
}
-static void prefs_filtering_clear_cb(void)
+static void prefs_filtering_clear_cb(gpointer action, gpointer data)
{
prefs_filtering_reset_dialog();
}
-static void prefs_filtering_duplicate_cb(void)
+static void prefs_filtering_duplicate_cb(gpointer action, gpointer data)
{
gint selected_row = gtkut_list_view_get_selected_row
(filtering.cond_list_view);
modified = TRUE;
}
-static void prefs_filtering_top(void)
+static void prefs_filtering_top(gpointer action, gpointer data)
{
gint row;
GtkTreeIter top, sel;
modified = TRUE;
}
-static void prefs_filtering_page_up(void)
+static void prefs_filtering_page_up(gpointer action, gpointer data)
{
gint row, target_row, n_rows;
GtkTreeIter selected, target;
gtkut_list_view_select_row(filtering.cond_list_view, target_row);
modified = TRUE;
}
-static void prefs_filtering_up(void)
+static void prefs_filtering_up(gpointer action, gpointer data)
{
gint row;
GtkTreeIter top, sel;
modified = TRUE;
}
-static void prefs_filtering_down(void)
+static void prefs_filtering_down(gpointer action, gpointer data)
{
gint row, n_rows;
GtkTreeIter top, sel;
modified = TRUE;
}
-static void prefs_filtering_page_down(void)
+static void prefs_filtering_page_down(gpointer action, gpointer data)
{
gint row, target_row, n_rows;
GtkTreeIter selected, target;
modified = TRUE;
}
-static void prefs_filtering_bottom(void)
+static void prefs_filtering_bottom(gpointer action, gpointer data)
{
gint row, n_rows;
GtkTreeIter top, sel;
static gint prefs_filtering_deleted(GtkWidget *widget, GdkEventAny *event,
gpointer data)
{
- prefs_filtering_cancel();
+ prefs_filtering_cancel(NULL, NULL);
return TRUE;
}
static gboolean prefs_filtering_key_pressed(GtkWidget *widget, GdkEventKey *event,
gpointer data)
{
- if (event && event->keyval == GDK_Escape) {
- prefs_filtering_cancel();
+ if (event && event->keyval == GDK_KEY_Escape) {
+ prefs_filtering_cancel(NULL, NULL);
return TRUE;
}
return FALSE;
return FALSE;
}
-static void prefs_filtering_ok(void)
+static void prefs_filtering_ok(gpointer action, gpointer data)
{
if (prefs_filtering_check_mod(FALSE))
return;
prefs_filtering_close();
}
-static void prefs_filtering_cancel(void)
+static void prefs_filtering_cancel(gpointer action, gpointer data)
{
if (prefs_filtering_check_mod(TRUE))
return;
}
}
-static GtkItemFactory *prefs_filtering_popup_factory = NULL;
+static GtkActionGroup *prefs_filtering_popup_action = NULL;
static GtkWidget *prefs_filtering_popup_menu = NULL;
-static GtkItemFactoryEntry prefs_filtering_popup_entries[] =
+static GtkActionEntry prefs_filtering_popup_entries[] =
{
- {N_("/_Delete"), NULL, prefs_filtering_delete_cb, 0, NULL, NULL},
- {N_("/Delete _all"), NULL, prefs_filtering_delete_all_cb, 0, NULL, NULL},
- {N_("/D_uplicate"), NULL, prefs_filtering_duplicate_cb, 0, NULL, NULL},
+ {"PrefsFilteringPopup", NULL, "PrefsFilteringPopup" },
+ {"PrefsFilteringPopup/Delete", NULL, N_("_Delete"), NULL, NULL, G_CALLBACK(prefs_filtering_delete_cb) },
+ {"PrefsFilteringPopup/DeleteAll", NULL, N_("Delete _all"), NULL, NULL, G_CALLBACK(prefs_filtering_delete_all_cb) },
+ {"PrefsFilteringPopup/Duplicate", NULL, N_("D_uplicate"), NULL, NULL, G_CALLBACK(prefs_filtering_duplicate_cb) },
#ifdef GENERIC_UMPC
- {N_("/---"), NULL, NULL, 0, "<Separator>", NULL},
- {N_("/Move one page up"), NULL, prefs_filtering_page_up, 0, NULL, NULL},
- {N_("/Move one page down"), NULL, prefs_filtering_page_down, 0, NULL, NULL},
+ {"PrefsFilteringPopup/---", NULL, "---", NULL, NULL, NULL },
+ {"PrefsFilteringPopup/PageUp", NULL, N_("Move one page up"), NULL, NULL, G_CALLBACK(prefs_filtering_page_up) },
+ {"PrefsFilteringPopup/PageDown", NULL, N_("Move one page down"), NULL, NULL, G_CALLBACK(prefs_filtering_page_down) },
#endif
};
+static void prefs_filtering_row_selected(GtkTreeSelection *selection,
+ GtkTreeView *list_view)
+{
+ GtkTreePath *path;
+ GtkTreeIter iter;
+ GtkTreeModel *model;
+
+ if (!gtk_tree_selection_get_selected(selection, &model, &iter))
+ return;
+
+ path = gtk_tree_model_get_path(model, &iter);
+ prefs_filtering_select_row(list_view, path);
+ gtk_tree_path_free(path);
+}
+
static gint prefs_filtering_list_btn_pressed(GtkWidget *widget, GdkEventButton *event,
GtkTreeView *list_view)
{
gint row;
if (!prefs_filtering_popup_menu) {
- gint n_entries = sizeof(prefs_filtering_popup_entries) /
- sizeof(prefs_filtering_popup_entries[0]);
- prefs_filtering_popup_menu = menu_create_items(prefs_filtering_popup_entries,
- n_entries, "<PrefsFilteringPopupMenu>",
- &prefs_filtering_popup_factory, list_view);
+ prefs_filtering_popup_action = cm_menu_create_action_group("PrefsFilteringPopup", prefs_filtering_popup_entries,
+ G_N_ELEMENTS(prefs_filtering_popup_entries), (gpointer)list_view);
+ MENUITEM_ADDUI("/Menus", "PrefsFilteringPopup", "PrefsFilteringPopup", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI("/Menus/PrefsFilteringPopup", "Delete", "PrefsFilteringPopup/Delete", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI("/Menus/PrefsFilteringPopup", "DeleteAll", "PrefsFilteringPopup/DeleteAll", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI("/Menus/PrefsFilteringPopup", "Duplicate", "PrefsFilteringPopup/Duplicate", GTK_UI_MANAGER_MENUITEM)
+#ifdef GENERIC_UMPC
+ MENUITEM_ADDUI("/Menus/PrefsFilteringPopup", "Separator1", "PrefsFilteringPopup/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI("/Menus/PrefsFilteringPopup", "PageUp", "PrefsFilteringPopup/PageUp", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI("/Menus/PrefsFilteringPopup", "PageDown", "PrefsFilteringPopup/PageDown", GTK_UI_MANAGER_MENUITEM)
+#endif
+ prefs_filtering_popup_menu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(
+ gtk_ui_manager_get_widget(gtkut_ui_manager(), "/Menus/PrefsFilteringPopup")) );
}
/* grey out some popup menu items if there is no selected row */
row = gtkut_list_view_get_selected_row(GTK_WIDGET(list_view));
- menu_set_sensitive(prefs_filtering_popup_factory, "/Delete", (row > 0));
- menu_set_sensitive(prefs_filtering_popup_factory, "/Duplicate", (row > 0));
+ cm_menu_set_sensitive("PrefsFilteringPopup/Delete", (row > 0));
+ cm_menu_set_sensitive("PrefsFilteringPopup/Duplicate", (row > 0));
/* grey out seom popup menu items if there is no row
(not counting the (New) one at row 0) */
non_empty = gtk_tree_model_get_iter_first(model, &iter);
if (non_empty)
non_empty = gtk_tree_model_iter_next(model, &iter);
- menu_set_sensitive(prefs_filtering_popup_factory, "/Delete all", non_empty);
+ cm_menu_set_sensitive("PrefsFilteringPopup/DeleteAll", non_empty);
gtk_menu_popup(GTK_MENU(prefs_filtering_popup_menu),
NULL, NULL, NULL, NULL,
selector = gtk_tree_view_get_selection(list_view);
gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE);
+ g_signal_connect(G_OBJECT(selector), "changed",
+ G_CALLBACK(prefs_filtering_row_selected), list_view);
/* create the columns */
prefs_filtering_create_list_view_columns(GTK_WIDGET(list_view));
"text", PREFS_FILTERING_RULE,
NULL);
- gtk_tree_view_set_search_column(GTK_TREE_VIEW(list_view), 1);
+ gtk_tree_view_set_search_column(GTK_TREE_VIEW(list_view), PREFS_FILTERING_NAME);
gtk_tree_view_set_search_equal_func(GTK_TREE_VIEW(list_view), prefs_filtering_search_func_cb , NULL, NULL);
gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);
projects / claws.git / blobdiff