diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2016-04-02 07:09:40 -0500 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2016-04-02 12:46:59 -0500 |
| commit | 69c10808af442140829975ee1cf893160e3be10d (patch) | |
| tree | 920867c4eb230888c5b6193571690719da227f97 /qt-mobile/qml | |
| parent | f677d482e9db6f4d566eac40909bb7c8f01fafd7 (diff) | |
| download | subsurface-69c10808af442140829975ee1cf893160e3be10d.tar.gz | |
QML UI: don't go through manager object to show map
We can open URLs in the browser directly from QML.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-mobile/qml')
| -rw-r--r-- | qt-mobile/qml/DiveDetailsView.qml | 2 | ||||
| -rw-r--r-- | qt-mobile/qml/GpsList.qml | 5 | ||||
| -rw-r--r-- | qt-mobile/qml/main.qml | 8 |
3 files changed, 11 insertions, 4 deletions
diff --git a/qt-mobile/qml/DiveDetailsView.qml b/qt-mobile/qml/DiveDetailsView.qml index c423ef016..ef1dc5605 100644 --- a/qt-mobile/qml/DiveDetailsView.qml +++ b/qt-mobile/qml/DiveDetailsView.qml @@ -54,7 +54,7 @@ Item { anchors.fill: parent onClicked: { if (dive.gps !== "") - manager.showMap(dive.gps) + showMap(dive.gps) } } } diff --git a/qt-mobile/qml/GpsList.qml b/qt-mobile/qml/GpsList.qml index 54dc02121..6903acd80 100644 --- a/qt-mobile/qml/GpsList.qml +++ b/qt-mobile/qml/GpsList.qml @@ -36,7 +36,7 @@ Kirigami.ScrollablePage { property int horizontalPadding: Kirigami.Units.gridUnit / 2 - Kirigami.Units.smallSpacing + 1 Kirigami.BasicListItem { - supportsMouseEvents: true + supportsMouseEvents: true width: parent.width - Kirigami.Units.gridUnit height: childrenRect.height - Kirigami.Units.smallSpacing GridLayout { @@ -99,8 +99,7 @@ Kirigami.ScrollablePage { Kirigami.Action { iconName: "gps" onTriggered: { - print("show map") - manager.showMap(latitude + " " + longitude) + showMap(latitude + " " + longitude) } } diff --git a/qt-mobile/qml/main.qml b/qt-mobile/qml/main.qml index 9365052a8..b578ffe51 100644 --- a/qt-mobile/qml/main.qml +++ b/qt-mobile/qml/main.qml @@ -46,6 +46,14 @@ Kirigami.ApplicationWindow { diveList.scrollToTop() } + function showMap(location) { + var urlPrefix = "https://www.google.com/maps/place/" + var locationPair = location + "/@" + location + var urlSuffix = ",5000m/data=!3m1!1e3!4m2!3m1!1s0x0:0x0" + Qt.openUrlExternally(urlPrefix + locationPair + urlSuffix) + + } + function startAddDive() { detailsWindow.state = "add" detailsWindow.dive_id = manager.addDive(); |