Showing the changes to interface/src/Application.cpp (1 of 1 file). Show all
Unified · Split
| @@ -5353,7 +5353,7 @@ void Application::addAssetToWorldInitiate() { · 5352 unmodified lines | |||
| 5353 | 5353 | ||
| 5354 | if (!_addAssetToWorldMessageBox) { | 5354 | if (!_addAssetToWorldMessageBox) { |
| 5355 | _addAssetToWorldMessageBox = DependencyManager::get<OffscreenUi>()->createMessageBox(OffscreenUi::ICON_INFORMATION, | 5355 | _addAssetToWorldMessageBox = DependencyManager::get<OffscreenUi>()->createMessageBox(OffscreenUi::ICON_INFORMATION, |
| 5356 | "Downloading Asset", "Preparing asset for download", QMessageBox::Cancel, QMessageBox::NoButton); | 5356 | "Downloading Asset", "Preparing asset for download.", QMessageBox::Cancel, QMessageBox::NoButton); |
| 5357 | } | 5357 | } |
| 5358 | 5358 | ||
| 5359 | connect(_addAssetToWorldMessageBox, SIGNAL(destroyed()), this, SLOT(onAssetToWorldMessageBoxClosed())); | 5359 | connect(_addAssetToWorldMessageBox, SIGNAL(destroyed()), this, SLOT(onAssetToWorldMessageBoxClosed())); |
| @@ -5377,7 +5377,7 @@ void Application::addAssetToWorld(QString filePath) { · 17 unmodified lines | |||
| 5377 | return; | 5377 | return; |
| 5378 | } | 5378 | } |
| 5379 | 5379 | ||
| 5380 | _addAssetToWorldMessageBox->setProperty("text", "Downloading asset file"); | 5380 | _addAssetToWorldMessageBox->setProperty("text", "Downloading asset file."); |
| 5381 | 5381 | ||
| 5382 | if (!DependencyManager::get<NodeList>()->getThisNodeCanWriteAssets()) { | 5382 | if (!DependencyManager::get<NodeList>()->getThisNodeCanWriteAssets()) { |
| 5383 | QString errorInfo = "Do not have permissions to write to asset server."; | 5383 | QString errorInfo = "Do not have permissions to write to asset server."; |
| @@ -5496,9 +5496,9 @@ void Application::addAssetToWorldAddEntity(QString mapping) { · 112 unmodified lines | |||
| 5496 | qCDebug(interfaceapp) << "Error downloading asset: " + errorInfo; | 5496 | qCDebug(interfaceapp) << "Error downloading asset: " + errorInfo; |
| 5497 | addAssetToWorldError(errorInfo); | 5497 | addAssetToWorldError(errorInfo); |
| 5498 | } else { | 5498 | } else { |
| 5499 | QString successInfo = "Downloaded asset " + mapping + " added to world"; | 5499 | QString successInfo = "Downloaded asset " + mapping + " added to world."; |
| 5500 | qCDebug(interfaceapp) << "Downloading asset completed: " + successInfo; | 5500 | qCDebug(interfaceapp) << "Downloading asset completed: " + successInfo; |
| 5501 | _addAssetToWorldMessageBox->setProperty("text", "Downloading asset completed"); | 5501 | _addAssetToWorldMessageBox->setProperty("text", successInfo); |
| 5502 | _addAssetToWorldMessageBox->setProperty("buttons", QMessageBox::Ok); | 5502 | _addAssetToWorldMessageBox->setProperty("buttons", QMessageBox::Ok); |
| 5503 | _addAssetToWorldMessageBox->setProperty("defaultButton", QMessageBox::Ok); | 5503 | _addAssetToWorldMessageBox->setProperty("defaultButton", QMessageBox::Ok); |
| 5504 | } | 5504 | } |