Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-23 13:39:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bugfixes and Settings button

Browse source
This commit is contained in:
Zach Fox 2018-05-15 13:16:42 -07:00
parent bccaa2dbe5
commit 9632498422
2 changed files with 126 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
unpublishedScripts/marketplace/spectator-camera/SpectatorCamera.qml
View file

@ -90,7 +90,7 @@ Rectangle {
} }
} }
onCheckedChanged: { onClicked: {
sendToScript({method: (checked ? 'spectatorCameraOn' : 'spectatorCameraOff')}); sendToScript({method: (checked ? 'spectatorCameraOn' : 'spectatorCameraOff')});
sendToScript({method: 'updateCameravFoV', vFoV: fieldOfViewSlider.value}); sendToScript({method: 'updateCameravFoV', vFoV: fieldOfViewSlider.value});
} }
@ -172,7 +172,7 @@ Rectangle {
anchors.top: titleBarContainer.bottom; anchors.top: titleBarContainer.bottom;
anchors.left: parent.left; anchors.left: parent.left;
anchors.right: parent.right; anchors.right: parent.right;
anchors.bottom: parent.bottom; anchors.bottom: footer.top;
// Instructions or Preview // Instructions or Preview
Rectangle { Rectangle {
@ -289,10 +289,10 @@ Rectangle {
HifiControlsUit.RadioButton { HifiControlsUit.RadioButton {
id: showHmdPreview; id: showHmdPreview;
text: "HMD"; text: "VR Preview";
anchors.left: showCameraView.right; anchors.left: showCameraView.right;
anchors.leftMargin: 20; anchors.leftMargin: 10;
width: 70; width: 125;
anchors.verticalCenter: parent.verticalCenter; anchors.verticalCenter: parent.verticalCenter;
colorScheme: hifi.colorSchemes.dark; colorScheme: hifi.colorSchemes.dark;
onClicked: { onClicked: {
@ -477,7 +477,7 @@ Rectangle {
anchors.left: parent.left; anchors.left: parent.left;
anchors.right: parent.right; anchors.right: parent.right;
anchors.bottom: parent.bottom; anchors.bottom: parent.bottom;
anchors.bottomMargin: 40; anchors.bottomMargin: 12;
// "Spectator" app description text // "Spectator" app description text
HifiStylesUit.RalewayRegular { HifiStylesUit.RalewayRegular {
@ -546,6 +546,60 @@ Rectangle {
} }
} }
} }
Item {
id: footer;
anchors.bottom: parent.bottom;
anchors.left: parent.left;
anchors.right: parent.right;
height: 35;
// Separator
HifiControlsUit.Separator {
anchors.left: parent.left;
anchors.right: parent.right;
anchors.top: parent.top;
}
Item {
id: settingsButtonContainer;
anchors.top: parent.top;
anchors.left: parent.left;
anchors.bottom: parent.bottom;
width: childrenRect.width;
HifiStylesUit.HiFiGlyphs {
id: snapshotLocationGlyph;
text: hifi.glyphs.settings;
size: 30;
color: hifi.colors.lightGrayText;
anchors.top: parent.top;
anchors.bottom: parent.bottom;
anchors.left: parent.left;
anchors.leftMargin: -1;
verticalAlignment: Text.AlignVCenter;
}
HifiStylesUit.RalewayLight {
id: snapshotLocationHeaderText;
text: "Change Snapshot Location";
anchors.top: parent.top;
anchors.bottom: parent.bottom;
anchors.left: snapshotLocationGlyph.right;
anchors.leftMargin: -3;
size: 18;
width: paintedWidth;
color: hifi.colors.lightGrayText;
verticalAlignment: Text.AlignVCenter;
}
MouseArea {
anchors.fill: parent;
onClicked: {
sendToScript({method: 'openSettings'});
}
}
}
}
// //
// SPECTATOR CONTROLS END // SPECTATOR CONTROLS END
// //

8
unpublishedScripts/marketplace/spectator-camera/spectatorCamera.js
View file

@ -577,6 +577,14 @@
case 'takeSecondaryCamera360Snapshot': case 'takeSecondaryCamera360Snapshot':
maybeTake360Snapshot(); maybeTake360Snapshot();
break; break;
case 'openSettings':
if ((HMD.active && Settings.getValue("hmdTabletBecomesToolbar", false))
|| (!HMD.active && Settings.getValue("desktopTabletBecomesToolbar", true))) {
Desktop.show("hifi/dialogs/GeneralPreferencesDialog.qml", "GeneralPreferencesDialog");
} else {
tablet.loadQMLOnTop("hifi/tablet/TabletGeneralPreferences.qml");
}
break;
default: default:
print('Unrecognized message from SpectatorCamera.qml:', JSON.stringify(message)); print('Unrecognized message from SpectatorCamera.qml:', JSON.stringify(message));
} }