Merge lp:~costales/unav/0.60-joer-quickpois-minor3 into lp:~joergberroth/unav/poi_quick_access_feature

Proposed by costales
Status: Merged
Merged at revision: 85
Proposed branch: lp:~costales/unav/0.60-joer-quickpois-minor3
Merge into: lp:~joergberroth/unav/poi_quick_access_feature
Diff against target: 34 lines (+14/-7)
1 file modified
qml/components/POIQuickAccessGridView.qml (+14/-7)
To merge this branch: bzr merge lp:~costales/unav/0.60-joer-quickpois-minor3
Reviewer Review Type Date Requested Status
costales (community) Needs Resubmitting
JkB Pending
Review via email: mp+295403@code.launchpad.net

Description of the change

- Message if unknown pos.
- Text size bigger, as in popup

To post a comment you must log in.
86. By costales

Undone text size

Revision history for this message
costales (costales) wrote :

Just unknow pos message.

review: Needs Resubmitting

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml/components/POIQuickAccessGridView.qml'
2--- qml/components/POIQuickAccessGridView.qml 2016-05-20 22:11:30 +0000
3+++ qml/components/POIQuickAccessGridView.qml 2016-05-22 17:20:54 +0000
4@@ -169,16 +169,23 @@
5 mainPageStack.showSideBar()
6 mainPageStack.addPageToNextColumn(mainPageStack.primaryPage, Qt.resolvedUrl("../PoiQuickAccessPage.qml"))
7 } else {
8- poiXmlModel.clear()
9- notifiactionBar.text = i18n.tr("Searching…")
10- notifiactionBar.info()
11- poiXmlModel.distance = model.distance;
12- poiXmlModel.clause = model.clause;
13- poiXmlModel.search();
14- mainPageStack.executeJavaScript("ui.markers_POI_clear()")
15+ if (mainPageStack.currentLat === 'null' || mainPageStack.currentLng === 'null') {
16+ notifiactionBar.text = i18n.tr("Unknown current position");
17+ notifiactionBar.info();
18+ }
19+ else {
20+ poiXmlModel.clear();
21+ notifiactionBar.text = i18n.tr("Searching…");
22+ notifiactionBar.info();
23+ poiXmlModel.distance = model.distance;
24+ poiXmlModel.clause = model.clause;
25+ poiXmlModel.search();
26+ mainPageStack.executeJavaScript("ui.markers_POI_clear()");
27+ }
28 }
29 }
30 }
31 }
32 }
33
34+

Subscribers

People subscribed via source and target branches

to all changes: