2005-02-18 [colin] 1.0.1cvs11.6
[claws.git] / src / folderview.c
index b0f8edd7721a64aa6d61fb335260a151c2999dc2..1ae1697d15d0bd306813b9bc61200ccad558da1c 100644 (file)
@@ -20,6 +20,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkscrolledwindow.h>
@@ -37,7 +38,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "intl.h"
 #include "main.h"
 #include "mainwindow.h"
 #include "folderview.h"
@@ -62,7 +62,7 @@
 #include "statusbar.h"
 #include "hooks.h"
 #include "folderutils.h"
-#include "common/partial_download.h"
+#include "partial_download.h"
 
 typedef enum
 {
@@ -243,7 +243,7 @@ static GtkItemFactoryEntry folderview_common_popup_entries[] =
 };
 
 static GtkItemFactoryEntry folder_view_trash_popup_entries[] = {
-       {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
+       {N_("/------"),                 NULL, NULL, 0, "<Separator>"},
        {N_("/Empty trash..."),         NULL, folderview_empty_trash_cb, 0, NULL},
 };
 
@@ -518,13 +518,15 @@ void folderview_init(FolderView *folderview)
        if (!bold_style) {
                PangoFontDescription *font_desc;
                bold_style = gtk_style_copy(gtk_widget_get_style(ctree));
-               font_desc = pango_font_description_from_string(prefs_common.boldfont);
+               font_desc = pango_font_description_from_string(BOLD_FONT);
                if (font_desc) {
                        if (bold_style->font_desc)
                                pango_font_description_free
                                        (bold_style->font_desc);
                        bold_style->font_desc = font_desc;
                }
+               pango_font_description_set_weight
+                       (bold_style->font_desc, PANGO_WEIGHT_BOLD);
                bold_color_style = gtk_style_copy(bold_style);
                bold_color_style->fg[GTK_STATE_NORMAL] = folderview->color_new;
 
@@ -586,7 +588,7 @@ static void mark_all_read_cb(FolderView *folderview, guint action,
 {
        FolderItem *item;
 
-       item = folderview_get_selected(folderview);
+       item = folderview_get_selected_item(folderview);
        if (item == NULL)
                return;
 
@@ -658,6 +660,14 @@ void folderview_select_next_unread(FolderView *folderview)
                folderview_select_node(folderview, node);
 }
 
+FolderItem *folderview_get_selected_item(FolderView *folderview)
+{
+       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+
+       if (!folderview->selected) return NULL;
+       return gtk_ctree_node_get_row_data(ctree, folderview->selected);
+}
+
 void folderview_update_msg_num(FolderView *folderview, GtkCTreeNode *row)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
@@ -983,6 +993,51 @@ static gboolean folderview_have_unread_children(FolderView *folderview,
        return FALSE;
 }
 
+static gboolean folderview_search_matching_recursive(GtkCTree *ctree,
+                                                  GtkCTreeNode *node)
+{
+       FolderItem *item;
+
+       if (node) {
+               item = gtk_ctree_node_get_row_data(ctree, node);
+               if (item) {
+                       if (item->search_match)
+                               return TRUE;
+               }
+               node = GTK_CTREE_ROW(node)->children;
+       } else
+               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+
+       while (node) {
+               if (folderview_search_matching_recursive(ctree, node) == TRUE)
+                       return TRUE;
+               node = GTK_CTREE_ROW(node)->sibling;
+       }
+
+       return FALSE;
+}
+
+static gboolean folderview_have_matching_children(FolderView *folderview,
+                                               GtkCTreeNode *node)
+{
+       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+
+       if (!node)
+               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+       if (!node)
+               return FALSE;
+
+       node = GTK_CTREE_ROW(node)->children;
+
+       while (node) {
+               if (folderview_search_matching_recursive(ctree, node) == TRUE)
+                       return TRUE;
+               node = GTK_CTREE_ROW(node)->sibling;
+       }
+
+       return FALSE;
+}
+
 static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
@@ -991,9 +1046,13 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
        FolderItem *item;
        GdkPixmap *xpm, *openxpm;
        GdkBitmap *mask, *openmask;
+       static GdkPixmap *searchicon;
+       static GdkBitmap *searchmask;
+
        gchar *name;
        gchar *str;
        gboolean add_unread_mark;
+       gboolean add_sub_match_mark;
        gboolean use_bold, use_color;
 
        item = gtk_ctree_node_get_row_data(ctree, node);
@@ -1073,11 +1132,24 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
        }
        name = folder_item_get_name(item);
 
-       if (!GTK_CTREE_ROW(node)->expanded &&
-           folderview_have_unread_children(folderview, node))
-               add_unread_mark = TRUE;
-       else
+       if (!GTK_CTREE_ROW(node)->expanded) {
+               add_unread_mark = folderview_have_unread_children(
+                                       folderview, node);
+               add_sub_match_mark = folderview_have_matching_children(
+                                       folderview, node);
+       } else {
                add_unread_mark = FALSE;
+               add_sub_match_mark = FALSE;
+       }
+
+       if (item->search_match) {
+               if (!searchicon) {
+                       stock_pixmap_gdk(folderview->ctree, STOCK_PIXMAP_QUICKSEARCH,
+                        &searchicon, &searchmask);
+               }
+               xpm = openxpm = searchicon;
+               mask = openmask = searchmask;
+       }
 
        if (item->stype == F_QUEUE && item->total_msgs > 0 &&
            prefs_common.display_folder_unread) {
@@ -1087,12 +1159,13 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                                        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) {
+       } 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_unread_mark || add_sub_match_mark ? "+" : "", 
                                              item->unreadmarked_msgs > 0 ? "!":"");
                else
                        str = g_strdup_printf("%s (+)", name);
@@ -1202,6 +1275,27 @@ void folderview_update_item(FolderItem *item, gboolean update_summary)
 }
 #endif
 
