diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index a28334e7a3..a295cd8a6e 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2374,12 +2374,8 @@ bool Application::acceptSnapshot(const QString& urlString) { DependencyManager::get()->handleLookupString(snapshotData->getURL().toString()); } } else { - QMessageBox msgBox; - msgBox.setText("No location details were found in the file " - + snapshotPath + ", try dragging in an authentic Hifi snapshot."); - - msgBox.setStandardButtons(QMessageBox::Ok); - msgBox.exec(); + OffscreenUi::warning("", "No location details were found in the file\n" + + snapshotPath + "\nTry dragging in an authentic Hifi snapshot."); } return true; } @@ -4252,8 +4248,7 @@ void Application::setSessionUUID(const QUuid& sessionUUID) { bool Application::askToSetAvatarUrl(const QString& url) { QUrl realUrl(url); if (realUrl.isLocalFile()) { - QString message = "You can not use local files for avatar components."; - OffscreenUi::warning("", message); + OffscreenUi::warning("", "You can not use local files for avatar components."); return false; } @@ -4268,7 +4263,7 @@ bool Application::askToSetAvatarUrl(const QString& url) { case FSTReader::HEAD_AND_BODY_MODEL: ok = QMessageBox::Ok == OffscreenUi::question("Set Avatar", - QString("Would you like to use '") + modelName + "' for your avatar?", + "Would you like to use '" + modelName + "' for your avatar?", QMessageBox::Ok | QMessageBox::Cancel); break; @@ -4441,27 +4436,16 @@ bool Application::askToWearAvatarAttachmentUrl(const QString& url) { void Application::displayAvatarAttachmentWarning(const QString& message) const { auto avatarAttachmentWarningTitle = tr("Avatar Attachment Failure"); - QMessageBox msgBox; - msgBox.setIcon(QMessageBox::Warning); - msgBox.setWindowTitle(avatarAttachmentWarningTitle); - msgBox.setText(message); - msgBox.exec(); - msgBox.addButton(QMessageBox::Ok); - msgBox.exec(); + OffscreenUi::warning(avatarAttachmentWarningTitle, message); } bool Application::displayAvatarAttachmentConfirmationDialog(const QString& name) const { auto avatarAttachmentConfirmationTitle = tr("Avatar Attachment Confirmation"); - auto avatarAttachmentConfirmationMessage = tr("Would you like to wear '%1' on your avatar?"); - QMessageBox msgBox; - msgBox.setIcon(QMessageBox::Question); - msgBox.setWindowTitle(avatarAttachmentConfirmationTitle); - QPushButton* button = msgBox.addButton(tr("Yes"), QMessageBox::ActionRole); - QString message = avatarAttachmentConfirmationMessage.arg(name); - msgBox.setText(message); - msgBox.addButton(QMessageBox::Cancel); - msgBox.exec(); - if (msgBox.clickedButton() == button) { + auto avatarAttachmentConfirmationMessage = tr("Would you like to wear '%1' on your avatar?").arg(name); + auto reply = OffscreenUi::question(avatarAttachmentConfirmationTitle, + avatarAttachmentConfirmationMessage, + QMessageBox::Ok | QMessageBox::Cancel); + if (QMessageBox::Ok == reply) { return true; } else { return false; @@ -4625,11 +4609,7 @@ void Application::notifyPacketVersionMismatch() { QString message = "The location you are visiting is running an incompatible server version.\n"; message += "Content may not display properly."; - QMessageBox msgBox; - msgBox.setText(message); - msgBox.setStandardButtons(QMessageBox::Ok); - msgBox.setIcon(QMessageBox::Warning); - msgBox.exec(); + OffscreenUi::warning("", message); } } @@ -4638,11 +4618,7 @@ void Application::checkSkeleton() { qCDebug(interfaceapp) << "MyAvatar model has no skeleton"; QString message = "Your selected avatar body has no skeleton.\n\nThe default body will be loaded..."; - QMessageBox msgBox; - msgBox.setText(message); - msgBox.setStandardButtons(QMessageBox::Ok); - msgBox.setIcon(QMessageBox::Warning); - msgBox.exec(); + OffscreenUi::warning("", message); getMyAvatar()->useFullAvatarURL(AvatarData::defaultFullAvatarModelUrl(), DEFAULT_FULL_AVATAR_MODEL_NAME); } else {