Add an entry to the country list to allow search with keys

[modest] / src / hildon2 / modest-country-picker.c

diff --git a/src/hildon2/modest-country-picker.c b/src/hildon2/modest-country-picker.c
index 20b3e70..ee109d3 100644 (file)
--- a/src/hildon2/modest-country-picker.c
+++ b/src/hildon2/modest-country-picker.c
@@ -35,6 +35,7 @@
 
 #include "modest-maemo-utils.h"
 #include "modest-country-picker.h"
 
 #include "modest-maemo-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 <gtk/gtkliststore.h>
 #include <gtk/gtkcelllayout.h>
 #include <gtk/gtkcellrenderertext.h>

@@ -226,12 +227,10 @@ load_from_file (ModestCountryPicker *self, GtkListStore *liststore)
                        if (translated) {
                                if (!g_utf8_collate (country, territory))
                                        priv->locale_mcc = mcc;
                        if (translated) {
                                if (!g_utf8_collate (country, territory))
                                        priv->locale_mcc = mcc;

-                               g_debug ("'%s' || '%s' || %d", territory, country, mcc);

                        } else {
                                gchar *translation = dgettext ("osso-countries", country);
                                if (!g_utf8_collate (translation, territory))
                                        priv->locale_mcc = mcc;
                        } else {
                                gchar *translation = dgettext ("osso-countries", country);
                                if (!g_utf8_collate (translation, territory))
                                        priv->locale_mcc = mcc;

-                               g_debug ("'%s' || '%s' || %d", territory, translation, mcc);

                        }
                }
                name_translated = dgettext ("osso-countries", country);
                        }
                }
                name_translated = dgettext ("osso-countries", country);

@@ -278,7 +277,7 @@ modest_country_picker_load_data(ModestCountryPicker *self)
        renderer = gtk_cell_renderer_text_new ();
        g_object_set (G_OBJECT (renderer), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
 
        renderer = gtk_cell_renderer_text_new ();
        g_object_set (G_OBJECT (renderer), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
 

-       selector = hildon_touch_selector_new ();
+       selector = hildon_touch_selector_entry_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);
        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);

@@ -289,6 +288,9 @@ modest_country_picker_load_data(ModestCountryPicker *self)
        /* Set this _after_ loading from file, it makes loading faster */
        hildon_touch_selector_set_model (HILDON_TOUCH_SELECTOR (selector),
                                         0, GTK_TREE_MODEL (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_touch_selector_entry_set_text_column (HILDON_TOUCH_SELECTOR_ENTRY (selector),
+                                                    MODEL_COL_NAME);
+

        hildon_picker_button_set_selector (HILDON_PICKER_BUTTON (self), HILDON_TOUCH_SELECTOR (selector));
 
        g_object_unref (model);
        hildon_picker_button_set_selector (HILDON_PICKER_BUTTON (self), HILDON_TOUCH_SELECTOR (selector));
 
        g_object_unref (model);