#include <tny-simple-list.h>
#include <modest-header-view.h>
#include <modest-header-view-priv.h>
+#include <modest-defs.h>
#include <modest-icon-names.h>
#include <modest-text-utils.h>
#include <modest-tny-account-store.h>
#include <modest-platform.h>
#include <string.h>
-typedef enum {
- RENDER_CELL_STYLE_DEFAULT=0,
- RENDER_CELL_STYLE_GREY
-} RenderCellStyle;
+#ifdef MODEST_TOOLKIT_HILDON2
+#define SMALL_ICON_SIZE MODEST_ICON_SIZE_XSMALL
+#else
+#define SMALL_ICON_SIZE MODEST_ICON_SIZE_SMALL
+#endif
static const gchar *
get_status_string (ModestTnySendQueueStatus status)
case TNY_HEADER_FLAG_DELETED:
if (G_UNLIKELY(!deleted_pixbuf))
deleted_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_DELETED,
- MODEST_ICON_SIZE_SMALL);
+ SMALL_ICON_SIZE);
return deleted_pixbuf;
case TNY_HEADER_FLAG_SEEN:
if (G_UNLIKELY(!seen_pixbuf))
seen_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_READ,
- MODEST_ICON_SIZE_SMALL);
+ SMALL_ICON_SIZE);
return seen_pixbuf;
case TNY_HEADER_FLAG_ATTACHMENTS:
if (G_UNLIKELY(!attachments_pixbuf))
attachments_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_ATTACH,
- MODEST_ICON_SIZE_SMALL);
+ SMALL_ICON_SIZE);
return attachments_pixbuf;
case TNY_HEADER_FLAG_HIGH_PRIORITY:
if (G_UNLIKELY(!high_pixbuf))
high_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_HIGH,
- MODEST_ICON_SIZE_SMALL);
+ SMALL_ICON_SIZE);
return high_pixbuf;
case TNY_HEADER_FLAG_LOW_PRIORITY:
if (G_UNLIKELY(!low_pixbuf))
low_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_LOW,
- MODEST_ICON_SIZE_SMALL);
+ SMALL_ICON_SIZE);
return low_pixbuf;
case TNY_HEADER_FLAG_NORMAL_PRIORITY:
return NULL;
default:
if (G_UNLIKELY(!unread_pixbuf))
unread_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_UNREAD,
- MODEST_ICON_SIZE_SMALL);
+ SMALL_ICON_SIZE);
return unread_pixbuf;
}
}
static void
set_cell_text (GtkCellRenderer *renderer,
const gchar *text,
- TnyHeaderFlags flags,
- RenderCellStyle style)
+ TnyHeaderFlags flags)
{
PangoWeight weight;
gboolean strikethrough;
"weight", (flags & TNY_HEADER_FLAG_SEEN) ? PANGO_WEIGHT_NORMAL : PANGO_WEIGHT_ULTRABOLD,
"strikethrough", (flags &TNY_HEADER_FLAG_DELETED) ? TRUE : FALSE,
NULL);
- switch (style) {
- case RENDER_CELL_STYLE_GREY:
- g_object_set (G_OBJECT (renderer),
- "foreground", "#666666",
- "scale", PANGO_SCALE_SMALL,
- NULL);
- break;
- case RENDER_CELL_STYLE_DEFAULT:
- break;
- }
g_object_thaw_notify (G_OBJECT (renderer));
}
-
-void
-_modest_header_view_msgtype_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_DELETED)
- g_object_set (G_OBJECT (renderer), "pixbuf",
- get_pixbuf_for_flag (TNY_HEADER_FLAG_DELETED), NULL);
- else if (flags & TNY_HEADER_FLAG_SEEN)
- g_object_set (G_OBJECT (renderer), "pixbuf",
- get_pixbuf_for_flag (TNY_HEADER_FLAG_SEEN), NULL);
- else
- g_object_set (G_OBJECT (renderer), "pixbuf",
- get_pixbuf_for_flag (0), NULL); /* ughh, FIXME */
-}
-
void
_modest_header_view_attach_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data)
TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags,
date_col, &date,
-1);
-
+
+#if GTK_CHECK_VERSION (2, 12, 0)
+ ModestHeaderView *header_view;
+ header_view = MODEST_HEADER_VIEW (gtk_tree_view_column_get_tree_view (column));
+ set_cell_text (renderer,
+ _modest_header_view_get_display_date (header_view, date),
+ flags);
+#else
set_cell_text (renderer, modest_text_utils_get_display_date (date),
- flags, RENDER_CELL_STYLE_DEFAULT);
+ flags);
+#endif
}
void
-1);
modest_text_utils_get_display_address (address); /* string is changed in-place */
- set_cell_text (renderer, address, flags, RENDER_CELL_STYLE_DEFAULT);
+
+ set_cell_text (renderer, (address && address[0] != '\0')?address:_("mail_va_no_to"),
+ flags);
g_free (address);
}
/*
gchar *address = NULL;
gchar *subject = NULL;
time_t date;
+
+#ifdef MAEMO_CHANGES
+#ifdef HAVE_GTK_TREE_VIEW_COLUMN_GET_CELL_DATA_HINT
+ GtkTreeCellDataHint hint;
+#endif
+#endif
GtkCellRenderer *recipient_cell, *date_or_status_cell, *subject_cell,
*attach_cell, *priority_cell,
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (column));
g_return_if_fail (GTK_IS_CELL_RENDERER (renderer));
g_return_if_fail (GTK_IS_TREE_MODEL (tree_model));
+
+#ifdef MAEMO_CHANGES
+#ifdef HAVE_GTK_TREE_VIEW_COLUMN_GET_CELL_DATA_HINT
+ hint = gtk_tree_view_column_get_cell_data_hint (GTK_TREE_VIEW_COLUMN (column));
+
+ if (hint != GTK_TREE_CELL_DATA_HINT_ALL)
+ return;
+#endif
+#endif
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"));
NULL);
set_cell_text (subject_cell, (subject && subject[0] != 0)?subject:_("mail_va_no_subject"),
- flags, RENDER_CELL_STYLE_DEFAULT);
+ flags);
g_free (subject);
/* FIXME: we hardcode the color to #666666; instead we should use SecondaryTextColour from the
* theme (gtkrc file) */
modest_text_utils_get_display_address (address); /* changed in-place */
- set_cell_text (recipient_cell, address, flags, RENDER_CELL_STYLE_GREY);
+ set_cell_text (recipient_cell, (address && address[0] != '\0')?address:_("mail_va_no_to"), flags);
+ g_free (address);
if (header_mode == MODEST_HEADER_VIEW_COMPACT_HEADER_MODE_OUTBOX) {
ModestTnySendQueueStatus status = MODEST_TNY_SEND_QUEUE_UNKNOWN;
}
status_str = get_status_string (status);
- set_cell_text (date_or_status_cell, status_str, flags, RENDER_CELL_STYLE_GREY);
- } else {
- set_cell_text (date_or_status_cell, date ? modest_text_utils_get_display_date (date) : "",
- flags, RENDER_CELL_STYLE_GREY);
+ set_cell_text (date_or_status_cell, status_str, flags);
+ } else {
+#if GTK_CHECK_VERSION (2, 12, 0)
+ ModestHeaderView *header_view;
+ header_view = MODEST_HEADER_VIEW (gtk_tree_view_column_get_tree_view (column));
+ set_cell_text (date_or_status_cell,
+ date ? _modest_header_view_get_display_date (header_view, date) : "",
+ flags);
+#else
+ set_cell_text (date_or_status_cell,
+ date ? modest_text_utils_get_display_date (date) : "",
+ flags);
+#endif
}
-
if (msg_header != NULL)
g_object_unref (msg_header);
}
size_str = modest_text_utils_get_display_size (size);
- set_cell_text (renderer, size_str, flags, RENDER_CELL_STYLE_DEFAULT);
+ set_cell_text (renderer, size_str, flags);
g_free (size_str);
}
else
status_str = g_strdup(_("mcen_li_outbox_waiting"));
- set_cell_text (renderer, status_str, flags, RENDER_CELL_STYLE_DEFAULT);
+ set_cell_text (renderer, status_str, flags);
g_free (status_str);
}