#include <tny-folder.h>
#include <tny-camel-folder.h>
#include <tny-simple-list.h>
+#include <tny-merge-folder.h>
#include <modest-tny-folder.h>
+#include <modest-tny-simple-folder-store.h>
#include <modest-marshal.h>
#include <modest-icon-names.h>
#include <modest-tny-account-store.h>
+#include <modest-tny-outbox-account.h>
#include <modest-text-utils.h>
#include <modest-runtime.h>
#include "modest-folder-view.h"
#include <modest-dnd.h>
#include <modest-platform.h>
+#include <modest-account-mgr-helpers.h>
+#include <modest-widget-memory.h>
+
/* 'private'/'protected' functions */
static void modest_folder_view_class_init (ModestFolderViewClass *klass);
guint timer_expander;
gchar *local_account_name;
+ gchar *visible_account_id;
ModestFolderViewStyle style;
};
#define MODEST_FOLDER_VIEW_GET_PRIVATE(o) \
G_TYPE_NONE, 1, G_TYPE_STRING);
}
-
-
static void
text_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
priv = MODEST_FOLDER_VIEW_GET_PRIVATE (data);
+ gchar *item_name = NULL;
+ gint item_weight = 400;
+
if (type != TNY_FOLDER_TYPE_ROOT) {
- gint number;
-
+ gint number = 0;
+
if (modest_tny_folder_is_local_folder (TNY_FOLDER (instance))) {
TnyFolderType type;
type = modest_tny_folder_get_local_folder_type (TNY_FOLDER (instance));
else
number = unread;
- /* Use bold font style if there are unread messages */
+ /* Use bold font style if there are unread messages */
if (unread > 0) {
- gchar *folder_title = g_strdup_printf ("%s (%d)", fname, unread);
- g_object_set (rendobj,"text", folder_title, "weight", 800, NULL);
- if (G_OBJECT (priv->cur_folder_store) == instance)
- g_signal_emit (G_OBJECT(data),
- signals[FOLDER_DISPLAY_NAME_CHANGED_SIGNAL], 0,
- folder_title);
- g_free (folder_title);
+ item_name = g_strdup_printf ("%s (%d)", fname, unread);
+ item_weight = 800;
} else {
- g_object_set (rendobj,"text", fname, "weight", 400, NULL);
- if (G_OBJECT (priv->cur_folder_store) == instance)
- g_signal_emit (G_OBJECT(data),
- signals[FOLDER_DISPLAY_NAME_CHANGED_SIGNAL], 0,
- fname);
+ item_name = g_strdup (fname);
+ item_weight = 400;
}
- } else {
- const gchar *account_name = NULL;
- const gchar *account_id = NULL;
-
+ } else if (TNY_IS_ACCOUNT (instance)) {
/* If it's a server account */
- account_id = tny_account_get_id (TNY_ACCOUNT (instance));
- if (!strcmp (account_id, MODEST_LOCAL_FOLDERS_ACCOUNT_ID)) {
- account_name = priv->local_account_name;
+ const gchar * account_id = tny_account_get_id (TNY_ACCOUNT (instance));
+ if (!strcmp (account_id, MODEST_ACTUAL_LOCAL_FOLDERS_ACCOUNT_ID)) {
+ item_name = g_strdup (priv->local_account_name);
} else {
if (!strcmp (account_id, MODEST_MMC_ACCOUNT_ID)) {
/* TODO: get MMC card name */
+ item_name = g_strdup (_("MMC"));
} else {
- account_name = fname;
+ item_name = g_strdup (fname);
}
}
+ item_weight = 800;
+ } else if (modest_tny_folder_store_is_virtual_local_folders (
+ TNY_FOLDER_STORE(instance)))
+ {
+ /* We use ModestTnySimpleFolder store to group the outboxes and
+ * the other local folders together: */
+ item_name = g_strdup (_("Local Folders"));
+ item_weight = 400;
+ }
+
+ if (!item_name)
+ item_name = g_strdup ("unknown");
+
+ if (item_name && item_weight) {
+ /* Set the name in the treeview cell: */
+ g_object_set (rendobj,"text", item_name, "weight", item_weight, NULL);
+
/* Notify display name observers */
- if (G_OBJECT (priv->cur_folder_store) == instance)
+ if (G_OBJECT (priv->cur_folder_store) == instance) {
g_signal_emit (G_OBJECT(data),
- signals[FOLDER_DISPLAY_NAME_CHANGED_SIGNAL], 0,
- account_name);
-
- /* Use bold font style */
- g_object_set (rendobj,"text", account_name, "weight", 800, NULL);
+ signals[FOLDER_DISPLAY_NAME_CHANGED_SIGNAL], 0,
+ item_name);
+ }
+
+ g_free (item_name);
+
}
g_object_unref (G_OBJECT (instance));
icon_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
{
- GObject *rendobj, *instance;
- GdkPixbuf *pixbuf;
+ GObject *rendobj = NULL, *instance = NULL;
+ GdkPixbuf *pixbuf = NULL;
TnyFolderType type;
gchar *fname = NULL;
const gchar *account_id = NULL;
gtk_tree_model_get (tree_model, iter,
TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type,
TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &fname,
- TNY_GTK_FOLDER_STORE_TREE_MODEL_UNREAD_COLUMN, &unread,
+ TNY_GTK_FOLDER_STORE_TREE_MODEL_UNREAD_COLUMN, &unread,
TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &instance,
-1);
switch (type) {
case TNY_FOLDER_TYPE_ROOT:
- account_id = tny_account_get_id (TNY_ACCOUNT (instance));
- if (!strcmp (account_id, MODEST_LOCAL_FOLDERS_ACCOUNT_ID)) {
+ if (TNY_IS_ACCOUNT (instance)) {
+ account_id = tny_account_get_id (TNY_ACCOUNT (instance));
+ /*
+ if (!strcmp (account_id, MODEST_ACTUAL_LOCAL_FOLDERS_ACCOUNT_ID)) {
+ pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_LOCAL_FOLDERS);
+ } else {
+ */
+ if (!strcmp (account_id, MODEST_MMC_ACCOUNT_ID))
+ pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_MMC);
+ else
+ pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_ACCOUNT);
+ /*
+ }
+ */
+ }
+ else if (modest_tny_folder_store_is_virtual_local_folders (
+ TNY_FOLDER_STORE (instance))) {
pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_LOCAL_FOLDERS);
- } else {
- if (!strcmp (account_id, MODEST_MMC_ACCOUNT_ID))
- pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_MMC);
- else
- pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_ACCOUNT);
}
- break;
+ break;
case TNY_FOLDER_TYPE_INBOX:
- pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_INBOX);
- break;
- case TNY_FOLDER_TYPE_OUTBOX:
- pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_OUTBOX);
- break;
- case TNY_FOLDER_TYPE_JUNK:
- pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_JUNK);
- break;
- case TNY_FOLDER_TYPE_SENT:
- pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_SENT);
- break;
+ pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_INBOX);
+ break;
+ case TNY_FOLDER_TYPE_OUTBOX:
+ pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_OUTBOX);
+ break;
+ case TNY_FOLDER_TYPE_JUNK:
+ pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_JUNK);
+ break;
+ case TNY_FOLDER_TYPE_SENT:
+ pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_SENT);
+ break;
case TNY_FOLDER_TYPE_TRASH:
pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_TRASH);
- break;
+ break;
case TNY_FOLDER_TYPE_DRAFTS:
pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_DRAFTS);
- break;
+ break;
case TNY_FOLDER_TYPE_NORMAL:
- default:
- pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_NORMAL);
+ default:
+ pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_NORMAL);
break;
- }
+ }
+
g_object_unref (G_OBJECT (instance));
g_free (fname);
/* Set pixbuf */
g_object_set (rendobj, "pixbuf", pixbuf, NULL);
+
+ if (pixbuf != NULL)
+ g_object_unref (pixbuf);
}
static void
-modest_folder_view_init (ModestFolderView *obj)
+add_columns (GtkWidget *treeview)
{
- ModestFolderViewPrivate *priv;
GtkTreeViewColumn *column;
GtkCellRenderer *renderer;
GtkTreeSelection *sel;
- ModestConf *conf;
-
- priv = MODEST_FOLDER_VIEW_GET_PRIVATE(obj);
-
- priv->timer_expander = 0;
- priv->account_store = NULL;
- priv->cur_folder_store = NULL;
- priv->query = NULL;
- priv->style = MODEST_FOLDER_VIEW_STYLE_SHOW_ALL;
-
- /* Initialize the local account name */
- conf = modest_runtime_get_conf();
- priv->local_account_name = modest_conf_get_string (conf, MODEST_CONF_DEVICE_NAME, NULL);
- /* Build treeview */
+ /* Create column */
column = gtk_tree_view_column_new ();
+ /* Set icon and text render function */
renderer = gtk_cell_renderer_pixbuf_new();
gtk_tree_view_column_pack_start (column, renderer, FALSE);
gtk_tree_view_column_set_cell_data_func(column, renderer,
- icon_cell_data, obj, NULL);
+ icon_cell_data, treeview, NULL);
renderer = gtk_cell_renderer_text_new();
gtk_tree_view_column_pack_start (column, renderer, FALSE);
gtk_tree_view_column_set_cell_data_func(column, renderer,
- text_cell_data, obj, NULL);
+ text_cell_data, treeview, NULL);
- sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(obj));
+ /* Set selection mode */
+ sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(treeview));
gtk_tree_selection_set_mode (sel, GTK_SELECTION_SINGLE);
+ /* Set treeview appearance */
gtk_tree_view_column_set_spacing (column, 2);
gtk_tree_view_column_set_resizable (column, TRUE);
gtk_tree_view_column_set_fixed_width (column, TRUE);
- gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW(obj), FALSE);
- gtk_tree_view_set_enable_search (GTK_TREE_VIEW(obj), FALSE);
+ gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW(treeview), FALSE);
+ gtk_tree_view_set_enable_search (GTK_TREE_VIEW(treeview), FALSE);
- gtk_tree_view_append_column (GTK_TREE_VIEW(obj),column);
+ /* Add column */
+ gtk_tree_view_append_column (GTK_TREE_VIEW(treeview),column);
+}
+
+static void
+modest_folder_view_init (ModestFolderView *obj)
+{
+ ModestFolderViewPrivate *priv;
+ ModestConf *conf;
+
+ priv = MODEST_FOLDER_VIEW_GET_PRIVATE(obj);
+
+ priv->timer_expander = 0;
+ priv->account_store = NULL;
+ priv->query = NULL;
+ priv->style = MODEST_FOLDER_VIEW_STYLE_SHOW_ALL;
+ priv->cur_folder_store = NULL;
+ priv->visible_account_id = NULL;
+
+ /* Initialize the local account name */
+ conf = modest_runtime_get_conf();
+ priv->local_account_name = modest_conf_get_string (conf, MODEST_CONF_DEVICE_NAME, NULL);
+
+ /* Build treeview */
+ add_columns (GTK_WIDGET (obj));
/* Setup drag and drop */
setup_drag_and_drop (GTK_TREE_VIEW(obj));
+ /* Restore conf */
+ modest_widget_memory_restore (conf, G_OBJECT (obj), MODEST_CONF_FOLDER_VIEW_KEY);
+
/* Connect signals */
g_signal_connect (G_OBJECT (obj),
"key-press-event",
g_signal_handler_disconnect (G_OBJECT(sel), priv->changed_signal);
g_free (priv->local_account_name);
+ g_free (priv->visible_account_id);
G_OBJECT_CLASS(parent_class)->finalize (obj);
}
self = G_OBJECT (g_object_new (MODEST_TYPE_FOLDER_VIEW, NULL));
priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
- priv->query = g_object_ref (query);
+ if (query)
+ priv->query = g_object_ref (query);
sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
priv->changed_signal = g_signal_connect (sel, "changed",
}
/*
- * HACK: we use this function to implement the
- * MODEST_FOLDER_VIEW_STYLE_SHOW_ONE style. This implementation
- * assumes that the model has the following order (which is currently
- * true) Remote folders->Local folders->MMC folders, so the rows of
- * the first level (that represent the accounts) are received in the
- * same order. So basically it uses a static variable to register that
- * a remote account has already being shown to hide the others
- * (returning NULL). When the function evaluates the local or the MMC
- * accounts is time to reset the static variable in order to get it
- * ready for the next time the tree model needs to be shown.
+ * We use this function to implement the
+ * MODEST_FOLDER_VIEW_STYLE_SHOW_ONE style. We only show the default
+ * account in this case, and the local folders.
*/
static gboolean
filter_row (GtkTreeModel *model,
GtkTreeIter *iter,
gpointer data)
{
- static gboolean found = FALSE;
- gboolean retval;
- gint type;
- GObject *instance;
+ gboolean retval = TRUE;
+ gint type = 0;
+ GObject *instance = NULL;
gtk_tree_model_get (model, iter,
TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type,
-1);
if (type == TNY_FOLDER_TYPE_ROOT) {
- const gchar *account_id = tny_account_get_id (TNY_ACCOUNT (instance));
+ /* TNY_FOLDER_TYPE_ROOT means that the instance is an account instead of a folder. */
+ if (TNY_IS_ACCOUNT (instance)) {
+ 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 (strcmp (account_id, MODEST_ACTUAL_LOCAL_FOLDERS_ACCOUNT_ID) &&
+ strcmp (account_id, MODEST_MMC_ACCOUNT_ID)) {
+
+ /* TODO: Merge the folders before we get to this point? */
+
+ /* Show only the visible account id */
+ /*
+ ModestFolderViewPrivate *priv =
+ MODEST_FOLDER_VIEW_GET_PRIVATE (data);
+ if (priv->visible_account_id && strcmp (account_id, priv->visible_account_id))
+ retval = FALSE;
+ */
+ }
+ }
+ }
- if (strcmp (account_id, MODEST_LOCAL_FOLDERS_ACCOUNT_ID) &&
- strcmp (account_id, MODEST_MMC_ACCOUNT_ID)) {
+ g_object_unref (instance);
- if (!found) {
- found = TRUE;
- retval = TRUE;
- } else
- retval = FALSE;
- } else {
- found = FALSE;
- retval = TRUE;
+ return retval;
+}
+
+/*
+static void on_tnylist_accounts_debug_print(gpointer data, gpointer user_data)
+{
+ TnyAccount* account = TNY_ACCOUNT(data);
+ const gchar *prefix = (const gchar*)(user_data);
+
+ printf("%s account id=%s\n", prefix, tny_account_get_id (account));
+}
+*/
+
+static void
+add_account_folders_to_merged_folder (TnyAccount *account, TnyMergeFolder* merge_folder)
+{
+ const gchar* account_id = tny_account_get_id (account);
+ const gboolean is_actual_local_folders_account = account_id &&
+ (strcmp (account_id, MODEST_ACTUAL_LOCAL_FOLDERS_ACCOUNT_ID) == 0);
+
+ TnyList *list_outbox_folders = tny_simple_list_new ();
+ tny_folder_store_get_folders (TNY_FOLDER_STORE (account),
+ list_outbox_folders, NULL, NULL);
+
+ TnyIterator* iter = tny_list_create_iterator (list_outbox_folders);
+ while (!tny_iterator_is_done (iter))
+ {
+ TnyFolder *folder = TNY_FOLDER (tny_iterator_get_current (iter));
+
+ if (folder) {
+ gboolean add = TRUE;
+ /* TODO: Do not add outboxes that are inside local-folders/,
+ * because these are just left-over from earlier Modest versions
+ * that put the outbox there: */
+ if (is_actual_local_folders_account) {
+ const TnyFolderType type = modest_tny_folder_get_local_folder_type (folder);
+ if (type == TNY_FOLDER_TYPE_OUTBOX) {
+ add = FALSE;
+ }
+ }
+
+ if (add)
+ tny_merge_folder_add_folder (merge_folder, folder);
+
+ g_object_unref (folder);
}
- } else
- retval = TRUE;
+
+ tny_iterator_next (iter);
+ }
+
+ g_object_unref (list_outbox_folders);
+}
- return retval;
+
+static void
+add_account_folders_to_simple_folder_store (TnyAccount *account, ModestTnySimpleFolderStore* store)
+{
+ g_return_if_fail (account);
+ g_return_if_fail (store);
+
+ TnyList *list_outbox_folders = tny_simple_list_new ();
+ tny_folder_store_get_folders (TNY_FOLDER_STORE (account),
+ list_outbox_folders, NULL, NULL);
+
+ /* Special handling for the .modest/local-folders account,
+ * to avoid adding unwanted folders.
+ * We cannot prevent them from being in the TnyAccount without
+ * changing the libtinymail-camel. */
+ const gchar* account_id = tny_account_get_id (account);
+ const gboolean is_actual_local_folders_account = account_id &&
+ (strcmp (account_id, MODEST_ACTUAL_LOCAL_FOLDERS_ACCOUNT_ID) == 0);
+
+ TnyIterator* iter = tny_list_create_iterator (list_outbox_folders);
+ while (!tny_iterator_is_done (iter))
+ {
+ TnyFolder *folder = TNY_FOLDER (tny_iterator_get_current (iter));
+
+ if (folder) {
+ gboolean add = TRUE;
+ /* TODO: Do not add outboxes that are inside local-folders/,
+ * because these are just left-over from earlier Modest versions
+ * that put the outbox there: */
+ if (is_actual_local_folders_account) {
+ const TnyFolderType type = modest_tny_folder_get_local_folder_type (folder);
+ if (type == TNY_FOLDER_TYPE_OUTBOX) {
+ add = FALSE;
+ }
+ }
+
+ if (add)
+ modest_tny_simple_folder_store_add_folder (store, folder);
+
+ g_object_unref (folder);
+ }
+
+ tny_iterator_next (iter);
+ }
+
+ g_object_unref (list_outbox_folders);
}
static gboolean
update_model (ModestFolderView *self, ModestTnyAccountStore *account_store)
{
ModestFolderViewPrivate *priv;
- TnyList *account_list;
+
GtkTreeModel *model;
g_return_val_if_fail (account_store, FALSE);
selects only the subscribed folders. */
/* model = tny_gtk_folder_store_tree_model_new (TRUE, priv->query); */
model = tny_gtk_folder_store_tree_model_new (TRUE, NULL);
- account_list = TNY_LIST(model);
+
+ /* Deal with the model via its TnyList Interface,
+ * filling the TnyList via a get_accounts() call: */
+ TnyList *model_as_list = TNY_LIST(model);
+ /* Create a virtual local-folders folder store,
+ * containing the real local folders and the (merged) various per-account
+ * outbox folders:
+ */
+ ModestTnySimpleFolderStore *store = modest_tny_simple_folder_store_new ();
+
+ /* Get the accounts: */
+ TnyList *account_list = tny_simple_list_new ();
tny_account_store_get_accounts (TNY_ACCOUNT_STORE(account_store),
account_list,
- TNY_ACCOUNT_STORE_STORE_ACCOUNTS);
- if (account_list) {
- GtkTreeModel *filter_model = NULL, *sortable = NULL;
-
- sortable = gtk_tree_model_sort_new_with_model (model);
- gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable),
- TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN,
- GTK_SORT_ASCENDING);
- gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (sortable),
- TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN,
- cmp_rows, NULL, NULL);
-
- /* Create filter model */
- if (priv->style == MODEST_FOLDER_VIEW_STYLE_SHOW_ONE) {
- filter_model = gtk_tree_model_filter_new (sortable, NULL);
- gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (filter_model),
- filter_row,
- NULL,
- NULL);
+ TNY_ACCOUNT_STORE_STORE_ACCOUNTS);
+ TnyIterator* iter = tny_list_create_iterator (account_list);
+
+ /* All per-account outbox folders are merged into one folders
+ * so that they appear as one outbox to the user: */
+ TnyMergeFolder *merged_outbox = TNY_MERGE_FOLDER (tny_merge_folder_new());
+
+ while (!tny_iterator_is_done (iter))
+ {
+ GObject *cur = tny_iterator_get_current (iter);
+ TnyAccount *account = TNY_ACCOUNT (cur);
+ if (account) {
+ /* Add both outbox account and local-folders account folders
+ * to our one combined account:
+ */
+ if (MODEST_IS_TNY_OUTBOX_ACCOUNT (account)) {
+ /* Add the folder to the merged folder.
+ * We will add it later to the virtual local-folders store: */
+ add_account_folders_to_merged_folder (account, merged_outbox);
+ } else {
+ const gchar *account_id = tny_account_get_id (account);
+ if (account_id && !strcmp (account_id, MODEST_ACTUAL_LOCAL_FOLDERS_ACCOUNT_ID)) {
+ /* Add the folders to the virtual local-folders store: */
+ add_account_folders_to_simple_folder_store (account, store);
+ }
+ else {
+ /* Just add the account: */
+ tny_list_append (model_as_list, G_OBJECT (account));
+ }
+ }
}
-
- /* Set new model */
- gtk_tree_view_set_model (GTK_TREE_VIEW(self),
- (filter_model) ? filter_model : sortable);
- expand_root_items (self); /* expand all account folders */
- g_object_unref (account_list);
+
+ g_object_unref (cur);
+ tny_iterator_next (iter);
}
+ /* Add the merged outbox folder to the virtual local-folders store: */
+ modest_tny_simple_folder_store_add_folder (store, TNY_FOLDER(merged_outbox));
+ g_object_unref (merged_outbox);
+ merged_outbox = NULL;
+
+ /* Add the virtual local-folders store to the model: */
+ tny_list_append (model_as_list, G_OBJECT (store));
+
+
+ g_object_unref (account_list);
+ account_list = NULL;
+
+ g_object_unref (model_as_list);
+ model_as_list = NULL;
+
+ /* tny_list_foreach (account_list, on_tnylist_accounts_debug_print, "update_model: "); */
+
+ GtkTreeModel *filter_model = NULL, *sortable = NULL;
+
+ sortable = gtk_tree_model_sort_new_with_model (model);
+ gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable),
+ TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN,
+ GTK_SORT_ASCENDING);
+ gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (sortable),
+ TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN,
+ cmp_rows, NULL, NULL);
+
+ /* Create filter model */
+ if (priv->style == MODEST_FOLDER_VIEW_STYLE_SHOW_ONE) {
+ 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);
+ }
+
+ /* Set new model */
+ gtk_tree_view_set_model (GTK_TREE_VIEW(self),
+ (filter_model) ? filter_model : sortable);
+ expand_root_items (self); /* expand all account folders */
+
return TRUE;
}
priv->cur_folder_store = NULL;
/* Notify the display name observers */
- g_signal_emit (G_OBJECT(user_data),
+ g_signal_emit (G_OBJECT(user_data),
signals[FOLDER_DISPLAY_NAME_CHANGED_SIGNAL], 0,
NULL);
- return;
+ return;
}
tree_view = MODEST_FOLDER_VIEW (user_data);
priv->cur_folder_store = folder;
/* New folder has been selected */
- g_signal_emit (G_OBJECT(tree_view),
- signals[FOLDER_SELECTION_CHANGED_SIGNAL],
- 0, folder, TRUE);
+ g_signal_emit (G_OBJECT(tree_view),
+ signals[FOLDER_SELECTION_CHANGED_SIGNAL],
+ 0, folder, TRUE);
}
TnyFolderStore *
return priv->cur_folder_store;
}
+static gint
+get_cmp_rows_type_pos (GObject *folder)
+{
+ /* Remote accounts -> Local account -> MMC account .*/
+ /* 0, 1, 2 */
+
+ if (TNY_IS_FOLDER_STORE (folder) &&
+ modest_tny_folder_store_is_virtual_local_folders (
+ TNY_FOLDER_STORE (folder))) {
+ return 1;
+ } else if (TNY_IS_ACCOUNT (folder)) {
+ TnyAccount *account = TNY_ACCOUNT (folder);
+ const gchar *account_id = tny_account_get_id (account);
+ if (!strcmp (account_id, MODEST_MMC_ACCOUNT_ID))
+ return 2;
+ else
+ return 0;
+ }
+ else {
+ printf ("DEBUG: %s: unexpected type.\n", __FUNCTION__);
+ return -1; /* Should never happen */
+ }
+}
+
/*
- * This function orders the mail accounts following the next rules
+ * This function orders the mail accounts according to these rules:
* 1st - remote accounts
* 2nd - local account
* 3rd - MMC account
gint cmp;
gchar *name1, *name2;
TnyFolderType type;
- TnyFolder *folder1, *folder2;
+ GObject *folder1 = NULL;
+ GObject *folder2 = NULL;
gtk_tree_model_get (tree_model, iter1,
TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &name1,
TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder2,
-1);
- /* Order must be: Remote accounts -> Local account -> MMC account */
if (type == TNY_FOLDER_TYPE_ROOT) {
- const gchar *account_id = tny_account_get_id (TNY_ACCOUNT (folder1));
- const gchar *account_id2 = tny_account_get_id (TNY_ACCOUNT (folder2));
-
- if (!strcmp (account_id, MODEST_MMC_ACCOUNT_ID))
- cmp = +1;
+ /* Compare the types, so that
+ * Remote accounts -> Local account -> MMC account .*/
+ const gint pos1 = get_cmp_rows_type_pos (folder1);
+ const gint pos2 = get_cmp_rows_type_pos (folder2);
+ /* printf ("DEBUG: %s:\n type1=%s, pos1=%d\n type2=%s, pos2=%d\n",
+ __FUNCTION__, G_OBJECT_TYPE_NAME(folder1), pos1, G_OBJECT_TYPE_NAME(folder2), pos2); */
+ if (pos1 < pos2)
+ cmp = -1;
+ else if (pos1 > pos2)
+ cmp = 1;
else {
- if (!strcmp (account_id, MODEST_LOCAL_FOLDERS_ACCOUNT_ID)) {
- if (!strcmp (account_id2, MODEST_MMC_ACCOUNT_ID))
- cmp = -1;
- else
- cmp = +1;
- } else {
- if (!strcmp (account_id2, MODEST_LOCAL_FOLDERS_ACCOUNT_ID) ||
- !strcmp (account_id2, MODEST_MMC_ACCOUNT_ID))
- cmp = -1;
- else
- cmp = modest_text_utils_utf8_strcmp (name1, name2, TRUE);
- }
+ /* Compare items of the same type: */
+
+ TnyAccount *account1 = NULL;
+ if (TNY_IS_ACCOUNT (folder1))
+ account1 = TNY_ACCOUNT (folder1);
+
+ TnyAccount *account2 = NULL;
+ if (TNY_IS_ACCOUNT (folder2))
+ account2 = TNY_ACCOUNT (folder2);
+
+ const gchar *account_id = account1 ? tny_account_get_id (account1) : NULL;
+ const gchar *account_id2 = account2 ? tny_account_get_id (account2) : NULL;
+
+ if (!account_id && !account_id2)
+ return 0;
+ else if (!account_id)
+ return -1;
+ else if (!account_id2)
+ return +1;
+ else if (!strcmp (account_id, MODEST_MMC_ACCOUNT_ID))
+ cmp = +1;
+ else
+ cmp = modest_text_utils_utf8_strcmp (name1, name2, TRUE);
}
- } else
+ } else {
cmp = modest_text_utils_utf8_strcmp (name1, name2, TRUE);
+ }
if (folder1)
g_object_unref(G_OBJECT(folder1));
gpointer data)
{
GtkTreeSelection *selection;
- GtkTreeModel *model_sort, *model;
+ GtkTreeModel *model;
GtkTreeIter iter;
- GtkTreePath *source_row_sort;
GtkTreePath *source_row;
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget));
- gtk_tree_selection_get_selected (selection, &model_sort, &iter);
- source_row_sort = gtk_tree_model_get_path (model_sort, &iter);
-
- /* Get the unsorted path and model */
- model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (model_sort));
- source_row = gtk_tree_model_sort_convert_path_to_child_path (GTK_TREE_MODEL_SORT (model_sort),
- source_row_sort);
+ gtk_tree_selection_get_selected (selection, &model, &iter);
+ source_row = gtk_tree_model_get_path (model, &iter);
gtk_tree_set_row_drag_data (selection_data,
model,
source_row);
- gtk_tree_path_free (source_row_sort);
gtk_tree_path_free (source_row);
}
/*
* This function is the callback of the
- * modest_mail_operation_xfer_msg() and
+ * modest_mail_operation_xfer_msgs () and
* modest_mail_operation_xfer_folder() calls. We check here if the
* message/folder was correctly asynchronously transferred. The reason
* to use the same callback is that the code is the same, it only has
GtkTreePath *dest_row,
DndHelper *helper)
{
+ TnyList *headers;
TnyHeader *header;
TnyFolder *folder;
ModestMailOperation *mail_op;
&folder, -1);
/* Transfer message */
- mail_op = modest_mail_operation_new ();
- modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
+ mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_RECEIVE, NULL);
+
+ modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
mail_op);
g_signal_connect (G_OBJECT (mail_op), "progress-changed",
G_CALLBACK (on_progress_changed), helper);
- modest_mail_operation_xfer_msg (mail_op, header, folder, helper->delete_source);
+ /* FIXME: I replaced this because the API changed, but D&D
+ should be reviewed in order to allow multiple drags*/
+ headers = tny_simple_list_new ();
+ tny_list_append (headers, G_OBJECT (header));
+ modest_mail_operation_xfer_msgs (mail_op, headers, folder, helper->delete_source, NULL, NULL);
/* Frees */
g_object_unref (G_OBJECT (mail_op));
g_object_unref (G_OBJECT (header));
g_object_unref (G_OBJECT (folder));
+ g_object_unref (headers);
}
/*
TnyFolder *folder;
/* Check if the drag is possible */
- if (!gtk_tree_path_compare (helper->source_row, dest_row) ||
- !gtk_tree_drag_dest_row_drop_possible (GTK_TREE_DRAG_DEST (dest_model),
- dest_row,
- selection_data)) {
+/* if (!gtk_tree_path_compare (helper->source_row, dest_row) || */
+/* !gtk_tree_drag_dest_row_drop_possible (GTK_TREE_DRAG_DEST (dest_model), */
+/* dest_row, */
+/* selection_data)) { */
+ if (!gtk_tree_path_compare (helper->source_row, dest_row)) {
gtk_drag_finish (helper->context, FALSE, FALSE, helper->time);
gtk_tree_path_free (helper->source_row);
&folder, -1);
/* Do the mail operation */
- mail_op = modest_mail_operation_new ();
+ mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_RECEIVE, NULL);
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
mail_op);
g_signal_connect (G_OBJECT (mail_op), "progress-changed",
folder,
parent_folder,
helper->delete_source);
-
+
/* Frees */
g_object_unref (G_OBJECT (parent_folder));
g_object_unref (G_OBJECT (folder));
gpointer data)
{
GtkWidget *source_widget;
- GtkTreeModel *model_sort, *dest_model, *source_model;
- GtkTreePath *source_row, *dest_row, *child_dest_row;
+ GtkTreeModel *dest_model, *source_model;
+ GtkTreePath *source_row, *dest_row;
GtkTreeViewDropPosition pos;
gboolean success = FALSE, delete_source = FALSE;
- DndHelper *helper;
+ DndHelper *helper = NULL;
/* Do not allow further process */
g_signal_stop_emission_by_name (widget, "drag-data-received");
+ source_widget = gtk_drag_get_source_widget (context);
/* Get the action */
- if (context->action == GDK_ACTION_MOVE)
+ if (context->action == GDK_ACTION_MOVE) {
delete_source = TRUE;
+ /* Notify that there is no folder selected. We need to
+ do this in order to update the headers view (and
+ its monitors, because when moving, the old folder
+ won't longer exist. We can not wait for the end of
+ the operation, because the operation won't start if
+ the folder is in use */
+ if (source_widget == widget)
+ g_signal_emit (G_OBJECT (widget),
+ signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0, NULL, TRUE);
+ }
+
/* Check if the get_data failed */
if (selection_data == NULL || selection_data->length < 0)
gtk_drag_finish (context, success, FALSE, time);
/* Get the models */
- source_widget = gtk_drag_get_source_widget (context);
gtk_tree_get_row_drag_data (selection_data,
&source_model,
&source_row);
- model_sort = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));
/* Select the destination model */
if (source_widget == widget) {
dest_model = source_model;
} else {
- dest_model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (model_sort));
+ dest_model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));
}
/* Get the path to the destination row. Can not call
helper->context = context;
helper->time = time;
- /* Get path from the unsorted model */
- child_dest_row =
- gtk_tree_model_sort_convert_path_to_child_path (GTK_TREE_MODEL_SORT (model_sort),
- dest_row);
- gtk_tree_path_free (dest_row);
-
/* Drags from the header view */
if (source_widget != widget) {
drag_and_drop_from_header_view (source_model,
dest_model,
- child_dest_row,
+ dest_row,
helper);
} else {
drag_and_drop_from_folder_view (source_model,
dest_model,
- child_dest_row,
+ dest_row,
selection_data,
helper);
}
/* Frees */
gtk_tree_path_free (source_row);
- gtk_tree_path_free (child_dest_row);
+ gtk_tree_path_free (dest_row);
}
/*
/* Do not allow drops between folders */
if (!dest_row ||
- pos == GTK_TREE_VIEW_DROP_BEFORE ||
+ pos == GTK_TREE_VIEW_DROP_BEFORE ||
pos == GTK_TREE_VIEW_DROP_AFTER) {
gtk_tree_view_set_drag_dest_row(GTK_TREE_VIEW (widget), NULL, 0);
gdk_drag_status(context, 0, time);
gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (widget), dest_row, pos);
priv->timer_expander = g_timeout_add (500, expand_row_timeout, widget);
}
- gtk_tree_path_free (dest_row);
/* Select the desired action. By default we pick MOVE */
suggested_action = GDK_ACTION_MOVE;
gdk_drag_status(context, GDK_ACTION_DEFAULT, time);
out:
+ if (dest_row)
+ gtk_tree_path_free (dest_row);
g_signal_stop_emission_by_name (widget, "drag-motion");
return valid_location;
}
{
ModestFolderViewPrivate *priv;
- if (!key || strcmp (key, MODEST_CONF_DEVICE_NAME))
+ if (!key)
return;
+ g_return_if_fail (MODEST_IS_FOLDER_VIEW (self));
priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
- g_free (priv->local_account_name);
+ if (!strcmp (key, MODEST_CONF_DEVICE_NAME)) {
+ g_free (priv->local_account_name);
- if (event == MODEST_CONF_EVENT_KEY_UNSET)
- priv->local_account_name = g_strdup (MODEST_LOCAL_FOLDERS_DEFAULT_DISPLAY_NAME);
- else
- priv->local_account_name = modest_conf_get_string (modest_runtime_get_conf(),
- MODEST_CONF_DEVICE_NAME, NULL);
+ if (event == MODEST_CONF_EVENT_KEY_UNSET)
+ priv->local_account_name = g_strdup (MODEST_LOCAL_FOLDERS_DEFAULT_DISPLAY_NAME);
+ else
+ priv->local_account_name = modest_conf_get_string (modest_runtime_get_conf(),
+ MODEST_CONF_DEVICE_NAME, NULL);
- /* Force a redraw */
+ /* Force a redraw */
#if GTK_CHECK_VERSION(2, 8, 0) /* gtk_tree_view_column_queue_resize is only available in GTK+ 2.8 */
- GtkTreeViewColumn * tree_column = gtk_tree_view_get_column (GTK_TREE_VIEW (self),
- TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN);
- gtk_tree_view_column_queue_resize (tree_column);
+ GtkTreeViewColumn * tree_column = gtk_tree_view_get_column (GTK_TREE_VIEW (self),
+ TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN);
+ gtk_tree_view_column_queue_resize (tree_column);
#endif
+ }
}
void
priv->style = style;
}
+
+void
+modest_folder_view_set_account_id_of_visible_server_account (ModestFolderView *self,
+ const gchar *account_id)
+{
+ ModestFolderViewPrivate *priv;
+ ModestConf *conf;
+ GtkTreeModel *model;
+
+ g_return_if_fail (self);
+
+ priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
+
+ /* This will be used by the filter_row callback,
+ * to decided which rows to show: */
+ if (priv->visible_account_id)
+ g_free (priv->visible_account_id);
+ priv->visible_account_id = g_strdup (account_id);
+
+ /* Save preferences */
+ conf = modest_runtime_get_conf ();
+ modest_widget_memory_save (conf, G_OBJECT (self), MODEST_CONF_FOLDER_VIEW_KEY);
+
+ /* Refilter */
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
+ if (GTK_IS_TREE_MODEL_FILTER (model))
+ gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model));
+}
+
+const gchar *
+modest_folder_view_get_account_id_of_visible_server_account (ModestFolderView *self)
+{
+ ModestFolderViewPrivate *priv;
+
+ g_return_val_if_fail (self, NULL);
+
+ priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
+
+ return (const gchar *) priv->visible_account_id;
+}
projects / modest / blobdiff