From b15e7cec216a537b2c7eab6c4fa28bf1bb3e3d1a Mon Sep 17 00:00:00 2001 From: Niraj Venkat Date: Fri, 19 Jun 2015 11:17:56 -0700 Subject: [PATCH] Back and forward are red if not possible --- interface/resources/qml/AddressBarDialog.qml | 8 ++------ interface/src/ui/AddressBarDialog.cpp | 4 ++-- interface/src/ui/AddressBarDialog.h | 4 ++-- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/interface/resources/qml/AddressBarDialog.qml b/interface/resources/qml/AddressBarDialog.qml index 13b29c0555..6caed7b029 100644 --- a/interface/resources/qml/AddressBarDialog.qml +++ b/interface/resources/qml/AddressBarDialog.qml @@ -38,7 +38,7 @@ DialogContainer { implicitHeight: backgroundImage.height onParentChanged: { - console.log("Test: " + addressBarDialog.backEnabled + " " + addressBarDialog.forwardEnabled+ " " + addressBarDialog) + console.log("Test: " + addressBarDialog.backEnabled + " " + addressBarDialog.forwardEnabled + " " + addressBarDialog) } Image { @@ -53,7 +53,7 @@ DialogContainer { Image { id: backArrow - source: addressBarDialog.backEnabled ? "../images/left-arrow.svg" : "../images/redarrow.svg" + source: addressBarDialog.backEnabled ? "../images/left-arrow.svg" : "../images/redarrow_reversed.svg" anchors { fill: parent @@ -71,8 +71,6 @@ DialogContainer { } } - //onBackEnabledChanged: { parent.source: "../images/redarrow.svg" } - /* Connections { target: backArrow @@ -104,8 +102,6 @@ DialogContainer { } } - //onForwardEnabledChanged: { parent.source: "../images/redarrow.svg" } - /* Connections { target: forwardArrow diff --git a/interface/src/ui/AddressBarDialog.cpp b/interface/src/ui/AddressBarDialog.cpp index e9d1251772..0590a63390 100644 --- a/interface/src/ui/AddressBarDialog.cpp +++ b/interface/src/ui/AddressBarDialog.cpp @@ -24,8 +24,8 @@ AddressBarDialog::AddressBarDialog(QQuickItem* parent) : OffscreenQmlDialog(pare connect(addressManager.data(), &AddressManager::lookupResultsFinished, this, &AddressBarDialog::hide); connect(addressManager.data(), &AddressManager::goBackPossible, this, &AddressBarDialog::changeBackAlpha); connect(addressManager.data(), &AddressManager::goForwardPossible, this, &AddressBarDialog::changeForwardAlpha); - _backEnabled = false; - _forwardEnabled = false; + _backEnabled = DependencyManager::get()->getBackState(); + _forwardEnabled = DependencyManager::get()->getForwardState(); } void AddressBarDialog::hide() { diff --git a/interface/src/ui/AddressBarDialog.h b/interface/src/ui/AddressBarDialog.h index 5cfdde1459..3148f828fd 100644 --- a/interface/src/ui/AddressBarDialog.h +++ b/interface/src/ui/AddressBarDialog.h @@ -18,8 +18,8 @@ class AddressBarDialog : public OffscreenQmlDialog { Q_OBJECT HIFI_QML_DECL - Q_PROPERTY(bool backEnabled READ backEnabled CHANGED backEnabledChanged) - Q_PROPERTY(bool forwardEnabled READ forwardEnabled CHANGED forwardEnabledChanged) + Q_PROPERTY(bool backEnabled READ backEnabled NOTIFY backEnabledChanged) + Q_PROPERTY(bool forwardEnabled READ forwardEnabled NOTIFY forwardEnabledChanged) public: AddressBarDialog(QQuickItem* parent = nullptr);