#include <stdlib.h>
#include <string.h> /* For memcpy() */
-
+#include <langinfo.h>
+#include <locale.h>
#include <libintl.h> /* For dgettext(). */
/* Include config.h so that _() works: */
#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
-#define COUNTRY_COMBO_BOX_GET_PRIVATE(o) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((o), EASYSETUP_TYPE_COUNTRY_COMBO_BOX, EasysetupCountryComboBoxPrivate))
-
-typedef struct _EasysetupCountryComboBoxPrivate EasysetupCountryComboBoxPrivate;
-
-struct _EasysetupCountryComboBoxPrivate
+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), \
+ MODEST_EASYSETUP_TYPE_COUNTRY_COMBO_BOX, \
+ ModestEasysetupCountryComboBoxPrivate))
static void
easysetup_country_combo_box_get_property (GObject *object, guint property_id,
static void
easysetup_country_combo_box_finalize (GObject *object)
{
- EasysetupCountryComboBoxPrivate *priv = COUNTRY_COMBO_BOX_GET_PRIVATE (object);
-
- g_object_unref (G_OBJECT (priv->model));
G_OBJECT_CLASS (easysetup_country_combo_box_parent_class)->finalize (object);
}
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- g_type_class_add_private (klass, sizeof (EasysetupCountryComboBoxPrivate));
+ g_type_class_add_private (klass, sizeof (ModestEasysetupCountryComboBoxPrivate));
object_class->get_property = easysetup_country_combo_box_get_property;
object_class->set_property = easysetup_country_combo_box_set_property;
int i, j;
char mcc[4]; /* the mcc code, always 3 bytes*/
static char my_country[128];
-
- /* Initialize output parameters: */
- *country = NULL;
- g_return_val_if_fail (line && strlen(line) > 20, 0);
+ if (!line) {
+ *country = NULL;
+ return 0;
+ }
for (i = 3, j = 0; i < 128; ++i) {
char kar = line[i];
- if (kar < '_' ) { /* optimization */
- if (kar == '\n' || kar == '\r')
- break;
- else if (kar == ' ' || kar == '\t')
- continue;
- else /* error */
- return 0;
- } else {
+ if (kar == '\0')
+ break;
+ else if (kar < '_')
+ continue;
+ else
my_country [j++] = kar;
- }
}
my_country[j] = '\0';
mcc[3] = '\0';
*country = my_country;
- return effective_mcc (atoi(mcc));
+
+ return effective_mcc ((int) strtol ((const char*)mcc, NULL, 10));
}
/** Note that the mcc_mapping file is installed
* by the operator-wizard-settings package.
*/
static void
-load_from_file (EasysetupCountryComboBox *self)
+load_from_file (EasysetupCountryComboBox *self, GtkListStore *liststore)
{
- EasysetupCountryComboBoxPrivate *priv = COUNTRY_COMBO_BOX_GET_PRIVATE (self);
- GtkListStore *liststore = GTK_LIST_STORE (priv->model);
+ ModestEasysetupCountryComboBoxPrivate *priv = MODEST_EASYSETUP_COUNTRY_COMBO_BOX_GET_PRIVATE (self);
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");
return;
}
- while (fgets (line, MAX_LINE_LEN, file) > 0) {
+ while (fgets (line, MAX_LINE_LEN, file) != NULL) {
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);
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;
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)
{
- EasysetupCountryComboBoxPrivate *priv = COUNTRY_COMBO_BOX_GET_PRIVATE (self);
+ ModestEasysetupCountryComboBoxPrivate *priv = MODEST_EASYSETUP_COUNTRY_COMBO_BOX_GET_PRIVATE (self);
+ priv->locale_mcc = 0;
+}
+
+void
+easysetup_country_combo_box_load_data(EasysetupCountryComboBox *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);
- gtk_combo_box_set_model (combobox, priv->model);
+ 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 */
+#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 (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
}
/**
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) {
- EasysetupCountryComboBoxPrivate *priv = 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. */
* 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)
{
- EasysetupCountryComboBoxPrivate *priv = COUNTRY_COMBO_BOX_GET_PRIVATE (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 */
}
projects / modest / blobdiff