fix layouting for QT6

OpenHD · Feb 29, 2024 · 4180acb · 4180acb
1 parent d3ce14e
commit 4180acb
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 16 deletions.
diff --git a/qml/main.qml b/qml/main.qml
@@ -94,17 +94,6 @@ ApplicationWindow {
             }
         }
 
-        // TODO QT 6
-        ColorPicker {
-            id: colorPicker
-            height: 264
-            width: 380
-            z: 15.0
-            anchors.centerIn: parent
-        }
-
-        // UI areas
-
         HUDOverlayGrid {
             id: hudOverlayGrid
             anchors.fill: parent
@@ -117,12 +106,22 @@ ApplicationWindow {
             layer.enabled: false
         }
 
-
         ConfigPopup {
             id: settings_panel
             visible: false
         }
 
+        // TODO QT 6
+        ColorPicker {
+            id: colorPicker
+            height: 264
+            width: 380
+            z: 15.0
+            anchors.centerIn: parent
+        }
+        //ColorDialoque{
+        //}
+
         WorkaroundMessageBox{
             id: workaroundmessagebox
         }
@@ -149,7 +148,7 @@ ApplicationWindow {
             }
         }
         AnyParamBusyIndicator{
-             z: 10
+            z: 10
         }
 
         Component.onCompleted: {

diff --git a/qml/qml.qrc b/qml/qml.qrc
@@ -306,5 +306,6 @@
         <file>ui/elements/NewSlider.qml</file>
         <file>ui/sidebar/InfoElement2.qml</file>
         <file>ui/elements/ErrorMessageBox.qml</file>
+        <file>ui/elements/ColorDialoque.qml</file>
     </qresource>
 </RCC>
diff --git a/qml/ui/configpopup/dev/AppDeveloperStatsPanel.qml b/qml/ui/configpopup/dev/AppDeveloperStatsPanel.qml
@@ -19,7 +19,7 @@ Rectangle {
     property int rowHeight: 64
     property int text_minHeight: 20
 
-    color: "green"//"#eaeaea"
+    color: "#eaeaea"
 
     function yes_or_no_as_string(yes){
         if(yes) return "Y"
@@ -104,7 +104,7 @@ Rectangle {
                 }
             }
             Row {
-                //width: parent.width
+                spacing: 5
                 visible: _qopenhd.is_linux()
                 Button {
                     text: "Start openhd"
@@ -132,7 +132,7 @@ Rectangle {
                 }
             }
             Row {
-                //width: parent.width
+                spacing: 5
                 Button {
                     font.capitalization: Font.MixedCase
                     text: qsTr("Restart QOpenHD")

diff --git a/qml/ui/elements/ColorDialoque.qml b/qml/ui/elements/ColorDialoque.qml
@@ -0,0 +1,15 @@
+import QtQuick 2.12
+import QtQuick.Dialogs 1.3
+
+ColorDialog {
+    id: colorDialog
+    //selectedColor: settings.color_text
+
+    Component.onCompleted: visible = true
+
+
+    function custom_open(current_color){
+
+    }
+}
+