← Back to branch summary

~nik90/unav/unav-convergence-part-2

« back to all changes in this revision

Viewing changes to qml/PoiPage.qml

  • Committer: Nekhelesh Ramananthan
  • Date: 2016-04-23 20:16:12 UTC
  • Revision ID: krnekhelesh@gmail.com-20160423201612-3o83i71fviro354g
Transitioned all the POI pages

Show diffs side-by-side

added added

removed removed

Lines of Context:
qml/PoiPage.qml
37
37
    }
38
38
 
39
39
    function goBackStandardMode() {
40
 
        mainPageStack.pop()
 
40
        mainPageStack.removePages(poiPage)
41
41
    }
42
42
 
43
43
    Keys.onEscapePressed: {
44
44
        !poiHeader.isSearchMode ? goBackStandardMode()
45
 
                                     : goBackSearchMode()
 
45
                                : goBackSearchMode()
46
46
    }
47
47
 
48
48
    header: UNavHeader {
56
56
        leadingActionBar.actions: Action {
57
57
            iconName: "back"
58
58
            text: i18n.tr("Back")
 
59
            visible: poiHeader.isSearchMode || mainPageStack.columns === 1
59
60
            onTriggered: {
60
61
                if (poiHeader.isSearchMode) {
61
62
                    goBackSearchMode()
189
190
                ProgressionSlot{}
190
191
            }
191
192
            onClicked: {
192
 
                goBackSearchMode()
193
 
                mainPageStack.push(Qt.resolvedUrl("PoiListPage.qml"), {
 
193
                if (poiHeader.isSearchMode) {
 
194
                    goBackSearchMode()
 
195
                }
 
196
                mainPageStack.addPageToCurrentColumn(poiPage, Qt.resolvedUrl("PoiListPage.qml"), {
194
197
                    lat: poiPage.lat,
195
198
                    lng: poiPage.lng,
196
199
                    poiType: model.label,