Rearrange settings window.

2018-12-03 16:39:20 +01:00
parent fd2e5ce71e
commit 41413d4712
5 changed files with 100 additions and 131 deletions
--- a/app/qml/SettingsEffectsTab.qml
+++ b/app/qml/SettingsEffectsTab.qml
@@ -23,62 +23,92 @@ import QtQuick.Controls 1.1
 import QtQuick.Layouts 1.1

 Tab{
-    GroupBox{
-        title: qsTr("Effects")
+    ColumnLayout{
        anchors.fill: parent
-        ColumnLayout{
-            anchors.fill: parent
-            spacing: 2
-            CheckableSlider{
-                name: qsTr("Bloom")
-                onNewValue: appSettings.bloom = newValue
-                value: appSettings.bloom
+        spacing: 2
+
+        GroupBox{
+            title: qsTr("Effects")
+            Layout.fillWidth: true
+
+            ColumnLayout {
+                anchors.fill: parent
+
+                CheckableSlider{
+                    name: qsTr("Bloom")
+                    onNewValue: appSettings.bloom = newValue
+                    value: appSettings.bloom
+                }
+                CheckableSlider{
+                    name: qsTr("BurnIn")
+                    onNewValue: appSettings.burnIn = newValue
+                    value: appSettings.burnIn
+                }
+                CheckableSlider{
+                    name: qsTr("Static Noise")
+                    onNewValue: appSettings.staticNoise = newValue
+                    value: appSettings.staticNoise
+                }
+                CheckableSlider{
+                    name: qsTr("Jitter")
+                    onNewValue: appSettings.jitter = newValue
+                    value: appSettings.jitter
+                }
+                CheckableSlider{
+                    name: qsTr("Glow Line")
+                    onNewValue: appSettings.glowingLine = newValue;
+                    value: appSettings.glowingLine
+                }
+                CheckableSlider{
+                    name: qsTr("Screen Curvature")
+                    onNewValue: appSettings.screenCurvature = newValue;
+                    value: appSettings.screenCurvature;
+                }
+                CheckableSlider{
+                    name: qsTr("Ambient Light")
+                    onNewValue: appSettings.ambientLight = newValue;
+                    value: appSettings.ambientLight
+                    enabled: appSettings.framesIndex !== 0
+                }
+                CheckableSlider{
+                    name: qsTr("Flickering")
+                    onNewValue: appSettings.flickering = newValue;
+                    value: appSettings.flickering;
+                }
+                CheckableSlider{
+                    name: qsTr("Horizontal Sync")
+                    onNewValue: appSettings.horizontalSync = newValue;
+                    value: appSettings.horizontalSync;
+                }
+                CheckableSlider{
+                    name: qsTr("RGB Shift")
+                    onNewValue: appSettings.rbgShift = newValue;
+                    value: appSettings.rbgShift;
+                }
            }
-            CheckableSlider{
-                name: qsTr("BurnIn")
-                onNewValue: appSettings.burnIn = newValue
-                value: appSettings.burnIn
-            }
-            CheckableSlider{
-                name: qsTr("Static Noise")
-                onNewValue: appSettings.staticNoise = newValue
-                value: appSettings.staticNoise
-            }
-            CheckableSlider{
-                name: qsTr("Jitter")
-                onNewValue: appSettings.jitter = newValue
-                value: appSettings.jitter
-            }
-            CheckableSlider{
-                name: qsTr("Glow Line")
-                onNewValue: appSettings.glowingLine = newValue;
-                value: appSettings.glowingLine
-            }
-            CheckableSlider{
-                name: qsTr("Screen Curvature")
-                onNewValue: appSettings.screenCurvature = newValue;
-                value: appSettings.screenCurvature;
-            }
-            CheckableSlider{
-                name: qsTr("Ambient Light")
-                onNewValue: appSettings.ambientLight = newValue;
-                value: appSettings.ambientLight
-                enabled: appSettings.framesIndex !== 0
-            }
-            CheckableSlider{
-                name: qsTr("Flickering")
-                onNewValue: appSettings.flickering = newValue;
-                value: appSettings.flickering;
-            }
-            CheckableSlider{
-                name: qsTr("Horizontal Sync")
-                onNewValue: appSettings.horizontalSync = newValue;
-                value: appSettings.horizontalSync;
-            }
-            CheckableSlider{
-                name: qsTr("RGB Shift")
-                onNewValue: appSettings.rbgShift = newValue;
-                value: appSettings.rbgShift;
+        }
+
+        GroupBox{
+            title: qsTr("Lights")
+            Layout.fillWidth: true
+            GridLayout{
+                anchors.fill: parent
+                columns: 2
+                Label{ text: qsTr("Brightness") }
+                SimpleSlider{
+                    onValueChanged: appSettings.brightness = value
+                    value: appSettings.brightness
+                }
+                Label{ text: qsTr("Contrast") }
+                SimpleSlider{
+                    onValueChanged: appSettings.contrast = value
+                    value: appSettings.contrast
+                }
+                Label{ text: qsTr("Opacity") }
+                SimpleSlider{
+                    onValueChanged: appSettings.windowOpacity = value
+                    value: appSettings.windowOpacity
+                }
            }
        }
    }