#include <modest-runtime.h>
#include <glib/gi18n.h>
#include <modest-platform.h>
-
-
-static gchar *
-_pango_parse_string (const gchar *string) {
- gchar **tmp = NULL;
- gchar *parsed_string = NULL;
- gchar *tmp_string = NULL;
- guint i = 0;
-
- tmp = g_strsplit(string, "&", 0);
- parsed_string = g_strdup(tmp[i]);
- for (i = 1; tmp[i] != NULL; i++) {
- tmp_string = g_strconcat (parsed_string, "&", tmp[i], NULL);
- g_free(parsed_string);
- parsed_string = g_strdup(tmp_string);
- }
-
- return parsed_string;
-}
-
+#include <string.h>
static GdkPixbuf*
get_pixbuf_for_flag (TnyHeaderFlags flag)
static GdkPixbuf *seen_pixbuf = NULL;
static GdkPixbuf *unread_pixbuf = NULL;
static GdkPixbuf *attachments_pixbuf = NULL;
+ static GdkPixbuf *high_pixbuf = NULL;
+ static GdkPixbuf *low_pixbuf = NULL;
switch (flag) {
case TNY_HEADER_FLAG_DELETED:
if (G_UNLIKELY(!attachments_pixbuf))
attachments_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_ATTACH);
return attachments_pixbuf;
- default:
- if (G_UNLIKELY(!unread_pixbuf))
- unread_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_UNREAD);
- return unread_pixbuf;
- }
-}
-
-static GdkPixbuf*
-get_pixbuf_for_compact_flag (TnyHeaderFlags flags)
-{
- /* optimization */
- static GdkPixbuf *high_attachments_pixbuf = NULL;
- static GdkPixbuf *normal_attachments_pixbuf = NULL;
- static GdkPixbuf *low_attachments_pixbuf = NULL;
- static GdkPixbuf *high_pixbuf = NULL;
- static GdkPixbuf *low_pixbuf = NULL;
-
- if (flags & TNY_HEADER_FLAG_ATTACHMENTS) {
- if (flags & TNY_HEADER_FLAG_HIGH_PRIORITY) {
- if (G_UNLIKELY(!high_attachments_pixbuf))
- high_attachments_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_ATTACH_HIGH_PRIORITY);
- return high_attachments_pixbuf;
- }
- else if (flags & TNY_HEADER_FLAG_LOW_PRIORITY) {
- if (G_UNLIKELY(!low_attachments_pixbuf))
- low_attachments_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_ATTACH_LOW_PRIORITY);
- return low_attachments_pixbuf;
- }
- else {
- if (G_UNLIKELY(!normal_attachments_pixbuf))
- normal_attachments_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_ATTACH_NORM_PRIORITY);
- return normal_attachments_pixbuf;
- }
- }
- else if (flags & TNY_HEADER_FLAG_HIGH_PRIORITY) {
+ case TNY_HEADER_FLAG_HIGH_PRIORITY:
if (G_UNLIKELY(!high_pixbuf))
high_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_HIGH_PRIORITY);
return high_pixbuf;
- }
- else if (flags & TNY_HEADER_FLAG_LOW_PRIORITY) {
+ case TNY_HEADER_FLAG_LOW_PRIORITY:
if (G_UNLIKELY(!low_pixbuf))
low_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_LOW_PRIORITY);
return low_pixbuf;
+ default:
+ if (G_UNLIKELY(!unread_pixbuf))
+ unread_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_UNREAD);
+ return unread_pixbuf;
}
-
-
- return NULL;
}
static void
}
void
-_modest_header_view_compact_flag_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
- GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data)
-{
- TnyHeaderFlags flags;
-
- gtk_tree_model_get (tree_model, iter, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN,
- &flags, -1);
-
- if (flags & TNY_HEADER_FLAG_ATTACHMENTS) {
- if (flags & TNY_HEADER_FLAG_HIGH_PRIORITY)
- g_object_set (G_OBJECT (renderer), "pixbuf",
- get_pixbuf_for_compact_flag (flags),
- NULL);
- else if (flags & TNY_HEADER_FLAG_LOW_PRIORITY)
- g_object_set (G_OBJECT (renderer), "pixbuf",
- get_pixbuf_for_compact_flag (flags),
- NULL);
- else
- g_object_set (G_OBJECT (renderer), "pixbuf",
- get_pixbuf_for_compact_flag (flags),
- NULL);
- }
- else {
- if (flags & TNY_HEADER_FLAG_HIGH_PRIORITY)
- g_object_set (G_OBJECT (renderer), "pixbuf",
- get_pixbuf_for_compact_flag (flags),
- NULL);
- else if (flags & TNY_HEADER_FLAG_LOW_PRIORITY)
- g_object_set (G_OBJECT (renderer), "pixbuf",
- get_pixbuf_for_compact_flag (flags),
- NULL);
- }
-}
-
-void
_modest_header_view_header_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data)
{
{
TnyHeaderFlags flags;
guint date, date_col;
- gchar *display_date = NULL, *tmp_date = NULL;
+ gchar *display_date = NULL;
gboolean received = GPOINTER_TO_INT(user_data);
if (received)
date_col, &date,
-1);
- tmp_date = modest_text_utils_get_display_date (date);
- display_date = g_strdup_printf ("\n<small>%s</small>", tmp_date);
- g_object_set (G_OBJECT(renderer), "markup", display_date, NULL);
+ display_date = modest_text_utils_get_display_date (date);
+ g_object_set (G_OBJECT(renderer), "text", display_date, NULL);
set_common_flags (renderer, flags);
- g_free (tmp_date);
g_free (display_date);
}
-
void
_modest_header_view_sender_receiver_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
GtkTreeModel *tree_model, GtkTreeIter *iter, gboolean is_sender)
_modest_header_view_compact_header_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data)
{
- GObject *rendobj;
TnyHeaderFlags flags;
- gchar *address, *subject, *header, *display_address;
- gchar *parsed_address, *parsed_subject;
+ gchar *address, *subject, *header;
time_t date;
gboolean is_incoming;
+ GtkCellRenderer *recipient_cell, *date_cell, *subject_cell,
+ *attach_cell, *priority_cell,
+ *recipient_box, *subject_box;
+ gchar *display_date = NULL, *tmp_date = NULL;
+
+ recipient_box = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (renderer), "recpt-box-renderer"));
+ subject_box = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (renderer), "subject-box-renderer"));
+ priority_cell = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (subject_box), "priority-renderer"));
+ subject_cell = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (subject_box), "subject-renderer"));
+ attach_cell = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (recipient_box), "attach-renderer"));
+ recipient_cell = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (recipient_box), "recipient-renderer"));
+ date_cell = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (recipient_box), "date-renderer"));
is_incoming = GPOINTER_TO_INT(user_data); /* GPOINTER_TO_BOOLEAN is not available
* in older versions of glib...*/
TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN, &subject,
TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &date,
-1);
-
- rendobj = G_OBJECT(renderer);
- /* deal with empty subjects */
- if (!subject)
- subject = g_strdup (_("mail_va_no_subject"));
-
- /* Escape special characteres to allow pango makup`*/
- display_address = modest_text_utils_get_display_address (address);
- parsed_address = _pango_parse_string (display_address);
- parsed_subject = _pango_parse_string (subject);
+ /* flags */
+ if (flags & TNY_HEADER_FLAG_ATTACHMENTS)
+ g_object_set (G_OBJECT (attach_cell), "pixbuf",
+ get_pixbuf_for_flag (TNY_HEADER_FLAG_ATTACHMENTS),
+ NULL);
+ else
+ g_object_set (G_OBJECT (attach_cell), "pixbuf",
+ NULL, NULL);
+ if (flags & TNY_HEADER_FLAG_PRIORITY)
+ g_object_set (G_OBJECT (priority_cell), "pixbuf",
+ get_pixbuf_for_flag (flags & TNY_HEADER_FLAG_PRIORITY),
+ NULL);
+ else
+ g_object_set (G_OBJECT (priority_cell), "pixbuf",
+ NULL, NULL);
+ header = g_markup_printf_escaped ("%s", (subject && strlen (subject)) ? subject : _("mail_va_no_subject"));
+ g_free (subject);
+ g_object_set (G_OBJECT (subject_cell), "markup", header, NULL);
+ set_common_flags (subject_cell, flags);
- header = g_strdup_printf ("%s\n<small>%s</small>",
- parsed_subject,
- parsed_address);
+ header = g_markup_printf_escaped ("<small>%s</small>", modest_text_utils_get_display_address (address));
g_free (address);
- g_free (subject);
- g_free(parsed_subject);
- g_free(parsed_address);
+ g_object_set (G_OBJECT (recipient_cell), "markup", header, NULL);
- g_object_set (rendobj, "markup", header, NULL);
- set_common_flags (renderer, flags);
+ g_object_set (G_OBJECT (recipient_cell), "markup", header, NULL);
+ set_common_flags (recipient_cell, flags);
+
+ /* in some rare cases, mail might have no Date: field. it case,
+ * don't show the date, instead of bogus 1/1/1970
+ */
+ if (date)
+ tmp_date = modest_text_utils_get_display_date (date);
+ else
+ tmp_date = g_strdup ("");
+
+ display_date = g_strdup_printf ("<small>%s</small>", tmp_date);
+ g_object_set (G_OBJECT (date_cell), "markup", display_date, NULL);
+ g_free (tmp_date);
+ g_free (display_date);
+ set_common_flags (date_cell, flags);
g_free (header);
}
void
_modest_header_view_status_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
- GtkTreeModel *tree_model, GtkTreeIter *iter,
- gpointer user_data)
+ GtkTreeModel *tree_model, GtkTreeIter *iter,
+ gpointer user_data)
{
TnyHeaderFlags flags;
- guint status;
+ //guint status;
gchar *status_str;
gtk_tree_model_get (tree_model, iter,
- TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags,
- TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN, &status,
+ TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags,
+ // TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN, &status,
-1);
-/* size_str = modest_text_utils_get_display_size (size); */
status_str = g_strdup(_("mcen_li_outbox_waiting"));
g_object_set (G_OBJECT(renderer), "text", status_str, NULL);