gint width,
FolderView *folderview);
+static void folderview_update_tree_cb (FolderView *folderview,
+ guint action,
+ GtkWidget *widget);
+
static void folderview_new_folder_cb (FolderView *folderview,
guint action,
GtkWidget *widget);
{N_("/_Rename folder..."), NULL, folderview_rename_folder_cb, 0, NULL},
{N_("/_Delete folder"), NULL, folderview_delete_folder_cb, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Update folder tree"), NULL, folderview_update_tree_cb, 0, NULL},
{N_("/Remove _mailbox"), NULL, folderview_remove_mailbox_cb, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Property..."), NULL, NULL, 0, NULL},
{N_("/_Rename folder..."), NULL, NULL, 0, NULL},
{N_("/_Delete folder"), NULL, folderview_rm_imap_folder_cb, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/Remove _IMAP4 server"), NULL, folderview_rm_imap_server_cb, 0, NULL},
+ {N_("/_Update folder tree"), NULL, folderview_update_tree_cb, 0, NULL},
+ {N_("/Remove _IMAP4 account"), NULL, folderview_rm_imap_server_cb, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Property..."), NULL, NULL, 0, NULL},
{N_("/_Scoring..."), NULL, folderview_scoring_cb, 0, NULL}
NULL, folderview_new_news_group_cb, 0, NULL},
{N_("/_Remove newsgroup"), NULL, folderview_rm_news_group_cb, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/Remove _news server"), NULL, folderview_rm_news_server_cb, 0, NULL},
+ {N_("/Remove _news account"), NULL, folderview_rm_news_server_cb, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Property..."), NULL, NULL, 0, NULL},
{N_("/_Scoring..."), NULL, folderview_scoring_cb, 0, NULL}
gtk_ctree_set_expander_style(GTK_CTREE(ctree),
GTK_CTREE_EXPANDER_SQUARE);
gtk_ctree_set_indent(GTK_CTREE(ctree), CTREE_INDENT);
-
+
/* don't let title buttons take key focus */
for (i = 0; i < N_FOLDER_COLS; i++)
GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(ctree)->column[i].button,
gtk_signal_connect(GTK_OBJECT(ctree), "tree_select_row",
GTK_SIGNAL_FUNC(folderview_selected), folderview);
-
gtk_signal_connect_after(GTK_OBJECT(ctree), "tree_expand",
GTK_SIGNAL_FUNC(folderview_tree_expanded),
folderview);
STATUSBAR_POP(mainwin);
}
+void folderview_set_all(void)
+{
+ GList *list;
+
+ for (list = folderview_list; list != NULL; list = list->next)
+ folderview_set((FolderView *)list->data);
+}
+
void folderview_select(FolderView *folderview, FolderItem *item)
{
GtkCTree *ctree = GTK_CTREE(folderview->ctree);
gpointer data)
{
GList *list;
+ gchar *rootpath;
+
+ if (folder->type == F_MH || folder->type == F_MBOX ||
+ folder->type == F_MAILDIR)
+ rootpath = LOCAL_FOLDER(folder)->rootpath;
+ else if (folder->type == F_IMAP && folder->account &&
+ folder->account->recv_server)
+ rootpath = folder->account->recv_server;
+ else
+ return;
for (list = folderview_list; list != NULL; list = list->next) {
FolderView *folderview = (FolderView *)list->data;
if (item->path)
str = g_strdup_printf(_("Scanning folder %s%c%s ..."),
- LOCAL_FOLDER(folder)->rootpath,
- G_DIR_SEPARATOR,
+ rootpath, G_DIR_SEPARATOR,
item->path);
else
str = g_strdup_printf(_("Scanning folder %s ..."),
- LOCAL_FOLDER(folder)->rootpath);
+ rootpath);
STATUSBAR_PUSH(mainwin, str);
STATUSBAR_POP(mainwin);
return window;
}
+void folderview_update_tree(Folder *folder)
+{
+ GtkWidget *window;
+
+ g_return_if_fail(folder != NULL);
+
+ if (!folder->scan_tree) return;
+
+ window = label_window_create(_("Updating folder tree..."));
+
+ folder_set_ui_func(folder, folderview_scan_tree_func, NULL);
+ folder->scan_tree(folder);
+ folder_set_ui_func(folder, NULL, NULL);
+
+ folder_write_list();
+ folderview_set_all();
+
+ gtk_widget_destroy(window);
+}
+
void folderview_update_all(void)
{
GList *list;
}
folder_write_list();
-
- for (list = folderview_list; list != NULL; list = list->next) {
- FolderView *folderview = (FolderView *)list->data;
-
- folderview_set(folderview);
- }
+ folderview_set_all();
gtk_widget_destroy(window);
}
gtk_ctree_node_set_text(ctree, node, COL_TOTAL, itos(item->total));
}
- if (item->stype == F_TRASH) return;
-
ctree_style = gtk_widget_get_style(GTK_WIDGET(ctree));
prev_style = gtk_ctree_node_get_row_style(ctree, node);
if (!prev_style)
if (item->stype == F_QUEUE) {
/* highlight queue folder if there are any messages */
use_bold = use_color = (item->total > 0);
+ } else if (item->stype == F_TRASH) {
+ /* Never highlight trash */
+ use_bold = FALSE;
+ use_color = FALSE;
} else {
/* if unread messages exist, print with bold font */
use_bold = (item->unread > 0) || add_unread_mark;
if (use_bold && boldfont)
style->font = boldfont;
else
- style->font = ctree_style->font;
+ style->font = normalfont;
if (use_color) {
style->fg[GTK_STATE_NORMAL] = folderview->color_new;
static void folderview_expand_func(GtkCTree *ctree, GtkCTreeNode *node,
gpointer data)
{
- if (GTK_CTREE_ROW(node)->children)
- gtk_ctree_expand(ctree, node);
+ /* NOTE: data should by FolderView pointer */
+ if (GTK_CTREE_ROW(node)->children) {
+ FolderItem *item = gtk_ctree_node_get_row_data(ctree, node);
+ FolderView *view = (FolderView *) data;
+ g_return_if_fail(item != NULL);
+ g_return_if_fail(view);
+
+ if (!item->collapsed) {
+ gtk_ctree_expand(ctree, node);
+ }
+ else {
+ /* if it is collapsed we should update the node,
+ * in case one of the children contains unread
+ * messages or other visible state things */
+ folderview_update_node(view, node);
+ }
+ }
}
#define SET_SPECIAL_FOLDER(ctree, item) \
if (folder->type == F_MH && item->parent == NULL) {
menu_set_sensitive(folderview->mail_factory,
"/Create new folder...", TRUE);
+ menu_set_sensitive(folderview->mail_factory,
+ "/Update folder tree", TRUE);
menu_set_sensitive(folderview->mail_factory,
"/Remove mailbox", TRUE);
} else if (folder->type == F_MH && item->stype != F_NORMAL) {
menu_set_sensitive(folderview->imap_factory,
"/Create new folder...", TRUE);
menu_set_sensitive(folderview->imap_factory,
- "/Remove IMAP4 server", TRUE);
- } else if (folder->type == F_IMAP && item->parent != NULL) {
+ "/Update folder tree", TRUE);
+ menu_set_sensitive(folderview->imap_factory,
+ "/Remove IMAP4 account", TRUE);
+ } else if (folder->type == F_IMAP && item->stype != F_NORMAL) {
+ menu_set_sensitive(folderview->imap_factory,
+ "/Create new folder...", TRUE);
+ } else if (folder->type == F_IMAP) {
menu_set_sensitive(folderview->imap_factory,
"/Create new folder...", TRUE);
menu_set_sensitive(folderview->imap_factory,
menu_set_sensitive(folderview->news_factory,
"/Subscribe to newsgroup...", TRUE);
menu_set_sensitive(folderview->news_factory,
- "/Remove news server", TRUE);
- } else if (folder->type == F_NEWS && item->parent != NULL) {
+ "/Remove news account", TRUE);
+ } else if (folder->type == F_NEWS) {
menu_set_sensitive(folderview->news_factory,
"/Subscribe to newsgroup...", TRUE);
menu_set_sensitive(folderview->news_factory,
{
if (!event) return;
- if (event->button == 1 && folderview->opened != NULL) {
+ if (event->button == 1 && folderview->open_folder == FALSE &&
+ folderview->opened != NULL) {
gtk_ctree_select(GTK_CTREE(ctree), folderview->opened);
gtkut_ctree_set_focus_row(GTK_CTREE(ctree),
folderview->opened);
static gboolean can_select = TRUE; /* exclusive lock */
gboolean opened;
FolderItem *item;
- GtkCTreeNode *prev_row;
folderview->selected = row;
}
if (!folderview->open_folder) return;
- folderview->open_folder = FALSE;
item = gtk_ctree_node_get_row_data(ctree, row);
if (!item) return;
gdk_pointer_ungrab(GDK_CURRENT_TIME);
}
- prev_row = folderview->opened;
- folderview->opened = row;
-
opened = summary_show(folderview->summaryview, item, FALSE);
if (!opened) {
- folderview->opened = prev_row;
- gtk_ctree_select(ctree, prev_row);
- gtkut_ctree_set_focus_row(ctree, prev_row);
- }
+ gtk_ctree_select(ctree, folderview->opened);
+ gtkut_ctree_set_focus_row(ctree, folderview->opened);
+ } else
+ folderview->opened = row;
+ folderview->open_folder = FALSE;
can_select = TRUE;
}
static void folderview_tree_expanded(GtkCTree *ctree, GtkCTreeNode *node,
FolderView *folderview)
{
+ FolderItem *item = gtk_ctree_node_get_row_data(ctree, node);
+
+ g_return_if_fail(item);
+ item->collapsed = FALSE;
folderview_update_node(folderview, node);
}
static void folderview_tree_collapsed(GtkCTree *ctree, GtkCTreeNode *node,
FolderView *folderview)
{
+ FolderItem *item = gtk_ctree_node_get_row_data(ctree, node);
+
+ g_return_if_fail(item);
+ item->collapsed = TRUE;
folderview_update_node(folderview, node);
}
return NULL;
}
+static void folderview_update_tree_cb(FolderView *folderview, guint action,
+ GtkWidget *widget)
+{
+ GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+ FolderItem *item;
+
+ if (!folderview->selected) return;
+
+ summary_show(folderview->summaryview, NULL, FALSE);
+
+ item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
+ g_return_if_fail(item != NULL);
+ g_return_if_fail(item->folder != NULL);
+
+ folderview_update_tree(item->folder);
+}
+
static void folderview_new_folder_cb(FolderView *folderview, guint action,
GtkWidget *widget)
{
if (avalue != G_ALERTDEFAULT) return;
if (item->folder->remove_folder(item->folder, item) < 0) {
- g_warning(_("can't remove folder `%s'\n"), item->path);
+ alertpanel_error(_("Can't remove the folder `%s'."),
+ item->path);
return;
}
FolderItem *item;
FolderItem *new_item;
gchar *new_folder;
+ gchar *p;
if (!folderview->selected) return;
g_return_if_fail(item->folder->type == F_IMAP);
g_return_if_fail(item->folder->account != NULL);
- new_folder = input_dialog(_("New folder"),
- _("Input the name of new folder:"),
- _("NewFolder"));
+ new_folder = input_dialog
+ (_("New folder"),
+ _("Input the name of new folder:\n"
+ "(if you want to create a folder to store subfolders,\n"
+ " append `/' at the end of the name)"),
+ _("NewFolder"));
if (!new_folder) return;
- if (strchr(new_folder, G_DIR_SEPARATOR) != NULL) {
+ if ((p = strchr(new_folder, G_DIR_SEPARATOR)) != NULL &&
+ *(p + 1) != '\0') {
alertpanel_error(_("`%c' can't be included in folder name."),
G_DIR_SEPARATOR);
g_free(new_folder);
}
new_item = item->folder->create_folder(item->folder, item, new_folder);
+ if (!new_item) {
+ alertpanel_error(_("Can't create the folder `%s'."),
+ new_folder);
+ g_free(new_folder);
+ return;
+ }
g_free(new_folder);
- if (!new_item) return;
gtk_clist_freeze(GTK_CLIST(ctree));
if (avalue != G_ALERTDEFAULT) return;
if (item->folder->remove_folder(item->folder, item) < 0) {
- g_warning(_("can't remove folder `%s'\n"), item->path);
+ alertpanel_error(_("Can't remove the folder `%s'."),
+ item->path);
+ if (folderview->opened == folderview->selected)
+ summary_show(folderview->summaryview,
+ folderview->summaryview->folder_item,
+ FALSE);
return;
}
g_return_if_fail(item->folder->type == F_IMAP);
g_return_if_fail(item->folder->account != NULL);
- message = g_strdup_printf(_("Really delete IMAP4 server `%s'?"),
+ message = g_strdup_printf(_("Really delete IMAP4 account `%s'?"),
item->folder->name);
- avalue = alertpanel(_("Delete IMAP4 server"), message,
+ avalue = alertpanel(_("Delete IMAP4 account"), message,
_("Yes"), _("+No"), NULL);
g_free(message);
g_return_if_fail(item->folder->type == F_NEWS);
g_return_if_fail(item->folder->account != NULL);
- message = g_strdup_printf(_("Really delete news server `%s'?"),
+ message = g_strdup_printf(_("Really delete news account `%s'?"),
item->folder->name);
- avalue = alertpanel(_("Delete news server"), message,
+ avalue = alertpanel(_("Delete news account"), message,
_("Yes"), _("+No"), NULL);
g_free(message);
FolderView *folderview)
{
gint row, column;
- FolderItem *item;
- GtkCTreeNode *node;
+ FolderItem *item, *current_item;
+ GtkCTreeNode *node = NULL;
+ gboolean acceptable = FALSE;
if (gtk_clist_get_selection_info(GTK_CLIST(widget),
x - 24, y - 24, &row, &column)) {
node = gtk_ctree_node_nth(GTK_CTREE(widget), row);
item = gtk_ctree_node_get_row_data(GTK_CTREE(widget), node);
+ current_item = folderview->summaryview->folder_item;
if (item != NULL &&
item->path != NULL &&
- folderview->summaryview->folder_item != item) {
- if (item->folder->type != F_NEWS) {
- gtk_ctree_select(GTK_CTREE(widget), node);
- gdk_drag_status(context,
- context->suggested_action,
- time);
- return TRUE;
+ current_item != NULL &&
+ current_item != item) {
+ switch (item->folder->type){
+ case F_MH:
+ if (current_item->folder->type == F_MH)
+ acceptable = TRUE;
+ break;
+ case F_IMAP:
+ if (current_item->folder->account == item->folder->account)
+ acceptable = TRUE;
+ break;
+ default:
}
}
}
- gtk_ctree_select(GTK_CTREE(widget), folderview->opened);
- gdk_drag_status(context, 0, time);
+ if (acceptable) {
+ gtk_ctree_select(GTK_CTREE(widget), node);
+ gdk_drag_status(context, context->suggested_action, time);
+ } else {
+ gtk_ctree_select(GTK_CTREE(widget), folderview->opened);
+ gdk_drag_status(context, 0, time);
+ }
- return FALSE;
+ return acceptable;
}
static void folderview_drag_leave_cb(GtkWidget *widget,
projects / claws.git / blobdiff