X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-account-view.c;h=6cc9271ba96d7dd067b527dfbde28a41653950c6;hb=32609f52bc976d13b8287d00662d8c8e7543f1b6;hp=6afd0b549500163e398479af9d02f33f679fd62e;hpb=735b859586454405ffcd4f99455912d53a5faa8e;p=modest diff --git a/src/widgets/modest-account-view.c b/src/widgets/modest-account-view.c index 6afd0b5..6cc9271 100644 --- a/src/widgets/modest-account-view.c +++ b/src/widgets/modest-account-view.c @@ -28,6 +28,7 @@ */ #include +#include #include "modest-account-view.h" #include @@ -37,16 +38,16 @@ #include #include -#include -#include -#include -#include #include /* For strcmp(). */ #include #include +#include #ifdef MODEST_TOOLKIT_HILDON2 #include #endif +#ifdef MODEST_USE_LIBTIME +#include +#endif /* 'private'/'protected' functions */ static void modest_account_view_class_init (ModestAccountViewClass *klass); @@ -63,11 +64,11 @@ static void on_display_name_changed (ModestAccountMgr *self, const gchar *account, gpointer user_data); -static void modest_account_view_select_first_account (ModestAccountView *account_view); - 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_display_mode (ModestAccountView *self); typedef enum { MODEST_ACCOUNT_VIEW_NAME_COLUMN, @@ -85,6 +86,11 @@ struct _ModestAccountViewPrivate { ModestAccountMgr *account_mgr; ModestDatetimeFormatter *datetime_formatter; + gboolean picker_mode; + gboolean show_last_updated; + + GtkTreeModel *model; + GtkTreeModel *filter; /* Signal handlers */ GSList *sig_handlers; @@ -151,6 +157,8 @@ modest_account_view_init (ModestAccountView *obj) priv->sig_handlers = NULL; priv->datetime_formatter = modest_datetime_formatter_new (); + priv->picker_mode = FALSE; + priv->show_last_updated = TRUE; g_signal_connect (G_OBJECT (priv->datetime_formatter), "format-changed", G_CALLBACK (datetime_format_changed), (gpointer) obj); #ifdef MODEST_TOOLKIT_HILDON2 @@ -160,6 +168,7 @@ modest_account_view_init (ModestAccountView *obj) "widget_class \"*.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 @@ -201,6 +210,7 @@ get_last_updated_string(ModestAccountView *self, ModestAccountMgr* account_mgr, 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)) { @@ -214,7 +224,7 @@ get_last_updated_string(ModestAccountView *self, ModestAccountMgr* account_mgr, } else { last_updated_string = _("mcen_va_refreshing"); } - + return last_updated_string; } @@ -222,17 +232,17 @@ 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))); + ModestAccountViewPrivate *priv; + priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(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); + gtk_list_store_clear (GTK_LIST_STORE (priv->model)); /* Note: We do not show disabled accounts. * Of course, this means that there is no UI to enable or disable @@ -272,19 +282,21 @@ update_account_view (ModestAccountMgr *account_mgr, ModestAccountView *view) 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 + if (priv->show_last_updated) { + last_updated_hildon2 = g_strconcat (_("mcen_ti_lastupdated"), "\n", + last_updated_string, + NULL); + } else { + last_updated_hildon2 = g_strconcat (_("mcen_ti_lastupdated"), "\n", NULL); + } 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, + GTK_LIST_STORE (priv->model), &iter, 0, MODEST_ACCOUNT_VIEW_NAME_COLUMN, account_name, MODEST_ACCOUNT_VIEW_DISPLAY_NAME_COLUMN, modest_account_settings_get_display_name (settings), @@ -293,15 +305,9 @@ update_account_view (ModestAccountMgr *account_mgr, ModestAccountView *view) 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 } } @@ -317,8 +323,6 @@ update_account_view (ModestAccountMgr *account_mgr, ModestAccountView *view) if (selected_name) { modest_account_view_select_account (view, selected_name); g_free (selected_name); - } else { - modest_account_view_select_first_account (view); } } @@ -328,16 +332,18 @@ on_account_busy_changed(ModestAccountMgr *account_mgr, gboolean busy, ModestAccountView *self) { - GtkListStore *model = GTK_LIST_STORE(gtk_tree_view_get_model (GTK_TREE_VIEW(self))); GtkTreeIter iter; gboolean found = FALSE; + ModestAccountViewPrivate *priv; - if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(model), &iter)) + priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(self); + + if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(priv->model), &iter)) return; do { gchar* cur_name; - gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, + gtk_tree_model_get(GTK_TREE_MODEL(priv->model), &iter, MODEST_ACCOUNT_VIEW_NAME_COLUMN, &cur_name, -1); @@ -349,30 +355,22 @@ on_account_busy_changed(ModestAccountMgr *account_mgr, return; } 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 + gtk_list_store_set(GTK_LIST_STORE (priv->model), &iter, 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_object_unref (settings); found = TRUE; } g_free (cur_name); - } while (!found && gtk_tree_model_iter_next(GTK_TREE_MODEL(model), &iter)); + } while (!found && gtk_tree_model_iter_next(priv->model, &iter)); } static void @@ -413,8 +411,6 @@ on_account_removed (TnyAccountStore *account_store, selected_name = modest_account_view_get_selected_account (self); if (selected_name == NULL) { - /* we select the first account if none is selected */ - modest_account_view_select_first_account (self); } else { g_free (selected_name); } @@ -429,7 +425,6 @@ on_account_default_toggled (GtkCellRendererToggle *cell_renderer, ModestAccountView *self) { ModestAccountViewPrivate *priv; - GtkTreeModel *model; GtkTreeIter iter; gchar *account_name = NULL; @@ -441,10 +436,13 @@ on_account_default_toggled (GtkCellRendererToggle *cell_renderer, return; 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); + + if (!gtk_tree_model_get_iter_from_string (priv->filter, &iter, path)) { + g_warning ("Got path of a not existing iter"); + return; + } - gtk_tree_model_get (model, &iter, + gtk_tree_model_get (priv->filter, &iter, MODEST_ACCOUNT_VIEW_NAME_COLUMN, &account_name, -1); @@ -474,37 +472,37 @@ bold_if_default_account_cell_data (GtkTreeViewColumn *column, GtkCellRenderer GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data) { gboolean is_default; -#ifdef MODEST_TOOLKIT_HILDON2 GtkStyle *style; const gchar *font_style; PangoAttribute *attr; PangoAttrList *attr_list = NULL; GtkWidget *widget; -#endif + gtk_tree_model_get (tree_model, iter, MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN, &is_default, -1); -#ifdef MODEST_TOOLKIT_HILDON2 - widget = gtk_tree_view_column_get_tree_view (column); +/* 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); - attr = pango_attr_font_desc_new (pango_font_description_copy (style->font_desc)); + 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); + attr_list = pango_attr_list_new (); + pango_attr_list_insert (attr_list, attr); - g_object_set (G_OBJECT(renderer), - "attributes", attr_list, - NULL); + 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); -#endif + pango_attr_list_unref (attr_list); + } else { + g_object_set (G_OBJECT(renderer), + "weight", is_default ? 800: 400, + NULL); + } } static void @@ -512,37 +510,37 @@ bold_if_default_last_updated_cell_data (GtkTreeViewColumn *column, GtkCellRend GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data) { gboolean is_default; -#ifdef MODEST_TOOLKIT_HILDON2 GtkStyle *style; const gchar *font_style; PangoAttribute *attr; PangoAttrList *attr_list = NULL; GtkWidget *widget; -#endif + gtk_tree_model_get (tree_model, iter, MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN, &is_default, -1); -#ifdef MODEST_TOOLKIT_HILDON2 - widget = gtk_tree_view_column_get_tree_view (column); +/* 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); - attr = pango_attr_font_desc_new (pango_font_description_copy (style->font_desc)); + 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); + attr_list = pango_attr_list_new (); + pango_attr_list_insert (attr_list, attr); - g_object_set (G_OBJECT(renderer), - "attributes", attr_list, - NULL); + 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); -#endif + pango_attr_list_unref (attr_list); + } else { + g_object_set (G_OBJECT(renderer), + "weight", is_default ? 800: 400, + NULL); + } } static void @@ -550,27 +548,29 @@ init_view (ModestAccountView *self) { ModestAccountViewPrivate *priv; GtkCellRenderer *toggle_renderer, *text_renderer; - 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_TYPE_STRING, /* account name */ - G_TYPE_STRING, /* account display name */ - G_TYPE_BOOLEAN, /* is-enabled */ - G_TYPE_BOOLEAN, /* is-default */ - G_TYPE_STRING, /* account proto (pop, imap,...) */ - G_TYPE_STRING /* last updated (time_t) */ - ); + priv->model = GTK_TREE_MODEL (gtk_list_store_new (6, + G_TYPE_STRING, /* account name */ + G_TYPE_STRING, /* account display name */ + G_TYPE_BOOLEAN, /* is-enabled */ + G_TYPE_BOOLEAN, /* is-default */ + 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_TREE_SORTABLE (priv->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)); + priv->filter = gtk_tree_model_filter_new (priv->model, NULL); + + gtk_tree_view_set_model (GTK_TREE_VIEW(self), GTK_TREE_MODEL(priv->filter)); + g_object_unref (G_OBJECT (priv->model)); + g_object_unref (G_OBJECT (priv->filter)); toggle_renderer = gtk_cell_renderer_toggle_new (); /* the is_default column */ @@ -580,9 +580,7 @@ init_view (ModestAccountView *self) "active", MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW(self), 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. @@ -591,10 +589,6 @@ init_view (ModestAccountView *self) * * 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, @@ -607,9 +601,7 @@ init_view (ModestAccountView *self) 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 + "xpad", MODEST_MARGIN_DOUBLE, NULL); column = gtk_tree_view_column_new_with_attributes (_("mcen_ti_account"), text_renderer, "text", @@ -617,16 +609,14 @@ init_view (ModestAccountView *self) gtk_tree_view_append_column (GTK_TREE_VIEW(self), column); 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, - NULL, NULL); + self, NULL); /* last update for this account */ 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 + "xpad", MODEST_MARGIN_DOUBLE, NULL); column = gtk_tree_view_column_new_with_attributes (_("mcen_ti_lastupdated"), text_renderer,"markup", @@ -634,14 +624,13 @@ init_view (ModestAccountView *self) gtk_tree_view_append_column (GTK_TREE_VIEW(self),column); 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, - NULL, NULL); - + 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); -#endif + + update_display_mode (self); priv->sig_handlers = modest_signal_mgr_connect (priv->sig_handlers, @@ -703,6 +692,10 @@ modest_account_view_new (ModestAccountMgr *account_mgr) init_view (MODEST_ACCOUNT_VIEW (obj)); update_account_view (account_mgr, MODEST_ACCOUNT_VIEW (obj)); + /* Hide headers by default */ + gtk_tree_view_set_headers_visible ((GtkTreeView *)obj, FALSE); + gtk_tree_view_set_rules_hint ((GtkTreeView *) obj, TRUE); + return MODEST_ACCOUNT_VIEW (obj); } @@ -753,61 +746,11 @@ typedef struct 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) { -#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; - 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 -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); - } } static void @@ -857,3 +800,104 @@ on_display_name_changed (ModestAccountMgr *mgr, /* 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_display_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_cell_layout_get_cells (GTK_CELL_LAYOUT (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_display_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; +} + +void +modest_account_view_set_show_last_update (ModestAccountView *self, + gboolean show) +{ + ModestAccountViewPrivate *priv; + + g_return_if_fail (MODEST_IS_ACCOUNT_VIEW (self)); + priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(self); + + priv->show_last_updated = show; + update_account_view (priv->account_mgr, self); +} + +gboolean +modest_account_view_get_show_last_updated (ModestAccountView *self) +{ + ModestAccountViewPrivate *priv; + + g_return_val_if_fail (MODEST_IS_ACCOUNT_VIEW (self), FALSE); + priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(self); + + return priv->show_last_updated; +} + +GtkTreeModel * +modest_account_view_get_model (ModestAccountView *self) +{ + ModestAccountViewPrivate *priv; + + priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE (self); + + return priv->model; +} + +GtkTreeModel * +modest_account_view_get_filter (ModestAccountView *self) +{ + ModestAccountViewPrivate *priv; + + priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE (self); + + return priv->filter; +}