+void folderview_update_search_icon(FolderItem *item, gboolean matches)
+{
+       GList *list;
+       FolderView *folderview;
+       GtkCTree *ctree;
+       GtkCTreeNode *node;
+
+       g_return_if_fail(item != NULL);
+
+       for (list = folderview_list; list != NULL; list = list->next) {
+               folderview = (FolderView *)list->data;
+               ctree = GTK_CTREE(folderview->ctree);
+
+               node = gtk_ctree_find_by_row_data(ctree, NULL, item);
+               if (node) {
+                       item->search_match = matches;
+                       folderview_update_node(folderview, node);
+               }
+       }
+}
+
 gboolean folderview_update_item_claws(gpointer source, gpointer data)
 {
        FolderItemUpdateData *update_info = (FolderItemUpdateData *)source;
@@ -1421,7 +1515,7 @@ static gboolean folderview_button_pressed(GtkWidget *ctree, GdkEventButton *even
        SET_SENS("/Mark all read", item->unread_msgs >= 1);
        SET_SENS("/Search folder...", item->total_msgs >= 1 && 
                 folderview->selected == folderview->opened);
-       SET_SENS("/Properties...", TRUE);
+       SET_SENS("/Properties...", item->node->parent != NULL);
        SET_SENS("/Processing...", item->node->parent != NULL);
        if (item == folder->trash)
                SET_SENS("/Empty trash...", folder_item_get_msg_list(item) != NULL);
@@ -1715,9 +1809,12 @@ static void folderview_empty_trash_cb(FolderView *folderview, guint action,
        
        for (cur = mlist ; cur != NULL ; cur = cur->next) {
                MsgInfo * msginfo = (MsgInfo *) cur->data;
-               partial_mark_for_delete(msginfo);
-               procmsg_msginfo_free(msginfo);
+               /* is it partially received? (partial_recv isn't cached) */
+               if (msginfo->total_size != 0 && 
+                   msginfo->size != (off_t)msginfo->total_size)
+                       partial_mark_for_delete(msginfo);
        }
+       procmsg_msg_list_free(mlist);
 
        folder_item_remove_all_msg(item);
 }
@@ -1740,11 +1837,10 @@ static void folderview_property_cb(FolderView *folderview, guint action,
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
 
-       if (folder_item_parent(item) == NULL && item->folder->account)
-               account_open(item->folder->account);
-       else {
-               prefs_folder_item_open(item);
-       }
+       if (folder_item_parent(item) == NULL)
+               return;
+
+       prefs_folder_item_open(item);
 }
 
 static void folderview_recollapse_nodes(FolderView *folderview, GtkCTreeNode *node)
@@ -1839,7 +1935,7 @@ static gint folderview_clist_compare(GtkCList *clist,
        if (!item2->name)
                return -1;
 
-       return g_strcasecmp(item1->name, item2->name);
+       return g_utf8_collate(item1->name, item2->name);
 }
 
 static void folderview_processing_cb(FolderView *folderview, guint action,
@@ -2001,11 +2097,11 @@ static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
        FolderItem *item, *src_item = NULL;
        GtkCTreeNode *node = NULL;
        gboolean acceptable = FALSE;
-       gint height = folderview->ctree->allocation.height;
-       gint total_height = folderview->ctree->requisition.height;
        GtkAdjustment *pos = gtk_scrolled_window_get_vadjustment(
                                GTK_SCROLLED_WINDOW(folderview->scrolledwin));
-       gfloat vpos = pos->value;
+       int height = (int)pos->page_size;
+       int total_height = (int)pos->upper;
+       int vpos = (int) pos->value;
 
        if (gtk_clist_get_selection_info
                (GTK_CLIST(widget), x - 24, y - 24, &row, &column)) {
@@ -2014,7 +2110,7 @@ static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
                if (y > height - 24 && height + vpos < total_height)
                        gtk_adjustment_set_value(pos, (vpos+5 > height ? height : vpos+5));
 
-               if (y < 24 && y > 0)
+               if (y < 48 && y > 0)
                        gtk_adjustment_set_value(pos, (vpos-5 < 0 ? 0 : vpos-5));
 
                node = gtk_ctree_node_nth(GTK_CTREE(widget), row);
@@ -2152,12 +2248,6 @@ static void folderview_drag_end_cb(GtkWidget         *widget,
        folderview->nodes_to_recollapse = NULL;
 }
 
-FolderItem *folderview_get_selected(FolderView *folderview)
-{
-       return (FolderItem *) gtk_ctree_node_get_row_data(
-               GTK_CTREE(folderview->ctree), folderview->selected);
-}
-
 void folderview_register_popup(FolderViewPopup *fpopup)
 {
        GList *folderviews;