Showing the changes to interface/src/Application.cpp (1 of 11 files). Show all
Unified · Split
| @@ -86,6 +86,7 @@ · 85 unmodified lines | ||
| 86 | 86 | #include <ObjectMotionState.h> |
| 87 | 87 | #include <OctalCode.h> |
| 88 | 88 | #include <OctreeSceneStats.h> |
| 89 | +#include <OffscreenUi.h> | |
| 89 | 90 | #include <gl/OffscreenGLCanvas.h> |
| 90 | 91 | #include <PathUtils.h> |
| 91 | 92 | #include <PerfStat.h> |
| @@ -4386,7 +4387,7 @@ bool Application::askToLoadScript(const QString& scriptFilenameOrURL) { · 4294 unmodified lines | ||
| 4386 | 4387 | |
| 4387 | 4388 | bool Application::askToUploadAsset(const QString& filename) { |
| 4388 | 4389 | if (!DependencyManager::get<NodeList>()->getThisNodeCanRez()) { |
| 4389 | − QMessageBox::warning(_window, "Failed Upload", | |
| 4390 | + OffscreenUi::warning(_window, "Failed Upload", | |
| 4390 | 4391 | QString("You don't have upload rights on that domain.\n\n")); |
| 4391 | 4392 | return false; |
| 4392 | 4393 | } |
| @@ -4430,7 +4431,7 @@ bool Application::askToUploadAsset(const QString& filename) { · 37 unmodified lines | ||
| 4430 | 4431 | } |
| 4431 | 4432 | |
| 4432 | 4433 | // display a message box with the error |
| 4433 | − QMessageBox::warning(_window, "Failed Upload", QString("Failed to upload %1.\n\n").arg(filename)); | |
| 4434 | + OffscreenUi::warning(_window, "Failed Upload", QString("Failed to upload %1.\n\n").arg(filename)); | |
| 4434 | 4435 | return false; |
| 4435 | 4436 | } |
| 4436 | 4437 | |
| @@ -4528,7 +4529,7 @@ void Application::handleScriptEngineLoaded(const QString& scriptFilename) { · 91 unmodified lines | ||
| 4528 | 4529 | // FIXME - change to new version of ScriptCache loading notification |
| 4529 | 4530 | void Application::handleScriptLoadError(const QString& scriptFilename) { |
| 4530 | 4531 | qCDebug(interfaceapp) << "Application::loadScript(), script failed to load..."; |
| 4531 | − QMessageBox::warning(getWindow(), "Error Loading Script", scriptFilename + " failed to load."); | |
| 4532 | + OffscreenUi::warning(getWindow(), "Error Loading Script", scriptFilename + " failed to load."); | |
| 4532 | 4533 | } |
| 4533 | 4534 | |
| 4534 | 4535 | QStringList Application::getRunningScripts() { |