X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwidgets%2Fmodest-account-view.c;h=abfce39fddcfbcd77171909d41d047301ffeb298;hb=5f456f4b288067f9de646b31adabedef5a7171af;hp=b40ef6385ce84fb0efe5294426bc1b756cb7b7ff;hpb=63f43f42f299ec31bfe33e39ab6c8833387701f5;p=modest diff --git a/src/widgets/modest-account-view.c b/src/widgets/modest-account-view.c index b40ef63..abfce39 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,15 @@ #include #include -#include -#include -#include -#include #include /* For strcmp(). */ #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,12 +63,15 @@ 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, @@ -86,6 +89,7 @@ struct _ModestAccountViewPrivate { ModestAccountMgr *account_mgr; ModestDatetimeFormatter *datetime_formatter; + gboolean picker_mode; /* Signal handlers */ GSList *sig_handlers; @@ -152,6 +156,7 @@ modest_account_view_init (ModestAccountView *obj) 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 @@ -203,6 +208,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)) { @@ -216,7 +222,7 @@ get_last_updated_string(ModestAccountView *self, ModestAccountMgr* account_mgr, } else { last_updated_string = _("mcen_va_refreshing"); } - + return last_updated_string; } @@ -225,9 +231,9 @@ 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))); - + /* 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. @@ -320,7 +326,9 @@ update_account_view (ModestAccountMgr *account_mgr, ModestAccountView *view) 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 } } @@ -415,8 +423,10 @@ on_account_removed (TnyAccountStore *account_store, 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); + modest_account_view_select_first_account (self); +#endif } else { g_free (selected_name); } @@ -443,8 +453,12 @@ 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); + model = gtk_tree_view_get_model (GTK_TREE_VIEW(self)); + + 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, @@ -476,37 +490,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 @@ -514,37 +528,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 @@ -619,7 +633,7 @@ 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 (); @@ -636,8 +650,8 @@ 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. */ @@ -645,6 +659,8 @@ init_view (ModestAccountView *self) gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(self), TRUE); #endif + update_picker_mode (self); + priv->sig_handlers = modest_signal_mgr_connect (priv->sig_handlers, G_OBJECT (modest_runtime_get_account_store ()), @@ -799,6 +815,7 @@ modest_account_view_select_account (ModestAccountView *account_view, g_free (state); } +#ifndef MODEST_TOOLKIT_HILDON2 static void modest_account_view_select_first_account (ModestAccountView *account_view) { @@ -807,10 +824,11 @@ modest_account_view_select_first_account (ModestAccountView *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, @@ -868,3 +886,51 @@ on_notify_style (GObject *obj, GParamSpec *spec, gpointer userdata) } } +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; +}