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
@@ -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