/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2002 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
static GdkBitmap *trashxpmmask;
static GdkPixmap *trashhrmxpm;
static GdkBitmap *trashhrmxpmmask;
+static GdkPixmap *newxpm;
+static GdkBitmap *newxpmmask;
+static GdkPixmap *unreadxpm;
+static GdkBitmap *unreadxpmmask;
static void folderview_select_node (FolderView *folderview,
GtkCTreeNode *node);
guint action,
GtkWidget *widget);
+static void mark_all_read_cb (FolderView *folderview,
+ guint action,
+ GtkWidget *widget);
static void folderview_new_folder_cb (FolderView *folderview,
guint action,
GtkWidget *widget);
static GtkItemFactoryEntry folderview_mail_popup_entries[] =
{
+ {N_("/Mark all _read"), NULL, mark_all_read_cb, 0, NULL},
+ {N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/Create _new folder..."), NULL, folderview_new_folder_cb, 0, NULL},
{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_("/_Check for new messages"),
+ NULL, folderview_update_tree_cb, 0, NULL},
{N_("/R_escan folder tree"), NULL, folderview_update_tree_cb, 1, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/Remove _mailbox"), NULL, folderview_remove_mailbox_cb, 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_("/_Update folder tree"), NULL, folderview_update_tree_cb, 0, NULL},
+ {N_("/_Check for new messages"),
+ NULL, folderview_update_tree_cb, 0, NULL},
{N_("/R_escan folder tree"), NULL, folderview_update_tree_cb, 1, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/Remove _IMAP4 account"), NULL, folderview_rm_imap_server_cb, 0, NULL},
prefs_common.folderview_height);
ctree = gtk_ctree_new_with_titles(N_FOLDER_COLS, COL_FOLDER, titles);
+
gtk_container_add(GTK_CONTAINER(scrolledwin), ctree);
gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_BROWSE);
+#ifndef CLAWS /* text instead of pixmaps */
gtk_clist_set_column_justification(GTK_CLIST(ctree), COL_NEW,
GTK_JUSTIFY_RIGHT);
gtk_clist_set_column_justification(GTK_CLIST(ctree), COL_UNREAD,
GTK_JUSTIFY_RIGHT);
+#endif
gtk_clist_set_column_justification(GTK_CLIST(ctree), COL_TOTAL,
GTK_JUSTIFY_RIGHT);
gtk_clist_set_column_width(GTK_CLIST(ctree), COL_FOLDER,
void folderview_init(FolderView *folderview)
{
GtkWidget *ctree = folderview->ctree;
+ GtkWidget *label_new;
+ GtkWidget *label_unread;
+ GtkWidget *hbox_new;
+ GtkWidget *hbox_unread;
stock_pixmap_gdk(ctree, STOCK_PIXMAP_INBOX, &inboxxpm, &inboxxpmmask);
stock_pixmap_gdk(ctree, STOCK_PIXMAP_OUTBOX,
stock_pixmap_gdk(ctree, STOCK_PIXMAP_DIR_OPEN,
&folderopenxpm, &folderopenxpmmask);
stock_pixmap_gdk(ctree, STOCK_PIXMAP_TRASH, &trashxpm, &trashxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_INBOX_HRM,
+ &inboxhrmxpm, &inboxhrmxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_OUTBOX_HRM,
+ &outboxhrmxpm, &outboxhrmxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_DIR_OPEN_HRM,
+ &folderopenhrmxpm, &folderopenhrmxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_TRASH_HRM,
+ &trashhrmxpm, &trashhrmxpmmask);
+
+ /* CLAWS: titles for "New" and "Unread" show new & unread pixmaps
+ * instead text (text overflows making them unreadable and ugly) */
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_NEW,
+ &newxpm, &newxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_UNREAD,
+ &unreadxpm, &unreadxpmmask);
+
+ label_new = gtk_pixmap_new(newxpm, newxpmmask);
+ label_unread = gtk_pixmap_new(unreadxpm, unreadxpmmask);
+
+ hbox_new = gtk_hbox_new(FALSE, 4);
+ hbox_unread = gtk_hbox_new(FALSE, 4);
+
+ /* left justified */
+ gtk_box_pack_start(GTK_BOX(hbox_new),label_new,FALSE,FALSE,0);
+ gtk_box_pack_start(GTK_BOX(hbox_unread),label_unread,FALSE,FALSE,0);
+
+ gtk_widget_show_all(hbox_new);
+ gtk_widget_show_all(hbox_unread);
+
+ gtk_clist_set_column_widget(GTK_CLIST(ctree),COL_NEW,hbox_new);
+ gtk_clist_set_column_widget(GTK_CLIST(ctree),COL_UNREAD,hbox_unread);
+
+
if (!normalfont)
normalfont = gdk_fontset_load(NORMAL_FONT);
folder_update_op_count();
}
+static void mark_all_read_cb(FolderView *folderview, guint action,
+ GtkWidget *widget)
+{
+ if (!folderview->selected) return;
+ summary_mark_all_read(folderview->summaryview);
+}
+
static void folderview_select_node(FolderView *folderview, GtkCTreeNode *node)
{
GtkCTree *ctree = GTK_CTREE(folderview->ctree);
g_return_if_fail(node != NULL);
folderview->open_folder = TRUE;
- gtk_ctree_select(ctree, node);
gtkut_ctree_set_focus_row(ctree, node);
+ gtk_ctree_select(ctree, node);
if (folderview->summaryview->messages > 0)
gtk_widget_grab_focus(folderview->summaryview->ctree);
else
FolderItem *item;
Folder *folder;
GtkWidget *popup;
+ gboolean mark_all_read = FALSE;
gboolean new_folder = FALSE;
gboolean rename_folder = FALSE;
gboolean delete_folder = FALSE;
if (item->parent == NULL)
update_tree = remove_tree = TRUE;
else
- search_folder = TRUE;
+ mark_all_read = search_folder = TRUE;
if (FOLDER_IS_LOCAL(folder) || FOLDER_TYPE(folder) == F_IMAP || FOLDER_TYPE(folder) == F_MBOX) {
if (item->parent == NULL)
update_tree = rescan_tree = TRUE;
if (item->parent != NULL)
delete_folder = folder_scoring = folder_processing = TRUE;
}
+ if (item->unread < 1)
+ mark_all_read = FALSE;
}
#define SET_SENS(factory, name, sens) \
if (FOLDER_IS_LOCAL(folder)) {
popup = folderview->mail_popup;
menu_set_insensitive_all(GTK_MENU_SHELL(popup));
+ SET_SENS(mail_factory, "/Mark all read", mark_all_read);
SET_SENS(mail_factory, "/Create new folder...", new_folder);
SET_SENS(mail_factory, "/Rename folder...", rename_folder);
SET_SENS(mail_factory, "/Delete folder", delete_folder);
- SET_SENS(mail_factory, "/Update folder tree", update_tree);
+ SET_SENS(mail_factory, "/Check for new messages", update_tree);
SET_SENS(mail_factory, "/Rescan folder tree", rescan_tree);
SET_SENS(mail_factory, "/Remove mailbox", remove_tree);
SET_SENS(mail_factory, "/Property...", folder_property);
SET_SENS(imap_factory, "/Create new folder...", new_folder);
SET_SENS(imap_factory, "/Rename folder...", rename_folder);
SET_SENS(imap_factory, "/Delete folder", delete_folder);
- SET_SENS(imap_factory, "/Update folder tree", update_tree);
+ SET_SENS(imap_factory, "/Check for new messages", update_tree);
SET_SENS(imap_factory, "/Rescan folder tree", rescan_tree);
SET_SENS(imap_factory, "/Remove IMAP4 account", remove_tree);
SET_SENS(imap_factory, "/Processing...", folder_processing);
menu_set_insensitive_all(GTK_MENU_SHELL(popup));
SET_SENS(news_factory, "/Subscribe to newsgroup...", new_folder);
SET_SENS(news_factory, "/Remove newsgroup", delete_folder);
+#if 0
+ SET_SENS(news_factory, "/Check for new messages", update_tree);
+#endif
SET_SENS(news_factory, "/Remove news account", remove_tree);
SET_SENS(news_factory, "/Search folder...", search_folder);
SET_SENS(news_factory, "/Processing...", folder_processing);
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);
+ gtk_ctree_select(GTK_CTREE(ctree), folderview->opened);
}
}
switch (event->keyval) {
case GDK_Return:
- case GDK_space:
if (folderview->selected) {
folderview_select_node(folderview,
folderview->selected);
}
break;
+ case GDK_space:
+ if (folderview->selected) {
+ if (folderview->opened == folderview->selected &&
+ folderview->summaryview->messages == 0)
+ folderview_select_next_unread(folderview);
+ else
+ folderview_select_node(folderview,
+ folderview->selected);
+ }
+ break;
case GDK_v:
case GDK_V:
case GDK_g:
}
if (!can_select) {
- gtk_ctree_select(ctree, folderview->opened);
gtkut_ctree_set_focus_row(ctree, folderview->opened);
+ gtk_ctree_select(ctree, folderview->opened);
return;
}
opened = summary_show(folderview->summaryview, item, FALSE);
if (!opened) {
- gtk_ctree_select(ctree, folderview->opened);
gtkut_ctree_set_focus_row(ctree, folderview->opened);
+ gtk_ctree_select(ctree, folderview->opened);
} else
folderview->opened = row;
{
if (!folderview->opened) return;
- gtk_ctree_select(GTK_CTREE(folderview->ctree), folderview->opened);
gtkut_ctree_set_focus_row(GTK_CTREE(folderview->ctree),
folderview->opened);
+ gtk_ctree_select(GTK_CTREE(folderview->ctree), folderview->opened);
}
static void folderview_col_resized(GtkCList *clist, gint column, gint width,
GNode *next = gnode->next;
item = FOLDER_ITEM(gnode->data);
- if (g_slist_find_custom(new_subscr, item->name,
+ if (g_slist_find_custom(new_subscr, item->path,
(GCompareFunc)g_strcasecmp) != NULL) {
gnode = next;
continue;
prefs_filtering_open(item);
}
-static void folderview_property_cb(FolderView *folderview, guint action, GtkWidget *widget) {
+static void folderview_property_cb(FolderView *folderview, guint action,
+ GtkWidget *widget)
+{
GtkCTree *ctree = GTK_CTREE(folderview->ctree);
FolderItem *item;
g_return_if_fail(item != NULL);
g_return_if_fail(item->folder != NULL);
- prefs_folder_item_create(item);
+ prefs_folder_item_create(folderview, item);
}
-void folderview_set_target_folder_color(gint color_op) {
+void folderview_set_target_folder_color(gint color_op)
+{
gint firstone = 1;
GList *list;
FolderView *folderview;
projects / claws.git / blobdiff