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,
ModestAccountMgr *account_mgr;
ModestDatetimeFormatter *datetime_formatter;
+ gboolean picker_mode;
/* Signal handlers */
GSList *sig_handlers;
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
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
}
}
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);
}
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
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
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 ();
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.
*/
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 ()),
g_free (state);
}
+#ifndef MODEST_TOOLKIT_HILDON2
static void
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,
}
}
+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;
+}