+
/* modest-tny-header-tree-view.c
*/
#include <glib/gi18n.h>
#include <tny-list-iface.h>
#include <string.h>
+#include <modest-icon-names.h>
+#include "modest-icon-factory.h"
+
/* 'private'/'protected' functions */
static void modest_tny_header_tree_view_class_init (ModestTnyHeaderTreeViewClass *klass);
static void modest_tny_header_tree_view_init (ModestTnyHeaderTreeView *obj);
static void selection_changed (GtkTreeSelection *sel, gpointer user_data);
static void column_clicked (GtkTreeViewColumn *treeviewcolumn, gpointer user_data);
-#define PIXMAP_PREFIX PREFIX "/share/modest/pixmaps/"
-
enum {
MESSAGE_SELECTED_SIGNAL,
LAST_SIGNAL
};
-enum {
- HEADER_ICON_READ = 1,
- HEADER_ICON_UNREAD,
- HEADER_ICON_ATTACH,
- HEADER_ICON_NUM
-};
-
-
typedef struct _ModestTnyHeaderTreeViewPrivate ModestTnyHeaderTreeViewPrivate;
struct _ModestTnyHeaderTreeViewPrivate {
TnyMsgFolderIface *tny_msg_folder;
TnyListIface *headers;
- GdkPixbuf *icons[HEADER_ICON_NUM];
guint sort_columns[MODEST_TNY_HEADER_TREE_VIEW_COLUMN_NUM];
GSList *columns;
parent_class = g_type_class_peek_parent (klass);
gobject_class->finalize = modest_tny_header_tree_view_finalize;
-
+
g_type_class_add_private (gobject_class, sizeof(ModestTnyHeaderTreeViewPrivate));
-
+
signals[MESSAGE_SELECTED_SIGNAL] =
g_signal_new ("message_selected",
G_TYPE_FROM_CLASS (gobject_class),
static void
msgtype_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
- GtkTreeModel *tree_model, GtkTreeIter *iter,
- GdkPixbuf *icons[HEADER_ICON_NUM])
+ GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data)
{
TnyMsgHeaderFlags flags;
GdkPixbuf *pixbuf;
gtk_tree_model_get (tree_model, iter, TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN,
&flags, -1);
- if (flags & TNY_MSG_HEADER_FLAG_SEEN)
- pixbuf = icons[HEADER_ICON_READ];
+ if (flags & TNY_MSG_HEADER_FLAG_DELETED)
+ pixbuf = modest_icon_factory_get_icon (MODEST_HEADER_ICON_DELETED);
+ else if (flags & TNY_MSG_HEADER_FLAG_SEEN)
+ pixbuf = modest_icon_factory_get_icon (MODEST_HEADER_ICON_READ);
else
- pixbuf = icons[HEADER_ICON_UNREAD];
-
- g_object_set (G_OBJECT (renderer), "pixbuf", pixbuf,
- NULL);
+ pixbuf = modest_icon_factory_get_icon (MODEST_HEADER_ICON_UNREAD);
+ if (pixbuf)
+ g_object_set (G_OBJECT (renderer), "pixbuf", pixbuf, NULL);
}
static void
-attach_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
- GtkTreeModel *tree_model, GtkTreeIter *iter, GdkPixbuf *icons[HEADER_ICON_NUM])
+attach_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
+ GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data)
{
TnyMsgHeaderFlags flags;
- GdkPixbuf *pixbuf;
+ GdkPixbuf *pixbuf = NULL;
gtk_tree_model_get (tree_model, iter, TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN,
&flags, -1);
- if (flags & TNY_MSG_HEADER_FLAG_ATTACHMENTS)
- pixbuf = icons[HEADER_ICON_ATTACH];
- else
- pixbuf = NULL;
-
- g_object_set (G_OBJECT (renderer), "pixbuf", pixbuf, NULL);
+
+ if (flags & TNY_MSG_HEADER_FLAG_ATTACHMENTS) {
+ pixbuf = modest_icon_factory_get_icon (MODEST_HEADER_ICON_ATTACH);
+ if (pixbuf)
+ g_object_set (G_OBJECT (renderer), "pixbuf", pixbuf, NULL);
+ }
}
header_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data)
{
- GObject *rendobj;
TnyMsgHeaderFlags flags;
gtk_tree_model_get (tree_model, iter, TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN,
&flags, -1);
- rendobj = G_OBJECT(renderer);
-
- if (!(flags & TNY_MSG_HEADER_FLAG_SEEN))
- g_object_set (rendobj, "weight", 800, NULL);
- else
- g_object_set (rendobj, "weight", 400, NULL); /* default, non-bold */
+
+ g_object_set (G_OBJECT(renderer),
+ "weight", (flags & TNY_MSG_HEADER_FLAG_SEEN) ? 400: 800,
+ "style", (flags & TNY_MSG_HEADER_FLAG_DELETED) ?
+ PANGO_STYLE_ITALIC : PANGO_STYLE_NORMAL,
+ NULL);
}
static void
-sender_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
- GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data)
+sender_receiver_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
+ GtkTreeModel *tree_model, GtkTreeIter *iter, gboolean is_sender)
{
GObject *rendobj;
TnyMsgHeaderFlags flags;
- gchar *from;
- gchar *address;
-
+ gchar *addr1, *addr2;
+ gint sender_receiver_col;
+
+ if (is_sender)
+ sender_receiver_col = TNY_MSG_HEADER_LIST_MODEL_FROM_COLUMN;
+ else
+ sender_receiver_col = TNY_MSG_HEADER_LIST_MODEL_TO_COLUMN;
+
gtk_tree_model_get (tree_model, iter,
- TNY_MSG_HEADER_LIST_MODEL_FROM_COLUMN, &from,
+ sender_receiver_col, &addr1,
TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags,
-1);
- rendobj = G_OBJECT(renderer);
-
+
/* simplistic --> remove <email@address> from display */
- address = g_strstr_len (from, strlen(from), "<");
- if (address) {
- address[0]='\0';
- g_object_set (rendobj, "text", from, NULL);
- g_free (from);
- }
-
- if (!(flags & TNY_MSG_HEADER_FLAG_SEEN))
- g_object_set (rendobj, "weight", 800, NULL);
- else
- g_object_set (rendobj, "weight", 400, NULL); /* default, non-bold */
+ addr2 = g_strstr_len (addr1, strlen(addr1), "<");
+ if (addr2)
+ addr2[0]='\0';
+
+ g_object_set (G_OBJECT(renderer),
+ "text", addr1,
+ "weight", (flags & TNY_MSG_HEADER_FLAG_SEEN) ? 400 : 800,
+ "style", (flags & TNY_MSG_HEADER_FLAG_DELETED) ? PANGO_STYLE_ITALIC : PANGO_STYLE_NORMAL,
+ NULL);
+
+ g_free (addr1);
}
-static void
-init_icons (GdkPixbuf *icons[HEADER_ICON_NUM])
+/* not reentrant/thread-safe */
+const gchar*
+display_date (time_t date)
{
- icons[HEADER_ICON_READ] =
- gdk_pixbuf_new_from_file (PIXMAP_PREFIX "read.xpm",NULL);
- icons[HEADER_ICON_UNREAD] =
- gdk_pixbuf_new_from_file (PIXMAP_PREFIX "unread.xpm",NULL);
- icons[HEADER_ICON_ATTACH] =
- gdk_pixbuf_new_from_file (PIXMAP_PREFIX "clip.xpm",NULL);
+ struct tm date_tm, now_tm;
+ time_t now;
+
+ const gint buf_size = 64;
+ static gchar date_buf[64]; /* buf_size is not ... */
+ static gchar now_buf[64]; /* ...const enough... */
+
+ now = time (NULL);
+
+ localtime_r(&now, &now_tm);
+ localtime_r(&date, &date_tm);
+
+ /* get today's date */
+ strftime (date_buf, buf_size, "%x", &date_tm);
+ strftime (now_buf, buf_size, "%x", &now_tm); /* today */
+
+ /* if this is today, get the time instead of the date */
+ if (strcmp (date_buf, now_buf) == 0)
+ strftime (date_buf, buf_size, _("%X"), &date_tm);
+
+ return date_buf;
}
+compact_header_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
+ GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data)
+{
+ GObject *rendobj;
+ TnyMsgHeaderFlags flags;
+ gchar *from, *subject;
+ gchar *address;
+ gchar *header;
+ time_t date;
+
+ gtk_tree_model_get (tree_model, iter,
+ TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags,
+ TNY_MSG_HEADER_LIST_MODEL_FROM_COLUMN, &from,
+ TNY_MSG_HEADER_LIST_MODEL_SUBJECT_COLUMN, &subject,
+ TNY_MSG_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN, &date,
+ -1);
+ rendobj = G_OBJECT(renderer);
+
+ /* simplistic --> remove <email@address> from display */
+ address = g_strstr_len (from, strlen(from), "<");
+ if (address)
+ address[0]='\0'; /* set a new endpoint */
+
+ header = g_strdup_printf ("%s %s\n%s", from,
+ display_date(date), subject);
+ g_object_set (G_OBJECT(renderer),
+ "text", header,
+ "weight", (flags & TNY_MSG_HEADER_FLAG_SEEN) ? 400: 800,
+ "style", (flags & TNY_MSG_HEADER_FLAG_DELETED) ?
+ PANGO_STYLE_ITALIC : PANGO_STYLE_NORMAL,
+ NULL);
+ g_free (header);
+ g_free (from);
+ g_free (subject);
+}
+
+
static GtkTreeViewColumn*
get_new_column (const gchar *name, GtkCellRenderer *renderer,
gboolean resizable, gint sort_col_id, gboolean show_as_text,
column = get_new_column (_("M"), renderer_msgtype, FALSE,
TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN,
- FALSE, (GtkTreeCellDataFunc)msgtype_cell_data, priv->icons);
+ FALSE, (GtkTreeCellDataFunc)msgtype_cell_data,
+ NULL);
break;
case MODEST_TNY_HEADER_TREE_VIEW_COLUMN_ATTACH:
column = get_new_column (_("A"), renderer_attach, FALSE,
TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN,
- FALSE, (GtkTreeCellDataFunc)attach_cell_data, priv->icons);
+ FALSE, (GtkTreeCellDataFunc)attach_cell_data,
+ NULL);
break;
case MODEST_TNY_HEADER_TREE_VIEW_COLUMN_RECEIVED_DATE:
column = get_new_column (_("Received"), renderer_header, TRUE,
TNY_MSG_HEADER_LIST_MODEL_DATE_RECEIVED_COLUMN,
- TRUE, (GtkTreeCellDataFunc)header_cell_data, NULL);
+ TRUE, (GtkTreeCellDataFunc)header_cell_data,
+ NULL);
break;
case MODEST_TNY_HEADER_TREE_VIEW_COLUMN_FROM:
column = get_new_column (_("From"), renderer_header, TRUE,
TNY_MSG_HEADER_LIST_MODEL_FROM_COLUMN,
- TRUE, (GtkTreeCellDataFunc)sender_cell_data, NULL);
+ TRUE, (GtkTreeCellDataFunc)sender_receiver_cell_data,
+ GINT_TO_POINTER(TRUE));
break;
+ case MODEST_TNY_HEADER_TREE_VIEW_COLUMN_TO:
+ column = get_new_column (_("To"), renderer_header, TRUE,
+ TNY_MSG_HEADER_LIST_MODEL_TO_COLUMN,
+ TRUE, (GtkTreeCellDataFunc)sender_receiver_cell_data,
+ GINT_TO_POINTER(FALSE));
+ break;
+
+ case MODEST_TNY_HEADER_TREE_VIEW_COLUMN_COMPACT_HEADER:
+ column = get_new_column (_("Header"), renderer_header, TRUE,
+ TNY_MSG_HEADER_LIST_MODEL_FROM_COLUMN,
+ TRUE, (GtkTreeCellDataFunc)compact_header_cell_data,
+ NULL);
+ break;
+
case MODEST_TNY_HEADER_TREE_VIEW_COLUMN_SUBJECT:
column = get_new_column (_("Subject"), renderer_header, TRUE,
TNY_MSG_HEADER_LIST_MODEL_SUBJECT_COLUMN,
- TRUE, (GtkTreeCellDataFunc)header_cell_data, NULL);
+ TRUE, (GtkTreeCellDataFunc)header_cell_data,
+ NULL);
break;
case MODEST_TNY_HEADER_TREE_VIEW_COLUMN_SENT_DATE:
column = get_new_column (_("Sent"), renderer_header, TRUE,
TNY_MSG_HEADER_LIST_MODEL_DATE_SENT_COLUMN,
- TRUE, (GtkTreeCellDataFunc)header_cell_data, NULL);
- break;
-
- case MODEST_TNY_HEADER_TREE_VIEW_COLUMN_TO:
- column = get_new_column (_("To"), renderer_header, TRUE,
- TNY_MSG_HEADER_LIST_MODEL_TO_COLUMN,
- TRUE, (GtkTreeCellDataFunc)header_cell_data, NULL);
+ TRUE, (GtkTreeCellDataFunc)header_cell_data,
+ NULL);
break;
}
gtk_tree_view_append_column (GTK_TREE_VIEW(obj), column);
modest_tny_header_tree_view_init (ModestTnyHeaderTreeView *obj)
{
ModestTnyHeaderTreeViewPrivate *priv;
+ int i;
+
priv = MODEST_TNY_HEADER_TREE_VIEW_GET_PRIVATE(obj);
+
+ for (i = 0; i != MODEST_TNY_HEADER_TREE_VIEW_COLUMN_NUM; ++i)
+ priv->sort_columns[i] = -1;
- init_icons (priv->icons);
}
static void
priv->headers = NULL;
priv->tny_msg_folder = NULL;
-
- /* cleanup our icons */
- for (i = 0; i != HEADER_ICON_NUM; ++i) {
- if (priv->icons[i]) {
- g_object_unref (G_OBJECT(priv->icons[i]));
- priv->icons[i] = NULL;
- }
- }
}
GtkWidget*
}
-# if 0
+
+/* get the length of any prefix that should be ignored for sorting */
+static int
+get_prefix_len (const gchar *sub)
+{
+ int i = 0;
+ const static gchar* prefix[] = {"Re:", "RE:", "Fwd:", "FWD:", NULL};
+
+ if (sub[0] != 'R' && sub[0] != 'F') /* optimization */
+ return 0;
+
+ while (prefix[i]) {
+ if (g_str_has_prefix(sub, prefix[i])) {
+ int prefix_len = strlen(prefix[i]);
+ if (sub[prefix_len + 1] == ' ')
+ ++prefix_len; /* ignore space after prefix as well */
+ return prefix_len;
+ }
+ }
+ return 0;
+}
+
+
+static gint
+cmp_normalized_subject (const gchar* s1, const gchar *s2)
+{
+ /* FIXME: utf8 */
+ return strcmp (s1 + get_prefix_len(s1),
+ s2 + get_prefix_len(s2));
+}
+
+
static gint
cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
gpointer user_data)
switch (col_id) {
- case SORT_COLUMN_RECEIVED:
+ case MODEST_TNY_HEADER_TREE_VIEW_COLUMN_COMPACT_HEADER:
+ case MODEST_TNY_HEADER_TREE_VIEW_COLUMN_RECEIVED_DATE:
gtk_tree_model_get (tree_model, iter1, TNY_MSG_HEADER_LIST_MODEL_DATE_RECEIVED_COLUMN,
&val1,-1);
gtk_tree_model_get (tree_model, iter2, TNY_MSG_HEADER_LIST_MODEL_DATE_RECEIVED_COLUMN,
&val2,-1);
-
- g_message ("%d %d %d %d", col_id, val1, val2, val1 - val2);
-
return val1 - val2;
+
- case SORT_COLUMN_SENT:
+ case MODEST_TNY_HEADER_TREE_VIEW_COLUMN_SENT_DATE:
gtk_tree_model_get (tree_model, iter1, TNY_MSG_HEADER_LIST_MODEL_DATE_SENT_COLUMN,
&val1,-1);
gtk_tree_model_get (tree_model, iter2, TNY_MSG_HEADER_LIST_MODEL_DATE_SENT_COLUMN,
&val2,-1);
return val1 - val2;
-
- case SORT_COLUMN_ATTACH:
+
+ case MODEST_TNY_HEADER_TREE_VIEW_COLUMN_SUBJECT: {
+ gchar *sub1, *sub2;
+ int retval;
+
+ gtk_tree_model_get (tree_model, iter1, TNY_MSG_HEADER_LIST_MODEL_SUBJECT_COLUMN,
+ &sub1,-1);
+ gtk_tree_model_get (tree_model, iter2, TNY_MSG_HEADER_LIST_MODEL_SUBJECT_COLUMN,
+ &sub2,-1);
+
+ retval = cmp_normalized_subject(sub1, sub2);
+
+ g_free (sub1);
+ g_free (sub2);
+
+ return retval;
+ }
+
+ case MODEST_TNY_HEADER_TREE_VIEW_COLUMN_ATTACH:
gtk_tree_model_get (tree_model, iter1, TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN,
&val1,-1);
gtk_tree_model_get (tree_model, iter2, TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN,
return (val1 & TNY_MSG_HEADER_FLAG_ATTACHMENTS) - (val2 & TNY_MSG_HEADER_FLAG_ATTACHMENTS);
- case SORT_COLUMN_MSGTYPE:
+ case MODEST_TNY_HEADER_TREE_VIEW_COLUMN_MSGTYPE:
gtk_tree_model_get (tree_model, iter1, TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN,
&val1,-1);
gtk_tree_model_get (tree_model, iter2, TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN,
&val2,-1);
-
+
+ g_message ("%p %p", iter1, iter2);
return (val1 & TNY_MSG_HEADER_FLAG_SEEN) - (val2 & TNY_MSG_HEADER_FLAG_SEEN);
default:
return &iter1 - &iter2;
}
}
-#endif
gboolean
tny_msg_folder_iface_get_headers (folder, priv->headers,
FALSE);
tny_msg_header_list_model_set_folder (TNY_MSG_HEADER_LIST_MODEL(priv->headers),
- folder);
+ folder, TRUE);
oldsortable = gtk_tree_view_get_model(GTK_TREE_VIEW (self));
if (oldsortable && GTK_IS_TREE_MODEL_SORT(oldsortable)) {
sortable = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL(priv->headers));
- /* set special sorting functions */
-#if 0 /* FIXME */
- gtk_tree_model_sort_reset_default_sort_func (sortable);
-
- for (i = 0; i != SORT_COLUMN_NUM; ++i) {
+ for (i = 0; i != MODEST_TNY_HEADER_TREE_VIEW_COLUMN_NUM; ++i) {
int col_id = priv->sort_columns[i];
if (col_id >= 0) {
g_message ("%d: %p: %p: %d", i, GTK_TREE_SORTABLE(sortable), sortable, col_id);
GINT_TO_POINTER(col_id), NULL);
}
}
-#endif
gtk_tree_view_set_model (GTK_TREE_VIEW (self), sortable);
gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW(self), TRUE);
-
/* no need to unref sortable */
} else /* when there is no folder */
- gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW(self), FALSE);
+ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(self), FALSE);
return TRUE;
}
header);
if (!msg) {
g_message ("cannot find msg");
- /* FIXME: update display */
+ gtk_tree_store_remove (GTK_TREE_STORE(model),
+ &iter);
}
}
msg);
/* mark message as seen; _set_flags crashes, bug in tinymail? */
- flags = tny_msg_header_iface_get_flags (TNY_MSG_HEADER_IFACE(header));
- //tny_msg_header_iface_set_flags (header, flags | TNY_MSG_HEADER_FLAG_SEEN);
+ //flags = tny_msg_header_iface_get_flags (TNY_MSG_HEADER_IFACE(header));
+ //tny_msg_header_iface_set_flags (header, TNY_MSG_HEADER_FLAG_SEEN);
}
}
projects / modest / blobdiff