Showing the changes to libraries/script-engine/src/TabletScriptingInterface.cpp (1 of 2 files). Show all
Unified · Split
| @@ -58,7 +58,7 @@ void TabletScriptingInterface::setQmlTabletRoot(QString tabletId, QQuickItem* qm · 57 unmodified lines | ||
| 58 | 58 | static const char* TABLET_SOURCE_URL = "Tablet.qml"; |
| 59 | 59 | static const char* WEB_VIEW_SOURCE_URL = "TabletWebView.qml"; |
| 60 | 60 | static const char* LOADER_SOURCE_PROPERTY_NAME = "LoaderSource"; |
| 61 | −static const char* VRMENU_SOURCE_URL = "VrMenuView.qml"; | |
| 61 | +static const char* VRMENU_SOURCE_URL = "TabletMenu.qml"; | |
| 62 | 62 | |
| 63 | 63 | TabletProxy::TabletProxy(QString name) : _name(name) { |
| 64 | 64 | ; |
| @@ -101,9 +101,8 @@ void TabletProxy::setQmlTabletRoot(QQuickItem* qmlTabletRoot, QObject* qmlOffscr · 36 unmodified lines | ||
| 101 | 101 | void TabletProxy::gotoMenuScreen() { |
| 102 | 102 | if (_qmlTabletRoot) { |
| 103 | 103 | _qmlTabletRoot->setProperty(LOADER_SOURCE_PROPERTY_NAME, TABLET_SOURCE_URL); |
| 104 | − auto loader = _qmlTabletRoot->findChild<QQuickItem*>("loader"); | |
| 105 | − auto offscreenUi = DependencyManager::get<OffscreenUi>(); | |
| 106 | − auto rootMenu = offscreenUi->getRootMenu(); | |
| 104 | + //auto loader = _qmlTabletRoot->findChild<QQuickItem*>("loader"); | |
| 105 | + //QObject::connect(loader, SIGNAL(loaded()), this, SLOT(addButtonsToMenuScreen())); | |
| 107 | 106 | QMetaObject::invokeMethod(_qmlTabletRoot, "loadSource", Q_ARG(const QVariant&, QVariant(VRMENU_SOURCE_URL))); |
| 108 | 107 | } |
| 109 | 108 | } |
| @@ -200,7 +199,23 @@ void TabletProxy::addButtonsToHomeScreen() { · 90 unmodified lines | ||
| 200 | 199 | } |
| 201 | 200 | |
| 202 | 201 | void TabletProxy::addButtonsToMenuScreen() { |
| 203 | − | |
| 202 | + if (!_qmlTabletRoot) { | |
| 203 | + return; | |
| 204 | + } | |
| 205 | + | |
| 206 | + auto loader = _qmlTabletRoot->findChild<QQuickItem*>("loader"); | |
| 207 | + if (!loader) { | |
| 208 | + return; | |
| 209 | + } | |
| 210 | + | |
| 211 | + QQuickItem* VrMenu = loader->findChild<QQuickItem*>("VrMenu"); | |
| 212 | + if (!VrMenu) { | |
| 213 | + qDebug() << "----------> could not find vr menu"; | |
| 214 | + return; | |
| 215 | + } | |
| 216 | + | |
| 217 | + QString name = "Menu"; | |
| 218 | + QVariant returnedValue; | |
| 204 | 219 | } |
| 205 | 220 | |
| 206 | 221 | void TabletProxy::removeButtonsFromHomeScreen() { |