Fix QML interface for Raspberry Pi

2025-01-31 17:42:55 +08:00 · 2022-01-02 12:34:38 -05:00 · 2022-01-02 12:34:38 -05:00 · 30659ea15d
commit 30659ea15d
parent 6bbff5a976
42 changed files with 197 additions and 257 deletions
--- a/assets/qml/Dashboard/DashboardTitle.qml
+++ b/assets/qml/Dashboard/DashboardTitle.qml
@ -20,11 +20,11 @@
 * THE SOFTWARE.
 */

-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10

-import Qt.labs.settings 1.1
+import Qt.labs.settings 1.0

 import "../Widgets" as Widgets

--- a/assets/qml/Dashboard/ViewOptions.qml
+++ b/assets/qml/Dashboard/ViewOptions.qml
@ -20,10 +20,10 @@
 * THE SOFTWARE.
 */

-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
-import Qt.labs.settings 1.1
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10
+import Qt.labs.settings 1.0

 import "../Widgets" as Widgets

--- a/assets/qml/Dashboard/ViewOptionsDelegate.qml
+++ b/assets/qml/Dashboard/ViewOptionsDelegate.qml
@ -1,6 +1,6 @@
-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10

 import "../Widgets" as Widgets

--- a/assets/qml/Dashboard/WidgetDelegate.qml
+++ b/assets/qml/Dashboard/WidgetDelegate.qml
@ -20,9 +20,9 @@
 * THE SOFTWARE.
 */

-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10

 import SerialStudio 1.0

--- a/assets/qml/Dashboard/WidgetGrid.qml
+++ b/assets/qml/Dashboard/WidgetGrid.qml
@ -20,9 +20,9 @@
 * THE SOFTWARE.
 */

-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10

 import "../Widgets" as Widgets

--- a/assets/qml/Dashboard/WidgetModel.qml
+++ b/assets/qml/Dashboard/WidgetModel.qml
@ -20,7 +20,7 @@
 * THE SOFTWARE.
 */

