was required to keep compatibility with 1-row style view.
* Change configuration header setting to load new compact columns.
* Use strftime to build date/time strings.
* Parse special character in subjects and mail addresses for allowing
pango markup tags to format two style rows view.
pmo-trunk-r1612
static const FolderCols INBOX_COLUMNS_TWOLINES[] = {
{MODEST_HEADER_VIEW_COLUMN_COMPACT_FLAG, 40},
{MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN, 180},
- {MODEST_HEADER_VIEW_COLUMN_RECEIVED_DATE, 240}
+ {MODEST_HEADER_VIEW_COLUMN_COMPACT_RECEIVED_DATE, 240}
};
static const FolderCols OUTBOX_COLUMNS_DETAILS[] = {
static const FolderCols SENT_COLUMNS_TWOLINES[] = {
{MODEST_HEADER_VIEW_COLUMN_COMPACT_FLAG, 40},
{MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT,180},
- {MODEST_HEADER_VIEW_COLUMN_SENT_DATE, 240}
+ {MODEST_HEADER_VIEW_COLUMN_COMPACT_SENT_DATE, 240}
};
#ifdef MODEST_PLATFORM_MAEMO
modest_text_utils_strftime(char *s, gsize max, const char *fmt, time_t timet)
{
struct tm tm;
-/* static GDate date; */
/* does not work on old maemo glib:
* g_date_set_time_t (&date, timet);
*/
-/* g_date_set_time (&date, (GTime) timet); */
localtime_r (&timet, &tm);
-/* return g_date_strftime (s, max, fmt, (const GDate*) &date); */
return strftime(s, max, fmt, &tm);
}
GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data);
void _modest_header_view_date_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data);
+void _modest_header_view_compact_date_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
+ GtkTreeModel *tree_model, GtkTreeIter *iter,
+ gpointer user_data);
void _modest_header_view_size_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data);
void _modest_header_view_status_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
static gchar *
-_pango_parse_string (const gchar *string) {
+_pango_replace_string (const gchar *string,
+ const gchar *in,
+ const gchar *out)
+{
gchar **tmp = NULL;
- gchar *parsed_string = NULL;
+ gchar *new_string = NULL;
gchar *tmp_string = NULL;
guint i = 0;
- tmp = g_strsplit(string, "&", 0);
- parsed_string = g_strdup(tmp[i]);
+ /* Split data */
+ if (string == NULL) return g_strdup("");
+ tmp = g_strsplit(string, in, 0);
+ if (tmp[0] == NULL) return g_strdup(string);
+
+ /* Replace and concat data*/
+ new_string = g_strdup(tmp[0]);
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);
+ tmp_string = g_strconcat (new_string, out, tmp[i], NULL);
+ g_free(new_string);
+ new_string = g_strdup(tmp_string);
+ g_free(tmp_string);
}
+
+ /* Free */
+ g_strfreev(tmp);
+
+ return new_string;
+}
+
+static gchar *
+_pango_parse_string (const gchar *string)
+{
+ gchar *parsed_string = NULL;
+ gchar *tmp = NULL;
+
+ if (string == NULL) return g_strdup("");
+ parsed_string = g_strdup(string);
+
+ /* Check for '&' special character */
+ tmp = g_strdup(parsed_string);
+ g_free(parsed_string);
+ parsed_string = _pango_replace_string (tmp, "&", "&");
+ g_free(tmp);
+
+ /* Check for '<' special character */
+ tmp = g_strdup(parsed_string);
+ g_free(parsed_string);
+ parsed_string = _pango_replace_string (tmp, "<", "<");
+ g_free(tmp);
+
+ /* Check for '>' special character */
+ tmp = g_strdup(parsed_string);
+ g_free(parsed_string);
+ parsed_string = _pango_replace_string (tmp, ">", ">");
+ g_free(tmp);
+
+ /* Check for ''' special character */
+ tmp = g_strdup(parsed_string);
+ g_free(parsed_string);
+ parsed_string = _pango_replace_string (tmp, "'", "'");
+ g_free(tmp);
return parsed_string;
}
GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data)
{
TnyHeaderFlags flags;
+ GdkPixbuf* pixbuf = NULL;
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);
- }
+
+ pixbuf = get_pixbuf_for_compact_flag (flags);
+ if (pixbuf != NULL)
+ g_object_set (G_OBJECT (renderer), "pixbuf", pixbuf, NULL);
+
}
void
{
TnyHeaderFlags flags;
guint date, date_col;
+ gchar *display_date = NULL;
+ gboolean received = GPOINTER_TO_INT(user_data);
+
+ if (received)
+ date_col = TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN;
+ else
+ date_col = TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN;
+
+ gtk_tree_model_get (tree_model, iter,
+ TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags,
+ date_col, &date,
+ -1);
+
+ 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 (display_date);
+}
+
+void
+_modest_header_view_compact_date_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;
gboolean received = GPOINTER_TO_INT(user_data);
g_free (display_date);
}
-
void
_modest_header_view_sender_receiver_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
GtkTreeModel *tree_model, GtkTreeIter *iter, gboolean is_sender)
break;
case MODEST_HEADER_VIEW_COLUMN_RECEIVED_DATE:
- column = get_new_column (_("Received"), renderer_compact_date, FALSE,
+ column = get_new_column (_("Received"), renderer_header, TRUE,
TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN,
TRUE,
(GtkTreeCellDataFunc)_modest_header_view_date_cell_data,
GINT_TO_POINTER(TRUE));
- gtk_tree_view_column_set_fixed_width (column, 130);
break;
- case MODEST_HEADER_VIEW_COLUMN_SENT_DATE:
- column = get_new_column (_("Sent"), renderer_compact_date, FALSE,
+ case MODEST_HEADER_VIEW_COLUMN_SENT_DATE:
+ column = get_new_column (_("Sent"), renderer_header, TRUE,
TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN,
TRUE,
(GtkTreeCellDataFunc)_modest_header_view_date_cell_data,
GINT_TO_POINTER(FALSE));
+ break;
+
+ case MODEST_HEADER_VIEW_COLUMN_COMPACT_RECEIVED_DATE:
+ column = get_new_column (_("Received"), renderer_compact_date, FALSE,
+ TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN,
+ TRUE,
+ (GtkTreeCellDataFunc)_modest_header_view_compact_date_cell_data,
+ GINT_TO_POINTER(TRUE));
gtk_tree_view_column_set_fixed_width (column, 130);
break;
+ case MODEST_HEADER_VIEW_COLUMN_COMPACT_SENT_DATE:
+ column = get_new_column (_("Sent"), renderer_compact_date, FALSE,
+ TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN,
+ TRUE,
+ (GtkTreeCellDataFunc)_modest_header_view_compact_date_cell_data,
+ GINT_TO_POINTER(FALSE));
+ gtk_tree_view_column_set_fixed_width (column, 130);
+ break;
case MODEST_HEADER_VIEW_COLUMN_SIZE:
column = get_new_column (_("Size"), renderer_header, TRUE,
TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN,
MODEST_HEADER_VIEW_COLUMN_ATTACH,
MODEST_HEADER_VIEW_COLUMN_SIZE,
MODEST_HEADER_VIEW_COLUMN_STATUS,
+
/*
* these two are for compact display on small devices,
* with two line display with all relevant headers
MODEST_HEADER_VIEW_COLUMN_COMPACT_FLAG, /* priority and attachments */
MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN, /* incoming mail */
MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT, /* outgoing mail */
+ MODEST_HEADER_VIEW_COLUMN_COMPACT_SENT_DATE,
+ MODEST_HEADER_VIEW_COLUMN_COMPACT_RECEIVED_DATE,
MODEST_HEADER_VIEW_COLUMN_NUM