Merge lp:~mterry/unity8/oobe-timezone into lp:~lukas-kde/unity8/oobe

[Michael Terry]

Switch to libgeonames and add an ActivityIndicator.

Needs https://code.launchpad.net/~mterry/geonames/expose-more/+merge/287365 and https://code.launchpad.net/~mterry/geonames/double-free/+merge/287359

[Lukáš Tinkl (lukas-kde)]

Nice work, one remark tho - why did you remove the filter model? We need to filter on both at the same time.

Otherwise a few small comments inline

[Michael Terry (mterry)]

The model itself is now the filter model, basically. The backing model is internal to libgeonames. And we just query it for filtered results. So our model now just stores the query results.

You say "filter on both at the same time". What do you mean by that?

I don't think your inline comments survived LP.

[Lukáš Tinkl (lukas-kde)]

Inline comments (re)added

[lp:~mterry/unity8/oobe-timezone]

2119. By Michael Terry on 2016-02-29

Sort default cities by name, not population

2120. By Michael Terry on 2016-03-01

Fix some review comments

[Michael Terry (mterry)]

> No need to cast the result to QVariant explicitely, also it should be sth like:
>
> QStringLiteral("%1, %2, %3).arg(QString::fromUtf8(foo).arg()

Fixed this (don't cast to QVariant, and use QStringLiteral). But I didn't use ::fromUtf8, because the QString constructor assumes Utf8 already.

> const QList<GeonamesCity *> &locations

Fixed.

> The default country should be the one from root.country (set in the first page).

In this MP, I've removed root.countryCode. I can add it back if you insist, but I didn't understand why it existed in the first place. The language page already saves the chosen language in the shared value i18n.language. We don't need to store country separately, right?

The less special cross-page variables, the better, in my book.

[Lukáš Tinkl (lukas-kde)]

> > No need to cast the result to QVariant explicitely, also it should be sth
> like:
> >
> > QStringLiteral("%1, %2, %3).arg(QString::fromUtf8(foo).arg()
>
> Fixed this (don't cast to QVariant, and use QStringLiteral). But I didn't use
> ::fromUtf8, because the QString constructor assumes Utf8 already.
>
> > const QList<GeonamesCity *> &locations
>
> Fixed.
>
> > The default country should be the one from root.country (set in the first
> page).
>
> In this MP, I've removed root.countryCode. I can add it back if you insist,
> but I didn't understand why it existed in the first place. The language page
> already saves the chosen language in the shared value i18n.language. We don't
> need to store country separately, right?
>
> The less special cross-page variables, the better, in my book.

Yup, looks good now

[lp:~mterry/unity8/oobe-timezone]

2121. By Michael Terry on 2016-03-02

Go back to sorting cities (when no search pattern entered) by population; Paty liked it

[Lukáš Tinkl (lukas-kde)]

Worked great with my testing, thanks!

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-02-12 00:12:30 +0000
+++ CMakeLists.txt	2016-03-02 16:19:54 +0000
@@ -58,6 +58,7 @@
 find_package(Qt5Sql 5.4 REQUIRED)
 
 pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=13)
+pkg_check_modules(GEONAMES REQUIRED geonames)
 pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
 pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
 pkg_check_modules(QMENUMODEL REQUIRED qmenumodel)

=== modified file 'debian/control'
--- debian/control	2016-02-16 04:28:15 +0000
+++ debian/control	2016-03-02 16:19:54 +0000
@@ -15,6 +15,7 @@
                gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
                libconnectivity-qt1-dev,
                libevdev-dev,
+               libgeonames-dev (>= 0.2),
                libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
                libgl1-mesa-dri,
                libgles2-mesa-dev[armhf],
@@ -28,7 +29,6 @@
                libqt5svg5-dev,
                libqt5xmlpatterns5-dev,
                libsystemsettings-dev,
-               libtimezonemap1-dev,
                libudev-dev,
                libunity-api-dev (>= 7.106),
                libusermetricsoutput1-dev,

=== modified file 'plugins/Wizard/CMakeLists.txt'
--- plugins/Wizard/CMakeLists.txt	2016-02-16 13:10:24 +0000
+++ plugins/Wizard/CMakeLists.txt	2016-03-02 16:19:54 +0000
@@ -1,6 +1,4 @@
-pkg_search_module(TIMEZONEMAP REQUIRED timezonemap)
-
-include_directories(${GLIB_INCLUDE_DIRS} ${TIMEZONEMAP_INCLUDE_DIRS})
+include_directories(${GLIB_INCLUDE_DIRS} ${GEONAMES_INCLUDE_DIRS})
 
 add_library(Wizard-qml MODULE
     plugin.cpp
@@ -12,7 +10,7 @@
 )
 
 qt5_use_modules(Wizard-qml DBus Qml Concurrent)
-target_link_libraries(Wizard-qml ${GLIB_LDFLAGS} ${TIMEZONEMAP_LDFLAGS})
+target_link_libraries(Wizard-qml ${GLIB_LDFLAGS} ${GEONAMES_LDFLAGS})
 add_unity8_plugin(Wizard 0.1 Wizard TARGETS Wizard-qml)
 
 set(POLKIT_LIB_DIR "${CMAKE_INSTALL_LOCALSTATEDIR}/lib/polkit-1")

=== modified file 'plugins/Wizard/plugin.cpp'
--- plugins/Wizard/plugin.cpp	2016-02-16 13:10:24 +0000
+++ plugins/Wizard/plugin.cpp	2016-03-02 16:19:54 +0000
@@ -30,6 +30,5 @@
     qmlRegisterSingletonType<System>(uri, 0, 1, "System", [](QQmlEngine*, QJSEngine*) -> QObject* { return new System; });
     qmlRegisterSingletonType<Status>(uri, 0, 1, "Status", [](QQmlEngine*, QJSEngine*) -> QObject* { return new Status; });
     qmlRegisterType<TimeZoneLocationModel>(uri, 0, 1, "TimeZoneModel");
-    qmlRegisterType<TimeZoneFilterModel>(uri, 0, 1, "TimeZoneFilterModel");
     qmlRegisterType<LocalePlugin>(uri, 0, 1, "LocalePlugin");
 }

=== modified file 'plugins/Wizard/timezonemodel.cpp'
--- plugins/Wizard/timezonemodel.cpp	2016-02-16 13:10:24 +0000
+++ plugins/Wizard/timezonemodel.cpp	2016-03-02 16:19:54 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Canonical Ltd.
+ * Copyright (C) 2016 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -18,17 +18,15 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <timezonemap/tz.h>
 
 #include "LocalePlugin.h"
 #include "timezonemodel.h"
 
 TimeZoneLocationModel::TimeZoneLocationModel(QObject *parent):
     QAbstractListModel(parent),
-    m_workerThread(new TimeZonePopulateWorker())
+    m_listUpdating(false),
+    m_cancellable(nullptr)
 {
-    qRegisterMetaType<TzLocationWizard>();
-
     m_roleNames[Qt::DisplayRole] = "displayName";
     m_roleNames[TimeZoneRole] = "timeZone";
     m_roleNames[CityRole] = "city";
@@ -36,78 +34,52 @@
     m_roleNames[OffsetRole] = "offset";
     m_roleNames[LatitudeRole] = "latitude";
     m_roleNames[LongitudeRole] = "longitude";
-
-    QObject::connect(m_workerThread,
-                     &TimeZonePopulateWorker::resultReady,
-                     this,
-                     &TimeZoneLocationModel::processModelResult);
-    QObject::connect(m_workerThread,
-                     &TimeZonePopulateWorker::finished,
-                     this,
-                     &TimeZoneLocationModel::store);
-    QObject::connect(m_workerThread,
-                     &TimeZonePopulateWorker::finished,
-                     m_workerThread,
-                     &QObject::deleteLater);
-
-    init();
-}
-
-void TimeZoneLocationModel::init()
-{
-    beginResetModel();
-    m_workerThread->start();
-}
-
-void TimeZoneLocationModel::store()
-{
-    m_workerThread = nullptr;
-    endResetModel();
-}
-
-void TimeZoneLocationModel::processModelResult(const TzLocationWizard &location)
-{
-    m_locations.append(location);
 }
 
 int TimeZoneLocationModel::rowCount(const QModelIndex &parent) const
 {
-    if (parent.isValid())
+    if (parent.isValid()) {
         return 0;
-    return m_locations.count();
+    } else if (m_filter.isEmpty()) {
+        return m_countryLocations.count();
+    } else {
+        return m_locations.count();
+    }
 }
 
 QVariant TimeZoneLocationModel::data(const QModelIndex &index, int role) const
 {
-    if (index.row() >= m_locations.count() || index.row() < 0)
+    GeonamesCity *city;
+    if (m_filter.isEmpty()) {
+        city = m_countryLocations.value(index.row());
+    } else {
+        city = m_locations.value(index.row());
+    }
+    if (!city)
         return QVariant();
 
-    const TzLocationWizard tz = m_locations.at(index.row());
-
-    const QString country(tz.full_country.isEmpty() ? tz.country : tz.full_country);
-
     switch (role) {
     case Qt::DisplayRole:
-        if (!tz.state.isEmpty())
-            return QStringLiteral("%1, %2, %3").arg(tz.city).arg(tz.state).arg(country);
-        else
-            return QStringLiteral("%1, %2").arg(tz.city).arg(country);
+        return QStringLiteral("%1, %2, %3").arg(geonames_city_get_name(city))
+                                           .arg(geonames_city_get_state(city))
+                                           .arg(geonames_city_get_country(city));
     case SimpleRole:
-        return QStringLiteral("%1, %2").arg(tz.city).arg(country);
+        return QStringLiteral("%1, %2").arg(geonames_city_get_name(city))
+                                       .arg(geonames_city_get_country(city));
     case TimeZoneRole:
-        return tz.timezone;
+        return geonames_city_get_timezone(city);
     case CountryRole:
-        return tz.country;
+        return geonames_city_get_country(city);
     case CityRole:
-        return tz.city;
+        return geonames_city_get_name(city);
     case OffsetRole: {
-        QTimeZone tmp(tz.timezone.toLatin1());
+        QTimeZone tmp(geonames_city_get_timezone(city));
         return static_cast<double>(tmp.standardTimeOffset(QDateTime::currentDateTime())) / 3600;
     }
     case LatitudeRole:
-        return tz.latitude;
+        return geonames_city_get_latitude(city);
     case LongitudeRole:
-        return tz.longitude;
+        return geonames_city_get_longitude(city);
     default:
         qWarning() << Q_FUNC_INFO << "Unknown role";
         return QVariant();
@@ -119,110 +91,149 @@
     return m_roleNames;
 }
 
-void TimeZonePopulateWorker::run()
-{
-    buildCityMap();
-}
-
-void TimeZonePopulateWorker::buildCityMap()
-{
-    TzDB *tzdb = tz_load_db();
-    GPtrArray *tz_locations = tz_get_locations(tzdb);
-
-    TimeZoneLocationModel::TzLocationWizard tmpTz;
-
-    for (guint i = 0; i < tz_locations->len; ++i) {
-        auto tmp = static_cast<CcTimezoneLocation *>(g_ptr_array_index(tz_locations, i));
-        gchar *en_name, *country, *zone, *state, *full_country;
-        gdouble latitude;
-        gdouble longitude;
-        g_object_get (tmp, "en_name", &en_name,
-                      "country", &country,
-                      "zone", &zone,
-                      "state", &state,
-                      "full_country", &full_country,
-                      "latitude", &latitude,
-                      "longitude", &longitude,
-                      nullptr);
-        // There are empty entries in the DB
-        if (g_strcmp0(en_name, "") != 0) {
-            tmpTz.city = en_name;
-            tmpTz.country = country;
-            tmpTz.timezone = zone;
-            tmpTz.state = state;
-            tmpTz.full_country = full_country;
-            tmpTz.latitude = latitude;
-            tmpTz.longitude = longitude;
-
-            Q_EMIT (resultReady(tmpTz));
-        }
-        g_free (en_name);
-        g_free (country);
-        g_free (zone);
-        g_free (state);
-        g_free (full_country);
-    }
-
-    g_ptr_array_free (tz_locations, TRUE);
-    tz_db_free(tzdb);
-}
-
-
-TimeZoneFilterModel::TimeZoneFilterModel(QObject *parent)
-    : QSortFilterProxyModel(parent)
-{
-    setDynamicSortFilter(false);
-    setSortLocaleAware(true);
-    setSortRole(TimeZoneLocationModel::CityRole);
-    m_stringMatcher.setCaseSensitivity(Qt::CaseInsensitive);
-    sort(0);
-}
-
-bool TimeZoneFilterModel::filterAcceptsRow(int row, const QModelIndex &parentIndex) const
-{
-    if (!sourceModel()) {
-        return true;
-    }
-
-    if (!m_filter.isEmpty()) { // filtering by freeform text input, cf setFilter(QString)
-        const QString city = sourceModel()->index(row, 0, parentIndex).data(TimeZoneLocationModel::CityRole).toString();
-
-        if (m_stringMatcher.indexIn(city) == 0) { // match at the beginning of the city name
-            return true;
-        }
-    } else if (!m_country.isEmpty()) { // filter by country code
-        const QString countryCode = sourceModel()->index(row, 0, parentIndex).data(TimeZoneLocationModel::CountryRole).toString();
-        return m_country.compare(countryCode, Qt::CaseInsensitive) == 0;
-    }
-
-    return false;
-}
-
-QString TimeZoneFilterModel::filter() const
+void TimeZoneLocationModel::setModel(const QList<GeonamesCity *> &locations)
+{
+    beginResetModel();
+
+    Q_FOREACH(GeonamesCity *city, m_locations) {
+        geonames_city_free(city);
+    }
+
+    m_locations = locations;
+    endResetModel();
+}
+
+void TimeZoneLocationModel::filterFinished(GObject      *source_object,
+                                           GAsyncResult *res,
+                                           gpointer      user_data)
+{
+    Q_UNUSED(source_object);
+
+    g_autofree gint *cities = nullptr;
+    guint cities_len = 0;
+    g_autoptr(GError) error = nullptr;
+
+    cities = geonames_query_cities_finish(res, &cities_len, &error);
+    if (error) {
+        if (!g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+            TimeZoneLocationModel *model = static_cast<TimeZoneLocationModel *>(user_data);
+            g_clear_object(&model->m_cancellable);
+            model->setListUpdating(false);
+            qWarning() << "Could not filter timezones:" << error->message;
+        }
+        return;
+    }
+
+    QList<GeonamesCity *> locations;
+
+    for (guint i = 0; i < cities_len; ++i) {
+        GeonamesCity *city = geonames_get_city(cities[i]);
+        if (city) {
+            locations.append(city);
+        }
+    }
+
+    TimeZoneLocationModel *model = static_cast<TimeZoneLocationModel *>(user_data);
+
+    g_clear_object(&model->m_cancellable);
+
+    model->setModel(locations);
+    model->setListUpdating(false);
+}
+
+bool TimeZoneLocationModel::listUpdating() const
+{
+    return m_listUpdating;
+}
+
+void TimeZoneLocationModel::setListUpdating(bool listUpdating)
+{
+    if (m_listUpdating != listUpdating) {
+        m_listUpdating = listUpdating;
+        Q_EMIT listUpdatingChanged();
+    }
+}
+
+QString TimeZoneLocationModel::filter() const
 {
     return m_filter;
 }
 
-void TimeZoneFilterModel::setFilter(const QString &filter)
+void TimeZoneLocationModel::setFilter(const QString &filter)
 {
     if (filter != m_filter) {
         m_filter = filter;
-        m_stringMatcher.setPattern(m_filter);
         Q_EMIT filterChanged();
-        invalidate();
-    }
+    }
+
+    setListUpdating(true);
+
+    if (m_cancellable) {
+        g_cancellable_cancel(m_cancellable);
+        g_clear_object(&m_cancellable);
+    }
+
+    setModel(QList<GeonamesCity *>());
+
+    if (filter.isEmpty()) {
+        setListUpdating(false);
+        return;
+    }
+
+    m_cancellable = g_cancellable_new();
+    geonames_query_cities(filter.toUtf8().data(),
+                          GEONAMES_QUERY_DEFAULT,
+                          m_cancellable,
+                          filterFinished,
+                          this);
 }
 
-QString TimeZoneFilterModel::country() const
+QString TimeZoneLocationModel::country() const
 {
     return m_country;
 }
 
-void TimeZoneFilterModel::setCountry(const QString &country)
+static bool citycmp(GeonamesCity *a, GeonamesCity *b)
+{
+    return geonames_city_get_population(b) < geonames_city_get_population(a);
+}
+
+void TimeZoneLocationModel::setCountry(const QString &country)
 {
     if (m_country == country)
         return;
 
     m_country = country;
+
+    Q_FOREACH(GeonamesCity *city, m_countryLocations) {
+        geonames_city_free(city);
+    }
+
+    gint num_cities = geonames_get_n_cities();
+    for (gint i = 0; i < num_cities; i++) {
+        GeonamesCity *city = geonames_get_city(i);
+        if (city && m_country == geonames_city_get_country_code(city)) {
+            m_countryLocations.append(city);
+        }
+    }
+
+    std::sort(m_countryLocations.begin(), m_countryLocations.end(), citycmp);
+
     Q_EMIT countryChanged(country);
 }
+
+TimeZoneLocationModel::~TimeZoneLocationModel()
+{
+    if (m_cancellable) {
+        g_cancellable_cancel(m_cancellable);
+        g_clear_object(&m_cancellable);
+    }
+
+    Q_FOREACH(GeonamesCity *city, m_countryLocations) {
+        geonames_city_free(city);
+    }
+
+    Q_FOREACH(GeonamesCity *city, m_locations) {
+        geonames_city_free(city);
+    }
+}

=== modified file 'plugins/Wizard/timezonemodel.h'
--- plugins/Wizard/timezonemodel.h	2016-02-16 13:10:24 +0000
+++ plugins/Wizard/timezonemodel.h	2016-03-02 16:19:54 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Canonical Ltd.
+ * Copyright (C) 2016 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -17,21 +17,21 @@
 #ifndef TIMEZONEMODEL_H
 #define TIMEZONEMODEL_H
 
+#include <geonames.h>
+#include <glib.h>
 #include <QAbstractListModel>
-#include <QSortFilterProxyModel>
-#include <QThread>
-#include <QtConcurrent>
-#include <QtGui/QImage>
-
-class TimeZonePopulateWorker;
 
 class TimeZoneLocationModel: public QAbstractListModel
 {
     Q_OBJECT
+    Q_PROPERTY(bool listUpdating READ listUpdating NOTIFY listUpdatingChanged)
+    Q_PROPERTY(QString filter READ filter WRITE setFilter NOTIFY filterChanged)
+    Q_PROPERTY(QString country READ country WRITE setCountry NOTIFY countryChanged)
     Q_ENUMS(Roles)
+
 public:
     explicit TimeZoneLocationModel(QObject *parent = nullptr);
-    ~TimeZoneLocationModel() = default;
+    ~TimeZoneLocationModel();
 
     enum Roles {
         TimeZoneRole = Qt::UserRole + 1,
@@ -43,56 +43,11 @@
         LongitudeRole
     };
 
-    struct TzLocationWizard {
-        QString city;
-        QString country;
-        QString timezone;
-        QString state;
-        QString full_country;
-        double latitude;
-        double longitude;
-    };
-
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
     QHash<int, QByteArray> roleNames() const override;
 
-private Q_SLOTS:
-    void processModelResult(const TzLocationWizard &location);
-    void store();
-
-private:
-    void init();
-    QHash<int, QByteArray> m_roleNames;
-    QList<TzLocationWizard> m_locations;
-    TimeZonePopulateWorker *m_workerThread;
-};
-
-Q_DECLARE_METATYPE (TimeZoneLocationModel::TzLocationWizard)
-
-class TimeZonePopulateWorker: public QThread
-{
-    Q_OBJECT
-public:
-    void run() override;
-
-Q_SIGNALS:
-    void resultReady(const TimeZoneLocationModel::TzLocationWizard &tz);
-
-private:
-    void buildCityMap();
-};
-
-class TimeZoneFilterModel: public QSortFilterProxyModel
-{
-    Q_OBJECT
-    Q_PROPERTY(QString filter READ filter WRITE setFilter NOTIFY filterChanged)
-    Q_PROPERTY(QString country READ country WRITE setCountry NOTIFY countryChanged)
-
-public:
-    explicit TimeZoneFilterModel(QObject *parent = nullptr);
-    ~TimeZoneFilterModel() = default;
-    bool filterAcceptsRow(int row, const QModelIndex &parentIndex) const override;
+    bool listUpdating() const;
 
     QString filter() const;
     void setFilter(const QString &filter);
@@ -101,13 +56,25 @@
     void setCountry(const QString &country);
 
 Q_SIGNALS:
+    void listUpdatingChanged();
     void filterChanged();
     void countryChanged(const QString &country);
 
 private:
+    void setModel(const QList<GeonamesCity *> &locations);
+    void setListUpdating(bool listUpdating);
+    static void filterFinished(GObject      *source_object,
+                               GAsyncResult *res,
+                               gpointer      user_data);
+
+
+    bool m_listUpdating;
     QString m_filter;
-    QStringMatcher m_stringMatcher;
     QString m_country;
+    GCancellable *m_cancellable;
+    QHash<int, QByteArray> m_roleNames;
+    QList<GeonamesCity *> m_locations;
+    QList<GeonamesCity *> m_countryLocations;
 };
 
 #endif

=== modified file 'qml/Wizard/Pages.qml'
--- qml/Wizard/Pages.qml	2016-02-18 14:05:12 +0000
+++ qml/Wizard/Pages.qml	2016-03-02 16:19:54 +0000
@@ -34,23 +34,12 @@
     property int passwordMethod: UbuntuSecurityPrivacyPanel.Passphrase
     property string password: ""
 
-    property string countryCode: "US" // default country (for the timezone page)
     property bool seenSIMPage: false // we want to see the SIM page at most once
 
     property alias modemManager: modemManager
     property alias simManager0: simManager0
     property alias simManager1: simManager1
 
-    TimeZoneModel { // preload the heavy models
-        id: tzModel
-    }
-
-    TimeZoneFilterModel {
-        id: tzFilterModel
-        sourceModel: tzModel
-        country: countryCode
-    }
-
     UbuntuSecurityPrivacyPanel {
         id: securityPrivacy
         objectName: "securityPrivacy"

=== modified file 'qml/Wizard/Pages/10-welcome.qml'
--- qml/Wizard/Pages/10-welcome.qml	2016-02-16 04:28:15 +0000
+++ qml/Wizard/Pages/10-welcome.qml	2016-03-02 16:19:54 +0000
@@ -155,7 +155,6 @@
                     System.updateSessionLocale(plugin.languageCodes[plugin.currentLanguage]);
                 }
                 i18n.language = plugin.languageCodes[plugin.currentLanguage]; // re-notify of change after above call (for qlocale change)
-                root.countryCode = plugin.languageCodes[plugin.currentLanguage].split('_')[1].split('.')[0]; // extract the country code, save it for the timezone page
 
                 if (!root.modemManager.available || !root.modemManager.ready || root.modemManager.modems.length === 0 ||
                         (root.simManager0.present && root.simManager0.ready) || (root.simManager1.present && root.simManager1.ready) ||

=== modified file 'qml/Wizard/Pages/50-timezone.qml'
--- qml/Wizard/Pages/50-timezone.qml	2016-03-01 19:00:13 +0000
+++ qml/Wizard/Pages/50-timezone.qml	2016-03-02 16:19:54 +0000
@@ -87,8 +87,6 @@
             }
 
             resetViews();
-            tzFilterModel.filter = Qt.binding(function() { return searchField.text; });
-            tzFilterModel.invalidate();
             theme.palette.normal.backgroundText = "#cdcdcd";
             searchField.forceActiveFocus();
         }
@@ -192,9 +190,21 @@
                 objectName: "tzList"
                 clip: true
                 currentIndex: -1
-                model: tzFilterModel
+                model: TimeZoneModel {
+                    id: timeZoneModel
+                    filter: searchField.text
+                    country: i18n.language.split('_')[1].split('.')[0]
+                }
                 delegate: tzComponent
             }
