Initial version of TabletProxy.toolbarMode boolean

Copies all tablet buttons between the tablet and the system toolbar. To test type this in the console: Tablet.getTablet("com.highfidelity.interface.tablet.system").toolbarMode = true;

Anthony J. Thibault committed 9 years ago

Commit 45039231 parent 5e25d075 files · +185 −8Browse files

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

Unified · Split

libraries/script-engine/src/TabletScriptingInterface.cpp+22−7

         return;
     }
+    _toolbarMode = toolbarMode;
     if (toolbarMode) {
         removeButtonsFromHomeScreen();
         addButtonsToToolbar();
         removeButtonsFromToolbar();
         addButtonsToHomeScreen();
     }
-    _toolbarMode = toolbarMode;
 }
 static void addButtonProxyToQmlTablet(QQuickItem* qmlTablet, TabletButtonProxy* buttonProxy) {
 void TabletProxy::addButtonsToHomeScreen() {
     auto tablet = getQmlTablet();
-    if (!tablet) {
+    if (!tablet || _toolbarMode) {
         return;
     }
 }
 void TabletProxy::removeButtonsFromHomeScreen() {
+    auto tablet = getQmlTablet();
     for (auto& buttonProxy : _tabletButtonProxies) {
+        if (tablet) {
+            QMetaObject::invokeMethod(tablet, "removeButtonProxy", Qt::AutoConnection, Q_ARG(QVariant, buttonProxy->getProperties()));
+        }
         buttonProxy->setQmlButton(nullptr);
     }
 }
 void TabletProxy::addButtonsToToolbar() {
     auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
     QObject* toolbarProxy = tabletScriptingInterface->getSystemToolbarProxy();
+    Qt::ConnectionType connectionType = Qt::AutoConnection;
+    if (QThread::currentThread() != toolbarProxy->thread()) {
+        connectionType = Qt::BlockingQueuedConnection;
+    }
     for (auto& buttonProxy : _tabletButtonProxies) {
         // copy properties from tablet button proxy to toolbar button proxy.
-        Qt::ConnectionType connectionType = Qt::AutoConnection;
-        if (QThread::currentThread() != toolbarProxy->thread()) {
-            connectionType = Qt::BlockingQueuedConnection;
-        }
         QObject* toolbarButtonProxy = nullptr;
         bool hasResult = QMetaObject::invokeMethod(toolbarProxy, "addButton", connectionType, Q_RETURN_ARG(QObject*, toolbarButtonProxy), Q_ARG(QVariant, buttonProxy->getProperties()));
         if (hasResult) {
 }
 void TabletProxy::removeButtonsFromToolbar() {
-    //
+    auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
+    QObject* toolbarProxy = tabletScriptingInterface->getSystemToolbarProxy();
+    for (auto& buttonProxy : _tabletButtonProxies) {
+        // remove button from toolbarProxy
+        QMetaObject::invokeMethod(toolbarProxy, "removeButton", Qt::AutoConnection, Q_ARG(QVariant, buttonProxy->getUuid().toString()));
+        buttonProxy->setToolbarButtonProxy(nullptr);
+    }
 }
 QQuickItem* TabletProxy::getQmlTablet() const {
 //
 const QString UUID_KEY = "uuid";
+const QString OBJECT_NAME_KEY = "objectName";
 const QString STABLE_ORDER_KEY = "stableOrder";
 static int s_stableOrder = 1;
 TabletButtonProxy::TabletButtonProxy(const QVariantMap& properties) : _uuid(QUuid::createUuid()), _stableOrder(++s_stableOrder), _properties(properties) {
     // this is used to uniquely identify this button.
     _properties[UUID_KEY] = _uuid;
+    _properties[OBJECT_NAME_KEY] = _uuid.toString();
     _properties[STABLE_ORDER_KEY] = _stableOrder;
 }