X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-folder-view.c;h=c65a7a9bb51358d760f38764c38b10c018cb93fe;hp=d5e9e94e108cbba94f21f40898a08fe145828955;hb=3678825a6d664c48b705f3de78da181ec5d8f9c9;hpb=892344e8bd0a0f65e36171319d46a82678ab9b16 diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c index d5e9e94..c65a7a9 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 @@ -48,41 +49,56 @@ #include #include #include +#include #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); static void modest_folder_view_init (ModestFolderView *obj); static void modest_folder_view_finalize (GObject *obj); -static void tny_account_store_view_init (gpointer g, +static void tny_account_store_view_init (gpointer g, gpointer iface_data); -static void modest_folder_view_set_account_store (TnyAccountStoreView *self, +static void modest_folder_view_set_account_store (TnyAccountStoreView *self, TnyAccountStore *account_store); -static void on_selection_changed (GtkTreeSelection *sel, gpointer data); +static void on_selection_changed (GtkTreeSelection *sel, + gpointer data); + +static void on_row_activated (GtkTreeView *treeview, + GtkTreePath *path, + GtkTreeViewColumn *column, + gpointer userdata); -static void on_account_removed (TnyAccountStore *self, +static void on_account_removed (TnyAccountStore *self, TnyAccount *account, gpointer user_data); -static void on_account_inserted (TnyAccountStore *self, +static void on_account_inserted (TnyAccountStore *self, TnyAccount *account, gpointer user_data); -static void on_account_changed (TnyAccountStore *self, +static void on_account_changed (TnyAccountStore *self, TnyAccount *account, gpointer user_data); -static gint cmp_rows (GtkTreeModel *tree_model, - GtkTreeIter *iter1, +static gint cmp_rows (GtkTreeModel *tree_model, + GtkTreeIter *iter1, GtkTreeIter *iter2, gpointer user_data); @@ -94,27 +110,27 @@ static gboolean on_key_pressed (GtkWidget *self, GdkEventKey *event, gpointer user_data); -static void on_configuration_key_changed (ModestConf* conf, - const gchar *key, +static void on_configuration_key_changed (ModestConf* conf, + const gchar *key, ModestConfEvent event, - ModestConfNotificationId notification_id, + ModestConfNotificationId notification_id, ModestFolderView *self); /* DnD functions */ -static void on_drag_data_get (GtkWidget *widget, - GdkDragContext *context, - GtkSelectionData *selection_data, - guint info, - guint time, +static void on_drag_data_get (GtkWidget *widget, + GdkDragContext *context, + GtkSelectionData *selection_data, + guint info, + guint time, gpointer data); -static void on_drag_data_received (GtkWidget *widget, - GdkDragContext *context, - gint x, - gint y, - GtkSelectionData *selection_data, - guint info, - guint time, +static void on_drag_data_received (GtkWidget *widget, + GdkDragContext *context, + gint x, + gint y, + GtkSelectionData *selection_data, + guint info, + guint time, gpointer data); static gboolean on_drag_motion (GtkWidget *widget, @@ -124,25 +140,30 @@ 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); static void setup_drag_and_drop (GtkTreeView *self); -static gboolean _clipboard_set_selected_data (ModestFolderView *folder_view, +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, +static void on_row_inserted_maybe_select_folder (GtkTreeModel *tree_model, + GtkTreePath *path, 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, + FOLDER_ACTIVATED_SIGNAL, LAST_SIGNAL }; @@ -153,14 +174,13 @@ 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; @@ -174,9 +194,11 @@ struct _ModestFolderViewPrivate { gchar *local_account_name; gchar *visible_account_id; ModestFolderViewStyle style; + ModestFolderViewCellStyle cell_style; 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), \ @@ -185,7 +207,7 @@ struct _ModestFolderViewPrivate { /* globals */ static GObjectClass *parent_class = NULL; -static guint signals[LAST_SIGNAL] = {0}; +static guint signals[LAST_SIGNAL] = {0}; GType modest_folder_view_get_type (void) @@ -211,13 +233,13 @@ modest_folder_view_get_type (void) NULL /* interface_data */ }; - + my_type = g_type_register_static (GTK_TYPE_TREE_VIEW, "ModestFolderView", &my_info, 0); - g_type_add_interface_static (my_type, - TNY_TYPE_ACCOUNT_STORE_VIEW, + g_type_add_interface_static (my_type, + TNY_TYPE_ACCOUNT_STORE_VIEW, &tny_account_store_view_info); } return my_type; @@ -227,15 +249,17 @@ static void modest_folder_view_class_init (ModestFolderViewClass *klass) { GObjectClass *gobject_class; + GtkTreeViewClass *treeview_class; gobject_class = (GObjectClass*) klass; + treeview_class = (GtkTreeViewClass*) klass; parent_class = g_type_class_peek_parent (klass); gobject_class->finalize = modest_folder_view_finalize; g_type_class_add_private (gobject_class, sizeof(ModestFolderViewPrivate)); - - signals[FOLDER_SELECTION_CHANGED_SIGNAL] = + + signals[FOLDER_SELECTION_CHANGED_SIGNAL] = g_signal_new ("folder_selection_changed", G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_FIRST, @@ -252,7 +276,7 @@ modest_folder_view_class_init (ModestFolderViewClass *klass) * the unread messages count to the folder name to build the * folder display name */ - signals[FOLDER_DISPLAY_NAME_CHANGED_SIGNAL] = + signals[FOLDER_DISPLAY_NAME_CHANGED_SIGNAL] = g_signal_new ("folder-display-name-changed", G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_FIRST, @@ -261,6 +285,24 @@ modest_folder_view_class_init (ModestFolderViewClass *klass) NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); + + signals[FOLDER_ACTIVATED_SIGNAL] = + g_signal_new ("folder_activated", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (ModestFolderViewClass, + folder_activated), + NULL, NULL, + g_cclosure_marshal_VOID__POINTER, + G_TYPE_NONE, 1, G_TYPE_POINTER); + + treeview_class->select_cursor_parent = NULL; + +#ifdef MODEST_TOOLKIT_HILDON2 + gtk_rc_parse_string ("class \"ModestFolderView\" style \"fremantle-touchlist\""); + +#endif + } /* Simplify checks for NULLs: */ @@ -281,23 +323,23 @@ 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 */ - } - + 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); @@ -309,14 +351,14 @@ on_model_foreach_set_name(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter * * 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 +typedef struct { ModestFolderView *self; gchar *previous_name; @@ -328,12 +370,12 @@ 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)), + tny_account_get_name(TNY_ACCOUNT(account)), data->previous_name)) { - - /* Tell the model that the data has changed, so that + + /* 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)); @@ -346,80 +388,100 @@ 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; + GObject *rendobj = (GObject *) renderer; 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); 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); - rendobj = G_OBJECT(renderer); - - if (!fname) - return; - - if (!instance) { - g_free (fname); - return; - } + if (!fname || !instance) + goto end; ModestFolderView *self = MODEST_FOLDER_VIEW (data); priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self); - + gchar *item_name = NULL; gint item_weight = 400; - + if (type != TNY_FOLDER_TYPE_ROOT) { gint number = 0; - + gboolean drafts; + 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)); + fname = g_strdup (modest_local_folder_info_get_type_display_name (type)); + } + } else { + /* Sometimes an special folder is reported by the server as + NORMAL, like some versions of Dovecot */ + if (type == TNY_FOLDER_TYPE_NORMAL || + type == TNY_FOLDER_TYPE_UNKNOWN) { + type = modest_tny_folder_guess_folder_type (TNY_FOLDER (instance)); } } - /* 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 or unset messages */ - if (number > 0) { - item_name = g_strdup_printf ("%s (%d)", fname, number); - item_weight = 800; + if (type == TNY_FOLDER_TYPE_INBOX) { + g_free (fname); + fname = g_strdup (_("mcen_me_folder_inbox")); + } + + /* 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)); + drafts = TRUE; } else { - item_name = g_strdup (fname); - item_weight = 400; + number = tny_folder_get_unread_count (TNY_FOLDER(instance)); + drafts = FALSE; } - + + if (priv->cell_style == MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT) { + gchar * substring; + if (number > 0) { + substring = g_strdup_printf (drafts?"TODO:%d messages":"TODO:%d new messages", number); + } else { + substring = g_strdup (""); + } + item_name = g_strdup_printf ("%s\n%s", + fname, substring); + g_free (substring); + } else { + /* 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))) { + 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))) { - /* fname is only correct when the items are first - * added to the model, not when the account is + } 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))); @@ -429,157 +491,265 @@ text_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, item_weight = 800; } } - + if (!item_name) item_name = g_strdup ("unknown"); - + if (item_name && item_weight) { /* Set the name in the treeview cell: */ - g_object_set (rendobj,"text", item_name, "weight", item_weight, NULL); - + g_object_set (rendobj,"markup", 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) { + if (((GObject *) priv->cur_folder_store) == instance) { g_signal_emit (G_OBJECT(self), signals[FOLDER_DISPLAY_NAME_CHANGED_SIGNAL], 0, item_name); } g_free (item_name); - + } - + /* 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) && + if (TNY_IS_STORE_ACCOUNT (instance) && modest_tny_account_is_memory_card_account (TNY_ACCOUNT (instance))) { /* Get the account name asynchronously: */ - GetMmcAccountNameData *callback_data = + 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); + 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); + 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); + end: + if (instance) + g_object_unref (G_OBJECT (instance)); + if (fname) + g_free (fname); } -static void -icon_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, - GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data) + +typedef struct { + GdkPixbuf *pixbuf; + GdkPixbuf *pixbuf_open; + GdkPixbuf *pixbuf_close; +} ThreePixbufs; + + +static inline GdkPixbuf * +get_composite_pixbuf (const gchar *icon_name, + const gint size, + GdkPixbuf *base_pixbuf) { - GObject *rendobj = NULL, *instance = NULL; - GdkPixbuf *pixbuf = NULL; - 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, - TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &instance, - -1); - has_children = gtk_tree_model_iter_has_child (tree_model, iter); + GdkPixbuf *emblem, *retval = NULL; + + emblem = modest_platform_get_icon (icon_name, size); + if (emblem) { + retval = gdk_pixbuf_copy (base_pixbuf); + gdk_pixbuf_composite (emblem, retval, 0, 0, + MIN (gdk_pixbuf_get_width (emblem), + gdk_pixbuf_get_width (retval)), + MIN (gdk_pixbuf_get_height (emblem), + gdk_pixbuf_get_height (retval)), + 0, 0, 1, 1, GDK_INTERP_NEAREST, 255); + g_object_unref (emblem); + } + return retval; +} - if (!instance) - return; +static inline ThreePixbufs * +get_composite_icons (const gchar *icon_code, + GdkPixbuf **pixbuf, + GdkPixbuf **pixbuf_open, + GdkPixbuf **pixbuf_close) +{ + ThreePixbufs *retval; + + if (!*pixbuf) + *pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (icon_code, MODEST_ICON_SIZE_SMALL)); + + if (!*pixbuf_open) + *pixbuf_open = get_composite_pixbuf ("qgn_list_gene_fldr_exp", + MODEST_ICON_SIZE_SMALL, + *pixbuf); - /* 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 || + if (!*pixbuf_close) + *pixbuf_close = get_composite_pixbuf ("qgn_list_gene_fldr_clp", + MODEST_ICON_SIZE_SMALL, + *pixbuf); + + retval = g_slice_new0 (ThreePixbufs); + if (*pixbuf) + retval->pixbuf = g_object_ref (*pixbuf); + if (*pixbuf_open) + retval->pixbuf_open = g_object_ref (*pixbuf_open); + if (*pixbuf_close) + retval->pixbuf_close = g_object_ref (*pixbuf_close); + + return retval; +} + +static ThreePixbufs* +get_folder_icons (TnyFolderType type, GObject *instance) +{ + static GdkPixbuf *inbox_pixbuf = NULL, *outbox_pixbuf = NULL, + *junk_pixbuf = NULL, *sent_pixbuf = NULL, + *trash_pixbuf = NULL, *draft_pixbuf = NULL, + *normal_pixbuf = NULL, *anorm_pixbuf = NULL, + *ammc_pixbuf = NULL, *avirt_pixbuf = NULL; + + static GdkPixbuf *inbox_pixbuf_open = NULL, *outbox_pixbuf_open = NULL, + *junk_pixbuf_open = NULL, *sent_pixbuf_open = NULL, + *trash_pixbuf_open = NULL, *draft_pixbuf_open = NULL, + *normal_pixbuf_open = NULL, *anorm_pixbuf_open = NULL, + *ammc_pixbuf_open = NULL, *avirt_pixbuf_open = NULL; + + static GdkPixbuf *inbox_pixbuf_close = NULL, *outbox_pixbuf_close = NULL, + *junk_pixbuf_close = NULL, *sent_pixbuf_close = NULL, + *trash_pixbuf_close = NULL, *draft_pixbuf_close = NULL, + *normal_pixbuf_close = NULL, *anorm_pixbuf_close = NULL, + *ammc_pixbuf_close = NULL, *avirt_pixbuf_close = NULL; + + ThreePixbufs *retval = NULL; + + /* Sometimes an special folder is reported by the server as + NORMAL, like some versions of Dovecot */ + if (type == TNY_FOLDER_TYPE_NORMAL || type == TNY_FOLDER_TYPE_UNKNOWN) { 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)) { - - if (modest_tny_account_is_virtual_local_folders ( - TNY_ACCOUNT (instance))) { - pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_LOCAL_FOLDERS); - } - else { - account_id = tny_account_get_id (TNY_ACCOUNT (instance)); - - if (!strcmp (account_id, MODEST_MMC_ACCOUNT_ID)) - pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_MMC); - else - pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_ACCOUNT); + + if (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (instance))) { + retval = get_composite_icons (MODEST_FOLDER_ICON_LOCAL_FOLDERS, + &avirt_pixbuf, + &avirt_pixbuf_open, + &avirt_pixbuf_close); + } else { + const gchar *account_id = tny_account_get_id (TNY_ACCOUNT (instance)); + + if (!strcmp (account_id, MODEST_MMC_ACCOUNT_ID)) { + retval = get_composite_icons (MODEST_FOLDER_ICON_MMC, + &ammc_pixbuf, + &ammc_pixbuf_open, + &ammc_pixbuf_close); + } else { + retval = get_composite_icons (MODEST_FOLDER_ICON_ACCOUNT, + &anorm_pixbuf, + &anorm_pixbuf_open, + &anorm_pixbuf_close); + } } } break; case TNY_FOLDER_TYPE_INBOX: - pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_INBOX); - break; + retval = get_composite_icons (MODEST_FOLDER_ICON_INBOX, + &inbox_pixbuf, + &inbox_pixbuf_open, + &inbox_pixbuf_close); + break; case TNY_FOLDER_TYPE_OUTBOX: - pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_OUTBOX); + retval = get_composite_icons (MODEST_FOLDER_ICON_OUTBOX, + &outbox_pixbuf, + &outbox_pixbuf_open, + &outbox_pixbuf_close); break; case TNY_FOLDER_TYPE_JUNK: - pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_JUNK); + retval = get_composite_icons (MODEST_FOLDER_ICON_JUNK, + &junk_pixbuf, + &junk_pixbuf_open, + &junk_pixbuf_close); break; case TNY_FOLDER_TYPE_SENT: - pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_SENT); + retval = get_composite_icons (MODEST_FOLDER_ICON_SENT, + &sent_pixbuf, + &sent_pixbuf_open, + &sent_pixbuf_close); break; case TNY_FOLDER_TYPE_TRASH: - pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_TRASH); + retval = get_composite_icons (MODEST_FOLDER_ICON_TRASH, + &trash_pixbuf, + &trash_pixbuf_open, + &trash_pixbuf_close); break; case TNY_FOLDER_TYPE_DRAFTS: - pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_DRAFTS); + retval = get_composite_icons (MODEST_FOLDER_ICON_DRAFTS, + &draft_pixbuf, + &draft_pixbuf_open, + &draft_pixbuf_close); break; case TNY_FOLDER_TYPE_NORMAL: default: - pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_NORMAL); + retval = get_composite_icons (MODEST_FOLDER_ICON_NORMAL, + &normal_pixbuf, + &normal_pixbuf_open, + &normal_pixbuf_close); break; } - - g_object_unref (G_OBJECT (instance)); + + return retval; +} + +static void +free_pixbufs (ThreePixbufs *pixbufs) +{ + if (pixbufs->pixbuf) + g_object_unref (pixbufs->pixbuf); + if (pixbufs->pixbuf_open) + g_object_unref (pixbufs->pixbuf_open); + if (pixbufs->pixbuf_close) + g_object_unref (pixbufs->pixbuf_close); + g_slice_free (ThreePixbufs, pixbufs); +} + +static void +icon_cell_data (GtkTreeViewColumn *column, + GtkCellRenderer *renderer, + GtkTreeModel *tree_model, + GtkTreeIter *iter, + gpointer data) +{ + GObject *rendobj = NULL, *instance = NULL; + TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN; + gboolean has_children; + ThreePixbufs *pixbufs; + + rendobj = (GObject *) renderer; + + 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 (!instance) + return; + + has_children = gtk_tree_model_iter_has_child (tree_model, iter); + pixbufs = get_folder_icons (type, instance); + g_object_unref (instance); /* 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); + g_object_set (rendobj, "pixbuf", pixbufs->pixbuf, NULL); + + if (has_children) { + g_object_set (rendobj, "pixbuf-expander-open", pixbufs->pixbuf_open, NULL); + g_object_set (rendobj, "pixbuf-expander-closed", pixbufs->pixbuf_close, NULL); } - if (pixbuf != NULL) - g_object_unref (pixbuf); + free_pixbufs (pixbufs); } static void @@ -590,19 +760,21 @@ add_columns (GtkWidget *treeview) GtkTreeSelection *sel; /* Create column */ - column = gtk_tree_view_column_new (); - + column = gtk_tree_view_column_new (); + /* Set icon and text render function */ renderer = gtk_cell_renderer_pixbuf_new(); gtk_tree_view_column_pack_start (column, renderer, FALSE); gtk_tree_view_column_set_cell_data_func(column, renderer, 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); - + /* Set selection mode */ sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(treeview)); gtk_tree_selection_set_mode (sel, GTK_SELECTION_SINGLE); @@ -610,7 +782,7 @@ add_columns (GtkWidget *treeview) /* Set treeview appearance */ gtk_tree_view_column_set_spacing (column, 2); gtk_tree_view_column_set_resizable (column, TRUE); - gtk_tree_view_column_set_fixed_width (column, TRUE); + gtk_tree_view_column_set_fixed_width (column, TRUE); gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW(treeview), FALSE); gtk_tree_view_set_enable_search (GTK_TREE_VIEW(treeview), FALSE); @@ -623,9 +795,9 @@ modest_folder_view_init (ModestFolderView *obj) { ModestFolderViewPrivate *priv; ModestConf *conf; - + priv = MODEST_FOLDER_VIEW_GET_PRIVATE(obj); - + priv->timer_expander = 0; priv->account_store = NULL; priv->query = NULL; @@ -634,6 +806,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); @@ -652,19 +826,23 @@ modest_folder_view_init (ModestFolderView *obj) setup_drag_and_drop (GTK_TREE_VIEW(obj)); /* Connect signals */ - g_signal_connect (G_OBJECT (obj), - "key-press-event", + g_signal_connect (G_OBJECT (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), + priv->conf_key_signal = g_signal_connect (G_OBJECT(conf), "key_changed", - G_CALLBACK(on_configuration_key_changed), + G_CALLBACK(on_configuration_key_changed), obj); } @@ -673,9 +851,7 @@ tny_account_store_view_init (gpointer g, gpointer iface_data) { TnyAccountStoreViewIface *klass = (TnyAccountStoreViewIface *)g; - klass->set_account_store_func = modest_folder_view_set_account_store; - - return; + klass->set_account_store = modest_folder_view_set_account_store; } static void @@ -683,16 +859,10 @@ modest_folder_view_finalize (GObject *obj) { ModestFolderViewPrivate *priv; GtkTreeSelection *sel; - + g_return_if_fail (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); - } + priv = MODEST_FOLDER_VIEW_GET_PRIVATE(obj); if (priv->timer_expander != 0) { g_source_remove (priv->timer_expander); @@ -710,6 +880,13 @@ modest_folder_view_finalize (GObject *obj) priv->account_store = NULL; } + if (g_signal_handler_is_connected (modest_runtime_get_account_mgr (), + priv->display_name_changed_signal)) { + g_signal_handler_disconnect (modest_runtime_get_account_mgr (), + priv->display_name_changed_signal); + priv->display_name_changed_signal = 0; + } + if (priv->query) { g_object_unref (G_OBJECT (priv->query)); priv->query = NULL; @@ -719,14 +896,14 @@ modest_folder_view_finalize (GObject *obj) 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); 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); @@ -734,10 +911,6 @@ modest_folder_view_finalize (GObject *obj) } 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; } @@ -767,20 +940,20 @@ modest_folder_view_set_account_store (TnyAccountStoreView *self, TnyAccountStore 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), + if (g_signal_handler_is_connected (G_OBJECT (priv->account_store), priv->account_removed_signal)) - g_signal_handler_disconnect (G_OBJECT (priv->account_store), + g_signal_handler_disconnect (G_OBJECT (priv->account_store), priv->account_removed_signal); - if (g_signal_handler_is_connected (G_OBJECT (priv->account_store), + if (g_signal_handler_is_connected (G_OBJECT (priv->account_store), priv->account_changed_signal)) - g_signal_handler_disconnect (G_OBJECT (priv->account_store), + g_signal_handler_disconnect (G_OBJECT (priv->account_store), priv->account_changed_signal); g_object_unref (G_OBJECT (priv->account_store)); } priv->account_store = g_object_ref (G_OBJECT (account_store)); - priv->account_removed_signal = + priv->account_removed_signal = g_signal_connect (G_OBJECT(account_store), "account_removed", G_CALLBACK (on_account_removed), self); @@ -793,12 +966,14 @@ modest_folder_view_set_account_store (TnyAccountStoreView *self, TnyAccountStore G_CALLBACK (on_account_changed), self); modest_folder_view_update_model (MODEST_FOLDER_VIEW (self), account_store); - + priv->reselect = FALSE; + modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (self)); + g_object_unref (G_OBJECT (device)); } static void -on_account_inserted (TnyAccountStore *account_store, +on_account_inserted (TnyAccountStore *account_store, TnyAccount *account, gpointer user_data) { @@ -812,57 +987,211 @@ on_account_inserted (TnyAccountStore *account_store, 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(), + modest_widget_memory_restore (modest_runtime_get_conf(), G_OBJECT (user_data), MODEST_CONF_FOLDER_VIEW_KEY); + if (!GTK_IS_TREE_VIEW(user_data)) { + g_warning ("BUG: %s: not a valid tree view", __FUNCTION__); + return; + } + /* Get the inner model */ + /* check, is some rare cases, we did not get the right thing here, + * NB#84097 */ filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (user_data)); + if (!GTK_IS_TREE_MODEL_FILTER(filter_model)) { + g_warning ("BUG: %s: not a valid filter model", __FUNCTION__); + return; + } + + /* check, is some rare cases, we did not get the right thing here, + * NB#84097 */ sort_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter_model)); + if (!GTK_IS_TREE_MODEL_SORT(sort_model)) { + g_warning ("BUG: %s: not a valid sort model", __FUNCTION__); + return; + } /* 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)); + + /* Refilter the model */ + gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model)); +} + + +static gboolean +same_account_selected (ModestFolderView *self, + TnyAccount *account) +{ + ModestFolderViewPrivate *priv; + gboolean same_account = FALSE; + + priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self); + + if (priv->cur_folder_store) { + TnyAccount *selected_folder_account = NULL; + + if (TNY_IS_FOLDER (priv->cur_folder_store)) { + selected_folder_account = + modest_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) + same_account = TRUE; + + g_object_unref (selected_folder_account); + } + return same_account; } +/** + * + * Selects the first inbox or the local account in an idle + */ +static gboolean +on_idle_select_first_inbox_or_local (gpointer user_data) +{ + ModestFolderView *self = MODEST_FOLDER_VIEW (user_data); + + gdk_threads_enter (); + modest_folder_view_select_first_inbox_or_local (self); + gdk_threads_leave (); + + return FALSE; +} 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 */ -} + ModestFolderView *self; + ModestFolderViewPrivate *priv; + GtkTreeModel *sort_model, *filter_model; + GtkTreeSelection *sel; + gboolean same_account; + + /* Ignore transport account insertions, we're not showing them + in the folder view */ + if (TNY_IS_TRANSPORT_ACCOUNT (tny_account)) + return; + + if (!MODEST_IS_FOLDER_VIEW(user_data)) { + g_warning ("BUG: %s: not a valid folder view", __FUNCTION__); + return; + } + + self = MODEST_FOLDER_VIEW (user_data); + priv = MODEST_FOLDER_VIEW_GET_PRIVATE (user_data); + + /* Get the inner model */ + filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (user_data)); + if (!GTK_IS_TREE_MODEL_FILTER(filter_model)) { + g_warning ("BUG: %s: not a valid filter model", __FUNCTION__); + return; + } + + sort_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter_model)); + if (!GTK_IS_TREE_MODEL_SORT(sort_model)) { + g_warning ("BUG: %s: not a valid sort model", __FUNCTION__); + return; + } + + /* Invalidate the cur_folder_store only if the selected folder + belongs to the account that is being removed */ + same_account = same_account_selected (self, tny_account); + if (same_account) { + sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self)); + gtk_tree_selection_unselect_all (sel); + } + /* 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)); + + /* Select the first INBOX if the currently selected folder + belongs to the account that is being deleted */ + if (same_account && !MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (tny_account)) + g_idle_add (on_idle_select_first_inbox_or_local, self); +} static void -on_account_removed (TnyAccountStore *account_store, +on_account_removed (TnyAccountStore *account_store, TnyAccount *account, gpointer user_data) { ModestFolderView *self = NULL; ModestFolderViewPrivate *priv; GtkTreeModel *sort_model, *filter_model; + GtkTreeSelection *sel = NULL; + gboolean same_account = FALSE; /* Ignore transport account removals, we're not showing them in the folder view */ if (TNY_IS_TRANSPORT_ACCOUNT (account)) return; - g_print ("--------------------- FOLDER ---------------\n"); + if (!MODEST_IS_FOLDER_VIEW(user_data)) { + g_warning ("BUG: %s: not a valid folder view", __FUNCTION__); + return; + } self = MODEST_FOLDER_VIEW (user_data); priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self); - /* TODO: invalidate the cur_folder_* and folder_to_select things */ + /* Invalidate the cur_folder_store only if the selected folder + belongs to the account that is being removed */ + same_account = same_account_selected (self, account); + if (same_account) { + sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self)); + gtk_tree_selection_unselect_all (sel); + } + + /* Invalidate row to select only if the folder to select + belongs to the account that is being removed*/ + if (priv->folder_to_select) { + 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 */ filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); + if (!GTK_IS_TREE_MODEL_FILTER(filter_model)) { + g_warning ("BUG: %s: not a valid filter model", __FUNCTION__); + return; + } + sort_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter_model)); + if (!GTK_IS_TREE_MODEL_SORT(sort_model)) { + g_warning ("BUG: %s: not a valid sort model", __FUNCTION__); + return; + } + tny_list_remove (TNY_LIST (gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (sort_model))), G_OBJECT (account)); @@ -879,16 +1208,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 (same_account) + g_idle_add (on_idle_select_first_inbox_or_local, self); } void modest_folder_view_set_title (ModestFolderView *self, const gchar *title) { GtkTreeViewColumn *col; - - g_return_if_fail (self); + + g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self)); col = gtk_tree_view_get_column (GTK_TREE_VIEW(self), 0); if (!col) { @@ -902,7 +1236,7 @@ modest_folder_view_set_title (ModestFolderView *self, const gchar *title) } static gboolean -modest_folder_view_on_map (ModestFolderView *self, +modest_folder_view_on_map (ModestFolderView *self, GdkEventExpose *event, gpointer data) { @@ -928,7 +1262,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; } @@ -939,17 +1276,23 @@ modest_folder_view_new (TnyFolderStoreQuery *query) GObject *self; ModestFolderViewPrivate *priv; GtkTreeSelection *sel; - - self = G_OBJECT (g_object_new (MODEST_TYPE_FOLDER_VIEW, NULL)); + + self = G_OBJECT (g_object_new (MODEST_TYPE_FOLDER_VIEW, +#ifdef MODEST_TOOLKIT_HILDON2 + "hildon-ui-mode", HILDON_UI_MODE_NORMAL, +#endif + NULL)); priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self); if (query) priv->query = g_object_ref (query); - + sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self)); priv->changed_signal = g_signal_connect (sel, "changed", G_CALLBACK (on_selection_changed), self); + g_signal_connect (self, "row-activated", G_CALLBACK (on_row_activated), self); + g_signal_connect (self, "expose-event", G_CALLBACK (modest_folder_view_on_map), NULL); return GTK_WIDGET(self); @@ -960,12 +1303,18 @@ 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); } @@ -974,10 +1323,8 @@ expand_root_items (ModestFolderView *self) * MODEST_FOLDER_VIEW_STYLE_SHOW_ONE style. We only show the default * account in this case, and the local folders. */ -static gboolean -filter_row (GtkTreeModel *model, - GtkTreeIter *iter, - gpointer data) +static gboolean +filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer data) { ModestFolderViewPrivate *priv; gboolean retval = TRUE; @@ -1009,23 +1356,23 @@ filter_row (GtkTreeModel *model, if (TNY_IS_ACCOUNT (instance)) { TnyAccount *acc = TNY_ACCOUNT (instance); const gchar *account_id = tny_account_get_id (acc); - - /* If it isn't a special folder, + + /* If it isn't a special folder, * don't show it unless it is the visible account: */ 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) { 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 + + /* 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; @@ -1033,24 +1380,22 @@ filter_row (GtkTreeModel *model, } /* Check hiding (if necessary) */ - cleared = modest_email_clipboard_cleared (priv->clipboard); + 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 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: @@ -1059,17 +1404,19 @@ 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 */ g_object_unref (instance); @@ -1083,16 +1430,16 @@ modest_folder_view_update_model (ModestFolderView *self, { ModestFolderViewPrivate *priv; GtkTreeModel *model /* , *old_model */; - /* TnyAccount *local_account; */ - TnyList *model_as_list; + 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); + g_return_val_if_fail (self && MODEST_IS_FOLDER_VIEW (self), FALSE); + g_return_val_if_fail (account_store && MODEST_IS_TNY_ACCOUNT_STORE(account_store), + FALSE); priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self); - + /* Notify that there is no folder selected */ - g_signal_emit (G_OBJECT(self), + g_signal_emit (G_OBJECT(self), signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0, NULL, FALSE); if (priv->cur_folder_store) { @@ -1101,26 +1448,17 @@ 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 (NULL); - - /* Deal with the model via its TnyList Interface, - * filling the TnyList via a get_accounts() call: */ - model_as_list = TNY_LIST(model); + selects only the subscribed folders */ + model = tny_gtk_folder_store_tree_model_new (NULL); /* 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), - TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, + TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, GTK_SORT_ASCENDING); gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (sortable), TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, @@ -1135,19 +1473,16 @@ modest_folder_view_update_model (ModestFolderView *self, /* Set new model */ 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); - + (GCallback) on_row_inserted_maybe_select_folder, self); g_object_unref (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 */ priv->reselect = TRUE; - + return TRUE; } @@ -1164,17 +1499,10 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data) g_return_if_fail (sel); g_return_if_fail (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), - signals[FOLDER_DISPLAY_NAME_CHANGED_SIGNAL], 0, - NULL); tree_view = MODEST_FOLDER_VIEW (user_data); @@ -1184,22 +1512,26 @@ 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; } } - + /* 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); - + /* We must do this firstly because a libtinymail-camel + implementation detail. If we issue the signal + before doing the sync_async, then that signal could + cause (and it actually does it) a free of the + summary of the folder (because the main window will + clear the headers view */ 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; @@ -1208,10 +1540,47 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data) /* New current references */ priv->cur_folder_store = folder; - /* New folder has been selected */ - g_signal_emit (G_OBJECT(tree_view), - signals[FOLDER_SELECTION_CHANGED_SIGNAL], - 0, priv->cur_folder_store, TRUE); + /* New folder has been selected. Do not notify if there is + nothing new selected */ + if (selected) { + g_signal_emit (G_OBJECT(tree_view), + signals[FOLDER_SELECTION_CHANGED_SIGNAL], + 0, priv->cur_folder_store, TRUE); + } +} + +static void +on_row_activated (GtkTreeView *treeview, + GtkTreePath *treepath, + GtkTreeViewColumn *column, + gpointer user_data) +{ + GtkTreeModel *model = NULL; + TnyFolderStore *folder = NULL; + GtkTreeIter iter; + ModestFolderView *self = NULL; + ModestFolderViewPrivate *priv = NULL; + + g_return_if_fail (treeview); + g_return_if_fail (user_data); + + self = MODEST_FOLDER_VIEW (user_data); + priv = MODEST_FOLDER_VIEW_GET_PRIVATE(user_data); + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); + + if (!gtk_tree_model_get_iter (model, &iter, treepath)) + return; + + gtk_tree_model_get (model, &iter, + TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder, + -1); + + g_signal_emit (G_OBJECT(self), + signals[FOLDER_ACTIVATED_SIGNAL], + 0, folder); + + g_object_unref (folder); } TnyFolderStore * @@ -1219,8 +1588,8 @@ modest_folder_view_get_selected (ModestFolderView *self) { ModestFolderViewPrivate *priv; - g_return_val_if_fail (self, NULL); - + g_return_val_if_fail (self && MODEST_IS_FOLDER_VIEW(self), NULL); + priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self); if (priv->cur_folder_store) g_object_ref (priv->cur_folder_store); @@ -1233,8 +1602,8 @@ get_cmp_rows_type_pos (GObject *folder) { /* Remote accounts -> Local account -> MMC account .*/ /* 0, 1, 2 */ - - if (TNY_IS_ACCOUNT (folder) && + + if (TNY_IS_ACCOUNT (folder) && modest_tny_account_is_virtual_local_folders ( TNY_ACCOUNT (folder))) { return 1; @@ -1313,11 +1682,11 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, goto finish; if (type == TNY_FOLDER_TYPE_ROOT) { - /* Compare the types, so that + /* Compare the types, so that * Remote accounts -> Local account -> MMC account .*/ const gint pos1 = get_cmp_rows_type_pos (folder1); const gint pos2 = get_cmp_rows_type_pos (folder2); - /* printf ("DEBUG: %s:\n type1=%s, pos1=%d\n type2=%s, pos2=%d\n", + /* printf ("DEBUG: %s:\n type1=%s, pos1=%d\n type2=%s, pos2=%d\n", __FUNCTION__, G_OBJECT_TYPE_NAME(folder1), pos1, G_OBJECT_TYPE_NAME(folder2), pos2); */ if (pos1 < pos2) cmp = -1; @@ -1325,18 +1694,18 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, cmp = 1; else { /* Compare items of the same type: */ - + TnyAccount *account1 = NULL; if (TNY_IS_ACCOUNT (folder1)) account1 = TNY_ACCOUNT (folder1); - + TnyAccount *account2 = NULL; if (TNY_IS_ACCOUNT (folder2)) account2 = TNY_ACCOUNT (folder2); - + 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) { cmp = 0; } else if (!account_id) { @@ -1359,15 +1728,26 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, if (has_parent) { GObject *parent_folder; TnyFolderType parent_type = TNY_FOLDER_TYPE_UNKNOWN; - gtk_tree_model_get (tree_model, &parent, + 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_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))); + TNY_IS_ACCOUNT (parent_folder)) { + if (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))); + } else if (modest_tny_account_is_memory_card_account (TNY_ACCOUNT (parent_folder))) { + if (modest_local_folder_info_get_type (tny_folder_get_name (TNY_FOLDER (folder1))) == TNY_FOLDER_TYPE_ARCHIVE) { + cmp1 = 0; + cmp2 = 1; + } else if (modest_local_folder_info_get_type (tny_folder_get_name (TNY_FOLDER (folder2))) == TNY_FOLDER_TYPE_ARCHIVE) { + cmp1 = 1; + cmp2 = 0; + } + } } g_object_unref (parent_folder); } @@ -1380,11 +1760,11 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, if (cmp1 == cmp2) cmp = modest_text_utils_utf8_strcmp (name1, name2, TRUE); - else + else cmp = (cmp1 - cmp2); } -finish: +finish: if (folder1) g_object_unref(G_OBJECT(folder1)); if (folder2) @@ -1393,25 +1773,20 @@ finish: g_free (name1); g_free (name2); - return cmp; + return cmp; } /*****************************************************************************/ /* DRAG and DROP stuff */ /*****************************************************************************/ - /* * This function fills the #GtkSelectionData with the row and the * model that has been dragged. It's called when this widget is a * source for dnd after the event drop happened */ static void -on_drag_data_get (GtkWidget *widget, - GdkDragContext *context, - GtkSelectionData *selection_data, - guint info, - guint time, - gpointer data) +on_drag_data_get (GtkWidget *widget, GdkDragContext *context, GtkSelectionData *selection_data, + guint info, guint time, gpointer data) { GtkTreeSelection *selection; GtkTreeModel *model; @@ -1419,70 +1794,52 @@ 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); + if (gtk_tree_selection_get_selected (selection, &model, &iter)) { - gtk_tree_set_row_drag_data (selection_data, - model, - 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); + gtk_tree_path_free (source_row); + } } typedef struct _DndHelper { + ModestFolderView *folder_view; gboolean delete_source; GtkTreePath *source_row; - GdkDragContext *context; - guint time; } DndHelper; - -/* - * This function is the callback of the - * modest_mail_operation_xfer_msgs () and - * modest_mail_operation_xfer_folder() calls. We check here if the - * message/folder was correctly asynchronously transferred. The reason - * to use the same callback is that the code is the same, it only has - * to check that the operation went fine and then finalize the drag - * and drop action - */ static void -on_progress_changed (ModestMailOperation *mail_op, - ModestMailOperationState *state, - gpointer user_data) +dnd_helper_destroyer (DndHelper *helper) { - gboolean success; - DndHelper *helper; - - helper = (DndHelper *) user_data; - - if (!state->finished) - return; - - if (state->status == MODEST_MAIL_OPERATION_STATUS_SUCCESS) { - success = TRUE; - } else { - success = FALSE; - } - - /* Notify the drag source. Never call delete, the monitor will - do the job if needed */ - gtk_drag_finish (helper->context, success, FALSE, helper->time); - /* Free the helper */ - gtk_tree_path_free (helper->source_row); + gtk_tree_path_free (helper->source_row); g_slice_free (DndHelper, helper); } +static void +xfer_folder_cb (ModestMailOperation *mail_op, + TnyFolder *new_folder, + gpointer user_data) +{ + if (new_folder) { + /* Select the folder */ + modest_folder_view_select_folder (MODEST_FOLDER_VIEW (user_data), + new_folder, FALSE); + } +} + /* 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, TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder, @@ -1490,17 +1847,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 @@ -1511,85 +1857,192 @@ static void drag_and_drop_from_header_view (GtkTreeModel *source_model, GtkTreeModel *dest_model, GtkTreePath *dest_row, - DndHelper *helper) + GtkSelectionData *selection_data) { TnyList *headers = NULL; - TnyHeader *header = NULL; - TnyFolder *folder = NULL; - 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. */ + TnyFolder *folder = NULL, *src_folder = NULL; + TnyFolderType folder_type; + GtkTreeIter source_iter, dest_iter; + ModestWindowMgr *mgr = NULL; + ModestWindow *main_win = NULL; + gchar **uris, **tmp; + + /* Build the list of headers */ mgr = modest_runtime_get_window_mgr (); - if (modest_window_mgr_find_registered_header(mgr, header, NULL)) + headers = tny_simple_list_new (); + uris = modest_dnd_selection_data_get_paths (selection_data); + tmp = uris; + + while (*tmp != NULL) { + TnyHeader *header; + GtkTreePath *path; + gboolean first = TRUE; + + /* 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)); + + if (G_UNLIKELY (first)) { + src_folder = tny_header_get_folder (header); + first = FALSE; + } + + /* Free and go on */ + gtk_tree_path_free (path); + g_object_unref (header); + tmp++; + } + g_strfreev (uris); + + /* This could happen ig we perform a d&d very quickly over the + same row that row could dissapear because message is + transferred */ + if (!TNY_IS_FOLDER (src_folder)) goto cleanup; - /* 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(); + /* 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; } - if (modest_tny_folder_get_rules(folder) & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE) { - g_debug ("folder rules: cannot write to that folder"); - goto cleanup; + + 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! */ } - - headers = tny_simple_list_new (); - tny_list_append (headers, G_OBJECT (header)); - main_win = modest_window_mgr_get_main_window(mgr); - if(msgs_move_to_confirmation(GTK_WINDOW(main_win), folder, TRUE, headers) - == GTK_RESPONSE_CANCEL) + /* 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; + } + + /* Transfer messages */ + modest_ui_actions_transfer_messages_helper (GTK_WINDOW (main_win), src_folder, + headers, folder); - /* Transfer message */ - 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); - - modest_mail_operation_xfer_msgs (mail_op, - headers, - folder, - helper->delete_source, - NULL, NULL); - /* 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 (src_folder)) + g_object_unref (src_folder); if (G_IS_OBJECT(folder)) g_object_unref (G_OBJECT (folder)); if (G_IS_OBJECT(headers)) g_object_unref (headers); } +typedef struct { + TnyFolderStore *src_folder; + TnyFolderStore *dst_folder; + ModestFolderView *folder_view; + DndHelper *helper; +} DndFolderInfo; + +static void +dnd_folder_info_destroyer (DndFolderInfo *info) +{ + if (info->src_folder) + g_object_unref (info->src_folder); + if (info->dst_folder) + g_object_unref (info->dst_folder); + g_slice_free (DndFolderInfo, info); +} + +static void +dnd_on_connection_failed_destroyer (DndFolderInfo *info, + GtkWindow *parent_window, + TnyAccount *account) +{ + /* Show error */ + modest_ui_actions_on_account_connection_error (parent_window, account); + + /* Free the helper & info */ + dnd_helper_destroyer (info->helper); + dnd_folder_info_destroyer (info); +} + +static void +drag_and_drop_from_folder_view_src_folder_performer (gboolean canceled, + GError *err, + GtkWindow *parent_window, + TnyAccount *account, + gpointer user_data) +{ + DndFolderInfo *info = NULL; + ModestMailOperation *mail_op; + + info = (DndFolderInfo *) user_data; + + if (err || canceled) { + dnd_on_connection_failed_destroyer (info, parent_window, account); + return; + } + + /* Do the mail operation */ + mail_op = modest_mail_operation_new_with_error_handling ((GObject *) parent_window, + modest_ui_actions_move_folder_error_handler, + info->src_folder, NULL); + + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), + mail_op); + + /* Transfer the folder */ + modest_mail_operation_xfer_folder (mail_op, + TNY_FOLDER (info->src_folder), + info->dst_folder, + info->helper->delete_source, + xfer_folder_cb, + info->helper->folder_view); + + /* Frees */ + g_object_unref (G_OBJECT (mail_op)); + dnd_helper_destroyer (info->helper); + dnd_folder_info_destroyer (info); +} + + +static void +drag_and_drop_from_folder_view_dst_folder_performer (gboolean canceled, + GError *err, + GtkWindow *parent_window, + TnyAccount *account, + gpointer user_data) +{ + DndFolderInfo *info = NULL; + + info = (DndFolderInfo *) user_data; + + if (err || canceled) { + dnd_on_connection_failed_destroyer (info, parent_window, account); + return; + } + + /* Connect to source folder and perform the copy/move */ + modest_platform_connect_if_remote_and_perform (NULL, TRUE, + info->src_folder, + drag_and_drop_from_folder_view_src_folder_performer, + info); +} + /* * This function is used by drag_data_received_cb to manage drag and * drop of a folder, i.e, and drag from the folder view to the same @@ -1602,26 +2055,31 @@ drag_and_drop_from_folder_view (GtkTreeModel *source_model, GtkSelectionData *selection_data, DndHelper *helper) { - ModestMailOperation *mail_op = NULL; GtkTreeIter dest_iter, iter; TnyFolderStore *dest_folder = NULL; - TnyFolder *folder = NULL; + TnyFolderStore *folder = NULL; gboolean forbidden = FALSE; + ModestWindow *win; + DndFolderInfo *info = NULL; + + 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__); + dnd_helper_destroyer (helper); + 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)) + if (!MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (folder) && + !modest_tny_account_is_memory_card_account (TNY_ACCOUNT (folder))) forbidden = TRUE; } g_object_unref (folder); @@ -1631,67 +2089,57 @@ 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); } - + /* Check if the drag is possible */ 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); - g_slice_free (DndHelper, helper); + /* Show error */ + modest_platform_run_information_dialog ((GtkWindow *) win, + _("mail_in_ui_folder_move_target_error"), + FALSE); + /* Restore the previous selection */ + folder = tree_path_to_folder (source_model, helper->source_row); + if (folder) { + if (TNY_IS_FOLDER (folder)) + modest_folder_view_select_folder (helper->folder_view, + TNY_FOLDER (folder), FALSE); + g_object_unref (folder); + } + dnd_helper_destroyer (helper); return; } /* Get data */ 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, + gtk_tree_model_get (dest_model, &dest_iter, + TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &dest_folder, -1); gtk_tree_model_get_iter (source_model, &iter, helper->source_row); gtk_tree_model_get (source_model, &iter, TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &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))) { - /* 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); - - modest_mail_operation_xfer_folder (mail_op, - folder, - dest_folder, - helper->delete_source, - NULL, - NULL); - - g_object_unref (G_OBJECT (mail_op)); - } - + /* Create the info for the performer */ + info = g_slice_new0 (DndFolderInfo); + info->src_folder = g_object_ref (folder); + info->dst_folder = g_object_ref (dest_folder); + info->helper = helper; + + /* Connect to the destination folder and perform the copy/move */ + modest_platform_connect_if_remote_and_perform (GTK_WINDOW (win), TRUE, + dest_folder, + drag_and_drop_from_folder_view_dst_folder_performer, + info); + /* Frees */ - g_object_unref (G_OBJECT (dest_folder)); - g_object_unref (G_OBJECT (folder)); + g_object_unref (dest_folder); + g_object_unref (folder); } /* @@ -1700,22 +2148,22 @@ drag_and_drop_from_folder_view (GtkTreeModel *source_model, * function will manage both the drags of folders of the treeview and * drags of headers of the header view widget. */ -static void -on_drag_data_received (GtkWidget *widget, - GdkDragContext *context, - gint x, - gint y, - GtkSelectionData *selection_data, - guint target_type, - guint time, +static void +on_drag_data_received (GtkWidget *widget, + GdkDragContext *context, + gint x, + gint y, + GtkSelectionData *selection_data, + guint target_type, + guint time, gpointer data) { GtkWidget *source_widget; GtkTreeModel *dest_model, *source_model; GtkTreePath *source_row, *dest_row; GtkTreeViewDropPosition pos; - gboolean success = FALSE, delete_source = FALSE; - DndHelper *helper = NULL; + gboolean delete_source = FALSE; + gboolean success = FALSE; /* Do not allow further process */ g_signal_stop_emission_by_name (widget, "drag-data-received"); @@ -1732,34 +2180,17 @@ 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); } } /* Check if the get_data failed */ 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); + goto end; /* 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 @@ -1768,36 +2199,49 @@ 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) - 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; + if (!dest_row || + pos == GTK_TREE_VIEW_DROP_BEFORE || + pos == GTK_TREE_VIEW_DROP_AFTER) + goto end; + success = TRUE; /* 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, - helper); + selection_data); } else { + DndHelper *helper = NULL; + + /* Get the source model and row */ + gtk_tree_get_row_drag_data (selection_data, + &source_model, + &source_row); + /* Create the helper */ + helper = g_slice_new0 (DndHelper); + helper->delete_source = delete_source; + helper->source_row = gtk_tree_path_copy (source_row); + helper->folder_view = MODEST_FOLDER_VIEW (widget); drag_and_drop_from_folder_view (source_model, dest_model, dest_row, - selection_data, + selection_data, helper); + + gtk_tree_path_free (source_row); } /* Frees */ - gtk_tree_path_free (source_row); gtk_tree_path_free (dest_row); + + end: + /* Finish the drag and drop */ + gtk_drag_finish (context, success, FALSE, time); } /* @@ -1813,7 +2257,7 @@ drag_drop_cb (GtkWidget *widget, gint x, gint y, guint time, - gpointer user_data) + gpointer user_data) { gpointer target; @@ -1841,13 +2285,13 @@ expand_row_timeout (gpointer data) GtkTreePath *dest_path = NULL; GtkTreeViewDropPosition pos; gboolean result = FALSE; - - GDK_THREADS_ENTER (); - + + gdk_threads_enter (); + gtk_tree_view_get_drag_dest_row (tree_view, &dest_path, &pos); - + if (dest_path && (pos == GTK_TREE_VIEW_DROP_INTO_OR_AFTER || pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE)) { @@ -1857,11 +2301,11 @@ expand_row_timeout (gpointer data) else { if (dest_path) gtk_tree_path_free (dest_path); - + result = TRUE; } - - GDK_THREADS_LEAVE (); + + gdk_threads_leave (); return result; } @@ -1880,13 +2324,15 @@ on_drag_motion (GtkWidget *widget, gint x, gint y, guint time, - gpointer user_data) + gpointer user_data) { GtkTreeViewDropPosition pos; GtkTreePath *dest_row; + GtkTreeModel *dest_model; ModestFolderViewPrivate *priv; GdkDragAction suggested_action; gboolean valid_location = FALSE; + TnyFolderStore *folder = NULL; priv = MODEST_FOLDER_VIEW_GET_PRIVATE (widget); @@ -1912,11 +2358,23 @@ 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; + } + } + /* Expand the selected row after 1/2 second */ if (!gtk_tree_view_row_expanded (GTK_TREE_VIEW (widget), dest_row)) { - gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (widget), dest_row, pos); priv->timer_expander = g_timeout_add (500, expand_row_timeout, widget); } + gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (widget), dest_row, pos); /* Select the desired action. By default we pick MOVE */ suggested_action = GDK_ACTION_MOVE; @@ -1931,20 +2389,16 @@ on_drag_motion (GtkWidget *widget, gdk_drag_status(context, GDK_ACTION_DEFAULT, time); out: - if (dest_row) + if (folder) + g_object_unref (folder); + 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. @@ -1955,6 +2409,9 @@ setup_drag_and_drop (GtkTreeView *self) /* Set up the folder view as a dnd destination. Set only the highlight flag, otherwise gtk will have a different behaviour */ +#ifdef MODEST_TOOLKIT_HILDON2 + return; +#endif gtk_drag_dest_set (GTK_WIDGET (self), GTK_DEST_DEFAULT_HIGHLIGHT, folder_view_drag_types, @@ -1978,7 +2435,7 @@ setup_drag_and_drop (GtkTreeView *self) "drag_motion", G_CALLBACK (on_drag_motion), NULL); - + g_signal_connect (G_OBJECT (self), "drag_data_get", G_CALLBACK (on_drag_data_get), @@ -2034,11 +2491,11 @@ on_key_pressed (GtkWidget *self, * tree view refresh. It's better to cache it and change whenever * necessary. */ -static void -on_configuration_key_changed (ModestConf* conf, - const gchar *key, +static void +on_configuration_key_changed (ModestConf* conf, + const gchar *key, ModestConfEvent event, - ModestConfNotificationId id, + ModestConfNotificationId id, ModestFolderView *self) { ModestFolderViewPrivate *priv; @@ -2047,10 +2504,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); @@ -2061,10 +2514,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 } } @@ -2075,10 +2532,13 @@ modest_folder_view_set_style (ModestFolderView *self, { ModestFolderViewPrivate *priv; - g_return_if_fail (self); - + g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self)); + g_return_if_fail (style == MODEST_FOLDER_VIEW_STYLE_SHOW_ALL || + style == MODEST_FOLDER_VIEW_STYLE_SHOW_ONE); + priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self); + priv->style = style; } @@ -2089,8 +2549,8 @@ modest_folder_view_set_account_id_of_visible_server_account (ModestFolderView *s ModestFolderViewPrivate *priv; GtkTreeModel *model; - g_return_if_fail (self); - + g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self)); + priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self); /* This will be used by the filter_row callback, @@ -2117,8 +2577,8 @@ modest_folder_view_get_account_id_of_visible_server_account (ModestFolderView *s { ModestFolderViewPrivate *priv; - g_return_val_if_fail (self, NULL); - + g_return_val_if_fail (self && MODEST_IS_FOLDER_VIEW(self), NULL); + priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self); return (const gchar *) priv->visible_account_id; @@ -2131,14 +2591,14 @@ find_inbox_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *inbox_iter GtkTreeIter child; TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN; - gtk_tree_model_get (model, iter, - TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, + gtk_tree_model_get (model, iter, + TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type, -1); - + gboolean result = FALSE; if (type == TNY_FOLDER_TYPE_INBOX) { result = TRUE; - } + } if (result) { *inbox_iter = *iter; return TRUE; @@ -2157,7 +2617,7 @@ find_inbox_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *inbox_iter -void +void modest_folder_view_select_first_inbox_or_local (ModestFolderView *self) { GtkTreeModel *model; @@ -2165,6 +2625,8 @@ modest_folder_view_select_first_inbox_or_local (ModestFolderView *self) GtkTreeSelection *sel; GtkTreePath *path = NULL; + g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self)); + model = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); if (!model) return; @@ -2172,7 +2634,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); @@ -2181,6 +2646,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 */ @@ -2190,7 +2656,7 @@ modest_folder_view_select_first_inbox_or_local (ModestFolderView *self) /* recursive */ static gboolean -find_folder_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *folder_iter, +find_folder_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *folder_iter, TnyFolder* folder) { do { @@ -2198,14 +2664,12 @@ find_folder_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *folder_it TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN; TnyFolder* a_folder; gchar *name = NULL; - - gtk_tree_model_get (model, iter, + + 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); + TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type, + -1); g_free (name); if (folder == a_folder) { @@ -2214,9 +2678,9 @@ find_folder_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *folder_it 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)) + if (find_folder_iter (model, &child, folder_iter, folder)) return TRUE; } @@ -2227,55 +2691,87 @@ find_folder_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *folder_it static void -on_row_changed_maybe_select_folder (GtkTreeModel *tree_model, GtkTreePath *path, GtkTreeIter *iter, - ModestFolderView *self) +on_row_inserted_maybe_select_folder (GtkTreeModel *tree_model, + GtkTreePath *path, + GtkTreeIter *iter, + ModestFolderView *self) { 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) { - + 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; + + /* Disable next */ + modest_folder_view_disable_next_folder_selection (self); + + /* Refilter the model */ + gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (tree_model)); } } +void +modest_folder_view_disable_next_folder_selection (ModestFolderView *self) +{ + ModestFolderViewPrivate *priv; + + g_return_if_fail (self && 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, +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); - + + g_return_val_if_fail (self && MODEST_IS_FOLDER_VIEW (self), FALSE); + g_return_val_if_fail (folder && 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); @@ -2284,13 +2780,20 @@ modest_folder_view_select_folder (ModestFolderView *self, TnyFolder *folder, 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); + + /* Refilter the model, before selecting the folder */ + gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model)); + + 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; @@ -2308,14 +2811,16 @@ modest_folder_view_select_folder (ModestFolderView *self, TnyFolder *folder, } -void -modest_folder_view_copy_selection (ModestFolderView *folder_view) +void +modest_folder_view_copy_selection (ModestFolderView *self) { + g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self)); + /* Copy selection */ - _clipboard_set_selected_data (folder_view, FALSE); + _clipboard_set_selected_data (self, FALSE); } -void +void modest_folder_view_cut_selection (ModestFolderView *folder_view) { ModestFolderViewPrivate *priv = NULL; @@ -2323,7 +2828,7 @@ modest_folder_view_cut_selection (ModestFolderView *folder_view) const gchar **hidding = NULL; guint i, n_selected; - g_return_if_fail (MODEST_IS_FOLDER_VIEW (folder_view)); + g_return_if_fail (folder_view && MODEST_IS_FOLDER_VIEW (folder_view)); priv = MODEST_FOLDER_VIEW_GET_PRIVATE (folder_view); /* Copy selection */ @@ -2331,16 +2836,16 @@ modest_folder_view_cut_selection (ModestFolderView *folder_view) return; /* Get hidding ids */ - hidding = modest_email_clipboard_get_hidding_ids (priv->clipboard, &n_selected); - + 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]); + 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)); @@ -2354,22 +2859,24 @@ modest_folder_view_copy_model (ModestFolderView *folder_view_src, GtkTreeModel *filter_model = NULL; GtkTreeModel *model = NULL; GtkTreeModel *new_filter_model = NULL; - - g_return_if_fail (MODEST_IS_FOLDER_VIEW (folder_view_src)); - g_return_if_fail (MODEST_IS_FOLDER_VIEW (folder_view_dst)); + + g_return_if_fail (folder_view_src && MODEST_IS_FOLDER_VIEW (folder_view_src)); + g_return_if_fail (folder_view_dst && MODEST_IS_FOLDER_VIEW (folder_view_dst)); /* Get src model*/ filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (folder_view_src)); model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER(filter_model)); /* Build new filter model */ - new_filter_model = gtk_tree_model_filter_new (model, NULL); + new_filter_model = gtk_tree_model_filter_new (model, NULL); gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (new_filter_model), filter_row, folder_view_dst, 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); @@ -2380,7 +2887,11 @@ modest_folder_view_show_non_move_folders (ModestFolderView *folder_view, gboolean show) { GtkTreeModel *model = NULL; - ModestFolderViewPrivate* priv = MODEST_FOLDER_VIEW_GET_PRIVATE(folder_view); + ModestFolderViewPrivate* priv; + + g_return_if_fail (folder_view && MODEST_IS_FOLDER_VIEW (folder_view)); + + 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())); */ @@ -2403,7 +2914,7 @@ _clipboard_set_selected_data (ModestFolderView *folder_view, 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); @@ -2421,19 +2932,53 @@ _clipboard_set_selected_data (ModestFolderView *folder_view, } static void -_clear_hidding_filter (ModestFolderView *folder_view) +_clear_hidding_filter (ModestFolderView *folder_view) { ModestFolderViewPrivate *priv; guint i; - - g_return_if_fail (MODEST_IS_FOLDER_VIEW (folder_view)); + + 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++) + for (i=0; i < priv->n_selected; i++) g_free (priv->hidding_ids[i]); g_free(priv->hidding_ids); - } + } +} + + +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 } +void +modest_folder_view_set_cell_style (ModestFolderView *self, + ModestFolderViewCellStyle cell_style) +{ + ModestFolderViewPrivate *priv = NULL; + + g_return_if_fail (MODEST_IS_FOLDER_VIEW (self)); + priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self); + priv->cell_style = cell_style; + + gtk_widget_queue_draw (GTK_WIDGET (self)); +}