X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-folder-view.c;h=4e901438e804cf11329f7cd91e48bcc2b4ee4aa7;hp=1329957de489f937dc850bfd16d93247189c9edc;hb=1386f3b566f5b5c9aa2ea4d0a5a6157502a45b4f;hpb=1b8fde83c2ce3508e36db9acd600523efb3332e4 diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c index 1329957..4e90143 100644 --- a/src/widgets/modest-folder-view.c +++ b/src/widgets/modest-folder-view.c @@ -30,6 +30,7 @@ #include #include +#include #include #include #include @@ -46,33 +47,45 @@ #include #include #include "modest-folder-view.h" +#include /* 'private'/'protected' functions */ 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 void tny_account_store_view_init (gpointer g, + gpointer iface_data); + +static void modest_folder_view_set_account_store (TnyAccountStoreView *self, + TnyAccountStore *account_store); + 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 void on_account_update (TnyAccountStore *account_store, + const gchar *account, + gpointer user_data); + +static void on_accounts_reloaded (TnyAccountStore *store, + gpointer user_data); + static gint cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, gpointer user_data); /* DnD functions */ -static void drag_data_get_cb (GtkWidget *widget, +static void on_drag_data_get (GtkWidget *widget, GdkDragContext *context, GtkSelectionData *selection_data, guint info, guint time, gpointer data); -static void drag_data_received_cb (GtkWidget *widget, +static void on_drag_data_received (GtkWidget *widget, GdkDragContext *context, gint x, gint y, @@ -81,7 +94,7 @@ static void drag_data_received_cb (GtkWidget *widget, guint time, gpointer data); -static gboolean drag_motion_cb (GtkWidget *widget, +static gboolean on_drag_motion (GtkWidget *widget, GdkDragContext *context, gint x, gint y, @@ -92,16 +105,8 @@ 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 }; @@ -111,15 +116,17 @@ struct _ModestFolderViewPrivate { TnyFolder *cur_folder; GtkTreeRowReference *cur_row; - gulong sig1, sig2; - GMutex *lock; + gulong account_update_signal; + gulong changed_signal; + gulong accounts_reloaded_signal; + GtkTreeSelection *cur_selection; TnyFolderStoreQuery *query; guint timer_expander; }; -#define MODEST_FOLDER_VIEW_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE((o), \ - MODEST_TYPE_FOLDER_VIEW, \ +#define MODEST_FOLDER_VIEW_GET_PRIVATE(o) \ + (G_TYPE_INSTANCE_GET_PRIVATE((o), \ + MODEST_TYPE_FOLDER_VIEW, \ ModestFolderViewPrivate)) /* globals */ static GObjectClass *parent_class = NULL; @@ -143,10 +150,21 @@ modest_folder_view_get_type (void) (GInstanceInitFunc) modest_folder_view_init, NULL }; + + static const GInterfaceInfo tny_account_store_view_info = { + (GInterfaceInitFunc) tny_account_store_view_init, /* interface_init */ + NULL, /* interface_finalize */ + NULL /* interface_data */ + }; + my_type = g_type_register_static (GTK_TYPE_TREE_VIEW, "ModestFolderView", - &my_info, 0); + &my_info, 0); + + g_type_add_interface_static (my_type, + TNY_TYPE_ACCOUNT_STORE_VIEW, + &tny_account_store_view_info); } return my_type; } @@ -159,8 +177,6 @@ modest_folder_view_class_init (ModestFolderViewClass *klass) parent_class = g_type_class_peek_parent (klass); gobject_class->finalize = modest_folder_view_finalize; - - klass->update_model = modest_folder_view_update_model; g_type_class_add_private (gobject_class, sizeof(ModestFolderViewPrivate)); @@ -174,26 +190,6 @@ 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); } @@ -203,10 +199,10 @@ text_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data) { GObject *rendobj; - gchar *fname; + gchar *fname = NULL; gint unread; TnyFolderType type; - TnyFolder *folder; + TnyFolder *folder = NULL; g_return_if_fail (column); g_return_if_fail (tree_model); @@ -218,7 +214,7 @@ text_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder, -1); rendobj = G_OBJECT(renderer); - + if (!fname) return; @@ -232,10 +228,7 @@ text_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, } } } else if (folder && type == TNY_FOLDER_TYPE_ROOT) { - if (strcmp (fname, MODEST_LOCAL_FOLDERS_ACCOUNT_NAME) == 0) {/* FIXME: hack */ - g_free (fname); - fname = g_strdup (MODEST_LOCAL_FOLDERS_DISPLAY_NAME); - } + /* FIXME: todo */ } if (unread > 0) { @@ -246,6 +239,7 @@ text_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, g_object_set (rendobj,"text", fname, "weight", 400, NULL); g_free (fname); + if (folder) g_object_unref (G_OBJECT (folder)); } @@ -264,7 +258,19 @@ get_cached_icon (const gchar *name) MODEST_CACHE_MGR_CACHE_TYPE_PIXBUF); if (!icon_cache || !g_hash_table_lookup_extended (icon_cache, name, &orig_key, &pixbuf)) { - pixbuf = (gpointer)gdk_pixbuf_new_from_file (name, &err); + +#if MODEST_PLATFORM_ID==1 /* MODES_PLATFORM_ID: 1 ==> gnome, 2==> maemo */ + pixbuf = (gpointer) gdk_pixbuf_new_from_file (name, &err); +#else + GtkIconTheme *current_theme; + current_theme = gtk_icon_theme_get_default (); + pixbuf = gtk_icon_theme_load_icon (current_theme, + name, + 26, + GTK_ICON_LOOKUP_NO_SVG, + NULL); +#endif + if (!pixbuf) { g_printerr ("modest: error in icon factory while loading '%s': %s\n", name, err->message); @@ -293,7 +299,8 @@ icon_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *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, -1); + TNY_GTK_FOLDER_STORE_TREE_MODEL_UNREAD_COLUMN, &unread, + -1); rendobj = G_OBJECT(renderer); if (type == TNY_FOLDER_TYPE_NORMAL || type == TNY_FOLDER_TYPE_UNKNOWN) { @@ -355,10 +362,8 @@ modest_folder_view_init (ModestFolderView *obj) priv->cur_folder = NULL; priv->cur_row = NULL; priv->query = NULL; - priv->lock = g_mutex_new (); - + column = gtk_tree_view_column_new (); - gtk_tree_view_append_column (GTK_TREE_VIEW(obj),column); renderer = gtk_cell_renderer_pixbuf_new(); gtk_tree_view_column_pack_start (column, renderer, FALSE); @@ -379,10 +384,22 @@ 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); + gtk_tree_view_append_column (GTK_TREE_VIEW(obj),column); + setup_drag_and_drop (GTK_TREE_VIEW(obj)); } static void +tny_account_store_view_init (gpointer g, gpointer iface_data) +{ + TnyAccountStoreViewIface *klass = (TnyAccountStoreViewIface *)g; + + klass->set_account_store_func = modest_folder_view_set_account_store; + + return; +} + +static void modest_folder_view_finalize (GObject *obj) { ModestFolderViewPrivate *priv; @@ -399,16 +416,13 @@ modest_folder_view_finalize (GObject *obj) if (priv->account_store) { g_signal_handler_disconnect (G_OBJECT(priv->account_store), - priv->sig1); + priv->account_update_signal); + g_signal_handler_disconnect (G_OBJECT(priv->account_store), + priv->accounts_reloaded_signal); g_object_unref (G_OBJECT(priv->account_store)); priv->account_store = NULL; } - if (priv->lock) { - g_mutex_free (priv->lock); - priv->lock = NULL; - } - if (priv->query) { g_object_unref (G_OBJECT (priv->query)); priv->query = NULL; @@ -416,13 +430,56 @@ modest_folder_view_finalize (GObject *obj) sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(obj)); if (sel) - g_signal_handler_disconnect (G_OBJECT(sel), priv->sig2); + g_signal_handler_disconnect (G_OBJECT(sel), priv->changed_signal); G_OBJECT_CLASS(parent_class)->finalize (obj); } static void +modest_folder_view_set_account_store (TnyAccountStoreView *self, TnyAccountStore *account_store) +{ + ModestFolderViewPrivate *priv; + TnyDevice *device; + + g_return_if_fail (MODEST_IS_FOLDER_VIEW (self)); + g_return_if_fail (TNY_IS_ACCOUNT_STORE (account_store)); + + priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self); + device = tny_account_store_get_device (account_store); + + 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); + + 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->accounts_reloaded_signal = + g_signal_connect (G_OBJECT(account_store), "accounts_reloaded", + G_CALLBACK (on_accounts_reloaded), self); + + if (!update_model (MODEST_FOLDER_VIEW (self), + MODEST_TNY_ACCOUNT_STORE (priv->account_store))) + g_printerr ("modest: failed to update model\n"); + + g_object_unref (G_OBJECT (device)); +} + +static void on_account_update (TnyAccountStore *account_store, const gchar *account, gpointer user_data) { @@ -432,6 +489,14 @@ on_account_update (TnyAccountStore *account_store, const gchar *account, account); } +static void +on_accounts_reloaded (TnyAccountStore *account_store, + gpointer user_data) +{ + update_model (MODEST_FOLDER_VIEW (user_data), + MODEST_TNY_ACCOUNT_STORE(account_store)); +} + void modest_folder_view_set_title (ModestFolderView *self, const gchar *title) { @@ -451,50 +516,23 @@ modest_folder_view_set_title (ModestFolderView *self, const gchar *title) } GtkWidget* -modest_folder_view_new (ModestTnyAccountStore *account_store, - TnyFolderStoreQuery *query) +modest_folder_view_new (TnyFolderStoreQuery *query) { GObject *self; ModestFolderViewPrivate *priv; GtkTreeSelection *sel; - g_return_val_if_fail (account_store, NULL); - - self = G_OBJECT(g_object_new(MODEST_TYPE_FOLDER_VIEW, NULL)); - priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self); - - priv->account_store = g_object_ref (G_OBJECT (account_store)); - if (query) - priv->query = g_object_ref (G_OBJECT (query)); - - if (!update_model (MODEST_FOLDER_VIEW(self), - MODEST_TNY_ACCOUNT_STORE(account_store))) - g_printerr ("modest: failed to update model\n"); - - priv->sig1 = g_signal_connect (G_OBJECT(account_store), "account_update", - G_CALLBACK (on_account_update), self); + self = G_OBJECT (g_object_new (MODEST_TYPE_FOLDER_VIEW, NULL)); + priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self); + + priv->query = g_object_ref (query); sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self)); - priv->sig2 = g_signal_connect (sel, "changed", - G_CALLBACK(on_selection_changed), self); + priv->changed_signal = g_signal_connect (sel, "changed", + G_CALLBACK (on_selection_changed), self); return GTK_WIDGET(self); } - -static gboolean -update_model_empty (ModestFolderView *self) -{ - ModestFolderViewPrivate *priv; - - g_return_val_if_fail (self, FALSE); - priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self); - - g_signal_emit (G_OBJECT(self), signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0, - NULL, TRUE); - return TRUE; -} - - /* this feels dirty; any other way to expand all the root items? */ static void expand_root_items (ModestFolderView *self) @@ -521,9 +559,14 @@ update_model (ModestFolderView *self, ModestTnyAccountStore *account_store) priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self); - /* Notify that there is no folder selected */ - update_model_empty (self); + /* Notify that there is no folder selected*/ + g_signal_emit (G_OBJECT(self), + signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0, + NULL, TRUE); + /* 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); account_list = TNY_LIST(model); @@ -542,9 +585,9 @@ update_model (ModestFolderView *self, ModestTnyAccountStore *account_store) /* Set new model */ gtk_tree_view_set_model (GTK_TREE_VIEW(self), sortable); expand_root_items (self); /* expand all account folders */ + g_object_unref (account_list); } - g_object_unref (model); return TRUE; } @@ -568,9 +611,13 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data) /* folder was _un_selected if true */ 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; + if (priv->cur_folder) + g_object_unref (priv->cur_folder); + if (priv->cur_row) + gtk_tree_row_reference_free (priv->cur_row); + priv->cur_folder = NULL; + priv->cur_row = NULL; + return; } model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (model_sort)); @@ -585,35 +632,34 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data) TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder, -1); - if (type == TNY_FOLDER_TYPE_ROOT) + /* If the folder is the same or is a root folder do not notify */ + if ((type == TNY_FOLDER_TYPE_ROOT) || (priv->cur_folder == folder)) { + g_object_unref (folder); return; + } - /* emit 2 signals: one for the unselection of the old one, - * and one for the selection of the new on */ - g_signal_emit (G_OBJECT(tree_view), signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0, - priv->cur_folder, FALSE); - g_signal_emit (G_OBJECT(tree_view), signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0, - folder, TRUE); + /* Current folder was unselected */ if (priv->cur_folder) { - tny_folder_sync (priv->cur_folder, TRUE, NULL); /* FIXME */ - gtk_tree_row_reference_free (priv->cur_row); + g_signal_emit (G_OBJECT(tree_view), signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0, + priv->cur_folder, FALSE); + g_object_unref (priv->cur_folder); } - priv->cur_folder = folder; + if (priv->cur_row) + gtk_tree_row_reference_free (priv->cur_row); + + /* New current references */ path = gtk_tree_model_get_path (model_sort, &iter_sort); + priv->cur_folder = folder; priv->cur_row = gtk_tree_row_reference_new (model_sort, path); - gtk_tree_path_free (path); -} -gboolean -modest_folder_view_update_model (ModestFolderView *self, TnyAccountStore *account_store) -{ - g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (self), FALSE); + /* Frees */ + gtk_tree_path_free (path); - g_signal_emit (G_OBJECT(self), signals[FOLDER_SELECTION_CHANGED_SIGNAL], - 0, NULL, TRUE); - - return update_model (self, MODEST_TNY_ACCOUNT_STORE(account_store)); /* ugly */ + /* New folder has been selected */ + g_signal_emit (G_OBJECT(tree_view), + signals[FOLDER_SELECTION_CHANGED_SIGNAL], + 0, folder, TRUE); } TnyFolder * @@ -630,97 +676,6 @@ 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) @@ -752,6 +707,12 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, 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); @@ -762,8 +723,14 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, /*****************************************************************************/ /* 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 + * source for dnd after the event drop happened + */ static void -drag_data_get_cb (GtkWidget *widget, +on_drag_data_get (GtkWidget *widget, GdkDragContext *context, GtkSelectionData *selection_data, guint info, @@ -780,6 +747,7 @@ drag_data_get_cb (GtkWidget *widget, gtk_tree_selection_get_selected (selection, &model_sort, &iter); source_row_sort = gtk_tree_model_get_path (model_sort, &iter); + /* Get the unsorted path and model */ model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (model_sort)); source_row = gtk_tree_model_sort_convert_path_to_child_path (GTK_TREE_MODEL_SORT (model_sort), source_row_sort); @@ -792,151 +760,319 @@ drag_data_get_cb (GtkWidget *widget, gtk_tree_path_free (source_row); } +typedef struct _DndHelper { + gboolean delete_source; + GtkTreePath *source_row; + GdkDragContext *context; + guint time; +} DndHelper; + + +/* + * This function is the callback of the + * modest_mail_operation_xfer_msg() 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 + * to check that the operation went fine and then finalize the drag + * and drop action + */ +static void +on_progress_changed (ModestMailOperation *mail_op, gpointer user_data) +{ + gboolean success; + DndHelper *helper; + + helper = (DndHelper *) user_data; + + if (!modest_mail_operation_is_finished (mail_op)) + return; + + if (modest_mail_operation_get_status (mail_op) == + MODEST_MAIL_OPERATION_STATUS_SUCCESS) { + success = TRUE; + } else { + success = FALSE; + } + + /* Notify the drag source. Never call delete, the monitor will + do the job if needed */ + gtk_drag_finish (helper->context, success, FALSE, helper->time); + + /* Free the helper */ + gtk_tree_path_free (helper->source_row); + g_slice_free (DndHelper, helper); +} + +/* + * 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 + * view. + */ +static void +drag_and_drop_from_header_view (GtkTreeModel *source_model, + GtkTreeModel *dest_model, + GtkTreePath *dest_row, + DndHelper *helper) +{ + TnyHeader *header; + TnyFolder *folder; + ModestMailOperation *mail_op; + GtkTreeIter source_iter, dest_iter; + + /* 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); + + /* Get 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, + &folder, -1); + + /* Transfer message */ + mail_op = modest_mail_operation_new (); + 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); + + /* Frees */ + g_object_unref (G_OBJECT (mail_op)); + g_object_unref (G_OBJECT (header)); + g_object_unref (G_OBJECT (folder)); +} + +/* + * This function is used by drag_data_received_cb to manage drag and + * drop of a folder, i.e, and drag from the folder view to the same + * folder view. + */ +static void +drag_and_drop_from_folder_view (GtkTreeModel *source_model, + GtkTreeModel *dest_model, + GtkTreePath *dest_row, + GtkSelectionData *selection_data, + DndHelper *helper) +{ + ModestMailOperation *mail_op; + GtkTreeIter parent_iter, iter; + TnyFolderStore *parent_folder; + TnyFolder *folder; + + /* Check if the drag is possible */ + if (!gtk_tree_path_compare (helper->source_row, dest_row) || + !gtk_tree_drag_dest_row_drop_possible (GTK_TREE_DRAG_DEST (dest_model), + dest_row, + selection_data)) { + + gtk_drag_finish (helper->context, FALSE, FALSE, helper->time); + gtk_tree_path_free (helper->source_row); + g_slice_free (DndHelper, helper); + return; + } + + /* 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, + TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, + &parent_folder, -1); + gtk_tree_model_get (source_model, &iter, + TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, + &folder, -1); + + /* Do the mail operation */ + mail_op = modest_mail_operation_new (); + 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_folder (mail_op, + folder, + parent_folder, + helper->delete_source); + + /* Frees */ + g_object_unref (G_OBJECT (parent_folder)); + g_object_unref (G_OBJECT (folder)); + g_object_unref (G_OBJECT (mail_op)); +} + +/* + * This function receives the data set by the "drag-data-get" signal + * handler. This information comes within the #GtkSelectionData. This + * function will manage both the drags of folders of the treeview and + * drags of headers of the header view widget. + */ static void -drag_data_received_cb (GtkWidget *widget, +on_drag_data_received (GtkWidget *widget, GdkDragContext *context, gint x, gint y, GtkSelectionData *selection_data, - guint info, + guint target_type, guint time, gpointer data) { - GtkTreeModel *model_sort, *model; - GtkTreeRowReference *source_row_reference; + GtkWidget *source_widget; + GtkTreeModel *model_sort, *dest_model, *source_model; GtkTreePath *source_row, *dest_row, *child_dest_row; GtkTreeViewDropPosition pos; - GtkTreeIter parent_iter, iter; - TnyFolder *folder; - TnyFolderStore *parent_folder; - gboolean done, success = FALSE; + gboolean success = FALSE, delete_source = FALSE; + DndHelper *helper; /* Do not allow further process */ g_signal_stop_emission_by_name (widget, "drag-data-received"); - if (selection_data->length == 0) - goto out; + /* Get the action */ + if (context->action == GDK_ACTION_MOVE) + delete_source = TRUE; - /* Get the unsorted model, and the path to the source row */ - model_sort = gtk_tree_view_get_model (GTK_TREE_VIEW (widget)); + /* Check if the get_data failed */ + if (selection_data == NULL || selection_data->length < 0) + gtk_drag_finish (context, success, FALSE, time); + + /* Get the models */ + source_widget = gtk_drag_get_source_widget (context); gtk_tree_get_row_drag_data (selection_data, - &model, + &source_model, &source_row); + model_sort = gtk_tree_view_get_model (GTK_TREE_VIEW (widget)); + /* Select the destination model */ + if (source_widget == widget) { + dest_model = source_model; + } else { + dest_model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (model_sort)); + } + /* Get the path to the destination row. Can not call gtk_tree_view_get_drag_dest_row() because the source row - it's not selected anymore */ - gtk_tree_view_get_dest_row_at_pos (GTK_TREE_VIEW (widget), - x, y, - &dest_row, - &pos); + is 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) - goto out; + if (!dest_row || pos == GTK_TREE_VIEW_DROP_BEFORE || pos == GTK_TREE_VIEW_DROP_AFTER) + gtk_drag_finish (context, success, FALSE, time); - /* Get the destination row in the usorted model */ + /* 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; + + /* Get path from the unsorted model */ child_dest_row = gtk_tree_model_sort_convert_path_to_child_path (GTK_TREE_MODEL_SORT (model_sort), dest_row); gtk_tree_path_free (dest_row); - /* Check if the drag is possible */ - if (!gtk_tree_drag_dest_row_drop_possible (GTK_TREE_DRAG_DEST (model), - child_dest_row, - selection_data)) { - gtk_tree_path_free (child_dest_row); - goto out; - } + /* Drags from the header view */ + if (source_widget != widget) { - /* 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; + drag_and_drop_from_header_view (source_model, + dest_model, + child_dest_row, + helper); + } else { - /* Get a row reference to the source path because the path - could change after the insertion. The gtk_drag_finish() is - not able to delete the source because that, so we have to - do it manually */ - 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)) { + drag_and_drop_from_folder_view (source_model, + dest_model, + child_dest_row, + selection_data, + helper); + } - /* Clean dest row */ - gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (widget), - NULL, - GTK_TREE_VIEW_DROP_BEFORE); + /* Frees */ + gtk_tree_path_free (source_row); + gtk_tree_path_free (child_dest_row); +} - /* Get the new path of the source row */ - source_row = gtk_tree_row_reference_get_path (source_row_reference); +/* + * We define a "drag-drop" signal handler because we do not want to + * use the default one, because the default one always calls + * gtk_drag_finish and we prefer to do it in the "drag-data-received" + * signal handler, because there we have all the information available + * to know if the dnd was a success or not. + */ +static gboolean +drag_drop_cb (GtkWidget *widget, + GdkDragContext *context, + gint x, + gint y, + guint time, + gpointer user_data) +{ + gpointer target; - /* Delete the source row */ - gtk_tree_drag_source_drag_data_delete (GTK_TREE_DRAG_SOURCE (model), - source_row); + if (!context->targets) + return FALSE; - success = TRUE; + /* Check if we're dragging a folder row */ + target = gtk_drag_dest_find_target (widget, context, NULL); - gtk_tree_path_free (source_row); - } - - gtk_tree_row_reference_free (source_row_reference); - gtk_tree_path_free (child_dest_row); - out: - /* Never delete the source, we do it manually */ - gtk_drag_finish (context, success, FALSE, time); + /* Request the data from the source. */ + gtk_drag_get_data(widget, context, target, time); + return TRUE; } +/* + * This function expands a node of a tree view if it's not expanded + * yet. Not sure why it needs the threads stuff, but gtk+`example code + * does that, so that's why they're here. + */ 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; -} + 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; +} +/* + * This function is called whenever the pointer is moved over a widget + * while dragging some data. It installs a timeout that will expand a + * node of the treeview if not expanded yet. This function also calls + * gdk_drag_status in order to set the suggested action that will be + * used by the "drag-data-received" signal handler to know if we + * should do a move or just a copy of the data. + */ static gboolean -drag_motion_cb (GtkWidget *widget, +on_drag_motion (GtkWidget *widget, GdkDragContext *context, gint x, gint y, @@ -946,6 +1082,8 @@ drag_motion_cb (GtkWidget *widget, GtkTreeViewDropPosition pos; GtkTreePath *dest_row; ModestFolderViewPrivate *priv; + GdkDragAction suggested_action; + gboolean valid_location = FALSE; priv = MODEST_FOLDER_VIEW_GET_PRIVATE (widget); @@ -959,8 +1097,17 @@ drag_motion_cb (GtkWidget *widget, &dest_row, &pos); - if (!dest_row) - return FALSE; + /* Do not allow drops between folders */ + if (!dest_row || + pos == GTK_TREE_VIEW_DROP_BEFORE || + pos == GTK_TREE_VIEW_DROP_AFTER) { + gtk_tree_view_set_drag_dest_row(GTK_TREE_VIEW (widget), NULL, 0); + gdk_drag_status(context, 0, time); + valid_location = FALSE; + goto out; + } else { + valid_location = TRUE; + } /* Expand the selected row after 1/2 second */ if (!gtk_tree_view_row_expanded (GTK_TREE_VIEW (widget), dest_row)) { @@ -969,39 +1116,72 @@ drag_motion_cb (GtkWidget *widget, } gtk_tree_path_free (dest_row); - return TRUE; + /* Select the desired action. By default we pick MOVE */ + suggested_action = GDK_ACTION_MOVE; + + if (context->actions == GDK_ACTION_COPY) + gdk_drag_status(context, GDK_ACTION_COPY, time); + else if (context->actions == GDK_ACTION_MOVE) + gdk_drag_status(context, GDK_ACTION_MOVE, time); + else if (context->actions & suggested_action) + gdk_drag_status(context, suggested_action, time); + else + gdk_drag_status(context, GDK_ACTION_DEFAULT, time); + + out: + 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 setup_drag_and_drop (GtkTreeView *self) { + /* Set up the folder view as a dnd destination. Set only the + highlight flag, otherwise gtk will have a different + behaviour */ gtk_drag_dest_set (GTK_WIDGET (self), - GTK_DEST_DEFAULT_ALL, - drag_types, - G_N_ELEMENTS (drag_types), - GDK_ACTION_MOVE); + GTK_DEST_DEFAULT_HIGHLIGHT, + folder_view_drag_types, + G_N_ELEMENTS (folder_view_drag_types), + GDK_ACTION_MOVE | GDK_ACTION_COPY); - gtk_signal_connect(GTK_OBJECT (self), - "drag_data_received", - GTK_SIGNAL_FUNC(drag_data_received_cb), - NULL); + g_signal_connect (G_OBJECT (self), + "drag_data_received", + G_CALLBACK (on_drag_data_received), + NULL); + /* Set up the treeview as a dnd source */ 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); + GDK_BUTTON1_MASK, + folder_view_drag_types, + G_N_ELEMENTS (folder_view_drag_types), + GDK_ACTION_MOVE | GDK_ACTION_COPY); + + g_signal_connect (G_OBJECT (self), + "drag_motion", + G_CALLBACK (on_drag_motion), + NULL); + + g_signal_connect (G_OBJECT (self), + "drag_data_get", + G_CALLBACK (on_drag_data_get), + NULL); + + g_signal_connect (G_OBJECT (self), + "drag_drop", + G_CALLBACK (drag_drop_cb), + NULL); }