X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-folder-view.c;h=81201edd9d9db555c3788ab539dba160e336baff;hp=d4a0001c0810eac0c499bf9088a3da51a60f2380;hb=92714909f98f61fbb69feb32e02f50afc4594561;hpb=e01895c431716d2cf2ed33bc9799f96ed63d87f9 diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c index d4a0001..81201ed 100644 --- a/src/widgets/modest-folder-view.c +++ b/src/widgets/modest-folder-view.c @@ -41,6 +41,7 @@ #include #include #include +#include #include #include #include @@ -51,10 +52,18 @@ #include #include #include "modest-folder-view.h" -#include #include #include #include +#include "modest-dnd.h" +#include "widgets/modest-window.h" + +/* Folder view drag types */ +const GtkTargetEntry folder_view_drag_types[] = +{ + { "GTK_TREE_MODEL_ROW", GTK_TARGET_SAME_WIDGET, MODEST_FOLDER_ROW }, + { GTK_TREE_PATH_AS_STRING_LIST, GTK_TARGET_SAME_APP, MODEST_HEADER_ROW } +}; /* 'private'/'protected' functions */ static void modest_folder_view_class_init (ModestFolderViewClass *klass); @@ -124,7 +133,7 @@ static gboolean on_drag_motion (GtkWidget *widget, guint time, gpointer user_data); -static void expand_root_items (ModestFolderView *self); +static void expand_root_items (ModestFolderView *self); static gint expand_row_timeout (gpointer data); @@ -140,6 +149,10 @@ static void on_row_inserted_maybe_select_folder (GtkTreeModel *tree_ GtkTreeIter *iter, ModestFolderView *self); +static void on_display_name_changed (ModestAccountMgr *self, + const gchar *account, + gpointer user_data); + enum { FOLDER_SELECTION_CHANGED_SIGNAL, FOLDER_DISPLAY_NAME_CHANGED_SIGNAL, @@ -153,13 +166,12 @@ struct _ModestFolderViewPrivate { TnyFolder *folder_to_select; /* folder to select after the next update */ - ModestConfNotificationId notification_id; - gulong changed_signal; gulong account_inserted_signal; gulong account_removed_signal; gulong account_changed_signal; gulong conf_key_signal; + gulong display_name_changed_signal; /* not unref this object, its a singlenton */ ModestEmailClipboard *clipboard; @@ -177,6 +189,7 @@ struct _ModestFolderViewPrivate { gboolean reselect; /* we use this to force a reselection of the INBOX */ gboolean show_non_move; + gboolean reexpand; /* next time we expose, we'll expand all root folders */ }; #define MODEST_FOLDER_VIEW_GET_PRIVATE(o) \ (G_TYPE_INSTANCE_GET_PRIVATE((o), \ @@ -346,24 +359,24 @@ on_get_mmc_account_name (TnyStoreAccount* account, gpointer user_data) } static void -text_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, - GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data) +text_cell_data (GtkTreeViewColumn *column, + GtkCellRenderer *renderer, + GtkTreeModel *tree_model, + GtkTreeIter *iter, + gpointer data) { ModestFolderViewPrivate *priv; GObject *rendobj; gchar *fname = NULL; - gint unread = 0; - gint all = 0; TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN; GObject *instance = NULL; - + g_return_if_fail (column); g_return_if_fail (tree_model); + g_return_if_fail (iter != NULL); gtk_tree_model_get (tree_model, iter, TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &fname, - TNY_GTK_FOLDER_STORE_TREE_MODEL_ALL_COLUMN, &all, - 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, &instance, -1); @@ -391,16 +404,21 @@ text_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, 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)); + fname = g_strdup (modest_local_folder_info_get_type_display_name (type)); } } - /* Select the number to show: the unread or unsent messages */ - if ((type == TNY_FOLDER_TYPE_DRAFTS) || (type == TNY_FOLDER_TYPE_OUTBOX)) - number = all; + /* note: we cannot reliably get the counts from the tree model, we need + * to use explicit calls on tny_folder for some reason. + */ + /* Select the number to show: the unread or unsent messages. in case of outbox/drafts, show all */ + if ((type == TNY_FOLDER_TYPE_DRAFTS) || + (type == TNY_FOLDER_TYPE_OUTBOX) || + (type == TNY_FOLDER_TYPE_MERGE)) /* _OUTBOX actually returns _MERGE... */ + number = tny_folder_get_all_count (TNY_FOLDER(instance)); else - number = unread; - + number = tny_folder_get_unread_count (TNY_FOLDER(instance)); + /* Use bold font style if there are unread or unset messages */ if (number > 0) { item_name = g_strdup_printf ("%s (%d)", fname, number); @@ -412,12 +430,10 @@ text_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, } else if (TNY_IS_ACCOUNT (instance)) { /* If it's a server account */ - if (modest_tny_account_is_virtual_local_folders ( - TNY_ACCOUNT (instance))) { + if (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (instance))) { item_name = g_strdup (priv->local_account_name); item_weight = 800; - } else if (modest_tny_account_is_memory_card_account ( - TNY_ACCOUNT (instance))) { + } 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 @@ -463,7 +479,7 @@ text_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, 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); + on_get_mmc_account_name, callback_data); } g_object_unref (G_OBJECT (instance)); @@ -479,7 +495,7 @@ icon_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN; const gchar *account_id = NULL; gboolean has_children; - + rendobj = G_OBJECT(renderer); gtk_tree_model_get (tree_model, iter, TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type, @@ -495,10 +511,14 @@ icon_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, 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)); + type = modest_tny_folder_guess_folder_type (TNY_FOLDER (instance)); } switch (type) { + case TNY_FOLDER_TYPE_INVALID: + g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__); + break; + case TNY_FOLDER_TYPE_ROOT: if (TNY_IS_ACCOUNT (instance)) { @@ -599,7 +619,9 @@ add_columns (GtkWidget *treeview) icon_cell_data, treeview, NULL); renderer = gtk_cell_renderer_text_new(); - gtk_tree_view_column_pack_start (column, renderer, FALSE); + g_object_set (renderer, "ellipsize", PANGO_ELLIPSIZE_END, + "ellipsize-set", TRUE, NULL); + gtk_tree_view_column_pack_start (column, renderer, TRUE); gtk_tree_view_column_set_cell_data_func(column, renderer, text_cell_data, treeview, NULL); @@ -634,6 +656,8 @@ modest_folder_view_init (ModestFolderView *obj) priv->visible_account_id = NULL; priv->folder_to_select = NULL; + priv->reexpand = TRUE; + /* Initialize the local account name */ conf = modest_runtime_get_conf(); priv->local_account_name = modest_conf_get_string (conf, MODEST_CONF_DEVICE_NAME, NULL); @@ -656,12 +680,16 @@ modest_folder_view_init (ModestFolderView *obj) "key-press-event", G_CALLBACK (on_key_pressed), NULL); + priv->display_name_changed_signal = + g_signal_connect (modest_runtime_get_account_mgr (), + "display_name_changed", + G_CALLBACK (on_display_name_changed), + obj); + /* * Track changes in the local account name (in the device it * will be the device name) */ - 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), @@ -688,12 +716,6 @@ 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; @@ -715,6 +737,7 @@ modest_folder_view_finalize (GObject *obj) priv->query = NULL; } +/* modest_folder_view_disable_next_folder_selection (MODEST_FOLDER_VIEW(obj)); */ if (priv->folder_to_select) { g_object_unref (G_OBJECT(priv->folder_to_select)); priv->folder_to_select = NULL; @@ -798,6 +821,22 @@ modest_folder_view_set_account_store (TnyAccountStoreView *self, TnyAccountStore } static void +on_connection_status_changed (TnyAccount *self, + TnyConnectionStatus status, + gpointer user_data) +{ + /* If the account becomes online then refresh it */ + if (status == TNY_CONNECTION_STATUS_CONNECTED) { + const gchar *acc_name; + GtkWidget *my_window; + + my_window = gtk_widget_get_ancestor (GTK_WIDGET (user_data), MODEST_TYPE_WINDOW); + acc_name = modest_tny_account_get_parent_modest_account_name_for_server_account (self); + modest_ui_actions_do_send_receive (acc_name, MODEST_WINDOW (my_window)); + } +} + +static void on_account_inserted (TnyAccountStore *account_store, TnyAccount *account, gpointer user_data) @@ -827,14 +866,48 @@ on_account_inserted (TnyAccountStore *account_store, /* 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)); + + + /* When the store account gets online refresh it */ + g_signal_connect (account, "connection_status_changed", + G_CALLBACK (on_connection_status_changed), + MODEST_FOLDER_VIEW (user_data)); + + /* Refilter the model */ + gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model)); } static void -on_account_changed (TnyAccountStore *account_store, TnyAccount *tny_account, +on_account_changed (TnyAccountStore *account_store, + TnyAccount *tny_account, gpointer user_data) { /* do nothing */ + ModestFolderViewPrivate *priv; + GtkTreeModel *sort_model, *filter_model; + + /* Ignore transport account insertions, we're not showing them + in the folder view */ + if (TNY_IS_TRANSPORT_ACCOUNT (tny_account)) + return; + + priv = MODEST_FOLDER_VIEW_GET_PRIVATE (user_data); + + /* 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)); + + /* Remove the account from the model */ + tny_list_remove (TNY_LIST (gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (sort_model))), + G_OBJECT (tny_account)); + + /* 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 (tny_account)); + + /* Refilter the model */ + gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model)); } @@ -857,14 +930,38 @@ on_account_removed (TnyAccountStore *account_store, self = MODEST_FOLDER_VIEW (user_data); priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self); - /* invalidate the cur_folder_* things */ - sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self)); - gtk_tree_selection_unselect_all (sel); + /* Invalidate the cur_folder_store only if the selected folder + belongs to the account that is being removed */ + if (priv->cur_folder_store) { + TnyAccount *selected_folder_account = NULL; + + if (TNY_IS_FOLDER (priv->cur_folder_store)) { + selected_folder_account = + tny_folder_get_account (TNY_FOLDER (priv->cur_folder_store)); + } else { + selected_folder_account = + TNY_ACCOUNT (g_object_ref (priv->cur_folder_store)); + } + + if (selected_folder_account == account) { + sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self)); + gtk_tree_selection_unselect_all (sel); + } + g_object_unref (selected_folder_account); + } - /* Invalidate row to select */ + /* Invalidate row to select only if the folder to select + belongs to the account that is being removed*/ if (priv->folder_to_select) { - g_object_unref (priv->folder_to_select); - priv->folder_to_select = NULL; + TnyAccount *folder_to_select_account = NULL; + + folder_to_select_account = tny_folder_get_account (priv->folder_to_select); + if (folder_to_select_account == account) { +/* modest_folder_view_disable_next_folder_selection (self); */ + g_object_unref (priv->folder_to_select); + priv->folder_to_select = NULL; + } + g_object_unref (folder_to_select_account); } /* Remove the account from the model */ @@ -886,8 +983,21 @@ on_account_removed (TnyAccountStore *account_store, MODEST_CONF_FOLDER_VIEW_KEY); } - /* Select the INBOX */ - modest_folder_view_select_first_inbox_or_local (self); + /* Refilter the model */ + gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model)); + + /* Select the first INBOX if the currently selected folder + belongs to the account that is being deleted */ + if (priv->cur_folder_store) { + TnyAccount *folder_selected_account; + + folder_selected_account = (TNY_IS_FOLDER (priv->cur_folder_store)) ? + modest_tny_folder_get_account (TNY_FOLDER (priv->cur_folder_store)) : + TNY_ACCOUNT (g_object_ref (priv->cur_folder_store)); + if (account == folder_selected_account) + modest_folder_view_select_first_inbox_or_local (self); + g_object_unref (folder_selected_account); + } } void @@ -935,7 +1045,10 @@ modest_folder_view_on_map (ModestFolderView *self, NULL); } - expand_root_items (self); + if (priv->reexpand) { + expand_root_items (self); + priv->reexpand = FALSE; + } return FALSE; } @@ -967,11 +1080,17 @@ static void expand_root_items (ModestFolderView *self) { GtkTreePath *path; + GtkTreeModel *model; + GtkTreeIter iter; + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); path = gtk_tree_path_new_first (); /* all folders should have child items, so.. */ - while (gtk_tree_view_expand_row (GTK_TREE_VIEW(self), path, FALSE)) + do { + gtk_tree_view_expand_row (GTK_TREE_VIEW(self), path, FALSE); gtk_tree_path_next (path); + } while (gtk_tree_model_get_iter (model, &iter, path)); gtk_tree_path_free (path); } @@ -1054,10 +1173,8 @@ filter_row (GtkTreeModel *model, /* 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) - { + if (!priv->show_non_move) { + switch (type) { case TNY_FOLDER_TYPE_OUTBOX: case TNY_FOLDER_TYPE_SENT: case TNY_FOLDER_TYPE_DRAFTS: @@ -1066,15 +1183,17 @@ filter_row (GtkTreeModel *model, 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) - { + if (type == TNY_FOLDER_TYPE_INVALID) + g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__); + + if (type == TNY_FOLDER_TYPE_OUTBOX || + type == TNY_FOLDER_TYPE_SENT + || type == TNY_FOLDER_TYPE_DRAFTS) retval = FALSE; - } break; default: - break; - } + break; + } } /* Free */ @@ -1089,9 +1208,8 @@ modest_folder_view_update_model (ModestFolderView *self, TnyAccountStore *account_store) { ModestFolderViewPrivate *priv; - GtkTreeModel *model /* , *old_model */; - /* TnyAccount *local_account; */ - TnyList *model_as_list; + GtkTreeModel *model /* , *old_model */; + GtkTreeModel *filter_model = NULL, *sortable = NULL; g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (self), FALSE); g_return_val_if_fail (account_store, FALSE); @@ -1108,22 +1226,13 @@ 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); */ + selects only the subscribed folders */ 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: */ - model_as_list = TNY_LIST(model); /* Get the accounts: */ tny_account_store_get_accounts (TNY_ACCOUNT_STORE(account_store), - model_as_list, + TNY_LIST (model), TNY_ACCOUNT_STORE_STORE_ACCOUNTS); - g_object_unref (model_as_list); - model_as_list = NULL; - - GtkTreeModel *filter_model = NULL, *sortable = NULL; sortable = gtk_tree_model_sort_new_with_model (model); gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable), @@ -1173,8 +1282,6 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data) priv = MODEST_FOLDER_VIEW_GET_PRIVATE(user_data); selected = gtk_tree_selection_get_selected (sel, &model, &iter); -/* if(!gtk_tree_selection_get_selected (sel, &model, &iter)) */ -/* return; */ /* Notify the display name observers */ g_signal_emit (G_OBJECT(user_data), @@ -1189,7 +1296,7 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data) -1); /* If the folder is the same do not notify */ - if (priv->cur_folder_store == folder && folder) { + if (folder && priv->cur_folder_store == folder) { g_object_unref (folder); return; } @@ -1371,12 +1478,14 @@ 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_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))); + 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))); @@ -1404,7 +1513,6 @@ finish: /*****************************************************************************/ /* 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 @@ -1424,14 +1532,15 @@ on_drag_data_get (GtkWidget *widget, GtkTreePath *source_row; selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget)); - gtk_tree_selection_get_selected (selection, &model, &iter); - source_row = gtk_tree_model_get_path (model, &iter); - - gtk_tree_set_row_drag_data (selection_data, - model, - source_row); + if (gtk_tree_selection_get_selected (selection, &model, &iter)) { - gtk_tree_path_free (source_row); + source_row = gtk_tree_model_get_path (model, &iter); + gtk_tree_set_row_drag_data (selection_data, + model, + source_row); + + gtk_tree_path_free (source_row); + } } typedef struct _DndHelper { @@ -1452,19 +1561,16 @@ typedef struct _DndHelper { * and drop action */ static void -on_progress_changed (ModestMailOperation *mail_op, - ModestMailOperationState *state, - gpointer user_data) +xfer_cb (ModestMailOperation *mail_op, + gpointer user_data) { gboolean success; DndHelper *helper; helper = (DndHelper *) user_data; - if (!state->finished) - return; - - if (state->status == MODEST_MAIL_OPERATION_STATUS_SUCCESS) { + if (modest_mail_operation_get_status (mail_op) == + MODEST_MAIL_OPERATION_STATUS_SUCCESS) { success = TRUE; } else { success = FALSE; @@ -1479,14 +1585,13 @@ 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* +static TnyFolderStore * tree_path_to_folder (GtkTreeModel *model, GtkTreePath *path) { GtkTreeIter iter; - TnyFolder *folder = NULL; + TnyFolderStore *folder = NULL; if (gtk_tree_model_get_iter (model,&iter, path)) gtk_tree_model_get (model, &iter, @@ -1495,18 +1600,6 @@ tree_path_to_folder (GtkTreeModel *model, GtkTreePath *path) return folder; } -static void -show_banner_move_target_error () -{ - ModestWindow *main_window; - - main_window = modest_window_mgr_get_main_window( - modest_runtime_get_window_mgr()); - - modest_platform_information_banner(GTK_WIDGET(main_window), - NULL, _("mail_in_ui_folder_move_target_error")); -} - /* * 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 @@ -1516,79 +1609,99 @@ static void drag_and_drop_from_header_view (GtkTreeModel *source_model, GtkTreeModel *dest_model, GtkTreePath *dest_row, + GtkSelectionData *selection_data, DndHelper *helper) { TnyList *headers = NULL; - TnyHeader *header = NULL; TnyFolder *folder = NULL; + TnyFolderType folder_type; ModestMailOperation *mail_op = NULL; - GtkTreeIter source_iter; - ModestWindowMgr *mgr = NULL; /*no need for unref*/ - ModestWindow *main_win = NULL; /*no need for unref*/ - - 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, - TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, - &header, -1); - if (!TNY_IS_HEADER(header)) { - g_warning ("BUG: %s could not get a valid header", __FUNCTION__); - goto cleanup; - } - - /* Check if the selected message is in msg-view. If it is than - * do not enable drag&drop on that. */ + GtkTreeIter source_iter, dest_iter; + ModestWindowMgr *mgr = NULL; + ModestWindow *main_win = NULL; + gchar **uris, **tmp; + gint response; + + /* Build the list of headers */ mgr = modest_runtime_get_window_mgr (); - if (modest_window_mgr_find_registered_header(mgr, header, NULL)) - goto cleanup; + headers = tny_simple_list_new (); + uris = modest_dnd_selection_data_get_paths (selection_data); + tmp = uris; - /* Get Folder */ - 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__); - show_banner_move_target_error(); - goto cleanup; + while (*tmp != NULL) { + TnyHeader *header; + GtkTreePath *path; + + /* Get header */ + path = gtk_tree_path_new_from_string (*tmp); + gtk_tree_model_get_iter (source_model, &source_iter, path); + gtk_tree_model_get (source_model, &source_iter, + TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, + &header, -1); + + /* Do not enable d&d of headers already opened */ + if (!modest_window_mgr_find_registered_header(mgr, header, NULL)) + tny_list_append (headers, G_OBJECT (header)); + + /* Free and go on */ + gtk_tree_path_free (path); + g_object_unref (header); + tmp++; } - if (modest_tny_folder_get_rules(folder) & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE) { - g_debug ("folder rules: cannot write to that folder"); + g_strfreev (uris); + + /* Get the target 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); + + if (!folder || !TNY_IS_FOLDER(folder)) { +/* g_warning ("%s: not a valid target folder (%p)", __FUNCTION__, folder); */ goto cleanup; } - headers = tny_simple_list_new (); - tny_list_append (headers, G_OBJECT (header)); + folder_type = modest_tny_folder_guess_folder_type (folder); + if (folder_type == TNY_FOLDER_TYPE_INVALID) { +/* g_warning ("%s: invalid target folder", __FUNCTION__); */ + goto cleanup; /* cannot move messages there */ + } + + if (modest_tny_folder_get_rules((TNY_FOLDER(folder))) & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE) { +/* g_warning ("folder not writable"); */ + goto cleanup; /* verboten! */ + } + + /* Ask for confirmation to move */ + main_win = modest_window_mgr_get_main_window (mgr, FALSE); /* don't create */ + if (!main_win) { + g_warning ("%s: BUG: no main window found", __FUNCTION__); + goto cleanup; + } - main_win = modest_window_mgr_get_main_window(mgr); - if(msgs_move_to_confirmation(GTK_WINDOW(main_win), folder, TRUE, headers) - == GTK_RESPONSE_CANCEL) + response = modest_ui_actions_msgs_move_to_confirmation (main_win, folder, + TRUE, headers); + if (response == GTK_RESPONSE_CANCEL) goto cleanup; - /* Transfer message */ - mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, - NULL, + /* Transfer messages */ + mail_op = modest_mail_operation_new_with_error_handling ((GObject *) main_win, modest_ui_actions_move_folder_error_handler, - NULL); + NULL, NULL); + 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_msgs (mail_op, + modest_mail_operation_xfer_msgs (mail_op, headers, folder, helper->delete_source, - NULL, NULL); + xfer_cb, helper); /* Frees */ cleanup: if (G_IS_OBJECT(mail_op)) g_object_unref (G_OBJECT (mail_op)); - if (G_IS_OBJECT(header)) - g_object_unref (G_OBJECT (header)); if (G_IS_OBJECT(folder)) g_object_unref (G_OBJECT (folder)); if (G_IS_OBJECT(headers)) @@ -1610,20 +1723,24 @@ drag_and_drop_from_folder_view (GtkTreeModel *source_model, ModestMailOperation *mail_op = NULL; GtkTreeIter dest_iter, iter; TnyFolderStore *dest_folder = NULL; - TnyFolder *folder = NULL; + TnyFolderStore *folder = NULL; gboolean forbidden = FALSE; + ModestWindow *win; + win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(), FALSE); /* don't create */ + if (!win) { + g_warning ("%s: BUG: no main window", __FUNCTION__); + return; + } + if (!forbidden) { /* check the folder rules for the destination */ folder = tree_path_to_folder (dest_model, dest_row); if (TNY_IS_FOLDER(folder)) { ModestTnyFolderRules rules = - modest_tny_folder_get_rules (folder); + modest_tny_folder_get_rules (TNY_FOLDER (folder)); forbidden = rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE; - - if (forbidden) - g_debug ("folder rules: cannot write to that folder"); - } else if (TNY_IS_FOLDER_STORE(folder)){ + } else if (TNY_IS_FOLDER_STORE(folder)) { /* enable local root as destination for folders */ if (!MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (folder) && TNY_IS_ACCOUNT (folder)) @@ -1636,10 +1753,8 @@ drag_and_drop_from_folder_view (GtkTreeModel *source_model, folder = tree_path_to_folder (source_model, helper->source_row); if (TNY_IS_FOLDER(folder)) { ModestTnyFolderRules rules = - modest_tny_folder_get_rules (folder); + modest_tny_folder_get_rules (TNY_FOLDER (folder)); forbidden = rules & MODEST_FOLDER_RULES_FOLDER_NON_MOVEABLE; - if (forbidden) - g_debug ("folder rules: cannot move that folder"); } else forbidden = TRUE; g_object_unref (folder); @@ -1665,33 +1780,25 @@ drag_and_drop_from_folder_view (GtkTreeModel *source_model, &folder, -1); /* Offer the connection dialog if necessary, for the destination parent folder and source folder: */ - if (modest_platform_connect_and_wait_if_network_folderstore ( - NULL, dest_folder) && - modest_platform_connect_and_wait_if_network_folderstore ( - NULL, TNY_FOLDER_STORE (folder))) { + if (modest_platform_connect_and_wait_if_network_folderstore (NULL, dest_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 (), - mail_op); - g_signal_connect ( - G_OBJECT (mail_op), - "progress-changed", - G_CALLBACK (on_progress_changed), - helper); + mail_op = modest_mail_operation_new_with_error_handling ((GObject *) win, + modest_ui_actions_move_folder_error_handler, + folder, NULL); + + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), + mail_op); modest_mail_operation_xfer_folder (mail_op, - folder, - dest_folder, - helper->delete_source, - NULL, - NULL); + TNY_FOLDER (folder), + dest_folder, + helper->delete_source, + xfer_cb, + helper); - g_object_unref (G_OBJECT (mail_op)); + g_object_unref (G_OBJECT (mail_op)); } /* Frees */ @@ -1737,16 +1844,8 @@ on_drag_data_received (GtkWidget *widget, the operation, because the operation won't start if the folder is in use */ 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, FALSE); + GtkTreeSelection *sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget)); + gtk_tree_selection_unselect_all (sel); } } @@ -1754,17 +1853,8 @@ on_drag_data_received (GtkWidget *widget, if (selection_data == NULL || selection_data->length < 0) gtk_drag_finish (context, success, FALSE, time); - /* Get the models */ - gtk_tree_get_row_drag_data (selection_data, - &source_model, - &source_row); - /* Select the destination model */ - if (source_widget == widget) { - dest_model = source_model; - } else { - dest_model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget)); - } + dest_model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget)); /* Get the path to the destination row. Can not call gtk_tree_view_get_drag_dest_row() because the source row @@ -1773,35 +1863,43 @@ on_drag_data_received (GtkWidget *widget, &dest_row, &pos); /* Only allow drops IN other rows */ - if (!dest_row || pos == GTK_TREE_VIEW_DROP_BEFORE || pos == GTK_TREE_VIEW_DROP_AFTER) + 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; /* Drags from the header view */ if (source_widget != widget) { + source_model = gtk_tree_view_get_model (GTK_TREE_VIEW (source_widget)); drag_and_drop_from_header_view (source_model, dest_model, dest_row, + selection_data, helper); } else { - + /* Get the source model and row */ + gtk_tree_get_row_drag_data (selection_data, + &source_model, + &source_row); + helper->source_row = gtk_tree_path_copy (source_row); drag_and_drop_from_folder_view (source_model, dest_model, dest_row, selection_data, helper); + + gtk_tree_path_free (source_row); } /* Frees */ - gtk_tree_path_free (source_row); gtk_tree_path_free (dest_row); } @@ -1889,9 +1987,11 @@ on_drag_motion (GtkWidget *widget, { GtkTreeViewDropPosition pos; GtkTreePath *dest_row; + GtkTreeModel *dest_model; ModestFolderViewPrivate *priv; GdkDragAction suggested_action; gboolean valid_location = FALSE; + TnyFolderStore *folder; priv = MODEST_FOLDER_VIEW_GET_PRIVATE (widget); @@ -1917,6 +2017,19 @@ on_drag_motion (GtkWidget *widget, valid_location = TRUE; } + /* Check that the destination folder is writable */ + dest_model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget)); + folder = tree_path_to_folder (dest_model, dest_row); + if (folder && TNY_IS_FOLDER (folder)) { + ModestTnyFolderRules rules = modest_tny_folder_get_rules(TNY_FOLDER (folder)); + + if (rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE) { + valid_location = FALSE; + goto out; + } + } + g_object_unref (folder); + /* 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); @@ -1939,17 +2052,10 @@ on_drag_motion (GtkWidget *widget, if (dest_row) gtk_tree_path_free (dest_row); 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. @@ -2052,10 +2158,6 @@ on_configuration_key_changed (ModestConf* conf, 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); @@ -2066,10 +2168,14 @@ on_configuration_key_changed (ModestConf* conf, MODEST_CONF_DEVICE_NAME, NULL); /* Force a redraw */ -#if GTK_CHECK_VERSION(2, 8, 0) /* gtk_tree_view_column_queue_resize is only available in GTK+ 2.8 */ - GtkTreeViewColumn * tree_column = gtk_tree_view_get_column (GTK_TREE_VIEW (self), - TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN); +#if GTK_CHECK_VERSION(2, 8, 0) + GtkTreeViewColumn * tree_column; + + tree_column = gtk_tree_view_get_column (GTK_TREE_VIEW (self), + TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN); gtk_tree_view_column_queue_resize (tree_column); +#else + gtk_widget_queue_draw (GTK_WIDGET (self)); #endif } } @@ -2177,7 +2283,10 @@ modest_folder_view_select_first_inbox_or_local (ModestFolderView *self) expand_root_items (self); sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self)); - gtk_tree_model_get_iter_first (model, &iter); + if (!gtk_tree_model_get_iter_first (model, &iter)) { + g_warning ("%s: model is empty", __FUNCTION__); + return; + } if (find_inbox_iter (model, &iter, &inbox_iter)) path = gtk_tree_model_get_path (model, &inbox_iter); @@ -2186,6 +2295,7 @@ modest_folder_view_select_first_inbox_or_local (ModestFolderView *self) /* Select the row and free */ gtk_tree_view_set_cursor (GTK_TREE_VIEW (self), path, NULL, FALSE); + gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (self), path, NULL, FALSE, 0.0, 0.0); gtk_tree_path_free (path); /* set focus */ @@ -2235,11 +2345,25 @@ on_row_inserted_maybe_select_folder (GtkTreeModel *tree_model, GtkTreePath *pat { ModestFolderViewPrivate *priv = NULL; GtkTreeSelection *sel; + TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN; + GObject *instance = NULL; if (!MODEST_IS_FOLDER_VIEW(self)) return; priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self); + + priv->reexpand = TRUE; + + gtk_tree_model_get (tree_model, iter, + TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type, + TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &instance, + -1); + if (type == TNY_FOLDER_TYPE_INBOX && priv->folder_to_select == NULL) { + priv->folder_to_select = g_object_ref (instance); + } + g_object_unref (instance); + if (priv->folder_to_select) { @@ -2257,12 +2381,29 @@ on_row_inserted_maybe_select_folder (GtkTreeModel *tree_model, GtkTreePath *pat gtk_tree_path_free (path); } - g_object_unref (priv->folder_to_select); - priv->folder_to_select = NULL; + + /* Disable next */ + modest_folder_view_disable_next_folder_selection (self); +/* g_object_unref (priv->folder_to_select); */ +/* priv->folder_to_select = NULL; */ } } +void +modest_folder_view_disable_next_folder_selection (ModestFolderView *self) +{ + ModestFolderViewPrivate *priv = NULL; + + g_return_if_fail (MODEST_IS_FOLDER_VIEW (self)); + priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self); + + if (priv->folder_to_select) + 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) @@ -2292,8 +2433,11 @@ modest_folder_view_select_folder (ModestFolderView *self, TnyFolder *folder, if (!model) return FALSE; - - gtk_tree_model_get_iter_first (model, &iter); + if (!gtk_tree_model_get_iter_first (model, &iter)) { + g_warning ("%s: model is empty", __FUNCTION__); + return FALSE; + } + if (find_folder_iter (model, &iter, &folder_iter, folder)) { GtkTreePath *path; @@ -2373,6 +2517,8 @@ modest_folder_view_copy_model (ModestFolderView *folder_view_src, NULL); /* Set copied model */ gtk_tree_view_set_model (GTK_TREE_VIEW (folder_view_dst), new_filter_model); + g_signal_connect (G_OBJECT(new_filter_model), "row-inserted", + (GCallback) on_row_inserted_maybe_select_folder, folder_view_dst); /* Free */ g_object_unref (new_filter_model); @@ -2440,3 +2586,23 @@ _clear_hidding_filter (ModestFolderView *folder_view) } +static void +on_display_name_changed (ModestAccountMgr *mgr, + const gchar *account, + gpointer user_data) +{ + ModestFolderView *self; + + self = MODEST_FOLDER_VIEW (user_data); + + /* Force a redraw */ +#if GTK_CHECK_VERSION(2, 8, 0) + GtkTreeViewColumn * tree_column; + + tree_column = gtk_tree_view_get_column (GTK_TREE_VIEW (self), + TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN); + gtk_tree_view_column_queue_resize (tree_column); +#else + gtk_widget_queue_draw (GTK_WIDGET (self)); +#endif +}