X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-folder-view.c;h=bfce18744de2431e7e9d1bc76f850bf5bdb7bac5;hp=102c4e5fb7ef8a3347118d83ddf3a69ce70655a5;hb=6754695adb4d12d3c2db5f7f819d2d7a78c07334;hpb=88bd0aad7510a75c701fcb4ea33abd8d74ddadbe diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c index 102c4e5..bfce187 100644 --- a/src/widgets/modest-folder-view.c +++ b/src/widgets/modest-folder-view.c @@ -30,42 +30,81 @@ #include #include +#include #include #include #include +#include #include #include #include +#include +#include #include #include #include -#include #include #include - +#include #include "modest-folder-view.h" +#include +#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 gboolean update_model (ModestFolderView *self, - ModestTnyAccountStore *account_store); -static gboolean update_model_empty (ModestFolderView *self); +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 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); -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 on_drag_data_get (GtkWidget *widget, + GdkDragContext *context, + GtkSelectionData *selection_data, + guint info, + guint time, + gpointer data); -static gboolean modest_folder_view_update_model (ModestFolderView *self, - TnyAccountStore *account_store); +static void on_drag_data_received (GtkWidget *widget, + GdkDragContext *context, + gint x, + gint y, + GtkSelectionData *selection_data, + guint info, + guint time, + gpointer data); -static void modest_folder_view_disconnect_store_account_handlers (GtkTreeView *self); +static gboolean on_drag_motion (GtkWidget *widget, + GdkDragContext *context, + gint x, + gint y, + guint time, + gpointer user_data); -static gint cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, - gpointer user_data); +static gint expand_row_timeout (gpointer data); +static void setup_drag_and_drop (GtkTreeView *self); enum { FOLDER_SELECTION_CHANGED_SIGNAL, @@ -74,20 +113,21 @@ enum { typedef struct _ModestFolderViewPrivate ModestFolderViewPrivate; struct _ModestFolderViewPrivate { - TnyAccountStore *account_store; TnyFolder *cur_folder; + GtkTreeRowReference *cur_row; - gulong sig1, sig2; - gulong *store_accounts_handlers; - 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; @@ -111,10 +151,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; } @@ -127,8 +178,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)); @@ -145,14 +194,16 @@ modest_folder_view_class_init (ModestFolderViewClass *klass) } + static void 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 = NULL; g_return_if_fail (column); g_return_if_fail (tree_model); @@ -161,12 +212,26 @@ text_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &fname, 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, &folder, -1); rendobj = G_OBJECT(renderer); - + if (!fname) return; - + + if (folder && type != TNY_FOLDER_TYPE_ROOT) { /* FIXME: tnymail bug? crashes with root folders */ + if (modest_tny_folder_is_local_folder (folder)) { + TnyFolderType type; + type = modest_tny_folder_get_local_folder_type (folder); + if (type != TNY_FOLDER_TYPE_UNKNOWN) { + g_free (fname); + fname = g_strdup(modest_local_folder_info_get_type_display_name (type)); + } + } + } else if (folder && type == TNY_FOLDER_TYPE_ROOT) { + /* FIXME: todo */ + } + if (unread > 0) { gchar *folder_title = g_strdup_printf ("%s (%d)", fname, unread); g_object_set (rendobj,"text", folder_title, "weight", 800, NULL); @@ -175,6 +240,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)); } @@ -193,54 +259,43 @@ 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) + if (type == TNY_FOLDER_TYPE_NORMAL || type == TNY_FOLDER_TYPE_UNKNOWN) { type = modest_tny_folder_guess_folder_type_from_name (fname); + } g_free (fname); switch (type) { case TNY_FOLDER_TYPE_ROOT: - pixbuf = modest_icon_factory_get_icon (MODEST_FOLDER_ICON_ACCOUNT); + pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_ACCOUNT); break; case TNY_FOLDER_TYPE_INBOX: - pixbuf = modest_icon_factory_get_icon (MODEST_FOLDER_ICON_INBOX); + pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_INBOX); break; case TNY_FOLDER_TYPE_OUTBOX: - pixbuf = modest_icon_factory_get_icon (MODEST_FOLDER_ICON_OUTBOX); + pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_OUTBOX); break; case TNY_FOLDER_TYPE_JUNK: - pixbuf = modest_icon_factory_get_icon (MODEST_FOLDER_ICON_JUNK); + pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_JUNK); break; case TNY_FOLDER_TYPE_SENT: - pixbuf = modest_icon_factory_get_icon (MODEST_FOLDER_ICON_SENT); - break; - case TNY_FOLDER_TYPE_DRAFTS: - pixbuf = modest_icon_factory_get_icon (MODEST_FOLDER_ICON_DRAFTS); + pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_SENT); break; - case TNY_FOLDER_TYPE_NOTES: - pixbuf = modest_icon_factory_get_icon (MODEST_FOLDER_ICON_NOTES); + case TNY_FOLDER_TYPE_TRASH: + pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_TRASH); break; - case TNY_FOLDER_TYPE_CALENDAR: - pixbuf = modest_icon_factory_get_icon (MODEST_FOLDER_ICON_CALENDAR); - break; - case TNY_FOLDER_TYPE_CONTACTS: - pixbuf = modest_icon_factory_get_icon (MODEST_FOLDER_ICON_CONTACTS); + case TNY_FOLDER_TYPE_DRAFTS: + pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_DRAFTS); break; case TNY_FOLDER_TYPE_NORMAL: default: - pixbuf = modest_icon_factory_get_icon (MODEST_FOLDER_ICON_NORMAL); - break; + pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_NORMAL); + break; } - - g_object_set (rendobj, - "pixbuf-expander-open", - modest_icon_factory_get_icon (MODEST_FOLDER_ICON_OPEN), - "pixbuf-expander-closed", - modest_icon_factory_get_icon (MODEST_FOLDER_ICON_CLOSED), - "pixbuf", pixbuf, - NULL); + g_object_set (rendobj, "pixbuf", pixbuf, NULL); } static void @@ -253,13 +308,13 @@ 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 (); - + 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); @@ -280,36 +335,21 @@ 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 -modest_folder_view_disconnect_store_account_handlers (GtkTreeView *self) +tny_account_store_view_init (gpointer g, gpointer iface_data) { - TnyIterator *iter; - ModestFolderViewPrivate *priv; - GtkTreeModel *model; - GtkTreeModelSort *sortable; - gint i = 0; + TnyAccountStoreViewIface *klass = (TnyAccountStoreViewIface *)g; - sortable = GTK_TREE_MODEL_SORT (gtk_tree_view_get_model (self)); - if (!sortable) - return; + klass->set_account_store_func = modest_folder_view_set_account_store; - model = gtk_tree_model_sort_get_model (sortable); - if (!model) - return; - - priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self); - iter = tny_list_create_iterator (TNY_LIST (model)); - while (!tny_iterator_is_done (iter)) { - g_signal_handler_disconnect (G_OBJECT (tny_iterator_get_current (iter)), - priv->store_accounts_handlers [i++]); - tny_iterator_next (iter); - } - g_object_unref (G_OBJECT (iter)); + return; } - static void modest_folder_view_finalize (GObject *obj) { @@ -319,24 +359,21 @@ 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); + 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->store_accounts_handlers) { - modest_folder_view_disconnect_store_account_handlers (GTK_TREE_VIEW (obj)); - g_free (priv->store_accounts_handlers); - priv->store_accounts_handlers = NULL; - } - if (priv->query) { g_object_unref (G_OBJECT (priv->query)); priv->query = NULL; @@ -344,13 +381,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) { @@ -360,6 +440,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) { @@ -379,91 +467,37 @@ 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); - - /* Disconnect old handlers */ - if (priv->store_accounts_handlers) { - modest_folder_view_disconnect_store_account_handlers (GTK_TREE_VIEW (self)); - g_free (priv->store_accounts_handlers); - priv->store_accounts_handlers = NULL; - } - - 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 -update_store_account_handlers (ModestFolderView *self, TnyList *account_list) +expand_root_items (ModestFolderView *self) { - ModestFolderViewPrivate *priv; - TnyIterator *iter; - guint len; - - priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self); + GtkTreePath *path; + path = gtk_tree_path_new_first (); - /* Listen to subscription changes */ - len = tny_list_get_length (TNY_LIST (account_list)); - - g_assert (priv->store_accounts_handlers == NULL); /* don't leak */ - priv->store_accounts_handlers = g_malloc0 (sizeof (guint) * len); - iter = tny_list_create_iterator (account_list); + /* all folders should have child items, so.. */ + while (gtk_tree_view_expand_row (GTK_TREE_VIEW(self), path, FALSE)) + gtk_tree_path_next (path); - if (!tny_iterator_is_done (iter)) { - gint i = 0; - - do { - - priv->store_accounts_handlers [i++] = - g_signal_connect (G_OBJECT (tny_iterator_get_current (iter)), - "subscription_changed", - G_CALLBACK (on_subscription_changed), - self); - tny_iterator_next (iter); - } while (!tny_iterator_is_done (iter)); - } - g_object_unref (G_OBJECT (iter)); + gtk_tree_path_free (path); } - - static gboolean update_model (ModestFolderView *self, ModestTnyAccountStore *account_store) { @@ -474,31 +508,37 @@ update_model (ModestFolderView *self, ModestTnyAccountStore *account_store) g_return_val_if_fail (account_store, FALSE); - update_model_empty (self); - priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self); - model = tny_gtk_folder_store_tree_model_new (FALSE, NULL); + /* 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); tny_account_store_get_accounts (TNY_ACCOUNT_STORE(account_store), account_list, - TNY_ACCOUNT_STORE_STORE_ACCOUNTS); - - + TNY_ACCOUNT_STORE_STORE_ACCOUNTS); if (account_list) { sortable = gtk_tree_model_sort_new_with_model (model); gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable), TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, 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); - update_store_account_handlers (self, account_list); + expand_root_items (self); /* expand all account folders */ + g_object_unref (account_list); } - g_object_unref (model); return TRUE; } @@ -506,9 +546,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; @@ -520,56 +561,56 @@ 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)) { - priv->cur_folder = NULL; /* FIXME: need this? */ - return; + if (!gtk_tree_selection_get_selected (sel, &model_sort, &iter_sort)) { + 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)); + 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, -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); - if (priv->cur_folder) - tny_folder_expunge (priv->cur_folder, NULL); /* FIXME */ - priv->cur_folder = folder; - -} - -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; + /* Current folder was unselected */ + if (priv->cur_folder) { + g_signal_emit (G_OBJECT(tree_view), signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0, + priv->cur_folder, FALSE); + g_object_unref (priv->cur_folder); + } - priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self); - update_model (self, MODEST_TNY_ACCOUNT_STORE (priv->account_store)); -} + 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); -static 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 * @@ -586,21 +627,6 @@ modest_folder_view_get_selected (ModestFolderView *self) return priv->cur_folder; } - - -static const gchar* -get_account_name (TnyFolder *folder) -{ - TnyAccount *account; - - account = tny_folder_get_account (folder); - if (!account) - return NULL; - else - return tny_account_get_name (account); - -} - static gint cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, gpointer user_data) @@ -624,17 +650,489 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, 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); - } else { + } 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); return cmp; } + +/*****************************************************************************/ +/* 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 +on_drag_data_get (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); + + /* 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); + + gtk_tree_set_row_drag_data (selection_data, + model, + source_row); + + gtk_tree_path_free (source_row_sort); + 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 +on_drag_data_received (GtkWidget *widget, + GdkDragContext *context, + gint x, + gint y, + GtkSelectionData *selection_data, + guint target_type, + guint time, + gpointer data) +{ + GtkWidget *source_widget; + GtkTreeModel *model_sort, *dest_model, *source_model; + GtkTreePath *source_row, *dest_row, *child_dest_row; + GtkTreeViewDropPosition pos; + gboolean success = FALSE, delete_source = FALSE; + DndHelper *helper; + + /* Do not allow further process */ + g_signal_stop_emission_by_name (widget, "drag-data-received"); + + /* Get the action */ + if (context->action == GDK_ACTION_MOVE) + delete_source = TRUE; + + /* 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, + &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 + 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) + 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; + + /* 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); + + /* Drags from the header view */ + if (source_widget != widget) { + + drag_and_drop_from_header_view (source_model, + dest_model, + child_dest_row, + helper); + } else { + + + drag_and_drop_from_folder_view (source_model, + dest_model, + child_dest_row, + selection_data, + helper); + } + + /* Frees */ + gtk_tree_path_free (source_row); + gtk_tree_path_free (child_dest_row); +} + +/* + * 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; + + if (!context->targets) + return FALSE; + + /* Check if we're dragging a folder row */ + target = gtk_drag_dest_find_target (widget, context, NULL); + + /* 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; +} + +/* + * 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 +on_drag_motion (GtkWidget *widget, + GdkDragContext *context, + gint x, + gint y, + guint time, + gpointer user_data) +{ + GtkTreeViewDropPosition pos; + GtkTreePath *dest_row; + ModestFolderViewPrivate *priv; + GdkDragAction suggested_action; + gboolean valid_location = FALSE; + + 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); + + /* 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)) { + 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); + + /* 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_HIGHLIGHT, + folder_view_drag_types, + G_N_ELEMENTS (folder_view_drag_types), + GDK_ACTION_MOVE | GDK_ACTION_COPY); + + 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, + 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); +}