Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 22:47:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed bring menu dialogs in tablet

Browse source
This commit is contained in:
Dante Ruiz 2017-03-10 23:21:29 +00:00
parent 78da936344
commit 8a973dae3c
7 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/resources/qml/hifi/dialogs/TabletRunningScripts.qml
View file

@ -20,6 +20,7 @@ import "../../windows"
Rectangle { Rectangle {
id: root id: root
objectName: "RunningScripts" objectName: "RunningScripts"
property var title: "Running Scripts"
HifiConstants { id: hifi } HifiConstants { id: hifi }
signal sendToScript(var message); signal sendToScript(var message);
property var eventBridge; property var eventBridge;

2
interface/resources/qml/hifi/tablet/TabletAudioPreferences.qml
View file

@ -19,7 +19,7 @@ StackView {
id: profileRoot id: profileRoot
initialItem: root initialItem: root
objectName: "stack" objectName: "stack"
property var title: "Audio Preferences"
property var eventBridge; property var eventBridge;
signal sendToScript(var message); signal sendToScript(var message);

2
interface/resources/qml/hifi/tablet/TabletAvatarPreferences.qml
View file

@ -19,7 +19,7 @@ StackView {
id: profileRoot id: profileRoot
initialItem: root initialItem: root
objectName: "stack" objectName: "stack"
property var title: "Avatar Preferences"
property var eventBridge; property var eventBridge;
signal sendToScript(var message); signal sendToScript(var message);

5
interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml
View file

@ -19,10 +19,11 @@ StackView {
id: profileRoot id: profileRoot
initialItem: root initialItem: root
objectName: "stack" objectName: "stack"
property var title: "General Prefernces"
property var eventBridge; property var eventBridge;
signal sendToScript(var message); signal sendToScript(var message);
function pushSource(path) { function pushSource(path) {
editRoot.push(Qt.reslovedUrl(path)); editRoot.push(Qt.reslovedUrl(path));
} }

2
interface/resources/qml/hifi/tablet/TabletMenuStack.qml
View file

@ -51,7 +51,7 @@ Item {
d.push(Qt.resolvedUrl(path)); d.push(Qt.resolvedUrl(path));
d.currentItem.eventBridge = tabletMenu.eventBridge d.currentItem.eventBridge = tabletMenu.eventBridge
d.currentItem.sendToScript.connect(tabletMenu.sendToScript); d.currentItem.sendToScript.connect(tabletMenu.sendToScript);
breadcrumbText.text = d.currentItem.objectName; breadcrumbText.text = d.currentItem.title;
} }
function popSource() { function popSource() {

2
interface/resources/qml/hifi/tablet/TabletNetworkingPreferences.qml
View file

@ -19,7 +19,7 @@ StackView {
id: profileRoot id: profileRoot
initialItem: root initialItem: root
objectName: "stack" objectName: "stack"
property var title: "Network Preferences"
property var eventBridge; property var eventBridge;
signal sendToScript(var message); signal sendToScript(var message);

2
interface/src/Application.cpp
View file

@ -5876,7 +5876,7 @@ void Application::showDialog(const QString& desktopURL, const QString& tabletURL
if (tablet->getToolbarMode() || (!hmd->getShouldShowTablet() && !isHMDMode())) { if (tablet->getToolbarMode() || (!hmd->getShouldShowTablet() && !isHMDMode())) {
DependencyManager::get<OffscreenUi>()->show(desktopURL, name); DependencyManager::get<OffscreenUi>()->show(desktopURL, name);
} else { } else {
tablet->loadQMLSource(tabletURL); tablet->pushOntoStack(tabletURL);
} }
} }