Qt6 (#669)

* update qt6 upgrade progress

* add flawed addition for QRenderTarget and link needed libs

* update to better logging format

* move many assets and qml files into qrc

* get rid of deprecation messages

* remove additional deprecation notices

* make Qt6 finally render on desktop with some progress on vr

* initialize QRhi with QQuickRenderControl

* use default values to stop SegFaults

* fix compilation on windows

* add windows files for aiding in running exe

* fix formatting of testing qt.conf

* first attempt on using textures instead of files in AudioTabController

* Fix public/private access issue

---------

Co-authored-by: RTUnreal <unreal@rtinf.net>

src/res/qml/ChaperoneWarningsPage.qml

@@ -1,7 +1,7 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.3
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import ovras.advsettings 1.0
 import "." // QTBUG-34418, singletons require explicit import to load qmldir file
 import "common"
@@ -415,43 +415,43 @@ MyStackViewPage {
 
         Connections {
             target: ChaperoneTabController
-            onChaperoneSwitchToBeginnerEnabledChanged: {
+            function onChaperoneSwitchToBeginnerEnabledChanged() {
                 switchBeginnerToggle.checked = ChaperoneTabController.chaperoneSwitchToBeginnerEnabled
             }
-            onChaperoneSwitchToBeginnerDistanceChanged: {
+            function onChaperoneSwitchToBeginnerDistanceChanged() {
                 var d = ChaperoneTabController.chaperoneSwitchToBeginnerDistance.toFixed(2)
                 if (d <= switchBeginnerDistanceSlider.to && Math.abs(switchBeginnerDistanceSlider.value - d) > 0.0008) {
                     switchBeginnerDistanceSlider.value = d
                 }
                 switchBeginnerDistanceText.text = d
             }
-            onChaperoneHapticFeedbackEnabledChanged: {
+            function onChaperoneHapticFeedbackEnabledChanged() {
                 hapticFeedbackToggle.checked = ChaperoneTabController.chaperoneHapticFeedbackEnabled
             }
-            onChaperoneHapticFeedbackDistanceChanged: {
+            function onChaperoneHapticFeedbackDistanceChanged() {
                 var d = ChaperoneTabController.chaperoneHapticFeedbackDistance.toFixed(2)
                 if (d <= hapticFeedbackDistanceSlider.to && Math.abs(hapticFeedbackDistanceSlider.value - d) > 0.0008) {
                     hapticFeedbackDistanceSlider.value = d
                 }
                 hapticFeedbackDistanceText.text = d
             }
-            onChaperoneAlarmSoundEnabledChanged: {
+            function onChaperoneAlarmSoundEnabledChanged() {
                 audioWarningToggle.checked = ChaperoneTabController.chaperoneAlarmSoundEnabled
             }
-            onChaperoneAlarmSoundLoopingChanged: {
+            function onChaperoneAlarmSoundLoopingChanged() {
                 audioWarningLoopingToggle.checked = ChaperoneTabController.chaperoneAlarmSoundLooping
             }
-            onChaperoneAlarmSoundDistanceChanged: {
+            function onChaperoneAlarmSoundDistanceChanged() {
                 var d = ChaperoneTabController.chaperoneAlarmSoundDistance.toFixed(2)
                 if (d <= audioWarningDistanceSlider.to && Math.abs(audioWarningDistanceSlider.value - d) > 0.0008) {
                     audioWarningDistanceSlider.value = d
                 }
                 audioWarningDistanceText.text = d
             }
-            onChaperoneShowDashboardEnabledChanged: {
+            function onChaperoneShowDashboardEnabledChanged() {
                 openDashboardToggle.checked = ChaperoneTabController.chaperoneShowDashboardEnabled
             }
-            onChaperoneShowDashboardDistanceChanged: {
+            function onChaperoneShowDashboardDistanceChanged() {
                 var d = ChaperoneTabController.chaperoneShowDashboardDistance.toFixed(2)
                 if (d <= openDashboardDistanceSlider.to && Math.abs(openDashboardDistanceSlider.value - d) > 0.0008) {
                     openDashboardDistanceSlider.value = d

src/res/qml/FixFloorPage.qml

@@ -140,7 +140,7 @@ MyStackViewPage {
 
         Connections {
             target: FixFloorTabController
-            onStatusMessageSignal: {
+            function onStatusMessageSignal() {
                 if (statusMessageTimer.running) {
                     statusMessageTimer.stop()
                 }
@@ -148,15 +148,15 @@ MyStackViewPage {
                 statusMessageTimer.interval = FixFloorTabController.currentStatusMessageTimeout() * 1000
                 statusMessageTimer.start()
             }
-            onMeasureStartSignal: {
+            function onMeasureStartSignal() {
                 fixButton.enabled = false
                 undoFixButton.enabled = false
             }
-            onMeasureEndSignal: {
+            function onMeasureEndSignal() {
                 fixButton.enabled = true
                 // undoFixButton.enabled = FixFloorTabController.canUndo
             }
-            onCanUndoChanged: {
+            function onCanUndoChanged() {
                 //undoFixButton.enabled = FixFloorTabController.canUndo
                 // revert below to this -^
                 undoFixButton.enabled = false
@@ -165,7 +165,7 @@ MyStackViewPage {
 
         Connections {
             target: MoveCenterTabController
-            onTrackingUniverseChanged: {
+            function onTrackingUniverseChanged() {
                 if (MoveCenterTabController.trackingUniverse === 0) {
                     fixButton.enabled = false
                     recenterButton.enabled = false

src/res/qml/PlayspacePage.qml

@@ -524,33 +524,33 @@ MyStackViewPage {
 
         Connections {
             target: MoveCenterTabController
-            onOffsetXChanged: {
+            function onOffsetXChanged() {
                 spaceMoveXText.text = MoveCenterTabController.offsetX.toFixed(2)
             }
-            onOffsetYChanged: {
+            function onOffsetYChanged() {
                 spaceMoveYText.text = MoveCenterTabController.offsetY.toFixed(2)
             }
-            onOffsetZChanged: {
+            function onOffsetZChanged() {
                 spaceMoveZText.text = MoveCenterTabController.offsetZ.toFixed(2)
             }
-            onRotationChanged: {
+            function onRotationChanged() {
                 spaceRotationSlider.value = ( MoveCenterTabController.rotation / 100 )
             }
-            onTempRotationChanged: {
+            function onTempRotationChanged() {
                 var intTempRotation = MoveCenterTabController.tempRotation
                 spaceRotationSlider.value = ( intTempRotation / 100 )
                 spaceRotationText.text = ( intTempRotation / 100 ) + "°"
             }
-			onLockXToggleChanged: {
+            function onLockXToggleChanged() {
 				lockXToggle.checked = MoveCenterTabController.lockXToggle
 			}
-			onLockYToggleChanged: {
+            function onLockYToggleChanged() {
 				lockYToggle.checked = MoveCenterTabController.lockYToggle
 			}
-			onLockZToggleChanged: {
+            function onLockZToggleChanged() {
 				lockZToggle.checked = MoveCenterTabController.lockZToggle
 			}
-            onTrackingUniverseChanged: {
+            function onTrackingUniverseChanged() {
                 if (MoveCenterTabController.trackingUniverse === 0) {
                     spaceModeText.text = "Sitting"
                     spaceSeatedRecenter.visible = true
@@ -560,7 +560,7 @@ MyStackViewPage {
                     spaceModeText.text = "Unknown(" + MoveCenterTabController.trackingUniverse + ")"
                 }
             }
-            onOffsetProfilesUpdated: {
+            function onOffsetProfilesUpdated() {
                 reloadOffsetProfiles()
             }
         }

src/res/qml/RootPage.qml

@@ -473,7 +473,7 @@ MyStackViewPage {
 
    Connections {
        target: OverlayController
-       onNewVersionDetectedChanged: {
+       function onNewVersionDetectedChanged() {
            if (OverlayController.newVersionDetected)
            {
                summaryVersionCheckTextRect.color = "#ff0000"
@@ -481,10 +481,10 @@ MyStackViewPage {
                summaryVersionCheckTextRect.color = "#2a2e35"
            }
        }
-       onVersionCheckTextChanged: {
+       function onVersionCheckTextChanged() {
            summaryVersionCheckText.text = OverlayController.versionCheckText
        }
-       onDisableVersionCheckChanged: {
+       function onDisableVersionCheckChanged() {
            if (OverlayController.disableVersionCheck)
            {
                summaryVersionCheckText.visible = false
@@ -503,34 +503,34 @@ MyStackViewPage {
 
    Connections {
        target: ChaperoneTabController
-       onChaperoneProfilesUpdated: {
+       function onChaperoneProfilesUpdated() {
            reloadChaperoneProfiles()
        }
    }
 
    Connections {
        target: VideoTabController
-       onVideoProfilesUpdated: {
+       function onVideoProfilesUpdated() {
            reloadVideoProfiles()
        }
    }
 
    Connections {
        target: AudioTabController
-       onMicVolumeChanged: {
+       function onMicVolumeChanged() {
            summaryMicVolumeSlider.value = AudioTabController.micVolume
        }
-       onMicMutedChanged: {
+       function onMicMutedChanged() {
            summaryMicMuteToggle.checked = AudioTabController.micMuted
        }
-       onPttEnabledChanged: {
+       function onPttEnabledChanged() {
            summaryPttToggle.checked = AudioTabController.pttEnabled
        }
    }
 
    Connections {
        target: MoveCenterTabController
-       onTrackingUniverseChanged: {
+       function onTrackingUniverseChanged() {
            if (MoveCenterTabController.trackingUniverse === 0) {
                summaryPlaySpaceModeText.text = "Sitting"
            } else if (MoveCenterTabController.trackingUniverse === 1) {

src/res/qml/SettingsPage.qml

@@ -338,66 +338,66 @@ MyStackViewPage {
 
         Connections {
             target: SettingsTabController
-            onAutoStartEnabledChanged: {
+            function onAutoStartEnabledChanged() {
                 settingsAutoStartToggle.checked = SettingsTabController.autoStartEnabled
             }
-            onNativeChaperoneToggleChanged:{
+            function onNativeChaperoneToggleChanged(){
                 nativeChaperoneToggleButton.checked = SettingsTabController.nativeChaperoneToggle
             }
-            onOculusSdkToggleChanged:{
+            function onOculusSdkToggleChanged(){
                 oculusSdkToggleButton.checked = SettingsTabController.oculusSdkToggle
             }
         }
 
         Connections {
             target: MoveCenterTabController
-            onUniverseCenteredRotationChanged: {
+            function onUniverseCenteredRotationChanged() {
                 universeCenteredRotationToggle.checked = MoveCenterTabController.universeCenteredRotation
             }
         }
 
         Connections {
             target: OverlayController
-            onVsyncDisabledChanged: {
+            function onVsyncDisabledChanged() {
                 vsyncDisabledToggle.checked = OverlayController.vsyncDisabled
                 customTickRateText.visible = vsyncDisabledToggle.checked
                 customTickRateLabel.visible = vsyncDisabledToggle.checked
                 customTickRateMsLabel.visible = vsyncDisabledToggle.checked
             }
-            onCrashRecoveryDisabledChanged: {
+            function onCrashRecoveryDisabledChanged() {
                 disableCrashRecoveryToggle.checked = !OverlayController.crashRecoveryDisabled
             }
 
-            onCustomTickRateMsChanged: {
+            function onCustomTickRateMsChanged() {
                 customTickRateText.text = OverlayController.customTickRateMs
             }
 
-            onEnableDebugChanged: {
+            function onEnableDebugChanged() {
                 debugStateRow.visible = OverlayController.enableDebug
             }
 
-            onDebugStateChanged: {
+            function onDebugStateChanged() {
                 debugStateText.text = OverlayController.debugState
             }
-            onDisableVersionCheckChanged: {
+            function onDisableVersionCheckChanged() {
                 disableVersionCheckToggle.checked = OverlayController.disableVersionCheck
             }
-            onExclusiveInputEnabledChanged:{
+            function onExclusiveInputEnabledChanged(){
                 exclusiveInputToggleButton.checked = OverlayController.exclusiveInputEnabled
             }
-            onAutoApplyChaperoneEnabledChanged: {
+            function onAutoApplyChaperoneEnabledChanged() {
                autoApplyChaperoneToggleButton.checked = OverlayController.autoApplyChaperoneEnabled
             }
-            onSoundVolumeChanged:{
+            function onSoundVolumeChanged(){
                 volumeSlider.value = OverlayController.soundVolume
             }
-            onDesktopModeToggleChanged:{
+            function onDesktopModeToggleChanged(){
                 desktopModeToggleButton.checked = OverlayController.desktopModeToggle
             }
         }
         Connections{
             target: ChaperoneTabController
-            onChaperoneProfilesUpdated: {
+            function onChaperoneProfilesUpdated() {
                 reloadChaperoneProfiles()
             }
         }

src/res/qml/audio_page/device_selector/AudioDeviceSelector.qml

@@ -44,14 +44,14 @@ RowLayout {
 
     Connections {
         target: AudioTabController
-        onPlaybackDeviceIndexChanged: {
+        function onPlaybackDeviceIndexChanged() {
             setShownAudioDevice(index)
         }
-        onPlaybackDeviceListChanged: {
+        function onPlaybackDeviceListChanged() {
             audioPlaybackNameCombo.devices = getAudioDeviceList()
             setShownAudioDevice(AudioTabController.playbackDeviceIndex)
         }
-        onPlaybackOverrideChanged: {
+        function onPlaybackOverrideChanged() {
             playbackOverrideToggle.value = AudioTabController.playbackOverride
         }
     }

src/res/qml/audio_page/device_selector/MicDeviceSelector.qml

@@ -63,14 +63,14 @@ RowLayout {
     }
     Connections {
         target: AudioTabController
-        onMicDeviceIndexChanged: {
+        function onMicDeviceIndexChanged() {
             setShownAudioDevice(index)
         }
-        onRecordingDeviceListChanged: {
+        function onRecordingDeviceListChanged() {
             devices = getAudioDeviceList()
             setShownAudioDevice(AudioTabController.micDeviceIndex)
         }
-        onRecordingOverrideChanged: {
+        function onRecordingOverrideChanged() {
             recordingOverrideToggle.value = AudioTabController.recordingOverride
         }
     }

src/res/qml/audio_page/device_selector/MicVolumeSlider.qml

@@ -89,7 +89,7 @@ ColumnLayout {
     }
     Connections {
         target: AudioTabController
-        onMicDeviceIndexChanged: {
+        function onMicDeviceIndexChanged() {
             if (index < 0) {
                 audioMicVolumeMinusButton.enabled = false
                 audioMicVolumeSlider.enabled = false
@@ -102,16 +102,16 @@ ColumnLayout {
                 audioMicMuteToggle.enabled = true
             }
         }
-        onMicVolumeChanged: {
+        function onMicVolumeChanged() {
             audioMicVolumeSlider.value = AudioTabController.micVolume
         }
-        onMicMutedChanged: {
+        function onMicMutedChanged() {
             audioMicMuteToggle.checked = AudioTabController.micMuted
         }
-        onPlaybackDeviceListChanged: {
+        function onPlaybackDeviceListChanged() {
 
         }
-        onRecordingDeviceListChanged: {
+        function onRecordingDeviceListChanged() {
             if (AudioTabController.micDeviceIndex < 0) {
                 audioMicVolumeMinusButton.enabled = false
                 audioMicVolumeSlider.enabled = false

src/res/qml/audio_page/device_selector/MirrorDeviceSelector.qml

@@ -41,10 +41,10 @@ RowLayout {
     }
     Connections {
         target: AudioTabController
-        onMirrorDeviceIndexChanged: {
+        function onMirrorDeviceIndexChanged() {
             setShownAudioDevice(index)
         }
-        onPlaybackDeviceListChanged: {
+        function onPlaybackDeviceListChanged() {
             audioMirrorNameCombo.devices = getAudioDeviceList()
             setShownAudioDevice(AudioTabController.mirrorDeviceIndex)
         }

src/res/qml/audio_page/device_selector/MirrorVolumeSlider.qml

@@ -89,7 +89,7 @@ ColumnLayout {
     }
     Connections {
         target: AudioTabController
-        onMirrorDeviceIndexChanged: {
+        function onMirrorDeviceIndexChanged() {
             if (index < 0) {
                 audioMirrorNameCombo.deviceIndex = 0
                 audioMirrorVolumeMinusButton.enabled = false
@@ -104,13 +104,13 @@ ColumnLayout {
                 audioMirrorNameCombo.deviceIndex = index + 1
             }
         }
-        onMirrorVolumeChanged: {
+        function onMirrorVolumeChanged() {
             audioMirrorVolumeSlider.value = AudioTabController.mirrorVolume
         }
-        onMirrorMutedChanged: {
+        function onMirrorMutedChanged() {
             audioMirrorMuteToggle.checked = AudioTabController.mirrorMuted
         }
-        onPlaybackDeviceListChanged: {
+        function onPlaybackDeviceListChanged() {
             if (AudioTabController.mirrorDeviceIndex < 0) {
                 audioMirrorVolumeMinusButton.enabled = false
                 audioMirrorVolumeSlider.enabled = false

src/res/qml/audio_page/profiles/ProfileButtons.qml

@@ -98,13 +98,13 @@ ColumnLayout {
     }
     Connections {
         target: AudioTabController
-        onAudioProfilesUpdated: {
+        function onAudioProfilesUpdated() {
             reloadAudioProfiles()
         }
-        onAudioProfileAdded: {
+        function onAudioProfileAdded() {
             audioProfileComboBox.currentIndex = AudioTabController.getAudioProfileCount()
         }
-        onDefaultProfileDisplay: {
+        function onDefaultProfileDisplay() {
             audioProfileComboBox.currentIndex = AudioTabController.getDefaultAudioProfileIndex(
                         ) + 1
         }

src/res/qml/audio_page/proximity/ProximityToggle.qml

@@ -21,7 +21,7 @@ MyToggleButton {
     }
     Connections {
         target: AudioTabController
-        onMicProximitySensorCanMuteChanged: {
+        function onMicProximitySensorCanMuteChanged() {
             audioMuteProximitySensorToggle.checked = AudioTabController.micProximitySensorCanMute
         }
     }

src/res/qml/audio_page/push_to_talk/PttButtons.qml

@@ -39,13 +39,13 @@ ColumnLayout {
     }
     Connections {
         target: AudioTabController
-        onPttEnabledChanged: {
+        function onPttEnabledChanged() {
             audioPttEnabledToggle.checked = AudioTabController.pttEnabled
         }
-        onMicReversePttChanged: {
+        function onMicReversePttChanged() {
             audioPttReverseToggle.checked = AudioTabController.micReversePtt
         }
-        onPttShowNotificationChanged: {
+        function onPttShowNotificationChanged() {
             audioPttShowNotificationToggle.checked = AudioTabController.pttShowNotification
         }
     }

src/res/qml/chaperone_page/ChaperonePage.qml

@@ -1,7 +1,7 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.3
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import ovras.advsettings 1.0
 import "." // QTBUG-34418, singletons require explicit import to load qmldir file
 import "../common"
@@ -586,26 +586,26 @@ MyStackViewPage {
 
         Connections {
             target: ChaperoneTabController
-            onBoundsVisibilityChanged: {
+            function onBoundsVisibilityChanged() {
                 if (Math.abs(chaperoneVisibilitySlider.value - ChaperoneTabController.boundsVisibility) > 0.008) {
                     chaperoneVisibilitySlider.value = ChaperoneTabController.boundsVisibility
                 }
             }
-            onFadeDistanceChanged: {
+            function onFadeDistanceChanged() {
                 var d = ChaperoneTabController.fadeDistance.toFixed(1)
                 if (d <= chaperoneFadeDistanceSlider.to && Math.abs(chaperoneFadeDistanceSlider.value - d) > 0.008) {
                     chaperoneFadeDistanceSlider.value = d
                 }
                 chaperoneFadeDistanceText.text = d
             }
-            onHeightChanged: {
+            function onHeightChanged() {
                 var h = ChaperoneTabController.height.toFixed(2)
                 if (h <= chaperoneHeightSlider.to && Math.abs(chaperoneHeightSlider.value - h) > 0.008) {
                     chaperoneHeightSlider.value = h
                 }
                 chaperoneHeightText.text = h
             }
-            onChaperoneDimHeightChanged: {
+            function onChaperoneDimHeightChanged() {
                 var dim = ChaperoneTabController.chaperoneDimHeight
                 if(dim > 0.0){
                     chaperoneDisableChaperone.enabled = false;
@@ -625,16 +625,16 @@ MyStackViewPage {
                     chaperoneFadeDistanceText.enabled = true;
                 }
             }
-            onCenterMarkerNewChanged: {
+            function onCenterMarkerNewChanged() {
                 chaperoneCenterMarkerToggle.checked = ChaperoneTabController.centerMarkerNew
             }
-            onPlaySpaceMarkerChanged: {
+            function onPlaySpaceMarkerChanged() {
                 chaperonePlaySpaceToggle.checked = ChaperoneTabController.playSpaceMarker
             }
-            onForceBoundsChanged: {
+            function onForceBoundsChanged() {
                 chaperoneForceBoundsToggle.checked = ChaperoneTabController.forceBounds
             }
-            onChaperoneProfilesUpdated: {
+            function onChaperoneProfilesUpdated() {
                 reloadChaperoneProfiles()
             }
         }

src/res/qml/chaperone_page/chaperone_additional/ChaperoneAdditionalPage.qml

@@ -1,7 +1,7 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.3
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import ovras.advsettings 1.0
 import "." // QTBUG-34418, singletons require explicit import to load qmldir file
 import "../../common"
@@ -113,7 +113,7 @@ MyStackViewPage {
 
         Connections {
             target: ChaperoneTabController
-            onChaperoneDimHeightChanged: {
+            function onChaperoneDimHeightChanged() {
                 var d = ChaperoneTabController.chaperoneDimHeight.toFixed(2)
                 if (d <= dimHeightSlider.to && Math.abs(dimHeightSlider.value - d) > 0.0008) {
                     dimHeightSlider.value = d

src/res/qml/chaperone_page/chaperone_additional/chaperoneboundscolor/ChaperoneBoundsColorGroupBox.qml

@@ -180,17 +180,17 @@ GroupBox {
 
     Connections {
         target: ChaperoneTabController
-        onChaperoneColorRChanged:{
+        function onChaperoneColorRChanged(){
             var redValue = ChaperoneTabController.chaperoneColorR
             colorRedText.text = redValue
             chaperoneColorRedSlider.value = redValue
         }
-        onChaperoneColorGChanged:{
+        function onChaperoneColorGChanged(){
             var greenValue = ChaperoneTabController.chaperoneColorG
             colorGreenText.text = greenValue
             chaperoneColorGreenSlider.value = greenValue
         }
-        onChaperoneColorBChanged:{
+        function onChaperoneColorBChanged(){
             var blueValue = ChaperoneTabController.chaperoneColorB
             colorBlueText.text = blueValue
             chaperoneColorBlueSlider.value = blueValue

src/res/qml/chaperone_page/chaperone_additional/chaperonemisc/ChaperoneMiscGroupBox.qml

@@ -70,10 +70,10 @@ GroupBox {
 
     Connections {
         target: ChaperoneTabController
-        onChaperoneFloorToggleChanged:{
+        function onChaperoneFloorToggleChanged(){
             chaperoneFloorToggleBtn.checked = ChaperoneTabController.chaperoneFloorToggle
         }
-        onCenterMarkerChanged:{
+        function onCenterMarkerChanged(){
             legacyCenterMarkerbtn.checked = ChaperoneTabController.centerMarker
         }
     }

src/res/qml/chaperone_page/chaperone_additional/chaperonetype/ChaperoneTypeGroupBox.qml

@@ -112,7 +112,7 @@ GroupBox {
 
     Connections {
         target: ChaperoneTabController
-        onCollisionBoundStyleChanged:{
+        function onCollisionBoundStyleChanged(){
             var collisiontype = ChaperoneTabController.collisionBoundStyle
             switch(collisiontype){
             case 0: denseRadio.checked = true; break;

src/res/qml/common/MyTextField.qml

@@ -39,7 +39,7 @@ TextField {
 	}
     Connections {
         target: OverlayController
-        onKeyBoardInputSignal: {
+        function onKeyBoardInputSignal() {
             if (userValue == keyBoardUID) {
                 if (myTextField.text !== input) {
                     myTextField.onInputEvent(input)

src/res/qml/motion_page/gravity/GravityGroupBox.qml

@@ -218,19 +218,19 @@ GroupBox {
     Connections {
         target: MoveCenterTabController
 
-        onGravityActiveChanged: {
+        function onGravityActiveChanged() {
             gravityToggleButton.checked = MoveCenterTabController.gravityActive
         }
-        onGravityStrengthChanged: {
+        function onGravityStrengthChanged() {
             gravityStrengthText.text = MoveCenterTabController.gravityStrength.toFixed(2)
         }
-        onMomentumSaveChanged: {
+        function onMomentumSaveChanged() {
             momentumToggleButton.checked = MoveCenterTabController.momentumSave
         }
-        onFlingStrengthChanged: {
+        function onFlingStrengthChanged() {
             flingStrengthText.text = MoveCenterTabController.flingStrength.toFixed(2)
         }
-        onFrictionPercentChanged: {
+        function onFrictionPercentChanged() {
             frictionPercentText.text = MoveCenterTabController.frictionPercent + "%"
         }
     }

src/res/qml/motion_page/height_toggle/HeightToggleGroupBox.qml

@@ -88,10 +88,10 @@ GroupBox {
     Connections {
         target: MoveCenterTabController
 
-        onHeightToggleChanged: {
+        function onHeightToggleChanged() {
             heightToggleButton.checked = MoveCenterTabController.heightToggle
         }
-        onHeightToggleOffsetChanged: {
+        function onHeightToggleOffsetChanged() {
             heightToggleOffsetText.text = MoveCenterTabController.heightToggleOffset.toFixed(2)
         }
     }

src/res/qml/motion_page/space_drag/SpaceDragGroupBox.qml

@@ -156,19 +156,19 @@ GroupBox {
     Connections {
         target: MoveCenterTabController
 
-        onMoveShortcutLeftChanged: {
+        function onMoveShortcutLeftChanged() {
             moveShortcutLeft.checked = MoveCenterTabController.moveShortcutLeft
         }
-        onMoveShortcutRightChanged: {
+        function onMoveShortcutRightChanged() {
             moveShortcutRight.checked = MoveCenterTabController.moveShortcutRight
         }
-        onDragComfortFactorChanged: {
+        function onDragComfortFactorChanged() {
             dragComfortSlider.value = MoveCenterTabController.dragComfortFactor
         }
-        onDragBoundsChanged: {
+        function onDragBoundsChanged() {
             dragBounds.checked = MoveCenterTabController.dragBounds
         }
-        onDragMultChanged: {
+        function onDragMultChanged() {
             dragMultText.text = MoveCenterTabController.dragMult.toFixed(2)
         }
     }

src/res/qml/rotation_page/redirected/AutoTurnGroupBox.qml

@@ -312,23 +312,23 @@ GroupBox {
     Connections {
         target: RotationTabController
 
-        onAutoTurnEnabledChanged: {
+        function onAutoTurnEnabledChanged() {
             autoTurn.checked = RotationTabController.autoTurnEnabled
         }
-        onAutoTurnActivationDistanceChanged: {
+        function onAutoTurnActivationDistanceChanged() {
             activationSlider.value = RotationTabController.autoTurnActivationDistance.toFixed(2)
         }
-        onAutoTurnDeactivationDistanceChanged:{
+        function onAutoTurnDeactivationDistanceChanged(){
             deactivationSlider.value = RotationTabController.autoTurnDeactivationDistance.toFixed(2)
         }
-        onAutoTurnUseCornerAngleChanged:{
+        function onAutoTurnUseCornerAngleChanged(){
             cornerAngle.checked = RotationTabController.autoTurnUseCornerAngle
         }
-        onAutoTurnSpeedChanged:{
+        function onAutoTurnSpeedChanged(){
             var val = RotationTabController.autoTurnSpeed
             speedSlider.value = ((val/100).toFixed())
         }
-        onAutoTurnModeChanged:{
+        function onAutoTurnModeChanged(){
             if(RotationTabController.autoTurnMode === 1){
 
                 autoTurnModeToggle.checked = true;
@@ -338,13 +338,13 @@ GroupBox {
                  autoTurnModeToggle.checked = false;
             }
         }
-        onMinCordTangleChanged:{
+        function onMinCordTangleChanged(){
             detangleAngleStartText.text = parseInt(RotationTabController.minCordTangle*(180/Math.PI))+ "°"
         }
-        onCordDetangleAngleChanged:{
+        function onCordDetangleAngleChanged(){
             detangleAngleAssistText.text = parseInt(RotationTabController.cordDetangleAngle*(180/Math.PI))+ "°"
         }
-        onAutoTurnShowNotificationChanged:{
+        function onAutoTurnShowNotificationChanged(){
             autoTurnNotificationToggle.checked = RotationTabController.autoTurnShowNotification
         }
     }

src/res/qml/rotation_page/redirected/RedirectedGroupBox.qml

@@ -115,10 +115,10 @@ GroupBox {
     Connections {
         target: RotationTabController
 
-        onVestibularMotionEnabledChanged:{
+        function onVestibularMotionEnabledChanged(){
          redirectedModeToggle.checked = RotationTabController.vestibularMotionEnabled
         }
-        onVestibularMotionRadiusChanged:{
+        function onVestibularMotionRadiusChanged(){
             redirectedWalkingRadiusText.text =  ((RotationTabController.vestibularMotionRadius).toFixed(2))
         }
     }

src/res/qml/rotation_page/snap_turn/SnapTurnGroupBox.qml

@@ -103,10 +103,10 @@ GroupBox {
     Connections {
         target: MoveCenterTabController
 
-        onSnapTurnAngleChanged: {
+        function onSnapTurnAngleChanged() {
             snapTurnAngleText.text = ( Math.round( MoveCenterTabController.snapTurnAngle / 100 ) ) + "°"
         }
-        onSmoothTurnRateChanged: {
+        function onSmoothTurnRateChanged() {
             smoothTurnRateText.text = MoveCenterTabController.smoothTurnRate + "%"
         }
     }

src/res/qml/rotation_page/space_turn/SpaceTurnGroupBox.qml

@@ -100,16 +100,16 @@ GroupBox {
     Connections {
         target: MoveCenterTabController
 
-        onTurnBindLeftChanged: {
+        function onTurnBindLeftChanged() {
             turnBindLeft.checked = MoveCenterTabController.turnBindLeft
         }
-        onTurnBindRightChanged: {
+        function onTurnBindRightChanged() {
             turnBindRight.checked = MoveCenterTabController.turnBindRight
         }
-        onTurnComfortFactorChanged: {
+        function onTurnComfortFactorChanged() {
             turnComfortSlider.value = MoveCenterTabController.turnComfortFactor
         }
-        onTurnBoundsChanged: {
+        function onTurnBoundsChanged() {
             turnBounds.checked = MoveCenterTabController.turnBounds
         }
     }

src/res/qml/rotation_page/view_ratchet/ViewRatchetGroupBox.qml

@@ -76,10 +76,10 @@ GroupBox {
     Connections {
         target: RotationTabController
 
-        onViewRatchettingEnabledChanged:{
+        function onViewRatchettingEnabledChanged(){
             viewRatchetToggleBtn.checked = RotationTabController.viewRatchettingEnabled
         }
-        onViewRatchettingPercentChanged:{
+        function onViewRatchettingPercentChanged(){
             var ratchetPercVal = RotationTabController.viewRatchettingPercent
             viewRatchetSlider.value = ratchetPercVal
             viewRatchetText.text = ratchetPercVal.toFixed(2)

src/res/qml/steamvr_page/camera/CameraGroupBox.qml

@@ -92,13 +92,13 @@ GroupBox {
 
     Connections {
         target: SteamVRTabController
-        onCameraActiveChanged: {
+        function onCameraActiveChanged() {
             steamvrCameraActiveToggle.checked = SteamVRTabController.cameraActive
         }
-        onCameraContChanged: {
+        function onCameraContChanged() {
             steamvrCameraContToggle.checked = SteamVRTabController.cameraCont
         }
-        onCameraBoundsChanged: {
+        function onCameraBoundsChanged() {
             steamvrCameraBoundsToggle.checked = SteamVRTabController.cameraBounds
         }
 

src/res/qml/steamvr_page/steamvr_additional/SteamVRTXRXPage.qml

@@ -2,7 +2,7 @@ import QtQuick 2.7
 import QtQuick.Controls 2.0
 import QtQuick.Controls 2.5
 import QtQuick.Layouts 1.3
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import ovras.advsettings 1.0
 import "." // QTBUG-34418, singletons require explicit import to load qmldir file
 import "../../common"
@@ -185,11 +185,11 @@ MyStackViewPage {
     }
     Connections{
         target: SteamVRTabController
-            onPairStatusChanged: {
+            function onPairStatusChanged() {
                 statusText.text = value;
                 getRXTX()
             }
-            onUpdateRXTX:{
+            function onUpdateRXTX(){
                 getRXTX()
             }
 

src/res/qml/steamvr_page/steamvrbind/SteamVRBindGroupBox.qml

@@ -130,7 +130,7 @@ GroupBox {
 
     Connections {
         target: SteamVRTabController
-        onPerformanceGraphChanged:{
+        function onPerformanceGraphChanged() {
             steamvrBindingToggle.checked = SteamVRTabController.perAppBindEnabled
         }
 

src/res/qml/steamvr_page/steamvrmisc/SteamVRMiscGroupBox.qml

@@ -131,25 +131,25 @@ GroupBox {
 
     Connections {
         target: SteamVRTabController
-        onPerformanceGraphChanged:{
+        function onPerformanceGraphChanged(){
             steamvrPerformanceGraphToggle.checked = SteamVRTabController.performanceGraph
         }
-        onSystemButtonChanged:{
+        function onSystemButtonChanged(){
             steamvrSystemButtonToggle.checked = SteamVRTabController.systemButton
         }
-        onMultipleDriverChanged:{
+        function onMultipleDriverChanged(){
             steamvrMultipleDriverToggle.checked = SteamVRTabController.multipleDriver
         }
-        onNoFadeToGridChanged:{
+        function onNoFadeToGridChanged(){
             steamvrNoFadeToGridToggle.checked = SteamVRTabController.noFadeToGrid
         }
-        onDNDChanged:{
+        function onDNDChanged(){
             steamvrNotificationToggle.checked = SteamVRTabController.dnd
         }
-        onNoHMDChanged:{
+        function onNoHMDChanged(){
             steamvrNoHMDToggle.checked = SteamVRTabController.noHMD
         }
-        onControllerPowerChanged:{
+        function onControllerPowerChanged(){
             steamvrControllerPowerToggle.checked = SteamVRTabController.controllerPower
         }
 

src/res/qml/utilities_page/alarm_clock/AlarmGroupBox.qml

@@ -103,10 +103,10 @@ GroupBox {
     }
     Connections {
         target: VrAlarm
-        onAlarmEnabledChanged: {
+        function onAlarmEnabledChanged() {
             alarmClockToggle.checked = VrAlarm.alarmEnabled
         }
-        onAlarmTimeChanged: {
+        function onAlarmTimeChanged() {
             alarmClockTimeAssembly.changeTimer(VrAlarm.getAlarmHour(),
                                                VrAlarm.getAlarmMinute(),
                                                VrAlarm.getAlarmSecond())

src/res/qml/utilities_page/keyboard_utils/KeyboardGroupBox.qml

@@ -45,7 +45,7 @@ GroupBox {
                 }
                 Connections {
                     target: OverlayController
-                    onKeyBoardInputSignal: {
+                    function onKeyBoardInputSignal() {
                         if (userValue == 601) {
                             UtilitiesTabController.sendKeyboardInput(input)
                         }
@@ -581,7 +581,7 @@ GroupBox {
     }
     Connections {
         target: UtilitiesTabController
-        onVrcDebugChanged: {
+        function onVrcDebugChanged() {
             vrcDebugRow.visible = UtilitiesTabController.vrcDebug
         }
     }

src/res/qml/utilities_page/misc/MiscBox.qml

@@ -53,7 +53,7 @@ GroupBox {
 
     Connections {
         target: UtilitiesTabController
-        onTrackerOvlEnabledChanged:{
+        function onTrackerOvlEnabledChanged(){
             trackerOvlToggle.checked = UtilitiesTabController.trackerOvlEnabled
         }
 

src/res/qml/video_page/VideoPage.qml

@@ -47,7 +47,7 @@ MyStackViewPage {
 
     Connections {
         target: VideoTabController
-            onIsOverlayMethodActiveChanged:{
+            function onIsOverlayMethodActiveChanged(){
                 overlayMethodGroupBox.visible = VideoTabController.isOverlayMethodActive
                 brightnessGroupBox.visible = !(VideoTabController.isOverlayMethodActive);
                 colorGroupBox.visible = !(VideoTabController.isOverlayMethodActive);

src/res/qml/video_page/brightness/BrightnessGroupBox.qml

@@ -95,12 +95,12 @@ GroupBox {
     Connections {
         target: VideoTabController
 
-        onBrightnessOpacityValueChanged: {
+        function onBrightnessOpacityValueChanged() {
             var brightvalue = VideoTabController.brightnessOpacityValue
             brightnessSlider.value = brightvalue
             brightnessValueText.text = Math.round(brightvalue*100)+ "%"
         }
-        onBrightnessEnabledChanged: {
+        function onBrightnessEnabledChanged() {
             brightnessToggle.checked = VideoTabController.brightnessEnabled
         }
     }

src/res/qml/video_page/color/ColorGroupBox.qml

@@ -197,17 +197,17 @@ GroupBox {
 
     Connections {
         target: VideoTabController
-        onColorRedChanged:{
+        function onColorRedChanged(){
             var redValue = VideoTabController.colorRed
             colorRedText.text = Math.round(redValue * 100) + "%"
             colorRedSlider.value = redValue
         }
-        onColorGreenChanged:{
+        function onColorGreenChanged(){
             var greenValue = VideoTabController.colorGreen
             colorGreenText.text = Math.round(greenValue * 100) + "%"
             colorGreenSlider.value = greenValue
         }
-        onColorBlueChanged:{
+        function onColorBlueChanged(){
             var blueValue = VideoTabController.colorBlue
             colorBlueText.text = Math.round(blueValue * 100) + "%"
             colorBlueSlider.value = blueValue

src/res/qml/video_page/miscvid/VideoMiscGroupBox.qml

@@ -73,14 +73,14 @@ GroupBox {
 
     Connections {
         target: VideoTabController
-        onAllowSupersampleFilteringChanged: {
+        function onAllowSupersampleFilteringChanged() {
             videoAllowSupersampleFilteringToggle.checked = VideoTabController.allowSupersampleFiltering
         }
 
-        onMotionSmoothingChanged: {
+        function onMotionSmoothingChanged() {
             videoMotionSmoothingToggle.checked = VideoTabController.motionSmoothing
         }
-        onIsOverlayMethodActiveChanged:{
+        function onIsOverlayMethodActiveChanged(){
             videoUseOverlayToggle.checked = VideoTabController.isOverlayMethodActive
         }
 

src/res/qml/video_page/overlaycolorbright/OverlayMethodGroupBox.qml

@@ -298,32 +298,33 @@ GroupBox {
     Connections {
         target: VideoTabController
 
-        onBrightnessOpacityValueChanged: {
+        function onBrightnessOpacityValueChanged() {
             var brightvalue = VideoTabController.brightnessOpacityValue
             brightnessSlider.value = brightvalue
             brightnessValueText.text = Math.round(brightvalue*100)+ "%"
+            brightnessSlider.value = VideoTabController.brightnessOpacityValue
         }
-        onBrightnessEnabledChanged: {
+        function onBrightnessEnabledChanged() {
             brightnessToggle.checked = VideoTabController.brightnessEnabled
         }
-        onColorOverlayOpacityChanged:{
+        function onColorOverlayOpacityChanged(){
             opacitySlider.value = VideoTabController.colorOverlayOpacity
         }
-        onColorOverlayEnabledChanged:{
+        function onColorOverlayEnabledChanged(){
             colorToggle.checked = VideoTabController.colorOverlayEnabled
         }
 
-        onColorRedChanged:{
+        function onColorRedChanged(){
             var redValue = VideoTabController.colorRed
             colorRedText.text = Math.round(redValue * 100) + "%"
             colorRedSlider.value = redValue
         }
-        onColorGreenChanged:{
+        function onColorGreenChanged(){
             var greenValue = VideoTabController.colorGreen
             colorGreenText.text = Math.round(greenValue * 100) + "%"
             colorGreenSlider.value = greenValue
         }
-        onColorBlueChanged:{
+        function onColorBlueChanged(){
             var blueValue = VideoTabController.colorBlue
             colorBlueText.text = Math.round(blueValue * 100) + "%"
             colorBlueSlider.value = blueValue

src/res/qml/video_page/profiles/VideoProfileGroupBox.qml

@@ -108,10 +108,10 @@ GroupBox {
     }
     Connections {
         target: VideoTabController
-        onVideoProfilesUpdated: {
+        function onVideoProfilesUpdated() {
             reloadVideoProfiles()
         }
-        onVideoProfileAdded: {
+        function onVideoProfileAdded() {
             videoProfileComboBox.currentIndex = VideoTabController.getVideoProfileCount()
         }
 

src/res/qml/video_page/supersampling/SuperSamplingGroupBox.qml

@@ -133,12 +133,12 @@ GroupBox {
     Connections {
         target: VideoTabController
 
-        onSuperSamplingChanged: {
+        function onSuperSamplingChanged() {
             var s1 = VideoTabController.superSampling
             videoSupersamplingSlider.value = s1
             videoSupersamplingText.text = s1.toFixed(2)
         }
-        onAllowSupersampleOverrideChanged: {
+        function onAllowSupersampleOverrideChanged() {
             videoAllowSupersampleOverrideToggle.checked = VideoTabController.allowSupersampleOverride
             var s1 = VideoTabController.superSampling
             videoSupersamplingSlider.value = s1