X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-folder-view.c;h=da0d5a803260462a24ec0729b387a11c78adf655;hp=d95c3a6a61fc93d4a946c37c6257778a0e4a2e7c;hb=a15fc8e70d5c5bdb119780511ad9410ecdd6b2b7;hpb=c2277fc818b1ba47308bce8b77c6af31c5764f90 diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c index d95c3a6..da0d5a8 100644 --- a/src/widgets/modest-folder-view.c +++ b/src/widgets/modest-folder-view.c @@ -41,8 +41,10 @@ #include #include #include +#include #include #include +#include #include #include #include @@ -124,6 +126,13 @@ static gint expand_row_timeout (gpointer data); static void setup_drag_and_drop (GtkTreeView *self); +static gboolean _clipboard_set_selected_data (ModestFolderView *folder_view, gboolean delete); + +static void _clear_hidding_filter (ModestFolderView *folder_view); + +static void on_row_changed_maybe_select_folder (GtkTreeModel *tree_model, GtkTreePath *path, GtkTreeIter *iter, + ModestFolderView *self); + enum { FOLDER_SELECTION_CHANGED_SIGNAL, FOLDER_DISPLAY_NAME_CHANGED_SIGNAL, @@ -135,17 +144,30 @@ struct _ModestFolderViewPrivate { TnyAccountStore *account_store; TnyFolderStore *cur_folder_store; + TnyFolder *folder_to_select; /* folder to select after the next update */ + gulong account_update_signal; gulong changed_signal; gulong accounts_reloaded_signal; gulong account_removed_signal; + gulong conf_key_signal; + /* not unref this object, its a singlenton */ + ModestEmailClipboard *clipboard; + + /* Filter tree model */ + gchar **hidding_ids; + guint n_selected; + TnyFolderStoreQuery *query; guint timer_expander; gchar *local_account_name; gchar *visible_account_id; ModestFolderViewStyle style; + + gboolean reselect; /* we use this to force a reselection of the INBOX */ + gboolean show_non_move; }; #define MODEST_FOLDER_VIEW_GET_PRIVATE(o) \ (G_TYPE_INSTANCE_GET_PRIVATE((o), \ @@ -232,6 +254,85 @@ modest_folder_view_class_init (ModestFolderViewClass *klass) G_TYPE_NONE, 1, G_TYPE_STRING); } +/* Simplify checks for NULLs: */ +static gboolean strings_are_equal (const gchar *a, const gchar *b) +{ + if (!a && !b) + return TRUE; + if (a && b) + { + return (strcmp (a, b) == 0); + } + else + return FALSE; +} + +static gboolean on_model_foreach_set_name(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data) +{ + GObject *instance = NULL; + + gtk_tree_model_get (model, iter, + TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &instance, + -1); + + if (!instance) + return FALSE; /* keep walking */ + + if (!TNY_IS_ACCOUNT (instance)) { + g_object_unref (instance); + return FALSE; /* keep walking */ + } + + /* Check if this is the looked-for account: */ + TnyAccount *this_account = TNY_ACCOUNT (instance); + TnyAccount *account = TNY_ACCOUNT (data); + + const gchar *this_account_id = tny_account_get_id(this_account); + const gchar *account_id = tny_account_get_id(account); + g_object_unref (instance); + instance = NULL; + + /* printf ("DEBUG: %s: this_account_id=%s, account_id=%s\n", __FUNCTION__, this_account_id, account_id); */ + if (strings_are_equal(this_account_id, account_id)) { + /* Tell the model that the data has changed, so that + * it calls the cell_data_func callbacks again: */ + /* TODO: This does not seem to actually cause the new string to be shown: */ + gtk_tree_model_row_changed (model, path, iter); + + return TRUE; /* stop walking */ + } + + return FALSE; /* keep walking */ +} + +typedef struct +{ + ModestFolderView *self; + gchar *previous_name; +} GetMmcAccountNameData; + +static void on_get_mmc_account_name (TnyStoreAccount* account, gpointer user_data) +{ + /* printf ("DEBU1G: %s: account name=%s\n", __FUNCTION__, tny_account_get_name (TNY_ACCOUNT(account))); */ + + GetMmcAccountNameData *data = (GetMmcAccountNameData*)user_data; + + if (!strings_are_equal ( + tny_account_get_name(TNY_ACCOUNT(account)), + data->previous_name)) { + + /* Tell the model that the data has changed, so that + * it calls the cell_data_func callbacks again: */ + ModestFolderView *self = data->self; + GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); + if (model) + gtk_tree_model_foreach(model, on_model_foreach_set_name, account); + } + + g_free (data->previous_name); + g_slice_free (GetMmcAccountNameData, data); +} + static void text_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data) @@ -255,7 +356,7 @@ text_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &instance, -1); rendobj = G_OBJECT(renderer); - + if (!fname) return; @@ -264,8 +365,8 @@ text_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, return; } - - priv = MODEST_FOLDER_VIEW_GET_PRIVATE (data); + ModestFolderView *self = MODEST_FOLDER_VIEW (data); + priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self); gchar *item_name = NULL; gint item_weight = 400; @@ -274,35 +375,43 @@ text_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, gint number = 0; if (modest_tny_folder_is_local_folder (TNY_FOLDER (instance))) { - TnyFolderType folder_type - = modest_tny_folder_get_local_folder_type (TNY_FOLDER (instance)); - if (folder_type != TNY_FOLDER_TYPE_UNKNOWN) { + type = modest_tny_folder_get_local_folder_type (TNY_FOLDER (instance)); + if (type != TNY_FOLDER_TYPE_UNKNOWN) { g_free (fname); - fname = g_strdup(modest_local_folder_info_get_type_display_name (folder_type)); + fname = g_strdup(modest_local_folder_info_get_type_display_name (type)); } } - /* Select the number to show */ + /* Select the number to show: the unread or unsent messages */ if ((type == TNY_FOLDER_TYPE_DRAFTS) || (type == TNY_FOLDER_TYPE_OUTBOX)) number = all; else number = unread; - - /* Use bold font style if there are unread messages */ - if (unread > 0) { - item_name = g_strdup_printf ("%s (%d)", fname, unread); + + /* Use bold font style if there are unread or unset messages */ + if (number > 0) { + item_name = g_strdup_printf ("%s (%d)", fname, number); item_weight = 800; } else { item_name = g_strdup (fname); item_weight = 400; } - + } else if (TNY_IS_ACCOUNT (instance)) { /* If it's a server account */ if (modest_tny_account_is_virtual_local_folders ( TNY_ACCOUNT (instance))) { item_name = g_strdup (priv->local_account_name); - item_weight = 400; + item_weight = 800; + } else if (modest_tny_account_is_memory_card_account ( + TNY_ACCOUNT (instance))) { + /* fname is only correct when the items are first + * added to the model, not when the account is + * changed later, so get the name from the account + * instance: */ + item_name = g_strdup (tny_account_get_name ( + TNY_ACCOUNT (instance))); + item_weight = 800; } else { item_name = g_strdup (fname); item_weight = 800; @@ -317,8 +426,9 @@ text_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, g_object_set (rendobj,"text", item_name, "weight", item_weight, NULL); /* Notify display name observers */ + /* TODO: What listens for this signal, and how can it use only the new name? */ if (G_OBJECT (priv->cur_folder_store) == instance) { - g_signal_emit (G_OBJECT(data), + g_signal_emit (G_OBJECT(self), signals[FOLDER_DISPLAY_NAME_CHANGED_SIGNAL], 0, item_name); } @@ -327,6 +437,24 @@ text_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, } + /* If it is a Memory card account, make sure that we have the correct name. + * This function will be trigerred again when the name has been retrieved: */ + if (TNY_IS_STORE_ACCOUNT (instance) && + modest_tny_account_is_memory_card_account (TNY_ACCOUNT (instance))) { + + /* Get the account name asynchronously: */ + GetMmcAccountNameData *callback_data = + g_slice_new0(GetMmcAccountNameData); + callback_data->self = self; + + const gchar *name = tny_account_get_name (TNY_ACCOUNT(instance)); + if (name) + callback_data->previous_name = g_strdup (name); + + modest_tny_account_get_mmc_account_name (TNY_STORE_ACCOUNT (instance), + on_get_mmc_account_name, callback_data); + } + g_object_unref (G_OBJECT (instance)); g_free (fname); } @@ -343,6 +471,7 @@ icon_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, gchar *fname = NULL; const gchar *account_id = NULL; gint unread = 0; + gboolean has_children; rendobj = G_OBJECT(renderer); gtk_tree_model_get (tree_model, iter, @@ -351,6 +480,7 @@ icon_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, TNY_GTK_FOLDER_STORE_TREE_MODEL_UNREAD_COLUMN, &unread, TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &instance, -1); + has_children = gtk_tree_model_iter_has_child (tree_model, iter); if (!fname) return; @@ -359,9 +489,13 @@ icon_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, g_free (fname); return; } - - if (type == TNY_FOLDER_TYPE_NORMAL || type == TNY_FOLDER_TYPE_UNKNOWN) { - type = modest_tny_folder_guess_folder_type_from_name (fname); + + /* MERGE is not needed anymore as the folder now has the correct type jschmid */ + /* We include the MERGE type here because it's used to create + the local OUTBOX folder */ + if (type == TNY_FOLDER_TYPE_NORMAL || + type == TNY_FOLDER_TYPE_UNKNOWN) { + type = modest_tny_folder_guess_folder_type (TNY_FOLDER (instance)); } switch (type) { @@ -411,6 +545,39 @@ icon_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, /* Set pixbuf */ g_object_set (rendobj, "pixbuf", pixbuf, NULL); + if (has_children && (pixbuf != NULL)) { + GdkPixbuf *open_pixbuf, *closed_pixbuf; + GdkPixbuf *open_emblem, *closed_emblem; + open_pixbuf = gdk_pixbuf_copy (pixbuf); + closed_pixbuf = gdk_pixbuf_copy (pixbuf); + open_emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp"); + closed_emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp"); + + if (open_emblem) { + gdk_pixbuf_composite (open_emblem, open_pixbuf, 0, 0, + MIN (gdk_pixbuf_get_width (open_emblem), + gdk_pixbuf_get_width (open_pixbuf)), + MIN (gdk_pixbuf_get_height (open_emblem), + gdk_pixbuf_get_height (open_pixbuf)), + 0, 0, 1, 1, GDK_INTERP_NEAREST, 255); + g_object_set (rendobj, "pixbuf-expander-open", open_pixbuf, NULL); + g_object_unref (open_emblem); + } + if (closed_emblem) { + gdk_pixbuf_composite (closed_emblem, closed_pixbuf, 0, 0, + MIN (gdk_pixbuf_get_width (closed_emblem), + gdk_pixbuf_get_width (closed_pixbuf)), + MIN (gdk_pixbuf_get_height (closed_emblem), + gdk_pixbuf_get_height (closed_pixbuf)), + 0, 0, 1, 1, GDK_INTERP_NEAREST, 255); + g_object_set (rendobj, "pixbuf-expander-closed", closed_pixbuf, NULL); + g_object_unref (closed_emblem); + } + if (closed_pixbuf) + g_object_unref (closed_pixbuf); + if (open_pixbuf) + g_object_unref (open_pixbuf); + } if (pixbuf != NULL) g_object_unref (pixbuf); @@ -466,11 +633,19 @@ modest_folder_view_init (ModestFolderView *obj) priv->style = MODEST_FOLDER_VIEW_STYLE_SHOW_ALL; priv->cur_folder_store = NULL; priv->visible_account_id = NULL; + priv->folder_to_select = NULL; /* Initialize the local account name */ conf = modest_runtime_get_conf(); priv->local_account_name = modest_conf_get_string (conf, MODEST_CONF_DEVICE_NAME, NULL); + /* Init email clipboard */ + priv->clipboard = modest_runtime_get_email_clipboard (); + priv->hidding_ids = NULL; + priv->n_selected = 0; + priv->reselect = FALSE; + priv->show_non_move = TRUE; + /* Build treeview */ add_columns (GTK_WIDGET (obj)); @@ -486,10 +661,10 @@ modest_folder_view_init (ModestFolderView *obj) * Track changes in the local account name (in the device it * will be the device name) */ - g_signal_connect (G_OBJECT(conf), - "key_changed", - G_CALLBACK(on_configuration_key_changed), obj); - + priv->conf_key_signal = + g_signal_connect (G_OBJECT(conf), + "key_changed", + G_CALLBACK(on_configuration_key_changed), obj); } static void @@ -533,6 +708,11 @@ modest_folder_view_finalize (GObject *obj) priv->query = NULL; } + if (priv->folder_to_select) { + g_object_unref (G_OBJECT(priv->folder_to_select)); + priv->folder_to_select = NULL; + } + sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(obj)); if (sel) g_signal_handler_disconnect (G_OBJECT(sel), priv->changed_signal); @@ -540,6 +720,24 @@ modest_folder_view_finalize (GObject *obj) g_free (priv->local_account_name); g_free (priv->visible_account_id); + if (priv->conf_key_signal) { + g_signal_handler_disconnect (modest_runtime_get_conf (), + priv->conf_key_signal); + priv->conf_key_signal = 0; + } + + if (priv->cur_folder_store) { + if (TNY_IS_FOLDER(priv->cur_folder_store)) + tny_folder_sync (TNY_FOLDER(priv->cur_folder_store), FALSE, NULL); + /* FALSE --> expunge the message */ + + g_object_unref (priv->cur_folder_store); + priv->cur_folder_store = NULL; + } + + /* Clear hidding array created by cut operation */ + _clear_hidding_filter (MODEST_FOLDER_VIEW (obj)); + G_OBJECT_CLASS(parent_class)->finalize (obj); } @@ -588,6 +786,9 @@ modest_folder_view_set_account_store (TnyAccountStoreView *self, TnyAccountStore g_signal_connect (G_OBJECT(account_store), "accounts_reloaded", G_CALLBACK (on_accounts_reloaded), self); + g_signal_connect (G_OBJECT(account_store), "connecting_finished", + G_CALLBACK (on_accounts_reloaded), self); + on_accounts_reloaded (account_store, (gpointer ) self); g_object_unref (G_OBJECT (device)); @@ -615,10 +816,13 @@ on_account_update (TnyAccountStore *account_store, const gchar *account, gpointer user_data) { - ModestFolderView *self = MODEST_FOLDER_VIEW (user_data); + ModestFolderView *self = NULL; ModestFolderViewPrivate *priv; + g_return_if_fail (MODEST_IS_FOLDER_VIEW (user_data)); + self = MODEST_FOLDER_VIEW (user_data); priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self); + if (!priv->visible_account_id) modest_widget_memory_restore (modest_runtime_get_conf(), G_OBJECT(self), MODEST_CONF_FOLDER_VIEW_KEY); @@ -632,6 +836,7 @@ static void on_accounts_reloaded (TnyAccountStore *account_store, gpointer user_data) { + g_return_if_fail (MODEST_IS_FOLDER_VIEW (user_data)); modest_folder_view_update_model (MODEST_FOLDER_VIEW (user_data), account_store); } @@ -653,6 +858,30 @@ modest_folder_view_set_title (ModestFolderView *self, const gchar *title) title != NULL); } +static gboolean +modest_folder_view_on_map (ModestFolderView *self, + GdkEventExpose *event, + gpointer data) +{ + ModestFolderViewPrivate *priv; + + priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self); + + /* This won't happen often */ + if (G_UNLIKELY (priv->reselect)) { + /* Select the first inbox or the local account if not found */ + + /* TODO: this could cause a lock at startup, so we + comment it for the moment. We know that this will + be a bug, because the INBOX is not selected, but we + need to rewrite some parts of Modest to avoid the + deathlock situation */ +/* modest_folder_view_select_first_inbox_or_local (self); */ + priv->reselect = FALSE; + } + return FALSE; +} + GtkWidget* modest_folder_view_new (TnyFolderStoreQuery *query) { @@ -670,6 +899,8 @@ modest_folder_view_new (TnyFolderStoreQuery *query) priv->changed_signal = g_signal_connect (sel, "changed", G_CALLBACK (on_selection_changed), self); + g_signal_connect (self, "expose-event", G_CALLBACK (modest_folder_view_on_map), NULL); + return GTK_WIDGET(self); } @@ -697,9 +928,17 @@ filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer data) { + ModestFolderViewPrivate *priv; gboolean retval = TRUE; TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN; GObject *instance = NULL; + const gchar *id = NULL; + guint i; + gboolean found = FALSE; + gboolean cleared = FALSE; + + g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (data), FALSE); + priv = MODEST_FOLDER_VIEW_GET_PRIVATE (data); gtk_tree_model_get (model, iter, TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type, @@ -714,7 +953,8 @@ filter_row (GtkTreeModel *model, return FALSE; if (type == TNY_FOLDER_TYPE_ROOT) { - /* TNY_FOLDER_TYPE_ROOT means that the instance is an account instead of a folder. */ + /* TNY_FOLDER_TYPE_ROOT means that the instance is an + account instead of a folder. */ if (TNY_IS_ACCOUNT (instance)) { TnyAccount *acc = TNY_ACCOUNT (instance); const gchar *account_id = tny_account_get_id (acc); @@ -724,21 +964,51 @@ filter_row (GtkTreeModel *model, if (!modest_tny_account_is_virtual_local_folders (acc) && strcmp (account_id, MODEST_MMC_ACCOUNT_ID)) { /* Show only the visible account id */ - ModestFolderViewPrivate *priv = - MODEST_FOLDER_VIEW_GET_PRIVATE (data); if (priv->visible_account_id && strcmp (account_id, priv->visible_account_id)) retval = FALSE; } + + /* Never show these to the user. They are merged into one folder + * in the local-folders account instead: */ + if (retval && MODEST_IS_TNY_OUTBOX_ACCOUNT (acc)) + retval = FALSE; } } /* The virtual local-folders folder store is also shown by default. */ + /* Check hiding (if necessary) */ + cleared = modest_email_clipboard_cleared (priv->clipboard); + if ((retval) && (!cleared) && (TNY_IS_FOLDER (instance))) { + id = tny_folder_get_id (TNY_FOLDER(instance)); + if (priv->hidding_ids != NULL) + for (i=0; i < priv->n_selected && !found; i++) + if (priv->hidding_ids[i] != NULL && id != NULL) + found = (!strcmp (priv->hidding_ids[i], id)); + + retval = !found; + } + + if (!priv->show_non_move) + { + switch (type) + { + case TNY_FOLDER_TYPE_OUTBOX: + case TNY_FOLDER_TYPE_SENT: + retval = FALSE; + break; + default: + break; + } + } + + /* Free */ g_object_unref (instance); return retval; } + gboolean modest_folder_view_update_model (ModestFolderView *self, TnyAccountStore *account_store) @@ -748,6 +1018,7 @@ modest_folder_view_update_model (ModestFolderView *self, /* TnyAccount *local_account; */ TnyList *model_as_list; + g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (self), FALSE); g_return_val_if_fail (account_store, FALSE); priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self); @@ -755,7 +1026,11 @@ modest_folder_view_update_model (ModestFolderView *self, /* Notify that there is no folder selected */ g_signal_emit (G_OBJECT(self), signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0, - NULL, TRUE); + NULL, FALSE); + if (priv->cur_folder_store) { + g_object_unref (priv->cur_folder_store); + priv->cur_folder_store = NULL; + } /* FIXME: the local accounts are not shown when the query selects only the subscribed folders. */ @@ -781,28 +1056,43 @@ modest_folder_view_update_model (ModestFolderView *self, GTK_SORT_ASCENDING); gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (sortable), TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, - cmp_rows, NULL, NULL); + cmp_rows, NULL, NULL); /* Create filter model */ - if (priv->style == MODEST_FOLDER_VIEW_STYLE_SHOW_ONE) { - filter_model = gtk_tree_model_filter_new (sortable, NULL); - gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (filter_model), - filter_row, - self, - NULL); - } + filter_model = gtk_tree_model_filter_new (sortable, NULL); + gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (filter_model), + filter_row, + self, + NULL); +/* if (priv->style == MODEST_FOLDER_VIEW_STYLE_SHOW_ONE) { */ +/* filter_model = gtk_tree_model_filter_new (sortable, NULL); */ +/* gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (filter_model), */ +/* filter_row, */ +/* self, */ +/* NULL); */ +/* } */ /* Set new model */ - gtk_tree_view_set_model (GTK_TREE_VIEW(self), - (filter_model) ? filter_model : sortable); - expand_root_items (self); /* expand all account folders */ + gtk_tree_view_set_model (GTK_TREE_VIEW(self), filter_model); + g_signal_connect (G_OBJECT(filter_model), "row-changed", + (GCallback)on_row_changed_maybe_select_folder, self); + g_signal_connect (G_OBJECT(filter_model), "row-inserted", + (GCallback)on_row_changed_maybe_select_folder, self); + + +/* gtk_tree_view_set_model (GTK_TREE_VIEW(self), */ +/* (filter_model) ? filter_model : sortable); */ + g_object_unref (model); - - if (filter_model) - g_object_unref (filter_model); + g_object_unref (filter_model); +/* if (filter_model) */ +/* g_object_unref (filter_model); */ g_object_unref (sortable); + + /* Force a reselection of the INBOX next time the widget is shown */ + priv->reselect = TRUE; return TRUE; } @@ -822,36 +1112,35 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data) priv = MODEST_FOLDER_VIEW_GET_PRIVATE(user_data); - /* folder was _un_selected if true */ - if (!gtk_tree_selection_get_selected (sel, &model, &iter)) { - if (priv->cur_folder_store) - g_object_unref (priv->cur_folder_store); - priv->cur_folder_store = NULL; - - /* Notify the display name observers */ - g_signal_emit (G_OBJECT(user_data), - signals[FOLDER_DISPLAY_NAME_CHANGED_SIGNAL], 0, - NULL); + if(!gtk_tree_selection_get_selected (sel, &model, &iter)) return; - } - tree_view = MODEST_FOLDER_VIEW (user_data); + /* Notify the display name observers */ + g_signal_emit (G_OBJECT(user_data), + signals[FOLDER_DISPLAY_NAME_CHANGED_SIGNAL], 0, + NULL); + tree_view = MODEST_FOLDER_VIEW (user_data); gtk_tree_model_get (model, &iter, TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder, -1); /* If the folder is the same do not notify */ - if (priv->cur_folder_store == folder) { + if (priv->cur_folder_store == folder && folder) { g_object_unref (folder); return; } /* Current folder was unselected */ if (priv->cur_folder_store) { + if (TNY_IS_FOLDER(priv->cur_folder_store)) + tny_folder_sync_async (TNY_FOLDER(priv->cur_folder_store), FALSE, NULL, NULL, NULL); + /* FALSE --> don't expunge the messages */ + g_signal_emit (G_OBJECT(tree_view), signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0, priv->cur_folder_store, FALSE); g_object_unref (priv->cur_folder_store); + priv->cur_folder_store = NULL; } /* New current references */ @@ -860,7 +1149,7 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data) /* New folder has been selected */ g_signal_emit (G_OBJECT(tree_view), signals[FOLDER_SELECTION_CHANGED_SIGNAL], - 0, folder, TRUE); + 0, priv->cur_folder_store, TRUE); } TnyFolderStore * @@ -901,6 +1190,30 @@ get_cmp_rows_type_pos (GObject *folder) } } +static gint +get_cmp_subfolder_type_pos (TnyFolderType t) +{ + /* Inbox, Outbox, Drafts, Sent, User */ + /* 0, 1, 2, 3, 4 */ + + switch (t) { + case TNY_FOLDER_TYPE_INBOX: + return 0; + break; + case TNY_FOLDER_TYPE_OUTBOX: + return 1; + break; + case TNY_FOLDER_TYPE_DRAFTS: + return 2; + break; + case TNY_FOLDER_TYPE_SENT: + return 3; + break; + default: + return 4; + } +} + /* * This function orders the mail accounts according to these rules: * 1st - remote accounts @@ -915,6 +1228,7 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, gchar *name1 = NULL; gchar *name2 = NULL; TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN; + TnyFolderType type2 = TNY_FOLDER_TYPE_UNKNOWN; GObject *folder1 = NULL; GObject *folder2 = NULL; @@ -925,9 +1239,17 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, -1); gtk_tree_model_get (tree_model, iter2, TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &name2, + TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type2, TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder2, -1); + /* Return if we get no folder. This could happen when folder + operations are happening. The model is updated after the + folder copy/move actually occurs, so there could be + situations where the model to be drawn is not correct */ + if (!folder1 || !folder2) + return 0; + if (type == TNY_FOLDER_TYPE_ROOT) { /* Compare the types, so that * Remote accounts -> Local account -> MMC account .*/ @@ -965,7 +1287,38 @@ 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); + gint cmp1 = 0, cmp2 = 0; + /* get the parent to know if it's a local folder */ + + GtkTreeIter parent; + gboolean has_parent; + has_parent = gtk_tree_model_iter_parent (tree_model, &parent, iter1); + if (has_parent) { + GObject *parent_folder; + TnyFolderType parent_type = TNY_FOLDER_TYPE_UNKNOWN; + gtk_tree_model_get (tree_model, &parent, + TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &parent_type, + TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &parent_folder, + -1); + if ((parent_type == TNY_FOLDER_TYPE_ROOT) && + TNY_IS_ACCOUNT (parent_folder) && + modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (parent_folder))) { + cmp1 = get_cmp_subfolder_type_pos (modest_tny_folder_get_local_folder_type (TNY_FOLDER (folder1))); + cmp2 = get_cmp_subfolder_type_pos (modest_tny_folder_get_local_folder_type (TNY_FOLDER (folder2))); + } + g_object_unref (parent_folder); + } + + /* if they are not local folders */ + if (cmp1 == cmp2) { + cmp1 = get_cmp_subfolder_type_pos (tny_folder_get_folder_type (TNY_FOLDER (folder1))); + cmp2 = get_cmp_subfolder_type_pos (tny_folder_get_folder_type (TNY_FOLDER (folder2))); + } + + if (cmp1 == cmp2) + cmp = modest_text_utils_utf8_strcmp (name1, name2, TRUE); + else + cmp = (cmp1 - cmp2); } if (folder1) @@ -1139,10 +1492,10 @@ drag_and_drop_from_folder_view (GtkTreeModel *source_model, GtkSelectionData *selection_data, DndHelper *helper) { - ModestMailOperation *mail_op; + ModestMailOperation *mail_op = NULL; GtkTreeIter parent_iter, iter; - TnyFolderStore *parent_folder; - TnyFolder *folder; + TnyFolderStore *parent_folder = NULL; + TnyFolder *folder = NULL; /* Check if the drag is possible */ /* if (!gtk_tree_path_compare (helper->source_row, dest_row) || */ @@ -1167,20 +1520,26 @@ drag_and_drop_from_folder_view (GtkTreeModel *source_model, TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder, -1); - /* Do the mail operation */ - mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, + /* Offer the connection dialog if necessary, for the destination parent folder and source folder: */ + if (modest_platform_connect_and_wait_if_network_folderstore (NULL, parent_folder) && + modest_platform_connect_and_wait_if_network_folderstore (NULL, TNY_FOLDER_STORE (folder))) { + /* Do the mail operation */ + mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, NULL, modest_ui_actions_move_folder_error_handler, NULL); - modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), + 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); + g_signal_connect (G_OBJECT (mail_op), "progress-changed", + G_CALLBACK (on_progress_changed), helper); - modest_mail_operation_xfer_folder (mail_op, + modest_mail_operation_xfer_folder (mail_op, folder, parent_folder, - helper->delete_source); + helper->delete_source, + NULL, + NULL); + } /* Frees */ g_object_unref (G_OBJECT (parent_folder)); @@ -1225,9 +1584,18 @@ on_drag_data_received (GtkWidget *widget, won't longer exist. We can not wait for the end of the operation, because the operation won't start if the folder is in use */ - if (source_widget == widget) + if (source_widget == widget) { + ModestFolderViewPrivate *priv; + + priv = MODEST_FOLDER_VIEW_GET_PRIVATE (widget); + if (priv->cur_folder_store) { + g_object_unref (priv->cur_folder_store); + priv->cur_folder_store = NULL; + } + g_signal_emit (G_OBJECT (widget), - signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0, NULL, TRUE); + signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0, NULL, FALSE); + } } /* Check if the get_data failed */ @@ -1615,7 +1983,7 @@ find_inbox_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *inbox_iter gchar *name = NULL; gtk_tree_model_get (model, iter, - TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &name, + TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &name, TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type, -1); @@ -1656,6 +2024,7 @@ find_inbox_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *inbox_iter + void modest_folder_view_select_first_inbox_or_local (ModestFolderView *self) { @@ -1663,6 +2032,10 @@ modest_folder_view_select_first_inbox_or_local (ModestFolderView *self) GtkTreeIter iter, inbox_iter; GtkTreeSelection *sel; +/* /\* Do not set it if the folder view was not painted *\/ */ +/* if (!GTK_WIDGET_MAPPED (self)) */ +/* return; */ + model = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); if (!model) return; @@ -1671,6 +2044,8 @@ modest_folder_view_select_first_inbox_or_local (ModestFolderView *self) sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self)); gtk_tree_model_get_iter_first (model, &iter); + gtk_tree_selection_unselect_all (sel); + if (find_inbox_iter (model, &iter, &inbox_iter)) { gtk_tree_selection_select_iter (sel, &inbox_iter); } @@ -1679,3 +2054,202 @@ modest_folder_view_select_first_inbox_or_local (ModestFolderView *self) gtk_tree_selection_select_iter (sel, &iter); } } + + +/* recursive */ +static gboolean +find_folder_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *folder_iter, + TnyFolder* folder) +{ + do { + GtkTreeIter child; + TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN; + TnyFolder* a_folder; + gchar *name = NULL; + + gtk_tree_model_get (model, iter, + TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &a_folder, + TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &name, + TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type, + -1); + + g_debug ("===> %s (%p ---- %p)", name, a_folder, folder); + g_free (name); + + if (folder == a_folder) { + g_object_unref (a_folder); + *folder_iter = *iter; + return TRUE; + } + g_object_unref (a_folder); + + if (gtk_tree_model_iter_children (model, &child, iter)) { + if (find_folder_iter (model, &child, folder_iter, folder)) + return TRUE; + } + + } while (gtk_tree_model_iter_next (model, iter)); + + return FALSE; +} + + +static void +on_row_changed_maybe_select_folder (GtkTreeModel *tree_model, GtkTreePath *path, GtkTreeIter *iter, + ModestFolderView *self) +{ + ModestFolderViewPrivate *priv = NULL; + GtkTreeSelection *sel; + + if (!MODEST_IS_FOLDER_VIEW(self)) + return; + + g_return_if_fail (MODEST_IS_FOLDER_VIEW (self)); + priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self); + + sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(self)); + + if (priv->folder_to_select) { + if (!modest_folder_view_select_folder (self, priv->folder_to_select, + FALSE)) { + sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self)); + gtk_tree_selection_select_iter (sel, iter); + g_debug ("could not find changed folder"); + } + g_object_unref (priv->folder_to_select); + priv->folder_to_select = NULL; + } +} + + +gboolean +modest_folder_view_select_folder (ModestFolderView *self, TnyFolder *folder, + gboolean after_change) +{ + GtkTreeModel *model; + GtkTreeIter iter, folder_iter; + GtkTreeSelection *sel; + ModestFolderViewPrivate *priv = NULL; + + g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (self), FALSE); + g_return_val_if_fail (TNY_IS_FOLDER (folder), FALSE); + + priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self); + + if (after_change) { + if (priv->folder_to_select) + g_object_unref(priv->folder_to_select); + priv->folder_to_select = TNY_FOLDER(g_object_ref(folder)); + return TRUE; + } + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); + if (!model) + return FALSE; + + sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self)); + + gtk_tree_model_get_iter_first (model, &iter); + if (find_folder_iter (model, &iter, &folder_iter, folder)) { + gtk_tree_selection_unselect_all (sel); + gtk_tree_selection_select_iter (sel, &folder_iter); + return TRUE; + } + return FALSE; +} + + +void +modest_folder_view_copy_selection (ModestFolderView *folder_view) +{ + /* Copy selection */ + _clipboard_set_selected_data (folder_view, FALSE); +} + +void +modest_folder_view_cut_selection (ModestFolderView *folder_view) +{ + ModestFolderViewPrivate *priv = NULL; + GtkTreeModel *model = NULL; + const gchar **hidding = NULL; + guint i, n_selected; + + g_return_if_fail (MODEST_IS_FOLDER_VIEW (folder_view)); + priv = MODEST_FOLDER_VIEW_GET_PRIVATE (folder_view); + + /* Copy selection */ + if (!_clipboard_set_selected_data (folder_view, TRUE)) + return; + + /* Get hidding ids */ + hidding = modest_email_clipboard_get_hidding_ids (priv->clipboard, &n_selected); + + /* Clear hidding array created by previous cut operation */ + _clear_hidding_filter (MODEST_FOLDER_VIEW (folder_view)); + + /* Copy hidding array */ + priv->n_selected = n_selected; + priv->hidding_ids = g_malloc0(sizeof(gchar *) * n_selected); + for (i=0; i < n_selected; i++) + priv->hidding_ids[i] = g_strdup(hidding[i]); + + /* Hide cut folders */ + model = gtk_tree_view_get_model (GTK_TREE_VIEW (folder_view)); + gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model)); +} + +void +modest_folder_view_show_non_move_folders (ModestFolderView *folder_view, + gboolean show) +{ + ModestFolderViewPrivate* priv = MODEST_FOLDER_VIEW_GET_PRIVATE(folder_view); + priv->show_non_move = show; + modest_folder_view_update_model(folder_view, + TNY_ACCOUNT_STORE(modest_runtime_get_account_store())); +} + +/* Returns FALSE if it did not selected anything */ +static gboolean +_clipboard_set_selected_data (ModestFolderView *folder_view, + gboolean delete) +{ + ModestFolderViewPrivate *priv = NULL; + TnyFolderStore *folder = NULL; + gboolean retval = FALSE; + + g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (folder_view), FALSE); + priv = MODEST_FOLDER_VIEW_GET_PRIVATE (folder_view); + + /* Set selected data on clipboard */ + g_return_val_if_fail (MODEST_IS_EMAIL_CLIPBOARD (priv->clipboard), FALSE); + folder = modest_folder_view_get_selected (folder_view); + + /* Do not allow to select an account */ + if (TNY_IS_FOLDER (folder)) { + modest_email_clipboard_set_data (priv->clipboard, TNY_FOLDER(folder), NULL, delete); + retval = TRUE; + } + + /* Free */ + g_object_unref (folder); + + return retval; +} + +static void +_clear_hidding_filter (ModestFolderView *folder_view) +{ + ModestFolderViewPrivate *priv; + guint i; + + g_return_if_fail (MODEST_IS_FOLDER_VIEW (folder_view)); + priv = MODEST_FOLDER_VIEW_GET_PRIVATE(folder_view); + + if (priv->hidding_ids != NULL) { + for (i=0; i < priv->n_selected; i++) + g_free (priv->hidding_ids[i]); + g_free(priv->hidding_ids); + } +} + +