History

Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2

Wayne Chen committed 8 years ago

Commit 331b09c2 parents eb36abb daa13b3511 files · +8478 −3575Browse files

Showing the changes to interface/src/Application.cpp (1 of 511 files). Show all

Unified · Split

interface/src/Application.cpp+8−3
@@ -226,6 +226,7 @@ · 225 unmodified lines
226#include "commerce/Ledger.h"226#include "commerce/Ledger.h"
227#include "commerce/Wallet.h"227#include "commerce/Wallet.h"
228#include "commerce/QmlCommerce.h"228#include "commerce/QmlCommerce.h"
229#include "ResourceRequestObserver.h"
229 230
230#include "webbrowser/WebBrowserSuggestionsEngine.h"231#include "webbrowser/WebBrowserSuggestionsEngine.h"
231#include <DesktopPreviewProvider.h>232#include <DesktopPreviewProvider.h>
@@ -947,6 +948,7 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) { · 715 unmodified lines
947 DependencyManager::set<WalletScriptingInterface>();948 DependencyManager::set<WalletScriptingInterface>();
948 949
949 DependencyManager::set<FadeEffect>();950 DependencyManager::set<FadeEffect>();
951 DependencyManager::set<ResourceRequestObserver>();
950 952
951 return previousSessionCrashed;953 return previousSessionCrashed;
952}954}
@@ -3148,6 +3150,7 @@ void Application::onDesktopRootContextCreated(QQmlContext* surfaceContext) { · 2195 unmodified lines
3148 surfaceContext->setContextProperty("ContextOverlay", DependencyManager::get<ContextOverlayInterface>().data());3150 surfaceContext->setContextProperty("ContextOverlay", DependencyManager::get<ContextOverlayInterface>().data());
3149 surfaceContext->setContextProperty("Wallet", DependencyManager::get<WalletScriptingInterface>().data());3151 surfaceContext->setContextProperty("Wallet", DependencyManager::get<WalletScriptingInterface>().data());
3150 surfaceContext->setContextProperty("HiFiAbout", AboutUtil::getInstance());3152 surfaceContext->setContextProperty("HiFiAbout", AboutUtil::getInstance());
3153 surfaceContext->setContextProperty("ResourceRequestObserver", DependencyManager::get<ResourceRequestObserver>().data());
3151 3154
3152 if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {3155 if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {
3153 surfaceContext->setContextProperty("Steam", new SteamScriptingInterface(engine, steamClient.get()));3156 surfaceContext->setContextProperty("Steam", new SteamScriptingInterface(engine, steamClient.get()));
@@ -5080,12 +5083,12 @@ void Application::saveSettings() const { · 1926 unmodified lines
5080 PluginManager::getInstance()->saveSettings();5083 PluginManager::getInstance()->saveSettings();
5081}5084}
5082 5085
5083bool Application::importEntities(const QString& urlOrFilename) {5086bool Application::importEntities(const QString& urlOrFilename, const bool isObservable, const qint64 callerId) {
5084 bool success = false;5087 bool success = false;
5085 _entityClipboard->withWriteLock([&] {5088 _entityClipboard->withWriteLock([&] {
5086 _entityClipboard->eraseAllOctreeElements();5089 _entityClipboard->eraseAllOctreeElements();
5087 5090
5088 success = _entityClipboard->readFromURL(urlOrFilename);5091 success = _entityClipboard->readFromURL(urlOrFilename, isObservable, callerId);
5089 if (success) {5092 if (success) {
5090 _entityClipboard->reaverageOctreeElements();5093 _entityClipboard->reaverageOctreeElements();
5091 }5094 }
@@ -6890,6 +6893,7 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEnginePointe · 1798 unmodified lines
6890 scriptEngine->registerGlobalObject("Wallet", DependencyManager::get<WalletScriptingInterface>().data());6893 scriptEngine->registerGlobalObject("Wallet", DependencyManager::get<WalletScriptingInterface>().data());
6891 scriptEngine->registerGlobalObject("AddressManager", DependencyManager::get<AddressManager>().data());6894 scriptEngine->registerGlobalObject("AddressManager", DependencyManager::get<AddressManager>().data());
6892 scriptEngine->registerGlobalObject("HifiAbout", AboutUtil::getInstance());6895 scriptEngine->registerGlobalObject("HifiAbout", AboutUtil::getInstance());
6896 scriptEngine->registerGlobalObject("ResourceRequestObserver", DependencyManager::get<ResourceRequestObserver>().data());
6893 6897
6894 qScriptRegisterMetaType(scriptEngine.data(), OverlayIDtoScriptValue, OverlayIDfromScriptValue);6898 qScriptRegisterMetaType(scriptEngine.data(), OverlayIDtoScriptValue, OverlayIDfromScriptValue);
6895 6899
@@ -7276,7 +7280,8 @@ void Application::addAssetToWorldFromURL(QString url) { · 380 unmodified lines
7276 7280
7277 addAssetToWorldInfo(filename, "Downloading model file " + filename + ".");7281 addAssetToWorldInfo(filename, "Downloading model file " + filename + ".");
7278 7282
7279 auto request = DependencyManager::get<ResourceManager>()->createResourceRequest(nullptr, QUrl(url));7283 auto request = DependencyManager::get<ResourceManager>()->createResourceRequest(
7284 nullptr, QUrl(url), true, -1, "Application::addAssetToWorldFromURL");
7280 connect(request, &ResourceRequest::finished, this, &Application::addAssetToWorldFromURLRequestFinished);7285 connect(request, &ResourceRequest::finished, this, &Application::addAssetToWorldFromURLRequestFinished);
7281 request->send();7286 request->send();
7282}7287}