From 1328ea619971967dee5362b43fd45251e7aca35a Mon Sep 17 00:00:00 2001 From: Niraj Venkat Date: Wed, 17 Jun 2015 13:41:41 -0700 Subject: [PATCH] Calling AddressManager back and forward functions --- interface/resources/qml/AddressBarDialog.qml | 19 +++++++++++++++++-- interface/src/ui/AddressBarDialog.cpp | 12 +++++++++++- interface/src/ui/AddressBarDialog.h | 2 ++ 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/interface/resources/qml/AddressBarDialog.qml b/interface/resources/qml/AddressBarDialog.qml index e80c5f2aa5..b8543c132d 100644 --- a/interface/resources/qml/AddressBarDialog.qml +++ b/interface/resources/qml/AddressBarDialog.qml @@ -58,6 +58,15 @@ DialogContainer { topMargin: parent.inputAreaStep + parent.inputAreaStep + hifi.layout.spacing bottomMargin: parent.inputAreaStep + parent.inputAreaStep + hifi.layout.spacing } + + MouseArea { + anchors.fill: parent + acceptedButtons: Qt.LeftButton + onClicked: { + event.accepted = true + addressBarDialog.loadBack() + } + } } Image { @@ -73,8 +82,14 @@ DialogContainer { bottomMargin: parent.inputAreaStep + parent.inputAreaStep + hifi.layout.spacing } - width: parent.width * 0.5 - height: parent.height * 0.5 + MouseArea { + anchors.fill: parent + acceptedButtons: Qt.LeftButton + onClicked: { + event.accepted = true + addressBarDialog.loadForward() + } + } } TextInput { diff --git a/interface/src/ui/AddressBarDialog.cpp b/interface/src/ui/AddressBarDialog.cpp index 3c3a843586..50fbf979a0 100644 --- a/interface/src/ui/AddressBarDialog.cpp +++ b/interface/src/ui/AddressBarDialog.cpp @@ -31,10 +31,20 @@ void AddressBarDialog::hide() { void AddressBarDialog::loadAddress(const QString& address) { qDebug() << "Called LoadAddress with address " << address; if (!address.isEmpty()) { - DependencyManager::get()->handleLookupString(address); + DependencyManager::get()->handleLookupString(address);; } } +void AddressBarDialog::loadBack() { + qDebug() << "Called LoadBack"; + DependencyManager::get()->goBack(); +} + +void AddressBarDialog::loadForward() { + qDebug() << "Called LoadForward"; + DependencyManager::get()->goForward(); +} + void AddressBarDialog::displayAddressOfflineMessage() { OffscreenUi::error("That user or place is currently offline"); } diff --git a/interface/src/ui/AddressBarDialog.h b/interface/src/ui/AddressBarDialog.h index 395cf3c725..da54e29929 100644 --- a/interface/src/ui/AddressBarDialog.h +++ b/interface/src/ui/AddressBarDialog.h @@ -28,6 +28,8 @@ protected: void hide(); Q_INVOKABLE void loadAddress(const QString& address); + Q_INVOKABLE void loadBack(); + Q_INVOKABLE void loadForward(); }; #endif