#include <modest-widget-memory.h>
#include <modest-ui-actions.h>
#include "modest-dnd.h"
+#include <modest-ui-constants.h>
#include "widgets/modest-window.h"
/* Folder view drag types */
static void _clear_hidding_filter (ModestFolderView *folder_view);
+#ifndef MODEST_TOOLKIT_HILDON2
static void on_row_inserted_maybe_select_folder (GtkTreeModel *tree_model,
GtkTreePath *path,
GtkTreeIter *iter,
ModestFolderView *self);
+#endif
static void on_display_name_changed (ModestAccountMgr *self,
const gchar *account,
gpointer user_data);
+static void update_style (ModestFolderView *self);
+static void on_notify_style (GObject *obj, GParamSpec *spec, gpointer userdata);
+static gint get_cmp_pos (TnyFolderType t, TnyFolder *folder_store);
enum {
FOLDER_SELECTION_CHANGED_SIGNAL,
gboolean reselect; /* we use this to force a reselection of the INBOX */
gboolean show_non_move;
gboolean reexpand; /* next time we expose, we'll expand all root folders */
+
+ GtkCellRenderer *messages_renderer;
};
#define MODEST_FOLDER_VIEW_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE((o), \
}
static void
+format_compact_style (gchar **item_name,
+ GObject *instance,
+ gboolean bold,
+ gboolean *use_markup)
+{
+ TnyFolder *folder;
+ gboolean is_special;
+ TnyFolderType folder_type;
+
+ if (!TNY_IS_FOLDER (instance))
+ return;
+
+ folder = (TnyFolder *) instance;
+
+ folder_type = tny_folder_get_folder_type (folder);
+ is_special = (get_cmp_pos (folder_type, folder)!= 4);
+
+ if (!is_special) {
+ TnyAccount *account = tny_folder_get_account (folder);
+ const gchar *folder_name;
+ gboolean concat_folder_name = FALSE;
+ GString *buffer;
+
+ /* Should not happen */
+ if (account == NULL)
+ return;
+
+ folder_name = tny_folder_get_name (folder);
+ if (g_str_has_suffix (*item_name, folder_name)) {
+ gchar *offset = g_strrstr (*item_name, folder_name);
+ *offset = '\0';
+ concat_folder_name = TRUE;
+ }
+
+ buffer = g_string_new ("");
+ buffer = g_string_append (buffer, tny_account_get_name (account));
+ buffer = g_string_append (buffer, MODEST_FOLDER_PATH_SEPARATOR);
+ buffer = g_string_append (buffer, *item_name);
+ if (concat_folder_name) {
+ if (bold) buffer = g_string_append (buffer, "<span weight='bold'>");
+ buffer = g_string_append (buffer, folder_name);
+ if (bold) buffer = g_string_append (buffer, "</span>");
+ }
+ g_free (*item_name);
+ g_object_unref (account);
+
+ *item_name = g_string_free (buffer, FALSE);
+ *use_markup = bold;
+ } else {
+ *use_markup = FALSE;
+ }
+}
+
+static void
text_cell_data (GtkTreeViewColumn *column,
GtkCellRenderer *renderer,
GtkTreeModel *tree_model,
gchar *fname = NULL;
TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
GObject *instance = NULL;
+ gboolean use_markup = FALSE;
gtk_tree_model_get (tree_model, iter,
NAME_COLUMN, &fname,
}
if (priv->cell_style == MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT) {
- gchar * substring;
+ item_name = g_strdup (fname);
if (number > 0) {
- substring = g_strdup_printf (drafts?"TODO:%d messages":"TODO:%d new messages", number);
- item_name = g_strdup_printf ("<span weight='800'>%s</span>\n<span weight='800' size='x-small' color='grey'>%s</span>",
- fname, substring);
item_weight = 800;
} else {
- substring = g_strdup ("");
- item_name = g_strdup_printf ("%s\n<span size='x-small' color='grey'>%s</span>",
- fname, substring);
item_weight = 400;
}
- g_free (substring);
} else {
/* Use bold font style if there are unread or unset messages */
if (number > 0) {
if (!item_name)
item_name = g_strdup ("unknown");
+ if (priv->cell_style == MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT) {
+ /* Convert item_name to markup */
+ format_compact_style (&item_name, instance, item_weight == 800, &use_markup);
+ }
+
if (item_name && item_weight) {
/* Set the name in the treeview cell: */
- g_object_set (rendobj,"markup", item_name, "weight", item_weight, NULL);
+ if (use_markup)
+ g_object_set (rendobj, "markup", item_name, NULL);
+ else
+ g_object_set (rendobj, "text", item_name, "weight", item_weight, NULL);
/* Notify display name observers */
/* TODO: What listens for this signal, and how can it use only the new name? */
g_free (fname);
}
+static void
+messages_cell_data (GtkTreeViewColumn *column,
+ GtkCellRenderer *renderer,
+ GtkTreeModel *tree_model,
+ GtkTreeIter *iter,
+ gpointer data)
+{
+ ModestFolderView *self;
+ ModestFolderViewPrivate *priv;
+ GObject *rendobj = (GObject *) renderer;
+ TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
+ GObject *instance = NULL;
+ gchar *item_name = NULL;
+
+ gtk_tree_model_get (tree_model, iter,
+ TYPE_COLUMN, &type,
+ INSTANCE_COLUMN, &instance,
+ -1);
+ if (!instance)
+ goto end;
+
+ self = MODEST_FOLDER_VIEW (data);
+ priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
+
+
+ if (type != TNY_FOLDER_TYPE_ROOT) {
+ gint number = 0;
+ gboolean drafts;
+
+ if (modest_tny_folder_is_local_folder (TNY_FOLDER (instance)) ||
+ modest_tny_folder_is_memory_card_folder (TNY_FOLDER (instance))) {
+ type = modest_tny_folder_get_local_or_mmc_folder_type (TNY_FOLDER (instance));
+ } else {
+ /* Sometimes an special folder is reported by the server as
+ NORMAL, like some versions of Dovecot */
+ if (type == TNY_FOLDER_TYPE_NORMAL ||
+ type == TNY_FOLDER_TYPE_UNKNOWN) {
+ type = modest_tny_folder_guess_folder_type (TNY_FOLDER (instance));
+ }
+ }
+
+ /* note: we cannot reliably get the counts from the tree model, we need
+ * to use explicit calls on tny_folder for some reason.
+ */
+ /* Select the number to show: the unread or unsent messages. in case of outbox/drafts, show all */
+ if ((type == TNY_FOLDER_TYPE_DRAFTS) ||
+ (type == TNY_FOLDER_TYPE_OUTBOX) ||
+ (type == TNY_FOLDER_TYPE_MERGE)) { /* _OUTBOX actually returns _MERGE... */
+ number = tny_folder_get_all_count (TNY_FOLDER(instance));
+ drafts = TRUE;
+ } else {
+ number = tny_folder_get_unread_count (TNY_FOLDER(instance));
+ drafts = FALSE;
+ }
+
+ if (priv->cell_style == MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT) {
+ if (number > 0) {
+ item_name = g_strdup_printf (drafts?_("mcen_ti_messages"):_("mcen_ti_new_messages"),
+ number);
+ }
+ }
+
+ }
+
+ if (!item_name)
+ item_name = g_strdup ("");
+
+ if (item_name) {
+ /* Set the name in the treeview cell: */
+ g_object_set (rendobj,"text", item_name, NULL);
+
+ g_free (item_name);
+
+ }
+
+ end:
+ if (instance)
+ g_object_unref (G_OBJECT (instance));
+}
+
typedef struct {
GdkPixbuf *pixbuf;
type = modest_tny_folder_guess_folder_type (TNY_FOLDER (instance));
}
+ /* Remote folders should not be treated as special folders */
+ if (TNY_IS_FOLDER_STORE (instance) &&
+ type != TNY_FOLDER_TYPE_INBOX &&
+ modest_tny_folder_store_is_remote (TNY_FOLDER_STORE (instance))) {
+ return get_composite_icons (MODEST_FOLDER_ICON_NORMAL,
+ &normal_pixbuf,
+ &normal_pixbuf_open,
+ &normal_pixbuf_close);
+ }
+
switch (type) {
case TNY_FOLDER_TYPE_INVALID:
g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__);
GtkTreeViewColumn *column;
GtkCellRenderer *renderer;
GtkTreeSelection *sel;
+ ModestFolderViewPrivate *priv;
+
+ priv = MODEST_FOLDER_VIEW_GET_PRIVATE(treeview);
/* Create column */
column = gtk_tree_view_column_new ();
icon_cell_data, treeview, NULL);
renderer = gtk_cell_renderer_text_new();
- g_object_set (renderer, "ellipsize", PANGO_ELLIPSIZE_END,
- "ellipsize-set", TRUE, NULL);
+ g_object_set (renderer,
+#ifdef MODEST_TOOLKIT_HILDON2
+ "ellipsize", PANGO_ELLIPSIZE_MIDDLE,
+#else
+ "ellipsize", PANGO_ELLIPSIZE_END,
+#endif
+ "ellipsize-set", TRUE, NULL);
gtk_tree_view_column_pack_start (column, renderer, TRUE);
gtk_tree_view_column_set_cell_data_func(column, renderer,
text_cell_data, treeview, NULL);
+ priv->messages_renderer = gtk_cell_renderer_text_new ();
+ g_object_set (priv->messages_renderer,
+ "scale", PANGO_SCALE_X_SMALL,
+ "scale-set", TRUE,
+ "alignment", PANGO_ALIGN_RIGHT,
+ "align-set", TRUE,
+ "xalign", 1.0,
+ NULL);
+ gtk_tree_view_column_pack_start (column, priv->messages_renderer, FALSE);
+ gtk_tree_view_column_set_cell_data_func(column, priv->messages_renderer,
+ messages_cell_data, treeview, NULL);
+
/* Set selection mode */
sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(treeview));
gtk_tree_selection_set_mode (sel, GTK_SELECTION_SINGLE);
"key_changed",
G_CALLBACK(on_configuration_key_changed),
obj);
+
+ update_style (obj);
+ g_signal_connect (G_OBJECT (obj), "notify::style", G_CALLBACK (on_notify_style), (gpointer) obj);
+
+
}
static void
return FALSE;
if (TNY_IS_ACCOUNT (instance)) {
+#ifdef MODEST_TOOLKIT_HILDON2
+ /* In hildon 2.2 we don't show the account rows */
+ return FALSE;
+#else
TnyAccount *acc = TNY_ACCOUNT (instance);
const gchar *account_id = tny_account_get_id (acc);
-
+
/* If it isn't a special folder,
* don't show it unless it is the visible account: */
if (priv->style == MODEST_FOLDER_VIEW_STYLE_SHOW_ONE &&
!modest_tny_account_is_virtual_local_folders (acc) &&
strcmp (account_id, MODEST_MMC_ACCOUNT_ID)) {
-
+
/* Show only the visible account id */
if (priv->visible_account_id) {
if (strcmp (account_id, priv->visible_account_id))
retval = FALSE;
}
}
-
+
/* Never show these to the user. They are merged into one folder
* in the local-folders account instead: */
if (retval && MODEST_IS_TNY_OUTBOX_ACCOUNT (acc))
retval = FALSE;
+#endif
} else {
- GtkTreeIter parent;
-
- if (priv->style == MODEST_FOLDER_VIEW_STYLE_SHOW_ONE &&
- !gtk_tree_model_iter_parent (model, iter, &parent)) {
+ if (priv->style == MODEST_FOLDER_VIEW_STYLE_SHOW_ONE) {
/* Only show special folders for current account if needed */
if (TNY_IS_FOLDER (instance) && !TNY_IS_MERGE_FOLDER (instance)) {
TnyAccount *account;
retval = !found;
}
-
/* If this is a move to dialog, hide Sent, Outbox and Drafts
folder as no message can be move there according to UI specs */
if (!priv->show_non_move) {
#ifdef MODEST_TOOLKIT_HILDON2
model = tny_gtk_folder_list_store_new_with_flags (NULL,
TNY_GTK_FOLDER_LIST_STORE_FLAG_SHOW_PATH);
+ tny_gtk_folder_list_store_set_path_separator (TNY_GTK_FOLDER_LIST_STORE (model),
+ MODEST_FOLDER_PATH_SEPARATOR);
#else
model = tny_gtk_folder_store_tree_model_new (NULL);
#endif
/* Set new model */
gtk_tree_view_set_model (GTK_TREE_VIEW(self), filter_model);
+#ifndef MODEST_TOOLKIT_HILDON2
g_signal_connect (G_OBJECT(filter_model), "row-inserted",
(GCallback) on_row_inserted_maybe_select_folder, self);
+#endif
g_object_unref (model);
g_object_unref (filter_model);
}
static gint
-get_cmp_pos (TnyFolderType t)
+get_cmp_pos (TnyFolderType t, TnyFolder *folder_store)
{
+ TnyAccount *account;
+ gboolean is_special;
/* Inbox, Outbox, Drafts, Sent, User */
/* 0, 1, 2, 3, 4 */
+ if (!TNY_IS_FOLDER (folder_store))
+ return 4;
switch (t) {
case TNY_FOLDER_TYPE_INBOX:
- return 0;
- break;
+ {
+ account = tny_folder_get_account (folder_store);
+ is_special = (get_cmp_rows_type_pos (G_OBJECT (account)) == 0);
+ g_object_unref (account);
+ return is_special?0:4;
+ }
+ break;
case TNY_FOLDER_TYPE_OUTBOX:
- return 1;
- break;
- case TNY_FOLDER_TYPE_DRAFTS:
return 2;
break;
+ case TNY_FOLDER_TYPE_DRAFTS:
+ {
+ account = tny_folder_get_account (folder_store);
+ is_special = (get_cmp_rows_type_pos (G_OBJECT (account)) == 1);
+ g_object_unref (account);
+ return is_special?1:4;
+ }
+ break;
case TNY_FOLDER_TYPE_SENT:
- return 3;
- break;
+ {
+ account = tny_folder_get_account (folder_store);
+ is_special = (get_cmp_rows_type_pos (G_OBJECT (account)) == 1);
+ g_object_unref (account);
+ return is_special?3:4;
+ }
+ break;
default:
return 4;
}
if (!folder1 || !folder2)
goto finish;
- /* First sort by type. First the special folders, then the archives */
- cmp = get_cmp_pos (type) - get_cmp_pos (type2);
- if (cmp != 0) {
- /* Special folders from remote accounts (Drafts,
- Sentbox...) except Inbox must not be listed at the
- beginning but inside their accounts as the other
- normal folders */
- if (cmp < 0) {
- if ((type == TNY_FOLDER_TYPE_INBOX) ||
- !modest_tny_folder_store_is_remote (TNY_FOLDER_STORE (folder1)))
- goto finish;
- } else {
- if ((type2 == TNY_FOLDER_TYPE_INBOX) ||
- !modest_tny_folder_store_is_remote (TNY_FOLDER_STORE (folder2)))
- goto finish;
- }
- }
+ /* Sort by type. First the special folders, then the archives */
+ cmp = get_cmp_pos (type, (TnyFolder *) folder1) - get_cmp_pos (type2, (TnyFolder *) folder2);
+ if (cmp != 0)
+ goto finish;
/* Now we sort using the account of each folder */
cmp = compare_accounts (TNY_FOLDER_STORE (folder1), TNY_FOLDER_STORE (folder2));
return FALSE;
}
-
+#ifndef MODEST_TOOLKIT_HILDON2
static void
on_row_inserted_maybe_select_folder (GtkTreeModel *tree_model,
GtkTreePath *path,
TYPE_COLUMN, &type,
INSTANCE_COLUMN, &instance,
-1);
+
+ if (!instance)
+ return;
+
if (type == TNY_FOLDER_TYPE_INBOX && priv->folder_to_select == NULL) {
priv->folder_to_select = g_object_ref (instance);
}
gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (tree_model));
}
}
-
+#endif
void
modest_folder_view_disable_next_folder_selection (ModestFolderView *self)
NULL);
/* Set copied model */
gtk_tree_view_set_model (GTK_TREE_VIEW (folder_view_dst), new_filter_model);
+#ifndef MODEST_TOOLKIT_HILDON2
g_signal_connect (G_OBJECT(new_filter_model), "row-inserted",
(GCallback) on_row_inserted_maybe_select_folder, folder_view_dst);
+#endif
/* Free */
g_object_unref (new_filter_model);
priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
priv->cell_style = cell_style;
+
+ g_object_set (G_OBJECT (priv->messages_renderer),
+ "visible", (cell_style == MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT),
+ NULL);
gtk_widget_queue_draw (GTK_WIDGET (self));
}
+
+static void
+update_style (ModestFolderView *self)
+{
+ ModestFolderViewPrivate *priv;
+ GdkColor style_color;
+
+ g_return_if_fail (MODEST_IS_FOLDER_VIEW (self));
+ priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
+
+ if (!gtk_style_lookup_color (GTK_WIDGET (self)->style, "SecondaryTextColor", &style_color)) {
+ gdk_color_parse ("grey", &style_color);
+ }
+
+ g_object_set (G_OBJECT (priv->messages_renderer),
+ "foreground-gdk", &style_color,
+ "foreground-set", TRUE,
+ NULL);
+}
+
+static void
+on_notify_style (GObject *obj, GParamSpec *spec, gpointer userdata)
+{
+ if (strcmp ("style", spec->name) == 0) {
+ update_style (MODEST_FOLDER_VIEW (obj));
+ gtk_widget_queue_draw (GTK_WIDGET (obj));
+ }
+}
+