added context menu to tablet

Dante Ruiz committed 9 years ago

Commit 6c51ede1 parent 3fab9019 files · +460 −16Browse files

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

Unified · Split

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

 void TabletProxy::gotoMenuScreen() {
     if (_qmlTabletRoot) {
-        _qmlTabletRoot->setProperty(LOADER_SOURCE_PROPERTY_NAME, TABLET_SOURCE_URL);
+        _qmlTabletRoot->setProperty(LOADER_SOURCE_PROPERTY_NAME, VRMENU_SOURCE_URL);
-        //auto loader = _qmlTabletRoot->findChild<QQuickItem*>("loader");
+        auto loader = _qmlTabletRoot->findChild<QQuickItem*>("loader");
-        //QObject::connect(loader, SIGNAL(loaded()), this, SLOT(addButtonsToMenuScreen()));
+        QObject::connect(loader, SIGNAL(loaded()), this, SLOT(addButtonsToMenuScreen()));
         QMetaObject::invokeMethod(_qmlTabletRoot, "loadSource", Q_ARG(const QVariant&, QVariant(VRMENU_SOURCE_URL)));
     }
 }
 void TabletProxy::updateAudioBar(const double micLevel) {
     auto tablet = getQmlTablet();
     if (!tablet) {
-        qCCritical(scriptengine) << "Could not find tablet in TabletRoot.qml";
+        //qCCritical(scriptengine) << "Could not find tablet in TabletRoot.qml";
     } else {
         QMetaObject::invokeMethod(tablet, "setMicLevel", Qt::AutoConnection, Q_ARG(QVariant, QVariant(micLevel)));
     }
         return;
     }
-    QQuickItem* VrMenu = loader->findChild<QQuickItem*>("VrMenu");
+    QQuickItem* VrMenu = loader->findChild<QQuickItem*>("tabletMenu");
     if (!VrMenu) {
         qDebug() << "----------> could not find vr menu";
         return;
     }
-    QString name = "Menu";
+    auto offscreenUi = DependencyManager::get<OffscreenUi>();
-    QVariant returnedValue;
+    QObject* menu = offscreenUi->getRootMenu();
+    QMetaObject::invokeMethod(VrMenu, "setRootMenu", Qt::AutoConnection, Q_ARG(QVariant, QVariant::fromValue(menu)));
 }
 void TabletProxy::removeButtonsFromHomeScreen() {