X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-folder-view.c;h=cd9ad27304913ed9ea58d04d884f38b8871d904b;hp=f13d619751ae28fe198ebcae7f160b9701e6ad6a;hb=f1c835f00b0b2975cf513c2ba6b7f5a07979e37c;hpb=785d7038a08e08a7eec3c923960f201c04c0f3f5 diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c index f13d619..cd9ad27 100644 --- a/src/widgets/modest-folder-view.c +++ b/src/widgets/modest-folder-view.c @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include @@ -200,6 +201,7 @@ enum { FOLDER_SELECTION_CHANGED_SIGNAL, FOLDER_DISPLAY_NAME_CHANGED_SIGNAL, FOLDER_ACTIVATED_SIGNAL, + VISIBLE_ACCOUNT_CHANGED_SIGNAL, LAST_SIGNAL }; @@ -230,11 +232,13 @@ struct _ModestFolderViewPrivate { gchar *local_account_name; gchar *visible_account_id; + gchar *mailbox; ModestFolderViewStyle style; ModestFolderViewCellStyle cell_style; gboolean reselect; /* we use this to force a reselection of the INBOX */ gboolean show_non_move; + TnyList *list_to_move; gboolean reexpand; /* next time we expose, we'll expand all root folders */ GtkCellRenderer *messages_renderer; @@ -337,6 +341,19 @@ modest_folder_view_class_init (ModestFolderViewClass *klass) g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); + /* + * Emitted whenever the visible account changes + */ + signals[VISIBLE_ACCOUNT_CHANGED_SIGNAL] = + g_signal_new ("visible-account-changed", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (ModestFolderViewClass, + visible_account_changed), + NULL, NULL, + g_cclosure_marshal_VOID__STRING, + G_TYPE_NONE, 1, G_TYPE_STRING); + treeview_class->select_cursor_parent = NULL; #ifdef MODEST_TOOLKIT_HILDON2 @@ -500,8 +517,9 @@ convert_parent_folders_to_dots (gchar **item_name) } static void -format_compact_style (gchar **item_name, +format_compact_style (gchar **item_name, GObject *instance, + const gchar *mailbox, gboolean bold, gboolean multiaccount, gboolean *use_markup) @@ -518,6 +536,22 @@ format_compact_style (gchar **item_name, folder_type = tny_folder_get_folder_type (folder); is_special = (get_cmp_pos (folder_type, folder)!= 4); + if (mailbox) { + /* Remove mailbox prefix if any */ + gchar *prefix = g_strconcat (mailbox, MODEST_FOLDER_PATH_SEPARATOR, NULL); + if (g_str_has_prefix (*item_name, prefix)) { + gchar *new_item_name; + + new_item_name = g_strdup (*item_name + strlen (prefix)); + if (!g_ascii_strcasecmp (new_item_name, "Inbox")) { + g_free (new_item_name); + new_item_name = g_strdup (_("mcen_me_folder_inbox")); + } + g_free (*item_name); + *item_name = new_item_name; + } + } + if (!is_special || multiaccount) { TnyAccount *account = tny_folder_get_account (folder); const gchar *folder_name; @@ -604,17 +638,11 @@ text_cell_data (GtkTreeViewColumn *column, } } - if (type == TNY_FOLDER_TYPE_INBOX) { - if (inbox_is_special (TNY_FOLDER_STORE (instance))) { - 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 */ + /* 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... */ @@ -669,7 +697,7 @@ text_cell_data (GtkTreeViewColumn *column, multiaccount = (priv->style == MODEST_FOLDER_VIEW_STYLE_SHOW_ALL); /* Convert item_name to markup */ - format_compact_style (&item_name, instance, + format_compact_style (&item_name, instance, priv->mailbox, item_weight == 800, multiaccount, &use_markup); } @@ -887,6 +915,13 @@ get_folder_icons (TnyFolderType type, GObject *instance) type = modest_tny_folder_guess_folder_type (TNY_FOLDER (instance)); } + /* It's not enough with check the folder type. We need to + ensure that we're not giving a special folder icon to a + normal folder with the same name than a special folder */ + if (TNY_IS_FOLDER (instance) && + get_cmp_pos (type, TNY_FOLDER (instance)) == 4) + type = TNY_FOLDER_TYPE_NORMAL; + /* Remote folders should not be treated as special folders */ if (TNY_IS_FOLDER_STORE (instance) && !TNY_IS_ACCOUNT (instance) && @@ -1062,6 +1097,12 @@ add_columns (GtkWidget *treeview) /* Set icon and text render function */ renderer = gtk_cell_renderer_pixbuf_new(); +#ifdef MODEST_TOOLKIT_HILDON2 + g_object_set (renderer, + "xpad", MODEST_MARGIN_DEFAULT, + "ypad", MODEST_MARGIN_DEFAULT, + NULL); +#endif gtk_tree_view_column_pack_start (column, renderer, FALSE); gtk_tree_view_column_set_cell_data_func(column, renderer, icon_cell_data, treeview, NULL); @@ -1070,6 +1111,7 @@ add_columns (GtkWidget *treeview) g_object_set (renderer, #ifdef MODEST_TOOLKIT_HILDON2 "ellipsize", PANGO_ELLIPSIZE_MIDDLE, + "ypad", MODEST_MARGIN_DEFAULT, #else "ellipsize", PANGO_ELLIPSIZE_END, #endif @@ -1080,8 +1122,14 @@ add_columns (GtkWidget *treeview) priv->messages_renderer = gtk_cell_renderer_text_new (); g_object_set (priv->messages_renderer, +#ifdef MODEST_TOOLKIT_HILDON2 + "yalign", 0.0, + "ypad", MODEST_MARGIN_DEFAULT, + "xpad", MODEST_MARGIN_DOUBLE, +#else "scale", PANGO_SCALE_X_SMALL, "scale-set", TRUE, +#endif "alignment", PANGO_ALIGN_RIGHT, "align-set", TRUE, "xalign", 1.0, @@ -1119,6 +1167,7 @@ modest_folder_view_init (ModestFolderView *obj) priv->style = MODEST_FOLDER_VIEW_STYLE_SHOW_ALL; priv->cur_folder_store = NULL; priv->visible_account_id = NULL; + priv->mailbox = NULL; priv->folder_to_select = NULL; priv->outbox_deleted_handler = 0; priv->reexpand = TRUE; @@ -1134,6 +1183,7 @@ modest_folder_view_init (ModestFolderView *obj) priv->filter = MODEST_FOLDER_VIEW_FILTER_NONE; priv->reselect = FALSE; priv->show_non_move = TRUE; + priv->list_to_move = NULL; /* Build treeview */ add_columns (GTK_WIDGET (obj)); @@ -1235,6 +1285,7 @@ modest_folder_view_finalize (GObject *obj) g_free (priv->local_account_name); g_free (priv->visible_account_id); + g_free (priv->mailbox); if (priv->conf_key_signal) { g_signal_handler_disconnect (modest_runtime_get_conf (), @@ -1247,6 +1298,11 @@ modest_folder_view_finalize (GObject *obj) priv->cur_folder_store = NULL; } + if (priv->list_to_move) { + g_object_unref (priv->list_to_move); + priv->list_to_move = NULL; + } + /* Clear hidding array created by cut operation */ _clear_hidding_filter (MODEST_FOLDER_VIEW (obj)); @@ -1541,6 +1597,7 @@ on_account_removed (TnyAccountStore *account_store, /* Clear the current visible account_id */ modest_folder_view_set_account_id_of_visible_server_account (self, NULL); + modest_folder_view_set_mailbox (self, NULL); /* Call the restore method, this will set the new visible account */ modest_widget_memory_restore (modest_runtime_get_conf(), G_OBJECT(self), @@ -1657,6 +1714,138 @@ expand_root_items (ModestFolderView *self) gtk_tree_path_free (path); } +static gboolean +is_parent_of (TnyFolder *a, TnyFolder *b) +{ + const gchar *a_id; + gboolean retval = FALSE; + + a_id = tny_folder_get_id (a); + if (a_id) { + gchar *string_to_match; + const gchar *b_id; + + string_to_match = g_strconcat (a_id, "/", NULL); + b_id = tny_folder_get_id (b); + retval = g_str_has_prefix (b_id, string_to_match); + g_free (string_to_match); + } + + return retval; +} + +typedef struct _ForeachFolderInfo { + gchar *needle; + gboolean found; +} ForeachFolderInfo; + +static gboolean +foreach_folder_with_id (GtkTreeModel *model, + GtkTreePath *path, + GtkTreeIter *iter, + gpointer data) +{ + ForeachFolderInfo *info; + GObject *instance; + + info = (ForeachFolderInfo *) data; + gtk_tree_model_get (model, iter, + INSTANCE_COLUMN, &instance, + -1); + + if (TNY_IS_FOLDER (instance)) { + const gchar *id; + gchar *collate; + id = tny_folder_get_id (TNY_FOLDER (instance)); + if (id) { + collate = g_utf8_collate_key (id, -1); + info->found = !strcmp (info->needle, collate); + g_free (collate); + } + } + + if (instance) + g_object_unref (instance); + + return info->found; + +} + + +static gboolean +has_folder_with_id (ModestFolderView *self, const gchar *id) +{ + GtkTreeModel *model; + ForeachFolderInfo info = {NULL, FALSE}; + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); + info.needle = g_utf8_collate_key (id, -1); + + gtk_tree_model_foreach (model, foreach_folder_with_id, &info); + g_free (info.needle); + + return info.found; +} + +static gboolean +has_child_with_name_of (ModestFolderView *self, TnyFolder *a, TnyFolder *b) +{ + const gchar *a_id; + gboolean retval = FALSE; + + a_id = tny_folder_get_id (a); + if (a_id) { + const gchar *b_id; + b_id = tny_folder_get_id (b); + + if (b_id) { + const gchar *last_bar; + gchar *string_to_match; + last_bar = g_strrstr (b_id, "/"); + if (last_bar) + last_bar++; + else + last_bar = b_id; + string_to_match = g_strconcat (a_id, "/", last_bar, NULL); + retval = has_folder_with_id (self, string_to_match); + g_free (string_to_match); + } + } + + return retval; +} + +static gboolean +check_move_to_this_folder_valid (ModestFolderView *self, TnyFolder *folder) +{ + ModestFolderViewPrivate *priv; + TnyIterator *iterator; + gboolean retval = TRUE; + + g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (self), FALSE); + priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self); + + for (iterator = tny_list_create_iterator (priv->list_to_move); + retval && !tny_iterator_is_done (iterator); + tny_iterator_next (iterator)) { + GObject *instance; + instance = tny_iterator_get_current (iterator); + if (instance == (GObject *) folder) { + retval = FALSE; + } else if (TNY_IS_FOLDER (instance)) { + retval = !is_parent_of (TNY_FOLDER (instance), folder); + if (retval) { + retval = !has_child_with_name_of (self, folder, TNY_FOLDER (instance)); + } + } + g_object_unref (instance); + } + g_object_unref (iterator); + + return retval; +} + + /* * We use this function to implement the * MODEST_FOLDER_VIEW_STYLE_SHOW_ONE style. We only show the default @@ -1674,11 +1863,13 @@ filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer data) gboolean found = FALSE; gboolean cleared = FALSE; ModestTnyFolderRules rules = 0; + gchar *fname; g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (data), FALSE); priv = MODEST_FOLDER_VIEW_GET_PRIVATE (data); gtk_tree_model_get (model, iter, + NAME_COLUMN, &fname, TYPE_COLUMN, &type, INSTANCE_COLUMN, &instance, -1); @@ -1687,8 +1878,10 @@ filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer data) happen when the model is being modified while it's being drawn. This could occur for example when moving folders using drag&drop */ - if (!instance) + if (!instance) { + g_free (fname); return FALSE; + } if (TNY_IS_ACCOUNT (instance)) { TnyAccount *acc = TNY_ACCOUNT (instance); @@ -1728,8 +1921,17 @@ filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer data) 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; + if (strcmp (account_id, priv->visible_account_id)) { + retval = FALSE; + } else if (priv->mailbox) { + /* Filter mailboxes */ + if (!g_str_has_prefix (fname, priv->mailbox)) { + retval = FALSE; + } else if (!strcmp (fname, priv->mailbox)) { + /* Hide mailbox parent */ + retval = FALSE; + } + } } } g_object_unref (account); @@ -1753,8 +1955,13 @@ filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer data) /* 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) { - if (TNY_IS_FOLDER (instance) && + if (retval && !priv->show_non_move) { + if (priv->list_to_move && + tny_list_get_length (priv->list_to_move) > 0 && + TNY_IS_FOLDER (instance)) { + retval = check_move_to_this_folder_valid (MODEST_FOLDER_VIEW (data), TNY_FOLDER (instance)); + } + if (retval && TNY_IS_FOLDER (instance) && modest_tny_folder_is_local_folder (TNY_FOLDER (instance))) { switch (type) { case TNY_FOLDER_TYPE_OUTBOX: @@ -1785,6 +1992,45 @@ filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer data) return FALSE; } + if (retval && (priv->filter & MODEST_FOLDER_VIEW_FILTER_HIDE_FOLDERS)) { + if (TNY_IS_FOLDER (instance)) + return FALSE; + } + + if (retval && (priv->filter & MODEST_FOLDER_VIEW_FILTER_HIDE_LOCAL_FOLDERS)) { + if (TNY_IS_ACCOUNT (instance)) { + if (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (instance))) + return FALSE; + } else if (TNY_IS_FOLDER (instance)) { + if (modest_tny_folder_is_local_folder (TNY_FOLDER (instance))) + return FALSE; + } + } + + if (retval && (priv->filter & MODEST_FOLDER_VIEW_FILTER_HIDE_MCC_FOLDERS)) { + if (TNY_IS_ACCOUNT (instance)) { + if (modest_tny_account_is_memory_card_account (TNY_ACCOUNT (instance))) + return FALSE; + } else if (TNY_IS_FOLDER (instance)) { + if (modest_tny_folder_is_memory_card_folder (TNY_FOLDER (instance))) + return FALSE; + } + } + + if (retval && (priv->filter & MODEST_FOLDER_VIEW_FILTER_SHOW_ONLY_MAILBOXES)) { + /* A mailbox is a fake folder with an @ in the middle of the name */ + if (!TNY_IS_FOLDER (instance) || + !(tny_folder_get_caps (TNY_FOLDER (instance)) & TNY_FOLDER_CAPS_NOSELECT)) { + return FALSE; + } else { + const gchar *folder_name; + folder_name = tny_folder_get_name (TNY_FOLDER (instance)); + if (!folder_name || strchr (folder_name, '@') == NULL) + return FALSE; + } + + } + if (retval && (priv->filter & MODEST_FOLDER_VIEW_FILTER_CAN_HAVE_FOLDERS)) { if (TNY_IS_FOLDER (instance)) { /* Check folder rules */ @@ -1861,6 +2107,7 @@ filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer data) /* Free */ g_object_unref (instance); + g_free (fname); return retval; } @@ -2125,6 +2372,8 @@ inbox_is_special (TnyFolderStore *folder_store) last_inbox_bar = g_strrstr (downcase, "inbox/"); if ((last_inbox_bar == NULL) || (last_inbox_bar + 5 != last_bar)) is_special = FALSE; + } else { + is_special = FALSE; } g_free (downcase); } @@ -2151,7 +2400,7 @@ get_cmp_pos (TnyFolderType t, TnyFolder *folder_store) * inbox of the account, or if it's a submailbox inbox. To do * this we'll apply an heuristic rule: Find last "/" and check * if it's preceeded by another Inbox */ - is_special = is_special && inbox_is_special (TNY_FOLDER_STORE (folder_store)); + is_special = is_special && !inbox_is_special (TNY_FOLDER_STORE (folder_store)); g_object_unref (account); return is_special?0:4; } @@ -3112,6 +3361,11 @@ modest_folder_view_set_account_id_of_visible_server_account (ModestFolderView *s /* Save settings to gconf */ modest_widget_memory_save (modest_runtime_get_conf (), G_OBJECT(self), MODEST_CONF_FOLDER_VIEW_KEY); + + /* Notify observers */ + g_signal_emit (G_OBJECT(self), + signals[VISIBLE_ACCOUNT_CHANGED_SIGNAL], 0, + account_id); } const gchar * @@ -3540,18 +3794,39 @@ update_style (ModestFolderView *self) { ModestFolderViewPrivate *priv; GdkColor style_color; + PangoAttrList *attr_list; + GtkStyle *style; + PangoAttribute *attr; g_return_if_fail (MODEST_IS_FOLDER_VIEW (self)); priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self); + /* Set color */ + + attr_list = pango_attr_list_new (); if (!gtk_style_lookup_color (GTK_WIDGET (self)->style, "SecondaryTextColor", &style_color)) { gdk_color_parse ("grey", &style_color); } + attr = pango_attr_foreground_new (style_color.red, style_color.green, style_color.blue); + pango_attr_list_insert (attr_list, attr); + + /* set font */ + style = gtk_rc_get_style_by_paths (gtk_widget_get_settings + (GTK_WIDGET(self)), + "SmallSystemFont", NULL, + G_TYPE_NONE); + if (style) { + attr = pango_attr_font_desc_new (pango_font_description_copy + (style->font_desc)); + pango_attr_list_insert (attr_list, attr); - g_object_set (G_OBJECT (priv->messages_renderer), - "foreground-gdk", &style_color, - "foreground-set", TRUE, - NULL); + g_object_set (G_OBJECT (priv->messages_renderer), + "foreground-gdk", &style_color, + "foreground-set", TRUE, + "attributes", attr_list, + NULL); + pango_attr_list_unref (attr_list); + } } static void @@ -3598,3 +3873,84 @@ modest_folder_view_unset_filter (ModestFolderView *self, gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model)); } } + +gboolean +modest_folder_view_any_folder_fulfils_rules (ModestFolderView *self, + ModestTnyFolderRules rules) +{ + GtkTreeModel *filter_model; + GtkTreeIter iter; + gboolean fulfil = FALSE; + + if (!get_inner_models (self, &filter_model, NULL, NULL)) + return FALSE; + + if (!gtk_tree_model_get_iter_first (filter_model, &iter)) + return FALSE; + + do { + TnyFolderStore *folder; + + gtk_tree_model_get (filter_model, &iter, INSTANCE_COLUMN, &folder, -1); + if (folder) { + if (TNY_IS_FOLDER (folder)) { + ModestTnyFolderRules folder_rules = modest_tny_folder_get_rules (TNY_FOLDER (folder)); + /* Folder rules are negative: non_writable, non_deletable... */ + if (!(folder_rules & rules)) + fulfil = TRUE; + } + g_object_unref (folder); + } + + } while (gtk_tree_model_iter_next (filter_model, &iter) && !fulfil); + + return fulfil; +} + +void +modest_folder_view_set_list_to_move (ModestFolderView *self, + TnyList *list) +{ + ModestFolderViewPrivate *priv; + + g_return_if_fail (MODEST_IS_FOLDER_VIEW (self)); + priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self); + + if (priv->list_to_move) + g_object_unref (priv->list_to_move); + + if (list) + g_object_ref (list); + + priv->list_to_move = list; +} + +void +modest_folder_view_set_mailbox (ModestFolderView *self, const gchar *mailbox) +{ + ModestFolderViewPrivate *priv; + + g_return_if_fail (MODEST_IS_FOLDER_VIEW (self)); + priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self); + + if (priv->mailbox) + g_free (priv->mailbox); + + priv->mailbox = g_strdup (mailbox); + + /* Notify observers */ + g_signal_emit (G_OBJECT(self), + signals[VISIBLE_ACCOUNT_CHANGED_SIGNAL], 0, + priv->visible_account_id); +} + +const gchar * +modest_folder_view_get_mailbox (ModestFolderView *self) +{ + ModestFolderViewPrivate *priv; + + g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (self), NULL); + priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self); + + return (const gchar *) priv->mailbox; +}