History

first commit

Dante Ruiz committed 9 years ago

Commit c99f8971 parent 28c8d523 files · +21 −1Browse files

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

Unified · Split

libraries/script-engine/src/TabletScriptingInterface.cpp+17−0
@@ -14,6 +14,8 @@ · 13 unmodified lines
14#include <PathUtils.h>14#include <PathUtils.h>
15#include <RegisteredMetaTypes.h>15#include <RegisteredMetaTypes.h>
16#include "ScriptEngineLogging.h"16#include "ScriptEngineLogging.h"
17#include "DependencyManager.h"
18#include "OffscreenUi.h"
17 19
18TabletScriptingInterface::TabletScriptingInterface() {20TabletScriptingInterface::TabletScriptingInterface() {
19 qmlRegisterType<SoundEffect>("Hifi", 1, 0, "SoundEffect");21 qmlRegisterType<SoundEffect>("Hifi", 1, 0, "SoundEffect");
@@ -56,6 +58,7 @@ void TabletScriptingInterface::setQmlTabletRoot(QString tabletId, QQuickItem* qm · 36 unmodified lines
56static const char* TABLET_SOURCE_URL = "Tablet.qml";58static const char* TABLET_SOURCE_URL = "Tablet.qml";
57static const char* WEB_VIEW_SOURCE_URL = "TabletWebView.qml";59static const char* WEB_VIEW_SOURCE_URL = "TabletWebView.qml";
58static const char* LOADER_SOURCE_PROPERTY_NAME = "LoaderSource";60static const char* LOADER_SOURCE_PROPERTY_NAME = "LoaderSource";
61static const char* VRMENU_SOURCE_URL = "VrMenuView.qml";
59 62
60TabletProxy::TabletProxy(QString name) : _name(name) {63TabletProxy::TabletProxy(QString name) : _name(name) {
61 ;64 ;
@@ -95,6 +98,16 @@ void TabletProxy::setQmlTabletRoot(QQuickItem* qmlTabletRoot, QObject* qmlOffscr · 33 unmodified lines
95 }98 }
96}99}
97 100
101void TabletProxy::gotoMenuScreen() {
102 if (_qmlTabletRoot) {
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();
107 QMetaObject::invokeMethod(_qmlTabletRoot, "loadSource", Q_ARG(const QVariant&, QVariant(VRMENU_SOURCE_URL)));
108 }
109}
110
98void TabletProxy::gotoHomeScreen() {111void TabletProxy::gotoHomeScreen() {
99 if (_qmlTabletRoot) {112 if (_qmlTabletRoot) {
100 QString tabletSource = _qmlTabletRoot->property(LOADER_SOURCE_PROPERTY_NAME).toString();113 QString tabletSource = _qmlTabletRoot->property(LOADER_SOURCE_PROPERTY_NAME).toString();
@@ -186,6 +199,10 @@ void TabletProxy::addButtonsToHomeScreen() { · 85 unmodified lines
186 QObject::disconnect(loader, SIGNAL(loaded()), this, SLOT(addButtonsToHomeScreen()));199 QObject::disconnect(loader, SIGNAL(loaded()), this, SLOT(addButtonsToHomeScreen()));
187}200}
188 201
202void TabletProxy::addButtonsToMenuScreen() {
203
204}
205
189void TabletProxy::removeButtonsFromHomeScreen() {206void TabletProxy::removeButtonsFromHomeScreen() {
190 auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();207 auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
191 for (auto& buttonProxy : _tabletButtonProxies) {208 for (auto& buttonProxy : _tabletButtonProxies) {