* Added dnd support to the folder view
authorSergio Villar Senin <svillar@igalia.com>
Wed, 7 Feb 2007 13:16:57 +0000 (13:16 +0000)
committerSergio Villar Senin <svillar@igalia.com>
Wed, 7 Feb 2007 13:16:57 +0000 (13:16 +0000)
* Added support to move folders with dnd
* Added support to reload the view of a ModestFolderView when a folder is added or renamed
* Added a folder-moved signal in the ModestFolderView
* Added some error handling code in ModestMailOperation

pmo-trunk-r795

src/modest-mail-operation.c
src/modest-ui.c
src/widgets/modest-folder-view.c
src/widgets/modest-folder-view.h

index 9903409..24ad550 100644 (file)
@@ -101,10 +101,16 @@ struct _ModestMailOperationPrivate {
        ModestMailOperationStatus  status;
        GError                    *error;
 };
+
 #define MODEST_MAIL_OPERATION_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
                                                    MODEST_TYPE_MAIL_OPERATION, \
                                                    ModestMailOperationPrivate))
 
+#define CHECK_EXCEPTION(priv, new_status, op)  if (priv->error) {\
+                                                   priv->status = new_status;\
+                                                   op;\
+                                               }
+
 typedef struct _RefreshFolderAsyncHelper
 {
        ModestMailOperation *mail_op;
@@ -659,16 +665,18 @@ modest_mail_operation_create_folder (ModestMailOperation *self,
                                     TnyFolderStore *parent,
                                     const gchar *name)
 {
+       ModestMailOperationPrivate *priv;
+       TnyFolder *new_folder = NULL;
+       TnyStoreAccount *store_account;
+
        g_return_val_if_fail (TNY_IS_FOLDER_STORE (parent), NULL);
        g_return_val_if_fail (name, NULL);
 
-       TnyFolder *new_folder = NULL;
-       TnyStoreAccount *store_account;
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
 
        /* Create the folder */
-       new_folder = tny_folder_store_create_folder (parent, name, NULL); /* FIXME */
-       if (!new_folder) 
-               return NULL;
+       new_folder = tny_folder_store_create_folder (parent, name, &(priv->error));
+       CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED, return NULL);
 
        /* Subscribe to folder */
        if (!tny_folder_is_subscribed (new_folder)) {
@@ -714,16 +722,21 @@ modest_mail_operation_rename_folder (ModestMailOperation *self,
                                     TnyFolder *folder,
                                     const gchar *name)
 {
+       ModestMailOperationPrivate *priv;
+
        g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
        g_return_if_fail (TNY_IS_FOLDER_STORE (folder));
        g_return_if_fail (name);
 
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+
        /* FIXME: better error handling */
        if (strrchr (name, '/') != NULL)
                return;
 
        /* Rename. Camel handles folder subscription/unsubscription */
-       tny_folder_set_name (folder, name, NULL); /* FIXME */
+       tny_folder_set_name (folder, name, &(priv->error));
+       CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED, return);
  }
 
 void
@@ -756,28 +769,36 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self,
                                   TnyFolderStore *parent,
                                   gboolean delete_original)
 {
+       ModestMailOperationPrivate *priv;
        const gchar *folder_name;
-       TnyFolder *dest_folder, *child;
-       TnyIterator *iter;
-       TnyList *folders, *headers;
+       TnyFolder *dest_folder = NULL, *child = NULL;
+       TnyIterator *iter = NULL;
+       TnyList *folders = NULL, *headers = NULL;
 
        g_return_if_fail (TNY_IS_FOLDER (folder));
        g_return_if_fail (TNY_IS_FOLDER_STORE (parent));
 
+       priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
+
        /* Create the destination folder */
        folder_name = tny_folder_get_name (folder);
        dest_folder = modest_mail_operation_create_folder (self, parent, folder_name);
+       CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED, goto clean);
 
        /* Transfer messages */
        headers = TNY_LIST (tny_simple_list_new ());
-       tny_folder_get_headers (folder, headers, FALSE, NULL); /* FIXME */
-       tny_folder_transfer_msgs (folder, headers, dest_folder, delete_original, NULL); /* FIXME */
+       tny_folder_get_headers (folder, headers, FALSE, &(priv->error));
+       CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED, goto clean);
+
+       tny_folder_transfer_msgs (folder, headers, dest_folder, delete_original, &(priv->error));
+       CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED, goto clean);
 
        /* Recurse children */
        folders = TNY_LIST (tny_simple_list_new ());
