#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);
GtkTreeIter *iter2,
gpointer user_data);
+static gboolean filter_row (GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer data);
+
+static gboolean on_key_pressed (GtkWidget *self,
+ GdkEventKey *event,
+ gpointer user_data);
+
+static void on_configuration_key_changed (ModestConf* conf,
+ const gchar *key,
+ ModestConfEvent event,
+ ModestFolderView *self);
+
/* DnD functions */
static void on_drag_data_get (GtkWidget *widget,
GdkDragContext *context,
static void setup_drag_and_drop (GtkTreeView *self);
-static gboolean on_key_pressed (GtkWidget *self,
- GdkEventKey *event,
- gpointer user_data);
-
-static void on_configuration_key_changed (ModestConf* conf,
- const gchar *key,
- ModestConfEvent event,
- ModestFolderView *self);
-
enum {
FOLDER_SELECTION_CHANGED_SIGNAL,
FOLDER_DISPLAY_NAME_CHANGED_SIGNAL,
typedef struct _ModestFolderViewPrivate ModestFolderViewPrivate;
struct _ModestFolderViewPrivate {
- TnyAccountStore *account_store;
- TnyFolderStore *cur_folder_store;
+ TnyAccountStore *account_store;
+ TnyFolderStore *cur_folder_store;
- gulong account_update_signal;
- gulong changed_signal;
- gulong accounts_reloaded_signal;
+ gulong account_update_signal;
+ gulong changed_signal;
+ gulong accounts_reloaded_signal;
- GtkTreeSelection *cur_selection;
- TnyFolderStoreQuery *query;
- guint timer_expander;
+ GtkTreeSelection *cur_selection;
+ TnyFolderStoreQuery *query;
+ guint timer_expander;
- gchar *local_account_name;
+ gchar *local_account_name;
+ gchar *visible_account_id;
+ ModestFolderViewStyle style;
};
#define MODEST_FOLDER_VIEW_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE((o), \
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),
+ g_signal_emit (G_OBJECT(data),
signals[FOLDER_DISPLAY_NAME_CHANGED_SIGNAL], 0,
folder_title);
g_free (folder_title);
} else {
g_object_set (rendobj,"text", fname, "weight", 400, NULL);
if (G_OBJECT (priv->cur_folder_store) == instance)
- g_signal_emit (G_OBJECT(data),
+ g_signal_emit (G_OBJECT(data),
signals[FOLDER_DISPLAY_NAME_CHANGED_SIGNAL], 0,
fname);
}
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);
}
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;
-
- /* 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);
+
+ /* 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);
- gtk_tree_view_append_column (GTK_TREE_VIEW(obj),column);
+ /* 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",
G_CALLBACK (on_selection_changed), self);
+
return GTK_WIDGET(self);
}
gtk_tree_path_free (path);
}
+/*
+ * We use this function to implement the
+ * MODEST_FOLDER_VIEW_STYLE_SHOW_ONE style. We only show the default
+ * account in this case
+ */
+static gboolean
+filter_row (GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer data)
+{
+ gboolean retval = TRUE;
+ gint type;
+ GObject *instance = NULL;
+
+ gtk_tree_model_get (model, iter,
+ TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type,
+ TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &instance,
+ -1);
+
+ if (type == TNY_FOLDER_TYPE_ROOT) {
+ TnyAccount *acc;
+ const gchar *account_id;
+
+ acc = TNY_ACCOUNT (instance);
+ account_id = tny_account_get_id (acc);
+
+ if (strcmp (account_id, MODEST_LOCAL_FOLDERS_ACCOUNT_ID) &&
+ strcmp (account_id, MODEST_MMC_ACCOUNT_ID)) {
+ ModestFolderViewPrivate *priv;
+
+ /* Show only the visible account id */
+ priv = MODEST_FOLDER_VIEW_GET_PRIVATE (data);
+ if (priv->visible_account_id && strcmp (account_id, priv->visible_account_id))
+ retval = FALSE;
+ }
+ }
+
+ g_object_unref (instance);
+
+ return retval;
+}
+
static gboolean
update_model (ModestFolderView *self, ModestTnyAccountStore *account_store)
{
ModestFolderViewPrivate *priv;
-
TnyList *account_list;
- GtkTreeModel *model, *sortable;
+ GtkTreeModel *model;
g_return_val_if_fail (account_store, FALSE);
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,
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), sortable);
+ 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);
}
static void
on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
{
- GtkTreeModel *model_sort, *model;
+ GtkTreeModel *model;
TnyFolderStore *folder = NULL;
- GtkTreeIter iter, iter_sort;
+ GtkTreeIter iter;
ModestFolderView *tree_view;
ModestFolderViewPrivate *priv;
gint type;
priv->cur_selection = sel;
/* folder was _un_selected if true */
- if (!gtk_tree_selection_get_selected (sel, &model_sort, &iter_sort)) {
+ if (!gtk_tree_selection_get_selected (sel, &model, &iter)) {
if (priv->cur_folder_store)
g_object_unref (priv->cur_folder_store);
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;
}
- model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (model_sort));
- gtk_tree_model_sort_convert_iter_to_child_iter (GTK_TREE_MODEL_SORT (model_sort),
- &iter,
- &iter_sort);
-
tree_view = MODEST_FOLDER_VIEW (user_data);
gtk_tree_model_get (model, &iter,
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;
}
+/*
+ * This function orders the mail accounts following the next rules
+ * 1st - remote accounts
+ * 2nd - local account
+ * 3rd - MMC account
+ */
static gint
cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
gpointer user_data)
gchar *name1, *name2;
TnyFolderType type;
TnyFolder *folder1, *folder2;
-
+
gtk_tree_model_get (tree_model, iter1,
TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &name1,
TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type,
TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder2,
-1);
- /* local_folders should be the last one */
+ /* Order must be: Remote accounts -> Local account -> MMC account */
if (type == TNY_FOLDER_TYPE_ROOT) {
- /* the account name is also the name of the root folder
- * in case of local folders */
- if (name1 && strcmp (name1, MODEST_LOCAL_FOLDERS_ACCOUNT_NAME) == 0)
+ 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;
- else if (name2 && strcmp (name2, MODEST_LOCAL_FOLDERS_ACCOUNT_NAME) == 0)
- cmp = -1;
- else
- cmp = modest_text_utils_utf8_strcmp (name1, name2, TRUE);
+ 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);
+ }
+ }
} else
cmp = modest_text_utils_utf8_strcmp (name1, name2, TRUE);
-
if (folder1)
g_object_unref(G_OBJECT(folder1));
if (folder2)
g_object_unref(G_OBJECT(folder2));
-
+
g_free (name1);
g_free (name2);
/*
* 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));
+ g_object_unref (header);
+ modest_mail_operation_xfer_msgs (mail_op, headers, folder, helper->delete_source);
/* Frees */
g_object_unref (G_OBJECT (mail_op));
&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",
{
ModestFolderViewPrivate *priv;
- if (!key || strcmp (key, MODEST_CONF_DEVICE_NAME))
+ if (!key)
return;
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
+modest_folder_view_set_style (ModestFolderView *self,
+ ModestFolderViewStyle style)
+{
+ ModestFolderViewPrivate *priv;
+
+ g_return_if_fail (self);
+
+ priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
+
+ priv->style = style;
+}
+
+void
+modest_folder_view_set_account_id_of_visible_server_account (ModestFolderView *self,
+ const gchar *account_id)
+{
+ ModestFolderViewPrivate *priv;
+ ModestConf *conf;
+
+ g_return_if_fail (self);
+
+ priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
+
+ 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);
+}
+
+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