* add delay if interface not found

* adjust initialization behavior

* pushed for debugging reasons for concerned parties

* comment out simple recenter

* remove old style motion, some minor optimizations

* optimize default case check

* optimized default condition

* change manifest install behavior to trigger on desktop mode as well

* add desktop mode binding launch

* add tracker overlay option to utils

* commit to check status

* attempt to fix native LH issues with chaperone when exiting

* add desktop mode toggle and some cleanup

* remove adjust chaperone

* remove clang format from ci, increment version, cleanup

* update circle ci

* fix conversion warning

* add F13-19 to keyboard parser

* add additional logging around failure to initialize

* add unsaved changes

* update version 5.8.1

* fix some collisions in enum declaration

* add controller powers on steamvr, and no HMD to steamvr tab, increment version

* slightly alter drag movement, fix qml issue

* code cleanup

* fix logspam/attempt to delete non existant overlays

* increment version 5.8.3
This commit is contained in:
ykeara
2024-02-21 12:38:00 -06:00
committed by GitHub
parent 54d22a429e
commit 48a7cf4b7f
29 changed files with 541 additions and 505 deletions
+11 -43
View File
@@ -92,37 +92,19 @@ MyStackViewPage {
SettingsTabController.setAutoStartEnabled(checked, false)
}
}
MyToggleButton {
id: desktopModeToggleButton
text: "Desktop Mode (restart required)"
onCheckedChanged: {
OverlayController.setDesktopModeToggle(this.checked, false)
}
}
MyToggleButton {
id: allowExternalEditsToggle
text: "Allow External App Chaperone Edits (Danger)"
onCheckedChanged: {
MoveCenterTabController.setAllowExternalEdits(checked, true)
seatedOldExternalWarning.visible = checked && MoveCenterTabController.oldStyleMotion
}
}
MyToggleButton {
id: oldStyleMotionToggle
text: "Old-Style Motion (per-frame disk writes)"
onCheckedChanged: {
MoveCenterTabController.setOldStyleMotion(checked, true)
seatedOldExternalWarning.visible = MoveCenterTabController.allowExternalEdits && checked
}
}
RowLayout{
MyText {
id: seatedOldExternalWarning
wrapMode: Text.WordWrap
font.pointSize: 20
color: "#FFA500"
text: "WARNING: 'Allow External App Chaperone Edits' + 'Old-Style Motion' + 'Enable Motion Features When in Seated Mode' active together may cause space center misalignment. Load the «Autosaved Profile» in the 'Chaperone' tab to fix."
horizontalAlignment: Text.AlignHCenter
Layout.leftMargin: 20
Layout.rightMargin: 20
Layout.preferredWidth: 900
//Layout.fillWidth: true
}
}
@@ -213,13 +195,6 @@ MyStackViewPage {
OverlayController.setExclusiveInputEnabled(this.checked, true)
}
}
MyToggleButton {
id: spaceAdjustChaperoneToggle
text: "Adjust Chaperone"
onCheckedChanged: {
MoveCenterTabController.adjustChaperone = this.checked
}
}
RowLayout {
Layout.fillWidth: true
@@ -350,7 +325,6 @@ MyStackViewPage {
settingsAutoStartToggle.checked = SettingsTabController.autoStartEnabled
allowExternalEditsToggle.checked = MoveCenterTabController.allowExternalEdits
oldStyleMotionToggle.checked = MoveCenterTabController.oldStyleMotion
universeCenteredRotationToggle.checked = MoveCenterTabController.universeCenteredRotation
disableCrashRecoveryToggle.checked = !OverlayController.crashRecoveryDisabled
@@ -366,10 +340,9 @@ MyStackViewPage {
oculusSdkToggleButton.checked = SettingsTabController.oculusSdkToggle
exclusiveInputToggleButton.checked = OverlayController.exclusiveInputEnabled
autoApplyChaperoneToggleButton.checked = OverlayController.autoApplyChaperoneEnabled
spaceAdjustChaperoneToggle.checked = MoveCenterTabController.adjustChaperone
desktopModeToggleButton.checked = OverlayController.desktopModeToggle
seatedOldExternalWarning.visible = MoveCenterTabController.allowExternalEdits && MoveCenterTabController.oldStyleMotion
reloadChaperoneProfiles()
volumeSlider.value = OverlayController.soundVolume
}
@@ -391,18 +364,10 @@ MyStackViewPage {
target: MoveCenterTabController
onAllowExternalEditsChanged: {
allowExternalEditsToggle.checked = MoveCenterTabController.allowExternalEdits
seatedOldExternalWarning.visible = MoveCenterTabController.allowExternalEdits && MoveCenterTabController.oldStyleMotion
}
onOldStyleMotionChanged: {
oldStyleMotionToggle.checked = MoveCenterTabController.oldStyleMotion
seatedOldExternalWarning.visible = MoveCenterTabController.allowExternalEdits && MoveCenterTabController.oldStyleMotion
}
onUniverseCenteredRotationChanged: {
universeCenteredRotationToggle.checked = MoveCenterTabController.universeCenteredRotation
}
onAdjustChaperoneChanged:{
spaceAdjustChaperoneToggle.checked = MoveCenterTabController.adjustChaperone
}
}
Connections {
@@ -440,6 +405,9 @@ MyStackViewPage {
onSoundVolumeChanged:{
volumeSlider.value = OverlayController.soundVolume
}
onDesktopModeToggleChanged:{
desktopModeToggleButton.checked = OverlayController.desktopModeToggle
}
}
Connections{
target: ChaperoneTabController
@@ -89,13 +89,6 @@ GroupBox {
}
}
RowLayout{
MyPushButton{
text:"Ignore Boundary State"
Layout.preferredWidth: 300
onClicked:{
MoveCenterTabController.setIgnoreChaperoneState();
}
}
Item{
Layout.fillWidth: true
@@ -35,7 +35,7 @@ GroupBox {
MyToggleButton {
id: steamvrPerformanceGraphToggle
text: "Enable Timing Overlay"
Layout.preferredWidth: 400
Layout.preferredWidth: 300
onCheckedChanged: {
SteamVRTabController.setPerformanceGraph(this.checked, false)
}
@@ -44,32 +44,18 @@ GroupBox {
Layout.preferredWidth: 20
text: " "
}
MyToggleButton {
id: steamvrSystemButtonToggle
Layout.fillWidth: true
text: "Enable System Button Binding"
id: steamvrNoHMDToggle
text: "Require HMD"
Layout.preferredWidth: 300
onCheckedChanged: {
SteamVRTabController.setSystemButton(this.checked, false)
}
}
}
RowLayout {
spacing: 16
MyToggleButton {
id: steamvrMultipleDriverToggle
Layout.preferredWidth: 400
text: "Allow Multiple Drivers"
onCheckedChanged: {
SteamVRTabController.setMultipleDriver(this.checked, false)
SteamVRTabController.setNoHMD(this.checked, false)
}
}
MyText {
Layout.preferredWidth: 20
text: " "
}
MyToggleButton {
id: steamvrNoFadeToGridToggle
Layout.fillWidth: true
@@ -79,6 +65,31 @@ GroupBox {
}
}
}
RowLayout {
spacing: 16
MyToggleButton {
id: steamvrMultipleDriverToggle
Layout.preferredWidth: 300
text: "Allow Multiple Drivers"
onCheckedChanged: {
SteamVRTabController.setMultipleDriver(this.checked, false)
}
}
MyText {
Layout.preferredWidth: 20
text: " "
}
MyToggleButton {
id: steamvrSystemButtonToggle
Layout.fillWidth: true
text: "Enable System Button Binding"
onCheckedChanged: {
SteamVRTabController.setSystemButton(this.checked, false)
}
}
}
RowLayout {
spacing: 16
@@ -86,7 +97,7 @@ GroupBox {
MyToggleButton {
id: steamvrNotificationToggle
text: "Disable Notifications"
Layout.preferredWidth: 400
Layout.preferredWidth: 300
onCheckedChanged: {
SteamVRTabController.setDND(this.checked, false)
}
@@ -95,6 +106,14 @@ GroupBox {
Layout.preferredWidth: 20
text: " "
}
MyToggleButton {
id: steamvrControllerPowerToggle
Layout.fillWidth: true
text: "Controller Power Turns on SteamVR"
onCheckedChanged: {
SteamVRTabController.setControllerPower(this.checked, false)
}
}
}
@@ -106,6 +125,8 @@ GroupBox {
steamvrMultipleDriverToggle.checked = SteamVRTabController.multipleDriver
steamvrNoFadeToGridToggle.checked = SteamVRTabController.noFadeToGrid
steamvrNotificationToggle.checked = SteamVRTabController.dnd
steamvrControllerPowerToggle.checked = SteamVRTabController.controllerPower
steamvrNoHMDToggle.checked = SteamVRTabController.noHMD
}
Connections {
@@ -125,6 +146,12 @@ GroupBox {
onDNDChanged:{
steamvrNotificationToggle.checked = SteamVRTabController.dnd
}
onNoHMDChanged:{
steamvrNoHMDToggle.checked = SteamVRTabController.noHMD
}
onControllerPowerChanged:{
steamvrControllerPowerToggle.checked = SteamVRTabController.controllerPower
}
}
}
@@ -6,6 +6,7 @@ import "media_keys"
import "alarm_clock"
import "keyboard_utils"
import "../common"
import "misc"
MyStackViewPage {
headerText: "Utilities"
@@ -25,6 +26,10 @@ MyStackViewPage {
id: mediaKeysGroupBox
}
MiscBox{
id:utilMiscGroupBox
}
Item {
Layout.fillHeight: true
}
@@ -0,0 +1,62 @@
import QtQuick 2.7
import QtQuick.Controls 2.0
import QtQuick.Layouts 1.3
import ovras.advsettings 1.0
import "../../common"
GroupBox {
id: utilMiscGroupBox
Layout.fillWidth: true
label:
MyText {
leftPadding: 10
text: "Misc:"
bottomPadding: -10
}
background: Rectangle {
color: "transparent"
border.color: "#d9dbe0"
radius: 8
}
ColumnLayout {
anchors.fill: parent
Rectangle {
color: "#d9dbe0"
height: 1
Layout.fillWidth: true
Layout.bottomMargin: 5
}
RowLayout {
spacing: 16
MyToggleButton {
id: trackerOvlToggle
text: "Show Tracker Batteries"
Layout.preferredWidth: 250
onCheckedChanged: {
UtilitiesTabController.setTrackerOvlEnabled(this.checked, false)
}
}
}
}
Component.onCompleted: {
trackerOvlToggle.checked = UtilitiesTabController.trackerOvlEnabled
}
Connections {
target: UtilitiesTabController
onTrackerOvlEnabledChanged:{
trackerOvlToggle.checked = UtilitiesTabController.trackerOvlEnabled
}
}
}