merged master to brightness

2019-04-12 18:25:14 -05:00
parent e2e68ecc89 b32d621994
commit 9de14e20cb
34 changed files with 1059 additions and 478 deletions
@@ -340,6 +340,30 @@ MyStackViewPage {
                    }
                }

+                Item {
+                    Layout.fillWidth: true
+                }
+
+                MyPushButton {
+                    id: spaceLogMatrices
+                    Layout.preferredWidth: 250
+                    visible: MoveCenterTabController.showLogMatricesButton
+                    text: "Log Matrices"
+                    onClicked: {
+                        MoveCenterTabController.outputLogPoses()
+                    }
+                }
+
+                MyPushButton {
+                    id: spaceSeatedRecenter
+                    Layout.preferredWidth: 250
+                    visible: false
+                    text: "Seated Recenter"
+                    onClicked: {
+                        MoveCenterTabController.updateSeatedResetData()
+                    }
+                }
+
            }
        }

@@ -356,19 +380,14 @@ MyStackViewPage {
 			lockXToggle.checked = MoveCenterTabController.lockXToggle
 			lockYToggle.checked = MoveCenterTabController.lockYToggle
 			lockZToggle.checked = MoveCenterTabController.lockZToggle
+            spaceLogMatrices.visible = MoveCenterTabController.showLogMatricesButton
 			
            if (MoveCenterTabController.trackingUniverse === 0) {
                spaceModeText.text = "Sitting"
-                spaceRotationPlusButton.enabled = false
-                spaceRotationMinusButton.enabled = false
-                spaceRotationSlider.enabled = false
-                spaceRotationText.text = "-"
+                spaceSeatedRecenter.visible = true
            } else if (MoveCenterTabController.trackingUniverse === 1) {
                spaceModeText.text = "Standing"
-                spaceRotationPlusButton.enabled = true
-                spaceRotationMinusButton.enabled = true
-                spaceRotationSlider.enabled = true
-                spaceRotationText.text = "0°"
+                spaceSeatedRecenter.visible = false
            } else {
                spaceModeText.text = "Unknown(" + MoveCenterTabController.trackingUniverse + ")"
            }
@@ -407,16 +426,10 @@ MyStackViewPage {
            onTrackingUniverseChanged: {
                if (MoveCenterTabController.trackingUniverse === 0) {
                    spaceModeText.text = "Sitting"
-                    spaceRotationPlusButton.enabled = false
-                    spaceRotationMinusButton.enabled = false
-                    spaceRotationSlider.enabled = false
-                    spaceRotationText.text = "-"
+                    spaceSeatedRecenter.visible = true
                } else if (MoveCenterTabController.trackingUniverse === 1) {
                    spaceModeText.text = "Standing"
-                    spaceRotationPlusButton.enabled = true
-                    spaceRotationMinusButton.enabled = true
-                    spaceRotationSlider.enabled = true
-                    spaceRotationText.text = "0°"
+                    spaceSeatedRecenter.visible = false
                } else {
                    spaceModeText.text = "Unknown(" + MoveCenterTabController.trackingUniverse + ")"
                }
@@ -115,6 +115,17 @@ MyStackViewPage {
                       }
                   }

+                   MyPushButton {
+                       id: desktopOverlayButton
+                       activationSoundEnabled: false
+                       text: "Desktop Overlay"
+                       Layout.fillWidth: true
+                       onClicked: {
+                           MyResources.playFocusChangedSound()
+                           mainView.push(desktopOverlayPage)
+                       }
+                   }
+
                   MyPushButton {
                       id: statisticsButton
                       activationSoundEnabled: false
@@ -26,6 +26,14 @@ MyStackViewPage {
            }
        }

+        MyToggleButton {
+            id: allowExternalEditsToggle
+            text: "Allow External App Chaperone Edits (Danger)"
+            onCheckedChanged: {
+                MoveCenterTabController.setAllowExternalEdits(checked, true)
+            }
+        }
+
        Item {
            Layout.fillHeight: true
        }
@@ -33,6 +41,7 @@ MyStackViewPage {
        Component.onCompleted: {
            settingsAutoStartToggle.checked = SettingsTabController.autoStartEnabled
            forceReviveToggle.checked = SettingsTabController.forceRevivePage
+            allowExternalEditsToggle.checked = MoveCenterTabController.allowExternalEdits
        }

        Connections {
@@ -44,5 +53,12 @@ MyStackViewPage {
                forceReviveToggle.checked = SettingsTabController.forceRevivePage
            }
        }
+
+        Connections {
+            target: MoveCenterTabController
+            onAllowExternalEditsChanged: {
+                allowExternalEditsToggle.checked = MoveCenterTabController.allowExternalEdits
+            }
+        }
    }
 }
@@ -0,0 +1,92 @@
+import QtQuick 2.7
+import QtQuick.Controls 2.0
+import QtQuick.Layouts 1.3
+import ovras.advsettings 1.0
+
+GroupBox {
+    // Public properties
+    // Overload
+    property alias headerMessage: headerText.text
+    property alias sliderText: steamDesktopForwardText.text
+    property alias sliderValue: steamDesktopForwardSlider.value
+    property alias lowerLimit: steamDesktopForwardSlider.from
+    property alias upperLimit: steamDesktopForwardSlider.to
+
+
+    function onValueChanged(value) {
+
+    }
+
+    function onComponentComplete() {
+
+    }
+
+
+    // Private properties
+    id: sliderBox
+    Layout.fillWidth: true
+    label: MyText {
+        id: headerText
+        leftPadding: 10
+        text: "MISSING HEADER TEXT"
+        bottomPadding: -10
+    }
+    background: Rectangle {
+        color: "transparent"
+        border.color: "#ffffff"
+        radius: 8
+    }
+
+    property real sliderStepSize: 0.10
+    readonly property real rightLeftLimit: 4.0
+
+    ColumnLayout {
+        anchors.fill: parent
+
+        LineSeparator {
+        }
+
+        ColumnLayout {
+            RowLayout {
+                MyPushButton2 {
+                    Layout.preferredWidth: 40
+                    text: "-"
+                    onClicked: {
+                        steamDesktopForwardSlider.value -= sliderStepSize
+                    }
+                }
+
+                MySlider {
+                    id: steamDesktopForwardSlider
+                    from: -rightLeftLimit
+                    to: rightLeftLimit
+                    stepSize: sliderStepSize
+                    Layout.fillWidth: true
+                    onValueChanged: {
+                        sliderBox.onValueChanged(this.value)
+                    }
+                }
+
+                MyPushButton2 {
+                    Layout.preferredWidth: 40
+                    text: "+"
+                    onClicked: {
+                        steamDesktopForwardSlider.value += sliderStepSize
+                    }
+                }
+
+                MyTextField {
+                    id: steamDesktopForwardText
+                    text: "0.0"
+                    keyBoardUID: 611
+                    Layout.preferredWidth: 100
+                    Layout.leftMargin: 10
+                    horizontalAlignment: Text.AlignHCenter
+                }
+            }
+        }
+    }
+    Component.onCompleted: {
+        sliderBox.onComponentComplete()
+    }
+}
@@ -6,6 +6,7 @@ import "../utilities_page"
 import "../audio_page"
 import "../motion_page"
 import "../video_page"
+import "../desktop_overlay_page"

 Rectangle {
    id: root
@@ -76,6 +77,10 @@ Rectangle {
        stackView: mainView
        visible:false
    }
+    property DesktopOverlayPage desktopOverlayPage: DesktopOverlayPage {
+        stackView: mainView
+        visible: false
+    }

    StackView {
        id: mainView
@@ -0,0 +1,40 @@
+import QtQuick 2.7
+import QtQuick.Controls 2.0
+import QtQuick.Layouts 1.3
+import ovras.advsettings 1.0
+import "translation_left_right"
+import "translation_back_forwards"
+import "translation_up_down"
+import "desktop_size"
+import "../common"
+
+MyStackViewPage {
+    headerText: "Desktop Overlay"
+
+    content: ColumnLayout {
+        spacing: 18
+
+        MyText {
+            Layout.alignment: Qt.AlignHCenter
+            horizontalAlignment: Text.AlignHCenter
+            text: "Reopen overlay to apply."
+        }
+
+        SteamDesktopGroupBox {
+        }
+
+        SteamDesktopTranslationUpDown {
+        }
+
+        SteamDesktopTranslationBackForwards {
+        }
+
+        SteamDesktopTranslationLeftRight {
+        }
+
+        Item {
+            Layout.fillHeight: true
+        }
+
+    }
+}
@@ -0,0 +1,22 @@
+import QtQuick 2.7
+import QtQuick.Controls 2.0
+import QtQuick.Layouts 1.3
+import ovras.advsettings 1.0
+import "../../common"
+
+FullWidthSliderBox {
+    headerMessage: "Overlay Width"
+
+    lowerLimit: 0.0
+    upperLimit: 32.0
+    sliderStepSize: 0.5
+
+    function onValueChanged(value) {
+        DesktopOverlay.width = value
+        sliderText = value.toFixed(2)
+    }
+    function onComponentComplete() {
+        sliderValue = DesktopOverlay.width
+    }
+}
+
@@ -0,0 +1,21 @@
+import QtQuick 2.7
+import QtQuick.Controls 2.0
+import QtQuick.Layouts 1.3
+import ovras.advsettings 1.0
+import "../../common"
+
+FullWidthSliderBox {
+    headerMessage: "Forwards/Backwards Translation"
+
+    lowerLimit: -4.0
+    upperLimit: 4.0
+    sliderStepSize: 0.10
+
+    function onValueChanged(value) {
+        DesktopOverlay.forwardsMovement = value
+        sliderText = value.toFixed(2)
+    }
+    function onComponentComplete() {
+        sliderValue = DesktopOverlay.forwardsMovement
+    }
+}
@@ -0,0 +1,21 @@
+import QtQuick 2.7
+import QtQuick.Controls 2.0
+import QtQuick.Layouts 1.3
+import ovras.advsettings 1.0
+import "../../common"
+
+FullWidthSliderBox {
+    headerMessage: "Left/Right Translation"
+
+    lowerLimit: -4.0
+    upperLimit: 4.0
+    sliderStepSize: 0.10
+
+    function onValueChanged(value) {
+        DesktopOverlay.rightMovement = value
+        sliderText = value.toFixed(2)
+    }
+    function onComponentComplete() {
+        sliderValue = DesktopOverlay.rightMovement
+    }
+}
@@ -0,0 +1,21 @@
+import QtQuick 2.7
+import QtQuick.Controls 2.0
+import QtQuick.Layouts 1.3
+import ovras.advsettings 1.0
+import "../../common"
+
+FullWidthSliderBox {
+    headerMessage: "Up/Down Translation"
+
+    lowerLimit: -4.0
+    upperLimit: 4.0
+    sliderStepSize: 0.10
+
+    function onValueChanged(value) {
+        DesktopOverlay.height = value
+        sliderText = value.toFixed(2)
+    }
+    function onComponentComplete() {
+        sliderValue = DesktopOverlay.height
+    }
+}
@@ -4,7 +4,6 @@ import QtQuick.Layouts 1.3
 import ovras.advsettings 1.0
 import "media_keys"
 import "alarm_clock"
-import "desktop_size"
 import "keyboard_utils"
 import "../common"

@@ -22,10 +21,6 @@ MyStackViewPage {
            id: alarmGroupBox
        }

-        SteamDesktopGroupBox {
-            id: steamDesktopGroupBox
-        }
-
        MediaControllerKeys {
            id: mediaKeysGroupBox
        }
@@ -1,108 +0,0 @@
-import QtQuick 2.7
-import QtQuick.Controls 2.0
-import QtQuick.Layouts 1.3
-import ovras.advsettings 1.0
-import "../../common"
-
-GroupBox {
-    id: steamDesktopGroupBox
-    Layout.fillWidth: true
-    
-    label: MyText {
-        leftPadding: 10
-        text: "Steam Desktop Overlay Width"
-        bottomPadding: -10
-    }
-    background: Rectangle {
-        color: "transparent"
-        border.color: "#ffffff"
-        radius: 8
-    }
-    ColumnLayout {
-        anchors.fill: parent
-        
-        Rectangle {
-            color: "#ffffff"
-            height: 1
-            Layout.fillWidth: true
-            Layout.bottomMargin: 5
-        }
-        
-        ColumnLayout {
-            RowLayout {
-                MyPushButton2 {
-                    id: steamDesktopWidthMinusButton
-                    Layout.preferredWidth: 40
-                    text: "-"
-                    onClicked: {
-                        steamDesktopWidthSlider.value -= 1.0
-                    }
-                }
-                
-                MySlider {
-                    id: steamDesktopWidthSlider
-                    from: 0.1
-                    to: 32.0
-                    stepSize: 0.1
-                    value: 1.0
-                    Layout.fillWidth: true
-                    onPositionChanged: {
-                        var val = this.from + ( this.position  * (this.to - this.from))
-                        steamDesktopWidthText.text = val.toFixed(1)
-                    }
-                    onValueChanged: {
-                        UtilitiesTabController.setSteamDesktopOverlayWidth(value, false)
-                        steamDesktopWidthText.text = value.toFixed(1)
-                    }
-                }
-                
-                MyPushButton2 {
-                    id: steamDesktopWidthPlusButton
-                    Layout.preferredWidth: 40
-                    text: "+"
-                    onClicked: {
-                        steamDesktopWidthSlider.value += 1.0
-                    }
-                }
-                
-                MyTextField {
-                    id: steamDesktopWidthText
-                    text: "0.0"
-                    keyBoardUID: 611
-                    Layout.preferredWidth: 100
-                    Layout.leftMargin: 10
-                    horizontalAlignment: Text.AlignHCenter
-                    function onInputEvent(input) {
-                        var val = parseFloat(input)
-                        if (!isNaN(val)) {
-                            if (val < 0.1) {
-                                val = 0.1
-                            }
-                            steamDesktopWidthSlider.value = val
-                            UtilitiesTabController.setSteamDesktopOverlayWidth(val, false)
-                        }
-                        text = UtilitiesTabController.steamDesktopOverlayWidth.toFixed(1)
-                    }
-                }
-            }
-        }
-    }
-    Component.onCompleted: {
-        steamDesktopGroupBox.visible = UtilitiesTabController.steamDesktopOverlayAvailable
-        if (steamDesktopGroupBox.visible) {
-            steamDesktopWidthSlider.value = UtilitiesTabController.steamDesktopOverlayWidth
-        }
-    }
-    Connections {
-        target: UtilitiesTabController
-        onSteamDesktopOverlayAvailableChanged: {
-            steamDesktopGroupBox.visible = UtilitiesTabController.steamDesktopOverlayAvailable
-            if (steamDesktopGroupBox.visible) {
-                steamDesktopWidthSlider.value = UtilitiesTabController.steamDesktopOverlayWidth
-            }
-        }
-        onSteamDesktopOverlayWidthChanged: {
-            steamDesktopWidthSlider.value = UtilitiesTabController.steamDesktopOverlayWidth
-        }
-    }
-}