#include <glib/gi18n.h>
#include <string.h>
-#include <tny-gtk-account-tree-model.h>
+#include <tny-gtk-account-list-model.h>
+#include <tny-gtk-folder-store-tree-model.h>
+#include <tny-gtk-header-list-model.h>
#include <tny-account-store.h>
#include <tny-account.h>
#include <tny-folder.h>
+#include <modest-marshal.h>
#include <modest-icon-names.h>
#include <modest-icon-factory.h>
#include <modest-tny-account-store.h>
#include "modest-folder-view.h"
-
/* '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_disconnect_store_account_handlers (GtkTreeView *self);
enum {
- FOLDER_SELECTED_SIGNAL,
+ FOLDER_SELECTION_CHANGED_SIGNAL,
LAST_SIGNAL
};
g_type_class_add_private (gobject_class,
sizeof(ModestFolderViewPrivate));
- signals[FOLDER_SELECTED_SIGNAL] =
- g_signal_new ("folder_selected",
+ signals[FOLDER_SELECTION_CHANGED_SIGNAL] =
+ g_signal_new ("folder_selection_changed",
G_TYPE_FROM_CLASS (gobject_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (ModestFolderViewClass,
- folder_selected),
+ folder_selection_changed),
NULL, NULL,
- g_cclosure_marshal_VOID__POINTER,
- G_TYPE_NONE, 1, G_TYPE_POINTER);
+ modest_marshal_VOID__POINTER_BOOLEAN,
+ G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_BOOLEAN);
}
TnyFolderType type;
gtk_tree_model_get (tree_model, iter,
- TNY_GTK_ACCOUNT_TREE_MODEL_NAME_COLUMN, &fname,
- TNY_GTK_ACCOUNT_TREE_MODEL_TYPE_COLUMN, &type,
- TNY_GTK_ACCOUNT_TREE_MODEL_UNREAD_COLUMN, &unread, -1);
+ TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &fname,
+ TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type,
+ TNY_GTK_FOLDER_STORE_TREE_MODEL_UNREAD_COLUMN, &unread, -1);
rendobj = G_OBJECT(renderer);
if (unread > 0) {
g_free (fname);
}
-/* FIXME: move these to TnyMail */
-enum {
- TNY_FOLDER_TYPE_NOTES = TNY_FOLDER_TYPE_SENT + 1, /* urgh */
- TNY_FOLDER_TYPE_DRAFTS,
- TNY_FOLDER_TYPE_CONTACTS,
- TNY_FOLDER_TYPE_CALENDAR
-};
-
+/* guess the folder type based on the name, or -1 in case of error */
static TnyFolderType
-guess_folder_type (const gchar* name)
+guess_type_from_name (const gchar* name)
{
- TnyFolderType type;
+ gint type;
gchar *folder;
-
- g_return_val_if_fail (name, TNY_FOLDER_TYPE_NORMAL);
+
+ if (!name)
+ return -1;
type = TNY_FOLDER_TYPE_NORMAL;
folder = g_utf8_strdown (name, strlen(name));
}
+
+TnyFolderType
+modest_folder_view_guess_folder_type (TnyFolder *folder)
+{
+ TnyFolderType type;
+
+ g_return_val_if_fail (folder, -1);
+
+ type = tny_folder_get_folder_type (folder);
+ if (type == TNY_FOLDER_TYPE_NORMAL)
+ type = guess_type_from_name (tny_folder_get_name (folder));
+
+ return type;
+}
+
+
static void
icon_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
rendobj = G_OBJECT(renderer);
gtk_tree_model_get (tree_model, iter,
- TNY_GTK_ACCOUNT_TREE_MODEL_TYPE_COLUMN, &type,
- TNY_GTK_ACCOUNT_TREE_MODEL_NAME_COLUMN, &fname,
- TNY_GTK_ACCOUNT_TREE_MODEL_UNREAD_COLUMN, &unread, -1);
+ TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type,
+ TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &fname,
+ TNY_GTK_FOLDER_STORE_TREE_MODEL_UNREAD_COLUMN, &unread, -1);
rendobj = G_OBJECT(renderer);
if (type == TNY_FOLDER_TYPE_NORMAL)
- type = guess_folder_type (fname);
+ type = guess_type_from_name (fname);
if (fname)
g_free (fname);
switch (type) {
- case TNY_FOLDER_TYPE_INBOX:
+ case TNY_FOLDER_TYPE_ROOT:
+ pixbuf = modest_icon_factory_get_icon (MODEST_FOLDER_ICON_ACCOUNT);
+ break;
+ case TNY_FOLDER_TYPE_INBOX:
pixbuf = modest_icon_factory_get_small_icon (MODEST_FOLDER_ICON_INBOX);
break;
case TNY_FOLDER_TYPE_OUTBOX:
priv->query = NULL;
priv->lock = g_mutex_new ();
- column = gtk_tree_view_column_new ();
- gtk_tree_view_column_set_title (column,
- _("All Mail Folders"));
-
- gtk_tree_view_append_column (GTK_TREE_VIEW(obj),
- column);
+ column = gtk_tree_view_column_new ();
+ gtk_tree_view_append_column (GTK_TREE_VIEW(obj),column);
renderer = gtk_cell_renderer_pixbuf_new();
gtk_tree_view_column_pack_start (column, renderer, FALSE);
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_set_headers_visible (GTK_TREE_VIEW(obj), TRUE);
gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW(obj), FALSE);
gtk_tree_view_set_enable_search (GTK_TREE_VIEW(obj), FALSE);
priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
iter = tny_list_create_iterator (TNY_LIST (model));
- do {
+ while (!tny_iterator_is_done (iter)) {
g_signal_handler_disconnect (G_OBJECT (tny_iterator_get_current (iter)),
priv->store_accounts_handlers [i++]);
tny_iterator_next (iter);
- } while (!tny_iterator_is_done (iter));
+ }
+ g_object_unref (G_OBJECT (iter));
}
account);
}
+void
+modest_folder_view_set_title (ModestFolderView *self, const gchar *title)
+{
+ GtkTreeViewColumn *col;
+
+ g_return_if_fail (self);
+
+ col = gtk_tree_view_get_column (GTK_TREE_VIEW(self), 0);
+ if (!col) {
+ g_printerr ("modest: failed get column for title\n");
+ return;
+ }
+
+ gtk_tree_view_column_set_title (col, title);
+ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(self),
+ title != NULL);
+}
GtkWidget*
modest_folder_view_new (ModestTnyAccountStore *account_store,
priv->account_store = g_object_ref (G_OBJECT (account_store));
if (query)
priv->query = g_object_ref (G_OBJECT (query));
-
+
if (!update_model (MODEST_FOLDER_VIEW(self),
MODEST_TNY_ACCOUNT_STORE(account_store)))
- g_printerr ("modest: failed to update model");
+ g_printerr ("modest: failed to update model\n");
priv->sig1 = g_signal_connect (G_OBJECT(account_store), "account_update",
G_CALLBACK (on_account_update), self);
store = gtk_tree_store_new (1, G_TYPE_STRING);
gtk_tree_store_append (store, &iter, NULL);
- gtk_tree_store_set (store, &iter, 0,
- _("(empty)"), -1);
+ gtk_tree_store_set (store, &iter, 0, _("(empty)"), -1);
gtk_tree_view_set_model (GTK_TREE_VIEW(self),
GTK_TREE_MODEL(store));
priv->view_is_empty = TRUE;
- g_signal_emit (G_OBJECT(self), signals[FOLDER_SELECTED_SIGNAL], 0,
- NULL);
+ g_signal_emit (G_OBJECT(self), signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0,
+ NULL, TRUE);
return TRUE;
}
static void
update_store_account_handlers (ModestFolderView *self, TnyList *account_list)
{
- gint size;
ModestFolderViewPrivate *priv;
TnyIterator *iter;
+ guint len;
priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
/* Listen to subscription changes */
- size = tny_list_get_length (TNY_LIST (account_list)) * sizeof (gulong);
+ len = tny_list_get_length (TNY_LIST (account_list));
g_assert (priv->store_accounts_handlers == NULL); /* don't leak */
- priv->store_accounts_handlers = g_malloc0 (size);
+ priv->store_accounts_handlers = g_malloc0 (sizeof (guint) * len);
iter = tny_list_create_iterator (account_list);
- if (!tny_iterator_is_done (iter))
- priv->view_is_empty = FALSE;
- else {
+ if (!tny_iterator_is_done (iter)) {
gint i = 0;
- while (!tny_iterator_is_done (iter)) {
+
+ priv->view_is_empty = FALSE;
+ do {
priv->store_accounts_handlers [i++] =
g_signal_connect (G_OBJECT (tny_iterator_get_current (iter)),
G_CALLBACK (on_subscription_changed),
self);
tny_iterator_next (iter);
- }
- }
- g_object_unref (iter);
+ } while (!tny_iterator_is_done (iter));
+ }
+ g_object_unref (G_OBJECT (iter));
}
+
+
static gboolean
update_model (ModestFolderView *self, ModestTnyAccountStore *account_store)
{
g_return_val_if_fail (account_store, FALSE);
priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
-
- update_model_empty (self); /* cleanup */
- //model = GTK_TREE_MODEL(tny_gtk_account_tree_model_new (TRUE, priv->query)); /* async */
- model = GTK_TREE_MODEL(tny_gtk_account_tree_model_new (TRUE, NULL)); /* async */
-
+ model = tny_gtk_folder_store_tree_model_new (TRUE, NULL);
account_list = TNY_LIST(model);
tny_account_store_get_accounts (TNY_ACCOUNT_STORE(account_store),
if (account_list) {
sortable = gtk_tree_model_sort_new_with_model (model);
gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sortable),
- TNY_GTK_ACCOUNT_TREE_MODEL_NAME_COLUMN,
+ TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN,
GTK_SORT_ASCENDING);
gtk_tree_view_set_model (GTK_TREE_VIEW(self), sortable);
GtkTreeIter iter;
ModestFolderView *tree_view;
ModestFolderViewPrivate *priv;
- gint type;
- const gchar *account_name;
+ gint type;
g_return_if_fail (sel);
g_return_if_fail (user_data);
-
+
priv = MODEST_FOLDER_VIEW_GET_PRIVATE(user_data);
priv->cur_selection = sel;
-
+
/* is_empty means that there is only the 'empty' item */
if (priv->view_is_empty)
return;
-
+
/* folder was _un_selected if true */
if (!gtk_tree_selection_get_selected (sel, &model, &iter)) {
priv->cur_folder = NULL; /* FIXME: need this? */
- return;
- }
-
+ return;
+ }
+
tree_view = MODEST_FOLDER_VIEW (user_data);
-
- gtk_tree_model_get (model, &iter,
- TNY_GTK_ACCOUNT_TREE_MODEL_TYPE_COLUMN, &type,
- TNY_GTK_ACCOUNT_TREE_MODEL_INSTANCE_COLUMN, &folder,
+ gtk_tree_model_get (model, &iter,
+ TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type,
+ TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder,
-1);
- if (type == TNY_FOLDER_TYPE_ROOT) {
- account_name = tny_account_get_name (TNY_ACCOUNT (folder));
- } else {
- if (priv->cur_folder)
- tny_folder_expunge (priv->cur_folder, NULL); /* FIXME */
- priv->cur_folder = folder;
+ if (type == TNY_FOLDER_TYPE_ROOT)
+ return;
+
+ /* emit 2 signals: one for the unselection of the old one,
+ * and one for the selection of the new on */
+ g_signal_emit (G_OBJECT(tree_view), signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0,
+ priv->cur_folder, FALSE);
+ g_signal_emit (G_OBJECT(tree_view), signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0,
+ folder, TRUE);
+
+ if (priv->cur_folder)
+ tny_folder_expunge (priv->cur_folder, NULL); /* FIXME */
+ priv->cur_folder = folder;
- /* FIXME: this is ugly */
- account_name = get_account_name_from_folder (model, iter);
-
- g_signal_emit (G_OBJECT(tree_view), signals[FOLDER_SELECTED_SIGNAL], 0,
- folder);
- }
}
static void
modest_folder_view_update_model (ModestFolderView *self, TnyAccountStore *account_store)
{
gboolean retval;
-
+
g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (self), FALSE);
retval = update_model (self, MODEST_TNY_ACCOUNT_STORE(account_store)); /* ugly */
- g_signal_emit (G_OBJECT(self), signals[FOLDER_SELECTED_SIGNAL],
- 0, NULL);
+ g_signal_emit (G_OBJECT(self), signals[FOLDER_SELECTION_CHANGED_SIGNAL],
+ 0, NULL, TRUE);
return retval;
}
+
+/* ugly */
static const gchar *
get_account_name_from_folder (GtkTreeModel *model, GtkTreeIter iter)
{
gtk_tree_model_get_iter (model, &new_iter, path);
gtk_tree_model_get (model, &new_iter,
- TNY_GTK_ACCOUNT_TREE_MODEL_INSTANCE_COLUMN, &account_folder,
+ TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &account_folder,
-1);
return tny_account_get_name (TNY_ACCOUNT (account_folder));
}
projects / modest / blobdiff