From 48ff26eeb7d75534efde05e4d00aceee08f81e45 Mon Sep 17 00:00:00 2001 From: howard-stearns Date: Wed, 17 Aug 2016 09:50:38 -0700 Subject: [PATCH] provide a way to programmatically show the feed (showing address bar in feed mode). --- interface/src/ui/AddressBarDialog.cpp | 1 + interface/src/ui/AddressBarDialog.h | 5 +++++ interface/src/ui/DialogsManager.cpp | 5 +++++ interface/src/ui/DialogsManager.h | 2 ++ 4 files changed, 13 insertions(+) diff --git a/interface/src/ui/AddressBarDialog.cpp b/interface/src/ui/AddressBarDialog.cpp index a4ef8a913f..e5b4262770 100644 --- a/interface/src/ui/AddressBarDialog.cpp +++ b/interface/src/ui/AddressBarDialog.cpp @@ -38,6 +38,7 @@ AddressBarDialog::AddressBarDialog(QQuickItem* parent) : OffscreenQmlDialog(pare }); _backEnabled = !(DependencyManager::get()->getBackStack().isEmpty()); _forwardEnabled = !(DependencyManager::get()->getForwardStack().isEmpty()); + connect(DependencyManager::get().data(), &DialogsManager::setUseFeed, this, &AddressBarDialog::setUseFeed); } void AddressBarDialog::loadAddress(const QString& address, bool fromSuggestions) { diff --git a/interface/src/ui/AddressBarDialog.h b/interface/src/ui/AddressBarDialog.h index 6c7620164b..10f0e0822a 100644 --- a/interface/src/ui/AddressBarDialog.h +++ b/interface/src/ui/AddressBarDialog.h @@ -20,15 +20,19 @@ class AddressBarDialog : public OffscreenQmlDialog { HIFI_QML_DECL Q_PROPERTY(bool backEnabled READ backEnabled NOTIFY backEnabledChanged) Q_PROPERTY(bool forwardEnabled READ forwardEnabled NOTIFY forwardEnabledChanged) + Q_PROPERTY(bool useFeed READ useFeed WRITE setUseFeed NOTIFY useFeedChanged) public: AddressBarDialog(QQuickItem* parent = nullptr); bool backEnabled() { return _backEnabled; } bool forwardEnabled() { return _forwardEnabled; } + bool useFeed() { return _useFeed; } + void setUseFeed(bool useFeed) { if (_useFeed != useFeed) { _useFeed = useFeed; emit useFeedChanged(); } } signals: void backEnabledChanged(); void forwardEnabledChanged(); + void useFeedChanged(); protected: void displayAddressOfflineMessage(); @@ -42,6 +46,7 @@ protected: bool _backEnabled; bool _forwardEnabled; + bool _useFeed { false }; }; #endif diff --git a/interface/src/ui/DialogsManager.cpp b/interface/src/ui/DialogsManager.cpp index dc06c50626..1b868f4154 100644 --- a/interface/src/ui/DialogsManager.cpp +++ b/interface/src/ui/DialogsManager.cpp @@ -54,6 +54,11 @@ void DialogsManager::showAddressBar() { AddressBarDialog::show(); } +void DialogsManager::showFeed() { + AddressBarDialog::show(); + emit setUseFeed(true); +} + void DialogsManager::toggleDiskCacheEditor() { maybeCreateDialog(_diskCacheEditor); _diskCacheEditor->toggle(); diff --git a/interface/src/ui/DialogsManager.h b/interface/src/ui/DialogsManager.h index 5b4995029f..5e25afd130 100644 --- a/interface/src/ui/DialogsManager.h +++ b/interface/src/ui/DialogsManager.h @@ -45,6 +45,7 @@ public: public slots: void toggleAddressBar(); void showAddressBar(); + void showFeed(); void toggleDiskCacheEditor(); void toggleLoginDialog(); void showLoginDialog(); @@ -63,6 +64,7 @@ public slots: signals: void addressBarToggled(); void addressBarShown(bool visible); + void setUseFeed(bool useFeed); private slots: void hmdToolsClosed();