TnyMsgFolderIface *tny_msg_folder;
TnyListIface *headers;
- guint sort_columns[MODEST_TNY_HEADER_TREE_VIEW_COLUMN_NUM];
-
GSList *columns;
+
ModestTnyHeaderTreeViewStyle style;
};
#define MODEST_TNY_HEADER_TREE_VIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
gtk_tree_model_get (tree_model, iter, TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN,
&flags, -1);
- if (flags & TNY_MSG_HEADER_FLAG_SEEN)
+ 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 = modest_icon_factory_get_icon (MODEST_HEADER_ICON_UNREAD);
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,
- TNY_MSG_HEADER_LIST_MODEL_SUBJECT_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
compact_header_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data)
{
header = g_strdup_printf ("%s %s\n%s", from,
display_date(date), subject);
- g_object_set (rendobj, "text", header, NULL);
-
+ 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);
-
- 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 */
}
static void
init_columns (ModestTnyHeaderTreeView *obj)
{
- GtkTreeViewColumn *column;
+ GtkTreeViewColumn *column=NULL;
GtkCellRenderer *renderer_msgtype,
*renderer_header,
*renderer_attach;
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)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);
- break;
}
gtk_tree_view_append_column (GTK_TREE_VIEW(obj), column);
}
static void
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;
-
}
static void
{
ModestTnyHeaderTreeView *self;
ModestTnyHeaderTreeViewPrivate *priv;
- int i;
self = MODEST_TNY_HEADER_TREE_VIEW(obj);
priv = MODEST_TNY_HEADER_TREE_VIEW_GET_PRIVATE(self);
modest_tny_header_tree_view_get_columns (ModestTnyHeaderTreeView *self)
{
ModestTnyHeaderTreeViewPrivate *priv;
- GSList *cursor;
g_return_val_if_fail (self, FALSE);
get_prefix_len (const gchar *sub)
{
int i = 0;
- const static gchar* prefix[] = {"Re:", "RE:", "Fwd:", "FWD:", NULL};
+ const static gchar* prefix[] = {"Re:", "RE:", "Fwd:", "FWD:", "FW:", 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] == ' ')
+ if (sub[prefix_len] == ' ')
++prefix_len; /* ignore space after prefix as well */
return prefix_len;
}
+ ++i;
}
return 0;
}
gpointer user_data)
{
gint col_id = GPOINTER_TO_INT (user_data);
+ gint t1, t2;
gint val1, val2;
-
+ gchar *s1, *s2;
+ gint cmp;
+
g_return_val_if_fail (GTK_IS_TREE_MODEL(tree_model), -1);
switch (col_id) {
+ /* first one, we decide based on the time */
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);
- return val1 - val2;
-
+ gtk_tree_model_get (tree_model, iter1, TNY_MSG_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN,
+ &t1,-1);
+ gtk_tree_model_get (tree_model, iter2, TNY_MSG_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN,
+ &t2,-1);
+ return t1 - t2;
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;
+ gtk_tree_model_get (tree_model, iter1, TNY_MSG_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN,
+ &t1,-1);
+ gtk_tree_model_get (tree_model, iter2, TNY_MSG_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN,
+ &t2,-1);
+ return t1 - t2;
- 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);
+ /* next ones, we try the search criteria first, if they're the same, then we use 'sent date' */
+ case MODEST_TNY_HEADER_TREE_VIEW_COLUMN_SUBJECT: {
+
+ gtk_tree_model_get (tree_model, iter1,
+ TNY_MSG_HEADER_LIST_MODEL_SUBJECT_COLUMN, &s1,
+ TNY_MSG_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1,
+ -1);
+ gtk_tree_model_get (tree_model, iter2,
+ TNY_MSG_HEADER_LIST_MODEL_SUBJECT_COLUMN, &s2,
+ TNY_MSG_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2,
+ -1);
- retval = cmp_normalized_subject(sub1, sub2);
+ cmp = cmp_normalized_subject(s1, s2);
- g_free (sub1);
- g_free (sub2);
+ g_free (s1);
+ g_free (s2);
- return retval;
+ return cmp ? cmp : t1 - t2;
}
+ case MODEST_TNY_HEADER_TREE_VIEW_COLUMN_FROM:
+
+ gtk_tree_model_get (tree_model, iter1,
+ TNY_MSG_HEADER_LIST_MODEL_FROM_COLUMN, &s1,
+ TNY_MSG_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1,
+ -1);
+ gtk_tree_model_get (tree_model, iter2,
+ TNY_MSG_HEADER_LIST_MODEL_FROM_COLUMN, &s2,
+ TNY_MSG_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2,
+ -1);
+ cmp = strcmp (s1, s2);
+ g_free (s1);
+ g_free (s2);
+
+ return cmp ? cmp : t1 - t2;
+
+ case MODEST_TNY_HEADER_TREE_VIEW_COLUMN_TO:
+
+ gtk_tree_model_get (tree_model, iter1,
+ TNY_MSG_HEADER_LIST_MODEL_TO_COLUMN, &s1,
+ TNY_MSG_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1,
+ -1);
+ gtk_tree_model_get (tree_model, iter2,
+ TNY_MSG_HEADER_LIST_MODEL_TO_COLUMN, &s2,
+ TNY_MSG_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2,
+ -1);
+ cmp = strcmp (s1, s2);
+ g_free (s1);
+ g_free (s2);
+
+ return cmp ? cmp : t1 - t2;
+
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,
- &val2,-1);
+
+ gtk_tree_model_get (tree_model, iter1, TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN, &val1,
+ TNY_MSG_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1, -1);
+ gtk_tree_model_get (tree_model, iter2, TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN, &val2,
+ TNY_MSG_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2, -1);
- return (val1 & TNY_MSG_HEADER_FLAG_ATTACHMENTS) - (val2 & TNY_MSG_HEADER_FLAG_ATTACHMENTS);
-
+ cmp = (val1 & TNY_MSG_HEADER_FLAG_ATTACHMENTS) - (val2 & TNY_MSG_HEADER_FLAG_ATTACHMENTS);
+ return cmp ? cmp : t1 - t2;
+
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);
+ gtk_tree_model_get (tree_model, iter1, TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN, &val1,
+ TNY_MSG_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1,-1);
+ gtk_tree_model_get (tree_model, iter2, TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN, &val2,
+ TNY_MSG_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2,-1);
+ cmp = (val1 & TNY_MSG_HEADER_FLAG_SEEN) - (val2 & TNY_MSG_HEADER_FLAG_SEEN);
- g_message ("%p %p", iter1, iter2);
- return (val1 & TNY_MSG_HEADER_FLAG_SEEN) - (val2 & TNY_MSG_HEADER_FLAG_SEEN);
+ return cmp ? cmp : t1 - t2;
default:
- g_message ("%p %p", iter1, iter2);
- return &iter1 - &iter2;
+ return &iter1 - &iter2; /* oughhhh */
}
}
+
gboolean
modest_tny_header_tree_view_set_folder (ModestTnyHeaderTreeView *self,
TnyMsgFolderIface *folder)
{
- int i;
- GtkTreeModel *oldsortable, *sortable, *oldmodel;
+ GtkTreeModel *oldsortable, *sortable;
ModestTnyHeaderTreeViewPrivate *priv;
g_return_val_if_fail (self, FALSE);
priv = MODEST_TNY_HEADER_TREE_VIEW_GET_PRIVATE(self);
if (folder) {
+ GSList *col;
+
priv->headers = TNY_LIST_IFACE(tny_msg_header_list_model_new ());
tny_msg_folder_iface_get_headers (folder, priv->headers,
FALSE);
}
sortable = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL(priv->headers));
-
- 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);
- gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(sortable), col_id,
- (GtkTreeIterCompareFunc)cmp_rows,
- GINT_TO_POINTER(col_id), NULL);
- }
+
+ /* install our special sorting functions */
+ col = priv->columns;
+ while (col) {
+ int col_id = GPOINTER_TO_INT (col->data);
+ gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(sortable), col_id,
+ (GtkTreeIterCompareFunc)cmp_rows,
+ GINT_TO_POINTER(col_id), NULL);
+ col = col->next;
}
+
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, -1);
if (header) {
- TnyMsgHeaderFlags flags;
- const TnyMsgIface *msg;
+ const TnyMsgIface *msg = NULL;
const TnyMsgFolderIface *folder;
folder = tny_msg_header_iface_get_folder (TNY_MSG_HEADER_IFACE(header));
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