#include <modest-hbox-cell-renderer.h>
#include <modest-vbox-cell-renderer.h>
#include <modest-datetime-formatter.h>
+#include <modest-ui-constants.h>
static void modest_header_view_class_init (ModestHeaderViewClass *klass);
static void modest_header_view_init (ModestHeaderView *obj);
ModestDatetimeFormatter *datetime_formatter;
+ GtkCellRenderer *renderer_subject;
GtkCellRenderer *renderer_address;
GtkCellRenderer *renderer_date_status;
};
gboolean
modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, TnyFolderType type)
{
- GtkTreeModel *tree_filter, *sortable;
+ GtkTreeModel *sortable;
GtkTreeViewColumn *column=NULL;
GtkTreeSelection *selection = NULL;
GtkCellRenderer *renderer_header,
*renderer_attach, *renderer_compact_date_or_status;
GtkCellRenderer *renderer_compact_header, *renderer_recpt_box,
- *renderer_subject, *renderer_subject_box, *renderer_recpt,
+ *renderer_subject_box, *renderer_recpt,
*renderer_priority;
ModestHeaderViewPrivate *priv;
GtkTreeViewColumn *compact_column = NULL;
renderer_subject_box = modest_hbox_cell_renderer_new ();
renderer_recpt = gtk_cell_renderer_text_new ();
priv->renderer_address = renderer_recpt;
- renderer_subject = gtk_cell_renderer_text_new ();
+ priv->renderer_subject = gtk_cell_renderer_text_new ();
renderer_compact_date_or_status = gtk_cell_renderer_text_new ();
priv->renderer_date_status = renderer_compact_date_or_status;
g_object_set_data (G_OBJECT (renderer_compact_header), "recpt-box-renderer", renderer_recpt_box);
modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_subject_box), renderer_priority, FALSE);
g_object_set_data (G_OBJECT (renderer_subject_box), "priority-renderer", renderer_priority);
- modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_subject_box), renderer_subject, TRUE);
- g_object_set_data (G_OBJECT (renderer_subject_box), "subject-renderer", renderer_subject);
+ modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_subject_box), priv->renderer_subject, TRUE);
+ g_object_set_data (G_OBJECT (renderer_subject_box), "subject-renderer", priv->renderer_subject);
modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_recpt_box), renderer_attach, FALSE);
g_object_set_data (G_OBJECT (renderer_recpt_box), "attach-renderer", renderer_attach);
modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_recpt_box), renderer_recpt, TRUE);
modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_recpt_box), renderer_compact_date_or_status, FALSE);
g_object_set_data (G_OBJECT (renderer_recpt_box), "date-renderer", renderer_compact_date_or_status);
+#ifdef MODEST_TOOLKIT_HILDON2
+ g_object_set (G_OBJECT (renderer_compact_header), "xpad", 0, NULL);
+#endif
g_object_set (G_OBJECT (renderer_subject_box), "yalign", 1.0, NULL);
#ifndef MODEST_TOOLKIT_GTK
gtk_cell_renderer_set_fixed_size (renderer_subject_box, -1, 32);
g_object_set(G_OBJECT(renderer_header),
"ellipsize", PANGO_ELLIPSIZE_END,
NULL);
- g_object_set (G_OBJECT (renderer_subject),
+ g_object_set (G_OBJECT (priv->renderer_subject),
"ellipsize", PANGO_ELLIPSIZE_END, "yalign", 1.0,
NULL);
- gtk_cell_renderer_text_set_fixed_height_from_font (GTK_CELL_RENDERER_TEXT (renderer_subject), 1);
+ gtk_cell_renderer_text_set_fixed_height_from_font (GTK_CELL_RENDERER_TEXT (priv->renderer_subject), 1);
g_object_set (G_OBJECT (renderer_recpt),
- "ellipsize", PANGO_ELLIPSIZE_END, "yalign", 0.0,
+ "ellipsize", PANGO_ELLIPSIZE_END, "yalign", 0.1,
NULL);
gtk_cell_renderer_text_set_fixed_height_from_font (GTK_CELL_RENDERER_TEXT (renderer_recpt), 1);
g_object_set(G_OBJECT(renderer_compact_date_or_status),
- "xalign", 1.0, "yalign", 0.0,
+ "xalign", 1.0, "yalign", 0.1,
NULL);
gtk_cell_renderer_text_set_fixed_height_from_font (GTK_CELL_RENDERER_TEXT (renderer_compact_date_or_status), 1);
+#ifdef MODEST_TOOLKIT_HILDON2
+ g_object_set (G_OBJECT (renderer_priority),
+ "yalign", 0.5,
+ "xalign", 0.0, NULL);
+ g_object_set (G_OBJECT (renderer_attach),
+ "yalign", 0.5,
+ "xalign", 0.0, NULL);
+#else
g_object_set (G_OBJECT (renderer_priority),
- "yalign", 1.0, NULL);
+ "yalign", 0.5, NULL);
g_object_set (G_OBJECT (renderer_attach),
"yalign", 0.0, NULL);
+#endif
-#ifndef MODEST_TOOLKIT_GTK
+#ifdef MODEST_TOOLKIT_HILDON1
gtk_cell_renderer_set_fixed_size (renderer_attach, 32, 26);
gtk_cell_renderer_set_fixed_size (renderer_priority, 32, 26);
gtk_cell_renderer_set_fixed_size (renderer_compact_header, -1, 64);
+#elif MODEST_TOOLKIT_HILDON2
+ gtk_cell_renderer_set_fixed_size (renderer_attach, 24 + MODEST_MARGIN_DEFAULT, 26);
+ gtk_cell_renderer_set_fixed_size (renderer_priority, 24 + MODEST_MARGIN_DEFAULT, 26);
+ gtk_cell_renderer_set_fixed_size (renderer_compact_header, -1, 64);
#else
gtk_cell_renderer_set_fixed_size (renderer_attach, 16, 16);
gtk_cell_renderer_set_fixed_size (renderer_priority, 16, 16);
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
gtk_tree_selection_set_mode(selection, GTK_SELECTION_MULTIPLE);
- tree_filter = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
- sortable = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER(tree_filter));
+ sortable = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
/* Add new columns */
for (cursor = columns; cursor; cursor = g_list_next(cursor)) {
}
if (sortable) {
- gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(sortable),
+ gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (sortable),
TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN,
(GtkTreeIterCompareFunc) cmp_rows,
compact_column, NULL);
modest_header_view_get_selected_headers (ModestHeaderView *self)
{
GtkTreeSelection *sel;
- ModestHeaderViewPrivate *priv;
TnyList *header_list = NULL;
TnyHeader *header;
GList *list, *tmp = NULL;
g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), NULL);
- priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
/* Get selected rows */
sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
set_folder_intern_get_headers_async_cb,
NULL, self);
- sortable = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL(headers));
- g_object_unref (G_OBJECT (headers));
+ /* Create a tree model filter to hide and show rows for cut operations */
+ filter_model = gtk_tree_model_filter_new (GTK_TREE_MODEL (headers), NULL);
+ gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (filter_model),
+ filter_row, self, NULL);
+ g_object_unref (headers);
/* Init filter_row function to examine empty status */
priv->status = HEADER_VIEW_INIT;
- /* Create a tree model filter to hide and show rows for cut operations */
- filter_model = gtk_tree_model_filter_new (sortable, NULL);
- gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (filter_model),
- filter_row,
- self,
- NULL);
- g_object_unref (G_OBJECT (sortable));
+ /* Create sortable model */
+ sortable = gtk_tree_model_sort_new_with_model (filter_model);
/* install our special sorting functions */
cursor = cols = gtk_tree_view_get_columns (GTK_TREE_VIEW(self));
type = modest_tny_folder_guess_folder_type (folder);
if (type == TNY_FOLDER_TYPE_INVALID)
g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__);
-
+
sort_colid = modest_header_view_get_sort_column_id (self, type);
sort_type = modest_header_view_get_sort_type (self, type);
- gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable),
+ gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sortable),
sort_colid,
sort_type);
- gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(sortable),
+ gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (sortable),
TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN,
(GtkTreeIterCompareFunc) cmp_rows,
cols->data, NULL);
- gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(sortable),
+ gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (sortable),
TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN,
(GtkTreeIterCompareFunc) cmp_subject_rows,
cols->data, NULL);
}
/* Set new model */
- gtk_tree_view_set_model (GTK_TREE_VIEW (self), filter_model);
- modest_header_view_notify_observers(self, GTK_TREE_MODEL(filter_model),
- tny_folder_get_id(folder));
- g_object_unref (G_OBJECT (filter_model));
+ gtk_tree_view_set_model (GTK_TREE_VIEW (self), sortable);
+ modest_header_view_notify_observers (self, sortable, tny_folder_get_id (folder));
+ g_object_unref (sortable);
/* Free */
g_list_free (cols);
GtkSortType sort_type)
{
ModestHeaderViewPrivate *priv = NULL;
- GtkTreeModel *tree_filter, *sortable = NULL;
+ GtkTreeModel *sortable = NULL;
TnyFolderType type;
g_return_if_fail (self && MODEST_IS_HEADER_VIEW(self));
g_return_if_fail (sort_type == GTK_SORT_ASCENDING || sort_type == GTK_SORT_DESCENDING);
/* Get model and private data */
- priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
- tree_filter = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
- sortable = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER(tree_filter));
-/* sortable = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); */
+ priv = MODEST_HEADER_VIEW_GET_PRIVATE (self);
+ sortable = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
/* Sort tree model */
type = modest_tny_folder_guess_folder_type (priv->folder);
if (type == TNY_FOLDER_TYPE_INVALID)
g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__);
else {
- gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable),
- sort_colid,
- sort_type);
+ gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sortable),
+ sort_colid,
+ sort_type);
/* Store new sort parameters */
modest_header_view_set_sort_params (self, sort_colid, sort_type, type);
}
ModestMailOperationStatus st = modest_mail_operation_get_status (mail_op);
/* If the mail op has been cancelled then it's not an error: don't show any message */
if (st != MODEST_MAIL_OPERATION_STATUS_CANCELED) {
- modest_platform_information_banner (NULL, NULL,
- dgettext("ke-recv",
- "cerm_device_memory_full"));
+ gchar *msg = g_strdup_printf (_KR("cerm_device_memory_full"), "");
+ modest_platform_information_banner (NULL, NULL, msg);
+ g_free (msg);
}
}
}
folder_refreshed_cb (mail_op, folder, info);
}
/* Free */
- g_object_unref (mail_op);
+ if (mail_op)
+ g_object_unref (mail_op);
} else {
g_mutex_lock (priv->observers_lock);
GtkTreeViewColumn *column, gpointer userdata)
{
ModestHeaderView *self = NULL;
- ModestHeaderViewPrivate *priv = NULL;
GtkTreeIter iter;
GtkTreeModel *model = NULL;
TnyHeader *header = NULL;
TnyHeaderFlags flags;
self = MODEST_HEADER_VIEW (treeview);
- priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
model = gtk_tree_view_get_model (treeview);
if ((path == NULL) || (!gtk_tree_model_get_iter(model, &iter, path)))
GtkTreePath *path = NULL;
GtkTreeIter iter;
ModestHeaderView *self;
- ModestHeaderViewPrivate *priv;
GList *selected = NULL;
g_return_if_fail (sel);
g_return_if_fail (user_data);
self = MODEST_HEADER_VIEW (user_data);
- priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
selected = gtk_tree_selection_get_selected_rows (sel, &model);
if (selected != NULL)
gint t1, t2;
gint val1, val2;
gint cmp;
-/* static int counter = 0; */
g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN(user_data), 0);
-/* col_id = gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (tree_model)); */
col_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(user_data), MODEST_HEADER_VIEW_FLAG_SORT));
gtk_tree_model_get_value (model, iter, TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &value);
header = (TnyHeader *) g_value_get_object (&value);
g_value_unset (&value);
-
+
+ /* Get message id from header (ensure is a valid id) */
+ if (!header) {
+ visible = FALSE;
+ goto frees;
+ }
+
/* Hide deleted and mark as deleted heders */
if (flags & TNY_HEADER_FLAG_DELETED ||
flags & TNY_HEADER_FLAG_EXPUNGED) {
if (modest_email_clipboard_cleared(priv->clipboard)) {
visible = TRUE;
goto frees;
- }
-
- /* Get message id from header (ensure is a valid id) */
- if (!header) {
- visible = FALSE;
- goto frees;
}
-
+
/* Check hiding */
if (priv->hidding_ids != NULL) {
id = tny_header_dup_message_id (header);
for (i=0; i < priv->n_selected && !found; i++)
if (priv->hidding_ids[i] != NULL && id != NULL)
found = (!strcmp (priv->hidding_ids[i], id));
-
+
visible = !found;
g_free(id);
}
old_status = priv->status;
priv->status = ((gboolean) priv->status) && !visible;
if ((priv->notify_status) && (priv->status != old_status)) {
- NotifyFilterInfo *info;
-
if (priv->status_timeout)
g_source_remove (priv->status_timeout);
- info = g_slice_new0 (NotifyFilterInfo);
- info->self = g_object_ref (G_OBJECT (user_data));
- info->folder = tny_header_get_folder (header);
- priv->status_timeout = g_timeout_add_full (G_PRIORITY_DEFAULT, 1000,
- notify_filter_change,
- info,
- notify_filter_change_destroy);
+ if (header) {
+ NotifyFilterInfo *info;
+
+ info = g_slice_new0 (NotifyFilterInfo);
+ info->self = g_object_ref (G_OBJECT (user_data));
+ if (header)
+ info->folder = tny_header_get_folder (header);
+ priv->status_timeout = g_timeout_add_full (G_PRIORITY_DEFAULT, 1000,
+ notify_filter_change,
+ info,
+ notify_filter_change_destroy);
+ }
}
return visible;
{
ModestHeaderViewPrivate *priv;
GdkColor style_color;
+ GdkColor style_active_color;
PangoAttrList *attr_list;
GtkStyle *style;
PangoAttribute *attr;
+ GdkColor *new_color;
g_return_if_fail (MODEST_IS_HEADER_VIEW (self));
priv = MODEST_HEADER_VIEW_GET_PRIVATE (self);
"attributes", attr_list,
NULL);
pango_attr_list_unref (attr_list);
+ } else {
+ g_object_set (G_OBJECT (priv->renderer_address),
+ "foreground-gdk", &style_color,
+ "foreground-set", TRUE,
+ "scale", PANGO_SCALE_SMALL,
+ "scale-set", TRUE,
+ NULL);
+ g_object_set (G_OBJECT (priv->renderer_date_status),
+ "foreground-gdk", &style_color,
+ "foreground-set", TRUE,
+ "scale", PANGO_SCALE_SMALL,
+ "scale-set", TRUE,
+ NULL);
}
+
+ if (gtk_style_lookup_color (GTK_WIDGET (self)->style, "ActiveTextColor", &style_active_color)) {
+ new_color = gdk_color_copy (&style_active_color);
+ } else {
+ new_color = NULL;
+ }
+#ifdef MODEST_TOOLKIT_HILDON2
+ g_object_set_data (G_OBJECT (priv->renderer_subject), BOLD_IS_ACTIVE_COLOR, GINT_TO_POINTER (new_color != NULL));
+ g_object_set_data_full (G_OBJECT (priv->renderer_subject), ACTIVE_COLOR, new_color, (GDestroyNotify) gdk_color_free);
+#endif
}
projects / modest / blobdiff