Merge pull request #6812 from jherico/running_scripts

Running scripts in QML

Brad Hefta-Gaub committed 10 years ago

Commit cd167e42 parents 90f4ca7 e7bfcba16 files · +587 −858Browse files

Showing the changes to interface/src/Application.cpp (1 of 16 files). Show all

Unified · Split

     });
     connect(this, &Application::applicationStateChanged, this, &Application::activeChanged);
-    // FIXME -- NOTE: This will call ProcessEvents() which can cause authentication signals to fire, which
-    // if not logged in can cause the login dialog to appear. As currently implemented, the login requires
-    // the offscreen UI to render, so this needs to be well after OffscreenUi is available
-    _runningScriptsWidget = new RunningScriptsWidget(_window);
     qCDebug(interfaceapp, "Startup time: %4.2f seconds.", (double)startupTimer.elapsed() / 1000.0);
 }
     offscreenUi->create(_offscreenContext->getContext());
     offscreenUi->setProxyWindow(_window->windowHandle());
     offscreenUi->setBaseUrl(QUrl::fromLocalFile(PathUtils::resourcesPath() + "/qml/"));
-    offscreenUi->load("Root.qml");
+    // OffscreenUi is a subclass of OffscreenQmlSurface specifically designed to
+    // support the window management and scripting proxies for VR use
+    offscreenUi->createDesktop();
     // FIXME either expose so that dialogs can set this themselves or
     // do better detection in the offscreen UI of what has focus
     offscreenUi->setNavigationFocused(false);
         qApp->quit();
     });
+    // For some reason there is already an "Application" object in the QML context,
+    // though I can't find it. Hence, "ApplicationInterface"
+    rootContext->setContextProperty("ApplicationInterface", this);
     rootContext->setContextProperty("AnimationCache", DependencyManager::get<AnimationCache>().data());
     rootContext->setContextProperty("Audio", &AudioScriptingInterface::getInstance());
     rootContext->setContextProperty("Controller", DependencyManager::get<controller::ScriptingInterface>().data());
 #endif
     rootContext->setContextProperty("Overlays", &_overlays);
-    rootContext->setContextProperty("Desktop", DependencyManager::get<DesktopScriptingInterface>().data());
     rootContext->setContextProperty("Window", DependencyManager::get<WindowScriptingInterface>().data());
     rootContext->setContextProperty("Menu", MenuScriptingInterface::getInstance());
     rootContext->setContextProperty("Stats", Stats::getInstance());
 }
 void Application::toggleRunningScriptsWidget() {
-    if (_runningScriptsWidget->isVisible()) {
+    static const QUrl url("dialogs/RunningScripts.qml");
-        if (_runningScriptsWidget->hasFocus()) {
+    DependencyManager::get<OffscreenUi>()->toggle(url, "RunningScripts");
-            _runningScriptsWidget->hide();
+    //if (_runningScriptsWidget->isVisible()) {
-        } else {
+    //    if (_runningScriptsWidget->hasFocus()) {
-            _runningScriptsWidget->raise();
+    //        _runningScriptsWidget->hide();
-            setActiveWindow(_runningScriptsWidget);
+    //    } else {
-            _runningScriptsWidget->setFocus();
+    //        _runningScriptsWidget->raise();
-        }
+    //        setActiveWindow(_runningScriptsWidget);
-    } else {
+    //        _runningScriptsWidget->setFocus();
-        _runningScriptsWidget->show();
+    //    }
-        _runningScriptsWidget->setFocus();
+    //} else {
-    }
+    //    _runningScriptsWidget->show();
+    //    _runningScriptsWidget->setFocus();
+    //}
 }
 void Application::packageModel() {