Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 02:03:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Phone home with suggestions activity usage.

Browse source
This commit is contained in:
Howard Stearns 2016-07-15 19:15:58 -07:00
parent f73c2b884d
commit d446e1bcf5
6 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/resources/qml/AddressBarDialog.qml
View file

@ -47,7 +47,7 @@ Window {
function goCard(card) {
addressLine.text = card.userStory.name;
toggleOrGo();
toggleOrGo(true);
}
property var allDomains: [];
property var suggestionChoices: [];
@ -327,9 +327,9 @@ Window {
}
}
function toggleOrGo() {
function toggleOrGo(fromSuggestions) {
if (addressLine.text !== "") {
addressBarDialog.loadAddress(addressLine.text)
addressBarDialog.loadAddress(addressLine.text, fromSuggestions)
}
root.shown = false;
}

4
interface/src/ui/AddressBarDialog.cpp
View file

@ -40,10 +40,10 @@ AddressBarDialog::AddressBarDialog(QQuickItem* parent) : OffscreenQmlDialog(pare
_forwardEnabled = !(DependencyManager::get<AddressManager>()->getForwardStack().isEmpty());
}
void AddressBarDialog::loadAddress(const QString& address) {
void AddressBarDialog::loadAddress(const QString& address, bool fromSuggestions) {
qDebug() << "Called LoadAddress with address " << address;
if (!address.isEmpty()) {
DependencyManager::get<AddressManager>()->handleLookupString(address);
DependencyManager::get<AddressManager>()->handleLookupString(address, fromSuggestions);
}
}

2
interface/src/ui/AddressBarDialog.h
View file

@ -34,7 +34,7 @@ protected:
void displayAddressOfflineMessage();
void displayAddressNotFoundMessage();
Q_INVOKABLE void loadAddress(const QString& address);
Q_INVOKABLE void loadAddress(const QString& address, bool fromSuggestions = false);
Q_INVOKABLE void loadHome();
Q_INVOKABLE void loadBack();
Q_INVOKABLE void loadForward();

4
libraries/networking/src/AddressManager.cpp
View file

@ -221,7 +221,7 @@ bool AddressManager::handleUrl(const QUrl& lookupUrl, LookupTrigger trigger) {
return false;
}
void AddressManager::handleLookupString(const QString& lookupString) {
void AddressManager::handleLookupString(const QString& lookupString, bool fromSuggestions) {
if (!lookupString.isEmpty()) {
// make this a valid hifi URL and handle it off to handleUrl
QString sanitizedString = lookupString.trimmed();
@ -236,7 +236,7 @@ void AddressManager::handleLookupString(const QString& lookupString) {
lookupURL = QUrl(lookupString);
}
handleUrl(lookupURL);
handleUrl(lookupURL, fromSuggestions ? Suggestions : UserInput);
}
}

5
libraries/networking/src/AddressManager.h
View file

@ -49,7 +49,8 @@ public:
StartupFromSettings,
DomainPathResponse,
Internal,
AttemptedRefresh
AttemptedRefresh,
Suggestions
};
bool isConnected();
@ -77,7 +78,7 @@ public:
std::function<void()> localSandboxNotRunningDoThat);
public slots:
void handleLookupString(const QString& lookupString);
void handleLookupString(const QString& lookupString, bool fromSuggestions = false);
// we currently expect this to be called from NodeList once handleLookupString has been called with a path
bool goToViewpointForPath(const QString& viewpointString, const QString& pathString)

3
libraries/networking/src/UserActivityLogger.cpp
View file

@ -178,6 +178,9 @@ void UserActivityLogger::wentTo(AddressManager::LookupTrigger lookupTrigger, QSt
case AddressManager::StartupFromSettings:
trigger = "StartupFromSettings";
break;
case AddressManager::Suggestions:
trigger = "Suggesions";
break;
default:
return;
}