Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 04:06:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

UX improvements

Browse source
This commit is contained in:
Zach Fox 2018-05-15 14:39:07 -07:00
parent 9632498422
commit d904bcd1cd
2 changed files with 37 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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: footer.top; anchors.bottom: parent.bottom;
// Instructions or Preview // Instructions or Preview
Rectangle { Rectangle {
@ -316,7 +316,7 @@ Rectangle {
id: takeSnapshotButton; id: takeSnapshotButton;
enabled: masterSwitch.checked; enabled: masterSwitch.checked;
text: "SNAP PICTURE"; text: "SNAP PICTURE";
colorScheme: hifi.colorSchemes.dark; colorScheme: hifi.colorSchemes.light;
color: hifi.buttons.white; color: hifi.buttons.white;
anchors.bottom: parent.bottom; anchors.bottom: parent.bottom;
anchors.bottomMargin: 8; anchors.bottomMargin: 8;
@ -332,7 +332,7 @@ Rectangle {
id: take360SnapshotButton; id: take360SnapshotButton;
enabled: masterSwitch.checked; enabled: masterSwitch.checked;
text: "SNAP 360"; text: "SNAP 360";
colorScheme: hifi.colorSchemes.dark; colorScheme: hifi.colorSchemes.light;
color: hifi.buttons.white; color: hifi.buttons.white;
anchors.bottom: parent.bottom; anchors.bottom: parent.bottom;
anchors.bottomMargin: 8; anchors.bottomMargin: 8;
@ -469,6 +469,20 @@ Rectangle {
} }
} }
HifiControlsUit.Button {
text: "Change Snapshot Location";
colorScheme: hifi.colorSchemes.dark;
color: hifi.buttons.none;
anchors.bottom: spectatorDescriptionContainer.top;
anchors.bottomMargin: 16;
anchors.left: parent.left;
anchors.right: parent.right;
height: 35;
onClicked: {
sendToScript({method: 'openSettings'});
}
}
Item { Item {
id: spectatorDescriptionContainer; id: spectatorDescriptionContainer;
// Size // Size
@ -477,7 +491,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: 12; anchors.bottomMargin: 20;
// "Spectator" app description text // "Spectator" app description text
HifiStylesUit.RalewayRegular { HifiStylesUit.RalewayRegular {
@ -546,60 +560,6 @@ 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
// //

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

@ -506,6 +506,23 @@
} }
} }
function updateSpectatorCameraQML() {
sendToQml({ method: 'updateSpectatorCameraCheckbox', params: !!camera });
sendToQml({ method: 'updateMonitorShowsSwitch', params: monitorShowsCameraView });
if (!switchViewControllerMapping || !takeSnapshotControllerMapping) {
registerButtonMappings();
} else {
sendToQml({
method: 'updateControllerMappingCheckbox',
switchViewSetting: switchViewFromController,
takeSnapshotSetting: takeSnapshotFromController,
controller: controllerType
});
}
Menu.setIsOptionChecked("Disable Preview", false);
Menu.setIsOptionChecked("Mono Preview", true);
}
// Function Name: onTabletScreenChanged() // Function Name: onTabletScreenChanged()
// //
// Description: // Description:
@ -520,20 +537,7 @@
} }
if (onSpectatorCameraScreen) { if (onSpectatorCameraScreen) {
sendToQml({ method: 'updateSpectatorCameraCheckbox', params: !!camera }); updateSpectatorCameraQML();
sendToQml({ method: 'updateMonitorShowsSwitch', params: monitorShowsCameraView });
if (!switchViewControllerMapping) {
registerButtonMappings();
} else {
sendToQml({
method: 'updateControllerMappingCheckbox',
switchViewSetting: switchViewFromController,
takeSnapshotSetting: takeSnapshotFromController,
controller: controllerType
});
}
Menu.setIsOptionChecked("Disable Preview", false);
Menu.setIsOptionChecked("Mono Preview", true);
} }
} }
@ -582,7 +586,7 @@
|| (!HMD.active && Settings.getValue("desktopTabletBecomesToolbar", true))) { || (!HMD.active && Settings.getValue("desktopTabletBecomesToolbar", true))) {
Desktop.show("hifi/dialogs/GeneralPreferencesDialog.qml", "GeneralPreferencesDialog"); Desktop.show("hifi/dialogs/GeneralPreferencesDialog.qml", "GeneralPreferencesDialog");
} else { } else {
tablet.loadQMLOnTop("hifi/tablet/TabletGeneralPreferences.qml"); tablet.pushOntoStack("hifi/tablet/TabletGeneralPreferences.qml");
} }
break; break;
default: default: