#include <modest-account-mgr.h>
#include <modest-account-mgr-helpers.h>
+#include <modest-tny-account.h>
#include <modest-text-utils.h>
#include <modest-runtime.h>
+#include <modest-signal-mgr.h>
#include <gtk/gtkcellrenderertoggle.h>
#include <gtk/gtkcellrenderertext.h>
#include <gtk/gtktreeselection.h>
#include <gtk/gtkliststore.h>
#include <string.h> /* For strcmp(). */
+#include <modest-account-mgr-helpers.h>
+#include <modest-datetime-formatter.h>
+#ifdef MODEST_TOOLKIT_HILDON2
+#include <hildon/hildon-defines.h>
+#endif
+#ifdef MODEST_USE_LIBTIME
+#include <clockd/libtime.h>
+#endif
/* 'private'/'protected' functions */
static void modest_account_view_class_init (ModestAccountViewClass *klass);
static void modest_account_view_finalize (GObject *obj);
static void modest_account_view_select_account (ModestAccountView *account_view,
- const gchar* account_name);
+ 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);
+
+#ifndef MODEST_TOOLKIT_HILDON2
+static void modest_account_view_select_first_account (ModestAccountView *account_view);
+#endif
+
+static void on_account_updated (ModestAccountMgr* mgr, gchar* account_name,
+ gpointer user_data);
+static void update_account_view (ModestAccountMgr *account_mgr, ModestAccountView *view);
+static void on_notify_style (GObject *obj, GParamSpec *spec, gpointer userdata);
+static void update_picker_mode (ModestAccountView *self);
typedef enum {
MODEST_ACCOUNT_VIEW_NAME_COLUMN,
struct _ModestAccountViewPrivate {
ModestAccountMgr *account_mgr;
+ ModestDatetimeFormatter *datetime_formatter;
+ gboolean picker_mode;
+
/* Signal handlers */
- gulong acc_inserted_handler, acc_removed_handler,
- acc_busy_changed_handler, acc_changed_handler;
+ GSList *sig_handlers;
};
#define MODEST_ACCOUNT_VIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
MODEST_TYPE_ACCOUNT_VIEW, \
}
static void
-modest_account_view_init (ModestAccountView *obj)
+datetime_format_changed (ModestDatetimeFormatter *formatter,
+ ModestAccountView *self)
{
ModestAccountViewPrivate *priv;
+
+ priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(self);
+ update_account_view (priv->account_mgr, self);
+}
+static void
+modest_account_view_init (ModestAccountView *obj)
+{
+ ModestAccountViewPrivate *priv;
+
priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(obj);
- priv->account_mgr = NULL;
- priv->acc_inserted_handler = 0;
- priv->acc_removed_handler = 0;
- priv->acc_busy_changed_handler = 0;
- priv->acc_changed_handler = 0;
+ priv->sig_handlers = NULL;
+
+ priv->datetime_formatter = modest_datetime_formatter_new ();
+ priv->picker_mode = FALSE;
+ g_signal_connect (G_OBJECT (priv->datetime_formatter), "format-changed",
+ G_CALLBACK (datetime_format_changed), (gpointer) obj);
+#ifdef MODEST_TOOLKIT_HILDON2
+ gtk_rc_parse_string ("style \"fremantle-modest-account-view\" {\n"
+ " GtkWidget::hildon-mode = 1\n"
+ "} widget \"*.fremantle-modest-account-view\" style \"fremantle-modest-account-view\""
+ "widget_class \"*<HildonPannableArea>.ModestAccountView\" style :highest \"fremantle-modest-account-view\"");
+
+#endif
+ g_signal_connect (G_OBJECT (obj), "notify::style", G_CALLBACK (on_notify_style), (gpointer) obj);
}
static void
priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(obj);
- if (priv->account_mgr) {
- 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);
-
+ if (priv->datetime_formatter) {
+ g_object_unref (priv->datetime_formatter);
+ priv->datetime_formatter = NULL;
+ }
+
+ /* 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;
}
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)
+/* Get the string for the last updated time. Result must NOT be g_freed */
+static const gchar*
+get_last_updated_string(ModestAccountView *self, ModestAccountMgr* account_mgr, ModestAccountSettings *settings)
{
/* 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"));
+ const gchar *last_updated_string;
+ const gchar *store_account_name;
+ const gchar *account_name;
+ time_t last_updated;
+ ModestServerAccountSettings *server_settings;
+ ModestAccountViewPrivate *priv;
+
+ priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE (self);
+ server_settings = modest_account_settings_get_store_settings (settings);
+ store_account_name = modest_server_account_settings_get_account_name (server_settings);
+ last_updated = modest_account_mgr_get_last_updated (account_mgr, store_account_name);
+
+ g_object_unref (server_settings);
+ account_name = modest_account_settings_get_account_name (settings);
+ if (!modest_account_mgr_account_is_busy(account_mgr, account_name)) {
+ if (last_updated > 0) {
+ last_updated_string =
+ modest_datetime_formatter_display_datetime (priv->datetime_formatter,
+ last_updated);
+ } else {
+ last_updated_string = _("mcen_va_never");
+ }
} else {
- /* FIXME: There should be a logical name in the UI specs */
- last_updated_string = g_strdup(_("..."));
+ last_updated_string = _("mcen_va_refreshing");
}
+
return last_updated_string;
}
{
GSList *account_names, *cursor;
GtkListStore *model;
-
+
model = GTK_LIST_STORE(gtk_tree_view_get_model (GTK_TREE_VIEW(view)));
-
- /* Get the ID of the currently-selected account,
+
+ /* 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.
*/
gtk_list_store_clear (model);
/* 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
+ * 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;
- ModestAccountData *account_data;
+ ModestAccountSettings *settings;
+ ModestServerAccountSettings *store_settings;
account_name = (gchar*)cursor->data;
- account_data = modest_account_mgr_get_account_data (account_mgr, account_name);
- if (!account_data) {
+ settings = modest_account_mgr_load_account_settings (account_mgr, account_name);
+ if (!settings) {
g_printerr ("modest: failed to get account data for %s\n", account_name);
+ cursor = cursor->next;
continue;
}
+ store_settings = modest_account_settings_get_store_settings (settings);
/* don't display accounts without stores */
- if (account_data->store_account) {
+ if (modest_server_account_settings_get_account_name (store_settings) != NULL) {
GtkTreeIter iter;
+
+ /* don't free */
+ const gchar *last_updated_string = get_last_updated_string(view, account_mgr, settings);
- gchar *last_updated_string = get_last_updated_string(account_mgr, account_data);
-
- if (account_data->is_enabled) {
+ if (modest_account_settings_get_enabled (settings)) {
+ ModestProtocolType protocol_type;
+ ModestProtocolRegistry *protocol_registry;
+ ModestProtocol *protocol;
+ const gchar *proto_name;
+#ifdef MODEST_TOOLKIT_HILDON2
+ gchar *last_updated_hildon2;
+
+ last_updated_hildon2 = g_strconcat (_("mcen_ti_lastupdated"), "\n",
+ last_updated_string,
+ NULL);
+#endif
+ protocol_registry = modest_runtime_get_protocol_registry ();
+ protocol_type = modest_server_account_settings_get_protocol (store_settings);
+ protocol = modest_protocol_registry_get_protocol_by_type (protocol_registry, protocol_type);
+ proto_name = modest_protocol_get_name (protocol);
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_NAME_COLUMN, account_name,
+ MODEST_ACCOUNT_VIEW_DISPLAY_NAME_COLUMN,
+ modest_account_settings_get_display_name (settings),
+ MODEST_ACCOUNT_VIEW_IS_ENABLED_COLUMN,
+ modest_account_settings_get_enabled (settings),
+ MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN,
+ modest_account_settings_get_is_default (settings),
+ MODEST_ACCOUNT_VIEW_PROTO_COLUMN, proto_name,
+#ifdef MODEST_TOOLKIT_HILDON2
+ MODEST_ACCOUNT_VIEW_LAST_UPDATED_COLUMN, last_updated_hildon2,
+#else
MODEST_ACCOUNT_VIEW_LAST_UPDATED_COLUMN, last_updated_string,
+#endif
-1);
+#ifdef MODEST_TOOLKIT_HILDON2
+ g_free (last_updated_hildon2);
+#endif
}
- g_free (last_updated_string);
}
-
- modest_account_mgr_free_account_data (account_mgr, account_data);
+
+ g_object_unref (store_settings);
+ g_object_unref (settings);
cursor = cursor->next;
}
if (selected_name) {
modest_account_view_select_account (view, selected_name);
g_free (selected_name);
+ } else {
+#ifndef MODEST_TOOLKIT_HILDON2
+ modest_account_view_select_first_account (view);
+#endif
}
}
static void
on_account_busy_changed(ModestAccountMgr *account_mgr,
- const gchar *account_name,
- gboolean busy,
- ModestAccountView *self)
+ 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__);
+ gboolean found = FALSE;
+
if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(model), &iter))
return;
- do
- {
+
+ 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)
+ 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)) {
+ ModestAccountSettings* settings =
+ modest_account_mgr_load_account_settings (account_mgr, account_name);
+ if (!settings) {
+ g_free (cur_name);
return;
- gchar* last_updated_string = get_last_updated_string(account_mgr, account_data);
+ }
+ const gchar* last_updated_string = get_last_updated_string(self, account_mgr, settings);
+#ifdef MODEST_TOOLKIT_HILDON2
+ gchar *last_updated_hildon2;
+
+ last_updated_hildon2 = g_strconcat (_("mcen_ti_lastupdated"), "\n",
+ last_updated_string,
+ NULL);
+#endif
gtk_list_store_set(model, &iter,
+#ifdef MODEST_TOOLKIT_HILDON2
+ MODEST_ACCOUNT_VIEW_LAST_UPDATED_COLUMN, last_updated_hildon2,
+#else
MODEST_ACCOUNT_VIEW_LAST_UPDATED_COLUMN, last_updated_string,
+#endif
-1);
- g_free (last_updated_string);
- modest_account_mgr_free_account_data (account_mgr, account_data);
- return;
+
+#ifdef MODEST_TOOLKIT_HILDON2
+ g_free (last_updated_hildon2);
+#endif
+ g_object_unref (settings);
+ found = TRUE;
}
- }
- while (gtk_tree_model_iter_next(GTK_TREE_MODEL(model), &iter));
+ g_free (cur_name);
+
+ } while (!found && gtk_tree_model_iter_next(GTK_TREE_MODEL(model), &iter));
}
static void
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);
+ /* Do not refresh the view with transport accounts */
+ if (TNY_IS_STORE_ACCOUNT (account))
+ update_account_view (priv->account_mgr, self);
}
static void
{
ModestAccountView *self;
ModestAccountViewPrivate *priv;
+ gchar *selected_name;
+
+ 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))
+ return;
+
+ selected_name = modest_account_view_get_selected_account (self);
+ if (selected_name == NULL) {
+#ifndef MODEST_TOOLKIT_HILDON2
+ /* we select the first account if none is selected */
+ modest_account_view_select_first_account (self);
+#endif
+ } else {
+ g_free (selected_name);
+ }
+
update_account_view (priv->account_mgr, self);
}
static void
-on_account_changed (TnyAccountStore *account_store,
- TnyAccount *account,
- gpointer user_data)
+on_account_default_toggled (GtkCellRendererToggle *cell_renderer,
+ gchar *path,
+ ModestAccountView *self)
{
- ModestAccountView *self;
ModestAccountViewPrivate *priv;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ gchar *account_name = NULL;
- 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);
-}
+ 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;
+ priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(self);
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW(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;
+ if (!gtk_tree_model_get_iter_from_string (model, &iter, path)) {
+ g_warning ("Got path of a not existing iter");
+ return;
}
+
+ 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);
- return FALSE;
+ g_free (account_name);
}
static void
-on_account_default_toggled (GtkCellRendererToggle *cell_renderer, gchar *path,
- ModestAccountView *self)
+on_account_updated (ModestAccountMgr* mgr,
+ gchar* account_name,
+ gpointer user_data)
{
- 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;
- }
+ update_account_view (mgr, MODEST_ACCOUNT_VIEW (user_data));
+}
- 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;
- }
-
- gchar *account_name = NULL;
- gtk_tree_model_get (model, &iter, MODEST_ACCOUNT_VIEW_NAME_COLUMN, &account_name,
- -1);
-
- /* 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__);
- }
+static void
+bold_if_default_account_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
+ GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data)
+{
+ gboolean is_default;
+ GtkStyle *style;
+ const gchar *font_style;
+ PangoAttribute *attr;
+ PangoAttrList *attr_list = NULL;
+ GtkWidget *widget;
- gtk_list_store_set (GTK_LIST_STORE (model), &iter,
- MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN, TRUE, -1);
- }
+ gtk_tree_model_get (tree_model, iter, MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN,
+ &is_default, -1);
- g_free (account_name);
+/* widget = gtk_tree_view_column_get_tree_view (column); */
+ widget = GTK_WIDGET (user_data);
+ font_style = is_default?"EmpSystemFont":"SystemFont";
+ style = gtk_rc_get_style_by_paths (gtk_widget_get_settings (GTK_WIDGET(widget)),
+ font_style, NULL,
+ G_TYPE_NONE);
+ if (style) {
+ attr = pango_attr_font_desc_new (pango_font_description_copy (style->font_desc));
+
+ attr_list = pango_attr_list_new ();
+ pango_attr_list_insert (attr_list, attr);
+
+ g_object_set (G_OBJECT(renderer),
+ "attributes", attr_list,
+ NULL);
+
+ pango_attr_list_unref (attr_list);
+ } else {
+ g_object_set (G_OBJECT(renderer),
+ "weight", is_default ? 800: 400,
+ NULL);
+ }
}
-void
-bold_if_default_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
- GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data)
+static void
+bold_if_default_last_updated_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
+ GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data)
{
gboolean is_default;
+ GtkStyle *style;
+ const gchar *font_style;
+ PangoAttribute *attr;
+ PangoAttrList *attr_list = NULL;
+ GtkWidget *widget;
+
gtk_tree_model_get (tree_model, iter, MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN,
&is_default, -1);
- g_object_set (G_OBJECT(renderer),
- "weight", is_default ? 800: 400,
- NULL);
+
+/* widget = gtk_tree_view_column_get_tree_view (column); */
+ widget = GTK_WIDGET (user_data);
+ font_style = is_default?"EmpSmallSystemFont":"SmallSystemFont";
+ style = gtk_rc_get_style_by_paths (gtk_widget_get_settings (GTK_WIDGET(widget)),
+ font_style, NULL,
+ G_TYPE_NONE);
+ if (style) {
+ attr = pango_attr_font_desc_new (pango_font_description_copy (style->font_desc));
+
+ attr_list = pango_attr_list_new ();
+ pango_attr_list_insert (attr_list, attr);
+
+ g_object_set (G_OBJECT(renderer),
+ "attributes", attr_list,
+ NULL);
+
+ pango_attr_list_unref (attr_list);
+ } else {
+ g_object_set (G_OBJECT(renderer),
+ "weight", is_default ? 800: 400,
+ NULL);
+ }
}
static void
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,
g_object_unref (G_OBJECT (model));
toggle_renderer = gtk_cell_renderer_toggle_new ();
- text_renderer = gtk_cell_renderer_text_new ();
-
/* the is_default column */
g_object_set (G_OBJECT(toggle_renderer), "activatable", TRUE, "radio", TRUE, NULL);
+ column = gtk_tree_view_column_new_with_attributes
+ (_("mcen_ti_default"), toggle_renderer,
+ "active", MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN, NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW(self),
- gtk_tree_view_column_new_with_attributes (
- _("mcen_ti_default"), toggle_renderer,
- "active", MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN, NULL));
+ column);
+#ifdef MODEST_TOOLKIT_HILDON2
+ gtk_tree_view_column_set_visible (column, FALSE);
+#endif
/* Disable the Maemo GtkTreeView::allow-checkbox-mode Maemo modification,
* which causes the model column to be updated automatically when the row is clicked.
*
* djcb: indeed, they have been removed for post-bora, i added the ifdefs...
*/
-#ifdef MODEST_HILDON_VERSION_0
+#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_HILDON_VERSION_0 */
- g_signal_connect (G_OBJECT(toggle_renderer), "toggled", G_CALLBACK(on_account_default_toggled),
- self);
+#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 */
+ text_renderer = gtk_cell_renderer_text_new ();
+ g_object_set (G_OBJECT (text_renderer),
+ "ellipsize", PANGO_ELLIPSIZE_END, "ellipsize-set", TRUE,
+#ifdef MODEST_TOOLKIT_HILDON2
+ "xpad", HILDON_MARGIN_DOUBLE,
+#endif
+ NULL);
+
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);
+ gtk_tree_view_column_set_expand (column, TRUE);
+ gtk_tree_view_column_set_cell_data_func(column, text_renderer, bold_if_default_account_cell_data,
+ self, NULL);
/* last update for this account */
- column = gtk_tree_view_column_new_with_attributes (_("mcen_ti_lastupdated"), text_renderer,"text",
+ text_renderer = gtk_cell_renderer_text_new ();
+ g_object_set (G_OBJECT (text_renderer),
+ "alignment", PANGO_ALIGN_RIGHT,
+ "xalign", 1.0,
+#ifdef MODEST_TOOLKIT_HILDON2
+ "xpad", HILDON_MARGIN_DOUBLE,
+#endif
+ NULL);
+
+ column = gtk_tree_view_column_new_with_attributes (_("mcen_ti_lastupdated"), text_renderer,"markup",
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);
-
+ gtk_tree_view_column_set_expand (column, FALSE);
+ gtk_tree_view_column_set_cell_data_func(column, text_renderer, bold_if_default_last_updated_cell_data,
+ self, NULL);
+
/* Show the column headers,
* which does not seem to be the default on Maemo.
- */
+ */
+#ifndef MODEST_TOOLKIT_HILDON2
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->acc_changed_handler = g_signal_connect (G_OBJECT(priv->account_mgr),
- "account_changed",
- G_CALLBACK(on_account_changed), self);
+#endif
+
+ update_picker_mode (self);
+
+ 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(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);
+ priv->sig_handlers =
+ modest_signal_mgr_connect (priv->sig_handlers,
+ G_OBJECT (priv->account_mgr),
+ "account_updated",
+ G_CALLBACK (on_account_updated),
+ self);
}
-
ModestAccountView*
modest_account_view_new (ModestAccountMgr *account_mgr)
{
g_return_val_if_fail (account_mgr, NULL);
- obj = g_object_new(MODEST_TYPE_ACCOUNT_VIEW, NULL);
+ obj = g_object_new(MODEST_TYPE_ACCOUNT_VIEW,
+#ifdef MODEST_TOOLKIT_HILDON2
+ "hildon-ui-mode", HILDON_UI_MODE_NORMAL,
+#endif
+ NULL);
priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(obj);
g_object_ref (G_OBJECT (account_mgr));
return account_name;
}
+gchar *
+modest_account_view_get_path_account (ModestAccountView *self, GtkTreePath *path)
+{
+ gchar *account_name = NULL;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+
+ g_return_val_if_fail (MODEST_IS_ACCOUNT_VIEW (self), NULL);
+
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
+ if (gtk_tree_model_get_iter (model, &iter, path)) {
+ gtk_tree_model_get (model, &iter,
+ MODEST_ACCOUNT_VIEW_NAME_COLUMN,
+ &account_name, -1);
+ }
+
+ return account_name;
+}
+
/* This allows us to pass more than one piece of data to the signal handler,
* and get a result: */
typedef struct
return FALSE; /* Keep walking the tree. */
}
-static void modest_account_view_select_account (ModestAccountView *account_view,
- const gchar* account_name)
+static void
+modest_account_view_select_account (ModestAccountView *account_view,
+ const gchar* account_name)
{
+#ifdef MODEST_TOOLKIT_HILDON2
+ return;
+#endif
/* 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;
g_free (state);
}
+#ifndef MODEST_TOOLKIT_HILDON2
+static void
+modest_account_view_select_first_account (ModestAccountView *account_view)
+{
+ GtkTreeIter iter;
+ GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (account_view));
+
+ if (gtk_tree_model_get_iter_first (model, &iter)) {
+ GtkTreeSelection *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (account_view));
+
+ gtk_tree_selection_select_iter (selection, &iter);
+ }
+}
+#endif
+
+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));
+}
+
+static void
+on_notify_style (GObject *obj, GParamSpec *spec, gpointer userdata)
+{
+ if (strcmp ("style", spec->name) == 0) {
+ gtk_widget_queue_draw (GTK_WIDGET (obj));
+ }
+}
+
+static void
+update_picker_mode (ModestAccountView *self)
+{
+ ModestAccountViewPrivate *priv;
+ GtkTreeViewColumn *column;
+ GList *renderers;
+ GtkCellRenderer *renderer;
+
+ g_return_if_fail (MODEST_IS_ACCOUNT_VIEW (self));
+ priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(self);
+
+ /* Last updated column */
+ column = gtk_tree_view_get_column (GTK_TREE_VIEW (self), 2);
+ gtk_tree_view_column_set_visible (column, !priv->picker_mode);
+
+ /* Name column */
+ column = gtk_tree_view_get_column (GTK_TREE_VIEW (self), 1);
+ renderers = gtk_tree_view_column_get_cell_renderers (column);
+ renderer = (GtkCellRenderer *) renderers->data;
+ g_object_set (renderer,
+ "align-set", TRUE,
+ "alignment", priv->picker_mode?PANGO_ALIGN_CENTER:PANGO_ALIGN_LEFT,
+ NULL);
+ g_list_free (renderers);
+}
+
+void
+modest_account_view_set_picker_mode (ModestAccountView *self, gboolean enable)
+{
+ ModestAccountViewPrivate *priv;
+
+ g_return_if_fail (MODEST_IS_ACCOUNT_VIEW (self));
+ priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(self);
+
+ priv->picker_mode = enable;
+ update_picker_mode (self);
+}
+
+gboolean
+modest_account_view_get_picker_mode (ModestAccountView *self)
+{
+ ModestAccountViewPrivate *priv;
+
+ g_return_val_if_fail (MODEST_IS_ACCOUNT_VIEW (self), FALSE);
+ priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(self);
+
+ return priv->picker_mode;
+}