investigating new layouts for the autogain window

wwmm · Sep 18, 2024 · ec0d5a5 · ec0d5a5
1 parent 8babfe6
commit ec0d5a5
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 24 deletions.
diff --git a/src/contents/ui/Autogain.qml b/src/contents/ui/Autogain.qml
@@ -11,12 +11,20 @@ Kirigami.ScrollablePage {
     property var pluginDB
 
     ColumnLayout {
+        Layout.fillWidth: true
+        Layout.fillHeight: true
+
         Kirigami.CardsLayout {
-            maximumColumnWidth: Kirigami.Units.gridUnit * 30
+            id: cardLayout
+
+            Layout.fillWidth: true
+            maximumColumnWidth: Kirigami.Units.gridUnit * 20
 
             Kirigami.Card {
                 id: cardControls
 
+                implicitWidth: cardLayout.maximumColumnWidth
+
                 header: Kirigami.Heading {
                     text: i18n("Controls")
                     level: 2
@@ -84,33 +92,22 @@ Kirigami.ScrollablePage {
             }
 
             Kirigami.Card {
-                // contentItem: GridLayout {
-                //     Layout.fillWidth: true
-                //     columns: 3
-                //     columnSpacing: Kirigami.Units.smallSpacing
-                //     FormCard.FormTextDelegate {
-                //         text: i18n("Integrated")
-                //     }
-                //     Controls.ProgressBar {
-                //         Layout.fillWidth: true
-                //         from: 0
-                //         to: 100
-                //         value: 50
-                //         indeterminate: false
-                //     }
-                //     FormCard.FormTextDelegate {
-                //         text: i18n("LUFS")
-                //     }
-                // }
-
                 id: cardLevels
 
+                implicitWidth: cardLayout.maximumColumnWidth
+
                 header: Kirigami.Heading {
                     text: i18n("Loudness")
                     level: 2
                 }
 
                 contentItem: ColumnLayout {
+                    anchors {
+                        left: parent.left
+                        right: parent.right
+                        top: parent.top
+                    }
+
                     EeProgressBar {
                         label: i18n("Momentary")
                         unit: i18n("LUFS")
@@ -129,14 +126,42 @@ Kirigami.ScrollablePage {
                         value: 0.8
                     }
 
+                    EeProgressBar {
+                        label: i18n("Relative")
+                        unit: i18n("LUFS")
+                        value: 0.2
+                    }
+
+                    EeProgressBar {
+                        label: i18n("Range")
+                        unit: i18n("LU")
+                        value: 0.7
+                    }
+
+                    EeProgressBar {
+                        label: i18n("Loudness")
+                        unit: i18n("LUFS")
+                        value: 0.6
+                    }
+
+                    EeProgressBar {
+                        label: i18n("Output Gain")
+                        unit: i18n("dB")
+                        value: 0.3
+                    }
+
                 }
 
             }
 
         }
 
-        EeInputOutputGain {
-            Layout.fillWidth: true
+        Kirigami.Card {
+
+            contentItem: EeInputOutputGain {
+                Layout.fillWidth: true
+            }
+
         }
 
     }

diff --git a/src/contents/ui/EeProgressBar.qml b/src/contents/ui/EeProgressBar.qml
@@ -22,7 +22,7 @@ FormCard.AbstractFormDelegate {
 
     background: Rectangle {
         anchors.fill: parent
-        color: Kirigami.Theme.activeBackgroundColor
+        color: Kirigami.Theme.neutralBackgroundColor
         radius: 3
     }
 
@@ -33,7 +33,7 @@ FormCard.AbstractFormDelegate {
             width: clampedValue / (to - from) * parent.width
             height: parent.height
             color: Kirigami.Theme.alternateBackgroundColor
-            radius: 3
+            radius: 5
         }
 
         RowLayout {