*
* 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
#include "defs.h"
static void folderview_search_cb (FolderView *folderview,
guint action,
GtkWidget *widget);
+static void folderview_run_processing_cb(FolderView *folderview,
+ guint action,
+ GtkWidget *widget);
static void folderview_property_cb (FolderView *folderview,
guint action,
{
{N_("/Mark all re_ad"), NULL, mark_all_read_cb, 0, NULL},
{"/---", NULL, NULL, 0, "<Separator>"},
+ {N_("/Run processing rules"), NULL, folderview_run_processing_cb, 0, NULL},
{N_("/_Search folder..."), NULL, folderview_search_cb, 0, NULL},
{N_("/_Properties..."), NULL, folderview_property_cb, 0, NULL},
{N_("/Process_ing..."), NULL, folderview_processing_cb, 0, NULL},
static void folderview_column_set_titles(FolderView *folderview)
{
GtkWidget *ctree = folderview->ctree;
+ GtkWidget *label_folder;
GtkWidget *label_new;
GtkWidget *label_unread;
GtkWidget *label_total;
+ GtkWidget *hbox_folder;
GtkWidget *hbox_new;
GtkWidget *hbox_unread;
GtkWidget *hbox_total;
&unreadxpm, &unreadxpmmask);
stock_pixmap_gdk(ctree, STOCK_PIXMAP_READ,
&readxpm, &readxpmmask);
-
+
+ label_folder = gtk_label_new(_("Folder"));
label_new = gtk_image_new_from_pixmap(newxpm, newxpmmask);
label_unread = gtk_image_new_from_pixmap(unreadxpm, unreadxpmmask);
label_total = gtk_image_new_from_pixmap(readxpm, readxpmmask);
gtk_clist_column_titles_active(GTK_CLIST(ctree));
+ hbox_folder = gtk_hbox_new(FALSE, 4);
hbox_new = gtk_hbox_new(FALSE, 4);
hbox_unread = gtk_hbox_new(FALSE, 4);
hbox_total = gtk_hbox_new(FALSE, 4);
/* left justified */
+ gtk_box_pack_start(GTK_BOX(hbox_folder), label_folder, TRUE, TRUE, 0);
+ gtk_misc_set_alignment (GTK_MISC (label_folder), 0, 0.5);
gtk_box_pack_start(GTK_BOX(hbox_new), label_new, TRUE, TRUE, 0);
gtk_misc_set_alignment (GTK_MISC (label_new), 1, 0.5);
gtk_box_pack_start(GTK_BOX(hbox_unread), label_unread, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(hbox_total), label_total, TRUE, TRUE, 0);
gtk_misc_set_alignment (GTK_MISC (label_total), 1, 0.5);
+ gtk_widget_show_all(hbox_folder);
gtk_widget_show_all(hbox_new);
gtk_widget_show_all(hbox_unread);
gtk_widget_show_all(hbox_total);
+#ifdef MAEMO
+ gtk_widget_set_size_request(hbox_new, -1, 20);
+ gtk_widget_set_size_request(hbox_unread, -1, 20);
+ gtk_widget_set_size_request(hbox_total, -1, 20);
+#endif
+
+ gtk_clist_set_column_widget(GTK_CLIST(ctree),col_pos[F_COL_FOLDER],hbox_folder);
gtk_clist_set_column_widget(GTK_CLIST(ctree),col_pos[F_COL_NEW],hbox_new);
gtk_clist_set_column_widget(GTK_CLIST(ctree),col_pos[F_COL_UNREAD],hbox_unread);
gtk_clist_set_column_widget(GTK_CLIST(ctree),col_pos[F_COL_TOTAL],hbox_total);
+#ifdef MAEMO
+ GTK_EVENTS_FLUSH();
+#endif
+
gtk_sctree_set_column_tooltip(GTK_SCTREE(ctree), col_pos[F_COL_NEW], _("New"));
gtk_sctree_set_column_tooltip(GTK_SCTREE(ctree), col_pos[F_COL_UNREAD], _("Unread"));
gtk_sctree_set_column_tooltip(GTK_SCTREE(ctree), col_pos[F_COL_TOTAL], _("Total"));
ctree = gtk_sctree_new_with_titles(N_FOLDER_COLS, col_pos[F_COL_FOLDER],
titles);
+ if (prefs_common.show_col_headers == FALSE)
+ gtk_clist_column_titles_hide(GTK_CLIST(ctree));
+
+
gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_BROWSE);
gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[F_COL_NEW],
GTK_JUSTIFY_RIGHT);
folderview);
g_signal_connect(G_OBJECT(ctree), "tree_select_row",
G_CALLBACK(folderview_selected), folderview);
+#ifndef MAEMO
+ /* drag-n-dropping folders on maemo is impractical as this
+ * opens the folder almost everytime */
g_signal_connect(G_OBJECT(ctree), "start_drag",
G_CALLBACK(folderview_start_drag), folderview);
+#endif
g_signal_connect(G_OBJECT(ctree), "drag_data_get",
G_CALLBACK(folderview_drag_data_get),
folderview);
{
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_TYPE(item->folder) == F_NEWS || FOLDER_IS_LOCAL(folder)) {
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();
}
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) ||
SET_SENS("/Mark all read", item->unread_msgs >= 1);
SET_SENS("/Search folder...", item->total_msgs >= 1 &&
folderview->selected == folderview->opened);
+ SET_SENS("/Run processing rules", item->prefs->processing &&
+ item->total_msgs >= 1);
SET_SENS("/Properties...", TRUE);
SET_SENS("/Processing...", item->node->parent != NULL);
if (item == folder->trash || item == special_trash
return FALSE;
switch (event->keyval) {
+ case GDK_Right:
+#ifndef MAEMO
case GDK_Return:
+ case GDK_KP_Enter:
+#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 &&
if (folderview->opened) {
FolderItem *olditem;
- olditem = gtk_ctree_node_get_row_data(folderview->ctree, folderview->opened);
+ olditem = gtk_ctree_node_get_row_data(GTK_CTREE(folderview->ctree),
+ folderview->opened);
if (olditem) {
gchar *buf = g_strdup_printf(_("Closing Folder %s..."),
olditem->path ? olditem->path:olditem->name);
STATUSBAR_POP(folderview->mainwin);
}
}
+
+ if (folderview->opened &&
+ !GTK_CTREE_ROW(folderview->opened)->children)
+ gtk_ctree_collapse(GTK_CTREE(folderview->ctree), folderview->opened);
+
folderview->opened = NULL;
}
static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
FolderItem *item;
gchar *buf;
int res = 0;
+ GtkCTreeNode *old_opened = folderview->opened;
START_TIMING("");
folderview->selected = row;
/* Save cache for old folder */
/* We don't want to lose all caches if sylpheed crashed */
+ /* 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)
summary_search(folderview->summaryview);
}
+static void folderview_run_processing_cb(FolderView *folderview, guint action,
+ GtkWidget *widget)
+{
+ GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+ FolderItem *item;
+
+ if (!folderview->selected) return;
+
+ item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
+ g_return_if_fail(item != NULL);
+ g_return_if_fail(item->folder != NULL);
+
+ folder_item_apply_processing(item);
+}
+
static void folderview_property_cb(FolderView *folderview, guint action,
GtkWidget *widget)
{
if (prefs_common.warn_dnd) {
buf = g_strdup_printf(copy ? _("Do you really want to copy folder '%s' in '%s' ?"):
- _("Do you really want to make folder '%s' a sub-folder of '%s' ?"),
+ _("Do you really want to make folder '%s' a subfolder of '%s' ?"),
from_folder->name, to_folder->name);
status = alertpanel_full(copy ? _("Copy folder"):_("Move folder"), buf,
GTK_STOCK_NO, GTK_STOCK_YES, NULL, TRUE,
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)
projects / claws.git / blobdiff