#include <modest-account-mgr.h>
#include <modest-account-mgr-helpers.h>
#include <modest-text-utils.h>
+#include <modest-runtime.h>
#include <gtk/gtkcellrenderertoggle.h>
#include <gtk/gtkcellrenderertext.h>
#include <gtk/gtktreeselection.h>
#include <gtk/gtkliststore.h>
+#include <string.h> /* For strcmp(). */
/* 'private'/'protected' functions */
static void modest_account_view_class_init (ModestAccountViewClass *klass);
static void modest_account_view_init (ModestAccountView *obj);
static void modest_account_view_finalize (GObject *obj);
+static void modest_account_view_select_account (ModestAccountView *account_view,
+ const gchar* account_name);
typedef enum {
MODEST_ACCOUNT_VIEW_NAME_COLUMN,
MODEST_ACCOUNT_VIEW_COLUMN_NUM
} AccountViewColumns;
-
-/* list my signals */
-enum {
- /* MY_SIGNAL_1, */
- /* MY_SIGNAL_2, */
- LAST_SIGNAL
-};
-
typedef struct _ModestAccountViewPrivate ModestAccountViewPrivate;
struct _ModestAccountViewPrivate {
ModestAccountMgr *account_mgr;
- gulong sig1, sig2;
-
+
+ /* Signal handlers */
+ gulong acc_inserted_handler, acc_removed_handler,
+ acc_busy_changed_handler, acc_changed_handler;
};
#define MODEST_ACCOUNT_VIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
MODEST_TYPE_ACCOUNT_VIEW, \
/* globals */
static GtkTreeViewClass *parent_class = NULL;
-/* uncomment the following if you have defined any signals */
-/* static guint signals[LAST_SIGNAL] = {0}; */
-
GType
modest_account_view_get_type (void)
{
priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(obj);
priv->account_mgr = NULL;
- priv->sig1 = 0;
- priv->sig2 = 0;
+ priv->acc_inserted_handler = 0;
+ priv->acc_removed_handler = 0;
+ priv->acc_busy_changed_handler = 0;
+ priv->acc_changed_handler = 0;
}
static void
priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(obj);
if (priv->account_mgr) {
- if (priv->sig1)
- g_signal_handler_disconnect (priv->account_mgr, priv->sig1);
-
- if (priv->sig2)
- g_signal_handler_disconnect (priv->account_mgr, priv->sig2);
-
+ if (g_signal_handler_is_connected (modest_runtime_get_account_store (),
+ priv->acc_inserted_handler))
+ g_signal_handler_disconnect (modest_runtime_get_account_store (),
+ priv->acc_inserted_handler);
+
+ if (g_signal_handler_is_connected (modest_runtime_get_account_store (),
+ priv->acc_removed_handler))
+ g_signal_handler_disconnect (modest_runtime_get_account_store (),
+ priv->acc_removed_handler);
+
+ if (priv->acc_busy_changed_handler)
+ g_signal_handler_disconnect (priv->account_mgr, priv->acc_busy_changed_handler);
+ if (priv->acc_changed_handler)
+ g_signal_handler_disconnect (priv->account_mgr, priv->acc_changed_handler);
+
g_object_unref (G_OBJECT(priv->account_mgr));
priv->account_mgr = NULL;
}
G_OBJECT_CLASS(parent_class)->finalize (obj);
}
-
+/* Get the string for the last updated time. Result must be g_freed */
+static gchar*
+get_last_updated_string(ModestAccountMgr* account_mgr, ModestAccountData *account_data)
+{
+ /* FIXME: let's assume that 'last update' applies to the store account... */
+ gchar* last_updated_string;
+ time_t last_updated = account_data->store_account->last_updated;
+ if (!modest_account_mgr_account_is_busy(account_mgr, account_data->account_name)) {
+ if (last_updated > 0)
+ last_updated_string = modest_text_utils_get_display_date(last_updated);
+ else
+ last_updated_string = g_strdup (_("mcen_va_never"));
+ } else {
+ /* FIXME: There should be a logical name in the UI specs */
+ last_updated_string = g_strdup(_("..."));
+ }
+ return last_updated_string;
+}
static void
update_account_view (ModestAccountMgr *account_mgr, ModestAccountView *view)
GSList *account_names, *cursor;
GtkListStore *model;
- model = GTK_LIST_STORE(gtk_tree_view_get_model (GTK_TREE_VIEW(view)));
+ model = GTK_LIST_STORE(gtk_tree_view_get_model (GTK_TREE_VIEW(view)));
+
+ /* Get the ID of the currently-selected account,
+ * so we can select it again after rebuilding the list.
+ * Note that the name doesn't change even when the display name changes.
+ */
+ gchar *selected_name = modest_account_view_get_selected_account (view);
+
gtk_list_store_clear (model);
- cursor = account_names = modest_account_mgr_account_names (account_mgr);
-
- if(account_names == NULL)
- {
- printf ("debug: modest_account_mgr_account_names() returned NULL\n");
- }
+ /* Note: We do not show disabled accounts.
+ * Of course, this means that there is no UI to enable or disable
+ * accounts. That is OK for maemo where no such feature or UI is
+ * specified, so the "enabled" property is used internally to avoid
+ * showing unfinished accounts. If a user-visible "enabled" is
+ * needed in the future, we must use a second property for the
+ * current use instead */
+ cursor = account_names = modest_account_mgr_account_names (account_mgr,
+ TRUE /* only enabled accounts. */);
while (cursor) {
gchar *account_name;
if (account_data->store_account) {
GtkTreeIter iter;
- time_t last_updated;
- gchar *last_updated_string;
- /* FIXME: let's assume that 'last update' applies to the store account... */
- last_updated = account_data->store_account->last_updated;
- if (last_updated > 0)
- last_updated_string = modest_text_utils_get_display_date(last_updated);
- else
- last_updated_string = g_strdup (_("Never"));
+ gchar *last_updated_string = get_last_updated_string(account_mgr, account_data);
- gtk_list_store_insert_with_values (
- model, &iter, 0,
- MODEST_ACCOUNT_VIEW_NAME_COLUMN, account_name,
- MODEST_ACCOUNT_VIEW_DISPLAY_NAME_COLUMN, account_data->display_name,
- MODEST_ACCOUNT_VIEW_IS_ENABLED_COLUMN, account_data->is_enabled,
- MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN, account_data->is_default,
-
- MODEST_ACCOUNT_VIEW_PROTO_COLUMN,
- modest_protocol_info_get_protocol_name (account_data->store_account->proto),
-
- MODEST_ACCOUNT_VIEW_LAST_UPDATED_COLUMN, last_updated_string,
- -1);
+ if (account_data->is_enabled) {
+ gtk_list_store_insert_with_values (
+ model, &iter, 0,
+ MODEST_ACCOUNT_VIEW_NAME_COLUMN, account_name,
+ MODEST_ACCOUNT_VIEW_DISPLAY_NAME_COLUMN, account_data->display_name,
+ MODEST_ACCOUNT_VIEW_IS_ENABLED_COLUMN, account_data->is_enabled,
+ MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN, account_data->is_default,
+
+ MODEST_ACCOUNT_VIEW_PROTO_COLUMN,
+ modest_protocol_info_get_transport_store_protocol_name (account_data->store_account->proto),
+
+ MODEST_ACCOUNT_VIEW_LAST_UPDATED_COLUMN, last_updated_string,
+ -1);
+ }
g_free (last_updated_string);
}
modest_account_mgr_free_account_data (account_mgr, account_data);
cursor = cursor->next;
}
- g_slist_free (account_names);
+
+ modest_account_mgr_free_account_names (account_names);
+ account_names = NULL;
+
+ /* Try to re-select the same account: */
+ if (selected_name) {
+ modest_account_view_select_account (view, selected_name);
+ g_free (selected_name);
+ }
+}
+
+static void
+on_account_busy_changed(ModestAccountMgr *account_mgr,
+ const gchar *account_name,
+ gboolean busy,
+ ModestAccountView *self)
+{
+ GtkListStore *model = GTK_LIST_STORE(gtk_tree_view_get_model (GTK_TREE_VIEW(self)));
+ GtkTreeIter iter;
+ g_message(__FUNCTION__);
+ if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(model), &iter))
+ return;
+ do
+ {
+ gchar* cur_name;
+ gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, MODEST_ACCOUNT_VIEW_NAME_COLUMN,
+ &cur_name, -1);
+ if (g_str_equal(cur_name, account_name))
+ {
+ ModestAccountData* account_data =
+ modest_account_mgr_get_account_data (account_mgr, account_name);
+ if (!account_data)
+ return;
+ gchar* last_updated_string = get_last_updated_string(account_mgr, account_data);
+ gtk_list_store_set(model, &iter,
+ MODEST_ACCOUNT_VIEW_LAST_UPDATED_COLUMN, last_updated_string,
+ -1);
+ g_free (last_updated_string);
+ modest_account_mgr_free_account_data (account_mgr, account_data);
+ return;
+ }
+ }
+ while (gtk_tree_model_iter_next(GTK_TREE_MODEL(model), &iter));
}
+static void
+on_account_inserted (TnyAccountStore *account_store,
+ TnyAccount *account,
+ gpointer user_data)
+{
+ ModestAccountView *self;
+ ModestAccountViewPrivate *priv;
+
+ self = MODEST_ACCOUNT_VIEW (user_data);
+ priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE (self);
+
+ update_account_view (priv->account_mgr, self);
+}
static void
-on_account_changed (ModestAccountMgr *account_mgr,
- const gchar* account, const gchar* key,
- gboolean server_account, ModestAccountView *self)
-{
- update_account_view (account_mgr, self);
+on_account_removed (TnyAccountStore *account_store,
+ TnyAccount *account,
+ gpointer user_data)
+{
+ ModestAccountView *self;
+ ModestAccountViewPrivate *priv;
+
+ self = MODEST_ACCOUNT_VIEW (user_data);
+ priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE (self);
+
+ update_account_view (priv->account_mgr, self);
}
static void
-on_account_removed (ModestAccountMgr *account_mgr,
- const gchar* account, gboolean server_account,
- ModestAccountView *self)
+on_account_changed (TnyAccountStore *account_store,
+ TnyAccount *account,
+ gpointer user_data)
{
- on_account_changed (account_mgr, account, NULL, server_account, self);
+ ModestAccountView *self;
+ ModestAccountViewPrivate *priv;
+
+ self = MODEST_ACCOUNT_VIEW (user_data);
+ priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE (self);
+
+ g_warning ("account changed: %s", tny_account_get_id(account));
+
+ update_account_view (priv->account_mgr, self);
}
+static gboolean
+find_default_account(ModestAccountView *self, GtkTreeIter *iter)
+{
+ GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
+ gboolean result;
+ for (result = gtk_tree_model_get_iter_first(model, iter);
+ result == TRUE; result = gtk_tree_model_iter_next(model, iter))
+ {
+ gboolean is_default;
+ gtk_tree_model_get (model, iter, MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN, &is_default, -1);
+ if(is_default)
+ return TRUE;
+ }
+
+ return FALSE;
+}
static void
-on_account_enable_toggled (GtkCellRendererToggle *cell_renderer, gchar *path,
+on_account_default_toggled (GtkCellRendererToggle *cell_renderer, gchar *path,
ModestAccountView *self)
{
- GtkTreeIter iter;
- ModestAccountViewPrivate *priv;
- GtkTreeModel *model;
- gchar *account_name;
- gboolean enabled;
-
- priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(self);
- model = gtk_tree_view_get_model (GTK_TREE_VIEW(self));
+ gboolean is_default = gtk_cell_renderer_toggle_get_active (cell_renderer);
+ if (is_default) {
+ /* Do not allow an account to be marked non-default.
+ * Only allow this to be changed by setting another account to default: */
+ gtk_cell_renderer_toggle_set_active (cell_renderer, TRUE);
+ return;
+ }
+
+ ModestAccountViewPrivate *priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(self);
+ GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW(self));
+ GtkTreeIter iter;
if (!gtk_tree_model_get_iter_from_string (model, &iter, path)) {
g_printerr ("modest: cannot find iterator\n");
return;
}
- gtk_tree_model_get (model, &iter, MODEST_ACCOUNT_VIEW_IS_ENABLED_COLUMN, &enabled,
- MODEST_ACCOUNT_VIEW_NAME_COLUMN, &account_name,
+
+ gchar *account_name = NULL;
+ gtk_tree_model_get (model, &iter, MODEST_ACCOUNT_VIEW_NAME_COLUMN, &account_name,
-1);
- /* toggle enabled / disabled */
- modest_account_mgr_set_enabled (priv->account_mgr, account_name, !enabled);
+ /* Set this previously-non-default account as the default: */
+ if (modest_account_mgr_set_default_account (priv->account_mgr, account_name))
+ {
+ /* Explicitely set default column because we are ignoring gconf changes */
+ GtkTreeIter old_default_iter;
+ if (find_default_account (self, &old_default_iter)) {
+ gtk_list_store_set (GTK_LIST_STORE (model), &old_default_iter,
+ MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN, FALSE, -1);
+ } else {
+ g_warning ("%s: Did not find old default account in view", __FUNCTION__);
+ }
+
+ gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+ MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN, TRUE, -1);
+ }
+
g_free (account_name);
}
-
void
bold_if_default_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data)
G_TYPE_STRING, /* account proto (pop, imap,...) */
G_TYPE_STRING /* last updated (time_t) */
);
+
+ gtk_tree_sortable_set_sort_column_id (
+ GTK_TREE_SORTABLE (model), MODEST_ACCOUNT_VIEW_DISPLAY_NAME_COLUMN,
+ GTK_SORT_ASCENDING);
gtk_tree_view_set_model (GTK_TREE_VIEW(self), GTK_TREE_MODEL(model));
g_object_unref (G_OBJECT (model));
toggle_renderer = gtk_cell_renderer_toggle_new ();
text_renderer = gtk_cell_renderer_text_new ();
- /* the is_enabled column */
- g_object_set (G_OBJECT(toggle_renderer), "activatable", TRUE,"radio", FALSE, NULL);
- g_signal_connect (G_OBJECT(toggle_renderer), "toggled", G_CALLBACK(on_account_enable_toggled),
- self);
+ /* the is_default column */
+ g_object_set (G_OBJECT(toggle_renderer), "activatable", TRUE, "radio", TRUE, NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW(self),
gtk_tree_view_column_new_with_attributes (
- _("Enabled"), toggle_renderer,
- "active", MODEST_ACCOUNT_VIEW_IS_ENABLED_COLUMN, NULL));
+ _("mcen_ti_default"), toggle_renderer,
+ "active", MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN, NULL));
+
+ /* Disable the Maemo GtkTreeView::allow-checkbox-mode Maemo modification,
+ * which causes the model column to be updated automatically when the row is clicked.
+ * Making this the default in Maemo's GTK+ is obviously a bug:
+ * https://maemo.org/bugzilla/show_bug.cgi?id=146
+ *
+ * djcb: indeed, they have been removed for post-bora, i added the ifdefs...
+ */
+#ifdef MODEST_HILDON_VERSION_0
+ g_object_set(G_OBJECT(self), "allow-checkbox-mode", FALSE, NULL);
+ g_object_set(G_OBJECT(toggle_renderer), "checkbox-mode", FALSE, NULL);
+#endif /*MODEST_HILDON_VERSION_0 */
+ g_signal_connect (G_OBJECT(toggle_renderer), "toggled", G_CALLBACK(on_account_default_toggled),
+ self);
/* account name */
- column = gtk_tree_view_column_new_with_attributes (_("Account"), text_renderer,"text",
+ column = gtk_tree_view_column_new_with_attributes (_("mcen_ti_account"), text_renderer, "text",
MODEST_ACCOUNT_VIEW_DISPLAY_NAME_COLUMN, NULL);
- gtk_tree_view_append_column (GTK_TREE_VIEW(self),column);
- gtk_tree_view_column_set_cell_data_func(column, text_renderer, bold_if_default_cell_data,
- NULL, NULL);
-
- /* account type */
- column = gtk_tree_view_column_new_with_attributes (_("Type"), text_renderer,"text",
- MODEST_ACCOUNT_VIEW_PROTO_COLUMN, NULL);
- gtk_tree_view_append_column (GTK_TREE_VIEW(self),column);
+ gtk_tree_view_append_column (GTK_TREE_VIEW(self), column);
gtk_tree_view_column_set_cell_data_func(column, text_renderer, bold_if_default_cell_data,
NULL, NULL);
/* last update for this account */
- column = gtk_tree_view_column_new_with_attributes (_("Last update"), text_renderer,"text",
+ column = gtk_tree_view_column_new_with_attributes (_("mcen_ti_lastupdated"), text_renderer,"text",
MODEST_ACCOUNT_VIEW_LAST_UPDATED_COLUMN, NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW(self),column);
gtk_tree_view_column_set_cell_data_func(column, text_renderer, bold_if_default_cell_data,
NULL, NULL);
+
+ /* Show the column headers,
+ * which does not seem to be the default on Maemo.
+ */
+ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(self), TRUE);
+
+ priv->acc_removed_handler = g_signal_connect (G_OBJECT (modest_runtime_get_account_store ()),
+ "account_removed",
+ G_CALLBACK(on_account_removed), self);
+
+ priv->acc_inserted_handler = g_signal_connect (G_OBJECT (modest_runtime_get_account_store ()),
+ "account_inserted",
+ G_CALLBACK(on_account_inserted), self);
+
+ priv->acc_busy_changed_handler = g_signal_connect (G_OBJECT(priv->account_mgr),
+ "account_busy_changed",
+ G_CALLBACK(on_account_busy_changed), self);
- priv->sig1 = g_signal_connect (G_OBJECT(priv->account_mgr),"account_removed",
- G_CALLBACK(on_account_removed), self);
- priv->sig2 = g_signal_connect (G_OBJECT(priv->account_mgr), "account_changed",
- G_CALLBACK(on_account_changed), self);
+ priv->acc_changed_handler = g_signal_connect (G_OBJECT(priv->account_mgr),
+ "account_changed",
+ G_CALLBACK(on_account_changed), self);
}
return account_name;
}
+
+/* This allows us to pass more than one piece of data to the signal handler,
+ * and get a result: */
+typedef struct
+{
+ ModestAccountView* self;
+ const gchar *account_name;
+} ForEachData;
+
+static gboolean
+on_model_foreach_select_account(GtkTreeModel *model,
+ GtkTreePath *path, GtkTreeIter *iter, gpointer user_data)
+{
+ ForEachData *state = (ForEachData*)(user_data);
+
+ /* Select the item if it has the matching account name: */
+ gchar *this_account_name = NULL;
+ gtk_tree_model_get (model, iter,
+ MODEST_ACCOUNT_VIEW_NAME_COLUMN, &this_account_name,
+ -1);
+ if(this_account_name && state->account_name
+ && (strcmp (this_account_name, state->account_name) == 0)) {
+
+ GtkTreeSelection *selection =
+ gtk_tree_view_get_selection (GTK_TREE_VIEW (state->self));
+ gtk_tree_selection_select_iter (selection, iter);
+
+ return TRUE; /* Stop walking the tree. */
+ }
+
+ return FALSE; /* Keep walking the tree. */
+}
+
+static void modest_account_view_select_account (ModestAccountView *account_view,
+ const gchar* account_name)
+{
+ /* Create a state instance so we can send two items of data to the signal handler: */
+ ForEachData *state = g_new0 (ForEachData, 1);
+ state->self = account_view;
+ state->account_name = account_name;
+
+ GtkTreeModel *model = gtk_tree_view_get_model (
+ GTK_TREE_VIEW (account_view));
+ gtk_tree_model_foreach (model,
+ on_model_foreach_select_account, state);
+
+ g_free (state);
+}
+
projects / modest / blobdiff