794674b · unity8 · git.iko.soy

filter only by city name

commit794674ba494890fc18c7dd90f52b5c9008f038f5 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateWed 16 Sep 2015, 17:27 (11 years ago) parent19d8928

2 files changed+3−3

unifiedsplit

plugins/Wizard/timezonemodel.cpp+2−2

@@ -123,9 +123,9 @@ bool TimeZoneFilterModel::filterAcceptsRow(int row, const QModelIndex &parentInd

123123

124124 if (!m_filter.isEmpty()) { // filtering by freeform text input, cf setFilter(QString)

125125 const QString city = sourceModel()->index(row, 0, parentIndex).data(TimeZoneModel::City).toString();

126− const QString country = sourceModel()->index(row, 0, parentIndex).data(TimeZoneModel::Country).toString();

126+ //const QString country = sourceModel()->index(row, 0, parentIndex).data(TimeZoneModel::Country).toString();

127127

128− if (m_stringMatcher.indexIn(city) == 0 || m_stringMatcher.indexIn(country) == 0) { // match at the beginning of the city/country name

128+ if (m_stringMatcher.indexIn(city) == 0 /*|| m_stringMatcher.indexIn(country) == 0*/) { // match at the beginning of the city name

129129 return true;

130130 }

131131 } else if (!m_country.isEmpty()) { // filter by country code

qml/Wizard/Pages/75-report-check.qml+1−1

@@ -75,7 +75,7 @@ LocalComponents.Page {

7575 id: forwardButton

7676 LocalComponents.StackButton {

7777 text: i18n.tr("Next")

78− onClicked: pageStack.next();

78+ onClicked: pageStack.next(); // TODO save that info somewhere

7979 }

8080 }

8181}