void
modest_country_picker_load_data(ModestCountryPicker *self)
{
+ GtkCellRenderer *renderer;
+ GtkWidget *selector;
GtkListStore *model;
+ HildonTouchSelectorColumn *column;
/* Create a tree model for the combo box,
* with a string for the name, and an int for the MCC ID.
/* Country column:
* The ID model column in not shown in the view. */
- GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
+ renderer = gtk_cell_renderer_text_new ();
g_object_set (G_OBJECT (renderer), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
- GtkWidget *selector = hildon_touch_selector_new ();
- hildon_picker_button_set_selector (HILDON_PICKER_BUTTON (self), HILDON_TOUCH_SELECTOR (selector));
- hildon_touch_selector_append_column (HILDON_TOUCH_SELECTOR (selector), GTK_TREE_MODEL (model),
- renderer, "text", MODEL_COL_NAME, NULL);
+ selector = hildon_touch_selector_new ();
+ column = hildon_touch_selector_append_column (HILDON_TOUCH_SELECTOR (selector), GTK_TREE_MODEL (model),
+ renderer, "text", MODEL_COL_NAME, NULL);
+ g_object_set (G_OBJECT (column), "text-column", MODEL_COL_NAME, NULL);
/* Fill the model with rows: */
load_from_file (self, model);
/* Set this _after_ loading from file, it makes loading faster */
hildon_touch_selector_set_model (HILDON_TOUCH_SELECTOR (selector),
0, GTK_TREE_MODEL (model));
+ hildon_picker_button_set_selector (HILDON_PICKER_BUTTON (self), HILDON_TOUCH_SELECTOR (selector));
+
+ g_object_unref (model);
}
ModestCountryPicker*
-modest_country_picker_new (void)
+modest_country_picker_new (HildonSizeType size,
+ HildonButtonArrangement arrangement)
{
return g_object_new (MODEST_TYPE_COUNTRY_PICKER,
- "arrangement", HILDON_BUTTON_ARRANGEMENT_VERTICAL,
- "size", HILDON_SIZE_AUTO,
+ "arrangement", arrangement,
+ "size", size,
NULL);
}
modest_country_picker_set_active_country_locale (ModestCountryPicker *self)
{
ModestCountryPickerPrivate *priv = MODEST_COUNTRY_PICKER_GET_PRIVATE (self);
+ GtkWidget *selector;
GtkTreeIter iter;
gint current_mcc;
GtkTreeModel *model;
- model = hildon_touch_selector_get_model (hildon_picker_button_get_selector
- (HILDON_PICKER_BUTTON (self)), 0);
+ selector = GTK_WIDGET (hildon_picker_button_get_selector (HILDON_PICKER_BUTTON (self)));
+ model = hildon_touch_selector_get_model (HILDON_TOUCH_SELECTOR (selector), 0);
if (!gtk_tree_model_get_iter_first (model, &iter))
return FALSE;
do {
gtk_tree_model_get (model, &iter, MODEL_COL_MCC, ¤t_mcc, -1);
if (priv->locale_mcc == current_mcc) {
- hildon_touch_selector_select_iter (hildon_picker_button_get_selector
- (HILDON_PICKER_BUTTON (self)), 0,
+ hildon_touch_selector_select_iter (HILDON_TOUCH_SELECTOR (selector), 0,
&iter, TRUE);
+ hildon_button_set_value (HILDON_BUTTON (self),
+ hildon_touch_selector_get_current_text (HILDON_TOUCH_SELECTOR (selector)));
return TRUE;
}
} while (gtk_tree_model_iter_next (model, &iter));