LAST_SIGNAL
};
-
enum {
- HEADER_ICON_READ = 1,
+ HEADER_ICON_READ,
HEADER_ICON_UNREAD,
HEADER_ICON_ATTACH,
HEADER_ICON_NUM
};
-enum {
- SORT_COLUMN_FROM = 1,
- SORT_COLUMN_TO,
- SORT_COLUMN_SUBJECT,
- SORT_COLUMN_ATTACH,
- SORT_COLUMN_RECEIVED,
- SORT_COLUMN_SENT,
- SORT_COLUMN_MSGTYPE,
- SORT_COLUMN_NUM
-};
-
-
typedef struct _ModestTnyHeaderTreeViewPrivate ModestTnyHeaderTreeViewPrivate;
struct _ModestTnyHeaderTreeViewPrivate {
+
TnyMsgFolderIface *tny_msg_folder;
TnyListIface *headers;
- GdkPixbuf *icons[HEADER_ICON_NUM];
- guint sort_columns[SORT_COLUMN_NUM];
+ GdkPixbuf *icons[HEADER_ICON_NUM];
+ 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), \
MODEST_TYPE_TNY_HEADER_TREE_VIEW, \
gtk_tree_model_get (tree_model, iter,
TNY_MSG_HEADER_LIST_MODEL_FROM_COLUMN, &from,
TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags,
+ TNY_MSG_HEADER_LIST_MODEL_SUBJECT_COLUMN, &flags
-1);
rendobj = G_OBJECT(renderer);
}
+
+compact_header_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
+ GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data)
+{
+ GObject *rendobj;
+ TnyMsgHeaderFlags flags;
+ gchar *from, *subject, *date;
+ gchar *address;
+ gchar *header;
+
+ 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_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, date, subject);
+ g_object_set (rendobj, "text", header, NULL);
+
+ g_free (header);
+ g_free (from);
+ g_free (subject);
+ g_free (date);
+
+ 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_icons (GdkPixbuf *icons[HEADER_ICON_NUM])
{
- 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);
+ gdk_pixbuf_new_from_file (PIXMAP_PREFIX "qgn_list_messagin_mail_unread.png",NULL);
+ icons[HEADER_ICON_READ] =
+ gdk_pixbuf_new_from_file (PIXMAP_PREFIX "qgn_list_messagin_mail.png",NULL);
icons[HEADER_ICON_ATTACH] =
gdk_pixbuf_new_from_file (PIXMAP_PREFIX "clip.xpm",NULL);
}
+static void
+remove_all_columns (ModestTnyHeaderTreeView *obj)
+{
+ GList *columns, *cursor;
+
+ columns = gtk_tree_view_get_columns (GTK_TREE_VIEW(obj));
+
+ for (cursor = columns; cursor; cursor = cursor->next)
+ gtk_tree_view_remove_column (GTK_TREE_VIEW(obj),
+ GTK_TREE_VIEW_COLUMN(cursor->data));
+ g_list_free (columns);
+}
+
+
+
static void
-modest_tny_header_tree_view_init (ModestTnyHeaderTreeView *obj)
+init_columns (ModestTnyHeaderTreeView *obj)
{
GtkTreeViewColumn *column;
GtkCellRenderer *renderer_msgtype,
*renderer_header,
*renderer_attach;
- int i;
+
ModestTnyHeaderTreeViewPrivate *priv;
+ GSList *cursor;
priv = MODEST_TNY_HEADER_TREE_VIEW_GET_PRIVATE(obj);
-
- init_icons (priv->icons);
-
+
renderer_msgtype = gtk_cell_renderer_pixbuf_new ();
renderer_attach = gtk_cell_renderer_pixbuf_new ();
renderer_header = gtk_cell_renderer_text_new ();
+
+ remove_all_columns (obj);
+
+ for (cursor = priv->columns; cursor; cursor = cursor->next) {
+ ModestTnyHeaderTreeViewColumn col =
+ (ModestTnyHeaderTreeViewColumn) GPOINTER_TO_INT(cursor->data);
+
+ switch (col) {
+
+ case MODEST_TNY_HEADER_TREE_VIEW_COLUMN_MSGTYPE:
+
+ column = get_new_column (_("M"), renderer_msgtype, FALSE,
+ TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN,
+ FALSE, (GtkTreeCellDataFunc)msgtype_cell_data, priv->icons);
+ 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);
+ 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);
+ 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);
+ 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);
+ 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);
+ break;
+ }
+ gtk_tree_view_append_column (GTK_TREE_VIEW(obj), column);
+ }
+}
- priv->tny_msg_folder = NULL;
- priv->headers = NULL;
- for (i = 0; i != SORT_COLUMN_NUM; ++i)
- priv->sort_columns[i] = -1;
- /* msgtype */
- column = get_new_column (_("M"), renderer_msgtype, FALSE, TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN,
- FALSE, (GtkTreeCellDataFunc)msgtype_cell_data, priv->icons);
- gtk_tree_view_append_column (GTK_TREE_VIEW(obj), column);
- priv->sort_columns[SORT_COLUMN_MSGTYPE] =
- gtk_tree_view_column_get_sort_column_id (column);
- g_signal_connect (G_OBJECT (column), "clicked",G_CALLBACK (column_clicked), obj);
-
-
- /* attachment */
- column = get_new_column (_("A"), renderer_attach, FALSE, TNY_MSG_HEADER_LIST_MODEL_FLAGS_COLUMN,
- FALSE, (GtkTreeCellDataFunc)attach_cell_data, priv->icons);
- gtk_tree_view_append_column (GTK_TREE_VIEW(obj), column);
- priv->sort_columns[SORT_COLUMN_ATTACH] =
- gtk_tree_view_column_get_sort_column_id (column);
- g_signal_connect (G_OBJECT (column), "clicked",G_CALLBACK (column_clicked), obj);
-
- /* received */
- column = get_new_column (_("Received"), renderer_header, TRUE, TNY_MSG_HEADER_LIST_MODEL_DATE_RECEIVED_COLUMN,
- TRUE, (GtkTreeCellDataFunc)header_cell_data, NULL);
- gtk_tree_view_append_column (GTK_TREE_VIEW(obj), column);
- priv->sort_columns[SORT_COLUMN_RECEIVED] =
- gtk_tree_view_column_get_sort_column_id (column);
- g_signal_connect (G_OBJECT (column), "clicked",G_CALLBACK (column_clicked), obj);
-
-
- /* from */
- column = get_new_column (_("From"), renderer_header, TRUE, TNY_MSG_HEADER_LIST_MODEL_FROM_COLUMN,
- TRUE, (GtkTreeCellDataFunc)sender_cell_data, NULL);
- gtk_tree_view_append_column (GTK_TREE_VIEW(obj), column);
- priv->sort_columns[SORT_COLUMN_FROM] =
- gtk_tree_view_column_get_sort_column_id (column);
- g_signal_connect (G_OBJECT (column), "clicked",G_CALLBACK (column_clicked), obj);
-
-
- /* subject */
- column = get_new_column (_("Subject"), renderer_header, TRUE, TNY_MSG_HEADER_LIST_MODEL_SUBJECT_COLUMN,
- TRUE, (GtkTreeCellDataFunc)header_cell_data, NULL);
- gtk_tree_view_append_column (GTK_TREE_VIEW(obj), column);
- priv->sort_columns[SORT_COLUMN_SUBJECT] =
- gtk_tree_view_column_get_sort_column_id (column);
- g_signal_connect (G_OBJECT (column), "clicked",G_CALLBACK (column_clicked), obj);
+
+static void
+modest_tny_header_tree_view_init (ModestTnyHeaderTreeView *obj)
+{
+ ModestTnyHeaderTreeViewPrivate *priv;
+ int i;
+
+ priv = MODEST_TNY_HEADER_TREE_VIEW_GET_PRIVATE(obj);
- /* all cols */
- gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(obj), TRUE);
- gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW(obj), TRUE);
-
- gtk_tree_view_set_rules_hint (GTK_TREE_VIEW(obj), TRUE); /* alternating row colors */
+ for (i = 0; i != MODEST_TNY_HEADER_TREE_VIEW_COLUMN_NUM; ++i)
+ priv->sort_columns[i] = -1;
+
+ init_icons (priv->icons);
}
static void
}
GtkWidget*
-modest_tny_header_tree_view_new (TnyMsgFolderIface *folder)
+modest_tny_header_tree_view_new (TnyMsgFolderIface *folder,
+ GSList *columns,
+ ModestTnyHeaderTreeViewStyle style)
{
GObject *obj;
GtkTreeSelection *sel;
ModestTnyHeaderTreeView *self;
-
+
obj = G_OBJECT(g_object_new(MODEST_TYPE_TNY_HEADER_TREE_VIEW, NULL));
self = MODEST_TNY_HEADER_TREE_VIEW(obj);
-
+
if (!modest_tny_header_tree_view_set_folder (self, NULL)) {
g_warning ("could not set the folder");
g_object_unref (obj);
return NULL;
}
+ modest_tny_header_tree_view_set_style (self, style);
+ modest_tny_header_tree_view_set_columns (self, columns);
+
+ /* all cols */
+ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(obj), TRUE);
+ gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW(obj), TRUE);
+
+ gtk_tree_view_set_rules_hint (GTK_TREE_VIEW(obj),
+ TRUE); /* alternating row colors */
+
sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
g_signal_connect (sel, "changed",
G_CALLBACK(selection_changed), self);
return GTK_WIDGET(self);
}
+gboolean
+modest_tny_header_tree_view_set_columns (ModestTnyHeaderTreeView *self, GSList *columns)
+{
+ ModestTnyHeaderTreeViewPrivate *priv;
+ GSList *cursor;
+
+ g_return_val_if_fail (self, FALSE);
+
+ priv = MODEST_TNY_HEADER_TREE_VIEW_GET_PRIVATE(self);
+
+ g_slist_free (priv->columns);
+
+ for (cursor = columns; cursor; cursor = cursor->next) {
+ ModestTnyHeaderTreeViewColumn col =
+ (ModestTnyHeaderTreeViewColumn) GPOINTER_TO_INT(cursor->data);
+ if (0 > col || col >= MODEST_TNY_HEADER_TREE_VIEW_COLUMN_NUM)
+ g_warning ("invalid column in column list");
+ else
+ priv->columns = g_slist_append (priv->columns, cursor->data);
+ }
+
+ init_columns (self); /* redraw them */
+ return TRUE;
+}
+
+
+
+const GSList*
+modest_tny_header_tree_view_get_columns (ModestTnyHeaderTreeView *self)
+{
+ ModestTnyHeaderTreeViewPrivate *priv;
+ GSList *cursor;
+
+ g_return_val_if_fail (self, FALSE);
+
+ priv = MODEST_TNY_HEADER_TREE_VIEW_GET_PRIVATE(self);
+ return priv->columns;
+}
+
+
+
+
+gboolean
+modest_tny_header_tree_view_set_style (ModestTnyHeaderTreeView *self,
+ ModestTnyHeaderTreeViewStyle style)
+{
+ g_return_val_if_fail (self, FALSE);
+ g_return_val_if_fail (style >= 0 && style < MODEST_TNY_HEADER_TREE_VIEW_STYLE_NUM,
+ FALSE);
+
+ MODEST_TNY_HEADER_TREE_VIEW_GET_PRIVATE(self)->style = style;
+
+ return TRUE;
+}
+
+ModestTnyHeaderTreeViewStyle
+modest_tny_header_tree_view_get_style (ModestTnyHeaderTreeView *self)
+{
+ g_return_val_if_fail (self, FALSE);
+
+ return MODEST_TNY_HEADER_TREE_VIEW_GET_PRIVATE(self)->style;
+}
+
+
+
+/* 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,
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:
}
-
gboolean
modest_tny_header_tree_view_set_folder (ModestTnyHeaderTreeView *self,
TnyMsgFolderIface *folder)
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);
projects / modest / blobdiff