From 4180acb1e850a89a064326a191a35f174b0e2b1a Mon Sep 17 00:00:00 2001 From: consti10 Date: Thu, 29 Feb 2024 19:07:54 +0100 Subject: [PATCH] fix layouting for QT6 --- qml/main.qml | 25 +++++++++---------- qml/qml.qrc | 1 + .../dev/AppDeveloperStatsPanel.qml | 6 ++--- qml/ui/elements/ColorDialoque.qml | 15 +++++++++++ 4 files changed, 31 insertions(+), 16 deletions(-) create mode 100644 qml/ui/elements/ColorDialoque.qml diff --git a/qml/main.qml b/qml/main.qml index abb2f9795..f3a4dcf94 100755 --- 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 index 1a14f0176..757cfab5f 100644 --- a/qml/qml.qrc +++ b/qml/qml.qrc @@ -306,5 +306,6 @@ ui/elements/NewSlider.qml ui/sidebar/InfoElement2.qml ui/elements/ErrorMessageBox.qml + ui/elements/ColorDialoque.qml diff --git a/qml/ui/configpopup/dev/AppDeveloperStatsPanel.qml b/qml/ui/configpopup/dev/AppDeveloperStatsPanel.qml index 049217b5f..d3dbdc9ab 100644 --- 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 new file mode 100644 index 000000000..7d023346c --- /dev/null +++ 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){ + + } +} +