Showing the changes to interface/src/Application.cpp (1 of 1 file). Show all
Unified · Split
| @@ -5475,7 +5475,7 @@ void Application::addAssetToWorldInitiate() { · 5474 unmodified lines | |||
| 5475 | 5475 | ||
| 5476 | if (!_addAssetToWorldMessageBox) { | 5476 | if (!_addAssetToWorldMessageBox) { |
| 5477 | _addAssetToWorldMessageBox = DependencyManager::get<OffscreenUi>()->createMessageBox(OffscreenUi::ICON_INFORMATION, | 5477 | _addAssetToWorldMessageBox = DependencyManager::get<OffscreenUi>()->createMessageBox(OffscreenUi::ICON_INFORMATION, |
| 5478 | "Downloading Asset", "Preparing asset for download", QMessageBox::Cancel, QMessageBox::NoButton); | 5478 | "Downloading Asset", "Preparing asset for download.", QMessageBox::Cancel, QMessageBox::NoButton); |
| 5479 | } | 5479 | } |
| 5480 | 5480 | ||
| 5481 | connect(_addAssetToWorldMessageBox, SIGNAL(destroyed()), this, SLOT(onAssetToWorldMessageBoxClosed())); | 5481 | connect(_addAssetToWorldMessageBox, SIGNAL(destroyed()), this, SLOT(onAssetToWorldMessageBoxClosed())); |
| @@ -5499,7 +5499,7 @@ void Application::addAssetToWorld(QString filePath) { · 17 unmodified lines | |||
| 5499 | return; | 5499 | return; |
| 5500 | } | 5500 | } |
| 5501 | 5501 | ||
| 5502 | _addAssetToWorldMessageBox->setProperty("text", "Downloading asset file"); | 5502 | _addAssetToWorldMessageBox->setProperty("text", "Downloading asset file."); |
| 5503 | 5503 | ||
| 5504 | if (!DependencyManager::get<NodeList>()->getThisNodeCanWriteAssets()) { | 5504 | if (!DependencyManager::get<NodeList>()->getThisNodeCanWriteAssets()) { |
| 5505 | QString errorInfo = "Do not have permissions to write to asset server."; | 5505 | QString errorInfo = "Do not have permissions to write to asset server."; |
| @@ -5618,9 +5618,9 @@ void Application::addAssetToWorldAddEntity(QString mapping) { · 112 unmodified lines | |||
| 5618 | qCDebug(interfaceapp) << "Error downloading asset: " + errorInfo; | 5618 | qCDebug(interfaceapp) << "Error downloading asset: " + errorInfo; |
| 5619 | addAssetToWorldError(errorInfo); | 5619 | addAssetToWorldError(errorInfo); |
| 5620 | } else { | 5620 | } else { |
| 5621 | QString successInfo = "Downloaded asset " + mapping + " added to world"; | 5621 | QString successInfo = "Downloaded asset " + mapping + " added to world."; |
| 5622 | qCDebug(interfaceapp) << "Downloading asset completed: " + successInfo; | 5622 | qCDebug(interfaceapp) << "Downloading asset completed: " + successInfo; |
| 5623 | _addAssetToWorldMessageBox->setProperty("text", "Downloading asset completed"); | 5623 | _addAssetToWorldMessageBox->setProperty("text", successInfo); |
| 5624 | _addAssetToWorldMessageBox->setProperty("buttons", QMessageBox::Ok); | 5624 | _addAssetToWorldMessageBox->setProperty("buttons", QMessageBox::Ok); |
| 5625 | _addAssetToWorldMessageBox->setProperty("defaultButton", QMessageBox::Ok); | 5625 | _addAssetToWorldMessageBox->setProperty("defaultButton", QMessageBox::Ok); |
| 5626 | } | 5626 | } |