#include <gdk/gdkkeysyms.h>
#include <tny-account-store-view.h>
#include <tny-gtk-account-list-model.h>
+#ifdef MODEST_TOOLKIT_HILDON2
+#include <tny-gtk-folder-list-store.h>
+#else
#include <tny-gtk-folder-store-tree-model.h>
+#endif
#include <tny-gtk-header-list-model.h>
+#include <tny-merge-folder.h>
#include <tny-folder.h>
#include <tny-folder-store-observer.h>
#include <tny-account-store.h>
#include <modest-widget-memory.h>
#include <modest-ui-actions.h>
#include "modest-dnd.h"
+#include "modest-ui-constants.h"
#include "widgets/modest-window.h"
/* Folder view drag types */
{ GTK_TREE_PATH_AS_STRING_LIST, GTK_TARGET_SAME_APP, MODEST_HEADER_ROW }
};
+/* Default icon sizes for Fremantle style are different */
+#ifdef MODEST_TOOLKIT_HILDON2
+#define FOLDER_ICON_SIZE MODEST_ICON_SIZE_BIG
+#else
+#define FOLDER_ICON_SIZE MODEST_ICON_SIZE_SMALL
+#endif
+
+/* Column names depending on we use list store or tree store */
+#ifdef MODEST_TOOLKIT_HILDON2
+#define NAME_COLUMN TNY_GTK_FOLDER_LIST_STORE_NAME_COLUMN
+#define UNREAD_COLUMN TNY_GTK_FOLDER_LIST_STORE_UNREAD_COLUMN
+#define ALL_COLUMN TNY_GTK_FOLDER_LIST_STORE_ALL_COLUMN
+#define TYPE_COLUMN TNY_GTK_FOLDER_LIST_STORE_TYPE_COLUMN
+#define INSTANCE_COLUMN TNY_GTK_FOLDER_LIST_STORE_INSTANCE_COLUMN
+#else
+#define NAME_COLUMN TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN
+#define UNREAD_COLUMN TNY_GTK_FOLDER_STORE_TREE_MODEL_UNREAD_COLUMN
+#define ALL_COLUMN TNY_GTK_FOLDER_STORE_TREE_MODEL_ALL_COLUMN
+#define TYPE_COLUMN TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN
+#define INSTANCE_COLUMN TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN
+#endif
+
/* '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,
+static void on_selection_changed (GtkTreeSelection *sel,
gpointer data);
-static void on_account_removed (TnyAccountStore *self,
+static void on_row_activated (GtkTreeView *treeview,
+ GtkTreePath *path,
+ GtkTreeViewColumn *column,
+ gpointer userdata);
+
+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);
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,
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_inserted_maybe_select_folder (GtkTreeModel *tree_model,
- GtkTreePath *path,
+#ifndef MODEST_TOOLKIT_HILDON2
+static void on_row_inserted_maybe_select_folder (GtkTreeModel *tree_model,
+ GtkTreePath *path,
GtkTreeIter *iter,
ModestFolderView *self);
+#endif
-static void on_display_name_changed (ModestAccountMgr *self,
+static void on_display_name_changed (ModestAccountMgr *self,
const gchar *account,
gpointer user_data);
+static void update_style (ModestFolderView *self);
+static void on_notify_style (GObject *obj, GParamSpec *spec, gpointer userdata);
+static gint get_cmp_pos (TnyFolderType t, TnyFolder *folder_store);
enum {
FOLDER_SELECTION_CHANGED_SIGNAL,
FOLDER_DISPLAY_NAME_CHANGED_SIGNAL,
+ FOLDER_ACTIVATED_SIGNAL,
LAST_SIGNAL
};
gulong account_changed_signal;
gulong conf_key_signal;
gulong display_name_changed_signal;
-
+
/* not unref this object, its a singlenton */
ModestEmailClipboard *clipboard;
/* Filter tree model */
gchar **hidding_ids;
guint n_selected;
+ ModestFolderViewFilter filter;
TnyFolderStoreQuery *query;
guint timer_expander;
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 */
+
+ GtkCellRenderer *messages_renderer;
};
#define MODEST_FOLDER_VIEW_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE((o), \
/* 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)
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;
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,
* 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,
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: */
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,
+ 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);
* 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;
/* 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));
}
static void
+convert_parent_folders_to_dots (gchar **item_name)
+{
+ gint n_parents = 0;
+ gchar *c;
+ gchar *last_separator;
+
+ if (item_name == NULL)
+ return;
+
+ for (c = *item_name; *c != '\0'; c++) {
+ if (g_str_has_prefix (c, MODEST_FOLDER_PATH_SEPARATOR)) {
+ n_parents++;
+ }
+ }
+
+ last_separator = g_strrstr (*item_name, MODEST_FOLDER_PATH_SEPARATOR);
+ if (last_separator != NULL) {
+ last_separator = last_separator + strlen (MODEST_FOLDER_PATH_SEPARATOR);
+ }
+
+ if (n_parents > 0) {
+ GString *buffer;
+ gint i;
+
+ buffer = g_string_new ("");
+ for (i = 0; i < n_parents; i++) {
+ buffer = g_string_append (buffer, MODEST_FOLDER_DOT);
+ }
+ buffer = g_string_append (buffer, last_separator);
+ g_free (*item_name);
+ *item_name = g_string_free (buffer, FALSE);
+ }
+
+}
+
+static void
+format_compact_style (gchar **item_name,
+ GObject *instance,
+ gboolean bold,
+ gboolean multiaccount,
+ gboolean *use_markup)
+{
+ TnyFolder *folder;
+ gboolean is_special;
+ TnyFolderType folder_type;
+
+ if (!TNY_IS_FOLDER (instance))
+ return;
+
+ folder = (TnyFolder *) instance;
+
+ folder_type = tny_folder_get_folder_type (folder);
+ is_special = (get_cmp_pos (folder_type, folder)!= 4);
+
+ if (!is_special || multiaccount) {
+ TnyAccount *account = tny_folder_get_account (folder);
+ const gchar *folder_name;
+ gboolean concat_folder_name = FALSE;
+ GString *buffer;
+
+ /* Should not happen */
+ if (account == NULL)
+ return;
+
+ /* convert parent folders to dots */
+ convert_parent_folders_to_dots (item_name);
+
+ folder_name = tny_folder_get_name (folder);
+ if (g_str_has_suffix (*item_name, folder_name)) {
+ gchar *offset = g_strrstr (*item_name, folder_name);
+ *offset = '\0';
+ concat_folder_name = TRUE;
+ }
+
+ buffer = g_string_new ("");
+
+ buffer = g_string_append (buffer, *item_name);
+ if (concat_folder_name) {
+ if (bold) buffer = g_string_append (buffer, "<span weight='bold'>");
+ buffer = g_string_append (buffer, folder_name);
+ if (bold) buffer = g_string_append (buffer, "</span>");
+ }
+ g_free (*item_name);
+ g_object_unref (account);
+
+ *item_name = g_string_free (buffer, FALSE);
+ *use_markup = bold;
+ } else {
+ *use_markup = FALSE;
+ }
+}
+
+static void
text_cell_data (GtkTreeViewColumn *column,
GtkCellRenderer *renderer,
GtkTreeModel *tree_model,
gchar *fname = NULL;
TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
GObject *instance = NULL;
+ gboolean use_markup = FALSE;
gtk_tree_model_get (tree_model, iter,
- TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &fname,
- TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type,
- TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &instance,
+ NAME_COLUMN, &fname,
+ TYPE_COLUMN, &type,
+ INSTANCE_COLUMN, &instance,
-1);
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));
g_free (fname);
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));
+ }
+ }
+
+ 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
/* 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... */
+ (type == TNY_FOLDER_TYPE_MERGE)) { /* _OUTBOX actually returns _MERGE... */
number = tny_folder_get_all_count (TNY_FOLDER(instance));
- else
+ drafts = TRUE;
+ } else {
number = tny_folder_get_unread_count (TNY_FOLDER(instance));
-
- /* Use bold font style if there are unread or unset messages */
- if (number > 0) {
- if (type == TNY_FOLDER_TYPE_INBOX)
- item_name = g_strdup_printf ("%s (%d)", _("mcen_me_folder_inbox"), number);
- else
- item_name = g_strdup_printf ("%s (%d)", fname, number);
- item_weight = 800;
+ drafts = FALSE;
+ }
+
+ if (priv->cell_style == MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT) {
+ item_name = g_strdup (fname);
+ if (number > 0) {
+ item_weight = 800;
+ } else {
+ item_weight = 400;
+ }
} else {
- if (type == TNY_FOLDER_TYPE_INBOX)
- item_name = g_strdup (_("mcen_me_folder_inbox"));
- 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;
+ item_weight = 400;
+ }
}
-
+
} else if (TNY_IS_ACCOUNT (instance)) {
/* If it's a server account */
if (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (instance))) {
item_name = g_strdup (priv->local_account_name);
item_weight = 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
+ /* fname is only correct when the items are first
+ * added to the model, not when the account is
* changed later, so get the name from the account
* instance: */
item_name = g_strdup (tny_account_get_name (TNY_ACCOUNT (instance)));
item_weight = 800;
}
}
-
+
if (!item_name)
item_name = g_strdup ("unknown");
-
+
+ if (priv->cell_style == MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT) {
+ gboolean multiaccount;
+
+ multiaccount = (priv->style == MODEST_FOLDER_VIEW_STYLE_SHOW_ALL);
+ /* Convert item_name to markup */
+ format_compact_style (&item_name, instance,
+ item_weight == 800,
+ multiaccount, &use_markup);
+ }
+
if (item_name && item_weight) {
/* Set the name in the treeview cell: */
- g_object_set (rendobj,"text", item_name, "weight", item_weight, NULL);
-
+ if (use_markup)
+ g_object_set (rendobj, "markup", item_name, NULL);
+ else
+ g_object_set (rendobj, "text", item_name, "weight", item_weight, NULL);
+
/* Notify display name observers */
/* TODO: What listens for this signal, and how can it use only the new name? */
if (((GObject *) priv->cur_folder_store) == instance) {
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),
+ modest_tny_account_get_mmc_account_name (TNY_STORE_ACCOUNT (instance),
on_get_mmc_account_name, callback_data);
}
- end:
+ end:
if (instance)
g_object_unref (G_OBJECT (instance));
if (fname)
g_free (fname);
}
+static void
+messages_cell_data (GtkTreeViewColumn *column,
+ GtkCellRenderer *renderer,
+ GtkTreeModel *tree_model,
+ GtkTreeIter *iter,
+ gpointer data)
+{
+ ModestFolderView *self;
+ ModestFolderViewPrivate *priv;
+ GObject *rendobj = (GObject *) renderer;
+ TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
+ GObject *instance = NULL;
+ gchar *item_name = NULL;
+
+ gtk_tree_model_get (tree_model, iter,
+ TYPE_COLUMN, &type,
+ INSTANCE_COLUMN, &instance,
+ -1);
+ if (!instance)
+ goto end;
+
+ self = MODEST_FOLDER_VIEW (data);
+ priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
+
+
+ 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));
+ } 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));
+ }
+ }
+
+ /* 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 {
+ number = tny_folder_get_unread_count (TNY_FOLDER(instance));
+ drafts = FALSE;
+ }
+
+ if (priv->cell_style == MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT) {
+ if (number > 0) {
+ item_name = g_strdup_printf (drafts?_("mcen_ti_messages"):_("mcen_ti_new_messages"),
+ number);
+ }
+ }
+
+ }
+
+ if (!item_name)
+ item_name = g_strdup ("");
+
+ if (item_name) {
+ /* Set the name in the treeview cell: */
+ g_object_set (rendobj,"text", item_name, NULL);
+
+ g_free (item_name);
+
+ }
+
+ end:
+ if (instance)
+ g_object_unref (G_OBJECT (instance));
+}
+
typedef struct {
GdkPixbuf *pixbuf;
static inline GdkPixbuf *
-get_composite_pixbuf (const gchar *icon_name,
- const gint size,
+get_composite_pixbuf (const gchar *icon_name,
+ const gint size,
GdkPixbuf *base_pixbuf)
{
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_composite (emblem, retval, 0, 0,
+ MIN (gdk_pixbuf_get_width (emblem),
gdk_pixbuf_get_width (retval)),
- MIN (gdk_pixbuf_get_height (emblem),
+ MIN (gdk_pixbuf_get_height (emblem),
gdk_pixbuf_get_height (retval)),
0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
g_object_unref (emblem);
ThreePixbufs *retval;
if (!*pixbuf)
- *pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (icon_code, MODEST_ICON_SIZE_SMALL));
-
+ *pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (icon_code, FOLDER_ICON_SIZE));
+
if (!*pixbuf_open)
*pixbuf_open = get_composite_pixbuf ("qgn_list_gene_fldr_exp",
- MODEST_ICON_SIZE_SMALL,
+ FOLDER_ICON_SIZE,
*pixbuf);
-
+
if (!*pixbuf_close)
*pixbuf_close = get_composite_pixbuf ("qgn_list_gene_fldr_clp",
- MODEST_ICON_SIZE_SMALL,
+ FOLDER_ICON_SIZE,
*pixbuf);
retval = g_slice_new0 (ThreePixbufs);
return retval;
}
-static ThreePixbufs*
+static inline 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,
+ *normal_pixbuf = NULL, *anorm_pixbuf = NULL, *mmc_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,
+ *normal_pixbuf_open = NULL, *anorm_pixbuf_open = NULL, *mmc_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,
+ *normal_pixbuf_close = NULL, *anorm_pixbuf_close = NULL, *mmc_pixbuf_close = NULL,
*ammc_pixbuf_close = NULL, *avirt_pixbuf_close = NULL;
ThreePixbufs *retval = NULL;
- /* 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 ||
+ /* 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));
+ type = modest_tny_folder_guess_folder_type (TNY_FOLDER (instance));
+ }
+
+ /* Remote folders should not be treated as special folders */
+ if (TNY_IS_FOLDER_STORE (instance) &&
+ !TNY_IS_ACCOUNT (instance) &&
+ type != TNY_FOLDER_TYPE_INBOX &&
+ modest_tny_folder_store_is_remote (TNY_FOLDER_STORE (instance))) {
+#ifdef MODEST_TOOLKIT_HILDON2
+ return get_composite_icons (MODEST_FOLDER_ICON_ACCOUNT,
+ &anorm_pixbuf,
+ &anorm_pixbuf_open,
+ &anorm_pixbuf_close);
+#else
+ return get_composite_icons (MODEST_FOLDER_ICON_NORMAL,
+ &normal_pixbuf,
+ &normal_pixbuf_open,
+ &normal_pixbuf_close);
+#endif
}
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))) {
retval = get_composite_icons (MODEST_FOLDER_ICON_LOCAL_FOLDERS,
&avirt_pixbuf,
&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,
retval = get_composite_icons (MODEST_FOLDER_ICON_JUNK,
&junk_pixbuf,
&junk_pixbuf_open,
- &junk_pixbuf_close);
+ &junk_pixbuf_close);
break;
case TNY_FOLDER_TYPE_SENT:
retval = get_composite_icons (MODEST_FOLDER_ICON_SENT,
&sent_pixbuf,
&sent_pixbuf_open,
- &sent_pixbuf_close);
+ &sent_pixbuf_close);
break;
case TNY_FOLDER_TYPE_TRASH:
retval = get_composite_icons (MODEST_FOLDER_ICON_TRASH,
&trash_pixbuf,
&trash_pixbuf_open,
- &trash_pixbuf_close);
+ &trash_pixbuf_close);
break;
case TNY_FOLDER_TYPE_DRAFTS:
retval = get_composite_icons (MODEST_FOLDER_ICON_DRAFTS,
&draft_pixbuf,
&draft_pixbuf_open,
- &draft_pixbuf_close);
- break;
+ &draft_pixbuf_close);
+ break;
+ case TNY_FOLDER_TYPE_ARCHIVE:
+ retval = get_composite_icons (MODEST_FOLDER_ICON_MMC_FOLDER,
+ &mmc_pixbuf,
+ &mmc_pixbuf_open,
+ &mmc_pixbuf_close);
+ break;
case TNY_FOLDER_TYPE_NORMAL:
default:
- retval = get_composite_icons (MODEST_FOLDER_ICON_NORMAL,
- &normal_pixbuf,
- &normal_pixbuf_open,
- &normal_pixbuf_close);
- break;
+ /* Memory card folders could have an special icon */
+ if (modest_tny_folder_is_memory_card_folder (TNY_FOLDER (instance))) {
+ retval = get_composite_icons (MODEST_FOLDER_ICON_MMC_FOLDER,
+ &mmc_pixbuf,
+ &mmc_pixbuf_open,
+ &mmc_pixbuf_close);
+ } else {
+ retval = get_composite_icons (MODEST_FOLDER_ICON_NORMAL,
+ &normal_pixbuf,
+ &normal_pixbuf_open,
+ &normal_pixbuf_close);
+ }
+ break;
}
return retval;
}
static void
-icon_cell_data (GtkTreeViewColumn *column,
+icon_cell_data (GtkTreeViewColumn *column,
GtkCellRenderer *renderer,
- GtkTreeModel *tree_model,
- GtkTreeIter *iter,
+ GtkTreeModel *tree_model,
+ GtkTreeIter *iter,
gpointer data)
{
GObject *rendobj = NULL, *instance = NULL;
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,
+ TYPE_COLUMN, &type,
+ INSTANCE_COLUMN, &instance,
-1);
- if (!instance)
+ if (!instance)
return;
has_children = gtk_tree_model_iter_has_child (tree_model, iter);
- pixbufs = get_folder_icons (type, instance);
+ pixbufs = get_folder_icons (type, instance);
g_object_unref (instance);
/* Set pixbuf */
}
free_pixbufs (pixbufs);
-
- return;
}
static void
GtkTreeViewColumn *column;
GtkCellRenderer *renderer;
GtkTreeSelection *sel;
+ ModestFolderViewPrivate *priv;
+
+ priv = MODEST_FOLDER_VIEW_GET_PRIVATE(treeview);
/* 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();
- g_object_set (renderer, "ellipsize", PANGO_ELLIPSIZE_END,
- "ellipsize-set", TRUE, NULL);
+ g_object_set (renderer,
+#ifdef MODEST_TOOLKIT_HILDON2
+ "ellipsize", PANGO_ELLIPSIZE_MIDDLE,
+#else
+ "ellipsize", PANGO_ELLIPSIZE_END,
+#endif
+ "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);
-
+
+ priv->messages_renderer = gtk_cell_renderer_text_new ();
+ g_object_set (priv->messages_renderer,
+ "scale", PANGO_SCALE_X_SMALL,
+ "scale-set", TRUE,
+ "alignment", PANGO_ALIGN_RIGHT,
+ "align-set", TRUE,
+ "xalign", 1.0,
+ NULL);
+ gtk_tree_view_column_pack_start (column, priv->messages_renderer, FALSE);
+ gtk_tree_view_column_set_cell_data_func(column, priv->messages_renderer,
+ messages_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);
/* 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);
{
ModestFolderViewPrivate *priv;
ModestConf *conf;
-
+
priv = MODEST_FOLDER_VIEW_GET_PRIVATE(obj);
-
+
priv->timer_expander = 0;
priv->account_store = NULL;
priv->query = NULL;
priv->clipboard = modest_runtime_get_email_clipboard ();
priv->hidding_ids = NULL;
priv->n_selected = 0;
+ priv->filter = MODEST_FOLDER_VIEW_FILTER_NONE;
priv->reselect = FALSE;
priv->show_non_move = TRUE;
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 =
+ priv->display_name_changed_signal =
g_signal_connect (modest_runtime_get_account_mgr (),
"display_name_changed",
G_CALLBACK (on_display_name_changed),
* Track changes in the local account name (in the device it
* will be the device name)
*/
- priv->conf_key_signal = g_signal_connect (G_OBJECT(conf),
+ 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);
+
+ update_style (obj);
+ g_signal_connect (G_OBJECT (obj), "notify::style", G_CALLBACK (on_notify_style), (gpointer) obj);
+
+
}
static void
{
ModestFolderViewPrivate *priv;
GtkTreeSelection *sel;
-
+
g_return_if_fail (obj);
-
+
priv = MODEST_FOLDER_VIEW_GET_PRIVATE(obj);
if (priv->timer_expander != 0) {
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;
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);
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);
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)
{
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);
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 */
/* 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));
}
TnyAccount *selected_folder_account = NULL;
if (TNY_IS_FOLDER (priv->cur_folder_store)) {
- selected_folder_account =
+ selected_folder_account =
modest_tny_folder_get_account (TNY_FOLDER (priv->cur_folder_store));
} else {
- selected_folder_account =
+ selected_folder_account =
TNY_ACCOUNT (g_object_ref (priv->cur_folder_store));
}
}
static void
-on_account_changed (TnyAccountStore *account_store,
+on_account_changed (TnyAccountStore *account_store,
TnyAccount *tny_account,
gpointer user_data)
{
/* 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));
}
static void
-on_account_removed (TnyAccountStore *account_store,
+on_account_removed (TnyAccountStore *account_store,
TnyAccount *account,
gpointer user_data)
{
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));
modest_folder_view_set_title (ModestFolderView *self, const gchar *title)
{
GtkTreeViewColumn *col;
-
+
g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self));
col = gtk_tree_view_get_column (GTK_TREE_VIEW(self), 0);
}
static gboolean
-modest_folder_view_on_map (ModestFolderView *self,
+modest_folder_view_on_map (ModestFolderView *self,
GdkEventExpose *event,
gpointer data)
{
}
if (priv->reexpand) {
- expand_root_items (self);
+ expand_root_items (self);
priv->reexpand = FALSE;
}
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);
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);
}
* MODEST_FOLDER_VIEW_STYLE_SHOW_ONE style. We only show the default
* account in this case, and the local folders.
*/
-static gboolean
+static gboolean
filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
{
ModestFolderViewPrivate *priv;
guint i;
gboolean found = FALSE;
gboolean cleared = FALSE;
+ ModestTnyFolderRules rules = 0;
g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (data), FALSE);
priv = MODEST_FOLDER_VIEW_GET_PRIVATE (data);
gtk_tree_model_get (model, iter,
- TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type,
- TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &instance,
+ TYPE_COLUMN, &type,
+ INSTANCE_COLUMN, &instance,
-1);
/* Do not show if there is no instance, this could indeed
if (!instance)
return FALSE;
- if (type == TNY_FOLDER_TYPE_ROOT) {
- /* TNY_FOLDER_TYPE_ROOT means that the instance is an
- account instead of a folder. */
- if (TNY_IS_ACCOUNT (instance)) {
- TnyAccount *acc = TNY_ACCOUNT (instance);
- const gchar *account_id = tny_account_get_id (acc);
-
- /* 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 {
+ if (TNY_IS_ACCOUNT (instance)) {
+#ifdef MODEST_TOOLKIT_HILDON2
+ /* In hildon 2.2 we don't show the account rows */
+ return FALSE;
+#else
+ TnyAccount *acc = TNY_ACCOUNT (instance);
+ const gchar *account_id = tny_account_get_id (acc);
+
+ /* 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;
- }
- }
-
- /* 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))
+ } else {
retval = FALSE;
+ }
+ }
+
+ /* Never show these to the user. They are merged into one folder
+ * in the local-folders account instead: */
+ if (retval && MODEST_IS_TNY_OUTBOX_ACCOUNT (acc))
+ retval = FALSE;
+#endif
+ } else {
+ if (priv->style == MODEST_FOLDER_VIEW_STYLE_SHOW_ONE) {
+ /* Only show special folders for current account if needed */
+ if (TNY_IS_FOLDER (instance) && !TNY_IS_MERGE_FOLDER (instance)) {
+ TnyAccount *account;
+
+ account = tny_folder_get_account (TNY_FOLDER (instance));
+
+ if (TNY_IS_ACCOUNT (account)) {
+ const gchar *account_id = tny_account_get_id (account);
+
+ if (!modest_tny_account_is_virtual_local_folders (account) &&
+ 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;
+ }
+ }
+ g_object_unref (account);
+ }
+ }
+
}
}
/* 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) {
type = modest_tny_folder_guess_folder_type(TNY_FOLDER(instance));
if (type == TNY_FOLDER_TYPE_INVALID)
g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__);
-
- if (type == TNY_FOLDER_TYPE_OUTBOX ||
+
+ if (type == TNY_FOLDER_TYPE_OUTBOX ||
type == TNY_FOLDER_TYPE_SENT
|| type == TNY_FOLDER_TYPE_DRAFTS)
retval = FALSE;
break;
}
}
-
+
+ /* apply special filters */
+ if (retval && (priv->filter & MODEST_FOLDER_VIEW_FILTER_CAN_HAVE_FOLDERS)) {
+ if (TNY_IS_FOLDER (instance)) {
+ TnyFolderCaps capabilities;
+
+ capabilities = tny_folder_get_caps (TNY_FOLDER (instance));
+ retval = !(capabilities & TNY_FOLDER_CAPS_NOCHILDREN);
+
+ if (retval) {
+ retval = ((type != TNY_FOLDER_TYPE_DRAFTS) &&
+ (type != TNY_FOLDER_TYPE_OUTBOX) &&
+ (type != TNY_FOLDER_TYPE_SENT));
+ }
+ } else if (TNY_IS_ACCOUNT (instance)) {
+ retval = FALSE;
+ }
+ }
+
+ if (retval && (priv->filter & MODEST_FOLDER_VIEW_FILTER_HIDE_MANDATORY_FOLDERS)) {
+ if (TNY_IS_FOLDER (instance)) {
+ TnyFolderType guess_type;
+
+ if (TNY_FOLDER_TYPE_NORMAL) {
+ guess_type = modest_tny_folder_guess_folder_type (TNY_FOLDER (instance));
+ } else {
+ guess_type = type;
+ }
+
+ switch (type) {
+ case TNY_FOLDER_TYPE_OUTBOX:
+ case TNY_FOLDER_TYPE_SENT:
+ case TNY_FOLDER_TYPE_DRAFTS:
+ case TNY_FOLDER_TYPE_ARCHIVE:
+ case TNY_FOLDER_TYPE_INBOX:
+ retval = FALSE;
+ break;
+ case TNY_FOLDER_TYPE_UNKNOWN:
+ case TNY_FOLDER_TYPE_NORMAL:
+ break;
+ default:
+ break;
+ }
+
+ } else if (TNY_IS_ACCOUNT (instance)) {
+ retval = FALSE;
+ }
+ }
+
+ if (retval && TNY_IS_FOLDER (instance)) {
+ rules = modest_tny_folder_get_rules (TNY_FOLDER (instance));
+ }
+
+ if (retval && (priv->filter & MODEST_FOLDER_VIEW_FILTER_DELETABLE)) {
+ if (TNY_IS_FOLDER (instance)) {
+ retval = !(rules & MODEST_FOLDER_RULES_FOLDER_NON_DELETABLE);
+ } else if (TNY_IS_ACCOUNT (instance)) {
+ retval = FALSE;
+ }
+ }
+
+ if (retval && (priv->filter & MODEST_FOLDER_VIEW_FILTER_RENAMEABLE)) {
+ if (TNY_IS_FOLDER (instance)) {
+ retval = !(rules & MODEST_FOLDER_RULES_FOLDER_NON_RENAMEABLE);
+ } else if (TNY_IS_ACCOUNT (instance)) {
+ retval = FALSE;
+ }
+ }
+
+ if (retval && (priv->filter & MODEST_FOLDER_VIEW_FILTER_MOVEABLE)) {
+ if (TNY_IS_FOLDER (instance)) {
+ retval = !(rules & MODEST_FOLDER_RULES_FOLDER_NON_MOVEABLE);
+ } else if (TNY_IS_ACCOUNT (instance)) {
+ retval = FALSE;
+ }
+ }
+
/* Free */
g_object_unref (instance);
TnyAccountStore *account_store)
{
ModestFolderViewPrivate *priv;
- GtkTreeModel *model /* , *old_model */;
+ GtkTreeModel *model /* , *old_model */;
GtkTreeModel *filter_model = NULL, *sortable = NULL;
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),
signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0,
/* FIXME: the local accounts are not shown when the query
selects only the subscribed folders */
+#ifdef MODEST_TOOLKIT_HILDON2
+ model = tny_gtk_folder_list_store_new_with_flags (NULL,
+ TNY_GTK_FOLDER_LIST_STORE_FLAG_SHOW_PATH);
+ tny_gtk_folder_list_store_set_path_separator (TNY_GTK_FOLDER_LIST_STORE (model),
+ MODEST_FOLDER_PATH_SEPARATOR);
+#else
model = tny_gtk_folder_store_tree_model_new (NULL);
+#endif
/* Get the accounts: */
tny_account_store_get_accounts (TNY_ACCOUNT_STORE(account_store),
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,
+ NAME_COLUMN,
GTK_SORT_ASCENDING);
gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (sortable),
- TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN,
+ NAME_COLUMN,
cmp_rows, NULL, NULL);
/* Create filter model */
/* Set new model */
gtk_tree_view_set_model (GTK_TREE_VIEW(self), filter_model);
+#ifndef MODEST_TOOLKIT_HILDON2
g_signal_connect (G_OBJECT(filter_model), "row-inserted",
(GCallback) on_row_inserted_maybe_select_folder, self);
+#endif
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;
}
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 (selected) {
gtk_tree_model_get (model, &iter,
- TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder,
+ INSTANCE_COLUMN, &folder,
-1);
/* If the folder is the same do not notify */
return;
}
}
-
+
/* Current folder was unselected */
if (priv->cur_folder_store) {
/* We must do this firstly because a libtinymail-camel
}
}
+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,
+ INSTANCE_COLUMN, &folder,
+ -1);
+
+ g_signal_emit (G_OBJECT(self),
+ signals[FOLDER_ACTIVATED_SIGNAL],
+ 0, folder);
+
+#ifdef MODEST_TOOLKIT_HILDON2
+ HildonUIMode ui_mode;
+ g_object_get (G_OBJECT (self), "hildon-ui-mode", &ui_mode, NULL);
+ if (ui_mode == HILDON_UI_MODE_NORMAL) {
+ if (priv->cur_folder_store)
+ g_object_unref (priv->cur_folder_store);
+ priv->cur_folder_store = g_object_ref (folder);
+ }
+#endif
+
+ g_object_unref (folder);
+}
+
TnyFolderStore *
modest_folder_view_get_selected (ModestFolderView *self)
{
ModestFolderViewPrivate *priv;
-
+
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);
{
/* 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;
}
static gint
-get_cmp_subfolder_type_pos (TnyFolderType t)
+get_cmp_pos (TnyFolderType t, TnyFolder *folder_store)
{
+ TnyAccount *account;
+ gboolean is_special;
/* Inbox, Outbox, Drafts, Sent, User */
/* 0, 1, 2, 3, 4 */
+ if (!TNY_IS_FOLDER (folder_store))
+ return 4;
switch (t) {
case TNY_FOLDER_TYPE_INBOX:
- return 0;
- break;
+ {
+ account = tny_folder_get_account (folder_store);
+ is_special = (get_cmp_rows_type_pos (G_OBJECT (account)) == 0);
+ g_object_unref (account);
+ return is_special?0:4;
+ }
+ break;
case TNY_FOLDER_TYPE_OUTBOX:
- return 1;
- break;
- case TNY_FOLDER_TYPE_DRAFTS:
return 2;
break;
+ case TNY_FOLDER_TYPE_DRAFTS:
+ {
+ account = tny_folder_get_account (folder_store);
+ is_special = (get_cmp_rows_type_pos (G_OBJECT (account)) == 1);
+ g_object_unref (account);
+ return is_special?1:4;
+ }
+ break;
case TNY_FOLDER_TYPE_SENT:
- return 3;
- break;
+ {
+ account = tny_folder_get_account (folder_store);
+ is_special = (get_cmp_rows_type_pos (G_OBJECT (account)) == 1);
+ g_object_unref (account);
+ return is_special?3:4;
+ }
+ break;
default:
return 4;
}
}
+static gint
+compare_account_names (TnyAccount *a1, TnyAccount *a2)
+{
+ const gchar *a1_name, *a2_name;
+
+ a1_name = tny_account_get_name (a1);
+ a2_name = tny_account_get_name (a2);
+
+ return modest_text_utils_utf8_strcmp (a1_name, a2_name, TRUE);
+}
+
+static gint
+compare_accounts (TnyFolderStore *s1, TnyFolderStore *s2)
+{
+ TnyAccount *a1, *a2;
+ gint cmp;
+
+ if (TNY_IS_ACCOUNT (s1)) {
+ a1 = TNY_ACCOUNT (g_object_ref (s1));
+ } else {
+ a1 = tny_folder_get_account (TNY_FOLDER (s1));
+ }
+
+ if (TNY_IS_ACCOUNT (s2)) {
+ a2 = TNY_ACCOUNT (g_object_ref (s2));
+ } else {
+ a2 = tny_folder_get_account (TNY_FOLDER (s2));
+ }
+
+ if (a1 == a2) {
+ cmp = 0;
+ goto finish;
+ }
+ /* First we sort with the type of account */
+ cmp = get_cmp_rows_type_pos (G_OBJECT (a1)) - get_cmp_rows_type_pos (G_OBJECT (a2));
+ if (cmp != 0)
+ goto finish;
+
+ cmp = compare_account_names (a1, a2);
+
+finish:
+ g_object_unref (a1);
+ g_object_unref (a2);
+
+ return cmp;
+}
+
+static gint
+compare_accounts_first (TnyFolderStore *s1, TnyFolderStore *s2)
+{
+ gint is_account1, is_account2;
+
+ is_account1 = TNY_IS_ACCOUNT (s1)?1:0;
+ is_account2 = TNY_IS_ACCOUNT (s2)?1:0;
+
+ return is_account2 - is_account1;
+}
+
/*
* This function orders the mail accounts according to these rules:
* 1st - remote accounts
GObject *folder2 = NULL;
gtk_tree_model_get (tree_model, iter1,
- TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &name1,
- TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type,
- TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder1,
+ NAME_COLUMN, &name1,
+ TYPE_COLUMN, &type,
+ INSTANCE_COLUMN, &folder1,
-1);
gtk_tree_model_get (tree_model, iter2,
- TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &name2,
- TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type2,
- TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder2,
+ NAME_COLUMN, &name2,
+ TYPE_COLUMN, &type2,
+ INSTANCE_COLUMN, &folder2,
-1);
/* Return if we get no folder. This could happen when folder
if (!folder1 || !folder2)
goto finish;
- if (type == TNY_FOLDER_TYPE_ROOT) {
- /* 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",
- __FUNCTION__, G_OBJECT_TYPE_NAME(folder1), pos1, G_OBJECT_TYPE_NAME(folder2), pos2); */
- if (pos1 < pos2)
- cmp = -1;
- else if (pos1 > pos2)
- 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) {
- cmp = -1;
- } else if (!account_id2) {
- cmp = +1;
- } else if (!strcmp (account_id, MODEST_MMC_ACCOUNT_ID)) {
- cmp = +1;
- } else {
- cmp = modest_text_utils_utf8_strcmp (name1, name2, TRUE);
- }
- }
- } else {
- gint cmp1 = 0, cmp2 = 0;
- /* get the parent to know if it's a local folder */
-
- GtkTreeIter parent;
- gboolean has_parent;
- has_parent = gtk_tree_model_iter_parent (tree_model, &parent, iter1);
- if (has_parent) {
- GObject *parent_folder;
- TnyFolderType parent_type = TNY_FOLDER_TYPE_UNKNOWN;
- gtk_tree_model_get (tree_model, &parent,
- TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &parent_type,
- TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &parent_folder,
- -1);
- if ((parent_type == TNY_FOLDER_TYPE_ROOT) &&
- TNY_IS_ACCOUNT (parent_folder)) {
- 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);
- }
-
- /* if they are not local folders */
- if (cmp1 == cmp2) {
- cmp1 = get_cmp_subfolder_type_pos (tny_folder_get_folder_type (TNY_FOLDER (folder1)));
- cmp2 = get_cmp_subfolder_type_pos (tny_folder_get_folder_type (TNY_FOLDER (folder2)));
- }
+ /* Sort by type. First the special folders, then the archives */
+ cmp = get_cmp_pos (type, (TnyFolder *) folder1) - get_cmp_pos (type2, (TnyFolder *) folder2);
+ if (cmp != 0)
+ goto finish;
- if (cmp1 == cmp2)
- cmp = modest_text_utils_utf8_strcmp (name1, name2, TRUE);
- else
- cmp = (cmp1 - cmp2);
- }
+ /* Now we sort using the account of each folder */
+ cmp = compare_accounts (TNY_FOLDER_STORE (folder1), TNY_FOLDER_STORE (folder2));
+ if (cmp != 0)
+ goto finish;
+
+ /* Each group is preceeded by its account */
+ cmp = compare_accounts_first (TNY_FOLDER_STORE (folder1), TNY_FOLDER_STORE (folder2));
+ if (cmp != 0)
+ goto finish;
-finish:
+ /* Pure sort by name */
+ cmp = modest_text_utils_utf8_strcmp (name1, name2, TRUE);
+ finish:
if (folder1)
g_object_unref(G_OBJECT(folder1));
if (folder2)
g_free (name1);
g_free (name2);
- return cmp;
+ return cmp;
}
/*****************************************************************************/
* source for dnd after the event drop happened
*/
static void
-on_drag_data_get (GtkWidget *widget, GdkDragContext *context, GtkSelectionData *selection_data,
+on_drag_data_get (GtkWidget *widget, GdkDragContext *context, GtkSelectionData *selection_data,
guint info, guint time, gpointer data)
{
GtkTreeSelection *selection;
GtkTreeModel *model;
GtkTreeIter iter;
GtkTreePath *source_row;
-
+
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget));
if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
gtk_tree_set_row_drag_data (selection_data,
model,
source_row);
-
+
gtk_tree_path_free (source_row);
}
}
}
static void
-xfer_folder_cb (ModestMailOperation *mail_op,
+xfer_folder_cb (ModestMailOperation *mail_op,
TnyFolder *new_folder,
gpointer user_data)
{
- if (new_folder) {
+ if (new_folder) {
/* Select the folder */
- modest_folder_view_select_folder (MODEST_FOLDER_VIEW (user_data),
+ modest_folder_view_select_folder (MODEST_FOLDER_VIEW (user_data),
new_folder, FALSE);
}
}
{
GtkTreeIter iter;
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,
+ INSTANCE_COLUMN, &folder,
-1);
return folder;
}
ModestWindowMgr *mgr = NULL;
ModestWindow *main_win = NULL;
gchar **uris, **tmp;
-
+
/* Build the list of headers */
mgr = modest_runtime_get_window_mgr ();
headers = tny_simple_list_new ();
/* 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,
+ 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 */
}
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 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,
+ gtk_tree_model_get (dest_model, &dest_iter,
+ INSTANCE_COLUMN,
&folder, -1);
-
+
if (!folder || !TNY_IS_FOLDER(folder)) {
/* g_warning ("%s: not a valid target folder (%p)", __FUNCTION__, 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! */
}
-
+
/* Ask for confirmation to move */
main_win = modest_window_mgr_get_main_window (mgr, FALSE); /* don't create */
if (!main_win) {
}
/* Transfer messages */
- modest_ui_actions_transfer_messages_helper (GTK_WINDOW (main_win), src_folder,
+ modest_ui_actions_transfer_messages_helper (GTK_WINDOW (main_win), src_folder,
headers, folder);
-
+
/* Frees */
cleanup:
if (G_IS_OBJECT (src_folder))
TnyFolderStore *src_folder;
TnyFolderStore *dst_folder;
ModestFolderView *folder_view;
- DndHelper *helper;
+ DndHelper *helper;
} DndFolderInfo;
static void
}
static void
-drag_and_drop_from_folder_view_src_folder_performer (gboolean canceled,
+drag_and_drop_from_folder_view_src_folder_performer (gboolean canceled,
GError *err,
- GtkWindow *parent_window,
- TnyAccount *account,
+ GtkWindow *parent_window,
+ TnyAccount *account,
gpointer user_data)
{
DndFolderInfo *info = NULL;
xfer_folder_cb,
info->helper->folder_view);
- /* Frees */
+ /* 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,
+drag_and_drop_from_folder_view_dst_folder_performer (gboolean canceled,
GError *err,
- GtkWindow *parent_window,
- TnyAccount *account,
+ GtkWindow *parent_window,
+ TnyAccount *account,
gpointer user_data)
{
DndFolderInfo *info = NULL;
dnd_helper_destroyer (helper);
return;
}
-
+
if (!forbidden) {
/* check the folder rules for the destination */
folder = tree_path_to_folder (dest_model, dest_row);
forbidden = rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE;
} else if (TNY_IS_FOLDER_STORE(folder)) {
/* enable local root as destination for folders */
- if (!MODEST_IS_TNY_LOCAL_FOLDERS_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);
}
-
+
/* Check if the drag is possible */
if (forbidden || !gtk_tree_path_compare (helper->source_row, dest_row)) {
+ /* 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,
+ 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,
+ INSTANCE_COLUMN,
&folder, -1);
/* Create the info for the performer */
dest_folder,
drag_and_drop_from_folder_view_dst_folder_performer,
info);
-
+
/* Frees */
g_object_unref (dest_folder);
g_object_unref (folder);
* 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;
&dest_row, &pos);
/* Only allow drops IN other rows */
- if (!dest_row ||
- pos == GTK_TREE_VIEW_DROP_BEFORE ||
+ if (!dest_row ||
+ pos == GTK_TREE_VIEW_DROP_BEFORE ||
pos == GTK_TREE_VIEW_DROP_AFTER)
goto end;
dest_row,
selection_data);
} else {
- DndHelper *helper = NULL;
+ DndHelper *helper = NULL;
/* Get the source model and row */
gtk_tree_get_row_drag_data (selection_data,
drag_and_drop_from_folder_view (source_model,
dest_model,
dest_row,
- selection_data,
+ selection_data,
helper);
gtk_tree_path_free (source_row);
gint x,
gint y,
guint time,
- gpointer user_data)
+ gpointer user_data)
{
gpointer target;
GtkTreePath *dest_path = NULL;
GtkTreeViewDropPosition pos;
gboolean result = FALSE;
-
+
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)) {
else {
if (dest_path)
gtk_tree_path_free (dest_path);
-
+
result = TRUE;
}
-
+
gdk_threads_leave ();
return result;
gint x,
gint y,
guint time,
- gpointer user_data)
+ gpointer user_data)
{
GtkTreeViewDropPosition pos;
GtkTreePath *dest_row;
/* 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,
"drag_motion",
G_CALLBACK (on_drag_motion),
NULL);
-
+
g_signal_connect (G_OBJECT (self),
"drag_data_get",
G_CALLBACK (on_drag_data_get),
* 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;
#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);
+ tree_column = gtk_tree_view_get_column (GTK_TREE_VIEW (self),
+ NAME_COLUMN);
gtk_tree_view_column_queue_resize (tree_column);
#else
gtk_widget_queue_draw (GTK_WIDGET (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;
}
GtkTreeModel *model;
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,
ModestFolderViewPrivate *priv;
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;
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,
+ TYPE_COLUMN,
&type, -1);
-
+
gboolean result = FALSE;
if (type == TNY_FOLDER_TYPE_INBOX) {
result = TRUE;
- }
+ }
if (result) {
*inbox_iter = *iter;
return TRUE;
-void
+void
modest_folder_view_select_first_inbox_or_local (ModestFolderView *self)
{
GtkTreeModel *model;
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;
/* 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 {
TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
TnyFolder* a_folder;
gchar *name = NULL;
-
- gtk_tree_model_get (model, iter,
- TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &a_folder,
- TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &name,
- TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type,
- -1);
+
+ gtk_tree_model_get (model, iter,
+ INSTANCE_COLUMN, &a_folder,
+ NAME_COLUMN, &name,
+ TYPE_COLUMN, &type,
+ -1);
g_free (name);
if (folder == a_folder) {
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;
}
return FALSE;
}
-
+#ifndef MODEST_TOOLKIT_HILDON2
static void
-on_row_inserted_maybe_select_folder (GtkTreeModel *tree_model,
- GtkTreePath *path,
+on_row_inserted_maybe_select_folder (GtkTreeModel *tree_model,
+ GtkTreePath *path,
GtkTreeIter *iter,
ModestFolderView *self)
{
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,
+ gtk_tree_model_get (tree_model, iter,
+ TYPE_COLUMN, &type,
+ INSTANCE_COLUMN, &instance,
-1);
+
+ if (!instance)
+ return;
+
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);
+ gtk_tree_path_free (path);
}
/* Disable next */
modest_folder_view_disable_next_folder_selection (self);
-
+
/* Refilter the model */
gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (tree_model));
}
}
-
+#endif
void
-modest_folder_view_disable_next_folder_selection (ModestFolderView *self)
+modest_folder_view_disable_next_folder_selection (ModestFolderView *self)
{
ModestFolderViewPrivate *priv;
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 (self && MODEST_IS_FOLDER_VIEW (self), FALSE);
- g_return_val_if_fail (folder && 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) {
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;
g_warning ("%s: model is empty", __FUNCTION__);
return FALSE;
}
-
+
if (find_folder_iter (model, &iter, &folder_iter, folder)) {
GtkTreePath *path;
}
-void
+void
modest_folder_view_copy_selection (ModestFolderView *self)
{
g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self));
-
+
/* Copy selection */
_clipboard_set_selected_data (self, FALSE);
}
-void
+void
modest_folder_view_cut_selection (ModestFolderView *folder_view)
{
ModestFolderViewPrivate *priv = NULL;
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));
GtkTreeModel *filter_model = NULL;
GtkTreeModel *model = NULL;
GtkTreeModel *new_filter_model = NULL;
-
+
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);
+#ifndef MODEST_TOOLKIT_HILDON2
g_signal_connect (G_OBJECT(new_filter_model), "row-inserted",
(GCallback) on_row_inserted_maybe_select_folder, folder_view_dst);
+#endif
/* Free */
g_object_unref (new_filter_model);
g_return_if_fail (folder_view && MODEST_IS_FOLDER_VIEW (folder_view));
- priv = MODEST_FOLDER_VIEW_GET_PRIVATE(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())); */
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);
}
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,
+static void
+on_display_name_changed (ModestAccountMgr *mgr,
const gchar *account,
gpointer 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);
+
+ tree_column = gtk_tree_view_get_column (GTK_TREE_VIEW (self),
+ 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;
+
+ g_object_set (G_OBJECT (priv->messages_renderer),
+ "visible", (cell_style == MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT),
+ NULL);
+
+ gtk_widget_queue_draw (GTK_WIDGET (self));
+}
+
+static void
+update_style (ModestFolderView *self)
+{
+ ModestFolderViewPrivate *priv;
+ GdkColor style_color;
+
+ g_return_if_fail (MODEST_IS_FOLDER_VIEW (self));
+ priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
+
+ if (!gtk_style_lookup_color (GTK_WIDGET (self)->style, "SecondaryTextColor", &style_color)) {
+ gdk_color_parse ("grey", &style_color);
+ }
+
+ g_object_set (G_OBJECT (priv->messages_renderer),
+ "foreground-gdk", &style_color,
+ "foreground-set", TRUE,
+ NULL);
+}
+
+static void
+on_notify_style (GObject *obj, GParamSpec *spec, gpointer userdata)
+{
+ if (strcmp ("style", spec->name) == 0) {
+ update_style (MODEST_FOLDER_VIEW (obj));
+ gtk_widget_queue_draw (GTK_WIDGET (obj));
+ }
+}
+
+void
+modest_folder_view_set_filter (ModestFolderView *self,
+ ModestFolderViewFilter filter)
+{
+ ModestFolderViewPrivate *priv;
+ GtkTreeModel *filter_model;
+
+ g_return_if_fail (MODEST_IS_FOLDER_VIEW (self));
+ priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
+
+ priv->filter = filter;
+
+ filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
+ if (GTK_IS_TREE_MODEL_FILTER(filter_model)) {
+ gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model));
+ }
+}
projects / modest / blobdiff