migrate callers of QMessageBox::question() to OffscreenUi::question()

interface/src/Application.cpp

@@ -4373,7 +4373,7 @@ bool Application::askToSetAvatarUrl(const QString& url) {
 bool Application::askToLoadScript(const QString& scriptFilenameOrURL) {
     QMessageBox::StandardButton reply;
     QString message = "Would you like to run this script:\n" + scriptFilenameOrURL;
-    reply = QMessageBox::question(getWindow(), "Run Script", message, QMessageBox::Yes|QMessageBox::No);
+    reply = OffscreenUi::question(getWindow(), "Run Script", message, QMessageBox::Yes | QMessageBox::No);
 
     if (reply == QMessageBox::Yes) {
         qCDebug(interfaceapp) << "Chose to run the script: " << scriptFilenameOrURL;

interface/src/assets/ATPAssetMigrator.cpp

@@ -25,6 +25,7 @@
 #include <AssetUpload.h>
 #include <ResourceManager.h>
 
+#include "OffscreenUi.h"
 #include "../ui/AssetUploadDialogFactory.h"
 
 Q_DECLARE_LOGGING_CATEGORY(asset_migrator);
@@ -52,7 +53,7 @@ void ATPAssetMigrator::loadEntityServerFile() {
             " continue?\n\nMake sure you are connected to the right domain."
         };
         
-        auto button = QMessageBox::question(_dialogParent, MESSAGE_BOX_TITLE, MIGRATION_CONFIRMATION_TEXT,
+        auto button = OffscreenUi::question(_dialogParent, MESSAGE_BOX_TITLE, MIGRATION_CONFIRMATION_TEXT,
                                             QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
         
         if (button == QMessageBox::No) {
@@ -212,7 +213,7 @@ bool ATPAssetMigrator::wantsToMigrateResource(const QUrl& url) {
             "Select \"No\" to be prompted for each discovered asset."
         };
         
-        auto button = QMessageBox::question(_dialogParent, MESSAGE_BOX_TITLE, COMPLETE_MIGRATION_TEXT,
+        auto button = OffscreenUi::question(_dialogParent, MESSAGE_BOX_TITLE, COMPLETE_MIGRATION_TEXT,
                                             QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
                               
         if (button == QMessageBox::Yes) {
@@ -226,7 +227,7 @@ bool ATPAssetMigrator::wantsToMigrateResource(const QUrl& url) {
         return true;
     } else {
         // present a dialog asking the user if they want to migrate this specific resource
-        auto button = QMessageBox::question(_dialogParent, MESSAGE_BOX_TITLE,
+        auto button = OffscreenUi::question(_dialogParent, MESSAGE_BOX_TITLE,
                                             "Would you like to migrate the following resource?\n" + url.toString(),
                                             QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
         return button == QMessageBox::Yes;

interface/src/scripting/WindowScriptingInterface.cpp

@@ -167,14 +167,9 @@ QScriptValue WindowScriptingInterface::showAlert(const QString& message) {
 /// \return QScriptValue `true` if 'Yes' was clicked, `false` otherwise
 QScriptValue WindowScriptingInterface::showConfirm(const QString& message) {
     bool confirm = false;
-    bool waiting = true;
     OffscreenUi::question("", message, [&](QMessageBox::StandardButton response){
         confirm = (response == QMessageBox::Yes);
-        waiting = false;
     });
-    while (waiting) {
-        QCoreApplication::processEvents();
-    }
     return QScriptValue(confirm);
 }
 

interface/src/ui/DiskCacheEditor.cpp

@@ -22,6 +22,7 @@
 #include <NetworkAccessManager.h>
 
 #include "DiskCacheEditor.h"
+#include "OffscreenUi.h"
 
 DiskCacheEditor::DiskCacheEditor(QWidget* parent) : QObject(parent) {
     
@@ -136,7 +137,7 @@ void DiskCacheEditor::refresh() {
 
 void DiskCacheEditor::clear() {
     QMessageBox::StandardButton buttonClicked =
-                        QMessageBox::question(_dialog, "Clearing disk cache",
+                                    OffscreenUi::question(_dialog, "Clearing disk cache",
                                               "You are about to erase all the content of the disk cache,"
                                               "are you sure you want to do that?");
     if (buttonClicked == QMessageBox::Yes) {

libraries/ui/src/OffscreenUi.cpp

@@ -174,12 +174,37 @@ void OffscreenUi::information(const QString& title, const QString& text,
 }
 
 void OffscreenUi::question(const QString& title, const QString& text,
-    ButtonCallback callback,
+                            ButtonCallback callback,
-    QMessageBox::StandardButtons buttons) {
+                            QMessageBox::StandardButtons buttons) {
-    messageBox(title, text, callback,
+
-            static_cast<QMessageBox::Icon>(MessageDialog::Question), buttons);
+    bool waiting = true;
+    ButtonCallback blockingCallback = [&](QMessageBox::StandardButton response){
+        callback(response); // call the actual callback
+        waiting = false;
+    };
+
+    messageBox(title, text, blockingCallback,
+        static_cast<QMessageBox::Icon>(MessageDialog::Question), buttons);
+
+    // block until the call back has been called   
+    while (waiting) {
+        QCoreApplication::processEvents();
+    }
 }
 
+QMessageBox::StandardButton OffscreenUi::question(void* ignored, const QString& title, const QString& text,
+        QMessageBox::StandardButtons buttons, QMessageBox::StandardButton defaultButton) {
+
+    QMessageBox::StandardButton result = defaultButton;
+
+    OffscreenUi::question(title, text, [&](QMessageBox::StandardButton response){
+        result = response;
+    }, buttons);
+
+    return result;
+}
+
+
 void OffscreenUi::warning(const QString& title, const QString& text,
     ButtonCallback callback,
     QMessageBox::StandardButtons buttons) {

libraries/ui/src/OffscreenUi.h

@@ -45,10 +45,16 @@ public:
         ButtonCallback callback = NO_OP_CALLBACK,
         QMessageBox::StandardButtons buttons = QMessageBox::Ok);
 
+    /// Note: will block until user clicks a response to the question
     static void question(const QString& title, const QString& text,
         ButtonCallback callback = NO_OP_CALLBACK,
         QMessageBox::StandardButtons buttons = QMessageBox::StandardButtons(QMessageBox::Yes | QMessageBox::No));
 
+    /// Same design as QMessageBox::question(), will block, returns result
+    static QMessageBox::StandardButton question(void* ignored, const QString& title, const QString& text, 
+        QMessageBox::StandardButtons buttons = QMessageBox::StandardButtons(QMessageBox::Yes | QMessageBox::No), 
+        QMessageBox::StandardButton defaultButton = QMessageBox::NoButton);
+
     static void warning(const QString& title, const QString& text,
         ButtonCallback callback = NO_OP_CALLBACK,
         QMessageBox::StandardButtons buttons = QMessageBox::Ok);