Tablet can switch to a web url.

Help button has been updated to switch to the help.html. It doesn't look good because the content was authored expecting landscape window, not portrait. The API is by no means final. But it exposes two methods to JS. * Tablet.gotoHomeScreen() - Used to forcefully go back to the home tablet "springboard", eventually this will hooked up to the tablet button. * Tablet.gotoWebScreen(url) - Causes the tablet to switch from the home "springboard" and load a web url. tabletTest.js and help.js have been updated to use this functionality.

Anthony J. Thibault committed 9 years ago

Commit a791ddc1 parent 856791c7 files · +144 −28Browse files

Showing the changes to libraries/script-engine/src/TabletScriptingInterface.cpp (1 of 7 files). Show all

Unified · Split

libraries/script-engine/src/TabletScriptingInterface.cpp+64−15

     }
 }
-void TabletScriptingInterface::setQmlTablet(QString tabletId, QQuickItem* qmlTablet) {
+void TabletScriptingInterface::setQmlTabletRoot(QString tabletId, QQuickItem* qmlTabletRoot) {
     TabletProxy* tablet = qobject_cast<TabletProxy*>(getTablet(tabletId));
     if (tablet) {
-        tablet->setQmlTablet(qmlTablet);
+        tablet->setQmlTabletRoot(qmlTabletRoot);
     } else {
         qWarning() << "TabletScriptingInterface::setupTablet() bad tablet object";
     }
 // TabletProxy
 //
+static const char* TABLET_SOURCE_URL = "Tablet.qml";
+static const char* WEB_VIEW_SOURCE_URL = "TabletWebView.qml";
+static const char* LOADER_SOURCE_PROPERTY_NAME = "loaderSource";
 TabletProxy::TabletProxy(QString name) : _name(name) {
     ;
 }
     buttonProxy->setQmlButton(qobject_cast<QQuickItem*>(qmlButton));
 }
-void TabletProxy::setQmlTablet(QQuickItem* qmlTablet) {
+void TabletProxy::setQmlTabletRoot(QQuickItem* qmlTabletRoot) {
     std::lock_guard<std::mutex> guard(_mutex);
-    if (qmlTablet) {
+    _qmlTabletRoot = qmlTabletRoot;
-        _qmlTablet = qmlTablet;
+    if (_qmlTabletRoot) {
-        for (auto& buttonProxy : _tabletButtonProxies) {
+        gotoHomeScreen();
-            addButtonProxyToQmlTablet(_qmlTablet, buttonProxy.data());
-        }
     } else {
-        for (auto& buttonProxy : _tabletButtonProxies) {
+        removeButtonsFromHomeScreen();
-            buttonProxy->setQmlButton(nullptr);
+    }
+}
+void TabletProxy::gotoHomeScreen() {
+    if (_qmlTabletRoot) {
+        QString tabletSource = _qmlTabletRoot->property(LOADER_SOURCE_PROPERTY_NAME).toString();
+        if (tabletSource != TABLET_SOURCE_URL) {
+            QMetaObject::invokeMethod(_qmlTabletRoot, "loadSource", Q_ARG(const QVariant&, QVariant(TABLET_SOURCE_URL)));
+            addButtonsToHomeScreen();
+        }
+    }
+}
+void TabletProxy::gotoWebScreen(const QString& url) {
+    if (_qmlTabletRoot) {
+        removeButtonsFromHomeScreen();
+        QString tabletSource = _qmlTabletRoot->property(LOADER_SOURCE_PROPERTY_NAME).toString();
+        if (tabletSource != WEB_VIEW_SOURCE_URL) {
+            QMetaObject::invokeMethod(_qmlTabletRoot, "loadSource", Q_ARG(const QVariant&, QVariant(WEB_VIEW_SOURCE_URL)));
+            // TABLET_UI_HACK: TODO: addEventBridge to tablet....
         }
-        _qmlTablet = nullptr;
+        QMetaObject::invokeMethod(_qmlTabletRoot, "loadWebUrl", Q_ARG(const QVariant&, QVariant(url)));
     }
 }
     auto tabletButtonProxy = QSharedPointer<TabletButtonProxy>(new TabletButtonProxy(properties.toMap()));
     std::lock_guard<std::mutex> guard(_mutex);
     _tabletButtonProxies.push_back(tabletButtonProxy);
-    if (_qmlTablet) {
+    if (_qmlTabletRoot) {
-        addButtonProxyToQmlTablet(_qmlTablet, tabletButtonProxy.data());
+        addButtonProxyToQmlTablet(_qmlTabletRoot, tabletButtonProxy.data());
     }
     return tabletButtonProxy.data();
 }
     std::lock_guard<std::mutex> guard(_mutex);
     auto iter = std::find(_tabletButtonProxies.begin(), _tabletButtonProxies.end(), tabletButtonProxy);
     if (iter != _tabletButtonProxies.end()) {
-        if (_qmlTablet) {
+        if (_qmlTabletRoot) {
             (*iter)->setQmlButton(nullptr);
-            QMetaObject::invokeMethod(_qmlTablet, "removeButtonProxy", Qt::AutoConnection, Q_ARG(QVariant, (*iter)->getProperties()));
+            QMetaObject::invokeMethod(_qmlTabletRoot, "removeButtonProxy", Qt::AutoConnection, Q_ARG(QVariant, (*iter)->getProperties()));
         }
         _tabletButtonProxies.erase(iter);
     } else {
     }
 }
+void TabletProxy::addButtonsToHomeScreen() {
+    if (!_qmlTabletRoot) {
+        return;
+    }
+    auto loader = _qmlTabletRoot->findChild<QQuickItem*>("loader");
+    if (!loader) {
+        return;
+    }
+    auto tablet = loader->findChild<QQuickItem*>("tablet");
+    if (!tablet) {
+        return;
+    }
+    auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
+    for (auto& buttonProxy : _tabletButtonProxies) {
+        addButtonProxyToQmlTablet(tablet, buttonProxy.data());
+    }
+}
+void TabletProxy::removeButtonsFromHomeScreen() {
+    auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
+    for (auto& buttonProxy : _tabletButtonProxies) {
+        buttonProxy->setQmlButton(nullptr);
+    }
+}
 //
 // TabletButtonProxy
 //