X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Feasysetup%2Fmodest-easysetup-country-combo-box.c;h=0f7b3dc2ea805efdd31fd2f461af83062cc52e39;hp=9630810d342dd88b136c7c9a403e965dd5c49e54;hb=f6d386ff93e929092ba105385a29d760aeba9ff7;hpb=9f75979fd2978d84d13398d0678293a495627c72 diff --git a/src/maemo/easysetup/modest-easysetup-country-combo-box.c b/src/maemo/easysetup/modest-easysetup-country-combo-box.c index 9630810..0f7b3dc 100644 --- a/src/maemo/easysetup/modest-easysetup-country-combo-box.c +++ b/src/maemo/easysetup/modest-easysetup-country-combo-box.c @@ -41,7 +41,8 @@ #include #include /* For memcpy() */ - +#include +#include #include /* For dgettext(). */ /* Include config.h so that _() works: */ @@ -51,11 +52,16 @@ #define MAX_LINE_LEN 128 /* max length of a line in MCC file */ +#if MODEST_HILDON_API < 2 G_DEFINE_TYPE (EasysetupCountryComboBox, easysetup_country_combo_box, GTK_TYPE_COMBO_BOX); +#else +G_DEFINE_TYPE (EasysetupCountryComboBox, easysetup_country_combo_box, HILDON_TYPE_PICKER_BUTTON); +#endif typedef struct { - GtkTreeModel *model; + gint locale_mcc; +/* GtkTreeModel *model; */ } ModestEasysetupCountryComboBoxPrivate; #define MODEST_EASYSETUP_COUNTRY_COMBO_BOX_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \ @@ -98,9 +104,6 @@ enum MODEL_COLS { static void easysetup_country_combo_box_finalize (GObject *object) { - ModestEasysetupCountryComboBoxPrivate *priv = MODEST_EASYSETUP_COUNTRY_COMBO_BOX_GET_PRIVATE (object); - - g_object_unref (G_OBJECT (priv->model)); G_OBJECT_CLASS (easysetup_country_combo_box_parent_class)->finalize (object); } @@ -191,14 +194,26 @@ parse_mcc_mapping_line (const char* line, char** country) * by the operator-wizard-settings package. */ static void -load_from_file (EasysetupCountryComboBox *self) +load_from_file (EasysetupCountryComboBox *self, GtkListStore *liststore) { ModestEasysetupCountryComboBoxPrivate *priv = MODEST_EASYSETUP_COUNTRY_COMBO_BOX_GET_PRIVATE (self); - GtkListStore *liststore = GTK_LIST_STORE (priv->model); char line[MAX_LINE_LEN]; guint previous_mcc = 0; - + gchar *territory, *fallback = NULL; + gchar *current_locale; + + /* Get the territory specified for the current locale */ + territory = nl_langinfo (_NL_ADDRESS_COUNTRY_NAME); + + /* Tricky stuff, the translations of the OSSO countries does + not always correspond to the country names in locale + databases. Add all these cases here. sergio */ + if (!strcmp (territory, "United Kingdom")) + fallback = g_strdup ("UK"); + + current_locale = setlocale (LC_ALL ,NULL); + FILE *file = modest_maemo_open_mcc_mapping_file (); if (!file) { g_warning("Could not open mcc_mapping file"); @@ -209,6 +224,8 @@ load_from_file (EasysetupCountryComboBox *self) int mcc; char *country = NULL; + const gchar *name_translated, *english_translation; + mcc = parse_mcc_mapping_line (line, &country); if (!country || mcc == 0) { g_warning ("%s: error parsing line: '%s'", __FUNCTION__, line); @@ -220,16 +237,14 @@ load_from_file (EasysetupCountryComboBox *self) continue; } previous_mcc = mcc; - - /* Get the translation for the country name: - * Note that the osso_countries_1.0 translation domain files are installed - * by the operator-wizard-settings package. */ - /* For post-Bora, there is a separate (meta)package osso-countries-l10n-mr0 */ - - /* Note: Even when the untranslated names are different, there may still be - * duplicate translated names. They would be translation bugs. - */ - const gchar *name_translated = dgettext ("osso-countries", country); + + if (!priv->locale_mcc) { + english_translation = dgettext ("osso-countries", country); + if (!strcmp (english_translation, territory) || + (fallback && !strcmp (english_translation, fallback))) + priv->locale_mcc = mcc; + } + name_translated = dgettext ("osso-countries", country); /* Add the row to the model: */ GtkTreeIter iter; @@ -237,55 +252,73 @@ load_from_file (EasysetupCountryComboBox *self) gtk_list_store_set(liststore, &iter, MODEL_COL_MCC, mcc, MODEL_COL_NAME, name_translated, -1); } fclose (file); - + /* Sort the items: */ gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (liststore), MODEL_COL_NAME, GTK_SORT_ASCENDING); + + g_free (fallback); } static void easysetup_country_combo_box_init (EasysetupCountryComboBox *self) { ModestEasysetupCountryComboBoxPrivate *priv = MODEST_EASYSETUP_COUNTRY_COMBO_BOX_GET_PRIVATE (self); - priv->model = NULL; + priv->locale_mcc = 0; } void easysetup_country_combo_box_load_data(EasysetupCountryComboBox *self) { - ModestEasysetupCountryComboBoxPrivate *priv = MODEST_EASYSETUP_COUNTRY_COMBO_BOX_GET_PRIVATE (self); + GtkListStore *model; /* Create a tree model for the combo box, * with a string for the name, and an int for the MCC ID. * This must match our MODEL_COLS enum constants. */ - priv->model = GTK_TREE_MODEL (gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT)); - - /* Setup the combo box: */ - GtkComboBox *combobox = GTK_COMBO_BOX (self); + model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT); /* Country column: * The ID model column in not shown in the view. */ GtkCellRenderer *renderer = gtk_cell_renderer_text_new (); g_object_set (G_OBJECT (renderer), "ellipsize", PANGO_ELLIPSIZE_END, NULL); - gtk_cell_layout_pack_start(GTK_CELL_LAYOUT (combobox), renderer, TRUE); - gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combobox), renderer, - "text", MODEL_COL_NAME, NULL); - - g_assert (GTK_IS_LIST_STORE(priv->model)); +#if MODEST_HILDON_API < 2 + gtk_cell_layout_pack_start(GTK_CELL_LAYOUT (self), renderer, TRUE); + gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (self), renderer, + "text", MODEL_COL_NAME, NULL); +#else + 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_picker_button_get_selector (HILDON_PICKER_BUTTON (self)), + GTK_TREE_MODEL (model), + renderer, "text", MODEL_COL_NAME, NULL); +#endif - /* Fill the model with rows: */ - load_from_file (self); + load_from_file (self, model); + /* Set this _after_ loading from file, it makes loading faster */ - gtk_combo_box_set_model (combobox, priv->model); +#if MODEST_HILDON_API < 2 + gtk_combo_box_set_model (GTK_COMBO_BOX (self), GTK_TREE_MODEL (model)); +#else + hildon_touch_selector_set_model (hildon_picker_button_get_selector (HILDON_PICKER_BUTTON (self)), + 0, GTK_TREE_MODEL (model)); +#endif } EasysetupCountryComboBox* easysetup_country_combo_box_new (void) { - return g_object_new (MODEST_EASYSETUP_TYPE_COUNTRY_COMBO_BOX, NULL); +#if MODEST_HILDON_API >= 2 + return g_object_new (MODEST_EASYSETUP_TYPE_COUNTRY_COMBO_BOX, + "arrangement", HILDON_BUTTON_ARRANGEMENT_VERTICAL, + "size", HILDON_SIZE_AUTO, + NULL); +#else + return g_object_new (MODEST_EASYSETUP_TYPE_COUNTRY_COMBO_BOX, + NULL); +#endif } /** @@ -295,11 +328,25 @@ gint easysetup_country_combo_box_get_active_country_mcc (EasysetupCountryComboBox *self) { GtkTreeIter active; - const gboolean found = gtk_combo_box_get_active_iter (GTK_COMBO_BOX (self), &active); + gboolean found; + +#if MODEST_HILDON_API < 2 + found = gtk_combo_box_get_active_iter (GTK_COMBO_BOX (self), &active); +#else + found = hildon_touch_selector_get_selected (hildon_picker_button_get_selector + (HILDON_PICKER_BUTTON (self)), 0, &active); +#endif if (found) { - ModestEasysetupCountryComboBoxPrivate *priv = MODEST_EASYSETUP_COUNTRY_COMBO_BOX_GET_PRIVATE (self); gint mcc = 0; - gtk_tree_model_get (priv->model, &active, MODEL_COL_MCC, &mcc, -1); +#if MODEST_HILDON_API < 2 + gtk_tree_model_get (gtk_combo_box_get_model (GTK_COMBO_BOX (self)), + &active, MODEL_COL_MCC, &mcc, -1); +#else + gtk_tree_model_get (hildon_touch_selector_get_model (hildon_picker_button_get_selector + (HILDON_PICKER_BUTTON (self)), + 0), + &active, MODEL_COL_MCC, &mcc, -1); +#endif return mcc; } return 0; /* Failed. */ @@ -311,21 +358,36 @@ easysetup_country_combo_box_get_active_country_mcc (EasysetupCountryComboBox *se * Specify 0 to select no country. */ gboolean -easysetup_country_combo_box_set_active_country_mcc (EasysetupCountryComboBox *self, guint mcc) +easysetup_country_combo_box_set_active_country_locale (EasysetupCountryComboBox *self) { ModestEasysetupCountryComboBoxPrivate *priv = MODEST_EASYSETUP_COUNTRY_COMBO_BOX_GET_PRIVATE (self); GtkTreeIter iter; + gint current_mcc; + GtkTreeModel *model; - if (!gtk_tree_model_get_iter_first (priv->model, &iter)) +#if MODEST_HILDON_API < 2 + model = gtk_combo_box_get_model (GTK_COMBO_BOX (self)); + g_message ("HILDON < 2"); +#else + model = hildon_touch_selector_get_model (hildon_picker_button_get_selector + (HILDON_PICKER_BUTTON (self)), 0); + g_message ("HILDON >= 2"); +#endif + if (!gtk_tree_model_get_iter_first (model, &iter)) return FALSE; do { - gint current_mcc = 0; - gtk_tree_model_get (priv->model, &iter, MODEL_COL_MCC, ¤t_mcc, -1); - if (current_mcc == mcc) { + gtk_tree_model_get (model, &iter, MODEL_COL_MCC, ¤t_mcc, -1); + if (priv->locale_mcc == current_mcc) { +#if MODEST_HILDON_API < 2 gtk_combo_box_set_active_iter (GTK_COMBO_BOX (self), &iter); +#else + hildon_touch_selector_select_iter (hildon_picker_button_get_selector + (HILDON_PICKER_BUTTON (self)), 0, + &iter, TRUE); +#endif return TRUE; } - } while (gtk_tree_model_iter_next (priv->model, &iter)); + } while (gtk_tree_model_iter_next (model, &iter)); return FALSE; /* not found */ }