move alert and confirm to use offscreen ui

Brad Hefta-Gaub committed 10 years ago

Commit 2b5956a1 parent 26f00301 file · +12 −5Browse files

Showing the changes to interface/src/scripting/WindowScriptingInterface.cpp (1 of 1 file). Show all

Unified · Split

 #include "DomainHandler.h"
 #include "MainWindow.h"
 #include "Menu.h"
+#include "OffscreenUi.h"
 #include "ui/ModelsBrowser.h"
 #include "WindowScriptingInterface.h"
     return retVal;
 }
 /// Display an alert box
 /// \param const QString& message message to display
 /// \return QScriptValue::UndefinedValue
 QScriptValue WindowScriptingInterface::showAlert(const QString& message) {
-    QMessageBox::warning(qApp->getWindow(), "", message);
+    OffscreenUi::warning("", message);
     return QScriptValue::UndefinedValue;
 }
 /// \param const QString& message message to display
 /// \return QScriptValue `true` if 'Yes' was clicked, `false` otherwise
 QScriptValue WindowScriptingInterface::showConfirm(const QString& message) {
-    QMessageBox::StandardButton response = QMessageBox::question(qApp->getWindow(), "", message);
+    bool confirm = false;
-    return QScriptValue(response == QMessageBox::Yes);
+    bool waiting = true;
+    OffscreenUi::question("", message, [&](QMessageBox::StandardButton response){
+        confirm = (response == QMessageBox::Yes);
+        waiting = false;
+    });
+    while (waiting) {
+        QCoreApplication::processEvents();
+    }
+    return QScriptValue(confirm);
 }
 void WindowScriptingInterface::chooseDirectory() {
     if (promptDialog.exec() == QDialog::Accepted) {
         return QScriptValue(promptDialog.textValue());
     }
     return QScriptValue::NullValue;
 }