X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-folder-view.c;h=51bfcfcef75d161eecfeb48f46fb68f836b21ed5;hp=498ab17a3e4f3e2f7e77b9dce691437d24560531;hb=362784ce756b3f0e31cd451d9ac5e69b909d4053;hpb=2f51f213469dc0679fd33c205a6f6aa0c20481a9 diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c index 498ab17..51bfcfc 100644 --- a/src/widgets/modest-folder-view.c +++ b/src/widgets/modest-folder-view.c @@ -69,15 +69,12 @@ static void modest_folder_view_set_account_store (TnyAccountStoreView *s 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_account_removed (TnyAccountStore *self, TnyAccount *account, gpointer user_data); -static void on_accounts_reloaded (TnyAccountStore *store, +static void on_account_inserted (TnyAccountStore *self, + TnyAccount *account, gpointer user_data); static gint cmp_rows (GtkTreeModel *tree_model, @@ -93,10 +90,11 @@ static gboolean on_key_pressed (GtkWidget *self, GdkEventKey *event, gpointer user_data); -static void on_configuration_key_changed (ModestConf* conf, - const gchar *key, - ModestConfEvent event, - ModestFolderView *self); +static void on_configuration_key_changed (ModestConf* conf, + const gchar *key, + ModestConfEvent event, + ModestConfNotificationId notification_id, + ModestFolderView *self); /* DnD functions */ static void on_drag_data_get (GtkWidget *widget, @@ -126,11 +124,15 @@ 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 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, @@ -143,9 +145,12 @@ struct _ModestFolderViewPrivate { TnyAccountStore *account_store; TnyFolderStore *cur_folder_store; - gulong account_update_signal; + TnyFolder *folder_to_select; /* folder to select after the next update */ + + ModestConfNotificationId notification_id; + gulong changed_signal; - gulong accounts_reloaded_signal; + gulong account_inserted_signal; gulong account_removed_signal; gulong conf_key_signal; @@ -163,7 +168,8 @@ struct _ModestFolderViewPrivate { gchar *visible_account_id; ModestFolderViewStyle style; - gboolean reselect; /* we use this to force a reselection of the INBOX */ + 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), \ @@ -312,7 +318,7 @@ static void on_get_mmc_account_name (TnyStoreAccount* account, gpointer user_dat /* 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)) { @@ -370,8 +376,9 @@ text_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, if (type != TNY_FOLDER_TYPE_ROOT) { gint number = 0; - if (modest_tny_folder_is_local_folder (TNY_FOLDER (instance))) { - type = modest_tny_folder_get_local_folder_type (TNY_FOLDER (instance)); + if (modest_tny_folder_is_local_folder (TNY_FOLDER (instance)) || + modest_tny_folder_is_memory_card_folder (TNY_FOLDER (instance))) { + type = modest_tny_folder_get_local_or_mmc_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 (type)); @@ -428,7 +435,6 @@ text_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, signals[FOLDER_DISPLAY_NAME_CHANGED_SIGNAL], 0, item_name); } - g_free (item_name); } @@ -455,8 +461,6 @@ text_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, g_free (fname); } - - static void icon_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data) @@ -464,31 +468,24 @@ icon_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, GObject *rendobj = NULL, *instance = NULL; GdkPixbuf *pixbuf = NULL; TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN; - 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, 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, TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &instance, -1); + has_children = gtk_tree_model_iter_has_child (tree_model, iter); - if (!fname) - return; - - if (!instance) { - g_free (fname); + if (!instance) return; - } + /* 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 == TNY_FOLDER_TYPE_MERGE) { + type == TNY_FOLDER_TYPE_UNKNOWN) { type = modest_tny_folder_guess_folder_type (TNY_FOLDER (instance)); } @@ -535,10 +532,42 @@ icon_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, } g_object_unref (G_OBJECT (instance)); - g_free (fname); /* 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); @@ -594,6 +623,7 @@ 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(); @@ -604,6 +634,7 @@ modest_folder_view_init (ModestFolderView *obj) priv->hidding_ids = NULL; priv->n_selected = 0; priv->reselect = FALSE; + priv->show_non_move = TRUE; /* Build treeview */ add_columns (GTK_WIDGET (obj)); @@ -620,10 +651,12 @@ modest_folder_view_init (ModestFolderView *obj) * Track changes in the local account name (in the device it * will be the device name) */ - priv->conf_key_signal = - g_signal_connect (G_OBJECT(conf), - "key_changed", - G_CALLBACK(on_configuration_key_changed), obj); + priv->notification_id = modest_conf_listen_to_namespace (conf, + MODEST_CONF_NAMESPACE); + priv->conf_key_signal = g_signal_connect (G_OBJECT(conf), + "key_changed", + G_CALLBACK(on_configuration_key_changed), + obj); } static void @@ -646,6 +679,12 @@ modest_folder_view_finalize (GObject *obj) priv = MODEST_FOLDER_VIEW_GET_PRIVATE(obj); + if (priv->notification_id) { + modest_conf_forget_namespace (modest_runtime_get_conf (), + MODEST_CONF_NAMESPACE, + priv->notification_id); + } + if (priv->timer_expander != 0) { g_source_remove (priv->timer_expander); priv->timer_expander = 0; @@ -653,9 +692,7 @@ modest_folder_view_finalize (GObject *obj) if (priv->account_store) { g_signal_handler_disconnect (G_OBJECT(priv->account_store), - priv->account_update_signal); - g_signal_handler_disconnect (G_OBJECT(priv->account_store), - priv->accounts_reloaded_signal); + priv->account_inserted_signal); g_signal_handler_disconnect (G_OBJECT(priv->account_store), priv->account_removed_signal); g_object_unref (G_OBJECT(priv->account_store)); @@ -667,6 +704,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); @@ -710,14 +752,10 @@ modest_folder_view_set_account_store (TnyAccountStoreView *self, TnyAccountStore 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); + if (g_signal_handler_is_connected (G_OBJECT (priv->account_store), + priv->account_inserted_signal)) + g_signal_handler_disconnect (G_OBJECT (priv->account_store), + priv->account_inserted_signal); if (g_signal_handler_is_connected (G_OBJECT (priv->account_store), priv->account_removed_signal)) g_signal_handler_disconnect (G_OBJECT (priv->account_store), @@ -728,70 +766,99 @@ modest_folder_view_set_account_store (TnyAccountStoreView *self, TnyAccountStore 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->account_removed_signal = g_signal_connect (G_OBJECT(account_store), "account_removed", G_CALLBACK (on_account_removed), self); - priv->accounts_reloaded_signal = - g_signal_connect (G_OBJECT(account_store), "accounts_reloaded", - G_CALLBACK (on_accounts_reloaded), self); + priv->account_inserted_signal = + g_signal_connect (G_OBJECT(account_store), "account_inserted", + G_CALLBACK (on_account_inserted), self); - g_signal_connect (G_OBJECT(account_store), "connecting_finished", - G_CALLBACK (on_accounts_reloaded), self); - on_accounts_reloaded (account_store, (gpointer ) self); +/* g_signal_connect (G_OBJECT(account_store), "connecting_finished", */ +/* G_CALLBACK (on_accounts_reloaded), self); */ + +/* on_accounts_reloaded (account_store, (gpointer ) self); */ + + modest_folder_view_update_model (MODEST_FOLDER_VIEW (self), account_store); g_object_unref (G_OBJECT (device)); } static void -on_account_removed (TnyAccountStore *account_store, - TnyAccount *account, - gpointer user_data) +on_account_inserted (TnyAccountStore *account_store, + TnyAccount *account, + gpointer user_data) { - ModestFolderView *self = MODEST_FOLDER_VIEW (user_data); ModestFolderViewPrivate *priv; + GtkTreeModel *sort_model, *filter_model; - priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self); + /* Ignore transport account insertions, we're not showing them + in the folder view */ + if (TNY_IS_TRANSPORT_ACCOUNT (account)) + return; - /* If the removed account is the currently viewed one then - clear the configuration value. The new visible account will be the default account */ - if (!strcmp (priv->visible_account_id, tny_account_get_id (account))) { - modest_folder_view_set_account_id_of_visible_server_account (self, NULL); - } + priv = MODEST_FOLDER_VIEW_GET_PRIVATE (user_data); + + /* If we're adding a new account, and there is no previous + one, we need to select the visible server account */ + if (priv->style == MODEST_FOLDER_VIEW_STYLE_SHOW_ONE && + !priv->visible_account_id) + modest_widget_memory_restore (modest_runtime_get_conf(), + G_OBJECT (user_data), + MODEST_CONF_FOLDER_VIEW_KEY); + + /* Get the inner model */ + filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (user_data)); + sort_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter_model)); + + /* Insert the account in the model */ + tny_list_append (TNY_LIST (gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (sort_model))), + G_OBJECT (account)); } static void -on_account_update (TnyAccountStore *account_store, - const gchar *account, - gpointer user_data) +on_account_removed (TnyAccountStore *account_store, + TnyAccount *account, + gpointer user_data) { ModestFolderView *self = NULL; ModestFolderViewPrivate *priv; + GtkTreeModel *sort_model, *filter_model; + + /* Ignore transport account removals, we're not showing them + in the folder view */ + if (TNY_IS_TRANSPORT_ACCOUNT (account)) + return; + + g_print ("--------------------- FOLDER ---------------\n"); - 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) + /* TODO: invalidate the cur_folder_* and folder_to_select things */ + + /* Remove the account from the model */ + filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); + sort_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter_model)); + tny_list_remove (TNY_LIST (gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (sort_model))), + G_OBJECT (account)); + + /* If the removed account is the currently viewed one then + clear the configuration value. The new visible account will be the default account */ + if (priv->visible_account_id && + !strcmp (priv->visible_account_id, tny_account_get_id (account))) { + + /* Clear the current visible account_id */ + modest_folder_view_set_account_id_of_visible_server_account (self, NULL); + + /* Call the restore method, this will set the new visible account */ modest_widget_memory_restore (modest_runtime_get_conf(), G_OBJECT(self), MODEST_CONF_FOLDER_VIEW_KEY); + } - if (!modest_folder_view_update_model (self, account_store)) - g_printerr ("modest: failed to update model for changes in '%s'", - account); -} - -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); + /* Select the INBOX */ + modest_folder_view_select_first_inbox_or_local (self); } void @@ -830,8 +897,13 @@ modest_folder_view_on_map (ModestFolderView *self, 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); */ + /* TODO: check if this is still the case */ priv->reselect = FALSE; + modest_folder_view_select_first_inbox_or_local (self); + /* Notify the display name observers */ + g_signal_emit (G_OBJECT(self), + signals[FOLDER_DISPLAY_NAME_CHANGED_SIGNAL], 0, + NULL); } return FALSE; } @@ -890,7 +962,7 @@ filter_row (GtkTreeModel *model, 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); @@ -915,11 +987,17 @@ filter_row (GtkTreeModel *model, /* If it isn't a special folder, * don't show it unless it is the visible account: */ - if (!modest_tny_account_is_virtual_local_folders (acc) && - strcmp (account_id, MODEST_MMC_ACCOUNT_ID)) { + if (priv->style == MODEST_FOLDER_VIEW_STYLE_SHOW_ONE && + !modest_tny_account_is_virtual_local_folders (acc) && + strcmp (account_id, MODEST_MMC_ACCOUNT_ID)) { + /* Show only the visible account id */ - if (priv->visible_account_id && strcmp (account_id, priv->visible_account_id)) + if (priv->visible_account_id) { + if (strcmp (account_id, priv->visible_account_id)) + retval = FALSE; + } else { retval = FALSE; + } } /* Never show these to the user. They are merged into one folder @@ -928,8 +1006,6 @@ filter_row (GtkTreeModel *model, retval = FALSE; } } - - /* The virtual local-folders folder store is also shown by default. */ /* Check hiding (if necessary) */ cleared = modest_email_clipboard_cleared (priv->clipboard); @@ -942,13 +1018,40 @@ filter_row (GtkTreeModel *model, retval = !found; } - + + + /* If this is a move to dialog, hide Sent, Outbox and Drafts + folder as no message can be move there according to UI specs */ + if (!priv->show_non_move) + { + switch (type) + { + case TNY_FOLDER_TYPE_OUTBOX: + case TNY_FOLDER_TYPE_SENT: + case TNY_FOLDER_TYPE_DRAFTS: + retval = FALSE; + break; + case TNY_FOLDER_TYPE_UNKNOWN: + case TNY_FOLDER_TYPE_NORMAL: + type = modest_tny_folder_guess_folder_type(TNY_FOLDER(instance)); + if (type == TNY_FOLDER_TYPE_OUTBOX || type == TNY_FOLDER_TYPE_SENT + || type == TNY_FOLDER_TYPE_DRAFTS) + { + retval = FALSE; + } + break; + default: + break; + } + } + /* Free */ g_object_unref (instance); return retval; } + gboolean modest_folder_view_update_model (ModestFolderView *self, TnyAccountStore *account_store) @@ -975,7 +1078,7 @@ modest_folder_view_update_model (ModestFolderView *self, /* 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); + model = tny_gtk_folder_store_tree_model_new (NULL); /* Deal with the model via its TnyList Interface, * filling the TnyList via a get_accounts() call: */ @@ -1004,24 +1107,17 @@ modest_folder_view_update_model (ModestFolderView *self, 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); -/* gtk_tree_view_set_model (GTK_TREE_VIEW(self), */ -/* (filter_model) ? filter_model : sortable); */ + 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); + g_object_unref (model); - g_object_unref (filter_model); -/* if (filter_model) */ -/* g_object_unref (filter_model); */ - + g_object_unref (filter_model); g_object_unref (sortable); /* Force a reselection of the INBOX next time the widget is shown */ @@ -1066,12 +1162,14 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data) /* Current folder was unselected */ if (priv->cur_folder_store) { + g_signal_emit (G_OBJECT(tree_view), signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0, + priv->cur_folder_store, FALSE); + if (TNY_IS_FOLDER(priv->cur_folder_store)) - tny_folder_sync (TNY_FOLDER(priv->cur_folder_store), FALSE, NULL); + 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; } @@ -1126,21 +1224,24 @@ get_cmp_rows_type_pos (GObject *folder) static gint get_cmp_subfolder_type_pos (TnyFolderType t) { - /* Outbox, Drafts, Sent, User */ - /* 0, 1, 2, 3 */ + /* Inbox, Outbox, Drafts, Sent, User */ + /* 0, 1, 2, 3, 4 */ switch (t) { - case TNY_FOLDER_TYPE_OUTBOX: + case TNY_FOLDER_TYPE_INBOX: return 0; break; - case TNY_FOLDER_TYPE_DRAFTS: + case TNY_FOLDER_TYPE_OUTBOX: return 1; break; - case TNY_FOLDER_TYPE_SENT: + case TNY_FOLDER_TYPE_DRAFTS: return 2; break; - default: + case TNY_FOLDER_TYPE_SENT: return 3; + break; + default: + return 4; } } @@ -1154,7 +1255,7 @@ static gint cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, gpointer user_data) { - gint cmp; + gint cmp = 0; gchar *name1 = NULL; gchar *name2 = NULL; TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN; @@ -1178,7 +1279,7 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, folder copy/move actually occurs, so there could be situations where the model to be drawn is not correct */ if (!folder1 || !folder2) - return 0; + goto finish; if (type == TNY_FOLDER_TYPE_ROOT) { /* Compare the types, so that @@ -1205,22 +1306,24 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, const gchar *account_id = account1 ? tny_account_get_id (account1) : NULL; const gchar *account_id2 = account2 ? tny_account_get_id (account2) : NULL; - if (!account_id && !account_id2) - return 0; - else if (!account_id) - return -1; - else if (!account_id2) - return +1; - else if (!strcmp (account_id, MODEST_MMC_ACCOUNT_ID)) + if (!account_id && !account_id2) { + cmp = 0; + } else if (!account_id) { + cmp = -1; + } else if (!account_id2) { cmp = +1; - else + } else if (!strcmp (account_id, MODEST_MMC_ACCOUNT_ID)) { + cmp = +1; + } else { cmp = modest_text_utils_utf8_strcmp (name1, name2, TRUE); + } } } else { - GtkTreeIter parent; - gboolean has_parent; 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; @@ -1232,17 +1335,25 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, 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))); + cmp1 = get_cmp_subfolder_type_pos (modest_tny_folder_get_local_or_mmc_folder_type (TNY_FOLDER (folder1))); + cmp2 = get_cmp_subfolder_type_pos (modest_tny_folder_get_local_or_mmc_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); } - + +finish: if (folder1) g_object_unref(G_OBJECT(folder1)); if (folder2) @@ -1332,6 +1443,22 @@ on_progress_changed (ModestMailOperation *mail_op, g_slice_free (DndHelper, helper); } + +/* get the folder for the row the treepath refers to. */ +/* folder must be unref'd */ +static TnyFolder* +tree_path_to_folder (GtkTreeModel *model, GtkTreePath *path) +{ + GtkTreeIter iter; + TnyFolder *folder = NULL; + + if (gtk_tree_model_get_iter (model,&iter, path)) + gtk_tree_model_get (model, &iter, + TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder, + -1); + return folder; +} + /* * 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 @@ -1347,13 +1474,13 @@ drag_and_drop_from_header_view (GtkTreeModel *source_model, TnyHeader *header = NULL; TnyFolder *folder = NULL; ModestMailOperation *mail_op = NULL; - GtkTreeIter source_iter, dest_iter; + GtkTreeIter source_iter; g_return_if_fail (GTK_IS_TREE_MODEL(source_model)); g_return_if_fail (GTK_IS_TREE_MODEL(dest_model)); g_return_if_fail (dest_row); g_return_if_fail (helper); - + /* Get header */ gtk_tree_model_get_iter (source_model, &source_iter, helper->source_row); gtk_tree_model_get (source_model, &source_iter, @@ -1365,18 +1492,22 @@ drag_and_drop_from_header_view (GtkTreeModel *source_model, } /* 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); - + folder = tree_path_to_folder (dest_model, dest_row); if (!TNY_IS_FOLDER(folder)) { g_warning ("BUG: %s could not get a valid folder", __FUNCTION__); goto cleanup; } + if (modest_tny_folder_get_rules(folder) & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE) { + g_debug ("folder rules: cannot write to that folder"); + goto cleanup; + } + /* Transfer message */ - mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, NULL); + 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 (), mail_op); g_signal_connect (G_OBJECT (mail_op), "progress-changed", @@ -1418,13 +1549,35 @@ drag_and_drop_from_folder_view (GtkTreeModel *source_model, GtkTreeIter parent_iter, iter; TnyFolderStore *parent_folder = NULL; TnyFolder *folder = NULL; + gboolean forbidden = TRUE; + + /* check the folder rules for the destination */ + folder = tree_path_to_folder (dest_model, dest_row); + if (folder) { + ModestTnyFolderRules rules = + modest_tny_folder_get_rules (folder); + forbidden = rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE; + if (forbidden) + g_debug ("folder rules: cannot write to that folder"); + g_object_unref (folder); + } + + if (!forbidden) { + /* check the folder rules for the source */ + folder = tree_path_to_folder (source_model, helper->source_row); + if (folder) { + ModestTnyFolderRules rules = + modest_tny_folder_get_rules (folder); + forbidden = rules & MODEST_FOLDER_RULES_FOLDER_NON_MOVEABLE; + if (forbidden) + g_debug ("folder rules: cannot move that folder"); + g_object_unref (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)) { */ - if (!gtk_tree_path_compare (helper->source_row, dest_row)) { + if (forbidden || !gtk_tree_path_compare (helper->source_row, dest_row)) { gtk_drag_finish (helper->context, FALSE, FALSE, helper->time); gtk_tree_path_free (helper->source_row); @@ -1461,12 +1614,13 @@ drag_and_drop_from_folder_view (GtkTreeModel *source_model, helper->delete_source, NULL, NULL); + + g_object_unref (G_OBJECT (mail_op)); } /* Frees */ g_object_unref (G_OBJECT (parent_folder)); g_object_unref (G_OBJECT (folder)); - g_object_unref (G_OBJECT (mail_op)); } /* @@ -1812,17 +1966,20 @@ on_key_pressed (GtkWidget *self, static void on_configuration_key_changed (ModestConf* conf, const gchar *key, - ModestConfEvent event, + ModestConfEvent event, + ModestConfNotificationId id, ModestFolderView *self) { ModestFolderViewPrivate *priv; - if (!key) - return; g_return_if_fail (MODEST_IS_FOLDER_VIEW (self)); priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self); + /* Do not listen for changes in other namespaces */ + if (priv->notification_id != id) + return; + if (!strcmp (key, MODEST_CONF_DEVICE_NAME)) { g_free (priv->local_account_name); @@ -1841,7 +1998,7 @@ on_configuration_key_changed (ModestConf* conf, } } -void +void modest_folder_view_set_style (ModestFolderView *self, ModestFolderViewStyle style) { @@ -1902,33 +2059,15 @@ find_inbox_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *inbox_iter do { GtkTreeIter child; TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN; - gchar *name = NULL; gtk_tree_model_get (model, iter, - TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &name, TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type, -1); - - /* - printf ("DEBUG: %s: name=%s, type=%d, TNY_FOLDER_TYPE_INBOX=%d\n", - __FUNCTION__, name, type, TNY_FOLDER_TYPE_INBOX); - */ gboolean result = FALSE; if (type == TNY_FOLDER_TYPE_INBOX) { result = TRUE; - } else if (type == TNY_FOLDER_TYPE_NORMAL) { - /* tinymail's camel implementation only provides TNY_FOLDER_TYPE_NORMAL - * when getting folders from the cache, before connectin, so we do - * an extra check. We could fix this in tinymail, but it's easier - * to do here. - */ - if (strcmp (name, "Inbox") == 0) - result = TRUE; - } - - g_free (name); - + } if (result) { *inbox_iter = *iter; return TRUE; @@ -1944,16 +2083,16 @@ find_inbox_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *inbox_iter return FALSE; } + + + void modest_folder_view_select_first_inbox_or_local (ModestFolderView *self) { GtkTreeModel *model; GtkTreeIter iter, inbox_iter; GtkTreeSelection *sel; - -/* /\* Do not set it if the folder view was not painted *\/ */ -/* if (!GTK_WIDGET_MAPPED (self)) */ -/* return; */ + GtkTreePath *path = NULL; model = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); if (!model) @@ -1963,15 +2102,138 @@ 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); - if (find_inbox_iter (model, &iter, &inbox_iter)) { - gtk_tree_selection_select_iter (sel, &inbox_iter); + + if (find_inbox_iter (model, &iter, &inbox_iter)) + path = gtk_tree_model_get_path (model, &inbox_iter); + else + path = gtk_tree_path_new_first (); + + /* Select the row and free */ + gtk_tree_view_set_cursor (GTK_TREE_VIEW (self), path, NULL, FALSE); + gtk_tree_path_free (path); +} + + +/* 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; + + priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self); + + if (priv->folder_to_select) { + + if (!modest_folder_view_select_folder (self, priv->folder_to_select, + FALSE)) { + GtkTreePath *path; + path = gtk_tree_model_get_path (tree_model, iter); + gtk_tree_view_expand_to_path (GTK_TREE_VIEW(self), path); + + sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self)); + + gtk_tree_selection_select_iter (sel, iter); + gtk_tree_view_set_cursor (GTK_TREE_VIEW(self), path, NULL, FALSE); + + gtk_tree_path_free (path); + + } + g_object_unref (priv->folder_to_select); + priv->folder_to_select = NULL; } - else { - gtk_tree_model_get_iter_first (model, &iter); - gtk_tree_selection_select_iter (sel, &iter); +} + + +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) { + + sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self)); + gtk_tree_selection_unselect_all (sel); + + 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; + + + gtk_tree_model_get_iter_first (model, &iter); + if (find_folder_iter (model, &iter, &folder_iter, folder)) { + GtkTreePath *path; + + path = gtk_tree_model_get_path (model, &folder_iter); + gtk_tree_view_expand_to_path (GTK_TREE_VIEW(self), path); + + sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self)); + gtk_tree_selection_select_iter (sel, &folder_iter); + gtk_tree_view_set_cursor (GTK_TREE_VIEW(self), path, NULL, FALSE); + + gtk_tree_path_free (path); + return TRUE; + } + return FALSE; } + void modest_folder_view_copy_selection (ModestFolderView *folder_view) { @@ -2011,6 +2273,16 @@ modest_folder_view_cut_selection (ModestFolderView *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, @@ -2054,3 +2326,5 @@ _clear_hidding_filter (ModestFolderView *folder_view) g_free(priv->hidding_ids); } } + +