-       tny_folder_store_get_folders (TNY_FOLDER_STORE (folder), folders, NULL, NULL ); /* FIXME */
-       iter = tny_list_create_iterator (folders);
+       tny_folder_store_get_folders (TNY_FOLDER_STORE (folder), folders, NULL,  &(priv->error));
+       CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED, goto clean);
 
+       iter = tny_list_create_iterator (folders);
        while (!tny_iterator_is_done (iter)) {
                child = TNY_FOLDER (tny_iterator_get_current (iter));
                modest_mail_operation_xfer_folder (self, child, TNY_FOLDER_STORE (dest_folder),
@@ -791,10 +812,15 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self,
                modest_mail_operation_remove_folder (self, folder, FALSE);
 
        /* Clean up */
-       g_object_unref (G_OBJECT (dest_folder));
-       g_object_unref (G_OBJECT (headers));
-       g_object_unref (G_OBJECT (folders));
-       g_object_unref (G_OBJECT (iter));
+ clean:
+       if (dest_folder)
+               g_object_unref (G_OBJECT (dest_folder));
+       if (headers)
+               g_object_unref (G_OBJECT (headers));
+       if (folders)
+               g_object_unref (G_OBJECT (folders));
+       if (iter)
+               g_object_unref (G_OBJECT (iter));
 }
 
 
index 7ae7610..7b56dbc 100644 (file)
@@ -43,6 +43,7 @@
 #include "modest-account-mgr-helpers.h"
 #include "modest-main-window.h"
 #include "modest-mail-operation.h"
+#include "modest-msg-view-window.h"
 #include <modest-widget-memory.h>
 #include <tny-error.h>
 #include <tny-simple-list.h>
@@ -107,6 +108,12 @@ static void     _modest_ui_actions_on_connection_changed    (TnyDevice *device,
 static void     _modest_ui_actions_on_accounts_reloaded     (TnyAccountStore *store, 
                                                             gpointer user_data);
 
+static void     _modest_ui_actions_on_folder_moved          (ModestFolderView *folder_view,
+                                                            TnyFolder        *folder, 
+                                                            TnyFolderStore   *parent,
+                                                            gboolean         *done,
+                                                            gpointer          user_data);
+
 GType
 modest_ui_get_type (void)
 {
@@ -336,7 +343,11 @@ connect_signals (ModestUI *self)
        /* folder view */
        g_signal_connect (G_OBJECT(folder_view), "folder_selection_changed",
                          G_CALLBACK(_modest_ui_actions_on_folder_selection_changed),
-                         priv->main_window);   
+                         priv->main_window);
+       g_signal_connect (G_OBJECT(folder_view), "folder_moved",
+                         G_CALLBACK(_modest_ui_actions_on_folder_moved),
+                         NULL);
+
        /* header view */
        g_signal_connect (G_OBJECT(header_view), "status_update",
                          G_CALLBACK(_modest_ui_actions_on_header_status_update), 
@@ -1012,6 +1023,8 @@ _modest_ui_actions_on_online_toggle_toggled (GtkToggleButton *toggle,
                tny_device_force_online (device);
        else
                tny_device_force_offline (device);
+
+       g_object_unref (G_OBJECT (device));
 }
 
 void 
@@ -1266,8 +1279,11 @@ _modest_ui_actions_on_new_folder (GtkWidget *widget,
                                                                          TNY_FOLDER_STORE (parent_folder),
                                                                          (const gchar *) folder_name);
                        if (new_folder) {
-                               /* Do anything more? The model
-                                  is automatically updated */
+                               /* TODO: tinymail should do this. 
+                                  Update view */
+                               modest_folder_view_add_subfolder (folder_view, new_folder);
+
+                               /* Free new folder */
                                g_object_unref (new_folder);
                        }
                        g_object_unref (mail_op);
@@ -1294,11 +1310,21 @@ _modest_ui_actions_on_rename_folder (GtkWidget *widget,
 
                if (folder_name != NULL && strlen (folder_name) > 0) {
                        ModestMailOperation *mail_op;
+                       const GError *error;
 
                        mail_op = modest_mail_operation_new ();
                        modest_mail_operation_rename_folder (mail_op,
                                                             folder,
                                                             (const gchar *) folder_name);
+
+                       error = modest_mail_operation_get_error (mail_op);
+                       if (!error)
+                               /* TODO: tinymail should do this. 
+                                  Update view */
+                               modest_folder_view_rename (folder_view);
+
+                       /* TODO: else ? notify error ? */
+
                        g_object_unref (mail_op);
                }
                g_object_unref (folder);
@@ -1343,3 +1369,26 @@ _modest_ui_actions_on_accounts_reloaded (TnyAccountStore *store, gpointer user_d
        folder_view = modest_widget_factory_get_folder_view (modest_runtime_get_widget_factory());
        modest_folder_view_update_model (folder_view, store);
 }
+
+static void 
+_modest_ui_actions_on_folder_moved (ModestFolderView *folder_view,
+                                   TnyFolder        *folder, 
+                                   TnyFolderStore   *parent,
+                                   gboolean         *done,
+                                   gpointer          user_data)
+{
+       ModestMailOperation *mail_op;
+       const GError *error;
+
+       *done = TRUE;
+
+       /* Try to move the folder */    
+       mail_op = modest_mail_operation_new ();
+       modest_mail_operation_move_folder (mail_op, folder, parent);
+
+       error = modest_mail_operation_get_error (mail_op);
+       if (error)
+               *done = FALSE;
+
+       g_object_unref (G_OBJECT (mail_op));
+}
index cf5fae0..8f4cb3f 100644 (file)
 #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>
@@ -50,20 +52,56 @@ static void modest_folder_view_class_init  (ModestFolderViewClass *klass);
 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
 };
 
@@ -71,12 +109,13 @@ typedef struct _ModestFolderViewPrivate ModestFolderViewPrivate;
 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),                               \
@@ -135,6 +174,26 @@ modest_folder_view_class_init (ModestFolderViewClass *klass)
                              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);
 }
 
 