-import QtQuick 2.12
+import QtQuick 2.10

 Repeater {
    id: root
--- a/assets/qml/FramelessWindow/CustomWindow.qml
+++ b/assets/qml/FramelessWindow/CustomWindow.qml
@ -20,8 +20,8 @@
 * THE SOFTWARE.
 */

-import QtQuick 2.12
-import QtQuick.Window 2.12 as QtWindow
+import QtQuick 2.10
+import QtQuick.Window 2.10 as QtWindow

 import "../Widgets" as Widgets

@ -210,39 +210,6 @@ QtWindow.Window {
        anchors.margins: root.shadowMargin
    }

-    //
-    // Handle for resizing the window
-    // Note: this does not work on macOS, see the following article for more information
-    //       https://www.qt.io/blog/custom-window-decorations
-    //
-    DragHandler {
-        id: resizeHandler
-        target: null
-        enabled: !Cpp_IsMac && Cpp_ThemeManager.customWindowDecorations
-        grabPermissions: TapHandler.TakeOverForbidden
-        onActiveChanged: {
-            if (active) {
-                const p = resizeHandler.centroid.position
-                const b = root.handleSize
-                let e = 0;
-
-                if (p.x < b)
-                    e |= Qt.LeftEdge
-
-                if (p.x >= width - b)
-                    e |= Qt.RightEdge
-
-                if (p.y < b)
-                    e |= Qt.TopEdge
-
-                if (p.y >= height - b)
-                    e |= Qt.BottomEdge
-
-                root.startSystemResize(e)
-            }
-        }
-    }
-
    //
    // Global mouse area to set cursor shape while resizing
    //
--- a/assets/qml/FramelessWindow/ResizeHandles.qml
+++ b/assets/qml/FramelessWindow/ResizeHandles.qml
@ -20,8 +20,8 @@
 * THE SOFTWARE.
 */

-import QtQuick 2.12
-import QtQuick.Window 2.12
+import QtQuick 2.10
+import QtQuick.Window 2.10

 Item {
    id: root
@ -40,7 +40,7 @@ Item {
             (window.visibility !== Window.Maximized)

    //
-    // Right resize handle for macOS
+    // Right resize handle
    //
    MouseArea {
        property bool dragging: false
@ -54,7 +54,6 @@ Item {
        }

        width: handleSize
-        enabled: Cpp_IsMac
        onPressedChanged: dragging = pressed
        onPressed: lastMousePos = Qt.point(mouseX, mouseY)

@ -87,7 +86,6 @@ Item {
        }

        width: handleSize
-        enabled: Cpp_IsMac
        onPressedChanged: dragging = pressed
        onPressed: lastMousePos = Qt.point(mouseX, mouseY)

@ -131,7 +129,6 @@ Item {
        }

        height: handleSize
-        enabled: Cpp_IsMac
        onPressedChanged: dragging = pressed
        onPressed: lastMousePos = Qt.point(mouseX, mouseY)
        onMouseYChanged: {
@ -235,7 +232,6 @@ Item {

        width: handleSize
        height: handleSize
-        enabled: Cpp_IsMac
        onPressedChanged: dragging = pressed
        onMouseXChanged: updateWindowPosition()
        onPressed: lastMousePos = Qt.point(mouseX, mouseY)
--- a/assets/qml/FramelessWindow/Titlebar.qml
+++ b/assets/qml/FramelessWindow/Titlebar.qml
@ -20,10 +20,10 @@
 * THE SOFTWARE.
 */

-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Window 2.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Window 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10

 import "../Widgets" as Widgets

@ -176,32 +176,26 @@ Rectangle {
    }

    //
-    // Window drag handler
+    // Window drag handler & maximize by double click
    //
    Item {
        anchors.fill: parent
        enabled: Cpp_ThemeManager.customWindowDecorations

-        DragHandler {
-            grabPermissions: TapHandler.CanTakeOverFromAnything
-            onActiveChanged: {
-                if (active)
-                    window.startSystemMove()
-            }
-        }
-    }
-
-    //
-    // Window maximize by double click
-    //
        MouseArea {
            anchors.fill: parent
            acceptedButtons: Qt.LeftButton
-        enabled: Cpp_ThemeManager.customWindowDecorations
+
            onDoubleClicked: {
                if (root.maximizeEnabled)
                    root.toggleMaximized()
            }
+
+            onPressedChanged: {
+                if (pressed)
+                    window.startSystemMove()
+            }
+        }
    }

    //
--- a/assets/qml/FramelessWindow/WindowButton.qml
+++ b/assets/qml/FramelessWindow/WindowButton.qml
@ -20,7 +20,7 @@
 * THE SOFTWARE.
 */

-import QtQuick 2.12
+import QtQuick 2.10
 import "../Widgets" as Widgets

 Widgets.Icon {
--- a/assets/qml/FramelessWindow/WindowButtonMacOS.qml
+++ b/assets/qml/FramelessWindow/WindowButtonMacOS.qml
@ -20,7 +20,7 @@
 * THE SOFTWARE.
 */

-import QtQuick 2.12
+import QtQuick 2.10

 Image {
    id: root
--- a/assets/qml/JsonEditor/Footer.qml
+++ b/assets/qml/JsonEditor/Footer.qml
@ -20,9 +20,9 @@
 * THE SOFTWARE.
 */

-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10

 import "../Widgets" as Widgets

--- a/assets/qml/JsonEditor/GroupEditor.qml
+++ b/assets/qml/JsonEditor/GroupEditor.qml
@ -20,9 +20,9 @@
 * THE SOFTWARE.
 */

-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10

 import "../Widgets" as Widgets

--- a/assets/qml/JsonEditor/Header.qml
+++ b/assets/qml/JsonEditor/Header.qml
@ -20,9 +20,9 @@
 * THE SOFTWARE.
 */

-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10

 import "../Widgets" as Widgets

--- a/assets/qml/JsonEditor/JsonDatasetDelegate.qml
+++ b/assets/qml/JsonEditor/JsonDatasetDelegate.qml
@ -20,9 +20,9 @@
 * THE SOFTWARE.
 */

-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10

 import "../Widgets" as Widgets

--- a/assets/qml/JsonEditor/JsonGroupDelegate.qml
+++ b/assets/qml/JsonEditor/JsonGroupDelegate.qml
@ -20,9 +20,9 @@
 * THE SOFTWARE.
 */

-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10

 import "../Widgets" as Widgets

--- a/assets/qml/JsonEditor/TreeView.qml
+++ b/assets/qml/JsonEditor/TreeView.qml
@ -20,9 +20,9 @@
 * THE SOFTWARE.
 */

-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10

 import "../Widgets" as Widgets

--- a/assets/qml/Panes/Console.qml
+++ b/assets/qml/Panes/Console.qml
@ -20,9 +20,9 @@
 * THE SOFTWARE.
 */

-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10

 import "../Widgets" as Widgets

--- a/assets/qml/Panes/Dashboard.qml
+++ b/assets/qml/Panes/Dashboard.qml
@ -20,9 +20,9 @@
 * THE SOFTWARE.
 */

-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10

 import "../Widgets" as Widgets
 import "../Dashboard" as DashboardItems
--- a/assets/qml/Panes/Setup.qml
+++ b/assets/qml/Panes/Setup.qml
@ -20,11 +20,11 @@
 * THE SOFTWARE.
 */

-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10

-import Qt.labs.settings 1.1
+import Qt.labs.settings 1.0

 import "../Widgets" as Widgets
 import "SetupPanes" as SetupPanes
--- a/assets/qml/Panes/SetupPanes/MQTT.qml
+++ b/assets/qml/Panes/SetupPanes/MQTT.qml
@ -20,9 +20,9 @@
 * THE SOFTWARE.
 */

-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10

 import "../../Windows" as Windows

--- a/assets/qml/Panes/SetupPanes/Network.qml
+++ b/assets/qml/Panes/SetupPanes/Network.qml
@ -20,9 +20,9 @@
 * THE SOFTWARE.
 */

-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10

 Control {
    id: root
--- a/assets/qml/Panes/SetupPanes/Serial.qml
+++ b/assets/qml/Panes/SetupPanes/Serial.qml
@ -20,9 +20,9 @@
 * THE SOFTWARE.
 */

-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10

 Control {
    id: root
--- a/assets/qml/Panes/SetupPanes/Settings.qml
+++ b/assets/qml/Panes/SetupPanes/Settings.qml
@ -20,9 +20,9 @@
 * THE SOFTWARE.
 */

-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10

 Control {
    id: root
--- a/assets/qml/Panes/Toolbar.qml
+++ b/assets/qml/Panes/Toolbar.qml
@ -20,10 +20,10 @@
 * THE SOFTWARE.
 */

-import QtQuick 2.12
-import QtQuick.Window 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Window 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10

 import "../Widgets" as Widgets

@ -238,10 +238,10 @@ Control {
            height: parent.height
            Layout.fillWidth: true

-            DragHandler {
-                grabPermissions: TapHandler.CanTakeOverFromAnything
-                onActiveChanged: {
-                    if (active)
+            MouseArea {
+                anchors.fill: parent
+                onPressedChanged: {
+                    if (pressed)
                        window.startSystemMove()
                }
            }
--- a/assets/qml/PlatformDependent/DecentMenuItem.qml
+++ b/assets/qml/PlatformDependent/DecentMenuItem.qml
@ -20,9 +20,9 @@
 * THE SOFTWARE.
 */

-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10

 MenuItem {
    id: root
--- a/assets/qml/PlatformDependent/Menubar.qml
+++ b/assets/qml/PlatformDependent/Menubar.qml
@ -20,8 +20,8 @@
 * THE SOFTWARE.
 */

-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Controls 2.10

 MenuBar {
    id: root
--- a/assets/qml/PlatformDependent/MenubarMacOS.qml
+++ b/assets/qml/PlatformDependent/MenubarMacOS.qml
@ -20,7 +20,7 @@
 * THE SOFTWARE.
 */

-import QtQuick 2.12
+import QtQuick 2.10
 import Qt.labs.platform 1.0

 MenuBar {
--- a/assets/qml/Widgets/Icon.qml
+++ b/assets/qml/Widgets/Icon.qml
@ -20,8 +20,8 @@
 * THE SOFTWARE.
 */

-import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Controls 2.10

 Item {
    id: root
--- a/assets/qml/Widgets/JSONDropArea.qml
+++ b/assets/qml/Widgets/JSONDropArea.qml
@ -20,9 +20,9 @@
 * THE SOFTWARE.
 */

-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10

 DropArea {
    //
--- a/assets/qml/Widgets/Shadow.qml
+++ b/assets/qml/Widgets/Shadow.qml
@ -20,7 +20,7 @@
 * THE SOFTWARE.
 */

-import QtQuick 2.12
+import QtQuick 2.10

 Item {
    id: root
--- a/assets/qml/Widgets/Terminal.qml
+++ b/assets/qml/Widgets/Terminal.qml
@ -20,11 +20,11 @@
 * THE SOFTWARE.
 */

-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10

-import Qt.labs.settings 1.1
+import Qt.labs.settings 1.0
 import SerialStudio 1.0 as SerialStudio

 Item {
--- a/assets/qml/Widgets/Window.qml
+++ b/assets/qml/Widgets/Window.qml
@ -20,9 +20,9 @@
 * THE SOFTWARE.
 */

-import QtQuick 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10

 Page {
    id: root
--- a/assets/qml/Windows/About.qml
+++ b/assets/qml/Windows/About.qml
@ -20,10 +20,10 @@
 * THE SOFTWARE.
 */

-import QtQuick 2.12
-import QtQuick.Window 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Window 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10

 import "../FramelessWindow" as FramelessWindow

@ -94,10 +94,10 @@ FramelessWindow.CustomWindow {
        Item {
            anchors.fill: parent

-            DragHandler {
-                grabPermissions: TapHandler.CanTakeOverFromAnything
-                onActiveChanged: {
-                    if (active)
+            MouseArea {
+                anchors.fill: parent
+                onPressedChanged: {
+                    if (pressed)
                        root.startSystemMove()
                }
            }
--- a/assets/qml/Windows/Acknowledgements.qml
+++ b/assets/qml/Windows/Acknowledgements.qml
@ -20,10 +20,10 @@
 * THE SOFTWARE.
 */

-import QtQuick 2.12
-import QtQuick.Window 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Window 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10

 import "../FramelessWindow" as FramelessWindow

--- a/assets/qml/Windows/CsvPlayer.qml
+++ b/assets/qml/Windows/CsvPlayer.qml
@ -20,10 +20,10 @@
 * THE SOFTWARE.
 */

-import QtQuick 2.12
-import QtQuick.Window 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Window 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10

 import "../FramelessWindow" as FramelessWindow

--- a/assets/qml/Windows/Donate.qml
+++ b/assets/qml/Windows/Donate.qml
@ -20,12 +20,12 @@
 * THE SOFTWARE.
 */

-import QtQuick 2.12
-import QtQuick.Window 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Window 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10

-import Qt.labs.settings 1.1
+import Qt.labs.settings 1.0
 import "../FramelessWindow" as FramelessWindow

 FramelessWindow.CustomWindow {
@ -124,10 +124,10 @@ FramelessWindow.CustomWindow {
        Item {
            anchors.fill: parent

-            DragHandler {
-                grabPermissions: TapHandler.CanTakeOverFromAnything
-                onActiveChanged: {
-                    if (active)
+            MouseArea {
+                anchors.fill: parent
+                onPressedChanged: {
+                    if (pressed)
                        root.startSystemMove()
                }
            }
--- a/assets/qml/Windows/JsonEditor.qml
+++ b/assets/qml/Windows/JsonEditor.qml
@ -20,12 +20,12 @@
 * THE SOFTWARE.
 */

-import QtQuick 2.12
-import QtQuick.Window 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Window 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10

-import Qt.labs.settings 1.1
+import Qt.labs.settings 1.0

 import "../JsonEditor"
 import "../Widgets" as Widgets
--- a/assets/qml/Windows/MQTTConfiguration.qml
+++ b/assets/qml/Windows/MQTTConfiguration.qml
@ -20,12 +20,12 @@
 * THE SOFTWARE.
 */

-import QtQuick 2.12
-import QtQuick.Window 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Window 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10

-import Qt.labs.settings 1.1
+import Qt.labs.settings 1.0

 import "../FramelessWindow" as FramelessWindow

@ -110,21 +110,6 @@ FramelessWindow.CustomWindow {
            }
        }

-        //
-        // Window drag handler
-        //
-        Item {
-            anchors.fill: parent
-
-            DragHandler {
-                grabPermissions: TapHandler.TakeOverForbidden
-                onActiveChanged: {
-                    if (active)
-                        root.startSystemMove()
-                }
-            }
-        }
-
        //
        // Window controls
        //
--- a/assets/qml/Windows/MainWindow.qml
+++ b/assets/qml/Windows/MainWindow.qml
@ -20,12 +20,12 @@
 * THE SOFTWARE.
 */

-import QtQuick 2.12
-import QtQuick.Window 2.12
-import QtQuick.Layouts 1.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Window 2.10
+import QtQuick.Layouts 1.10
+import QtQuick.Controls 2.10

-import Qt.labs.settings 1.1
+import Qt.labs.settings 1.0

 import "../Panes"
 import "../Windows"
--- a/assets/qml/main.qml
+++ b/assets/qml/main.qml
@ -20,9 +20,9 @@
 * THE SOFTWARE.
 */

-import QtQuick 2.12
-import QtQuick.Window 2.12
-import QtQuick.Controls 2.12
+import QtQuick 2.10
+import QtQuick.Window 2.10
+import QtQuick.Controls 2.10

 import "Windows" as Windows

--- a/src/UI/Widgets/Terminal.cpp
+++ b/src/UI/Widgets/Terminal.cpp
@ -604,9 +604,7 @@ QString Widgets::Terminal::vt100Processing(const QString &data)
 //---------------------------------------------------------º-----------------------------------------

 #define QTC_ASSERT(cond, action)                                                         \
-    if (Q_LIKELY(cond))                                                                  \
-    {                                                                                    \
-    }                                                                                    \
+    if (Q_LIKELY(cond)) { }                                                              \
    else                                                                                 \
    {                                                                                    \
        action;                                                                          \