GtkCTreeNode *row,
gint column,
SummaryView *summaryview);
+static void summary_unselected (GtkCTree *ctree,
+ GtkCTreeNode *row,
+ gint column,
+ SummaryView *summaryview);
static void summary_col_resized (GtkCList *clist,
gint column,
gint width,
}; /* see also list in menu_connect_identical_items() in menu.c if this changes */
static const gchar *const col_label[N_SUMMARY_COLS] = {
- N_("M"), /* S_COL_MARK */
+ "", /* S_COL_MARK */
N_("S"), /* S_COL_STATUS */
"", /* S_COL_MIME */
N_("Subject"), /* S_COL_SUBJECT */
N_("To"), /* S_COL_TO */
N_("Date"), /* S_COL_DATE */
N_("Size"), /* S_COL_SIZE */
- N_("No."), /* S_COL_NUMBER */
+ N_("#"), /* S_COL_NUMBER */
N_("Score"), /* S_COL_SCORE */
- N_("L") /* S_COL_LOCKED */
+ "", /* S_COL_LOCKED */
};
#define START_LONG_OPERATION(summaryview) { \
gtk_tooltips_set_tip(GTK_TOOLTIPS(search_tip),
toggle_search,
- _("Toggle quick-search bar"), NULL);
+ _("Toggle quick search bar"), NULL);
gtk_box_pack_start(GTK_BOX(hbox), toggle_search, FALSE, FALSE, 2);
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+ if (!summaryview->folder_item)
+ return;
if (node) {
gtkut_ctree_expand_parent_all(ctree, node);
if (do_refresh) {
GTK_EVENTS_FLUSH();
gtk_widget_grab_focus(GTK_WIDGET(ctree));
- gtk_ctree_node_moveto(ctree, node, -1, 0.5, 0);
+ if (GTK_CTREE_ROW(node) == NULL) {
+ g_warning("crash avoidance hack 1\n");
+ return;
+ }
+ if (((GtkCListRow *)(GTK_CTREE_ROW(node)))->state < GTK_STATE_NORMAL
+ || ((GtkCListRow *)(GTK_CTREE_ROW(node)))->state > GTK_STATE_INSENSITIVE) {
+ g_warning("crash avoidance hack 2\n");
+ return;
+ }
+ gtk_ctree_node_moveto(ctree, node, 0, 0.5, 0);
}
summary_unselect_all(summaryview);
if (display_msg && summaryview->displayed == node)
g_hash_table_destroy(subject_table);
- gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
+ gtk_ctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
gtk_clist_thaw(clist);
gchar *spc;
gchar *itstr;
GList *rowlist, *cur;
- guint n_selected = 0;
- off_t sel_size = 0;
+ guint n_selected = 0, n_new = 0, n_unread = 0, n_total = 0;
+ off_t sel_size = 0, n_size = 0;
MsgInfo *msginfo;
gchar *name;
else {
sel_size += msginfo->size;
n_selected++;
+
+ }
+ }
+
+ if (summaryview->folder_item->hide_read_msgs
+ || quicksearch_is_active(summaryview->quicksearch)) {
+ rowlist = GTK_CLIST(summaryview->ctree)->row_list;
+ for (cur = rowlist; cur != NULL && cur->data != NULL; cur = cur->next) {
+ msginfo = gtk_ctree_node_get_row_data
+ (GTK_CTREE(summaryview->ctree),
+ GTK_CTREE_NODE(cur));
+ if (!msginfo)
+ g_warning("summary_status_show(): msginfo == NULL\n");
+ else {
+ n_size += msginfo->size;
+ n_total++;
+ if (MSG_IS_NEW(msginfo->flags))
+ n_new++;
+ if (MSG_IS_UNREAD(msginfo->flags))
+ n_unread++;
+ }
}
+ } else {
+ n_new = summaryview->folder_item->new_msgs;
+ n_unread = summaryview->folder_item->unread_msgs;
+ n_total = summaryview->folder_item->total_msgs;
+ n_size = summaryview->total_size;
}
name = folder_item_get_name(summaryview->folder_item);
str = g_strdup_printf(_("%d new, %d unread, %d total (%s)"),
- summaryview->folder_item->new_msgs,
- summaryview->folder_item->unread_msgs,
- summaryview->folder_item->total_msgs,
- to_human_readable(summaryview->total_size));
+ n_new, n_unread, n_total,
+ to_human_readable(n_size));
gtk_label_set_text(GTK_LABEL(summaryview->statlabel_msgs), str);
g_free(str);
}
gint pos;
const gchar *title;
SummaryColumnType type;
- gboolean single_char;
GtkJustification justify;
static FolderSortKey sort_by[N_SUMMARY_COLS] = {
type = summaryview->col_state[pos].type;
/* CLAWS: mime and unread are single char headers */
- single_char = (type == S_COL_MIME || type == S_COL_STATUS);
justify = (type == S_COL_NUMBER || type == S_COL_SIZE)
? GTK_JUSTIFY_RIGHT : GTK_JUSTIFY_LEFT;
else
title = col_label[type];
break;
- /* CLAWS: dummies for mark and locked headers */
- case S_COL_MARK:
- case S_COL_LOCKED:
- title = "";
- break;
default:
title = gettext(col_label[type]);
}
gtk_widget_show(label);
gtk_clist_set_column_widget(clist, pos, label);
continue;
- } else if (single_char) {
+ } else if (type == S_COL_MARK) {
+ label = gtk_image_new_from_pixmap(markxpm, markxpmmask);
+ gtk_widget_show(label);
+ gtk_clist_set_column_widget(clist, pos, label);
+ continue;
+ } else if (type == S_COL_LOCKED) {
+ label = gtk_image_new_from_pixmap(lockedxpm, lockedxpmmask);
+ gtk_widget_show(label);
+ gtk_clist_set_column_widget(clist, pos, label);
+ continue;
+ } else if (type == S_COL_STATUS) {
gtk_clist_set_column_title(clist, pos, title);
continue;
}
- /* CLAWS: changed so that locked and mark headers
- * show a pixmap instead of single character */
hbox = gtk_hbox_new(FALSE, 4);
-
- if (type == S_COL_LOCKED)
- label = gtk_pixmap_new(lockedxpm, lockedxpmmask);
- else if (type == S_COL_MARK)
- label = gtk_pixmap_new(markxpm, markxpmmask);
- else
- label = gtk_label_new(title);
-
+ label = gtk_label_new(title);
+
if (justify == GTK_JUSTIFY_RIGHT)
gtk_box_pack_end(GTK_BOX(hbox), label,
FALSE, FALSE, 0);
gtk_sctree_sort_recursive(ctree, NULL);
- gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
+ gtk_ctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
main_window_cursor_normal(summaryview->mainwin);
gtk_clist_thaw(clist);
summary_set_header(summaryview, text, msginfo);
- gtk_ctree_set_node_info(ctree, cnode, text[col_pos[S_COL_SUBJECT]], 2,
+ gtk_sctree_set_node_info(ctree, cnode, text[col_pos[S_COL_SUBJECT]], 2,
NULL, NULL, NULL, NULL, FALSE,
gnode->parent->parent ? TRUE : FALSE);
#define SET_TEXT(col) \
summary_set_header(summaryview, text, msginfo);
- node = gtk_ctree_insert_node
+ node = gtk_sctree_insert_node
(ctree, NULL, node, text, 2,
- NULL, NULL, NULL, NULL, FALSE, FALSE);
+ NULL, NULL, NULL, NULL,
+ FALSE, FALSE);
GTKUT_CTREE_NODE_SET_ROW_DATA(node, msginfo);
summary_set_marks_func(ctree, node, summaryview);
summary_update_status(summaryview);
summary_status_show(summaryview);
- gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
+ gtk_ctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
summary_unlock(summaryview);
summaryview->thread_collapsed = FALSE;
- gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
+ gtk_ctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
}
void summary_collapse_threads(SummaryView *summaryview)
summaryview->thread_collapsed = TRUE;
- gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
+ gtk_ctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
}
void summary_filter(SummaryView *summaryview, gboolean selected_only)
GTK_CTREE_EXPANDER_TRIANGLE);
#endif
gtk_ctree_set_indent(GTK_CTREE(ctree), 12);
- g_object_set_data(G_OBJECT(ctree), "user_data", summaryview);
+ g_object_set_data(G_OBJECT(ctree), "summaryview", (gpointer)summaryview);
for (pos = 0; pos < N_SUMMARY_COLS; pos++) {
GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(ctree)->column[pos].button,
g_signal_connect(G_OBJECT(ctree), "tree_select_row",
G_CALLBACK(summary_selected), summaryview);
+ g_signal_connect(G_OBJECT(ctree), "tree_unselect_row",
+ G_CALLBACK(summary_unselected), summaryview);
g_signal_connect(G_OBJECT(ctree), "button_press_event",
G_CALLBACK(summary_button_pressed),
summaryview);
{
GtkWidget *ctree;
GtkWidget *scrolledwin = summaryview->scrolledwin;
- GtkWidget *pixmap;
FolderItem *item;
guint selected_msgnum = summary_get_msgnum(summaryview, summaryview->selected);
guint displayed_msgnum = summary_get_msgnum(summaryview, summaryview->displayed);
summaryview->ctree = ctree = summary_ctree_create(summaryview);
summary_set_fonts(summaryview);
- pixmap = gtk_image_new_from_pixmap(clipxpm, clipxpmmask);
- gtk_clist_set_column_widget(GTK_CLIST(ctree),
- summaryview->col_pos[S_COL_MIME], pixmap);
- gtk_widget_show(pixmap);
+ summary_set_column_titles(summaryview);
gtk_scrolled_window_set_hadjustment(GTK_SCROLLED_WINDOW(scrolledwin),
GTK_CLIST(ctree)->hadjustment);
gtk_scrolled_window_set_vadjustment(GTK_SCROLLED_WINDOW(scrolledwin),
case GDK_l:
case GDK_c:
if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) == 0) {
+ g_signal_stop_emission_by_name(G_OBJECT(widget),
+ "key_press_event");
mimeview_pass_key_press_event(messageview->mimeview,
event);
break;
summary_set_row_marks(summaryview, node);
}
+static void summary_unselected(GtkCTree *ctree, GtkCTreeNode *row,
+ gint column, SummaryView *summaryview)
+{
+ if (summary_is_locked(summaryview)
+ || GTK_SCTREE(ctree)->selecting_range) {
+ return;
+ }
+
+ summary_status_show(summaryview);
+}
+
static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
gint column, SummaryView *summaryview)
{
source.item = summaryview->folder_item;
source.update_flags = F_ITEM_UPDATE_NAME;
+ source.msg = NULL;
hooks_invoke(FOLDER_ITEM_UPDATE_HOOKLIST, &source);
summary_show(summaryview, summaryview->folder_item);
}