History

Change the "Mute" tablet button to "Audio"

David Rowe committed 9 years ago

Commit 77f0fb11 parent 98c1a186 files · +52 −16Browse files

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

Unified · Split

libraries/script-engine/src/TabletScriptingInterface.cpp+2−1
@@ -213,10 +213,11 @@ void TabletProxy::setQmlTabletRoot(QQuickItem* qmlTabletRoot, QObject* qmlOffscr · 212 unmodified lines
213 }213 }
214}214}
215 215
216void TabletProxy::gotoMenuScreen() {216void TabletProxy::gotoMenuScreen(const QString& submenu) {
217 if (_qmlTabletRoot) {217 if (_qmlTabletRoot) {
218 if (_state != State::Menu) {218 if (_state != State::Menu) {
219 removeButtonsFromHomeScreen();219 removeButtonsFromHomeScreen();
220 QMetaObject::invokeMethod(_qmlTabletRoot, "setOption", Q_ARG(const QVariant&, QVariant(submenu)));
220 auto loader = _qmlTabletRoot->findChild<QQuickItem*>("loader");221 auto loader = _qmlTabletRoot->findChild<QQuickItem*>("loader");
221 QObject::connect(loader, SIGNAL(loaded()), this, SLOT(addButtonsToMenuScreen()), Qt::DirectConnection);222 QObject::connect(loader, SIGNAL(loaded()), this, SLOT(addButtonsToMenuScreen()), Qt::DirectConnection);
222 QMetaObject::invokeMethod(_qmlTabletRoot, "loadSource", Q_ARG(const QVariant&, QVariant(VRMENU_SOURCE_URL)));223 QMetaObject::invokeMethod(_qmlTabletRoot, "loadSource", Q_ARG(const QVariant&, QVariant(VRMENU_SOURCE_URL)));