g_signal_connect(G_OBJECT(ctree), "button_press_event",
G_CALLBACK(folderview_button_pressed),
folderview);
+#ifndef MAEMO
g_signal_connect(G_OBJECT(ctree), "popup-menu",
G_CALLBACK(folderview_popup_menu), folderview);
+#else
+ gtk_widget_tap_and_hold_setup(GTK_WIDGET(ctree), NULL, NULL,
+ GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS);
+ g_signal_connect(G_OBJECT(ctree), "tap-and-hold",
+ G_CALLBACK(folderview_popup_menu), folderview);
+#endif
g_signal_connect(G_OBJECT(ctree), "button_release_event",
G_CALLBACK(folderview_button_released),
folderview);
folderview->target_list = gtk_target_list_new(folderview_drag_types, 2);
folderview_list = g_list_append(folderview_list, folderview);
+ folderview->deferred_refresh_id = -1;
return folderview;
}
}
}
+static gboolean folderview_defer_set(gpointer data)
+{
+ FolderView *folderview = (FolderView *)data;
+ MainWindow *mainwin = folderview->mainwin;
+
+ if (!mainwin)
+ return FALSE;
+ if (mainwin->lock_count)
+ return TRUE;
+
+ printf("doing deferred folderview_set now\n");
+ folderview_set(folderview);
+
+ folderview->deferred_refresh_id = -1;
+ return FALSE;
+}
+
void folderview_set(FolderView *folderview)
{
GtkCTree *ctree = GTK_CTREE(folderview->ctree);
if (!mainwin)
return;
+ if (mainwin->lock_count) {
+ if (folderview->deferred_refresh_id == -1)
+ folderview->deferred_refresh_id =
+ g_timeout_add(500, folderview_defer_set, folderview);
+ printf("deferred folderview_set\n");
+ return;
+ }
+
+ inc_lock();
debug_print("Setting folder info...\n");
STATUSBAR_PUSH(mainwin, _("Setting folder info..."));
gtk_clist_thaw(GTK_CLIST(ctree));
main_window_cursor_normal(mainwin);
STATUSBAR_POP(mainwin);
+ inc_unlock();
}
void folderview_set_all(void)
{
GtkCTree *ctree = GTK_CTREE(folderview->ctree);
GtkCTreeNode *node = NULL;
- SelectOnEntry last_sel = prefs_common.select_on_entry;
+ EntryAction last_summary_select_prio = prefs_common.summary_select_prio[0];
gboolean last_open = prefs_common.always_show_msg;
- prefs_common.select_on_entry = SELECTONENTRY_MNU;
+ prefs_common.summary_select_prio[0] = ACTION_MARKED;
prefs_common.always_show_msg = TRUE;
if ((node = folderview_find_next_marked(ctree, folderview->opened))
folderview_select_node(folderview, node);
out:
- prefs_common.select_on_entry = last_sel;
+ prefs_common.summary_select_prio[0] = last_summary_select_prio;
prefs_common.always_show_msg = last_open;
}
{
GtkCTree *ctree = GTK_CTREE(folderview->ctree);
GtkCTreeNode *node = NULL;
- SelectOnEntry last_sel = prefs_common.select_on_entry;
+ EntryAction last_summary_select_prio = prefs_common.summary_select_prio[0];
gboolean last_open = prefs_common.always_show_msg;
- prefs_common.select_on_entry = SELECTONENTRY_UNM;
+ prefs_common.summary_select_prio[0] = ACTION_UNREAD;
prefs_common.always_show_msg = force_open ? TRUE : last_open;
if ((node = folderview_find_next_unread(ctree, folderview->opened))
folderview_select_node(folderview, node);
out:
- prefs_common.select_on_entry = last_sel;
+ prefs_common.summary_select_prio[0] = last_summary_select_prio;
prefs_common.always_show_msg = last_open;
}
{
GtkCTree *ctree = GTK_CTREE(folderview->ctree);
GtkCTreeNode *node = NULL;
- SelectOnEntry last_sel = prefs_common.select_on_entry;
+ EntryAction last_summary_select_prio = prefs_common.summary_select_prio[0];
gboolean last_open = prefs_common.always_show_msg;
- prefs_common.select_on_entry = SELECTONENTRY_NUM;
+ prefs_common.summary_select_prio[0] = ACTION_NEW;
prefs_common.always_show_msg = TRUE;
if ((node = folderview_find_next_new(ctree, folderview->opened))
folderview_select_node(folderview, node);
out:
- prefs_common.select_on_entry = last_sel;
+ prefs_common.summary_select_prio[0] = last_summary_select_prio;
prefs_common.always_show_msg = last_open;
}
GTK_SCROLLED_WINDOW(folderview->scrolledwin));
gtk_adjustment_set_value(pos, height);
}
- gtk_widget_destroy(window);
+ label_window_destroy(window);
inc_unlock();
}
GTK_SCROLLED_WINDOW(folderview->scrolledwin));
gtk_adjustment_set_value(pos, height);
}
- gtk_widget_destroy(window);
+ label_window_destroy(window);
inc_unlock();
}
if (folder) {
summaryview_unlock(folderview->summaryview, item);
if (FOLDER_TYPE(item->folder) == F_NEWS || FOLDER_IS_LOCAL(folder)) {
- log_error(_("Couldn't scan folder %s\n"),
+ log_error(LOG_PROTOCOL, _("Couldn't scan folder %s\n"),
item->path ? item->path:item->name);
+ STATUSBAR_POP(folderview->mainwin);
continue;
} else if (!FOLDER_IS_LOCAL(folder)) {
STATUSBAR_POP(folderview->mainwin);
folder_write_list();
folderview_set_all();
- gtk_widget_destroy(window);
+ label_window_destroy(window);
main_window_unlock(folderview->mainwin);
inc_unlock();
}
mask = openmask = searchmask;
}
- if (folder_has_parent_of_type(item, F_QUEUE) && item->total_msgs > 0 &&
- prefs_common.display_folder_unread) {
- str = g_strdup_printf("%s (%d%s)", name, item->total_msgs,
- add_unread_mark ? "+" : "");
- gtk_sctree_set_node_info(ctree, node, str, FOLDER_SPACING,
- xpm, mask, openxpm, openmask,
- FALSE, GTK_CTREE_ROW(node)->expanded);
- g_free(str);
- } else if (((item->unread_msgs > 0 || add_unread_mark) &&
- prefs_common.display_folder_unread)
- || add_sub_match_mark) {
-
- if (item->unread_msgs > 0)
- str = g_strdup_printf("%s (%d%s%s)", name, item->unread_msgs,
- add_unread_mark || add_sub_match_mark ? "+" : "",
- item->unreadmarked_msgs > 0 ? "!":"");
- else
- str = g_strdup_printf("%s (+)", name);
- gtk_sctree_set_node_info(ctree, node, str, FOLDER_SPACING,
- xpm, mask, openxpm, openmask,
- FALSE, GTK_CTREE_ROW(node)->expanded);
- g_free(str);
+ str = NULL;
+ if (prefs_common.display_folder_unread) {
+ if (folder_has_parent_of_type(item, F_QUEUE)) {
+ /* only total_msgs matters here */
+ if (item->total_msgs > 0) {
+ /* show total number (should be equal to the unread number)
+ and signs if any */
+ str = g_strdup_printf("%s (%d%s%s)",
+ name, item->total_msgs,
+ (add_unread_mark || add_sub_match_mark) ? "+" : "",
+ (item->unreadmarked_msgs > 0) ? "!" : "");
+ }
} else {
- str = g_strdup_printf("%s%s", name,
- item->unreadmarked_msgs > 0 ? " (!)":"");
-
+ if (prefs_common.display_folder_unread == 1) {
+ if (item->unread_msgs > 0) {
+ /* show unread number and signs */
+ str = g_strdup_printf("%s (%d%s%s)",
+ name, item->unread_msgs,
+ (add_unread_mark || add_sub_match_mark) ? "+" : "",
+ (item->unreadmarked_msgs > 0) ? "!" : "");
+ }
+ } else {
+ if (item->total_msgs > 0) {
+ /* show unread number, total number and signs if any */
+ str = g_strdup_printf("%s (%d/%d%s%s)",
+ name, item->unread_msgs, item->total_msgs,
+ (add_unread_mark || add_sub_match_mark) ? "+" : "",
+ (item->unreadmarked_msgs > 0) ? "!" : "");
+ }
+ }
+ }
+ if ((str == NULL) &&
+ (add_unread_mark || add_sub_match_mark || (item->unreadmarked_msgs > 0))) {
+ /* no unread/total numbers, but at least one sign */
+ str = g_strdup_printf("%s (%s%s)",
+ name,
+ (add_unread_mark || add_sub_match_mark) ? "+" : "",
+ (item->unreadmarked_msgs > 0) ? "!" : "");
+ }
+ }
+ if (str == NULL) {
+ /* last fallback, folder name only or with ! sign */
+ str = g_strdup_printf("%s%s",
+ name, (item->unreadmarked_msgs > 0) ? " (!)" : "");
+ }
gtk_sctree_set_node_info(ctree, node, str, FOLDER_SPACING,
xpm, mask, openxpm, openmask,
FALSE, GTK_CTREE_ROW(node)->expanded);
g_free(str);
- }
g_free(name);
if (!folder_item_parent(item)) {
gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_UNREAD], "-");
gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_TOTAL], "-");
} else {
- gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_NEW], itos(item->new_msgs));
- gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_UNREAD], itos(item->unread_msgs));
- gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_TOTAL], itos(item->total_msgs));
+ gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_NEW], item->new_msgs > 0 ? itos(item->new_msgs) : prefs_common.zero_replacement);
+ gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_UNREAD], item->unread_msgs > 0 ? itos(item->unread_msgs) : prefs_common.zero_replacement);
+ gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_TOTAL], item->total_msgs > 0 ? itos(item->total_msgs) : prefs_common.zero_replacement);
}
if (folder_has_parent_of_type(item, F_OUTBOX) ||
if (update_info->update_flags & (F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_NAME))
folderview_update_node(folderview, node);
- if ((update_info->update_flags & F_ITEM_UPDATE_CONTENT) && (folderview->opened == node))
+ if ((update_info->update_flags & F_ITEM_UPDATE_CONTENT) &&
+ update_info->item == folderview->summaryview->folder_item &&
+ update_info->item != NULL)
if (!quicksearch_is_active(folderview->summaryview->quicksearch))
summary_show(folderview->summaryview, update_info->item);
}
return FALSE;
switch (event->keyval) {
+ case GDK_Right:
+#ifndef MAEMO
case GDK_Return:
+#endif
if (folderview->selected) {
folderview_select_node(folderview,
folderview->selected);
}
break;
+#ifdef MAEMO
+ case GDK_Return:
+ if (folderview->selected && GTK_CTREE_ROW(folderview->selected)->children) {
+ gtk_ctree_toggle_expansion(
+ GTK_CTREE(folderview->ctree),
+ folderview->selected);
+ }
+ break;
+#endif
case GDK_space:
if (folderview->selected) {
if (folderview->opened == folderview->selected &&
return FALSE;
}
+void folderview_close_opened(FolderView *folderview)
+{
+ if (folderview->opened) {
+ FolderItem *olditem;
+
+ olditem = gtk_ctree_node_get_row_data(folderview->ctree, folderview->opened);
+ if (olditem) {
+ gchar *buf = g_strdup_printf(_("Closing Folder %s..."),
+ olditem->path ? olditem->path:olditem->name);
+ /* will be null if we just moved the previously opened folder */
+ STATUSBAR_PUSH(folderview->mainwin, buf);
+ main_window_cursor_wait(folderview->mainwin);
+ g_free(buf);
+ summary_save_prefs_to_folderitem(folderview->summaryview, olditem);
+ summary_show(folderview->summaryview, NULL);
+ folder_item_close(olditem);
+ main_window_cursor_normal(folderview->mainwin);
+ STATUSBAR_POP(folderview->mainwin);
+ }
+ }
+
+ if (folderview->opened &&
+ !GTK_CTREE_ROW(folderview->opened)->children)
+ gtk_ctree_collapse(folderview->ctree, folderview->opened);
+
+ folderview->opened = NULL;
+}
static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
gint column, FolderView *folderview)
{
FolderItem *item;
gchar *buf;
int res = 0;
+ GtkCTreeNode *old_opened = folderview->opened;
START_TIMING("");
folderview->selected = row;
+ debug_print("newly selected %p, opened %p\n", folderview->selected,
+ folderview->opened);
if (folderview->opened == row) {
folderview->open_folder = FALSE;
END_TIMING();
gtkut_ctree_set_focus_row(ctree, folderview->opened);
gtk_ctree_select(ctree, folderview->opened);
}
+ folderview->open_folder = FALSE;
END_TIMING();
return;
}
/* Save cache for old folder */
/* We don't want to lose all caches if sylpheed crashed */
- if (folderview->opened) {
- FolderItem *olditem;
-
- olditem = gtk_ctree_node_get_row_data(ctree, folderview->opened);
- if (olditem) {
- buf = g_strdup_printf(_("Closing Folder %s..."),
- olditem->path ? olditem->path:olditem->name);
- /* will be null if we just moved the previously opened folder */
- STATUSBAR_PUSH(folderview->mainwin, buf);
- main_window_cursor_wait(folderview->mainwin);
- g_free(buf);
- summary_save_prefs_to_folderitem(folderview->summaryview, olditem);
- summary_show(folderview->summaryview, NULL);
- folder_item_close(olditem);
- main_window_cursor_normal(folderview->mainwin);
- STATUSBAR_POP(folderview->mainwin);
- }
- }
-
+ /* resets folderview->opened to NULL */
+ folderview_close_opened(folderview);
+
/* CLAWS: set compose button type: news folder items
* always have a news folder as parent */
if (item->folder)
if (!GTK_CTREE_ROW(row)->children)
gtk_ctree_expand(ctree, row);
- if (folderview->opened &&
- !GTK_CTREE_ROW(folderview->opened)->children)
- gtk_ctree_collapse(ctree, folderview->opened);
/* ungrab the mouse event */
if (GTK_WIDGET_HAS_GRAB(ctree)) {
folder_clean_cache_memory(item);
if (!opened) {
- gtkut_ctree_set_focus_row(ctree, folderview->opened);
- gtk_ctree_select(ctree, folderview->opened);
+ gtkut_ctree_set_focus_row(ctree, old_opened);
+ gtk_ctree_select(ctree, old_opened);
+ folderview->opened = old_opened;
} else {
folderview->opened = row;
if (gtk_ctree_node_is_visible(ctree, row)
_("Can't move a folder to one of its children."));
break;
case F_MOVE_FAILED_DEST_OUTSIDE_MAILBOX:
- alertpanel_error(_("Folder moving cannot be done between different mailboxes."));
+ alertpanel_error(_("A folder cannot be moved between different mailboxes."));
break;
default:
alertpanel_error(copy ? _("Copy failed!"):_("Move failed!"));
FolderItem *item1 = ((GtkCListRow *)ptr1)->data;
FolderItem *item2 = ((GtkCListRow *)ptr2)->data;
+ if (item1->order > 0 && item2->order > 0) // if we have an order item, use it
+ {
+ return item1->order - item2->order;
+ }
+
+ // if only one folder has an order it comes first
+ if (item1->order > 0)
+ {
+ return -1;
+ }
+ if (item2->order > 0)
+ {
+ return 1;
+ }
+
if (!item1->name)
return (item2->name != NULL);
if (!item2->name)
GtkCTreeNode *node;
node = gtk_ctree_find_by_row_data(GTK_CTREE(ctree), NULL, hookdata->item);
- if (node != NULL)
+ if (node != NULL) {
gtk_ctree_remove_node(GTK_CTREE(ctree), node);
+ if (folderview->selected == node)
+ folderview->selected = NULL;
+ if (folderview->opened == node)
+ folderview->opened = NULL;
+ }
} else if (hookdata->update_flags & (FOLDER_TREE_CHANGED | FOLDER_ADD_FOLDER | FOLDER_REMOVE_FOLDER))
folderview_set(folderview);
projects / claws.git / blobdiff