};
/* 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 modest_folder_view_dispose (GObject *obj);
static void tny_account_store_view_init (gpointer g,
gpointer iface_data);
GtkTreeIter *iter,
gpointer data);
-static gboolean on_key_pressed (GtkWidget *self,
- GdkEventKey *event,
- gpointer user_data);
-
static void on_configuration_key_changed (ModestConf* conf,
const gchar *key,
ModestConfEvent event,
ModestConfNotificationId notification_id,
ModestFolderView *self);
-/* DnD functions */
-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,
- gpointer data);
-
-static gboolean on_drag_motion (GtkWidget *widget,
- GdkDragContext *context,
- gint x,
- gint y,
- guint time,
- gpointer user_data);
-
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,
gboolean delete);
static void _clear_hidding_filter (ModestFolderView *folder_view);
-#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,
const gchar *account,
gpointer user_data);
GtkTreeModel **filter_model,
GtkTreeModel **sort_model,
GtkTreeModel **tny_model);
-#ifdef MODEST_TOOLKIT_HILDON2
-static void
-on_activity_changed (TnyGtkFolderListStore *store,
- gboolean activity,
- ModestFolderView *folder_view);
-#endif
+static void on_activity_changed (TnyGtkFolderListStore *store,
+ gboolean activity,
+ ModestFolderView *folder_view);
enum {
FOLDER_SELECTION_CHANGED_SIGNAL,
ModestFolderViewFilter filter;
TnyFolderStoreQuery *query;
+ gboolean do_refresh;
guint timer_expander;
gchar *local_account_name;
gulong outbox_deleted_handler;
- guint activity_changed_handler;
+ GSList *signal_handlers;
+ GdkColor active_color;
};
#define MODEST_FOLDER_VIEW_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE((o), \
parent_class = g_type_class_peek_parent (klass);
gobject_class->finalize = modest_folder_view_finalize;
+ gobject_class->dispose = modest_folder_view_dispose;
g_type_class_add_private (gobject_class,
sizeof(ModestFolderViewPrivate));
convert_parent_folders_to_dots (gchar **item_name)
{
gint n_parents = 0;
+ gint n_inbox_parents = 0;
gchar *c;
+ gchar *path_start;
gchar *last_separator;
if (item_name == NULL)
return;
+ path_start = *item_name;
for (c = *item_name; *c != '\0'; c++) {
if (g_str_has_prefix (c, MODEST_FOLDER_PATH_SEPARATOR)) {
+ gchar *compare;
+ if (c != path_start) {
+ compare = g_strndup (path_start, c - path_start);
+ compare = g_strstrip (compare);
+ if (g_ascii_strcasecmp (compare, "inbox") == 0) {
+ n_inbox_parents++;
+ }
+ g_free (compare);
+ }
n_parents++;
+ path_start = c + 1;
}
}
gint i;
buffer = g_string_new ("");
- for (i = 0; i < n_parents; i++) {
+ for (i = 0; i < n_parents - n_inbox_parents; i++) {
buffer = g_string_append (buffer, MODEST_FOLDER_DOT);
}
buffer = g_string_append (buffer, last_separator);
/* 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"));
- }
+ gchar *new_item_name = g_strdup (*item_name + strlen (prefix));
g_free (*item_name);
*item_name = new_item_name;
}
- } else if (!g_ascii_strcasecmp (*item_name, "Inbox")) {
-
- g_free (*item_name);
- *item_name = g_strdup (_("mcen_me_folder_inbox"));
}
if (!is_special || multiaccount) {
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>");
+ if (!is_special && folder_type == TNY_FOLDER_TYPE_DRAFTS) {
+ buffer = g_string_append (buffer, folder_name);
+ /* TODO: append a sensitive string to the remote drafts to
+ * be able to know it's the remote one */
+/* buffer = g_string_append (buffer, " (TODO:remote)"); */
+ } else {
+ buffer = g_string_append (buffer, folder_name);
+ }
}
g_free (*item_name);
g_object_unref (account);
*item_name = g_string_free (buffer, FALSE);
- *use_markup = bold;
+ *use_markup = FALSE;
} else {
*use_markup = FALSE;
}
}
static void
+replace_special_folder_prefix (gchar **item_name)
+{
+ const gchar *separator;
+ gchar *prefix;
+
+ if (item_name == NULL || *item_name == NULL || **item_name == '\0')
+ return;
+ separator = g_strstr_len (*item_name, -1, MODEST_FOLDER_PATH_SEPARATOR);
+ if (separator == NULL)
+ return;
+
+ prefix = g_strndup (*item_name, separator - *item_name);
+ g_strstrip (prefix);
+
+ if (prefix && *prefix != '\0') {
+ TnyFolderType folder_type;
+ gchar *new_name;
+ gchar *downcase;
+
+ downcase = g_utf8_strdown (prefix, -1);
+ g_free (prefix);
+ prefix = downcase;
+
+ if (strcmp (downcase, "inbox") == 0) {
+ folder_type = TNY_FOLDER_TYPE_INBOX;
+ new_name = g_strconcat (_("mcen_me_folder_inbox"), separator, NULL);
+ g_free (*item_name);
+ *item_name = new_name;
+ } else {
+ folder_type = modest_local_folder_info_get_type (prefix);
+ switch (folder_type) {
+ case TNY_FOLDER_TYPE_INBOX:
+ case TNY_FOLDER_TYPE_ARCHIVE:
+ new_name = g_strconcat (modest_local_folder_info_get_type_display_name (folder_type), separator, NULL);
+ g_free (*item_name);
+ *item_name = new_name;
+ break;
+ default:
+ break;
+ }
+ }
+ }
+ g_free (prefix);
+}
+
+static void
text_cell_data (GtkTreeViewColumn *column,
GtkCellRenderer *renderer,
GtkTreeModel *tree_model,
}
}
+ /* Convert INBOX */
+ if (type == TNY_FOLDER_TYPE_INBOX &&
+ g_str_has_suffix (fname, "Inbox")) {
+ g_free (item_name);
+ item_name = g_strdup (_("mcen_me_folder_inbox"));
+ }
+
if (!item_name)
item_name = g_strdup ("unknown");
format_compact_style (&item_name, instance, priv->mailbox,
item_weight == 800,
multiaccount, &use_markup);
+ } else {
+ replace_special_folder_prefix (&item_name);
}
if (item_name && item_weight) {
/* Set the name in the treeview cell: */
- if (use_markup)
- g_object_set (rendobj, "markup", item_name, "weight-set", FALSE, NULL);
- else
- g_object_set (rendobj, "text", item_name, "weight-set", TRUE, "weight", item_weight, NULL);
+ if (priv->cell_style == MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT && item_weight == 800 &&
+ (priv->active_color.red != 0 || priv->active_color.blue != 0 || priv->active_color.green != 0)) {
+ g_object_set (rendobj,
+ "text", item_name,
+ "weight-set", FALSE,
+ "foreground-set", TRUE,
+ "foreground-gdk", &(priv->active_color),
+ NULL);
+ } else {
+ g_object_set (rendobj,
+ "text", item_name,
+ "foreground-set", FALSE,
+ "weight-set", TRUE,
+ "weight", item_weight,
+ NULL);
+ }
/* Notify display name observers */
/* TODO: What listens for this signal, and how can it use only the new name? */
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 ((priv->cell_style == MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT) && (number > 0)) {
+ item_name =
+ g_strdup_printf (ngettext ((drafts) ? "mcen_ti_message" : "mcen_va_new_message",
+ (drafts) ? "mcen_ti_messages" : "mcen_va_new_messages",
+ number), number);
+ }
+ }
if (!item_name)
item_name = g_strdup ("");
{
ThreePixbufs *retval;
- if (!*pixbuf)
- *pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (icon_code, FOLDER_ICON_SIZE));
+ if (pixbuf && !*pixbuf) {
+ GdkPixbuf *icon;
+ icon = modest_platform_get_icon (icon_code, FOLDER_ICON_SIZE);
+ if (icon) {
+ *pixbuf = gdk_pixbuf_copy (icon);
+ } else {
+ *pixbuf = NULL;
+ }
+ }
- if (!*pixbuf_open)
+ if (pixbuf_open && !*pixbuf_open && pixbuf && *pixbuf)
*pixbuf_open = get_composite_pixbuf ("qgn_list_gene_fldr_exp",
FOLDER_ICON_SIZE,
*pixbuf);
- if (!*pixbuf_close)
+ if (pixbuf_close && !*pixbuf_close && pixbuf && *pixbuf)
*pixbuf_close = get_composite_pixbuf ("qgn_list_gene_fldr_clp",
FOLDER_ICON_SIZE,
*pixbuf);
retval = g_slice_new0 (ThreePixbufs);
- if (*pixbuf)
+ if (pixbuf && *pixbuf)
retval->pixbuf = g_object_ref (*pixbuf);
- if (*pixbuf_open)
+ else
+ retval->pixbuf = NULL;
+ if (pixbuf_open && *pixbuf_open)
retval->pixbuf_open = g_object_ref (*pixbuf_open);
- if (*pixbuf_close)
+ else
+ retval->pixbuf_open = NULL;
+ if (pixbuf_close && *pixbuf_close)
retval->pixbuf_close = g_object_ref (*pixbuf_close);
+ else
+ retval->pixbuf_close = NULL;
return retval;
}
!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,
+ return get_composite_icons (MODEST_FOLDER_ICON_REMOTE_FOLDER,
&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) {
/* 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);
renderer = gtk_cell_renderer_text_new();
g_object_set (renderer,
-#ifdef MODEST_TOOLKIT_HILDON2
"ellipsize", PANGO_ELLIPSIZE_MIDDLE,
"ypad", MODEST_MARGIN_DEFAULT,
"xpad", MODEST_MARGIN_DEFAULT,
-#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,
priv->messages_renderer = gtk_cell_renderer_text_new ();
g_object_set (priv->messages_renderer,
-#ifdef MODEST_TOOLKIT_HILDON2
- "yalign", 0.0,
+ "yalign", 0.5,
"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,
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);
+ gtk_tree_view_set_rules_hint ((GtkTreeView *) treeview, TRUE);
/* Add column */
gtk_tree_view_append_column (GTK_TREE_VIEW(treeview),column);
priv->timer_expander = 0;
priv->account_store = NULL;
priv->query = NULL;
+ priv->do_refresh = TRUE;
priv->style = MODEST_FOLDER_VIEW_STYLE_SHOW_ALL;
priv->cur_folder_store = NULL;
priv->visible_account_id = NULL;
priv->folder_to_select = NULL;
priv->outbox_deleted_handler = 0;
priv->reexpand = TRUE;
- priv->activity_changed_handler = 0;
+ priv->signal_handlers = 0;
/* Initialize the local account name */
conf = modest_runtime_get_conf();
/* Build treeview */
add_columns (GTK_WIDGET (obj));
- /* Setup drag and drop */
- setup_drag_and_drop (GTK_TREE_VIEW(obj));
-
- /* Connect signals */
- 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);
+ 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->conf_key_signal = g_signal_connect (G_OBJECT(conf),
- "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);
+ priv->conf_key_signal = g_signal_connect (G_OBJECT(conf),
+ "key_changed",
+ G_CALLBACK(on_configuration_key_changed),
+ obj);
+ gdk_color_parse ("000", &priv->active_color);
+ update_style (obj);
+ g_signal_connect (G_OBJECT (obj), "notify::style",
+ G_CALLBACK (on_notify_style), (gpointer) obj);
}
static void
}
static void
+modest_folder_view_dispose (GObject *obj)
+{
+ ModestFolderViewPrivate *priv;
+
+ priv = MODEST_FOLDER_VIEW_GET_PRIVATE (obj);
+
+ if (priv->signal_handlers) {
+ modest_signal_mgr_disconnect_all_and_destroy (priv->signal_handlers);
+ priv->signal_handlers = NULL;
+ }
+
+ /* Free external references */
+ if (priv->account_store) {
+ g_signal_handler_disconnect (G_OBJECT(priv->account_store),
+ priv->account_inserted_signal);
+ g_signal_handler_disconnect (G_OBJECT(priv->account_store),
+ priv->account_removed_signal);
+ g_signal_handler_disconnect (G_OBJECT(priv->account_store),
+ priv->account_changed_signal);
+ g_object_unref (G_OBJECT(priv->account_store));
+ priv->account_store = NULL;
+ }
+
+ if (priv->query) {
+ g_object_unref (G_OBJECT (priv->query));
+ priv->query = NULL;
+ }
+
+ if (priv->folder_to_select) {
+ g_object_unref (G_OBJECT(priv->folder_to_select));
+ priv->folder_to_select = NULL;
+ }
+
+ if (priv->cur_folder_store) {
+ g_object_unref (priv->cur_folder_store);
+ priv->cur_folder_store = NULL;
+ }
+
+ if (priv->list_to_move) {
+ g_object_unref (priv->list_to_move);
+ priv->list_to_move = NULL;
+ }
+
+ G_OBJECT_CLASS(parent_class)->dispose (obj);
+}
+
+static void
modest_folder_view_finalize (GObject *obj)
{
ModestFolderViewPrivate *priv;
g_object_unref (local_account);
}
- if (priv->account_store) {
- g_signal_handler_disconnect (G_OBJECT(priv->account_store),
- priv->account_inserted_signal);
- g_signal_handler_disconnect (G_OBJECT(priv->account_store),
- priv->account_removed_signal);
- g_signal_handler_disconnect (G_OBJECT(priv->account_store),
- priv->account_changed_signal);
- g_object_unref (G_OBJECT(priv->account_store));
- 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 = 0;
}
- if (priv->query) {
- g_object_unref (G_OBJECT (priv->query));
- priv->query = NULL;
- }
-
- if (priv->folder_to_select) {
- g_object_unref (G_OBJECT(priv->folder_to_select));
- priv->folder_to_select = NULL;
- }
-
sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(obj));
if (sel)
g_signal_handler_disconnect (G_OBJECT(sel), priv->changed_signal);
priv->conf_key_signal = 0;
}
- if (priv->cur_folder_store) {
- g_object_unref (priv->cur_folder_store);
- 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));
+ gdk_color_parse ("000", &priv->active_color);
+
G_OBJECT_CLASS(parent_class)->finalize (obj);
}
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));
}
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,
/* 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
/* 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
deathlock situation */
/* TODO: check if this is still the case */
priv->reselect = FALSE;
- modest_folder_view_select_first_inbox_or_local (self);
/* Notify the display name observers */
g_signal_emit (G_OBJECT(self),
signals[FOLDER_DISPLAY_NAME_CHANGED_SIGNAL], 0,
GtkWidget*
modest_folder_view_new (TnyFolderStoreQuery *query)
{
+ return modest_folder_view_new_full (query, TRUE);
+}
+
+GtkWidget*
+modest_folder_view_new_full (TnyFolderStoreQuery *query, gboolean do_refresh)
+{
GObject *self;
ModestFolderViewPrivate *priv;
GtkTreeSelection *sel;
if (query)
priv->query = g_object_ref (query);
+ priv->do_refresh = do_refresh;
+
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, "expose-event", G_CALLBACK (modest_folder_view_on_map), NULL);
+ /* Hide headers by default */
+ gtk_tree_view_set_headers_visible ((GtkTreeView *)self, FALSE);
+
return GTK_WIDGET(self);
}
ModestProtocolType protocol_type;
protocol_type = modest_tny_account_get_protocol_type (TNY_ACCOUNT (instance));
- retval = !modest_protocol_registry_protocol_type_has_tag
+ retval = !modest_protocol_registry_protocol_type_has_tag
(modest_runtime_get_protocol_registry (),
protocol_type,
- MODEST_PROTOCOL_REGISTRY_STORE_FORBID_MESSAGE_ADD);
+ MODEST_PROTOCOL_REGISTRY_STORE_FORBID_INCOMING_XFERS);
}
}
/* FIXME: the local accounts are not shown when the query
selects only the subscribed folders */
-#ifdef MODEST_TOOLKIT_HILDON2
+ TnyGtkFolderListStoreFlags flags;
+ flags = TNY_GTK_FOLDER_LIST_STORE_FLAG_SHOW_PATH;
+ if (priv->do_refresh)
+ flags |= TNY_GTK_FOLDER_LIST_STORE_FLAG_DELAYED_REFRESH;
+ else
+ flags |= TNY_GTK_FOLDER_LIST_STORE_FLAG_NO_REFRESH;
model = tny_gtk_folder_list_store_new_with_flags (NULL,
- TNY_GTK_FOLDER_LIST_STORE_FLAG_SHOW_PATH);
+ flags);
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
/* When the model is a list store (plain representation) the
outbox is not a child of any account so we have to manually
g_object_unref (account);
}
- /* Get the accounts: */
- tny_account_store_get_accounts (TNY_ACCOUNT_STORE(account_store),
- TNY_LIST (model),
- TNY_ACCOUNT_STORE_STORE_ACCOUNTS);
+ if (priv->style == MODEST_FOLDER_VIEW_STYLE_SHOW_ALL) {
+ /* Get the accounts */
+ tny_account_store_get_accounts (TNY_ACCOUNT_STORE(account_store),
+ TNY_LIST (model),
+ TNY_ACCOUNT_STORE_STORE_ACCOUNTS);
+ } else {
+ if (priv->visible_account_id) {
+ TnyAccount *account;
+
+ /* Add local folders account */
+ account = modest_tny_account_store_get_local_folders_account ((ModestTnyAccountStore *) account_store);
+
+ if (account) {
+ tny_list_append (TNY_LIST (model), (GObject *) account);
+ g_object_unref (account);
+ }
+
+ account = modest_tny_account_store_get_mmc_folders_account ((ModestTnyAccountStore *) account_store);
+
+ if (account) {
+ tny_list_append (TNY_LIST (model), (GObject *) account);
+ g_object_unref (account);
+ }
+
+ /* Add visible account */
+ account = modest_tny_account_store_get_tny_account_by ((ModestTnyAccountStore *) account_store,
+ MODEST_TNY_ACCOUNT_STORE_QUERY_ID,
+ priv->visible_account_id);
+ if (account) {
+ tny_list_append (TNY_LIST (model), (GObject *) account);
+ g_object_unref (account);
+ } else {
+ g_warning ("You need to set an account first");
+ g_object_unref (model);
+ return FALSE;
+ }
+ } else {
+ g_warning ("You need to set an account first");
+ g_object_unref (model);
+ return FALSE;
+ }
+ }
sortable = gtk_tree_model_sort_new_with_model (model);
gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable),
self,
NULL);
- if (priv->activity_changed_handler > 0) {
- GtkTreeModel *old_tny_model;
-
- if (get_inner_models (self, NULL, NULL, &old_tny_model)) {
- g_signal_handler_disconnect (G_OBJECT (old_tny_model), priv->activity_changed_handler);
+ GtkTreeModel *old_tny_model = NULL;
+ if (get_inner_models (self, NULL, NULL, &old_tny_model)) {
+ if (priv->signal_handlers > 0) {
+ priv->signal_handlers = modest_signal_mgr_disconnect (priv->signal_handlers,
+ G_OBJECT (old_tny_model),
+ "activity-changed");
}
- priv->activity_changed_handler = 0;
}
/* 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
-#ifdef MODEST_TOOLKIT_HILDON2
- priv->activity_changed_handler =
- g_signal_connect (G_OBJECT (model), "activity-changed", G_CALLBACK (on_activity_changed), self);
-#endif
+ priv->signal_handlers = modest_signal_mgr_connect (priv->signal_handlers,
+ G_OBJECT (model),
+ "activity-changed",
+ G_CALLBACK (on_activity_changed),
+ self);
g_object_unref (model);
g_object_unref (filter_model);
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);
g_signal_emit (G_OBJECT(tree_view), signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0,
priv->cur_folder_store, FALSE);
return is_account2 - is_account1;
}
+static gint
+compare_folders (const gchar *name1, const gchar *name2)
+{
+ const gchar *separator1, *separator2;
+ const gchar *next1, *next2;
+ gchar *top1, *top2;
+ gint cmp;
+
+ if (name1 == NULL || name1[0] == '\0')
+ return -1;
+ if (name2 == NULL || name2[0] == '\0')
+ return 1;
+
+ separator1 = strstr (name1, MODEST_FOLDER_PATH_SEPARATOR);
+ if (separator1) {
+ top1 = g_strndup (name1, separator1 - name1);
+ } else {
+ top1 = g_strdup (name1);
+ }
+
+ separator2 = strstr (name2, MODEST_FOLDER_PATH_SEPARATOR);
+ if (separator2) {
+ top2 = g_strndup (name2, separator2 - name2);
+ } else {
+ top2 = g_strdup (name2);
+ }
+
+
+ cmp = modest_text_utils_utf8_strcmp (top1, top2, TRUE);
+ g_free (top1);
+ g_free (top2);
+
+ if (cmp != 0)
+ return cmp;
+
+ if (separator1 == NULL && separator2 == NULL)
+ return 0;
+
+ next1 = (separator1 != NULL)?separator1 + strlen (MODEST_FOLDER_PATH_SEPARATOR):NULL;
+ next2 = (separator2 != NULL)?separator2 + strlen (MODEST_FOLDER_PATH_SEPARATOR):NULL;
+
+ return compare_folders (next1, next2);
+}
+
+
/*
* This function orders the mail accounts according to these rules:
* 1st - remote accounts
}
/* Pure sort by name */
- cmp = modest_text_utils_utf8_strcmp (name1, name2, TRUE);
+ cmp = compare_folders (name1, name2);
finish:
if (folder1)
g_object_unref(G_OBJECT(folder1));
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
+ * We listen to the changes in the local folder account name key,
+ * because we want to show the right name in the view. The local
+ * folder account name corresponds to the device name in the Maemo
+ * version. We do this because we do not want to query gconf on each
+ * tree view refresh. It's better to cache it and change whenever
+ * necessary.
*/
static void
-on_drag_data_get (GtkWidget *widget, GdkDragContext *context, GtkSelectionData *selection_data,
- guint info, guint time, gpointer data)
+on_configuration_key_changed (ModestConf* conf,
+ const gchar *key,
+ ModestConfEvent event,
+ ModestConfNotificationId id,
+ ModestFolderView *self)
{
- GtkTreeSelection *selection;
- GtkTreeModel *model;
- GtkTreeIter iter;
- GtkTreePath *source_row;
+ ModestFolderViewPrivate *priv;
- selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget));
- if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
- source_row = gtk_tree_model_get_path (model, &iter);
- gtk_tree_set_row_drag_data (selection_data,
- model,
- source_row);
+ g_return_if_fail (MODEST_IS_FOLDER_VIEW (self));
+ priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
- gtk_tree_path_free (source_row);
- }
-}
+ if (!strcmp (key, MODEST_CONF_DEVICE_NAME)) {
+ g_free (priv->local_account_name);
-typedef struct _DndHelper {
- ModestFolderView *folder_view;
- gboolean delete_source;
- GtkTreePath *source_row;
-} DndHelper;
+ if (event == MODEST_CONF_EVENT_KEY_UNSET)
+ priv->local_account_name = g_strdup (MODEST_LOCAL_FOLDERS_DEFAULT_DISPLAY_NAME);
+ else
+ priv->local_account_name = modest_conf_get_string (modest_runtime_get_conf(),
+ MODEST_CONF_DEVICE_NAME, NULL);
-static void
-dnd_helper_destroyer (DndHelper *helper)
-{
- /* Free the helper */
- gtk_tree_path_free (helper->source_row);
- g_slice_free (DndHelper, helper);
-}
+ /* Force a redraw */
+#if GTK_CHECK_VERSION(2, 8, 0)
+ GtkTreeViewColumn * tree_column;
-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);
+ 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
}
}
-
-/* get the folder for the row the treepath refers to. */
-/* folder must be unref'd */
-static TnyFolderStore *
-tree_path_to_folder (GtkTreeModel *model, GtkTreePath *path)
+void
+modest_folder_view_set_style (ModestFolderView *self,
+ ModestFolderViewStyle style)
{
- GtkTreeIter iter;
- TnyFolderStore *folder = NULL;
-
- if (gtk_tree_model_get_iter (model,&iter, path))
- gtk_tree_model_get (model, &iter,
- INSTANCE_COLUMN, &folder,
- -1);
- return folder;
-}
-
-
-/*
- * This function is used by drag_data_received_cb to manage drag and
- * drop of a header, i.e, and drag from the header view to the folder
- * view.
- */
-static void
-drag_and_drop_from_header_view (GtkTreeModel *source_model,
- GtkTreeModel *dest_model,
- GtkTreePath *dest_row,
- GtkSelectionData *selection_data)
-{
- TnyList *headers = NULL;
- 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 ();
- 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 the target folder */
- gtk_tree_model_get_iter (dest_model, &dest_iter, dest_row);
- 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) {
- 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);
-
- /* Frees */
-cleanup:
- 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
- * folder view.
- */
-static void
-drag_and_drop_from_folder_view (GtkTreeModel *source_model,
- GtkTreeModel *dest_model,
- GtkTreePath *dest_row,
- GtkSelectionData *selection_data,
- DndHelper *helper)
-{
- GtkTreeIter dest_iter, iter;
- TnyFolderStore *dest_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 (TNY_FOLDER (folder));
- 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) &&
- !modest_tny_account_is_memory_card_account (TNY_ACCOUNT (folder)))
- forbidden = TRUE;
- }
- g_object_unref (folder);
- }
- if (!forbidden) {
- /* check the folder rules for the source */
- folder = tree_path_to_folder (source_model, helper->source_row);
- if (TNY_IS_FOLDER(folder)) {
- ModestTnyFolderRules rules =
- modest_tny_folder_get_rules (TNY_FOLDER (folder));
- forbidden = rules & MODEST_FOLDER_RULES_FOLDER_NON_MOVEABLE;
- } else
- 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,
- INSTANCE_COLUMN,
- &dest_folder, -1);
- gtk_tree_model_get_iter (source_model, &iter, helper->source_row);
- gtk_tree_model_get (source_model, &iter,
- INSTANCE_COLUMN,
- &folder, -1);
-
- /* 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 (dest_folder);
- g_object_unref (folder);
-}
-
-/*
- * This function receives the data set by the "drag-data-get" signal
- * handler. This information comes within the #GtkSelectionData. This
- * 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,
- gpointer data)
-{
- GtkWidget *source_widget;
- GtkTreeModel *dest_model, *source_model;
- GtkTreePath *source_row, *dest_row;
- GtkTreeViewDropPosition pos;
- gboolean delete_source = FALSE;
- gboolean success = FALSE;
-
- /* Do not allow further process */
- g_signal_stop_emission_by_name (widget, "drag-data-received");
- source_widget = gtk_drag_get_source_widget (context);
-
- /* Get the action */
- if (context->action == GDK_ACTION_MOVE) {
- delete_source = TRUE;
-
- /* Notify that there is no folder selected. We need to
- do this in order to update the headers view (and
- its monitors, because when moving, the old folder
- won't longer exist. We can not wait for the end of
- the operation, because the operation won't start if
- the folder is in use */
- if (source_widget == widget) {
- 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)
- goto end;
-
- /* Select the destination model */
- 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
- is not selected anymore */
- gtk_tree_view_get_dest_row_at_pos (GTK_TREE_VIEW (widget), x, y,
- &dest_row, &pos);
-
- /* Only allow drops IN other rows */
- 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,
- 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,
- helper);
-
- gtk_tree_path_free (source_row);
- }
-
- /* Frees */
- gtk_tree_path_free (dest_row);
-
- end:
- /* Finish the drag and drop */
- gtk_drag_finish (context, success, FALSE, time);
-}
-
-/*
- * We define a "drag-drop" signal handler because we do not want to
- * use the default one, because the default one always calls
- * gtk_drag_finish and we prefer to do it in the "drag-data-received"
- * signal handler, because there we have all the information available
- * to know if the dnd was a success or not.
- */
-static gboolean
-drag_drop_cb (GtkWidget *widget,
- GdkDragContext *context,
- gint x,
- gint y,
- guint time,
- gpointer user_data)
-{
- gpointer target;
-
- if (!context->targets)
- return FALSE;
-
- /* Check if we're dragging a folder row */
- target = gtk_drag_dest_find_target (widget, context, NULL);
-
- /* Request the data from the source. */
- gtk_drag_get_data(widget, context, target, time);
-
- return TRUE;
-}
-
-/*
- * This function expands a node of a tree view if it's not expanded
- * yet. Not sure why it needs the threads stuff, but gtk+`example code
- * does that, so that's why they're here.
- */
-static gint
-expand_row_timeout (gpointer data)
-{
- GtkTreeView *tree_view = data;
- 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)) {
- gtk_tree_view_expand_row (tree_view, dest_path, FALSE);
- gtk_tree_path_free (dest_path);
- }
- else {
- if (dest_path)
- gtk_tree_path_free (dest_path);
-
- result = TRUE;
- }
-
- gdk_threads_leave ();
-
- return result;
-}
-
-/*
- * This function is called whenever the pointer is moved over a widget
- * while dragging some data. It installs a timeout that will expand a
- * node of the treeview if not expanded yet. This function also calls
- * gdk_drag_status in order to set the suggested action that will be
- * used by the "drag-data-received" signal handler to know if we
- * should do a move or just a copy of the data.
- */
-static gboolean
-on_drag_motion (GtkWidget *widget,
- GdkDragContext *context,
- gint x,
- gint y,
- guint time,
- 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);
-
- if (priv->timer_expander != 0) {
- g_source_remove (priv->timer_expander);
- priv->timer_expander = 0;
- }
-
- gtk_tree_view_get_dest_row_at_pos (GTK_TREE_VIEW (widget),
- x, y,
- &dest_row,
- &pos);
-
- /* Do not allow drops between folders */
- if (!dest_row ||
- pos == GTK_TREE_VIEW_DROP_BEFORE ||
- pos == GTK_TREE_VIEW_DROP_AFTER) {
- gtk_tree_view_set_drag_dest_row(GTK_TREE_VIEW (widget), NULL, 0);
- gdk_drag_status(context, 0, time);
- valid_location = FALSE;
- goto out;
- } else {
- 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)) {
- 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;
-
- if (context->actions == GDK_ACTION_COPY)
- gdk_drag_status(context, GDK_ACTION_COPY, time);
- else if (context->actions == GDK_ACTION_MOVE)
- gdk_drag_status(context, GDK_ACTION_MOVE, time);
- else if (context->actions & suggested_action)
- gdk_drag_status(context, suggested_action, time);
- else
- gdk_drag_status(context, GDK_ACTION_DEFAULT, time);
-
- out:
- 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;
-}
-
-/*
- * This function sets the treeview as a source and a target for dnd
- * events. It also connects all the requirede signals.
- */
-static void
-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,
- G_N_ELEMENTS (folder_view_drag_types),
- GDK_ACTION_MOVE | GDK_ACTION_COPY);
-
- g_signal_connect (G_OBJECT (self),
- "drag_data_received",
- G_CALLBACK (on_drag_data_received),
- NULL);
-
-
- /* Set up the treeview as a dnd source */
- gtk_drag_source_set (GTK_WIDGET (self),
- GDK_BUTTON1_MASK,
- folder_view_drag_types,
- G_N_ELEMENTS (folder_view_drag_types),
- GDK_ACTION_MOVE | GDK_ACTION_COPY);
-
- g_signal_connect (G_OBJECT (self),
- "drag_motion",
- G_CALLBACK (on_drag_motion),
- NULL);
-
- g_signal_connect (G_OBJECT (self),
- "drag_data_get",
- G_CALLBACK (on_drag_data_get),
- NULL);
-
- g_signal_connect (G_OBJECT (self),
- "drag_drop",
- G_CALLBACK (drag_drop_cb),
- NULL);
-}
-
-/*
- * This function manages the navigation through the folders using the
- * keyboard or the hardware keys in the device
- */
-static gboolean
-on_key_pressed (GtkWidget *self,
- GdkEventKey *event,
- gpointer user_data)
-{
- GtkTreeSelection *selection;
- GtkTreeIter iter;
- GtkTreeModel *model;
- gboolean retval = FALSE;
-
- /* Up and Down are automatically managed by the treeview */
- if (event->keyval == GDK_Return) {
- /* Expand/Collapse the selected row */
- selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
- if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
- GtkTreePath *path;
-
- path = gtk_tree_model_get_path (model, &iter);
-
- if (gtk_tree_view_row_expanded (GTK_TREE_VIEW (self), path))
- gtk_tree_view_collapse_row (GTK_TREE_VIEW (self), path);
- else
- gtk_tree_view_expand_row (GTK_TREE_VIEW (self), path, FALSE);
- gtk_tree_path_free (path);
- }
- /* No further processing */
- retval = TRUE;
- }
-
- return retval;
-}
-
-/*
- * We listen to the changes in the local folder account name key,
- * because we want to show the right name in the view. The local
- * folder account name corresponds to the device name in the Maemo
- * version. We do this because we do not want to query gconf on each
- * tree view refresh. It's better to cache it and change whenever
- * necessary.
- */
-static void
-on_configuration_key_changed (ModestConf* conf,
- const gchar *key,
- ModestConfEvent event,
- ModestConfNotificationId id,
- ModestFolderView *self)
-{
- ModestFolderViewPrivate *priv;
-
-
- g_return_if_fail (MODEST_IS_FOLDER_VIEW (self));
- priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
-
- if (!strcmp (key, MODEST_CONF_DEVICE_NAME)) {
- g_free (priv->local_account_name);
-
- if (event == MODEST_CONF_EVENT_KEY_UNSET)
- priv->local_account_name = g_strdup (MODEST_LOCAL_FOLDERS_DEFAULT_DISPLAY_NAME);
- else
- priv->local_account_name = modest_conf_get_string (modest_runtime_get_conf(),
- MODEST_CONF_DEVICE_NAME, NULL);
-
- /* Force a redraw */
-#if GTK_CHECK_VERSION(2, 8, 0)
- GtkTreeViewColumn * tree_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_style (ModestFolderView *self,
- ModestFolderViewStyle style)
-{
- ModestFolderViewPrivate *priv;
+ ModestFolderViewPrivate *priv;
g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self));
g_return_if_fail (style == MODEST_FOLDER_VIEW_STYLE_SHOW_ALL ||
model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
if (GTK_IS_TREE_MODEL_FILTER (model))
gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model));
+ else
+ modest_folder_view_update_model(self,
+ (TnyAccountStore *) modest_runtime_get_account_store());
/* Save settings to gconf */
modest_widget_memory_save (modest_runtime_get_conf (), G_OBJECT(self),
return (const gchar *) priv->visible_account_id;
}
-static gboolean
-find_inbox_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *inbox_iter)
-{
- do {
- GtkTreeIter child;
- TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
-
- 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;
- }
-
- if (gtk_tree_model_iter_children (model, &child, iter)) {
- if (find_inbox_iter (model, &child, inbox_iter))
- return TRUE;
- }
-
- } while (gtk_tree_model_iter_next (model, iter));
-
- return FALSE;
-}
-
-
-
-
-void
-modest_folder_view_select_first_inbox_or_local (ModestFolderView *self)
-{
-#ifndef MODEST_TOOLKIT_HILDON2
- GtkTreeModel *model;
- GtkTreeIter iter, inbox_iter;
- 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;
-
- expand_root_items (self);
- sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
-
- 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);
- else
- path = gtk_tree_path_new_first ();
-
- /* Select the row and free */
- gtk_tree_view_set_cursor (GTK_TREE_VIEW (self), path, NULL, FALSE);
- gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (self), path, NULL, FALSE, 0.0, 0.0);
- gtk_tree_path_free (path);
-
- /* set focus */
- gtk_widget_grab_focus (GTK_WIDGET(self));
-#endif
-}
-
-
/* recursive */
static gboolean
find_folder_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *folder_iter,
return FALSE;
}
-#ifndef MODEST_TOOLKIT_HILDON2
-static void
-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,
- 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);
- }
-
- /* 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)
/* Get src model*/
if (get_inner_models (folder_view_dst, NULL, NULL, &old_tny_model)) {
- g_signal_handler_disconnect (G_OBJECT (old_tny_model), dst_priv->activity_changed_handler);
- dst_priv->activity_changed_handler = 0;
+ modest_signal_mgr_disconnect (dst_priv->signal_handlers,
+ G_OBJECT (old_tny_model),
+ "activity-changed");
}
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));
/* 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
-#ifdef MODEST_TOOLKIT_HILDON2
- if (new_tny_model)
- dst_priv->activity_changed_handler = g_signal_connect (G_OBJECT (new_tny_model), "activity-changed",
- G_CALLBACK (on_activity_changed), folder_view_dst);
-#endif
+ if (new_tny_model) {
+ dst_priv->signal_handlers = modest_signal_mgr_connect (dst_priv->signal_handlers,
+ G_OBJECT (new_tny_model),
+ "activity-changed",
+ G_CALLBACK (on_activity_changed),
+ folder_view_dst);
+ }
/* Free */
g_object_unref (new_filter_model);
update_style (ModestFolderView *self)
{
ModestFolderViewPrivate *priv;
- GdkColor style_color;
+ GdkColor style_color, style_active_color;
PangoAttrList *attr_list;
GtkStyle *style;
PangoAttribute *attr;
/* 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);
+
+ if (!gtk_style_lookup_color (gtk_widget_get_style (GTK_WIDGET (self)), "SecondaryTextColor", &style_color)) {
+ gdk_color_parse (MODEST_SECONDARY_COLOR, &style_color);
}
attr = pango_attr_foreground_new (style_color.red, style_color.green, style_color.blue);
pango_attr_list_insert (attr_list, attr);
NULL);
pango_attr_list_unref (attr_list);
}
+
+ if (gtk_style_lookup_color (gtk_widget_get_style (GTK_WIDGET (self)), "ActiveTextColor", &style_active_color)) {
+ priv->active_color = style_active_color;
+ } else {
+ gdk_color_parse ("000", &(priv->active_color));
+ }
}
static void
g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (self), FALSE);
priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
- g_return_val_if_fail (get_inner_models (self, NULL, NULL, &inner_model), FALSE);
+
+ if (!get_inner_models (self, NULL, NULL, &inner_model))
+ return FALSE;
if (TNY_IS_GTK_FOLDER_LIST_STORE (inner_model)) {
return tny_gtk_folder_list_store_get_activity (TNY_GTK_FOLDER_LIST_STORE (inner_model));
}
}
-#ifdef MODEST_TOOLKIT_HILDON2
static void
on_activity_changed (TnyGtkFolderListStore *store,
gboolean activity,
g_signal_emit (G_OBJECT (folder_view), signals[ACTIVITY_CHANGED_SIGNAL], 0,
activity);
}
-#endif
+
+TnyList *
+modest_folder_view_get_model_tny_list (ModestFolderView *self)
+{
+ GtkTreeModel *model;
+ TnyList *ret_value;
+
+ ret_value = NULL;
+ model = NULL;
+
+ if (get_inner_models (MODEST_FOLDER_VIEW (self), NULL, NULL, (GtkTreeModel **) &model)) {
+ ret_value = TNY_LIST (model);
+ g_object_ref (ret_value);
+ }
+
+ return ret_value;
+
+}