+
+            ActivityIndicator {
+                anchors.centerIn: tzList
+                running: tzList.count == 0 &&
+                         searchField.length > 0 &&
+                         timeZoneModel.listUpdating
+                visible: running
+            }
         }
 
         Item {

=== modified file 'tests/mocks/Wizard/CMakeLists.txt'
--- tests/mocks/Wizard/CMakeLists.txt	2016-02-16 13:10:24 +0000
+++ tests/mocks/Wizard/CMakeLists.txt	2016-03-02 16:19:54 +0000
@@ -1,7 +1,5 @@
-pkg_search_module(TIMEZONEMAP REQUIRED timezonemap)
-
 include_directories(
-    ${GLIB_INCLUDE_DIRS} ${TIMEZONEMAP_INCLUDE_DIRS}
+    ${GLIB_INCLUDE_DIRS} ${GEONAMES_INCLUDE_DIRS}
     ${CMAKE_SOURCE_DIR}/plugins/Wizard
 )
 
@@ -15,5 +13,5 @@
 )
 
 qt5_use_modules(MockWizard-qml DBus Qml Concurrent)
-target_link_libraries(MockWizard-qml ${GLIB_LDFLAGS} ${TIMEZONEMAP_LDFLAGS})
+target_link_libraries(MockWizard-qml ${GLIB_LDFLAGS} ${GEONAMES_LDFLAGS})
 add_unity8_mock(Wizard 0.1 Wizard TARGETS MockWizard-qml)

=== modified file 'tests/mocks/Wizard/mockplugin.cpp'
--- tests/mocks/Wizard/mockplugin.cpp	2016-02-16 13:10:24 +0000
+++ tests/mocks/Wizard/mockplugin.cpp	2016-03-02 16:19:54 +0000
@@ -30,6 +30,5 @@
     qmlRegisterSingletonType<MockSystem>(uri, 0, 1, "System", [](QQmlEngine*, QJSEngine*) -> QObject* { return new MockSystem; });
     qmlRegisterSingletonType<Status>(uri, 0, 1, "Status", [](QQmlEngine*, QJSEngine*) -> QObject* { return new Status; });
     qmlRegisterType<TimeZoneLocationModel>(uri, 0, 1, "TimeZoneModel");
-    qmlRegisterType<TimeZoneFilterModel>(uri, 0, 1, "TimeZoneFilterModel");
     qmlRegisterType<LocalePlugin>(uri, 0, 1, "LocalePlugin");
 }