#include <stdio.h>
-#include "modest-maemo-utils.h"
+#include "modest-utils.h"
#include "modest-country-picker.h"
+#include <hildon/hildon-touch-selector-entry.h>
#include <gtk/gtkliststore.h>
#include <gtk/gtkcelllayout.h>
#include <gtk/gtkcellrenderertext.h>
#include <stdlib.h>
#include <string.h> /* For memcpy() */
-#include <langinfo.h>
#include <locale.h>
#include <libintl.h> /* For dgettext(). */
#include <config.h>
#endif
-#define MAX_LINE_LEN 128 /* max length of a line in MCC file */
-
G_DEFINE_TYPE (ModestCountryPicker, modest_country_picker, HILDON_TYPE_PICKER_BUTTON);
typedef struct
-/* cluster mcc's, based on the list
- * http://en.wikipedia.org/wiki/Mobile_country_code
- */
-static int
-effective_mcc (gint mcc)
-{
- switch (mcc) {
- case 405: return 404; /* india */
- case 441: return 440; /* japan */
- case 235: return 234; /* united kingdom */
- case 311:
- case 312:
- case 313:
- case 314:
- case 315:
- case 316: return 310; /* united states */
- default: return mcc;
- }
-}
-
-
-/* each line is of the form:
- xxx logical_id
-
- NOTE: this function is NOT re-entrant, the out-param country
- are static strings that should NOT be freed. and will change when
- calling this function again
-
- also note, this function will return the "effective mcc", which
- is the normalized mcc for a country - ie. even if the there
- are multiple entries for the United States with various mccs,
- this function will always return 310, even if the real mcc parsed
- would be 314. see the 'effective_mcc' function above.
-*/
-static int
-parse_mcc_mapping_line (const char* line, char** country)
-{
- int i, j;
- char mcc[4]; /* the mcc code, always 3 bytes*/
- static char my_country[128];
-
- if (!line) {
- *country = NULL;
- return 0;
- }
-
- for (i = 3, j = 0; i < 128; ++i) {
- char kar = line[i];
- if (kar == '\0')
- break;
- else if (kar < '_')
- continue;
- else
- my_country [j++] = kar;
- }
- my_country[j] = '\0';
-
- mcc[0] = line[0];
- mcc[1] = line[1];
- mcc[2] = line[2];
- mcc[3] = '\0';
-
- *country = my_country;
-
- 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 (ModestCountryPicker *self, GtkListStore *liststore)
+modest_country_picker_init (ModestCountryPicker *self)
{
ModestCountryPickerPrivate *priv = MODEST_COUNTRY_PICKER_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) != 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;
- }
-
- if (mcc == previous_mcc) {
- /* g_warning ("already seen: %s", line); */
- continue;
- }
- previous_mcc = mcc;
-
- 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_append (liststore, &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);
+ priv->locale_mcc = 0;
}
-static void
-modest_country_picker_init (ModestCountryPicker *self)
+static gchar *
+country_picker_print_func (HildonTouchSelector *selector, gpointer userdata)
{
- ModestCountryPickerPrivate *priv = MODEST_COUNTRY_PICKER_GET_PRIVATE (self);
- priv->locale_mcc = 0;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ gchar *text = NULL;
+
+ /* Always pick the selected country from the tree view and
+ never from the entry */
+ model = hildon_touch_selector_get_model (selector, 0);
+ if (hildon_touch_selector_get_selected (selector, 0, &iter)) {
+ gint column;
+ GtkWidget *entry;
+ const gchar *entry_text;
+
+ column = hildon_touch_selector_entry_get_text_column (HILDON_TOUCH_SELECTOR_ENTRY (selector));
+ gtk_tree_model_get (model, &iter, column, &text, -1);
+
+ entry = GTK_WIDGET (hildon_touch_selector_entry_get_entry (HILDON_TOUCH_SELECTOR_ENTRY (selector)));
+ entry_text = hildon_entry_get_text (HILDON_ENTRY (entry));
+ if (entry_text != NULL && text != NULL && strcmp (entry_text, text)) {
+ hildon_entry_set_text (HILDON_ENTRY (entry), text);
+ }
+ }
+ return text;
}
void
{
GtkCellRenderer *renderer;
GtkWidget *selector;
- GtkListStore *model;
+ GtkTreeModel *model;
HildonTouchSelectorColumn *column;
+ ModestCountryPickerPrivate *priv;
+
+ priv = MODEST_COUNTRY_PICKER_GET_PRIVATE (self);
/* 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.
*/
- model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
-
+ model = modest_utils_create_country_model ();
+
/* Country column:
* The ID model column in not shown in the view. */
renderer = gtk_cell_renderer_text_new ();
g_object_set (G_OBJECT (renderer), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
- selector = hildon_touch_selector_new ();
- hildon_picker_button_set_selector (HILDON_PICKER_BUTTON (self), HILDON_TOUCH_SELECTOR (selector));
- 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);
+ selector = hildon_touch_selector_entry_new ();
+ hildon_touch_selector_set_print_func (HILDON_TOUCH_SELECTOR (selector), (HildonTouchSelectorPrintFunc) country_picker_print_func);
- /* Fill the model with rows: */
- load_from_file (self, model);
+ column = hildon_touch_selector_append_column (HILDON_TOUCH_SELECTOR (selector), model,
+ renderer, "text", MODEST_UTILS_COUNTRY_MODEL_COLUMN_NAME, NULL);
+ hildon_touch_selector_entry_set_text_column (HILDON_TOUCH_SELECTOR_ENTRY (selector),
+ MODEST_UTILS_COUNTRY_MODEL_COLUMN_NAME);
+ modest_utils_fill_country_model (model, &(priv->locale_mcc));
/* Set this _after_ loading from file, it makes loading faster */
hildon_touch_selector_set_model (HILDON_TOUCH_SELECTOR (selector),
- 0, GTK_TREE_MODEL (model));
+ 0, model);
+ hildon_touch_selector_entry_set_input_mode (HILDON_TOUCH_SELECTOR_ENTRY (selector),
+ HILDON_GTK_INPUT_MODE_ALPHA |
+ HILDON_GTK_INPUT_MODE_SPECIAL |
+ HILDON_GTK_INPUT_MODE_AUTOCAP);
+
+
+ hildon_picker_button_set_selector (HILDON_PICKER_BUTTON (self), HILDON_TOUCH_SELECTOR (selector));
+
g_object_unref (model);
}
modest_country_picker_new (HildonSizeType size,
HildonButtonArrangement arrangement)
{
- return g_object_new (MODEST_TYPE_COUNTRY_PICKER,
- "arrangement", arrangement,
- "size", size,
- NULL);
+ ModestCountryPicker *picker = g_object_new (MODEST_TYPE_COUNTRY_PICKER,
+ "arrangement", arrangement,
+ "size", size,
+ NULL);
+
+ /* For theming purpouses. Widget name must end in Button-finger */
+ gtk_widget_set_name ((GtkWidget *) picker, "ModestCountryPickerButton-finger");
+
+ return picker;
}
/**
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);
+ &active, MODEST_UTILS_COUNTRY_MODEL_COLUMN_MCC, &mcc, -1);
return mcc;
}
return 0; /* Failed. */
if (!gtk_tree_model_get_iter_first (model, &iter))
return FALSE;
do {
- gtk_tree_model_get (model, &iter, MODEL_COL_MCC, ¤t_mcc, -1);
+ gtk_tree_model_get (model, &iter, MODEST_UTILS_COUNTRY_MODEL_COLUMN_MCC, ¤t_mcc, -1);
if (priv->locale_mcc == current_mcc) {
hildon_touch_selector_select_iter (HILDON_TOUCH_SELECTOR (selector), 0,
&iter, TRUE);
projects / modest / blobdiff