SteamFrame/OpenVR-AdvancedSettings-frame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compiling and various updates

Browse Source
This commit is contained in:
ykeara
2025-10-09 18:45:53 -05:00
parent 44a05dfd57
commit 1152cfee1f
25 changed files with 542 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/res/qml/RootPage.qml
+16 -17
View File
@@ -1,7 +1,7 @@
import QtQuick 2.7
import QtQuick.Controls 2.0
import QtQuick.Layouts 1.3
import ovras.advsettings 1.0
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import ovras.advsettings
import "." // QTBUG-34418, singletons require explicit import to load qmldir file
import "common"
import "utilities_page"
@@ -33,7 +33,7 @@ MyStackViewPage {
text: " SteamVR"
Layout.fillWidth: true
onClicked: {
MyResources.playFocusChangedSound()
OverlayController.playFocusChangedSound()
mainView.push(steamVRPage)
}
}
@@ -45,7 +45,7 @@ MyStackViewPage {
text: " Chaperone"
Layout.fillWidth: true
onClicked: {
MyResources.playFocusChangedSound()
OverlayController.playFocusChangedSound()
mainView.push(chaperonePage)
}
}
@@ -57,7 +57,7 @@ MyStackViewPage {
text: " Offsets"
Layout.fillWidth: true
onClicked: {
MyResources.playFocusChangedSound()
OverlayController.playFocusChangedSound()
mainView.push(playspacePage)
}
}
@@ -69,7 +69,7 @@ MyStackViewPage {
text: " Motion"
Layout.fillWidth: true
onClicked: {
MyResources.playFocusChangedSound()
OverlayController.playFocusChangedSound()
mainView.push(motionPage)
}
}
@@ -80,7 +80,7 @@ MyStackViewPage {
text: " Rotation"
Layout.fillWidth: true
onClicked: {
MyResources.playFocusChangedSound()
OverlayController.playFocusChangedSound()
mainView.push(rotationPage)
}
}
@@ -92,7 +92,7 @@ MyStackViewPage {
text: " Space Fix"
Layout.fillWidth: true
onClicked: {
MyResources.playFocusChangedSound()
OverlayController.playFocusChangedSound()
mainView.push(fixFloorPage)
}
}
@@ -104,7 +104,7 @@ MyStackViewPage {
text: " Audio"
Layout.fillWidth: true
onClicked: {
MyResources.playFocusChangedSound()
OverlayController.playFocusChangedSound()
mainView.push(audioPage)
}
}
@@ -116,7 +116,7 @@ MyStackViewPage {
text: " Video"
Layout.fillWidth: true
onClicked: {
MyResources.playFocusChangedSound()
OverlayController.playFocusChangedSound()
mainView.push(videoPage)
}
}
@@ -128,7 +128,7 @@ MyStackViewPage {
text: " Utilities"
Layout.fillWidth: true
onClicked: {
MyResources.playFocusChangedSound()
OverlayController.playFocusChangedSound()
mainView.push(utilitiesPage)
}
}
@@ -141,7 +141,7 @@ MyStackViewPage {
text: " Statistics"
Layout.fillWidth: true
onClicked: {
MyResources.playFocusChangedSound()
OverlayController.playFocusChangedSound()
mainView.push(statisticsPage)
}
}
@@ -169,7 +169,7 @@ MyStackViewPage {
text: " Settings"
Layout.fillWidth: true
onClicked: {
MyResources.playFocusChangedSound()
OverlayController.playFocusChangedSound()
mainView.push(settingsPage)
}
}
@@ -470,9 +470,8 @@ MyStackViewPage {
summaryMicMuteToggle.checked = AudioTabController.micMuted
summaryPttToggle.checked = AudioTabController.pttEnabled
}
Connections {
target: OverlayController
target: OverlayController
function onNewVersionDetectedChanged() {
if (OverlayController.newVersionDetected)
{
src/res/qml/chaperone_page/ChaperonePage.qml
+2 -2
View File
@@ -494,7 +494,7 @@ MyStackViewPage {
text: "Proximity Warning Settings"
Layout.preferredWidth: 350
onClicked: {
MyResources.playFocusChangedSound()
OverlayController.playFocusChangedSound()
mainView.push(chaperoneWarningsPage)
}
}
@@ -506,7 +506,7 @@ MyStackViewPage {
Layout.preferredWidth: 400
onClicked: {
MyResources.playFocusChangedSound()
OverlayController.playFocusChangedSound()
mainView.push(chaperoneAdditionalPage)
}
}
src/res/qml/chaperone_page/chaperone_additional/chaperonetype/ChaperoneTypeGroupBox.qml
+8 -5
View File
@@ -40,7 +40,7 @@ GroupBox {
Layout.preferredWidth: 200
onCheckedChanged: {
if(checked){
MyResources.playActivationSound()
OverlayController.playActivationSound()
ChaperoneTabController.setCollisionBoundStyle(0)
}
}
@@ -52,7 +52,7 @@ GroupBox {
Layout.preferredWidth: 200
onCheckedChanged: {
if(checked){
MyResources.playActivationSound()
OverlayController.playActivationSound()
ChaperoneTabController.setCollisionBoundStyle(1)
}
}
@@ -64,7 +64,7 @@ GroupBox {
Layout.preferredWidth: 200
onCheckedChanged: {
if(checked){
MyResources.playActivationSound()
OverlayController.playActivationSound()
ChaperoneTabController.setCollisionBoundStyle(2)
}
}
@@ -76,7 +76,7 @@ GroupBox {
Layout.preferredWidth: 200
onCheckedChanged: {
if(checked){
MyResources.playActivationSound()
OverlayController.playActivationSound()
ChaperoneTabController.setCollisionBoundStyle(3)
}
}
@@ -88,7 +88,7 @@ GroupBox {
Layout.preferredWidth: 200
onCheckedChanged: {
if(checked){
MyResources.playActivationSound()
OverlayController.playActivationSound()
ChaperoneTabController.setCollisionBoundStyle(4)
}
}
@@ -124,4 +124,7 @@ GroupBox {
}
}
Connections {
target: OverlayController
}
}
src/res/qml/common/MyComboBox.qml
+4 -1
View File
@@ -63,11 +63,14 @@ ComboBox {
onActivated: {
if (activeFocus) {
MyResources.playActivationSound()
OverlayController.playActivationSound()
}
}
Component.onCompleted: {
popup.background.color = "#2a2e35"
}
Connections {
target: OverlayController
}
}
src/res/qml/common/MyPushButton.qml
+4 -1
View File
@@ -35,7 +35,10 @@ Button {
onClicked: {
if (activationSoundEnabled) {
MyResources.playActivationSound()
OverlayController.playActivationSound()
}
}
Connections {
target: OverlayController
}
}
src/res/qml/common/MyPushButton2.qml
+4 -1
View File
@@ -24,6 +24,9 @@ Button {
}
onClicked: {
MyResources.playActivationSound()
OverlayController.playActivationSound()
}
Connections {
target: OverlayController
}
}
src/res/qml/common/MyRadioButton.qml
+4 -1
View File
@@ -19,6 +19,9 @@ RadioButton {
}
onClicked: {
MyResources.playActivationSound()
OverlayController.playActivationSound()
}
Connections {
target: OverlayController
}
}
src/res/qml/common/MyResources.qml
+3
View File
@@ -10,4 +10,7 @@ QtObject {
function playFocusChangedSound() {
OverlayController.playFocusChangedSound()
}
Connections {
target: OverlayController
}
}
src/res/qml/common/MySlider.qml
+1 -1
View File
@@ -48,7 +48,7 @@ Slider {
onValueChanged: {
if (activeFocus) {
//MyResources.playActivationSound()
//OverlayController.playActivationSound()
}
}
}
src/res/qml/common/MyStackViewPage.qml
+5 -2
View File
@@ -2,7 +2,7 @@ import QtQuick 2.7
import QtQuick.Controls 2.0
import QtQuick.Layouts 1.2
import "." // QTBUG-34418, singletons require explicit import to load qmldir file
// Needed for MyResources in the default folder.
// Needed for OverlayController in the default folder.
import ".."
Rectangle {
@@ -45,7 +45,7 @@ Rectangle {
}
}
onClicked: {
MyResources.playFocusChangedSound()
OverlayController.playFocusChangedSound()
stackView.pop()
}
}
@@ -90,4 +90,7 @@ Rectangle {
content.Layout.rightMargin = 40
content.Layout.bottomMargin = 40
}
Connections {
target: OverlayController
}
}
src/res/qml/common/MyToggleButton.qml
+5 -2
View File
@@ -1,7 +1,7 @@
import QtQuick 2.7
import QtQuick.Controls 2.0
import "." // QTBUG-34418, singletons require explicit import to load qmldir file
// Needed for MyResources in the default folder.
// Needed for OverlayControllers in the default folder.
import ".."
CheckBox {
@@ -60,6 +60,9 @@ CheckBox {
}
onClicked: {
MyResources.playActivationSound()
OverlayController.playActivationSound()
}
Connections {
target: OverlayController
}
}
src/res/qml/common/mainwidget.qml
+3 -3
View File
@@ -1,6 +1,6 @@
import QtQuick 2.7
import QtQuick.Controls 2.0
import QtQuick.Layouts 1.0
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import ".."
import "../utilities_page"
import "../audio_page"
src/res/qml/steamvr_page/SteamVRPage.qml
+4 -1
View File
@@ -32,7 +32,7 @@ MyStackViewPage {
Layout.preferredWidth: 350
onClicked: {
MyResources.playFocusChangedSound()
OverlayController.playFocusChangedSound()
mainView.push(steamVRTXRXPage)
SteamVRTabController.updateRXTXList()
}
@@ -50,4 +50,7 @@ MyStackViewPage {
}
}
}
Connections {
target: OverlayController
}
}