#include <tny-simple-list.h>
#include <string.h>
-#include "modest-header-view.h"
-#include "modest-marshal.h"
-#include "modest-icon-names.h"
-#include "modest-icon-factory.h"
+#include <modest-header-view.h>
+#include <modest-marshal.h>
+#include <modest-text-utils.h>
+#include <modest-icon-names.h>
+#include <modest-icon-factory.h>
static void modest_header_view_class_init (ModestHeaderViewClass *klass);
static void modest_header_view_init (ModestHeaderView *obj);
static void modest_header_view_finalize (GObject *obj);
-static void on_selection_changed (GtkTreeSelection *sel, gpointer user_data);
+static void on_selection_changed (GtkTreeSelection *sel, gpointer user_data);
+
+#define MODEST_HEADER_VIEW_PTR "modest-header-view"
enum {
MESSAGE_SELECTED_SIGNAL,
typedef struct _ModestHeaderViewPrivate ModestHeaderViewPrivate;
struct _ModestHeaderViewPrivate {
-
- TnyFolder *tny_folder;
- TnyList *headers;
- GSList *columns;
- GMutex *lock;
+ TnyFolder *folder;
+ TnyList *headers;
+ GMutex *lock;
ModestHeaderViewStyle style;
-
- gulong sig1;
+ gulong sig1;
};
#define MODEST_HEADER_VIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (ModestHeaderViewClass,message_selected),
NULL, NULL,
- modest_marshal_VOID__STRING_INT,
- G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_INT);
+ modest_marshal_VOID__STRING_INT_INT,
+ G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT);
}
static void
}
-
-/* try to make a shorter display address; changes it arg in-place */
-static gchar*
-display_address (gchar *address)
-{
- gchar *cursor;
-
- if (!address)
- return NULL;
-
- /* simplistic --> remove <email@address> from display name */
- cursor = g_strstr_len (address, strlen(address), "<");
- if (cursor)
- cursor[0]='\0';
-
- /* simplistic --> remove (bla bla) from display name */
- cursor = g_strstr_len (address, strlen(address), "(");
- if (cursor)
- cursor[0]='\0';
-
- /* FIXME */
- if (!g_utf8_validate (address, -1, NULL))
- g_printerr ("modest: invalid: '%s'", address);
-
- return address;
-}
-
-
-
static void
sender_receiver_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
GtkTreeModel *tree_model, GtkTreeIter *iter, gboolean is_sender)
g_object_set (G_OBJECT(renderer),
"text",
- display_address (address),
+ modest_text_utils_display_address (address),
"weight",
(flags & TNY_HEADER_FLAG_SEEN) ? 400 : 800,
"style",
-/* just to prevent warnings:
- * warning: `%x' yields only last 2 digits of year in some locales
- */
-static size_t
-my_strftime(char *s, size_t max, const char *fmt, const
- struct tm *tm) {
- return strftime(s, max, fmt, tm);
-}
-
-
/* not reentrant/thread-safe */
const gchar*
localtime_r(&date, &date_tm);
/* get today's date */
- my_strftime (date_buf, buf_size, "%x", &date_tm);
- my_strftime (now_buf, buf_size, "%x", &now_tm); /* today */
+ modest_text_utils_strftime (date_buf, buf_size, "%x", &date_tm);
+ modest_text_utils_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)
rendobj = G_OBJECT(renderer);
header = g_strdup_printf ("%s %s\n%s",
- display_address (from),
+ modest_text_utils_display_address (from),
display_date(date),
subject);
GtkTreeViewColumn *column;
column = gtk_tree_view_column_new_with_attributes(name, renderer, NULL);
- gtk_tree_view_column_set_resizable (column, resizable);
gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
+
+ gtk_tree_view_column_set_resizable (column, resizable);
+ if (resizable)
+ gtk_tree_view_column_set_min_width (column, 100);
if (show_as_text)
gtk_tree_view_column_add_attribute (column, renderer, "text",
if (cell_data_func)
gtk_tree_view_column_set_cell_data_func(column, renderer, cell_data_func,
user_data, NULL);
-
return column;
}
-
-static void
-init_columns (ModestHeaderView *obj)
+gboolean
+modest_header_view_set_columns (ModestHeaderView *self, const GList *columns)
{
GtkTreeViewColumn *column=NULL;
GtkCellRenderer *renderer_msgtype,
*renderer_attach;
ModestHeaderViewPrivate *priv;
- GSList *cursor;
+ const GList *cursor;
- priv = MODEST_HEADER_VIEW_GET_PRIVATE(obj);
-
+ priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
+
+ /* FIXME: check whether these renderers need to be freed */
renderer_msgtype = gtk_cell_renderer_pixbuf_new ();
renderer_attach = gtk_cell_renderer_pixbuf_new ();
- renderer_header = gtk_cell_renderer_text_new ();
+ renderer_header = gtk_cell_renderer_text_new ();
- remove_all_columns (obj);
+ remove_all_columns (self);
- for (cursor = priv->columns; cursor; cursor = cursor->next) {
+ for (cursor = columns; cursor; cursor = g_list_next(cursor)) {
ModestHeaderViewColumn col =
(ModestHeaderViewColumn) GPOINTER_TO_INT(cursor->data);
+ if (0> col || col >= MODEST_HEADER_VIEW_COLUMN_NUM) {
+ g_printerr ("modest: invalid column %d in column list\n", col);
+ continue;
+ }
+
switch (col) {
case MODEST_HEADER_VIEW_COLUMN_MSGTYPE:
-
column = get_new_column (_("M"), renderer_msgtype, FALSE,
TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN,
FALSE, (GtkTreeCellDataFunc)msgtype_cell_data,
NULL);
+ gtk_tree_view_column_set_fixed_width (column, 32);
break;
case MODEST_HEADER_VIEW_COLUMN_ATTACH:
-
column = get_new_column (_("A"), renderer_attach, FALSE,
TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN,
FALSE, (GtkTreeCellDataFunc)attach_cell_data,
NULL);
+ gtk_tree_view_column_set_fixed_width (column, 32);
break;
-
+
case MODEST_HEADER_VIEW_COLUMN_RECEIVED_DATE:
column = get_new_column (_("Received"), renderer_header, TRUE,
TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_COLUMN,
g_assert_not_reached ();
}
- gtk_tree_view_column_set_visible (column, TRUE);
- gtk_tree_view_column_set_min_width (column, 36);
- gtk_tree_view_column_set_resizable (column, TRUE);
+ /* we keep the column id around */
+ g_object_set_data (G_OBJECT(column), MODEST_HEADER_VIEW_COLUMN,
+ GINT_TO_POINTER(col));
+
+ /* we need this ptr when sorting the rows */
+ g_object_set_data (G_OBJECT(column), MODEST_HEADER_VIEW_PTR,
+ self);
- gtk_tree_view_append_column (GTK_TREE_VIEW(obj), column);
+ gtk_tree_view_column_set_visible (column, TRUE);
+ gtk_tree_view_append_column (GTK_TREE_VIEW(self), column);
}
+ return TRUE;
}
priv->lock = NULL;
}
- priv->headers = NULL;
- priv->tny_folder = NULL;
+ priv->headers = NULL;
+ priv->folder = NULL;
G_OBJECT_CLASS(parent_class)->finalize (obj);
}
-
+
GtkWidget*
-modest_header_view_new (TnyFolder *folder,
- GSList *columns,
+modest_header_view_new (TnyFolder *folder, const GList *columns,
ModestHeaderViewStyle style)
{
GObject *obj;
priv->sig1 = g_signal_connect (sel, "changed",
G_CALLBACK(on_selection_changed), self);
-
-
return GTK_WIDGET(self);
}
-gboolean
-modest_header_view_set_columns (ModestHeaderView *self, GSList *columns)
-{
- ModestHeaderViewPrivate *priv;
- GSList *cursor;
-
- g_return_val_if_fail (self, FALSE);
-
- priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
-
- g_slist_free (priv->columns);
-
- for (cursor = columns; cursor; cursor = cursor->next) {
- ModestHeaderViewColumn col =
- (ModestHeaderViewColumn) GPOINTER_TO_INT(cursor->data);
- if (col >= MODEST_HEADER_VIEW_COLUMN_NUM)
- g_printerr ("modest: invalid column %d in column list\n", col);
- else
- priv->columns = g_slist_append (priv->columns, cursor->data);
- }
-
- init_columns (self); /* redraw them */
- return TRUE;
-}
-
TnyList *
modest_header_view_get_selected_headers (ModestHeaderView *self)
list = g_list_reverse (list);
tmp = list;
while (tmp) {
- /* Get Header from selection */
+ /* get header from selection */
gtk_tree_model_get_iter (tree_model,
&iter,
(GtkTreePath *) (tmp->data));
return header_list;
}
-const GSList*
+
+GList*
modest_header_view_get_columns (ModestHeaderView *self)
{
- ModestHeaderViewPrivate *priv;
-
- g_return_val_if_fail (self, FALSE);
-
- priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
- return priv->columns;
+ g_return_val_if_fail (self, FALSE);
+ return gtk_tree_view_get_columns (GTK_TREE_VIEW(self));
}
gboolean
modest_header_view_set_style (ModestHeaderView *self,
- ModestHeaderViewStyle style)
+ ModestHeaderViewStyle style)
{
g_return_val_if_fail (self, FALSE);
g_return_val_if_fail (style < MODEST_HEADER_VIEW_STYLE_NUM, FALSE);
static inline int
get_prefix_len (const gchar *sub)
{
- gint i = 0;
- static const gchar* prefix[] = {"Re:", "RE:", "Fwd:", "FWD:", "FW:", "AW:", NULL};
-
- if (sub[0] != 'R' && sub[0] != 'F') /* optimization */
+ gint i;
+ static const gchar* prefix[] = {
+ "Re:", "RE:", "Fwd:", "FWD:", "FW:", NULL
+ };
+
+ if (!sub || (sub[0] != 'R' && sub[0] != 'F')) /* optimization */
return 0;
+
+ i = 0;
while (prefix[i]) {
if (g_str_has_prefix(sub, prefix[i])) {
}
-static inline gint
-cmp_normalized_subject (const gchar* s1, const gchar *s2)
+
+/* a strcmp that is case insensitive and NULL-safe */
+static gint
+cmp_insensitive_str (const gchar* s1, const gchar *s2)
{
gint result = 0;
- register gchar *n1, *n2;
-
- n1 = g_utf8_collate_key (s1 + get_prefix_len(s1), -1);
- n2 = g_utf8_collate_key (s2 + get_prefix_len(s2), -1);
+ gchar *n1, *n2;
+
+ /* work even when s1 and/or s2 == NULL */
+ if (s1 == s2)
+ return 0;
+ if (!s1)
+ return -1;
+ if (!s2)
+ return 1;
+
+ n1 = g_utf8_collate_key (s1, -1);
+ n2 = g_utf8_collate_key (s2, -1);
result = strcmp (n1, n2);
+
g_free (n1);
g_free (n2);
cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
gpointer user_data)
{
- gint col_id = GPOINTER_TO_INT (user_data);
+ gint col_id;
gint t1, t2;
gint val1, val2;
gchar *s1, *s2;
gint cmp;
- g_return_val_if_fail (GTK_IS_TREE_MODEL(tree_model), -1);
+ static int counter = 0;
+ col_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(user_data), MODEST_HEADER_VIEW_COLUMN));
+
+ if (!(++counter % 100)) {
+ GObject *header_view = g_object_get_data(G_OBJECT(user_data),
+ MODEST_HEADER_VIEW_PTR);
+ g_signal_emit (header_view,
+ signals[STATUS_UPDATE_SIGNAL],
+ 0, _("Sorting..."), 0, 0);
+ }
switch (col_id) {
TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN, &s2,
TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2,
-1);
-
- cmp = cmp_normalized_subject(s1, s2);
+
+ /* the prefix ('Re:', 'Fwd:' etc.) we ignore */
+ cmp = cmp_insensitive_str (s1 + get_prefix_len(s1), s2 + get_prefix_len(s2));
g_free (s1);
g_free (s2);
TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN, &s2,
TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2,
-1);
- cmp = strcmp (s1, s2);
+ cmp = cmp_insensitive_str (s1, s2);
g_free (s1);
g_free (s2);
TNY_GTK_HEADER_LIST_MODEL_TO_COLUMN, &s2,
TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2,
-1);
- cmp = strcmp (s1, s2);
+ cmp = cmp_insensitive_str (s1, s2);
g_free (s1);
g_free (s2);
if (cancelled)
return;
-
+
self = MODEST_HEADER_VIEW(user_data);
priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
+
+ g_assert (folder == priv->folder);
+
if (!folder) /* when there is no folder */
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(self), FALSE);
else { /* it's a new one or a refresh */
- GSList *col;
+ GList *cols, *cursor;
if (priv->headers)
g_object_unref (priv->headers);
(GTK_TREE_MODEL(priv->headers));
/* install our special sorting functions */
- col = priv->columns;
- while (col) {
- gint col_id = GPOINTER_TO_INT (col->data);
+ cursor = cols = gtk_tree_view_get_columns (GTK_TREE_VIEW(self));
+ while (cursor) {
+ gint col_id = GPOINTER_TO_INT (g_object_get_data(G_OBJECT(cursor->data),
+ MODEST_HEADER_VIEW_COLUMN));
gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(sortable),
col_id,
(GtkTreeIterCompareFunc)cmp_rows,
- GINT_TO_POINTER(col_id), NULL);
- col = col->next;
+ cursor->data, NULL);
+ cursor = g_list_next(cursor);
}
-
+ g_list_free (cols);
+
gtk_tree_view_set_model (GTK_TREE_VIEW (self), sortable);
gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW(self),TRUE);
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(self), TRUE);
- /* no need to unref sortable */
+ /* no need to unref sortable */
}
}
static void
on_refresh_folder_status_update (TnyFolder *folder, const gchar *msg,
- gint status_id, gpointer user_data)
+ gint num, gint total, gpointer user_data)
{
ModestHeaderView *self;
ModestHeaderViewPrivate *priv;
priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
g_signal_emit (G_OBJECT(self), signals[STATUS_UPDATE_SIGNAL],
- 0, msg, status_id);
+ 0, msg, num, total);
}
+TnyFolder*
+modest_header_view_get_folder (ModestHeaderView *self)
+{
+ ModestHeaderViewPrivate *priv;
+ priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
+
+ return priv->folder;
+}
+
gboolean
-modest_header_view_set_folder (ModestHeaderView *self,
- TnyFolder *folder)
+modest_header_view_set_folder (ModestHeaderView *self, TnyFolder *folder)
{
ModestHeaderViewPrivate *priv;
priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
+ priv->folder = folder;
+
if (!folder) {/* when there is no folder */
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(self), FALSE);
gtk_tree_view_set_model (GTK_TREE_VIEW (self), NULL);
on_refresh_folder_status_update,
self);
}
-
+
/* no message selected */
g_signal_emit (G_OBJECT(self), signals[MESSAGE_SELECTED_SIGNAL], 0,
NULL);
-
- //g_mutex_unlock (priv->lock);
-
return TRUE;
}
+
static void
on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
{
/* Free */
/* g_free (folder); */
}
-
projects / modest / blobdiff