/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 Hiroyuki Yamamoto
*
* 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 <gdk/gdkkeysyms.h>
#include <gtk/gtkmain.h>
#include <gtk/gtkwidget.h>
-#include <gtk/gtkctree.h>
#include <gtk/gtkwindow.h>
#include <gtk/gtkvbox.h>
#include <gtk/gtkscrolledwindow.h>
#include "main.h"
#include "utils.h"
#include "gtkutils.h"
+#include "gtksctree.h"
#include "stock_pixmap.h"
#include "foldersel.h"
#include "alertpanel.h"
static FolderItem *folder_item;
static gboolean cancelled;
+static gboolean finished;
static void foldersel_create (void);
static void foldersel_init (void);
static gint delete_event (GtkWidget *widget,
GdkEventAny *event,
gpointer data);
-static void key_pressed (GtkWidget *widget,
+static gboolean key_pressed (GtkWidget *widget,
GdkEventKey *event,
gpointer data);
+static gint foldersel_clist_compare (GtkCList *clist,
+ gconstpointer ptr1,
+ gconstpointer ptr2);
+
FolderItem *foldersel_folder_sel(Folder *cur_folder,
FolderSelectionType type,
const gchar *default_folder)
gtk_widget_grab_focus(ok_button);
gtk_widget_grab_focus(ctree);
- cancelled = FALSE;
+ cancelled = finished = FALSE;
- gtk_main();
+ while (finished == FALSE)
+ gtk_main_iteration();
gtk_widget_hide(window);
gtk_entry_set_text(GTK_ENTRY(entry), "");
GtkWidget *scrolledwin;
GtkWidget *confirm_area;
- window = gtk_window_new(GTK_WINDOW_DIALOG);
+ window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(window), _("Select folder"));
- gtk_widget_set_usize(window, 300, 400);
+ gtk_widget_set_size_request(window, 300, 400);
gtk_container_set_border_width(GTK_CONTAINER(window), BORDER_WIDTH);
gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
gtk_window_set_modal(GTK_WINDOW(window), TRUE);
gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, TRUE);
gtk_window_set_wmclass
(GTK_WINDOW(window), "folder_selection", "Sylpheed");
- gtk_signal_connect(GTK_OBJECT(window), "delete_event",
- GTK_SIGNAL_FUNC(delete_event), NULL);
- gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
- GTK_SIGNAL_FUNC(key_pressed), NULL);
+ g_signal_connect(G_OBJECT(window), "delete_event",
+ G_CALLBACK(delete_event), NULL);
+ g_signal_connect(G_OBJECT(window), "key_press_event",
+ G_CALLBACK(key_pressed), NULL);
MANAGE_WINDOW_SIGNALS_CONNECT(window);
vbox = gtk_vbox_new(FALSE, 4);
gtk_ctree_set_expander_style(GTK_CTREE(ctree),
GTK_CTREE_EXPANDER_SQUARE);
gtk_ctree_set_indent(GTK_CTREE(ctree), CTREE_INDENT);
+ gtk_clist_set_compare_func(GTK_CLIST(ctree), foldersel_clist_compare);
GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(ctree)->column[0].button,
GTK_CAN_FOCUS);
- /* gtk_signal_connect(GTK_OBJECT(ctree), "tree_select_row",
- GTK_SIGNAL_FUNC(foldersel_selected), NULL); */
- gtk_signal_connect(GTK_OBJECT(ctree), "select_row",
- GTK_SIGNAL_FUNC(foldersel_selected), NULL);
+ /* g_signal_connect(G_OBJECT(ctree), "tree_select_row",
+ G_CALLBACK(foldersel_selected), NULL); */
+ g_signal_connect(G_OBJECT(ctree), "select_row",
+ G_CALLBACK(foldersel_selected), NULL);
entry = gtk_entry_new();
gtk_box_pack_start(GTK_BOX(vbox), entry, FALSE, FALSE, 0);
- gtk_signal_connect(GTK_OBJECT(entry), "activate",
- GTK_SIGNAL_FUNC(foldersel_activated), NULL);
+ g_signal_connect(G_OBJECT(entry), "activate",
+ G_CALLBACK(foldersel_activated), NULL);
gtkut_button_set_create(&confirm_area,
&ok_button, _("OK"),
gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
gtk_widget_grab_default(ok_button);
- gtk_signal_connect(GTK_OBJECT(ok_button), "clicked",
- GTK_SIGNAL_FUNC(foldersel_ok), NULL);
- gtk_signal_connect(GTK_OBJECT(cancel_button), "clicked",
- GTK_SIGNAL_FUNC(foldersel_cancel), NULL);
+ g_signal_connect(G_OBJECT(ok_button), "clicked",
+ G_CALLBACK(foldersel_ok), NULL);
+ g_signal_connect(G_OBJECT(cancel_button), "clicked",
+ G_CALLBACK(foldersel_cancel), NULL);
gtk_widget_show_all(window);
}
FolderItem *item = FOLDER_ITEM(gnode->data);
gchar *name;
- switch (item->stype) {
- case F_INBOX:
- name = _("Inbox");
- break;
- case F_OUTBOX:
- name = _("Outbox");
- break;
- case F_QUEUE:
- name = _("Queue");
- break;
- case F_TRASH:
- name = _("Trash");
- break;
- case F_DRAFT:
- name = _("Draft");
- break;
- default:
- name = item->name;
-
- if (!item->parent) {
- switch (item->folder->type) {
- case F_MBOX:
- Xstrcat_a(name, name, " (MBOX)", ); break;
- case F_MH:
- Xstrcat_a(name, name, " (MH)", ); break;
- case F_IMAP:
- Xstrcat_a(name, name, " (IMAP4)", ); break;
- case F_NEWS:
- Xstrcat_a(name, name, " (News)", ); break;
- default:
- break;
- }
- }
- }
+ name = folder_item_get_name(item);
gtk_ctree_node_set_row_data(ctree, cnode, item);
gtk_ctree_set_node_info(ctree, cnode, name,
folderopenxpm, folderopenxpmmask,
FALSE, FALSE);
+ g_free(name);
+
return TRUE;
}
#define SET_SPECIAL_FOLDER(item) \
{ \
if (item) { \
- GtkCTreeNode *node_, *sibling; \
+ GtkCTreeNode *node_, *parent, *sibling; \
\
node_ = gtk_ctree_find_by_row_data \
(GTK_CTREE(ctree), node, item); \
if (!node_) \
g_warning("%s not found.\n", item->path); \
else { \
- if (!prev) \
- sibling = GTK_CTREE_ROW(node)->children; \
- else \
+ parent = GTK_CTREE_ROW(node_)->parent; \
+ if (prev && parent == GTK_CTREE_ROW(prev)->parent) \
sibling = GTK_CTREE_ROW(prev)->sibling; \
+ else \
+ sibling = GTK_CTREE_ROW(parent)->children; \
if (node_ != sibling) \
gtk_ctree_move(GTK_CTREE(ctree), \
- node_, node, sibling); \
+ node_, parent, sibling); \
} \
\
prev = node_; \
g_return_if_fail(folder != NULL);
if (type != FOLDER_SEL_ALL) {
- if (folder->type == F_NEWS)
+ if (FOLDER_TYPE(folder) == F_NEWS)
continue;
}
folder->node,
foldersel_gnode_func,
NULL);
- gtk_ctree_sort_recursive(GTK_CTREE(ctree), node);
+ gtk_sctree_sort_recursive(GTK_CTREE(ctree), node);
SET_SPECIAL_FOLDER(folder->inbox);
SET_SPECIAL_FOLDER(folder->outbox);
SET_SPECIAL_FOLDER(folder->draft);
folder_item = gtk_ctree_node_get_row_data
(GTK_CTREE(ctree), GTK_CTREE_NODE(list->data));
- gtk_main_quit();
+ finished = TRUE;
}
static void foldersel_cancel(GtkButton *button, gpointer data)
{
cancelled = TRUE;
- gtk_main_quit();
+ finished = TRUE;
}
static void foldersel_activated(void)
return TRUE;
}
-static void key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
+static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
if (event && event->keyval == GDK_Escape)
foldersel_cancel(NULL, NULL);
+ return FALSE;
+}
+
+static gint foldersel_clist_compare(GtkCList *clist,
+ gconstpointer ptr1, gconstpointer ptr2)
+{
+ FolderItem *item1 = ((GtkCListRow *)ptr1)->data;
+ FolderItem *item2 = ((GtkCListRow *)ptr2)->data;
+
+ if (!item1->name)
+ return (item2->name != NULL);
+ if (!item2->name)
+ return -1;
+
+ return g_strcasecmp(item1->name, item2->name);
}