#include "addressbook.h"
#include "addr_compl.h"
#include "scoring.h"
-#include "prefs_folder_item.h"
+#include "folder_item_prefs.h"
#include "filtering.h"
#include "string_match.h"
#include "toolbar.h"
#define SUMMARY_COL_LOCKED_WIDTH 13
#define SUMMARY_COL_MIME_WIDTH 11
-static GdkFont *boldfont;
-static GdkFont *smallfont;
static GtkStyle *bold_style;
static GtkStyle *bold_marked_style;
static GtkWidget *summary_ctree_create (SummaryView *summaryview);
/* callback functions */
-static void summary_toggle_pressed (GtkWidget *eventbox,
+static gint summary_toggle_pressed (GtkWidget *eventbox,
GdkEventButton *event,
SummaryView *summaryview);
static void summary_button_pressed (GtkWidget *ctree,
static void summary_button_released (GtkWidget *ctree,
GdkEventButton *event,
SummaryView *summaryview);
-static void summary_key_pressed (GtkWidget *ctree,
+static gint summary_key_pressed (GtkWidget *ctree,
GdkEventKey *event,
SummaryView *summaryview);
-static void summary_searchbar_pressed (GtkWidget *ctree,
+static gint summary_searchbar_pressed (GtkWidget *ctree,
GdkEventKey *event,
SummaryView *summaryview);
static void summary_searchbar_focus_evt (GtkWidget *ctree,
search_descr_strings
};
-static void search_description_cb (GtkWidget *widget) {
+static void search_description_cb(GtkWidget *widget)
+{
description_window_create(&search_descr);
};
summaryview->msginfo_update_callback_id =
hooks_register_hook(MSGINFO_UPDATE_HOOKLIST, summary_update_msg, (gpointer) summaryview);
+ summaryview->target_list = gtk_target_list_new(summary_drag_types, 1);
+
/* CLAWS: need this to get the SummaryView * from
* the CList */
gtk_object_set_data(GTK_OBJECT(ctree), "summaryview", (gpointer)summaryview);
void summary_init(SummaryView *summaryview)
{
+ static GdkFont *boldfont = NULL;
+ static GdkFont *smallfont = NULL;
GtkStyle *style;
GtkWidget *pixmap;
+ gtk_widget_realize(summaryview->ctree);
stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_MARK,
&markxpm, &markxpmmask);
stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_DELETED,
stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_GPG_SIGNED,
&gpgsignedxpm, &gpgsignedxpmmask);
+ if (!bold_style) {
+ bold_style = gtk_style_copy
+ (gtk_widget_get_style(summaryview->ctree));
+ if (!boldfont)
+ boldfont = gtkut_font_load(BOLD_FONT);
+ if (boldfont)
+ bold_style->font = boldfont;
+ bold_marked_style = gtk_style_copy(bold_style);
+ bold_marked_style->fg[GTK_STATE_NORMAL] =
+ summaryview->color_marked;
+ bold_deleted_style = gtk_style_copy(bold_style);
+ bold_deleted_style->fg[GTK_STATE_NORMAL] =
+ summaryview->color_dim;
+ }
+
if (!small_style) {
small_style = gtk_style_copy
(gtk_widget_get_style(summaryview->ctree));
small_deleted_style->fg[GTK_STATE_NORMAL] =
summaryview->color_dim;
}
- if (!bold_style) {
- bold_style = gtk_style_copy
- (gtk_widget_get_style(summaryview->ctree));
- if (!boldfont)
- boldfont = gtkut_font_load(BOLD_FONT);
- bold_style->font = boldfont;
- bold_marked_style = gtk_style_copy(bold_style);
- bold_marked_style->fg[GTK_STATE_NORMAL] =
- summaryview->color_marked;
- bold_deleted_style = gtk_style_copy(bold_style);
- bold_deleted_style->fg[GTK_STATE_NORMAL] =
- summaryview->color_dim;
- }
style = gtk_style_copy(gtk_widget_get_style
(summaryview->statlabel_folder));
-
+ if (smallfont)
+ style->font = smallfont;
gtk_widget_set_style(summaryview->statlabel_folder, style);
gtk_widget_set_style(summaryview->statlabel_select, style);
gtk_widget_set_style(summaryview->statlabel_msgs, style);
summary_clear_list(summaryview);
summary_set_column_titles(summaryview);
- if (!is_refresh)
- messageview_clear(summaryview->messageview);
buf = NULL;
if (!item || !item->path || !item->parent || item->no_select) {
g_free(buf);
debug_print("empty folder\n\n");
summary_set_hide_read_msgs_menu(summaryview, FALSE);
- if (is_refresh)
- messageview_clear(summaryview->messageview);
summary_clear_all(summaryview);
summaryview->folder_item = item;
gtk_clist_thaw(GTK_CLIST(ctree));
}
g_free(buf);
+ if (!is_refresh)
+ messageview_clear(summaryview->messageview);
+
summaryview->folder_item = item;
item->opened = TRUE;
STATUSBAR_POP(summaryview->mainwin);
- /* set ctree and hash table from the msginfo list
- creating thread, and count the number of messages */
-
+ /* set ctree and hash table from the msginfo list, and
+ create the thread */
summary_set_ctree_from_list(summaryview, mlist);
g_slist_free(mlist);
if (prefs_common.open_unread_on_enter ||
prefs_common.always_show_msg) {
summary_unlock(summaryview);
- summary_select_node(summaryview, node, TRUE, TRUE);
+ summary_select_node(summaryview, node,
+ messageview_is_visible(summaryview->messageview),
+ TRUE);
summary_lock(summaryview);
} else
summary_select_node(summaryview, node, FALSE, TRUE);
summaryview->display_msg = FALSE;
- summaryview->selected = NULL;
+ summaryview->selected = NULL;
summaryview->displayed = NULL;
- summaryview->newmsgs = summaryview->unread = 0;
- summaryview->messages = summaryview->total_size = 0;
- summaryview->deleted = summaryview->moved = 0;
- summaryview->copied = 0;
+ summaryview->total_size = 0;
+ summaryview->deleted = summaryview->moved = 0;
+ summaryview->copied = 0;
if (summaryview->msgid_table) {
g_hash_table_destroy(summaryview->msgid_table);
summaryview->msgid_table = NULL;
void summary_clear_all(SummaryView *summaryview)
{
+ messageview_clear(summaryview->messageview);
summary_clear_list(summaryview);
summary_set_menu_sensitive(summaryview);
toolbar_main_set_sensitive(summaryview->mainwin);
GSList *summary_get_selected_msg_list(SummaryView *summaryview)
{
GSList *mlist = NULL;
- GList *row_list;
GList *cur;
MsgInfo *msginfo;
- row_list = GTK_CLIST(summaryview->ctree)->selection;
- for (cur = row_list; cur != NULL; cur = cur->next) {
- msginfo = gtk_ctree_node_get_row_data
- (GTK_CTREE(summaryview->ctree),
- GTK_CTREE_NODE(cur->data));
+ for (cur = GTK_CLIST(summaryview->ctree)->selection; cur != NULL;
+ cur = cur->next) {
+ msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(cur->data);
+ mlist = g_slist_prepend(mlist, msginfo);
+ }
+
+ mlist = g_slist_reverse(mlist);
+
+ return mlist;
+}
+
+GSList *summary_get_msg_list(SummaryView *summaryview)
+{
+ GSList *mlist = NULL;
+ GtkCTree *ctree;
+ GtkCTreeNode *node;
+ MsgInfo *msginfo;
+
+ ctree = GTK_CTREE(summaryview->ctree);
+
+ for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+ node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
+ msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
mlist = g_slist_prepend(mlist, msginfo);
}
static void summary_set_menu_sensitive(SummaryView *summaryview)
{
GtkItemFactory *ifactory = summaryview->popupfactory;
- SummarySelection selection;
+ SensitiveCond state;
+ gboolean sensitive;
GtkWidget *menuitem;
- gboolean sens;
+ gint i;
+
+ static const struct {
+ gchar *const entry;
+ SensitiveCond cond;
+ } entry[] = {
+ {"/Reply" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+ {"/Reply to" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+ {"/Reply to/all" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+ {"/Reply to/sender" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+ {"/Reply to/mailing list" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+ {"/Follow-up and reply to" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST|M_NEWS},
+
+ {"/Forward" , M_HAVE_ACCOUNT|M_TARGET_EXIST},
+ {"/Redirect" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+
+ {"/Re-edit" , M_HAVE_ACCOUNT|M_ALLOW_REEDIT},
+
+ {"/Move..." , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NOT_NEWS},
+ {"/Copy..." , M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
+ {"/Delete" , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NOT_NEWS},
+ {"/Cancel a news message" , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NEWS},
+ {"/Execute" , M_DELAY_EXEC},
+
+ {"/Mark" , M_TARGET_EXIST},
+ {"/Mark/Mark" , M_TARGET_EXIST},
+ {"/Mark/Unmark" , M_TARGET_EXIST},
+ {"/Mark/Mark as unread" , M_TARGET_EXIST},
+ {"/Mark/Mark all read" , M_TARGET_EXIST},
+ {"/Mark/Ignore thread" , M_TARGET_EXIST},
+ {"/Mark/Lock" , M_TARGET_EXIST},
+ {"/Mark/Unlock" , M_TARGET_EXIST},
+ {"/Color label" , M_TARGET_EXIST},
+
+ {"/Add sender to address book" , M_SINGLE_TARGET_EXIST},
+ {"/Create filter rule" , M_SINGLE_TARGET_EXIST|M_UNLOCKED},
+
+ {"/View" , M_SINGLE_TARGET_EXIST},
+ {"/View/Open in new window" , M_SINGLE_TARGET_EXIST},
+ {"/View/Source" , M_SINGLE_TARGET_EXIST},
+ {"/View/All header" , M_SINGLE_TARGET_EXIST},
+
+ {"/Save as..." , M_TARGET_EXIST|M_UNLOCKED},
+ {"/Print..." , M_TARGET_EXIST|M_UNLOCKED},
+
+ {"/Select thread" , M_SINGLE_TARGET_EXIST},
+ {"/Select all" , M_TARGET_EXIST},
+
+ {NULL, 0}
+ };
- selection = summary_get_selection_type(summaryview);
main_window_set_menu_sensitive(summaryview->mainwin);
- if (selection == SUMMARY_NONE) {
- GtkWidget *submenu;
+ state = main_window_get_current_state(summaryview->mainwin);
- submenu = gtk_item_factory_get_widget
- (summaryview->popupfactory, "/Mark");
- menu_set_insensitive_all(GTK_MENU_SHELL(submenu));
- menu_set_insensitive_all
- (GTK_MENU_SHELL(summaryview->popupmenu));
- return;
+ for (i = 0; entry[i].entry != NULL; i++) {
+ sensitive = ((entry[i].cond & state) == entry[i].cond);
+ menu_set_sensitive(ifactory, entry[i].entry, sensitive);
}
- if (FOLDER_TYPE(summaryview->folder_item->folder) != F_NEWS)
- menu_set_sensitive(ifactory, "/Move...", TRUE);
- else
- menu_set_sensitive(ifactory, "/Move...", FALSE);
-
-#if 0
- menu_set_sensitive(ifactory, "/Delete", TRUE);
-#endif
- menu_set_sensitive(ifactory, "/Copy...", TRUE);
- menu_set_sensitive(ifactory, "/Execute", TRUE);
-
- menu_set_sensitive(ifactory, "/Mark", TRUE);
- menu_set_sensitive(ifactory, "/Mark/Mark", TRUE);
- menu_set_sensitive(ifactory, "/Mark/Unmark", TRUE);
-
- menu_set_sensitive(ifactory, "/Mark/Mark as unread", TRUE);
- menu_set_sensitive(ifactory, "/Mark/Mark as read", TRUE);
- menu_set_sensitive(ifactory, "/Mark/Mark all read", TRUE);
- menu_set_sensitive(ifactory, "/Mark/Ignore thread", TRUE);
- menu_set_sensitive(ifactory, "/Mark/Unignore thread", TRUE);
- menu_set_sensitive(ifactory, "/Mark/Lock", TRUE);
- menu_set_sensitive(ifactory, "/Mark/Unlock", TRUE);
-
- menu_set_sensitive(ifactory, "/Color label", TRUE);
-
- sens = (selection == SUMMARY_SELECTED_MULTIPLE) ? FALSE : TRUE;
- menu_set_sensitive(ifactory, "/Reply", sens);
- menu_set_sensitive(ifactory, "/Reply to", sens);
- menu_set_sensitive(ifactory, "/Reply to/all", sens);
- menu_set_sensitive(ifactory, "/Reply to/sender", sens);
- menu_set_sensitive(ifactory, "/Reply to/mailing list", sens);
- menu_set_sensitive(ifactory, "/Forward", TRUE);
- menu_set_sensitive(ifactory, "/Redirect", sens);
-
- menu_set_sensitive(ifactory, "/Add sender to address book", sens);
- menu_set_sensitive(ifactory, "/Create filter rule", sens);
-
- menu_set_sensitive(ifactory, "/View", sens);
- menu_set_sensitive(ifactory, "/View/Open in new window", sens);
- menu_set_sensitive(ifactory, "/View/Source", sens);
- menu_set_sensitive(ifactory, "/View/All header", sens);
- if (summaryview->folder_item->stype == F_OUTBOX ||
- summaryview->folder_item->stype == F_DRAFT ||
- summaryview->folder_item->stype == F_QUEUE)
- menu_set_sensitive(ifactory, "/Re-edit", sens);
- else
- menu_set_sensitive(ifactory, "/Re-edit", FALSE);
-
- menu_set_sensitive(ifactory, "/Save as...", TRUE);
- menu_set_sensitive(ifactory, "/Print...", TRUE);
-
- menu_set_sensitive(ifactory, "/Select all", TRUE);
- menu_set_sensitive(ifactory, "/Select thread", sens);
- if (summaryview->folder_item->folder->account)
- sens = summaryview->folder_item->folder->account->protocol
- == A_NNTP;
- else
- sens = FALSE;
- menu_set_sensitive(ifactory, "/Follow-up and reply to", sens);
- menu_set_sensitive(ifactory, "/Cancel a news message", sens);
- menu_set_sensitive(ifactory, "/Delete", !sens);
summary_lock(summaryview);
menuitem = gtk_item_factory_get_widget(ifactory, "/View/All header");
gtk_check_menu_item_set_active
(GTK_CHECK_MENU_ITEM(menuitem),
- summaryview->messageview->textview->show_all_headers);
+ summaryview->messageview->mimeview->textview->show_all_headers);
summary_unlock(summaryview);
}
msginfo = gtk_ctree_node_get_row_data(ctree, node);
- if (MSG_IS_NEWS(msginfo->flags))
+ if (msginfo->folder && msginfo->folder->folder &&
+ msginfo->folder->folder->klass->type == F_NEWS)
news_flag_crosspost(msginfo);
- if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
- summaryview->newmsgs++;
- if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
- summaryview->unread++;
if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
&& procmsg_msg_has_marked_parent(msginfo))
summaryview->unreadmarked++;
if (MSG_IS_DELETED(msginfo->flags))
summaryview->deleted++;
- summaryview->messages++;
summaryview->total_size += msginfo->size;
summary_set_row_marks(summaryview, node);
GtkCTreeNode *node;
MsgInfo *msginfo;
- summaryview->newmsgs = summaryview->unread =
- summaryview->messages = summaryview->total_size =
+ summaryview->total_size =
summaryview->deleted = summaryview->moved = summaryview->copied = 0;
for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
- if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
- summaryview->newmsgs++;
- if (MSG_IS_UNREAD(msginfo->flags)&& !MSG_IS_IGNORE_THREAD(msginfo->flags))
- summaryview->unread++;
if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
&& procmsg_msg_has_marked_parent(msginfo))
summaryview->unreadmarked++;
summaryview->moved++;
if (MSG_IS_COPY(msginfo->flags))
summaryview->copied++;
- summaryview->messages++;
summaryview->total_size += msginfo->size;
}
}
g_free(itstr);
str = g_strdup_printf(_("%d new, %d unread, %d total (%s)"),
- summaryview->newmsgs,
- summaryview->unread,
- summaryview->messages,
- to_human_readable(summaryview->total_size));
+ summaryview->folder_item->new_msgs,
+ summaryview->folder_item->unread_msgs,
+ summaryview->folder_item->total_msgs,
+ to_human_readable(summaryview->total_size));
gtk_label_set(GTK_LABEL(summaryview->statlabel_msgs), str);
g_free(str);
}
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
MsgInfo *msginfo;
MsgFlags flags;
- gchar *filename;
if (!new_window) {
if (summaryview->displayed == row)
msginfo = gtk_ctree_node_get_row_data(ctree, row);
- filename = procmsg_get_message_file(msginfo);
- if (!filename) {
- summary_unlock(summaryview);
- return;
- }
- g_free(filename);
-
if (new_window || !prefs_common.mark_as_read_on_new_window) {
- if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
- summaryview->newmsgs--;
- if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
- summaryview->unread--;
if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
&& procmsg_msg_has_marked_parent(msginfo))
summaryview->unreadmarked--;
if (!messageview_is_visible(msgview))
main_window_toggle_message_view(summaryview->mainwin);
messageview_show(msgview, msginfo, all_headers);
- if (msgview->type == MVIEW_TEXT ||
- (msgview->type == MVIEW_MIME &&
- (GTK_CLIST(msgview->mimeview->ctree)->row_list == NULL ||
- gtk_notebook_get_current_page
- (GTK_NOTEBOOK(msgview->mimeview->notebook)) == 0)))
+ if (GTK_CLIST(msgview->mimeview->ctree)->row_list == NULL)
gtk_widget_grab_focus(summaryview->ctree);
GTK_EVENTS_FLUSH();
gtkut_ctree_node_move_if_on_the_edge(ctree, row);
void summary_open_msg(SummaryView *summaryview)
{
if (!summaryview->selected) return;
-
+
+ /* CLAWS: if separate message view, don't open a new window
+ * but rather use the current separated message view */
summary_display_msg_full(summaryview, summaryview->selected,
- TRUE, FALSE);
+ prefs_common.sep_msg ? FALSE : TRUE,
+ FALSE);
}
void summary_view_source(SummaryView * summaryview)
}
gtk_ctree_node_set_foreground
(ctree, row, &summaryview->color_marked);
- }
- else if ((global_scoring ||
+ } else if ((global_scoring ||
summaryview->folder_item->prefs->scoring) &&
(msginfo->score >= summaryview->important_score) &&
(MSG_IS_MARKED(msginfo->flags) || MSG_IS_MOVE(msginfo->flags) || MSG_IS_COPY(msginfo->flags))) {
static void summary_unlock_row(SummaryView *summaryview, GtkCTreeNode *row)
{
- gboolean changed = FALSE;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
MsgInfo *msginfo;
if(!(MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)))
return;
- if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
- summaryview->newmsgs--;
- if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
- summaryview->unread--;
if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
&& procmsg_msg_has_marked_parent(msginfo))
summaryview->unreadmarked--;
summaryview->deleted--;
}
- if (!MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
- summaryview->unread++;
-
if (!MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
&& procmsg_msg_has_marked_parent(msginfo))
summaryview->unreadmarked++;
GtkCTreeNode *node;
if (!item) return;
-#if 0
- if (!item || item->folder->type == F_NEWS) return;
-#endif
if (summary_is_locked(summaryview)) return;
SummaryView *summaryview)
{
GtkCTreeNode *found;
- MsgInfo *msginfo = GTK_CTREE_ROW(node)->row.data;
+ MsgInfo *msginfo;
MsgInfo *dup_msginfo;
+
+ msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
- if (!msginfo->msgid || !*msginfo->msgid) return;
+ if (!msginfo || !msginfo->msgid || !*msginfo->msgid) return;
found = g_hash_table_lookup(summaryview->msgid_table, msginfo->msgid);
void summary_select_all(SummaryView *summaryview)
{
- if (summaryview->messages >= 500) {
+ if (!summaryview->folder_item) return;
+
+ if (summaryview->folder_item->total_msgs >= 500) {
STATUSBAR_PUSH(summaryview->mainwin,
_("Selecting all messages..."));
main_window_cursor_wait(summaryview->mainwin);
gtk_clist_select_all(GTK_CLIST(summaryview->ctree));
- if (summaryview->messages >= 500) {
+ if (summaryview->folder_item->total_msgs >= 500) {
STATUSBAR_POP(summaryview->mainwin);
main_window_cursor_normal(summaryview->mainwin);
}
if (msginfo && MSG_IS_MOVE(msginfo->flags) && msginfo->to_folder) {
summaryview->mlist =
- g_slist_append(summaryview->mlist, msginfo);
+ g_slist_prepend(summaryview->mlist, msginfo);
gtk_ctree_node_set_row_data(ctree, node, NULL);
if (msginfo->msgid && *msginfo->msgid &&
summaryview);
if (summaryview->mlist) {
+ summaryview->mlist = g_slist_reverse(summaryview->mlist);
procmsg_copy_messages(summaryview->mlist);
g_slist_free(summaryview->mlist);
if (msginfo && MSG_IS_COPY(msginfo->flags) && msginfo->to_folder) {
summaryview->mlist =
- g_slist_append(summaryview->mlist, msginfo);
+ g_slist_prepend(summaryview->mlist, msginfo);
procmsg_msginfo_unset_flags(msginfo, 0, MSG_COPY);
summary_set_row_marks(summaryview, node);
folder_item_remove_msgs(summaryview->folder_item,
summaryview->mlist);
else
- folder_item_move_msgs_with_dest(trash, summaryview->mlist);
+ folder_item_move_msgs(trash, summaryview->mlist);
for (cur = summaryview->mlist; cur != NULL; cur = cur->next)
procmsg_msginfo_free((MsgInfo *)cur->data);
/* callback functions */
-static void summary_toggle_pressed(GtkWidget *eventbox, GdkEventButton *event,
+static gint summary_toggle_pressed(GtkWidget *eventbox, GdkEventButton *event,
SummaryView *summaryview)
{
- if (!event) return;
-
- summary_toggle_view(summaryview);
+ if (event)
+ summary_toggle_view(summaryview);
+ return TRUE;
}
static void summary_button_pressed(GtkWidget *ctree, GdkEventButton *event,
#define BREAK_ON_MODIFIER_KEY() \
if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) != 0) break
-#define RETURN_IF_LOCKED() \
- if (summaryview->mainwin->lock_count) return
-
-static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
+static gint summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
SummaryView *summaryview)
{
GtkCTree *ctree = GTK_CTREE(widget);
MessageView *messageview;
TextView *textview;
- if (summary_is_locked(summaryview)) return;
- if (!event) return;
+ if (summary_is_locked(summaryview)) return TRUE;
+ if (!event) return TRUE;
switch (event->keyval) {
case GDK_Left: /* Move focus */
case GDK_Escape:
gtk_widget_grab_focus(summaryview->folderview->ctree);
- return;
+ return TRUE;
default:
break;
}
if (node)
gtk_sctree_select(GTK_SCTREE(ctree), node);
else
- return;
+ return TRUE;
}
messageview = summaryview->messageview;
- if (messageview->type == MVIEW_MIME &&
- gtk_notebook_get_current_page
- (GTK_NOTEBOOK(messageview->mimeview->notebook)) == 1)
- textview = messageview->mimeview->textview;
- else
- textview = messageview->textview;
+ textview = messageview->mimeview->textview;
switch (event->keyval) {
case GDK_space: /* Page down or go to the next */
- if (summaryview->displayed != summaryview->selected) {
- summary_display_msg(summaryview,
- summaryview->selected);
- break;
- }
- if (!textview_scroll_page(textview, FALSE))
- summary_select_next_unread(summaryview);
+ if (event->state & GDK_SHIFT_MASK)
+ textview_scroll_page(textview, TRUE);
+ else {
+ if (summaryview->displayed != summaryview->selected) {
+ summary_display_msg(summaryview,
+ summaryview->selected);
+ break;
+ }
+ if (!textview_scroll_page(textview, FALSE))
+ summary_select_next_unread(summaryview);
+ }
break;
case GDK_BackSpace: /* Page up */
textview_scroll_page(textview, TRUE);
summary_mark_as_unread(summaryview);
break;
case GDK_Delete:
- RETURN_IF_LOCKED();
BREAK_ON_MODIFIER_KEY();
summary_delete(summaryview);
break;
default:
break;
}
+ return TRUE;
}
-static void summary_searchbar_pressed(GtkWidget *widget, GdkEventKey *event,
+static gint summary_searchbar_pressed(GtkWidget *widget, GdkEventKey *event,
SummaryView *summaryview)
{
if (event != NULL && event->keyval == GDK_Return)
summary_show(summaryview, summaryview->folder_item);
+ return TRUE;
}
static void summary_searchbar_focus_evt(GtkWidget *widget, GdkEventFocus *event,
{
SummaryView *summaryview = (SummaryView *)data;
GtkWidget *hbox= summaryview->hbox_search;
- GtkAllocation size = hbox->allocation;
- GtkAllocation msgview_size = summaryview->messageview->vbox->allocation;
- GtkAllocation parent_size = summaryview->vbox->allocation;
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w))) {
prefs_common.show_searchbar = TRUE;
gtk_widget_show(hbox);
- if (!prefs_common.sep_msg && messageview_is_visible(summaryview->messageview)
- && msgview_size.height > 1 && parent_size.height > 1) {
- gtk_widget_set_usize(GTK_WIDGET(summaryview->messageview->vbox),
- -1,msgview_size.height - size.height - SUMMARY_VBOX_SPACING);
- gtk_widget_set_usize(GTK_WIDGET(summaryview->vbox),
- -1,parent_size.height + size.height + SUMMARY_VBOX_SPACING);
- gtk_paned_set_position(GTK_PANED(summaryview->vbox->parent),-1);
- }
} else {
prefs_common.show_searchbar = FALSE;
gtk_widget_hide(hbox);
- if (!prefs_common.sep_msg && messageview_is_visible(summaryview->messageview)
- && msgview_size.height > 1 && parent_size.height > 1) {
- gtk_widget_set_usize(GTK_WIDGET(summaryview->messageview->vbox),
- -1,msgview_size.height + size.height + SUMMARY_VBOX_SPACING);
- gtk_widget_set_usize(GTK_WIDGET(summaryview->vbox),
- -1,parent_size.height - size.height - SUMMARY_VBOX_SPACING);
- gtk_paned_set_position(GTK_PANED(summaryview->vbox->parent),-1);
- }
}
}
switch (column < 0 ? column : summaryview->col_state[column].type) {
case S_COL_MARK:
- if (MSG_IS_MARKED(msginfo->flags)) {
- summary_unmark_row(summaryview, row);
- } else
- summary_mark_row(summaryview, row);
+ if (!MSG_IS_DELETED(msginfo->flags) &&
+ !MSG_IS_MOVE(msginfo->flags) &&
+ !MSG_IS_COPY(msginfo->flags)) {
+ if (MSG_IS_MARKED(msginfo->flags)) {
+ summary_unmark_row(summaryview, row);
+ } else {
+ summary_mark_row(summaryview, row);
+ }
+ }
break;
case S_COL_STATUS:
if (MSG_IS_UNREAD(msginfo->flags)) {
static void summary_start_drag(GtkWidget *widget, gint button, GdkEvent *event,
SummaryView *summaryview)
{
- GtkTargetList *list;
GdkDragContext *context;
g_return_if_fail(summaryview != NULL);
g_return_if_fail(summaryview->folder_item->folder != NULL);
if (summaryview->selected == NULL) return;
- list = gtk_target_list_new(summary_drag_types, 1);
-
- context = gtk_drag_begin(widget, list,
+ context = gtk_drag_begin(widget, summaryview->target_list,
GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_DEFAULT, button, event);
gtk_drag_set_icon_default(context);
}
static gint summary_cmp_by_simplified_subject
(GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2)
{
- const PrefsFolderItem *prefs;
+ const FolderItemPrefs *prefs;
const gchar *str1, *str2;
const GtkCListRow *r1 = (const GtkCListRow *) ptr1;
const GtkCListRow *r2 = (const GtkCListRow *) ptr2;
GString *line;
gpointer key;
gpointer value;
- Folder *mff = msginfo->folder->folder;
+ Folder *mff;
- if (mff->account->mark_crosspost_read && MSG_IS_NEWS(msginfo->flags)) {
+ g_return_if_fail(msginfo != NULL);
+ g_return_if_fail(msginfo->folder != NULL);
+ g_return_if_fail(msginfo->folder->folder != NULL);
+ mff = msginfo->folder->folder;
+ g_return_if_fail(mff->klass->type != F_NEWS);
+
+ if (mff->account->mark_crosspost_read) {
line = g_string_sized_new(128);
g_string_sprintf(line, "%s:%d", msginfo->folder->path, msginfo->msgnum);
debug_print("nfcp: checking <%s>", line->str);
msginfo = gtk_ctree_node_get_row_data(ctree, row);
- if (MSG_IS_NEW(msginfo->flags))
- summaryview->newmsgs--;
- if (MSG_IS_UNREAD(msginfo->flags))
- summaryview->unread--;
if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
summaryview->unreadmarked--;
msginfo = gtk_ctree_node_get_row_data(ctree, row);
- if (MSG_IS_NEW(msginfo->flags))
- summaryview->newmsgs++;
- if (MSG_IS_UNREAD(msginfo->flags))
- summaryview->unread++;
if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
summaryview->unreadmarked++;
g_return_val_if_fail(msginfo_update != NULL, TRUE);
g_return_val_if_fail(summaryview != NULL, FALSE);
- node = gtk_ctree_find_by_row_data(GTK_CTREE(summaryview->ctree), NULL, msginfo_update->msginfo);
-
- if (node)
- summary_set_row_marks(summaryview, node);
+ if (msginfo_update->flags & MSGINFO_UPDATE_FLAGS) {
+ node = gtk_ctree_find_by_row_data(GTK_CTREE(summaryview->ctree), NULL, msginfo_update->msginfo);
+
+ if (node)
+ summary_set_row_marks(summaryview, node);
+ }
return FALSE;
}
projects / claws.git / blobdiff