Various UI cleanups

emericg · May 2, 2024 · f641789 · f641789
1 parent db7c355
commit f641789
Show file tree

Hide file tree

Showing 12 changed files with 376 additions and 297 deletions.
diff --git a/OffloadBuddy.pro b/OffloadBuddy.pro
@@ -7,7 +7,7 @@ DEFINES+= APP_VERSION=\\\"$$VERSION\\\"
 CONFIG += c++17
 QT     += core qml quickcontrols2 svg
 QT     += multimedia charts
-QT += location
+QT     += location
 
 # Validate Qt version
 !versionAtLeast(QT_VERSION, 6.5) : error("You need at least Qt version 6.5 for $${TARGET}")

diff --git a/qml/ScreenDeviceInfos.qml b/qml/ScreenDeviceInfos.qml
@@ -396,7 +396,7 @@ Loader {
                             DataBarPower {
                                 id: deviceBatteryBar
                                 width: columnStorage.width
-                                height: Theme.componentMargin
+                                height: 16
 
                                 visible: currentDevice.batteryLevel > 0
                                 value: currentDevice.batteryLevel

diff --git a/qml/ScreenMedia.qml b/qml/ScreenMedia.qml
@@ -350,6 +350,14 @@ Loader {
                     anchors.verticalCenter: parent.verticalCenter
                     spacing: Theme.componentMarginS
 
+                    Rectangle { // separator
+                        width: 2; height: 40;
+                        anchors.verticalCenter: parent.verticalCenter
+                        visible: rowActions1.visible
+                        color: Theme.colorHeaderContent
+                        opacity: 0.1
+                    }
+
                     Row {
                         id: rowActions1
                         anchors.verticalCenter: parent.verticalCenter
@@ -392,7 +400,7 @@ Loader {
                     Rectangle { // separator
                         width: 2; height: 40;
                         anchors.verticalCenter: parent.verticalCenter
-                        visible: rowActions1.visible
+                        visible: rowActions2.visible
                         color: Theme.colorHeaderContent
                         opacity: 0.1
                     }

diff --git a/qml/popups/PopupDelete.qml b/qml/popups/PopupDelete.qml
@@ -248,7 +248,7 @@ Popup {
 
             ////////
 
-            ListView {
+            ListView { // filesArea
                 id: listArea
                 anchors.left: parent.left
                 anchors.right: parent.right

diff --git a/qml/popups/PopupEncoding.qml b/qml/popups/PopupEncoding.qml
@@ -468,7 +468,8 @@ Popup {
 
             ListView {
                 id: listArea
-                anchors.fill: parent
+                anchors.left: parent.left
+                anchors.right: parent.right
 
                 visible: recapOpened
 
@@ -1376,7 +1377,7 @@ Popup {
                     anchors.right: parent.right
 
                     Item {
-                        height: Theme.componentMarginXL
+                        height: 24
                         anchors.left: parent.left
                         anchors.right: parent.right
 

diff --git a/qml/popups/PopupExit.qml b/qml/popups/PopupExit.qml
@@ -36,7 +36,7 @@ Popup {
                 color: Theme.colorPrimary
             }
 
-            Rectangle {
+            Rectangle { // border
                 anchors.fill: parent
                 radius: Theme.componentRadius
                 color: "transparent"
@@ -46,7 +46,7 @@ Popup {
             }
 
             layer.enabled: true
-            layer.effect: MultiEffect {
+            layer.effect: MultiEffect { // clip
                 maskEnabled: true
                 maskInverted: false
                 maskThresholdMin: 0.5
@@ -65,7 +65,7 @@ Popup {
         }
 
         layer.enabled: true
-        layer.effect: MultiEffect {
+        layer.effect: MultiEffect { // shadow
             autoPaddingEnabled: true
             shadowEnabled: true
             shadowColor: ThemeEngine.isLight ? "#aa000000" : "#aaffffff"

diff --git a/qml/popups/PopupMediaDirectory.qml b/qml/popups/PopupMediaDirectory.qml
@@ -232,7 +232,6 @@ Popup {
                     }
 
                     ComboBoxThemed {
-                        height: 36
                         anchors.left: parent.left
                         anchors.leftMargin: popupMediaDirectory.legendWidth + 16
                         anchors.right: parent.right
@@ -299,7 +298,6 @@ Popup {
                     }
 
                     ComboBoxThemed {
-                        height: 36
                         anchors.left: parent.left
                         anchors.leftMargin: popupMediaDirectory.legendWidth + 16
                         anchors.right: parent.right
@@ -364,7 +362,6 @@ Popup {
                         id: tfHC
                         anchors.right: parent.right
                         anchors.left: parent.left
-                        height: 36
                         anchors.verticalCenter: parent.verticalCenter
 
                         selectByMouse: true