@@ -291,8 +350,10 @@ modest_folder_view_init (ModestFolderView *obj)
        
        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 ();
        
@@ -318,6 +379,7 @@ modest_folder_view_init (ModestFolderView *obj)
        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
@@ -329,6 +391,12 @@ modest_folder_view_finalize (GObject *obj)
        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);
@@ -441,8 +509,6 @@ expand_root_items (ModestFolderView *self)
        gtk_tree_path_free (path);
 }
 
-
-
 static gboolean
 update_model (ModestFolderView *self, ModestTnyAccountStore *account_store)
 {
@@ -470,13 +536,12 @@ 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);
@@ -487,9 +552,10 @@ update_model (ModestFolderView *self, ModestTnyAccountStore *account_store)
 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;
@@ -501,12 +567,19 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
        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,
@@ -521,27 +594,17 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
                       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)
 {
@@ -567,6 +630,97 @@ modest_folder_view_get_selected (ModestFolderView *self)
        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)
@@ -604,3 +758,235 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
 
        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);
+}
index e99dfd9..7793636 100644 (file)
@@ -57,13 +57,18 @@ struct _ModestFolderViewClass {
        GtkTreeViewClass parent_class;
 
        /* emitted when a folder is selected or unselected */
-       void (*folder_selection_changed) (ModestFolderView* self,
-                                         TnyFolder *folder,
-                                         gboolean selected,
-                                         gpointer user_data);
+       void     (*folder_selection_changed) (ModestFolderView* self,
+                                             TnyFolder *folder,
+                                             gboolean selected,
+                                             gpointer user_data);
+
+       void     (*folder_moved)             (ModestFolderView *self, 
+                                             TnyFolder        *folder,
+                                             TnyFolderStore   *parent,
+                                             gboolean         *done);
        
-       gboolean (*update_model) (ModestFolderView *self, 
-                                 TnyAccountStore *account_store);
+       gboolean (*update_model)             (ModestFolderView *self, 
+                                             TnyAccountStore  *account_store);
 };
 
 /**
@@ -112,13 +117,16 @@ void          modest_folder_view_set_title       (ModestFolderView *self,
 TnyFolder*    modest_folder_view_get_selected    (ModestFolderView *self);
 
 
+gboolean      modest_folder_view_rename (ModestFolderView *self);
+gboolean      modest_folder_view_add_subfolder (ModestFolderView *self, TnyFolder *folder);
+
 /**
  * modest_folder_view_update_model:
  * @self: a #ModestFolderView
  * 
  * refresh the current model
  * 
- * Returns: the selected folder or NULL if none is selected
+ * Returns: TRUE if the model was succesfully updated
  **/
 gboolean      modest_folder_view_update_model    (ModestFolderView *self,
                                                  TnyAccountStore *account_store);