#include <tny-gtk-account-list-model.h>
#include <tny-gtk-folder-store-tree-model.h>
#include <tny-gtk-header-list-model.h>
+#include <tny-folder.h>
#include <tny-account-store.h>
#include <tny-account.h>
#include <tny-folder.h>
#include <tny-camel-folder.h>
+#include <tny-simple-list.h>
#include <modest-tny-folder.h>
#include <modest-marshal.h>
#include <modest-icon-names.h>
static void modest_folder_view_init (ModestFolderView *obj);
static void modest_folder_view_finalize (GObject *obj);
-static gboolean update_model (ModestFolderView *self,
- ModestTnyAccountStore *account_store);
-static gboolean update_model_empty (ModestFolderView *self);
+static gboolean update_model (ModestFolderView *self,
+ ModestTnyAccountStore *account_store);
+
+static gboolean update_model_empty (ModestFolderView *self);
+
+static void on_selection_changed (GtkTreeSelection *sel, gpointer data);
+
+static gint cmp_rows (GtkTreeModel *tree_model,
+ GtkTreeIter *iter1,
+ GtkTreeIter *iter2,
+ gpointer user_data);
-static void on_selection_changed (GtkTreeSelection *sel, gpointer data);
-/* static void on_subscription_changed (TnyStoreAccount *store_account, TnyFolder *folder, */
-/* ModestFolderView *self); */
+/* DnD functions */
+static void drag_data_get_cb (GtkWidget *widget,
+ GdkDragContext *context,
+ GtkSelectionData *selection_data,
+ guint info,
+ guint time,
+ gpointer data);
-static gint cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
- gpointer user_data);
+static void drag_data_received_cb (GtkWidget *widget,
+ GdkDragContext *context,
+ gint x,
+ gint y,
+ GtkSelectionData *selection_data,
+ guint info,
+ guint time,
+ gpointer data);
+
+static gboolean drag_motion_cb (GtkWidget *widget,
+ GdkDragContext *context,
+ gint x,
+ gint y,
+ guint time,
+ gpointer user_data);
+
+static gint expand_row_timeout (gpointer data);
+
+static void setup_drag_and_drop (GtkTreeView *self);
+
+
+static const GtkTargetEntry drag_types[] =
+{
+ { "GTK_TREE_MODEL_ROW", GTK_TARGET_SAME_WIDGET, 2 }
+};
enum {
FOLDER_SELECTION_CHANGED_SIGNAL,
+ FOLDER_MOVED_SIGNAL,
LAST_SIGNAL
};
struct _ModestFolderViewPrivate {
TnyAccountStore *account_store;
TnyFolder *cur_folder;
+ GtkTreeRowReference *cur_row;
gulong sig1, sig2;
GMutex *lock;
GtkTreeSelection *cur_selection;
TnyFolderStoreQuery *query;
-
+ guint timer_expander;
};
#define MODEST_FOLDER_VIEW_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE((o), \
NULL, NULL,
modest_marshal_VOID__POINTER_BOOLEAN,
G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_BOOLEAN);
+
+ /**
+ * ModestFolderView::folder-moved
+ * @self: the #MailOperation that emits the signal
+ * @folder: the #TnyFolder that is going to be moved
+ * @parent: then #TnyFolderStore that is going to be the new parent
+ * @done: indicates if the folder move was correctly completed or not
+ * @user_data: user data set when the signal handler was connected
+ *
+ * Emitted when a the user wants to move a folder through a
+ * drag and drop action
+ */
+ signals[FOLDER_MOVED_SIGNAL] =
+ g_signal_new ("folder_moved",
+ G_TYPE_FROM_CLASS (gobject_class),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (ModestFolderViewClass, folder_moved),
+ NULL, NULL,
+ modest_marshal_VOID__POINTER_POINTER_POINTER,
+ G_TYPE_NONE, 3, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_POINTER);
}
get_cached_icon (const gchar *name)
{
GError *err = NULL;
- GdkPixbuf *pixbuf;
+ gpointer pixbuf;
gpointer orig_key;
static GHashTable *icon_cache = NULL;
icon_cache = modest_cache_mgr_get_cache (modest_runtime_get_cache_mgr(),
MODEST_CACHE_MGR_CACHE_TYPE_PIXBUF);
- if (!icon_cache || !g_hash_table_lookup_extended (icon_cache, name, &orig_key,(gpointer*)&pixbuf)) {
- pixbuf = gdk_pixbuf_new_from_file (name, &err);
+ if (!icon_cache || !g_hash_table_lookup_extended (icon_cache, name, &orig_key, &pixbuf)) {
+ pixbuf = (gpointer)gdk_pixbuf_new_from_file (name, &err);
if (!pixbuf) {
g_printerr ("modest: error in icon factory while loading '%s': %s\n",
name, err->message);
if (icon_cache)
g_hash_table_insert (icon_cache, g_strdup(name),(gpointer)pixbuf);
}
- return pixbuf;
+ return GDK_PIXBUF(pixbuf);
}
priv = MODEST_FOLDER_VIEW_GET_PRIVATE(obj);
+ priv->timer_expander = 0;
priv->account_store = NULL;
priv->cur_folder = NULL;
+ priv->cur_row = NULL;
priv->query = NULL;
priv->lock = g_mutex_new ();
gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW(obj), FALSE);
gtk_tree_view_set_enable_search (GTK_TREE_VIEW(obj), FALSE);
+ setup_drag_and_drop (GTK_TREE_VIEW(obj));
}
static void
g_return_if_fail (obj);
priv = MODEST_FOLDER_VIEW_GET_PRIVATE(obj);
+
+ 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->sig1);
gtk_tree_path_free (path);
}
-
-
static gboolean
update_model (ModestFolderView *self, ModestTnyAccountStore *account_store)
{
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,
+ TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN,
cmp_rows, NULL, NULL);
/* Set new model */
gtk_tree_view_set_model (GTK_TREE_VIEW(self), sortable);
expand_root_items (self); /* expand all account folders */
-
}
g_object_unref (model);
static void
on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
{
- GtkTreeModel *model;
+ GtkTreeModel *model_sort, *model;
TnyFolder *folder = NULL;
- GtkTreeIter iter;
+ GtkTreeIter iter, iter_sort;
+ GtkTreePath *path;
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, &iter)) {
+ if (!gtk_tree_selection_get_selected (sel, &model_sort, &iter_sort)) {
priv->cur_folder = NULL; /* FIXME: need this? */
+ priv->cur_row = NULL; /* FIXME: need this? */
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,
TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type,
TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder,
priv->cur_folder, FALSE);
g_signal_emit (G_OBJECT(tree_view), signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0,
folder, TRUE);
- if (priv->cur_folder)
+ if (priv->cur_folder) {
tny_folder_sync (priv->cur_folder, TRUE, NULL); /* FIXME */
- priv->cur_folder = folder;
+ gtk_tree_row_reference_free (priv->cur_row);
+ }
+ priv->cur_folder = folder;
+ path = gtk_tree_model_get_path (model_sort, &iter_sort);
+ priv->cur_row = gtk_tree_row_reference_new (model_sort, path);
+ gtk_tree_path_free (path);
}
-/* static void */
-/* on_subscription_changed (TnyStoreAccount *store_account, */
-/* TnyFolder *folder, */
-/* ModestFolderView *self) */
-/* { */
-/* /\* TODO: probably we won't need a full reload, just the store */
-/* account or even the parent of the folder *\/ */
-
-/* ModestFolderViewPrivate *priv; */
-
-/* priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self); */
-/* update_model (self, MODEST_TNY_ACCOUNT_STORE (priv->account_store)); */
-/* } */
-
-
gboolean
modest_folder_view_update_model (ModestFolderView *self, TnyAccountStore *account_store)
{
return priv->cur_folder;
}
+static gboolean
+get_model_iter (ModestFolderView *self,
+ GtkTreeModel **model,
+ GtkTreeIter *iter)
+{
+ GtkTreeModel *model_sort;
+ GtkTreeIter iter_sort;
+ GtkTreePath *path;
+ ModestFolderViewPrivate *priv;
+
+ priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
+
+ if (!priv->cur_folder)
+ return FALSE;
+
+ if (!gtk_tree_row_reference_valid (priv->cur_row))
+ return FALSE;
+
+ model_sort = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
+ *model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (model_sort));
+
+ /* Get path to retrieve iter */
+ path = gtk_tree_row_reference_get_path (priv->cur_row);
+ if (!gtk_tree_model_get_iter (model_sort, &iter_sort, path))
+ return FALSE;
+
+ gtk_tree_model_sort_convert_iter_to_child_iter (GTK_TREE_MODEL_SORT (model_sort),
+ iter,
+ &iter_sort);
+ return TRUE;
+}
+
+gboolean
+modest_folder_view_rename (ModestFolderView *self)
+{
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ ModestFolderViewPrivate *priv;
+ gchar *old_name;
+
+ g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (self), FALSE);
+
+ priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
+
+ if (!get_model_iter (self, &model, &iter))
+ return FALSE;
+
+ /* Remove old name */
+ gtk_tree_model_get (model, &iter,
+ TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN,
+ &old_name, -1);
+ g_free (old_name);
+
+ /* Set new name */
+ gtk_tree_store_set (GTK_TREE_STORE (model), &iter,
+ TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN,
+ tny_folder_get_name (priv->cur_folder), -1);
+
+ /* Invalidate selection */
+ g_signal_emit (G_OBJECT(self), signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0,
+ priv->cur_folder, TRUE);
+
+ return TRUE;
+}
+
+gboolean
+modest_folder_view_add_subfolder (ModestFolderView *self, TnyFolder *folder)
+{
+ GtkTreeModel *model;
+ GtkTreeIter iter, child;
+
+ g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (self), FALSE);
+
+ if (!get_model_iter (self, &model, &iter))
+ return FALSE;
+
+ /* Append a new child to the folder */
+ gtk_tree_store_append (GTK_TREE_STORE (model), &child, &iter);
+ gtk_tree_store_set (GTK_TREE_STORE (model), &child,
+ TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN,
+ tny_folder_get_name (TNY_FOLDER (folder)),
+ TNY_GTK_FOLDER_STORE_TREE_MODEL_UNREAD_COLUMN,
+ tny_folder_get_unread_count (TNY_FOLDER (folder)),
+ TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN,
+ tny_folder_get_folder_type (TNY_FOLDER (folder)),
+ TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN,
+ folder, -1);
+
+ return TRUE;
+}
+
static gint
cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
gpointer user_data)
if (type == TNY_FOLDER_TYPE_ROOT) {
/* the account name is also the name of the root folder
* in case of local folders */
- if (strcmp (name1, MODEST_LOCAL_FOLDERS_ACCOUNT_NAME) == 0)
+ if (name1 && strcmp (name1, MODEST_LOCAL_FOLDERS_ACCOUNT_NAME) == 0)
cmp = +1;
- else if (strcmp (name2, MODEST_LOCAL_FOLDERS_ACCOUNT_NAME) == 0)
+ else if (name2 && strcmp (name2, MODEST_LOCAL_FOLDERS_ACCOUNT_NAME) == 0)
cmp = -1;
else
cmp = modest_text_utils_utf8_strcmp (name1, name2, TRUE);
return cmp;
}
+
+/*****************************************************************************/
+/* DRAG and DROP stuff */
+/*****************************************************************************/
+static void
+drag_data_get_cb (GtkWidget *widget,
+ GdkDragContext *context,
+ GtkSelectionData *selection_data,
+ guint info,
+ guint time,
+ gpointer data)
+{
+ GtkTreeSelection *selection;
+ GtkTreeModel *model_sort, *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);
+
+ 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_set_row_drag_data (selection_data,
+ model,
+ source_row);
+
+ gtk_tree_path_free (source_row_sort);
+ gtk_tree_path_free (source_row);
+}
+
+static void
+drag_data_received_cb (GtkWidget *widget,
+ GdkDragContext *context,
+ gint x,
+ gint y,
+ GtkSelectionData *selection_data,
+ guint info,
+ guint time,
+ gpointer data)
+{
+ GtkTreeModel *model_sort, *model;
+ GtkTreeRowReference *source_row_reference;
+ GtkTreePath *source_row, *dest_row, *child_dest_row;
+ GtkTreeViewDropPosition pos;
+ GtkTreeIter parent_iter, iter;
+ TnyFolder *folder;
+ TnyFolderStore *parent_folder;
+ gboolean done;
+
+ g_signal_stop_emission_by_name (widget, "drag-data-received");
+ model_sort = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));
+
+ /* Get the unsorted model, and the path to the source row */
+ gtk_tree_get_row_drag_data (selection_data,
+ &model,
+ &source_row);
+
+ /* Can not call gtk_tree_view_get_drag_dest_row() because it's
+ not selected anymore */
+ gtk_tree_view_get_dest_row_at_pos (GTK_TREE_VIEW (widget),
+ x, y,
+ &dest_row,
+ &pos);
+
+ /* Only allow drops IN other rows */
+ if (!dest_row ||
+ pos == GTK_TREE_VIEW_DROP_BEFORE ||
+ pos == GTK_TREE_VIEW_DROP_AFTER)
+ return;
+
+ 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);
+
+ if (!gtk_tree_drag_dest_row_drop_possible (GTK_TREE_DRAG_DEST (model),
+ child_dest_row,
+ selection_data))
+ goto out;
+
+ /* Do the mail operation */
+ gtk_tree_model_get_iter (model, &parent_iter, child_dest_row);
+ gtk_tree_model_get_iter (model, &iter, source_row);
+ gtk_tree_model_get (model, &parent_iter,
+ TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &parent_folder, -1);
+ gtk_tree_model_get (model, &iter,
+ TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder, -1);
+
+ g_signal_emit (G_OBJECT (widget), signals[FOLDER_MOVED_SIGNAL], 0,
+ folder, parent_folder, &done);
+ if (!done)
+ goto out;
+
+ /* Get a row reference to the source path because the path
+ could change after the insertion */
+ source_row_reference = gtk_tree_row_reference_new (model, source_row);
+ gtk_tree_path_free (source_row);
+
+ /* Insert the dragged row as a child of the dest row */
+ gtk_tree_path_down (child_dest_row);
+ if (gtk_tree_drag_dest_drag_data_received (GTK_TREE_DRAG_DEST (model),
+ child_dest_row,
+ selection_data)) {
+
+ /* Clean dest row */
+ gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (widget),
+ NULL,
+ GTK_TREE_VIEW_DROP_BEFORE);
+
+ /* Get the new path of the source row */
+ source_row = gtk_tree_row_reference_get_path (source_row_reference);
+
+ /* Delete the source row */
+ gtk_tree_drag_source_drag_data_delete (GTK_TREE_DRAG_SOURCE (model),
+ source_row);
+
+ gtk_tree_path_free (source_row);
+ }
+
+ gtk_tree_row_reference_free (source_row_reference);
+
+ out:
+ gtk_tree_path_free (child_dest_row);
+}
+
+static gint
+expand_row_timeout (gpointer data)
+{
+ GtkTreeView *tree_view = data;
+ GtkTreePath *dest_path = NULL;
+ GtkTreeViewDropPosition pos;
+ gboolean result = FALSE;
+
+ GDK_THREADS_ENTER ();
+
+ gtk_tree_view_get_drag_dest_row (tree_view,
+ &dest_path,
+ &pos);
+
+ if (dest_path &&
+ (pos == GTK_TREE_VIEW_DROP_INTO_OR_AFTER ||
+ pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE)) {
+ gtk_tree_view_expand_row (tree_view, dest_path, FALSE);
+ gtk_tree_path_free (dest_path);
+ }
+ else {
+ if (dest_path)
+ gtk_tree_path_free (dest_path);
+
+ result = TRUE;
+ }
+
+ GDK_THREADS_LEAVE ();
+
+ return result;
+}
+
+
+static gboolean
+drag_motion_cb (GtkWidget *widget,
+ GdkDragContext *context,
+ gint x,
+ gint y,
+ guint time,
+ gpointer user_data)
+{
+ GtkTreeViewDropPosition pos;
+ GtkTreePath *dest_row;
+ ModestFolderViewPrivate *priv;
+
+ priv = MODEST_FOLDER_VIEW_GET_PRIVATE (widget);
+
+ if (priv->timer_expander != 0) {
+ g_source_remove (priv->timer_expander);
+ priv->timer_expander = 0;
+ }
+
+ gtk_tree_view_get_dest_row_at_pos (GTK_TREE_VIEW (widget),
+ x, y,
+ &dest_row,
+ &pos);
+
+ if (!dest_row)
+ return FALSE;
+
+ /* 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);
+ priv->timer_expander = g_timeout_add (500, expand_row_timeout, widget);
+ }
+ gtk_tree_path_free (dest_row);
+
+ return TRUE;
+}
+
+static void
+setup_drag_and_drop (GtkTreeView *self)
+{
+ gtk_drag_dest_set (GTK_WIDGET (self),
+ GTK_DEST_DEFAULT_ALL,
+ drag_types,
+ G_N_ELEMENTS (drag_types),
+ GDK_ACTION_MOVE);
+
+ gtk_signal_connect(GTK_OBJECT (self),
+ "drag_data_received",
+ GTK_SIGNAL_FUNC(drag_data_received_cb),
+ NULL);
+
+
+ gtk_drag_source_set (GTK_WIDGET (self),
+ GDK_BUTTON1_MASK | GDK_BUTTON3_MASK,
+ drag_types,
+ G_N_ELEMENTS (drag_types),
+ GDK_ACTION_MOVE);
+
+
+ gtk_signal_connect(GTK_OBJECT (self),
+ "drag_motion",
+ GTK_SIGNAL_FUNC(drag_motion_cb),
+ NULL);
+
+
+ gtk_signal_connect(GTK_OBJECT (self),
+ "drag_data_get",
+ GTK_SIGNAL_FUNC(drag_data_get_cb),
+ NULL);
+}
projects / modest / blobdiff