In folder select dialog, allow type-search to match any part of folder names, not...
[claws.git] / src / foldersel.c
index 3fee1fa07e8f05c2626c27145ff2c1d5930824a1..ab512dcb2f86c2c6dddf0281ad9b1412d81a6665 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2013 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 <gdk/gdkkeysyms.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtktreestore.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
@@ -71,9 +62,9 @@ struct _FolderItemSearch
        GtkTreeIter iter;
 };
 
-static GdkPixbuf *folder_pixbuf;
-static GdkPixbuf *folderopen_pixbuf;
-static GdkPixbuf *foldernoselect_pixbuf;
+static GdkPixbuf *folder_pixbuf = NULL;
+static GdkPixbuf *folderopen_pixbuf = NULL;
+static GdkPixbuf *foldernoselect_pixbuf = NULL;
 
 static GtkWidget *window;
 static GtkWidget *treeview;
@@ -81,6 +72,7 @@ static GtkWidget *entry;
 static GtkWidget *ok_button;
 static GtkWidget *cancel_button;
 static GtkWidget *new_button;
+static gboolean   root_selectable;
 
 static FolderItem *folder_item;
 static FolderItem *selected_item;
@@ -140,9 +132,10 @@ static gboolean tree_view_folder_item_func (GtkTreeModel     *model,
                                                 FolderItemSearch *data);
 
 FolderItem *foldersel_folder_sel(Folder *cur_folder, FolderSelectionType type,
-                                const gchar *default_folder)
+                                const gchar *default_folder, gboolean can_sel_mailbox)
 {
        selected_item = NULL;
+       root_selectable = can_sel_mailbox;
 
        if (!window) {
                foldersel_create();
@@ -185,7 +178,8 @@ FolderItem *foldersel_folder_sel(Folder *cur_folder, FolderSelectionType type,
        gtk_widget_grab_focus(ok_button);
        gtk_widget_grab_focus(treeview);
 
-       gtk_widget_show(window);
+       gtk_window_present(GTK_WINDOW(window));
+       gtk_window_set_modal(GTK_WINDOW(window), TRUE);
        manage_window_set_transient(GTK_WINDOW(window));
 
        cancelled = finished = FALSE;
@@ -193,22 +187,39 @@ FolderItem *foldersel_folder_sel(Folder *cur_folder, FolderSelectionType type,
        while (finished == FALSE)
                gtk_main_iteration();
 
-       gtk_widget_hide(window);
-       gtk_entry_set_text(GTK_ENTRY(entry), "");
-       gtk_tree_store_clear(tree_store);
+       gtk_widget_destroy(window);
+       window = NULL;
 
        if (!cancelled &&
-           selected_item && selected_item->path && !selected_item->no_select) {
+           selected_item && (selected_item->path || root_selectable)) {
                folder_item = selected_item;
                return folder_item;
        } else
                return NULL;
 }
 
+static gboolean foldersel_search_name_func(GtkTreeModel *model, gint column,
+               const gchar *key, GtkTreeIter *iter, gpointer search_data)
+{
+       gchar *store_string;
+       gboolean retval;
+
+       gtk_tree_model_get(model, iter, column, &store_string, -1);
+
+       if (!store_string || !key)
+               return FALSE;
+
+       retval = (strcasestr(store_string, key) == NULL);
+
+       g_free(store_string);
+
+       return retval;
+}
+
 static void foldersel_size_allocate_cb(GtkWidget *widget,
                                         GtkAllocation *allocation)
 {
-       g_return_if_fail(allocation != NULL);
+       cm_return_if_fail(allocation != NULL);
 
        prefs_common.folderselwin_width = allocation->width;
        prefs_common.folderselwin_height = allocation->height;
@@ -228,7 +239,6 @@ static void foldersel_create(void)
        gtk_window_set_title(GTK_WINDOW(window), _("Select folder"));
        gtk_container_set_border_width(GTK_CONTAINER(window), 4);
        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);
 
        gtk_widget_realize(window);
@@ -267,8 +277,11 @@ static void foldersel_create(void)
        gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(treeview), FALSE);
        gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(treeview),
                                     prefs_common.use_stripes_everywhere);
+       gtk_tree_view_set_enable_tree_lines(GTK_TREE_VIEW(treeview), FALSE);
        gtk_tree_view_set_search_column(GTK_TREE_VIEW(treeview),
                                        FOLDERSEL_FOLDERNAME);
+       gtk_tree_view_set_search_equal_func(GTK_TREE_VIEW(treeview),
+                       foldersel_search_name_func, NULL, NULL);
 
        selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
        gtk_tree_selection_set_mode(selection, GTK_SELECTION_BROWSE);
@@ -305,7 +318,7 @@ static void foldersel_create(void)
        gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column);
 
        entry = gtk_entry_new();
