Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 14:29:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Code tidying

Browse source
This commit is contained in:
David Rowe 2016-11-01 13:27:05 +13:00
parent cee8b66ce9
commit 93beaa81c0
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/resources/qml/Marketplaces.qml
View file

@ -25,6 +25,7 @@ Rectangle {
HifiConstants { id: hifi } HifiConstants { id: hifi }
id: marketplace id: marketplace
anchors.fill: parent anchors.fill: parent
property var marketplacesUrl: "../../scripts/system/html/marketplaces.html" property var marketplacesUrl: "../../scripts/system/html/marketplaces.html"
property int statusBarHeight: 50 property int statusBarHeight: 50
property int statusMargin: 50 property int statusMargin: 50
@ -85,7 +86,6 @@ Rectangle {
statusIcon.text = hifi.glyphs.alert; statusIcon.text = hifi.glyphs.alert;
runJavaScript(notFbxHandler, displayErrorStatus()); runJavaScript(notFbxHandler, displayErrorStatus());
} }
} }
onLoadingChanged: { onLoadingChanged: {
@ -138,7 +138,7 @@ Rectangle {
width: 150 width: 150
text: "See all markets" text: "See all markets"
onClicked: { onClicked: {
webview.url = "../../scripts/system/html/marketplaces.html"; webview.url = marketplacesUrl;
statusLabel.text = standardMessage; statusLabel.text = standardMessage;
} }
} }
@ -163,5 +163,4 @@ Rectangle {
} }
} }
} }

11
interface/src/Application.cpp
View file

@ -5336,8 +5336,9 @@ void Application::addAssetToWorld(QString filePath) {
// Automatically upload and add asset to world as an alternative manual process initiated by showAssetServerWidget(). // Automatically upload and add asset to world as an alternative manual process initiated by showAssetServerWidget().
if (!DependencyManager::get<NodeList>()->getThisNodeCanWriteAssets()) { if (!DependencyManager::get<NodeList>()->getThisNodeCanWriteAssets()) {
qCDebug(interfaceapp) << "Error downloading asset: Do not have permissions to write to asset server"; QString errorInfo = "Do not have permissions to write to asset server.";
OffscreenUi::warning("Error Downloading Asset", "Do not have permissions to write to asset server"); qCDebug(interfaceapp) << "Error downloading asset: " + errorInfo;
OffscreenUi::warning("Error Downloading Asset", errorInfo);
return; return;
} }
@ -5376,7 +5377,7 @@ void Application::addAssetToWorldUpload(QString path, QString mapping) {
auto upload = DependencyManager::get<AssetClient>()->createUpload(path); auto upload = DependencyManager::get<AssetClient>()->createUpload(path);
QObject::connect(upload, &AssetUpload::finished, this, [=](AssetUpload* upload, const QString& hash) mutable { QObject::connect(upload, &AssetUpload::finished, this, [=](AssetUpload* upload, const QString& hash) mutable {
if (upload->getError() != AssetUpload::NoError) { if (upload->getError() != AssetUpload::NoError) {
QString errorInfo = "Could not upload asset to asset server"; QString errorInfo = "Could not upload asset to asset server.";
qCDebug(interfaceapp) << "Error downloading asset: " + errorInfo; qCDebug(interfaceapp) << "Error downloading asset: " + errorInfo;
OffscreenUi::warning("Error Downloading Asset", errorInfo); OffscreenUi::warning("Error Downloading Asset", errorInfo);
} else { } else {
@ -5401,7 +5402,7 @@ void Application::addAssetToWorldSetMapping(QString mapping, QString hash) {
auto request = DependencyManager::get<AssetClient>()->createSetMappingRequest(mapping, hash); auto request = DependencyManager::get<AssetClient>()->createSetMappingRequest(mapping, hash);
connect(request, &SetMappingRequest::finished, this, [=](SetMappingRequest* request) mutable { connect(request, &SetMappingRequest::finished, this, [=](SetMappingRequest* request) mutable {
if (request->getError() != SetMappingRequest::NoError) { if (request->getError() != SetMappingRequest::NoError) {
QString errorInfo = "Could not set asset mapping"; QString errorInfo = "Could not set asset mapping.";
qCDebug(interfaceapp) << "Error downloading asset: " + errorInfo; qCDebug(interfaceapp) << "Error downloading asset: " + errorInfo;
OffscreenUi::warning("Error Downloading Asset", errorInfo); OffscreenUi::warning("Error Downloading Asset", errorInfo);
} else { } else {
@ -5425,7 +5426,7 @@ void Application::addAssetToWorldAddEntity(QString mapping) {
auto result = DependencyManager::get<EntityScriptingInterface>()->addEntity(properties); auto result = DependencyManager::get<EntityScriptingInterface>()->addEntity(properties);
if (result == QUuid()) { if (result == QUuid()) {
QString errorInfo = "Could not add downloaded asset " + mapping + " to world"; QString errorInfo = "Could not add downloaded asset " + mapping + " to world.";
qCDebug(interfaceapp) << "Error downloading asset: " + errorInfo; qCDebug(interfaceapp) << "Error downloading asset: " + errorInfo;
OffscreenUi::warning("Error Downloading Asset", errorInfo); OffscreenUi::warning("Error Downloading Asset", errorInfo);
} else { } else {