/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2011 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2018 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
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
*/
#include "defs.h"
static GdkPixbuf *folder_pixbuf = NULL;
static GdkPixbuf *folderopen_pixbuf = NULL;
static GdkPixbuf *foldernoselect_pixbuf = NULL;
+static GdkPixbuf *foldernoselectopen_pixbuf = NULL;
static GtkWidget *window;
static GtkWidget *treeview;
static gboolean cancelled;
static gboolean finished;
-static void foldersel_create (void);
+static void foldersel_create (const gchar *title);
static void foldersel_init (void);
static void foldersel_append_item (GtkTreeStore *store,
FolderItemSearch *data);
FolderItem *foldersel_folder_sel(Folder *cur_folder, FolderSelectionType type,
- const gchar *default_folder, gboolean can_sel_mailbox)
+ const gchar *default_folder, gboolean can_sel_mailbox,
+ const gchar *title)
{
selected_item = NULL;
root_selectable = can_sel_mailbox;
if (!window) {
- foldersel_create();
+ foldersel_create(title);
foldersel_init();
}
gtk_widget_grab_focus(ok_button);
gtk_widget_grab_focus(treeview);
- gtk_widget_show(window);
- gtk_window_set_modal(GTK_WINDOW(window), TRUE);
+ gtk_window_present(GTK_WINDOW(window));
manage_window_set_transient(GTK_WINDOW(window));
+ gtk_window_set_modal(GTK_WINDOW(window), TRUE);
cancelled = finished = FALSE;
while (finished == FALSE)
gtk_main_iteration();
- gtk_widget_hide(window);
- gtk_window_set_modal(GTK_WINDOW(window), FALSE);
- 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 || root_selectable)) {
return NULL;
}
+static gboolean foldersel_search_name_func(GtkTreeModel *model, gint column,
+ const gchar *key, GtkTreeIter *iter, gpointer search_data)
+{
+ gchar *store_string = NULL;
+ FolderItem *item;
+ gboolean retval;
+
+ if (column == FOLDERSEL_FOLDERNAME) {
+ /* get the name of the FolderItem, not the displayed string */
+ gtk_tree_model_get(model, iter,
+ FOLDERSEL_FOLDERITEM, &item, -1);
+ store_string = folder_item_get_name(item);
+ } else {
+ 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)
{
prefs_common.folderselwin_height = allocation->height;
}
-static void foldersel_create(void)
+static void foldersel_create(const gchar *title)
{
GtkWidget *vbox;
GtkWidget *scrolledwin;
GtkWidget *confirm_area;
+ GtkWidget *label;
GtkTreeViewColumn *column;
GtkCellRenderer *renderer;
GtkTreeSelection *selection;
static GdkGeometry geometry;
window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "foldersel");
- gtk_window_set_title(GTK_WINDOW(window), _("Select folder"));
+ 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_resizable(GTK_WINDOW(window), TRUE);
+ gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
gtk_widget_realize(window);
g_signal_connect(G_OBJECT(window), "delete_event",
vbox = gtk_vbox_new(FALSE, 4);
gtk_container_add(GTK_CONTAINER(window), vbox);
+ if (title != NULL) {
+ label = gtk_label_new(title);
+ gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
+ gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+ }
+
scrolledwin = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
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),
- prefs_common.enable_dotted_lines);
+ gtk_tree_view_set_enable_tree_lines(GTK_TREE_VIEW(treeview), FALSE);
gtk_tree_view_set_search_column(GTK_TREE_VIEW(treeview),
FOLDERSEL_FOLDERNAME);
+ if (prefs_common.folder_search_wildcard)
+ 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);
/* create text renderer */
renderer = gtk_cell_renderer_text_new();
+ gtk_cell_renderer_set_padding(renderer, 0, 0);
gtk_tree_view_column_pack_start(column, renderer, TRUE);
gtk_tree_view_column_set_attributes
(column, renderer,
static void foldersel_init(void)
{
- stock_pixbuf_gdk(treeview, STOCK_PIXMAP_DIR_CLOSE,
- &folder_pixbuf);
- stock_pixbuf_gdk(treeview, STOCK_PIXMAP_DIR_OPEN,
- &folderopen_pixbuf);
- stock_pixbuf_gdk(treeview, STOCK_PIXMAP_DIR_NOSELECT,
- &foldernoselect_pixbuf);
+ stock_pixbuf_gdk(STOCK_PIXMAP_DIR_CLOSE, &folder_pixbuf);
+ stock_pixbuf_gdk(STOCK_PIXMAP_DIR_OPEN, &folderopen_pixbuf);
+ stock_pixbuf_gdk(STOCK_PIXMAP_DIR_NOSELECT_CLOSE, &foldernoselect_pixbuf);
+ stock_pixbuf_gdk(STOCK_PIXMAP_DIR_NOSELECT_OPEN, &foldernoselectopen_pixbuf);
}
void foldersel_reflect_prefs_pixmap_theme(void)
g_object_unref(folderopen_pixbuf);
if (foldernoselect_pixbuf)
g_object_unref(foldernoselect_pixbuf);
+ if (foldernoselectopen_pixbuf)
+ g_object_unref(foldernoselectopen_pixbuf);
foldersel_init();
}
static GdkColor color_noselect = {0, COLOR_DIM, COLOR_DIM, COLOR_DIM};
static GdkColor color_new;
- gtkut_convert_int_to_gdk_color(prefs_common.color_new, &color_new);
-
- name = tmpname = folder_item_get_name(item);
+ gtkut_convert_int_to_gdk_color(prefs_common.color[COL_NEW], &color_new);
- if (item->stype != F_NORMAL && FOLDER_IS_LOCAL(item->folder)) {
- switch (item->stype) {
- case F_INBOX:
- if (!strcmp2(item->name, INBOX_DIR))
- name = _("Inbox");
- break;
- case F_OUTBOX:
- if (!strcmp2(item->name, OUTBOX_DIR))
- name = _("Sent");
- break;
- case F_QUEUE:
- if (!strcmp2(item->name, QUEUE_DIR))
- name = _("Queue");
- break;
- case F_TRASH:
- if (!strcmp2(item->name, TRASH_DIR))
- name = _("Trash");
- break;
- case F_DRAFT:
- if (!strcmp2(item->name, DRAFT_DIR))
- name = _("Drafts");
- break;
- default:
- break;
- }
- }
+ name = folder_item_get_name(item);
if (folder_has_parent_of_type(item, F_QUEUE) && item->total_msgs > 0) {
- name = g_strdup_printf("%s (%d)", name, item->total_msgs);
+ tmpname = g_strdup_printf("%s (%d)", name, item->total_msgs);
} else if (item->unread_msgs > 0) {
- name = g_strdup_printf("%s (%d)", name, item->unread_msgs);
+ tmpname = g_strdup_printf("%s (%d)", name, item->unread_msgs);
} else
- name = g_strdup(name);
+ tmpname = g_strdup(name);
+
+ g_free(name);
+ name = tmpname;
pixbuf = item->no_select ? foldernoselect_pixbuf : folder_pixbuf;
pixbuf_open =
- item->no_select ? foldernoselect_pixbuf : folderopen_pixbuf;
+ item->no_select ? foldernoselectopen_pixbuf : folderopen_pixbuf;
if (folder_has_parent_of_type(item, F_DRAFT) ||
folder_has_parent_of_type(item, F_OUTBOX) ||
FOLDERSEL_BOLD, weight,
-1);
- g_free(tmpname);
+ g_free(name);
}
static void foldersel_insert_gnode_in_store(GtkTreeStore *store, GNode *node,
if (FOLDER_TYPE(folder) == F_NEWS)
continue;
}
-
+
+ if (cur_folder && (cur_folder->klass != folder->klass
+ && g_strcmp0(cur_folder->name, folder->name) != 0))
+ continue;
+
foldersel_insert_gnode_in_store(tree_store, folder->node, NULL);
}
return;
}
+ if (FOLDER_TYPE(selected_item->folder) != F_IMAP &&
+ FOLDER_TYPE(selected_item->folder) != F_NEWS &&
+ !folder_local_name_ok(new_folder))
+ return;
+
disp_name = trim_string(new_folder, 32);
AUTORELEASE_STR(disp_name, {g_free(disp_name); return;});
static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
- if (event && event->keyval == GDK_Escape)
+ if (!event)
+ return FALSE;
+
+ if (event->keyval == GDK_KEY_Escape) {
foldersel_cancel(NULL, NULL);
+ return TRUE;
+ }
+
+ GtkTreePath *path = NULL;
+ gtk_tree_view_get_cursor(GTK_TREE_VIEW(treeview), &path, NULL);
+ if (path == NULL)
+ return FALSE;
+
+ switch (event->keyval) {
+ case GDK_KEY_Left:
+ if (gtk_tree_view_row_expanded(GTK_TREE_VIEW(treeview), path)) {
+ gtk_tree_view_collapse_row(GTK_TREE_VIEW(treeview), path);
+ } else {
+ gtk_tree_path_up(path);
+ gtk_tree_view_set_cursor(GTK_TREE_VIEW(treeview), path, NULL, FALSE);
+ }
+ return TRUE;
+ break;
+ case GDK_KEY_Right:
+ if (!gtk_tree_view_row_expanded(GTK_TREE_VIEW(treeview), path)) {
+ gtk_tree_view_expand_row(GTK_TREE_VIEW(treeview), path, FALSE);
+ } else {
+ gtk_tree_path_down(path);
+ gtk_tree_view_set_cursor(GTK_TREE_VIEW(treeview), path, NULL, FALSE);
+ }
+ return TRUE;
+ break;
+ }
+
+ gtk_tree_path_free(path);
+
return FALSE;
}
projects / claws.git / blobdiff