X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-account-view.c;h=8fa542126bc2ff3fbf0aaa7c4fa037d079563621;hp=d2648680bcdd46d5d4d5120454a8531d9c73abe3;hb=16d7f8b9f45217e350735e33ee6d0255aa894074;hpb=0c22b6cb62dd4ad6a77fffa12762b3f9cdcc4469 diff --git a/src/widgets/modest-account-view.c b/src/widgets/modest-account-view.c index d264868..8fa5421 100644 --- a/src/widgets/modest-account-view.c +++ b/src/widgets/modest-account-view.c @@ -32,18 +32,31 @@ #include #include +#include #include +#include +#include #include #include #include #include +#include /* 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); + +static void on_default_account_changed (ModestAccountMgr *mgr, + gpointer user_data); + +static void on_display_name_changed (ModestAccountMgr *self, + const gchar *account, + gpointer user_data); typedef enum { MODEST_ACCOUNT_VIEW_NAME_COLUMN, @@ -56,19 +69,12 @@ typedef enum { 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 */ + GSList *sig_handlers; }; #define MODEST_ACCOUNT_VIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ MODEST_TYPE_ACCOUNT_VIEW, \ @@ -76,9 +82,6 @@ struct _ModestAccountViewPrivate { /* 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) { @@ -119,12 +122,10 @@ static void modest_account_view_init (ModestAccountView *obj) { ModestAccountViewPrivate *priv; - + priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(obj); - priv->account_mgr = NULL; - priv->sig1 = 0; - priv->sig2 = 0; + priv->sig_handlers = NULL; } static void @@ -134,13 +135,10 @@ modest_account_view_finalize (GObject *obj) 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); + /* Disconnect signals */ + modest_signal_mgr_disconnect_all_and_destroy (priv->sig_handlers); + if (priv->account_mgr) { g_object_unref (G_OBJECT(priv->account_mgr)); priv->account_mgr = NULL; } @@ -148,7 +146,25 @@ modest_account_view_finalize (GObject *obj) G_OBJECT_CLASS(parent_class)->finalize (obj); } - +/* Get the string for the last updated time. Result must NOT be g_freed */ +static const gchar* +get_last_updated_string(ModestAccountMgr* account_mgr, ModestAccountData *account_data) +{ + /* FIXME: let's assume that 'last update' applies to the store account... */ + const 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 = _("mcen_va_never"); + } else { + /* FIXME: There should be a logical name in the UI specs */ + last_updated_string = _("mcen_va_refreshing"); + } + + return last_updated_string; +} static void update_account_view (ModestAccountMgr *account_mgr, ModestAccountView *view) @@ -156,10 +172,25 @@ 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); + /* 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; @@ -177,85 +208,170 @@ update_account_view (ModestAccountMgr *account_mgr, ModestAccountView *view) 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")); + + /* don't free */ + const 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); - g_free (last_updated_string); + if (account_data->is_enabled) { + const gchar *proto_name; + + proto_name = modest_protocol_info_get_transport_store_protocol_name (account_data->store_account->proto); + 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, proto_name, + MODEST_ACCOUNT_VIEW_LAST_UPDATED_COLUMN, last_updated_string, + -1); + } } 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_changed (ModestAccountMgr *account_mgr, - const gchar* account, const gchar* key, - gboolean server_account, ModestAccountView *self) -{ - update_account_view (account_mgr, self); +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; + gboolean found = FALSE; + + 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) { + g_free (cur_name); + return; + } + const 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); + modest_account_mgr_free_account_data (account_mgr, account_data); + found = TRUE; + } + g_free (cur_name); + + } while (!found && 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; + + g_return_if_fail (MODEST_IS_ACCOUNT_VIEW (user_data)); + + self = MODEST_ACCOUNT_VIEW (user_data); + priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE (self); + + /* Do not refresh the view with transport accounts */ + if (TNY_IS_STORE_ACCOUNT (account)) + 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_removed (TnyAccountStore *account_store, + TnyAccount *account, + gpointer user_data) { - on_account_changed (account_mgr, account, NULL, server_account, self); + ModestAccountView *self; + ModestAccountViewPrivate *priv; + + g_return_if_fail (MODEST_IS_ACCOUNT_VIEW (user_data)); + + 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 (TnyAccountStore *account_store, + TnyAccount *account, + gpointer user_data) +{ + ModestAccountView *self = NULL; + ModestAccountViewPrivate *priv = NULL; + g_return_if_fail (MODEST_IS_ACCOUNT_VIEW (user_data)); + g_return_if_fail (account); + g_return_if_fail (TNY_IS_ACCOUNT (account)); + + self = MODEST_ACCOUNT_VIEW (user_data); + priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE (self); + + /* Update account view */ +/* update_account_view (priv->account_mgr, self); */ +} static void -on_account_enable_toggled (GtkCellRendererToggle *cell_renderer, gchar *path, - ModestAccountView *self) +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)); - - if (!gtk_tree_model_get_iter_from_string (model, &iter, path)) { - g_printerr ("modest: cannot find iterator\n"); + GtkTreeIter iter; + gchar *account_name = NULL; + + g_return_if_fail (MODEST_IS_ACCOUNT_VIEW (self)); + + /* If it's active then do nothing, no need to reenable it as + default account */ + if (gtk_cell_renderer_toggle_get_active (cell_renderer)) return; - } - gtk_tree_model_get (model, &iter, MODEST_ACCOUNT_VIEW_IS_ENABLED_COLUMN, &enabled, - MODEST_ACCOUNT_VIEW_NAME_COLUMN, &account_name, - -1); + + priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(self); + model = gtk_tree_view_get_model (GTK_TREE_VIEW(self)); + gtk_tree_model_get_iter_from_string (model, &iter, path); - /* toggle enabled / disabled */ - modest_account_mgr_set_enabled (priv->account_mgr, account_name, !enabled); + gtk_tree_model_get (model, &iter, + MODEST_ACCOUNT_VIEW_NAME_COLUMN, + &account_name, -1); + + /* Set this previously-non-default account as the + default. We're not updating here the value of the + DEFAULT_COLUMN because we'll do it in the + "default_account_changed" signal handler. We do it like + this because that way the signal handler is useful also + when we're inserting a new account and there is no other + one defined, in that case the change of account is provoked + by the account mgr and not by a signal toggle.*/ + modest_account_mgr_set_default_account (priv->account_mgr, account_name); + g_free (account_name); } - void bold_if_default_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data) @@ -276,6 +392,7 @@ init_view (ModestAccountView *self) GtkListStore *model; GtkTreeViewColumn *column; + g_return_if_fail (MODEST_IS_ACCOUNT_VIEW (self)); priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(self); model = gtk_list_store_new (6, @@ -286,6 +403,10 @@ init_view (ModestAccountView *self) 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)); @@ -293,44 +414,90 @@ init_view (ModestAccountView *self) 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_HAVE_HILDON0_WIDGETS + g_object_set(G_OBJECT(self), "allow-checkbox-mode", FALSE, NULL); + g_object_set(G_OBJECT(toggle_renderer), "checkbox-mode", FALSE, NULL); +#endif /* MODEST_HAVE_HILDON0_WIDGETS */ + + priv->sig_handlers = + modest_signal_mgr_connect (priv->sig_handlers, + 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); - - 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); + + /* 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->sig_handlers = + modest_signal_mgr_connect (priv->sig_handlers, + G_OBJECT (modest_runtime_get_account_store ()), + "account_removed", + G_CALLBACK(on_account_removed), + self); + priv->sig_handlers = + modest_signal_mgr_connect (priv->sig_handlers, + G_OBJECT (modest_runtime_get_account_store ()), + "account_inserted", + G_CALLBACK(on_account_inserted), + self); + priv->sig_handlers = + modest_signal_mgr_connect (priv->sig_handlers, + G_OBJECT (modest_runtime_get_account_store ()), + "account_changed", + G_CALLBACK(on_account_changed), + self); + priv->sig_handlers = + modest_signal_mgr_connect (priv->sig_handlers, + G_OBJECT(priv->account_mgr), + "account_busy_changed", + G_CALLBACK(on_account_busy_changed), + self); + priv->sig_handlers = + modest_signal_mgr_connect (priv->sig_handlers, + G_OBJECT(priv->account_mgr), + "default_account_changed", + G_CALLBACK(on_default_account_changed), + self); + priv->sig_handlers = + modest_signal_mgr_connect (priv->sig_handlers, + G_OBJECT(priv->account_mgr), + "display_name_changed", + G_CALLBACK(on_display_name_changed), + self); } - ModestAccountView* modest_account_view_new (ModestAccountMgr *account_mgr) { @@ -370,3 +537,100 @@ modest_account_view_get_selected_account (ModestAccountView *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); +} + +static void +on_default_account_changed (ModestAccountMgr *mgr, + gpointer user_data) +{ + GtkTreeIter iter; + gchar *default_account_name; + GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (user_data)); + + if (!gtk_tree_model_get_iter_first(model, &iter)) + return; + + default_account_name = modest_account_mgr_get_default_account (mgr); + + do { + gboolean is_default; + gchar *name; + + gtk_tree_model_get (model, &iter, + MODEST_ACCOUNT_VIEW_NAME_COLUMN, &name, + MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN, &is_default, + -1); + + /* Update the default account column */ + if ((default_account_name != NULL) && (!strcmp (name, default_account_name))) + gtk_list_store_set (GTK_LIST_STORE (model), &iter, + MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN, TRUE, -1); + else + gtk_list_store_set (GTK_LIST_STORE (model), &iter, + MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN, FALSE, -1); + + g_free (name); + + } while (gtk_tree_model_iter_next(model, &iter)); + + /* Free and force a redraw */ + g_free (default_account_name); + gtk_widget_queue_draw (GTK_WIDGET (user_data)); +} + +static void +on_display_name_changed (ModestAccountMgr *mgr, + const gchar *account, + gpointer user_data) +{ + /* Update the view */ + update_account_view (mgr, MODEST_ACCOUNT_VIEW (user_data)); +}