#include <tny-folder.h>
#include <tny-camel-folder.h>
#include <tny-simple-list.h>
+#include <tny-camel-account.h>
#include <modest-tny-account.h>
#include <modest-tny-folder.h>
#include <modest-tny-local-folders-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-widget-memory.h>
#include <modest-ui-actions.h>
+#include "modest-dnd.h"
+
+/* Folder view drag types */
+const GtkTargetEntry folder_view_drag_types[] =
+{
+ { "GTK_TREE_MODEL_ROW", GTK_TARGET_SAME_WIDGET, MODEST_FOLDER_ROW },
+ { GTK_TREE_PATH_AS_STRING_LIST, GTK_TARGET_SAME_APP, MODEST_HEADER_ROW }
+};
/* 'private'/'protected' functions */
static void modest_folder_view_class_init (ModestFolderViewClass *klass);
static void on_selection_changed (GtkTreeSelection *sel, gpointer data);
-static void on_account_update (TnyAccountStore *account_store,
- const gchar *account,
+static void on_account_removed (TnyAccountStore *self,
+ TnyAccount *account,
gpointer user_data);
-static void on_account_removed (TnyAccountStore *self,
+static void on_account_inserted (TnyAccountStore *self,
TnyAccount *account,
gpointer user_data);
-static void on_accounts_reloaded (TnyAccountStore *store,
+static void on_account_changed (TnyAccountStore *self,
+ TnyAccount *account,
gpointer user_data);
static gint cmp_rows (GtkTreeModel *tree_model,
GdkEventKey *event,
gpointer user_data);
-static void on_configuration_key_changed (ModestConf* conf,
- const gchar *key,
- ModestConfEvent event,
- ModestFolderView *self);
+static void on_configuration_key_changed (ModestConf* conf,
+ const gchar *key,
+ ModestConfEvent event,
+ ModestConfNotificationId notification_id,
+ ModestFolderView *self);
/* DnD functions */
static void on_drag_data_get (GtkWidget *widget,
guint time,
gpointer user_data);
+static void expand_root_items (ModestFolderView *self);
+
static gint expand_row_timeout (gpointer data);
static void setup_drag_and_drop (GtkTreeView *self);
static void _clear_hidding_filter (ModestFolderView *folder_view);
-static void on_row_changed_maybe_select_folder (GtkTreeModel *tree_model,
+static void on_row_inserted_maybe_select_folder (GtkTreeModel *tree_model,
GtkTreePath *path,
GtkTreeIter *iter,
ModestFolderView *self);
TnyFolder *folder_to_select; /* folder to select after the next update */
- gulong account_update_signal;
+ ModestConfNotificationId notification_id;
+
gulong changed_signal;
- gulong accounts_reloaded_signal;
+ gulong account_inserted_signal;
gulong account_removed_signal;
+ gulong account_changed_signal;
gulong conf_key_signal;
/* not unref this object, its a singlenton */
gchar *visible_account_id;
ModestFolderViewStyle style;
- gboolean reselect; /* we use this to force a reselection of the INBOX */
- gboolean show_non_move;
+ 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 */
};
#define MODEST_FOLDER_VIEW_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE((o), \
}
/* Simplify checks for NULLs: */
-static gboolean strings_are_equal (const gchar *a, const gchar *b)
+static gboolean
+strings_are_equal (const gchar *a, const gchar *b)
{
if (!a && !b)
return TRUE;
return FALSE;
}
-static gboolean on_model_foreach_set_name(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
+static gboolean
+on_model_foreach_set_name(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
{
GObject *instance = NULL;
gchar *previous_name;
} GetMmcAccountNameData;
-static void on_get_mmc_account_name (TnyStoreAccount* account, gpointer user_data)
+static void
+on_get_mmc_account_name (TnyStoreAccount* account, gpointer user_data)
{
/* printf ("DEBU1G: %s: account name=%s\n", __FUNCTION__, tny_account_get_name (TNY_ACCOUNT(account))); */
ModestFolderViewPrivate *priv;
GObject *rendobj;
gchar *fname = NULL;
- gint unread = 0;
- gint all = 0;
TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
GObject *instance = NULL;
-
+
g_return_if_fail (column);
g_return_if_fail (tree_model);
+ g_return_if_fail (iter != NULL);
gtk_tree_model_get (tree_model, iter,
TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &fname,
- TNY_GTK_FOLDER_STORE_TREE_MODEL_ALL_COLUMN, &all,
- TNY_GTK_FOLDER_STORE_TREE_MODEL_UNREAD_COLUMN, &unread,
TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type,
TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &instance,
-1);
}
}
- /* Select the number to show: the unread or unsent messages */
- if ((type == TNY_FOLDER_TYPE_DRAFTS) || (type == TNY_FOLDER_TYPE_OUTBOX))
- number = all;
+ /* 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));
else
- number = unread;
-
+ number = tny_folder_get_unread_count (TNY_FOLDER(instance));
+
/* Use bold font style if there are unread or unset messages */
if (number > 0) {
item_name = g_strdup_printf ("%s (%d)", fname, number);
* added to the model, not when the account is
* changed later, so get the name from the account
* instance: */
- item_name = g_strdup (tny_account_get_name (
- TNY_ACCOUNT (instance)));
+ item_name = g_strdup (tny_account_get_name (TNY_ACCOUNT (instance)));
item_weight = 800;
} else {
item_name = g_strdup (fname);
callback_data->previous_name = g_strdup (name);
modest_tny_account_get_mmc_account_name (TNY_STORE_ACCOUNT (instance),
- on_get_mmc_account_name, callback_data);
+ on_get_mmc_account_name, callback_data);
}
g_object_unref (G_OBJECT (instance));
GObject *rendobj = NULL, *instance = NULL;
GdkPixbuf *pixbuf = NULL;
TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
- gchar *fname = NULL;
const gchar *account_id = NULL;
- gint unread = 0;
gboolean has_children;
-
+
rendobj = G_OBJECT(renderer);
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_INSTANCE_COLUMN, &instance,
-1);
has_children = gtk_tree_model_iter_has_child (tree_model, iter);
- if (!fname)
+ if (!instance)
return;
- if (!instance) {
- g_free (fname);
- return;
- }
-
/* MERGE is not needed anymore as the folder now has the correct type jschmid */
/* We include the MERGE type here because it's used to create
the local OUTBOX folder */
}
g_object_unref (G_OBJECT (instance));
- g_free (fname);
/* Set pixbuf */
g_object_set (rendobj, "pixbuf", pixbuf, NULL);
priv->visible_account_id = NULL;
priv->folder_to_select = NULL;
+ priv->reexpand = TRUE;
+
/* Initialize the local account name */
conf = modest_runtime_get_conf();
priv->local_account_name = modest_conf_get_string (conf, MODEST_CONF_DEVICE_NAME, NULL);
* Track changes in the local account name (in the device it
* will be the device name)
*/
- priv->conf_key_signal =
- g_signal_connect (G_OBJECT(conf),
- "key_changed",
- G_CALLBACK(on_configuration_key_changed), obj);
+ priv->notification_id = modest_conf_listen_to_namespace (conf,
+ MODEST_CONF_NAMESPACE);
+ priv->conf_key_signal = g_signal_connect (G_OBJECT(conf),
+ "key_changed",
+ G_CALLBACK(on_configuration_key_changed),
+ obj);
}
static void
priv = MODEST_FOLDER_VIEW_GET_PRIVATE(obj);
+ if (priv->notification_id) {
+ modest_conf_forget_namespace (modest_runtime_get_conf (),
+ MODEST_CONF_NAMESPACE,
+ priv->notification_id);
+ }
+
if (priv->timer_expander != 0) {
g_source_remove (priv->timer_expander);
priv->timer_expander = 0;
if (priv->account_store) {
g_signal_handler_disconnect (G_OBJECT(priv->account_store),
- priv->account_update_signal);
- g_signal_handler_disconnect (G_OBJECT(priv->account_store),
- priv->accounts_reloaded_signal);
+ priv->account_inserted_signal);
g_signal_handler_disconnect (G_OBJECT(priv->account_store),
priv->account_removed_signal);
+ g_signal_handler_disconnect (G_OBJECT(priv->account_store),
+ priv->account_changed_signal);
g_object_unref (G_OBJECT(priv->account_store));
priv->account_store = NULL;
}
priv->query = NULL;
}
+/* modest_folder_view_disable_next_folder_selection (MODEST_FOLDER_VIEW(obj)); */
if (priv->folder_to_select) {
g_object_unref (G_OBJECT(priv->folder_to_select));
priv->folder_to_select = NULL;
if (G_UNLIKELY (priv->account_store)) {
- if (g_signal_handler_is_connected (G_OBJECT (priv->account_store),
- priv->account_update_signal))
- g_signal_handler_disconnect (G_OBJECT (priv->account_store),
- priv->account_update_signal);
- if (g_signal_handler_is_connected (G_OBJECT (priv->account_store),
- priv->accounts_reloaded_signal))
- g_signal_handler_disconnect (G_OBJECT (priv->account_store),
- priv->accounts_reloaded_signal);
+ if (g_signal_handler_is_connected (G_OBJECT (priv->account_store),
+ priv->account_inserted_signal))
+ g_signal_handler_disconnect (G_OBJECT (priv->account_store),
+ priv->account_inserted_signal);
if (g_signal_handler_is_connected (G_OBJECT (priv->account_store),
priv->account_removed_signal))
g_signal_handler_disconnect (G_OBJECT (priv->account_store),
priv->account_removed_signal);
-
+ if (g_signal_handler_is_connected (G_OBJECT (priv->account_store),
+ priv->account_changed_signal))
+ g_signal_handler_disconnect (G_OBJECT (priv->account_store),
+ priv->account_changed_signal);
g_object_unref (G_OBJECT (priv->account_store));
}
priv->account_store = g_object_ref (G_OBJECT (account_store));
- priv->account_update_signal =
- g_signal_connect (G_OBJECT(account_store), "account_update",
- G_CALLBACK (on_account_update), self);
-
priv->account_removed_signal =
g_signal_connect (G_OBJECT(account_store), "account_removed",
G_CALLBACK (on_account_removed), self);
- priv->accounts_reloaded_signal =
- g_signal_connect (G_OBJECT(account_store), "accounts_reloaded",
- G_CALLBACK (on_accounts_reloaded), self);
+ priv->account_inserted_signal =
+ g_signal_connect (G_OBJECT(account_store), "account_inserted",
+ G_CALLBACK (on_account_inserted), self);
- g_signal_connect (G_OBJECT(account_store), "connecting_finished",
- G_CALLBACK (on_accounts_reloaded), self);
+ priv->account_changed_signal =
+ g_signal_connect (G_OBJECT(account_store), "account_changed",
+ G_CALLBACK (on_account_changed), self);
- on_accounts_reloaded (account_store, (gpointer ) self);
+ modest_folder_view_update_model (MODEST_FOLDER_VIEW (self), account_store);
g_object_unref (G_OBJECT (device));
}
static void
+on_account_inserted (TnyAccountStore *account_store,
+ TnyAccount *account,
+ gpointer user_data)
+{
+ ModestFolderViewPrivate *priv;
+ GtkTreeModel *sort_model, *filter_model;
+
+ /* Ignore transport account insertions, we're not showing them
+ in the folder view */
+ if (TNY_IS_TRANSPORT_ACCOUNT (account))
+ return;
+
+ priv = MODEST_FOLDER_VIEW_GET_PRIVATE (user_data);
+
+ /* If we're adding a new account, and there is no previous
+ one, we need to select the visible server account */
+ if (priv->style == MODEST_FOLDER_VIEW_STYLE_SHOW_ONE &&
+ !priv->visible_account_id)
+ modest_widget_memory_restore (modest_runtime_get_conf(),
+ G_OBJECT (user_data),
+ MODEST_CONF_FOLDER_VIEW_KEY);
+
+ /* Get the inner model */
+ filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (user_data));
+ sort_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter_model));
+
+ /* Insert the account in the model */
+ tny_list_append (TNY_LIST (gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (sort_model))),
+ G_OBJECT (account));
+
+}
+
+
+static void
+on_account_changed (TnyAccountStore *account_store,
+ TnyAccount *tny_account,
+ gpointer user_data)
+{
+ /* do nothing */
+ ModestFolderViewPrivate *priv;
+ GtkTreeModel *sort_model, *filter_model;
+
+ /* Ignore transport account insertions, we're not showing them
+ in the folder view */
+ if (TNY_IS_TRANSPORT_ACCOUNT (tny_account))
+ return;
+
+ priv = MODEST_FOLDER_VIEW_GET_PRIVATE (user_data);
+
+ /* Get the inner model */
+ filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (user_data));
+ sort_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter_model));
+
+ /* Remove the account from the model */
+ tny_list_remove (TNY_LIST (gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (sort_model))),
+ G_OBJECT (tny_account));
+
+ /* Insert the account in the model */
+ tny_list_append (TNY_LIST (gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (sort_model))),
+ G_OBJECT (tny_account));
+}
+
+
+
+static void
on_account_removed (TnyAccountStore *account_store,
TnyAccount *account,
gpointer user_data)
{
- ModestFolderView *self = MODEST_FOLDER_VIEW (user_data);
+ ModestFolderView *self = NULL;
ModestFolderViewPrivate *priv;
+ GtkTreeModel *sort_model, *filter_model;
+ GtkTreeSelection *sel = NULL;
+
+ /* Ignore transport account removals, we're not showing them
+ in the folder view */
+ if (TNY_IS_TRANSPORT_ACCOUNT (account))
+ return;
+ self = MODEST_FOLDER_VIEW (user_data);
priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
+ /* Invalidate the cur_folder_store only if the selected folder
+ belongs to the account that is being removed */
+ if (priv->cur_folder_store) {
+ TnyAccount *selected_folder_account = NULL;
+
+ if (TNY_IS_FOLDER (priv->cur_folder_store)) {
+ selected_folder_account =
+ tny_folder_get_account (TNY_FOLDER (priv->cur_folder_store));
+ } else {
+ selected_folder_account =
+ TNY_ACCOUNT (g_object_ref (priv->cur_folder_store));
+ }
+
+ if (selected_folder_account == account) {
+ sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
+ gtk_tree_selection_unselect_all (sel);
+ }
+ g_object_unref (selected_folder_account);
+ }
+
+ /* Invalidate row to select only if the folder to select
+ belongs to the account that is being removed*/
+ if (priv->folder_to_select) {
+ TnyAccount *folder_to_select_account = NULL;
+
+ folder_to_select_account = tny_folder_get_account (priv->folder_to_select);
+ if (folder_to_select_account == account) {
+/* modest_folder_view_disable_next_folder_selection (self); */
+ g_object_unref (priv->folder_to_select);
+ priv->folder_to_select = NULL;
+ }
+ g_object_unref (folder_to_select_account);
+ }
+
+ /* Remove the account from the model */
+ filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
+ sort_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter_model));
+ tny_list_remove (TNY_LIST (gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (sort_model))),
+ G_OBJECT (account));
+
/* If the removed account is the currently viewed one then
clear the configuration value. The new visible account will be the default account */
if (priv->visible_account_id &&
/* Call the restore method, this will set the new visible account */
modest_widget_memory_restore (modest_runtime_get_conf(), G_OBJECT(self),
MODEST_CONF_FOLDER_VIEW_KEY);
-
- /* Select the INBOX */
- modest_folder_view_select_first_inbox_or_local (self);
}
-}
-
-static void
-on_account_update (TnyAccountStore *account_store,
- const gchar *account,
- gpointer user_data)
-{
- ModestFolderView *self = NULL;
- ModestFolderViewPrivate *priv;
- g_return_if_fail (MODEST_IS_FOLDER_VIEW (user_data));
- self = MODEST_FOLDER_VIEW (user_data);
- priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
-
- /* If we're adding a new account, and there is no previous
- one, we need to select the visible server account */
- if (priv->style == MODEST_FOLDER_VIEW_STYLE_SHOW_ONE &&
- !priv->visible_account_id)
- modest_widget_memory_restore (modest_runtime_get_conf(), G_OBJECT(self),
- MODEST_CONF_FOLDER_VIEW_KEY);
-
- if (!modest_folder_view_update_model (self, account_store))
- g_printerr ("modest: failed to update model for changes in '%s'",
- account);
-}
-
-static void
-on_accounts_reloaded (TnyAccountStore *account_store,
- gpointer user_data)
-{
- g_return_if_fail (MODEST_IS_FOLDER_VIEW (user_data));
- modest_folder_view_update_model (MODEST_FOLDER_VIEW (user_data), account_store);
+ /* Select the INBOX */
+ modest_folder_view_select_first_inbox_or_local (self);
}
void
signals[FOLDER_DISPLAY_NAME_CHANGED_SIGNAL], 0,
NULL);
}
+
+ if (priv->reexpand) {
+ expand_root_items (self);
+ priv->reexpand = FALSE;
+ }
+
return FALSE;
}
expand_root_items (ModestFolderView *self)
{
GtkTreePath *path;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
path = gtk_tree_path_new_first ();
/* all folders should have child items, so.. */
- while (gtk_tree_view_expand_row (GTK_TREE_VIEW(self), path, FALSE))
+ do {
+ gtk_tree_view_expand_row (GTK_TREE_VIEW(self), path, FALSE);
gtk_tree_path_next (path);
+ } while (gtk_tree_model_get_iter (model, &iter, path));
gtk_tree_path_free (path);
}
/* FIXME: the local accounts are not shown when the query
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);
+ model = tny_gtk_folder_store_tree_model_new (NULL);
/* Deal with the model via its TnyList Interface,
* filling the TnyList via a get_accounts() call: */
/* Set new model */
gtk_tree_view_set_model (GTK_TREE_VIEW(self), filter_model);
- g_signal_connect (G_OBJECT(filter_model), "row-changed",
- (GCallback)on_row_changed_maybe_select_folder, self);
g_signal_connect (G_OBJECT(filter_model), "row-inserted",
- (GCallback)on_row_changed_maybe_select_folder, self);
+ (GCallback) on_row_inserted_maybe_select_folder, self);
g_object_unref (model);
g_object_unref (filter_model);
g_object_unref (sortable);
-
+
/* Force a reselection of the INBOX next time the widget is shown */
priv->reselect = TRUE;
static void
on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
{
- GtkTreeModel *model;
- TnyFolderStore *folder = NULL;
- GtkTreeIter iter;
- ModestFolderView *tree_view;
- ModestFolderViewPrivate *priv;
+ GtkTreeModel *model = NULL;
+ TnyFolderStore *folder = NULL;
+ GtkTreeIter iter;
+ ModestFolderView *tree_view = NULL;
+ ModestFolderViewPrivate *priv = NULL;
+ gboolean selected = FALSE;
g_return_if_fail (sel);
g_return_if_fail (user_data);
priv = MODEST_FOLDER_VIEW_GET_PRIVATE(user_data);
- if(!gtk_tree_selection_get_selected (sel, &model, &iter))
- return;
+ selected = gtk_tree_selection_get_selected (sel, &model, &iter);
/* Notify the display name observers */
g_signal_emit (G_OBJECT(user_data),
NULL);
tree_view = MODEST_FOLDER_VIEW (user_data);
- gtk_tree_model_get (model, &iter,
- TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder,
- -1);
- /* If the folder is the same do not notify */
- if (priv->cur_folder_store == folder && folder) {
- g_object_unref (folder);
- return;
+ if (selected) {
+ gtk_tree_model_get (model, &iter,
+ TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder,
+ -1);
+
+ /* If the folder is the same do not notify */
+ if (folder && priv->cur_folder_store == folder) {
+ g_object_unref (folder);
+ return;
+ }
}
/* Current folder was unselected */
if (TNY_IS_FOLDER(priv->cur_folder_store))
tny_folder_sync_async (TNY_FOLDER(priv->cur_folder_store),
FALSE, NULL, NULL, NULL);
+
/* FALSE --> don't expunge the messages */
g_object_unref (priv->cur_folder_store);
/*****************************************************************************/
/* DRAG and DROP stuff */
/*****************************************************************************/
-
/*
* This function fills the #GtkSelectionData with the row and the
* model that has been dragged. It's called when this widget is a
* and drop action
*/
static void
-on_progress_changed (ModestMailOperation *mail_op,
- ModestMailOperationState *state,
- gpointer user_data)
+xfer_cb (ModestMailOperation *mail_op,
+ gpointer user_data)
{
gboolean success;
DndHelper *helper;
helper = (DndHelper *) user_data;
- if (!state->finished)
- return;
-
- if (state->status == MODEST_MAIL_OPERATION_STATUS_SUCCESS) {
+ if (modest_mail_operation_get_status (mail_op) ==
+ MODEST_MAIL_OPERATION_STATUS_SUCCESS) {
success = TRUE;
} else {
success = FALSE;
gtk_drag_finish (helper->context, success, FALSE, helper->time);
/* Free the helper */
- gtk_tree_path_free (helper->source_row);
+ gtk_tree_path_free (helper->source_row);
g_slice_free (DndHelper, helper);
}
+/* get the folder for the row the treepath refers to. */
+/* folder must be unref'd */
+static TnyFolder*
+tree_path_to_folder (GtkTreeModel *model, GtkTreePath *path)
+{
+ GtkTreeIter iter;
+ TnyFolder *folder = NULL;
+
+ if (gtk_tree_model_get_iter (model,&iter, path))
+ gtk_tree_model_get (model, &iter,
+ TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder,
+ -1);
+ return folder;
+}
+
/*
* This function is used by drag_data_received_cb to manage drag and
* drop of a header, i.e, and drag from the header view to the folder
drag_and_drop_from_header_view (GtkTreeModel *source_model,
GtkTreeModel *dest_model,
GtkTreePath *dest_row,
+ GtkSelectionData *selection_data,
DndHelper *helper)
{
TnyList *headers = NULL;
- TnyHeader *header = NULL;
TnyFolder *folder = NULL;
ModestMailOperation *mail_op = NULL;
GtkTreeIter source_iter, dest_iter;
+ ModestWindowMgr *mgr = NULL;
+ ModestWindow *main_win = NULL;
+ gchar **uris, **tmp;
+ gint response;
- g_return_if_fail (GTK_IS_TREE_MODEL(source_model));
- g_return_if_fail (GTK_IS_TREE_MODEL(dest_model));
- g_return_if_fail (dest_row);
- g_return_if_fail (helper);
-
- /* Get header */
- gtk_tree_model_get_iter (source_model, &source_iter, helper->source_row);
- gtk_tree_model_get (source_model, &source_iter,
- TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
- &header, -1);
- if (!TNY_IS_HEADER(header)) {
- g_warning ("BUG: %s could not get a valid header", __FUNCTION__);
- goto cleanup;
+ /* Build the list of headers */
+ mgr = modest_runtime_get_window_mgr ();
+ headers = tny_simple_list_new ();
+ uris = modest_dnd_selection_data_get_paths (selection_data);
+ tmp = uris;
+
+ while (*tmp != NULL) {
+ TnyHeader *header;
+ GtkTreePath *path;
+
+ /* Get header */
+ path = gtk_tree_path_new_from_string (*tmp);
+ gtk_tree_model_get_iter (source_model, &source_iter, path);
+ gtk_tree_model_get (source_model, &source_iter,
+ TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
+ &header, -1);
+
+ /* Do not enable d&d of headers already opened */
+ if (!modest_window_mgr_find_registered_header(mgr, header, NULL))
+ tny_list_append (headers, G_OBJECT (header));
+
+ /* Free and go on */
+ gtk_tree_path_free (path);
+ g_object_unref (header);
+ tmp++;
}
-
- /* Get Folder */
+ g_strfreev (uris);
+
+ /* Get the target folder */
gtk_tree_model_get_iter (dest_model, &dest_iter, dest_row);
gtk_tree_model_get (dest_model, &dest_iter,
- TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN,
+ TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN,
&folder, -1);
- if (!TNY_IS_FOLDER(folder)) {
- g_warning ("BUG: %s could not get a valid folder", __FUNCTION__);
+ /* Ask for confirmation to move */
+ main_win = modest_window_mgr_get_main_window(mgr);
+ response = modest_ui_actions_msgs_move_to_confirmation (GTK_WINDOW(main_win), folder,
+ TRUE, headers);
+ if (response == GTK_RESPONSE_CANCEL)
goto cleanup;
- }
- /* Transfer message */
+ /* Transfer messages */
mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE,
NULL,
modest_ui_actions_move_folder_error_handler,
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);
- headers = tny_simple_list_new ();
- tny_list_append (headers, G_OBJECT (header));
- modest_mail_operation_xfer_msgs (mail_op,
+ modest_mail_operation_xfer_msgs (mail_op,
headers,
folder,
helper->delete_source,
- NULL, NULL);
+ xfer_cb, helper);
/* Frees */
cleanup:
if (G_IS_OBJECT(mail_op))
g_object_unref (G_OBJECT (mail_op));
- if (G_IS_OBJECT(header))
- g_object_unref (G_OBJECT (header));
if (G_IS_OBJECT(folder))
g_object_unref (G_OBJECT (folder));
if (G_IS_OBJECT(headers))
DndHelper *helper)
{
ModestMailOperation *mail_op = NULL;
- GtkTreeIter parent_iter, iter;
- TnyFolderStore *parent_folder = NULL;
+ GtkTreeIter dest_iter, iter;
+ TnyFolderStore *dest_folder = NULL;
TnyFolder *folder = NULL;
+ gboolean forbidden = FALSE;
+
+ if (!forbidden) {
+ /* check the folder rules for the destination */
+ folder = tree_path_to_folder (dest_model, dest_row);
+ if (TNY_IS_FOLDER(folder)) {
+ ModestTnyFolderRules rules =
+ modest_tny_folder_get_rules (folder);
+ forbidden = rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE;
+ } else if (TNY_IS_FOLDER_STORE(folder)) {
+ /* enable local root as destination for folders */
+ if (!MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (folder)
+ && TNY_IS_ACCOUNT (folder))
+ forbidden = TRUE;
+ }
+ g_object_unref (folder);
+ }
+ if (!forbidden) {
+ /* check the folder rules for the source */
+ folder = tree_path_to_folder (source_model, helper->source_row);
+ if (TNY_IS_FOLDER(folder)) {
+ ModestTnyFolderRules rules =
+ modest_tny_folder_get_rules (folder);
+ forbidden = rules & MODEST_FOLDER_RULES_FOLDER_NON_MOVEABLE;
+ } else
+ forbidden = TRUE;
+ g_object_unref (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)) {
-
+ if (forbidden || !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);
g_slice_free (DndHelper, helper);
}
/* Get data */
- gtk_tree_model_get_iter (source_model, &parent_iter, dest_row);
- gtk_tree_model_get_iter (source_model, &iter, helper->source_row);
- gtk_tree_model_get (source_model, &parent_iter,
+ gtk_tree_model_get_iter (dest_model, &dest_iter, dest_row);
+ gtk_tree_model_get (dest_model, &dest_iter,
TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN,
- &parent_folder, -1);
+ &dest_folder, -1);
+ gtk_tree_model_get_iter (source_model, &iter, helper->source_row);
gtk_tree_model_get (source_model, &iter,
TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN,
&folder, -1);
/* Offer the connection dialog if necessary, for the destination parent folder and source folder: */
- if (modest_platform_connect_and_wait_if_network_folderstore (NULL, parent_folder) &&
- modest_platform_connect_and_wait_if_network_folderstore (NULL, TNY_FOLDER_STORE (folder))) {
+ if (modest_platform_connect_and_wait_if_network_folderstore (NULL, dest_folder) &&
+ modest_platform_connect_and_wait_if_network_folderstore (NULL, TNY_FOLDER_STORE (folder))) {
+ ModestWindowMgr *mgr = modest_runtime_get_window_mgr ();
+
/* Do the mail operation */
- mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE,
- NULL,
- modest_ui_actions_move_folder_error_handler,
- NULL);
+ mail_op =
+ modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE,
+ G_OBJECT (modest_window_mgr_get_main_window (mgr)),
+ modest_ui_actions_move_folder_error_handler,
+ folder);
+
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);
+ mail_op);
modest_mail_operation_xfer_folder (mail_op,
- folder,
- parent_folder,
- helper->delete_source,
- NULL,
- NULL);
+ folder,
+ dest_folder,
+ helper->delete_source,
+ xfer_cb,
+ helper);
- g_object_unref (G_OBJECT (mail_op));
+ g_object_unref (G_OBJECT (mail_op));
}
/* Frees */
- g_object_unref (G_OBJECT (parent_folder));
+ g_object_unref (G_OBJECT (dest_folder));
g_object_unref (G_OBJECT (folder));
}
the operation, because the operation won't start if
the folder is in use */
if (source_widget == widget) {
- ModestFolderViewPrivate *priv;
-
- priv = MODEST_FOLDER_VIEW_GET_PRIVATE (widget);
- if (priv->cur_folder_store) {
- g_object_unref (priv->cur_folder_store);
- priv->cur_folder_store = NULL;
- }
-
- g_signal_emit (G_OBJECT (widget),
- signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0, NULL, FALSE);
+ GtkTreeSelection *sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget));
+ gtk_tree_selection_unselect_all (sel);
}
}
if (selection_data == NULL || selection_data->length < 0)
gtk_drag_finish (context, success, FALSE, time);
- /* Get the models */
- gtk_tree_get_row_drag_data (selection_data,
- &source_model,
- &source_row);
-
/* Select the destination model */
- if (source_widget == widget) {
- dest_model = source_model;
- } else {
- dest_model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));
- }
+ dest_model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));
/* Get the path to the destination row. Can not call
gtk_tree_view_get_drag_dest_row() because the source row
&dest_row, &pos);
/* Only allow drops IN other rows */
- if (!dest_row || pos == GTK_TREE_VIEW_DROP_BEFORE || pos == GTK_TREE_VIEW_DROP_AFTER)
+ if (!dest_row ||
+ pos == GTK_TREE_VIEW_DROP_BEFORE ||
+ pos == GTK_TREE_VIEW_DROP_AFTER)
gtk_drag_finish (context, success, FALSE, time);
/* Create the helper */
helper = g_slice_new0 (DndHelper);
helper->delete_source = delete_source;
- helper->source_row = gtk_tree_path_copy (source_row);
helper->context = context;
helper->time = time;
/* Drags from the header view */
if (source_widget != widget) {
+ source_model = gtk_tree_view_get_model (GTK_TREE_VIEW (source_widget));
drag_and_drop_from_header_view (source_model,
dest_model,
dest_row,
+ selection_data,
helper);
} else {
-
+ /* Get the source model and row */
+ gtk_tree_get_row_drag_data (selection_data,
+ &source_model,
+ &source_row);
+ helper->source_row = gtk_tree_path_copy (source_row);
drag_and_drop_from_folder_view (source_model,
dest_model,
dest_row,
selection_data,
helper);
+
+ gtk_tree_path_free (source_row);
}
/* Frees */
- gtk_tree_path_free (source_row);
gtk_tree_path_free (dest_row);
}
{
GtkTreeViewDropPosition pos;
GtkTreePath *dest_row;
+ GtkTreeModel *dest_model;
ModestFolderViewPrivate *priv;
GdkDragAction suggested_action;
gboolean valid_location = FALSE;
+ TnyFolder *folder;
priv = MODEST_FOLDER_VIEW_GET_PRIVATE (widget);
valid_location = TRUE;
}
+ /* Check that the destination folder is writable */
+ dest_model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));
+ folder = tree_path_to_folder (dest_model, dest_row);
+ if (folder) {
+ ModestTnyFolderRules rules = modest_tny_folder_get_rules(folder);
+
+ if (rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE) {
+ valid_location = FALSE;
+ goto out;
+ }
+ g_object_unref (folder);
+ }
+
/* Expand the selected row after 1/2 second */
if (!gtk_tree_view_row_expanded (GTK_TREE_VIEW (widget), dest_row)) {
gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (widget), dest_row, pos);
if (dest_row)
gtk_tree_path_free (dest_row);
g_signal_stop_emission_by_name (widget, "drag-motion");
+
return valid_location;
}
-
-/* Folder view drag types */
-const GtkTargetEntry folder_view_drag_types[] =
-{
- { "GTK_TREE_MODEL_ROW", GTK_TARGET_SAME_WIDGET, MODEST_FOLDER_ROW },
- { "GTK_TREE_MODEL_ROW", GTK_TARGET_SAME_APP, MODEST_HEADER_ROW }
-};
-
/*
* This function sets the treeview as a source and a target for dnd
* events. It also connects all the requirede signals.
static void
on_configuration_key_changed (ModestConf* conf,
const gchar *key,
- ModestConfEvent event,
+ ModestConfEvent event,
+ ModestConfNotificationId id,
ModestFolderView *self)
{
ModestFolderViewPrivate *priv;
- if (!key)
- return;
g_return_if_fail (MODEST_IS_FOLDER_VIEW (self));
priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
+ /* Do not listen for changes in other namespaces */
+ if (priv->notification_id != id)
+ return;
+
if (!strcmp (key, MODEST_CONF_DEVICE_NAME)) {
g_free (priv->local_account_name);
MODEST_CONF_DEVICE_NAME, NULL);
/* 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);
+#if GTK_CHECK_VERSION(2, 8, 0)
+ GtkTreeViewColumn * tree_column;
+
+ 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);
+#else
+ gtk_widget_queue_draw (GTK_WIDGET (self));
#endif
}
}
-void
+void
modest_folder_view_set_style (ModestFolderView *self,
ModestFolderViewStyle style)
{
/* Select the row and free */
gtk_tree_view_set_cursor (GTK_TREE_VIEW (self), path, NULL, FALSE);
+ gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (self), path, NULL, FALSE, 0.0, 0.0);
gtk_tree_path_free (path);
+
+ /* set focus */
+ gtk_widget_grab_focus (GTK_WIDGET(self));
}
TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &name,
TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type,
-1);
-
- g_debug ("===> %s (%p ---- %p)", name, a_folder, folder);
g_free (name);
if (folder == a_folder) {
static void
-on_row_changed_maybe_select_folder (GtkTreeModel *tree_model, GtkTreePath *path, GtkTreeIter *iter,
- ModestFolderView *self)
+on_row_inserted_maybe_select_folder (GtkTreeModel *tree_model, GtkTreePath *path, GtkTreeIter *iter,
+ ModestFolderView *self)
{
ModestFolderViewPrivate *priv = NULL;
GtkTreeSelection *sel;
+ TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
+ GObject *instance = NULL;
if (!MODEST_IS_FOLDER_VIEW(self))
return;
priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
+
+ priv->reexpand = TRUE;
+
+ gtk_tree_model_get (tree_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_INBOX && priv->folder_to_select == NULL) {
+ priv->folder_to_select = g_object_ref (instance);
+ }
+ g_object_unref (instance);
+
if (priv->folder_to_select) {
gtk_tree_path_free (path);
}
- g_object_unref (priv->folder_to_select);
- priv->folder_to_select = NULL;
+
+ /* Disable next */
+ modest_folder_view_disable_next_folder_selection (self);
+/* g_object_unref (priv->folder_to_select); */
+/* priv->folder_to_select = NULL; */
}
}
+void
+modest_folder_view_disable_next_folder_selection (ModestFolderView *self)
+{
+ ModestFolderViewPrivate *priv = NULL;
+
+ g_return_if_fail (MODEST_IS_FOLDER_VIEW (self));
+ priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
+
+ if (priv->folder_to_select)
+ g_object_unref(priv->folder_to_select);
+
+ priv->folder_to_select = NULL;
+}
+
gboolean
modest_folder_view_select_folder (ModestFolderView *self, TnyFolder *folder,
gboolean after_change)
}
void
+modest_folder_view_copy_model (ModestFolderView *folder_view_src,
+ ModestFolderView *folder_view_dst)
+{
+ GtkTreeModel *filter_model = NULL;
+ GtkTreeModel *model = NULL;
+ GtkTreeModel *new_filter_model = NULL;
+
+ g_return_if_fail (MODEST_IS_FOLDER_VIEW (folder_view_src));
+ g_return_if_fail (MODEST_IS_FOLDER_VIEW (folder_view_dst));
+
+ /* Get src model*/
+ filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (folder_view_src));
+ model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER(filter_model));
+
+ /* Build new filter model */
+ new_filter_model = gtk_tree_model_filter_new (model, NULL);
+ gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (new_filter_model),
+ filter_row,
+ folder_view_dst,
+ NULL);
+ /* Set copied model */
+ gtk_tree_view_set_model (GTK_TREE_VIEW (folder_view_dst), new_filter_model);
+
+ /* Free */
+ g_object_unref (new_filter_model);
+}
+
+void
modest_folder_view_show_non_move_folders (ModestFolderView *folder_view,
- gboolean show)
+ gboolean show)
{
+ GtkTreeModel *model = NULL;
ModestFolderViewPrivate* priv = MODEST_FOLDER_VIEW_GET_PRIVATE(folder_view);
priv->show_non_move = show;
- modest_folder_view_update_model(folder_view,
- TNY_ACCOUNT_STORE(modest_runtime_get_account_store()));
+/* modest_folder_view_update_model(folder_view, */
+/* TNY_ACCOUNT_STORE(modest_runtime_get_account_store())); */
+
+ /* Hide special folders */
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (folder_view));
+ if (GTK_IS_TREE_MODEL_FILTER (model)) {
+ gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model));
+ }
}
/* Returns FALSE if it did not selected anything */
projects / modest / blobdiff