-       gtk_entry_set_editable(GTK_ENTRY(entry), FALSE);
+       gtk_editable_set_editable(GTK_EDITABLE(entry), FALSE);
        gtk_box_pack_start(GTK_BOX(vbox), entry, FALSE, FALSE, 0);
        g_signal_connect(G_OBJECT(entry), "activate",
                         G_CALLBACK(foldersel_entry_activated), NULL);
@@ -348,6 +361,17 @@ static void foldersel_init(void)
                         &foldernoselect_pixbuf);
 }
 
+void foldersel_reflect_prefs_pixmap_theme(void)
+{
+       if (folder_pixbuf)
+               g_object_unref(folder_pixbuf);
+       if (folderopen_pixbuf)
+               g_object_unref(folderopen_pixbuf);
+       if (foldernoselect_pixbuf)
+               g_object_unref(foldernoselect_pixbuf);
+       foldersel_init();
+}
+
 static void foldersel_append_item(GtkTreeStore *store, FolderItem *item,
                                  GtkTreeIter *iter, GtkTreeIter *parent)
 {
@@ -441,9 +465,9 @@ static void foldersel_insert_gnode_in_store(GtkTreeStore *store, GNode *node,
        GtkTreeIter child;
        GNode *iter;
 
-       g_return_if_fail(node != NULL);
-       g_return_if_fail(node->data != NULL);
-       g_return_if_fail(store != NULL);
+       cm_return_if_fail(node != NULL);
+       cm_return_if_fail(node->data != NULL);
+       cm_return_if_fail(store != NULL);
 
        item = FOLDER_ITEM(node->data);
        foldersel_append_item(store, item, &child, parent);
@@ -460,7 +484,7 @@ static void foldersel_set_tree(Folder *cur_folder, FolderSelectionType type)
 
        for (list = folder_get_list(); list != NULL; list = list->next) {
                folder = FOLDER(list->data);
-               g_return_if_fail(folder != NULL);
+               cm_return_if_fail(folder != NULL);
 
                if (type != FOLDER_SEL_ALL) {
                        if (FOLDER_TYPE(folder) == F_NEWS)
@@ -477,6 +501,7 @@ static void foldersel_set_tree(Folder *cur_folder, FolderSelectionType type)
        gtk_tree_view_expand_all(GTK_TREE_VIEW(treeview));
 }
 
+#include "localfolder.h"
 static gboolean foldersel_selected(GtkTreeSelection *selection,
                                   GtkTreeModel *model, GtkTreePath *path,
                                   gboolean currently_selected, gpointer data)
@@ -494,11 +519,19 @@ static gboolean foldersel_selected(GtkTreeSelection *selection,
                           FOLDERSEL_FOLDERITEM, &item, -1);
 
        selected_item = item;
-       if (selected_item && selected_item->path && !selected_item->no_select) {
+       if (selected_item && selected_item->path) {
                gchar *id;
                id = folder_item_get_identifier(selected_item);
                gtk_entry_set_text(GTK_ENTRY(entry), id);
                g_free(id);
+       } else
+       if (root_selectable && selected_item && selected_item->folder &&
+                       (FOLDER_TYPE(selected_item->folder) == F_MH ||
+                        FOLDER_TYPE(selected_item->folder) == F_MBOX ||
+                        FOLDER_TYPE(selected_item->folder) == F_IMAP)) {
+               gchar *id = folder_get_identifier(selected_item->folder);
+               gtk_entry_set_text(GTK_ENTRY(entry), id);
+               g_free(id);
        } else
                gtk_entry_set_text(GTK_ENTRY(entry), "");
 
@@ -603,7 +636,7 @@ static gint delete_event(GtkWidget *widget, GdkEventAny *event, gpointer data)
 
 static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
-       if (event && event->keyval == GDK_Escape)
+       if (event && event->keyval == GDK_KEY_Escape)
                foldersel_cancel(NULL, NULL);
        return FALSE;
 }