QT/Serial-Studio
1
0
Fork 0
mirror of https://github.com/Serial-Studio/Serial-Studio.git synced 2025-01-31 17:42:55 +08:00
Code Issues Projects Releases Wiki Activity

Fix QML interface for Raspberry Pi

Browse Source
This commit is contained in:
Alex Spataru 2022-01-02 12:34:38 -05:00
parent 6bbff5a976
commit 30659ea15d
42 changed files with 197 additions and 257 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
assets/qml/Dashboard/DashboardTitle.qml
View File

@ -20,11 +20,11 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
import QtQuick 2.12 import QtQuick 2.10
import QtQuick.Layouts 1.12 import QtQuick.Layouts 1.10
import QtQuick.Controls 2.12 import QtQuick.Controls 2.10
import Qt.labs.settings 1.1 import Qt.labs.settings 1.0
import "../Widgets" as Widgets import "../Widgets" as Widgets

8
assets/qml/Dashboard/ViewOptions.qml
View File

@ -20,10 +20,10 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
import QtQuick 2.12 import QtQuick 2.10
import QtQuick.Layouts 1.12 import QtQuick.Layouts 1.10
import QtQuick.Controls 2.12 import QtQuick.Controls 2.10
import Qt.labs.settings 1.1 import Qt.labs.settings 1.0
import "../Widgets" as Widgets import "../Widgets" as Widgets

6
assets/qml/Dashboard/ViewOptionsDelegate.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.12 import QtQuick 2.10
import QtQuick.Layouts 1.12 import QtQuick.Layouts 1.10
import QtQuick.Controls 2.12 import QtQuick.Controls 2.10
import "../Widgets" as Widgets import "../Widgets" as Widgets

6
assets/qml/Dashboard/WidgetDelegate.qml
View File

@ -20,9 +20,9 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
import QtQuick 2.12 import QtQuick 2.10
import QtQuick.Layouts 1.12 import QtQuick.Layouts 1.10
import QtQuick.Controls 2.12 import QtQuick.Controls 2.10
import SerialStudio 1.0 import SerialStudio 1.0

6
assets/qml/Dashboard/WidgetGrid.qml
View File

@ -20,9 +20,9 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
import QtQuick 2.12 import QtQuick 2.10
import QtQuick.Layouts 1.12 import QtQuick.Layouts 1.10
import QtQuick.Controls 2.12 import QtQuick.Controls 2.10
import "../Widgets" as Widgets import "../Widgets" as Widgets

2
assets/qml/Dashboard/WidgetModel.qml
View File

@ -20,7 +20,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
import QtQuick 2.12 import QtQuick 2.10
Repeater { Repeater {
id: root id: root

47
assets/qml/FramelessWindow/CustomWindow.qml
View File

@ -20,8 +20,8 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
import QtQuick 2.12 import QtQuick 2.10
import QtQuick.Window 2.12 as QtWindow import QtQuick.Window 2.10 as QtWindow
import "../Widgets" as Widgets import "../Widgets" as Widgets
@ -63,7 +63,7 @@ QtWindow.Window {
readonly property int handleSize: radius > 0 ? radius + shadowMargin + 10 : 0 readonly property int handleSize: radius > 0 ? radius + shadowMargin + 10 : 0
readonly property int radius: Cpp_ThemeManager.customWindowDecorations ? readonly property int radius: Cpp_ThemeManager.customWindowDecorations ?
(((root.visibility === QtWindow.Window.Maximized && (((root.visibility === QtWindow.Window.Maximized &&
maximizeEnabled) || isFullscreen) ? 0 : 10) : 0 maximizeEnabled) || isFullscreen) ? 0 : 10) : 0
// //
// Visibility properties // Visibility properties
@ -77,10 +77,10 @@ QtWindow.Window {
readonly property int customFlags: { readonly property int customFlags: {
// Setup frameless window flags // Setup frameless window flags
var flags = Qt.Window | var flags = Qt.Window |
Qt.CustomizeWindowHint | Qt.CustomizeWindowHint |
Qt.FramelessWindowHint | Qt.FramelessWindowHint |
Qt.WindowSystemMenuHint | Qt.WindowSystemMenuHint |
Qt.WindowMinMaxButtonsHint Qt.WindowMinMaxButtonsHint
// //
// The macOS window manager is able to generate shadows for Qt frameless // The macOS window manager is able to generate shadows for Qt frameless
@ -210,39 +210,6 @@ QtWindow.Window {
anchors.margins: root.shadowMargin 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 // Global mouse area to set cursor shape while resizing
// //

10
assets/qml/FramelessWindow/ResizeHandles.qml
View File

@ -20,8 +20,8 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
import QtQuick 2.12 import QtQuick 2.10
import QtQuick.Window 2.12 import QtQuick.Window 2.10
Item { Item {
id: root id: root
@ -40,7 +40,7 @@ Item {
(window.visibility !== Window.Maximized) (window.visibility !== Window.Maximized)
// //
// Right resize handle for macOS // Right resize handle
// //
MouseArea { MouseArea {
property bool dragging: false property bool dragging: false
@ -54,7 +54,6 @@ Item {
} }
width: handleSize width: handleSize
enabled: Cpp_IsMac
onPressedChanged: dragging = pressed onPressedChanged: dragging = pressed
onPressed: lastMousePos = Qt.point(mouseX, mouseY) onPressed: lastMousePos = Qt.point(mouseX, mouseY)
@ -87,7 +86,6 @@ Item {
} }
width: handleSize width: handleSize
enabled: Cpp_IsMac
onPressedChanged: dragging = pressed onPressedChanged: dragging = pressed
onPressed: lastMousePos = Qt.point(mouseX, mouseY) onPressed: lastMousePos = Qt.point(mouseX, mouseY)
@ -131,7 +129,6 @@ Item {
} }
height: handleSize height: handleSize
enabled: Cpp_IsMac
onPressedChanged: dragging = pressed onPressedChanged: dragging = pressed
onPressed: lastMousePos = Qt.point(mouseX, mouseY) onPressed: lastMousePos = Qt.point(mouseX, mouseY)
onMouseYChanged: { onMouseYChanged: {
@ -235,7 +232,6 @@ Item {
width: handleSize width: handleSize
height: handleSize height: handleSize
enabled: Cpp_IsMac
onPressedChanged: dragging = pressed onPressedChanged: dragging = pressed
onMouseXChanged: updateWindowPosition() onMouseXChanged: updateWindowPosition()
onPressed: lastMousePos = Qt.point(mouseX, mouseY) onPressed: lastMousePos = Qt.point(mouseX, mouseY)

38
assets/qml/FramelessWindow/Titlebar.qml
View File

@ -20,10 +20,10 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
import QtQuick 2.12 import QtQuick 2.10
import QtQuick.Layouts 1.12 import QtQuick.Window 2.10
import QtQuick.Window 2.12 import QtQuick.Layouts 1.10
import QtQuick.Controls 2.12 import QtQuick.Controls 2.10
import "../Widgets" as Widgets import "../Widgets" as Widgets
@ -176,34 +176,28 @@ Rectangle {
} }
// //
// Window drag handler // Window drag handler & maximize by double click
// //
Item { Item {
anchors.fill: parent anchors.fill: parent
enabled: Cpp_ThemeManager.customWindowDecorations enabled: Cpp_ThemeManager.customWindowDecorations
DragHandler { MouseArea {
grabPermissions: TapHandler.CanTakeOverFromAnything anchors.fill: parent
onActiveChanged: { acceptedButtons: Qt.LeftButton
if (active)
onDoubleClicked: {
if (root.maximizeEnabled)
root.toggleMaximized()
}
onPressedChanged: {
if (pressed)
window.startSystemMove() window.startSystemMove()
} }
} }
} }
//
// Window maximize by double click
//
MouseArea {
anchors.fill: parent
acceptedButtons: Qt.LeftButton
enabled: Cpp_ThemeManager.customWindowDecorations
onDoubleClicked: {
if (root.maximizeEnabled)
root.toggleMaximized()
}
}
// //
// macOS layout // macOS layout
// //

2
assets/qml/FramelessWindow/WindowButton.qml
View File

@ -20,7 +20,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
import QtQuick 2.12 import QtQuick 2.10
import "../Widgets" as Widgets import "../Widgets" as Widgets
Widgets.Icon { Widgets.Icon {

2
assets/qml/FramelessWindow/WindowButtonMacOS.qml
View File

@ -20,7 +20,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
import QtQuick 2.12 import QtQuick 2.10
Image { Image {
id: root id: root

6
assets/qml/JsonEditor/Footer.qml
View File

@ -20,9 +20,9 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
import QtQuick 2.12 import QtQuick 2.10
import QtQuick.Layouts 1.12 import QtQuick.Layouts 1.10
import QtQuick.Controls 2.12 import QtQuick.Controls 2.10
import "../Widgets" as Widgets import "../Widgets" as Widgets

6
assets/qml/JsonEditor/GroupEditor.qml
View File

@ -20,9 +20,9 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
import QtQuick 2.12 import QtQuick 2.10
import QtQuick.Layouts 1.12 import QtQuick.Layouts 1.10
import QtQuick.Controls 2.12 import QtQuick.Controls 2.10
import "../Widgets" as Widgets import "../Widgets" as Widgets

6
assets/qml/JsonEditor/Header.qml
View File

@ -20,9 +20,9 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
import QtQuick 2.12 import QtQuick 2.10
import QtQuick.Layouts 1.12 import QtQuick.Layouts 1.10
import QtQuick.Controls 2.12 import QtQuick.Controls 2.10
import "../Widgets" as Widgets import "../Widgets" as Widgets

6
assets/qml/JsonEditor/JsonDatasetDelegate.qml
View File

@ -20,9 +20,9 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
import QtQuick 2.12 import QtQuick 2.10
import QtQuick.Layouts 1.12 import QtQuick.Layouts 1.10
import QtQuick.Controls 2.12 import QtQuick.Controls 2.10
import "../Widgets" as Widgets import "../Widgets" as Widgets

6
assets/qml/JsonEditor/JsonGroupDelegate.qml
View File

@ -20,9 +20,9 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
import QtQuick 2.12 import QtQuick 2.10
import QtQuick.Layouts 1.12 import QtQuick.Layouts 1.10
import QtQuick.Controls 2.12 import QtQuick.Controls 2.10
import "../Widgets" as Widgets import "../Widgets" as Widgets

6
assets/qml/JsonEditor/TreeView.qml
View File

@ -20,9 +20,9 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
import QtQuick 2.12 import QtQuick 2.10
import QtQuick.Layouts 1.12 import QtQuick.Layouts 1.10
import QtQuick.Controls 2.12 import QtQuick.Controls 2.10
import "../Widgets" as Widgets import "../Widgets" as Widgets

6
assets/qml/Panes/Console.qml
View File

@ -20,9 +20,9 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
import QtQuick 2.12 import QtQuick 2.10
import QtQuick.Layouts 1.12 import QtQuick.Layouts 1.10
import QtQuick.Controls 2.12 import QtQuick.Controls 2.10
import "../Widgets" as Widgets import "../Widgets" as Widgets

6
assets/qml/Panes/Dashboard.qml
View File

@ -20,9 +20,9 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
import QtQuick 2.12 import QtQuick 2.10
import QtQuick.Layouts 1.12 import QtQuick.Layouts 1.10
import QtQuick.Controls 2.12 import QtQuick.Controls 2.10
import "../Widgets" as Widgets import "../Widgets" as Widgets
import "../Dashboard" as DashboardItems import "../Dashboard" as DashboardItems

8
assets/qml/Panes/Setup.qml
View File

@ -20,11 +20,11 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
import QtQuick 2.12 import QtQuick 2.10
import QtQuick.Layouts 1.12 import QtQuick.Layouts 1.10
import QtQuick.Controls 2.12 import QtQuick.Controls 2.10
import Qt.labs.settings 1.1 import Qt.labs.settings 1.0
import "../Widgets" as Widgets import "../Widgets" as Widgets
import "SetupPanes" as SetupPanes import "SetupPanes" as SetupPanes

6
assets/qml/Panes/SetupPanes/MQTT.qml
View File

@ -20,9 +20,9 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
import QtQuick 2.12 import QtQuick 2.10
import QtQuick.Layouts 1.12 import QtQuick.Layouts 1.10
import QtQuick.Controls 2.12 import QtQuick.Controls 2.10
import "../../Windows" as Windows import "../../Windows" as Windows

6
assets/qml/Panes/SetupPanes/Network.qml
View File

@ -20,9 +20,9 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
import QtQuick 2.12 import QtQuick 2.10
import QtQuick.Layouts 1.12 import QtQuick.Layouts 1.10
import QtQuick.Controls 2.12 import QtQuick.Controls 2.10
Control { Control {
id: root id: root

6
assets/qml/Panes/SetupPanes/Serial.qml
View File

@ -20,9 +20,9 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
import QtQuick 2.12 import QtQuick 2.10
import QtQuick.Layouts 1.12 import QtQuick.Layouts 1.10
import QtQuick.Controls 2.12 import QtQuick.Controls 2.10
Control { Control {
id: root id: root

6
assets/qml/Panes/SetupPanes/Settings.qml
View File

@ -20,9 +20,9 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
import QtQuick 2.12 import QtQuick 2.10
import QtQuick.Layouts 1.12 import QtQuick.Layouts 1.10
import QtQuick.Controls 2.12 import QtQuick.Controls 2.10
Control { Control {
id: root id: root

16
assets/qml/Panes/Toolbar.qml
View File

@ -20,10 +20,10 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
import QtQuick 2.12 import QtQuick 2.10
import QtQuick.Window 2.12 import QtQuick.Window 2.10
import QtQuick.Layouts 1.12 import QtQuick.Layouts 1.10
import QtQuick.Controls 2.12 import QtQuick.Controls 2.10
import "../Widgets" as Widgets import "../Widgets" as Widgets
@ -238,10 +238,10 @@ Control {
height: parent.height height: parent.height
Layout.fillWidth: true Layout.fillWidth: true
DragHandler { MouseArea {
grabPermissions: TapHandler.CanTakeOverFromAnything anchors.fill: parent
onActiveChanged: { onPressedChanged: {
if (active) if (pressed)
window.startSystemMove() window.startSystemMove()
} }
} }

6
assets/qml/PlatformDependent/DecentMenuItem.qml
View File

@ -20,9 +20,9 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
import QtQuick 2.12 import QtQuick 2.10
import QtQuick.Layouts 1.12 import QtQuick.Layouts 1.10
import QtQuick.Controls 2.12 import QtQuick.Controls 2.10
MenuItem { MenuItem {
id: root id: root

6
assets/qml/PlatformDependent/Menubar.qml
View File

@ -20,8 +20,8 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
import QtQuick 2.12 import QtQuick 2.10
import QtQuick.Controls 2.12 import QtQuick.Controls 2.10
MenuBar { MenuBar {
id: root id: root
@ -197,7 +197,7 @@ MenuBar {
sequence: "f11" sequence: "f11"
onTriggered: mainWindow.toggleFullscreen() onTriggered: mainWindow.toggleFullscreen()
text: mainWindow.isFullscreen ? qsTr("Exit full screen") : text: mainWindow.isFullscreen ? qsTr("Exit full screen") :
qsTr("Enter full screen") qsTr("Enter full screen")
} }
} }

2
assets/qml/PlatformDependent/MenubarMacOS.qml
View File

@ -20,7 +20,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
import QtQuick 2.12 import QtQuick 2.10
import Qt.labs.platform 1.0 import Qt.labs.platform 1.0
MenuBar { MenuBar {

4
assets/qml/Widgets/Icon.qml
View File

@ -20,8 +20,8 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
import QtQuick 2.12 import QtQuick 2.10
import QtQuick.Controls 2.12 import QtQuick.Controls 2.10
Item { Item {
id: root id: root

72
assets/qml/Widgets/JSONDropArea.qml
View File

@ -20,59 +20,59 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
import QtQuick 2.12 import QtQuick 2.10
import QtQuick.Layouts 1.12 import QtQuick.Layouts 1.10
import QtQuick.Controls 2.12 import QtQuick.Controls 2.10
DropArea { DropArea {
// //
// Show rectangle and set color based on file extension on drag enter // Show rectangle and set color based on file extension on drag enter
// //
onEntered: { onEntered: {
// Get file name & set color of rectangle accordingly // Get file name & set color of rectangle accordingly
if (drag.urls.length > 0) { if (drag.urls.length > 0) {
var path = drag.urls[0].toString() var path = drag.urls[0].toString()
if (path.endsWith(".json") || path.endsWith(".csv")) { if (path.endsWith(".json") || path.endsWith(".csv")) {
drag.accept(Qt.LinkAction) drag.accept(Qt.LinkAction)
dropRectangle.color = Qt.darker(palette.highlight, 1.4) dropRectangle.color = Qt.darker(palette.highlight, 1.4)
} }
// Invalid file name, show red rectangle // Invalid file name, show red rectangle
else else
dropRectangle.color = Cpp_ThemeManager.alternativeHighlight dropRectangle.color = Cpp_ThemeManager.alternativeHighlight
// Show drag&drop rectangle // Show drag&drop rectangle
dropRectangle.opacity = 0.8 dropRectangle.opacity = 0.8
} }
} }
// //
// Open *.json & *.csv files on drag drop // Open *.json & *.csv files on drag drop
// //
onDropped: { onDropped: {
// Hide rectangle // Hide rectangle
dropRectangle.hide() dropRectangle.hide()
// Get dropped file URL and remove prefixed "file://" // Get dropped file URL and remove prefixed "file://"
var path = drop.urls[0].toString() var path = drop.urls[0].toString()
if (!Cpp_IsWin) if (!Cpp_IsWin)
path = path.replace(/^(file:\/{2})/,""); path = path.replace(/^(file:\/{2})/,"");
else else
path = path.replace(/^(file:\/{3})/,""); path = path.replace(/^(file:\/{3})/,"");
// Unescape html codes like '%23' for '#' // Unescape html codes like '%23' for '#'
var cleanPath = decodeURIComponent(path); var cleanPath = decodeURIComponent(path);
// Process JSON files // Process JSON files
if (cleanPath.endsWith(".json")) { if (cleanPath.endsWith(".json")) {
Cpp_JSON_Generator.setOperationMode(0) Cpp_JSON_Generator.setOperationMode(0)
Cpp_JSON_Generator.loadJsonMap(cleanPath) Cpp_JSON_Generator.loadJsonMap(cleanPath)
} }
// Process CSV files // Process CSV files
else if (cleanPath.endsWith(".csv")) else if (cleanPath.endsWith(".csv"))
Cpp_CSV_Player.openFile(cleanPath) Cpp_CSV_Player.openFile(cleanPath)
} }
// //
// Hide drag & drop rectangle on drag exit // Hide drag & drop rectangle on drag exit

2
assets/qml/Widgets/Shadow.qml
View File

@ -20,7 +20,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
import QtQuick 2.12 import QtQuick 2.10
Item { Item {
id: root id: root

8
assets/qml/Widgets/Terminal.qml
View File

@ -20,11 +20,11 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
import QtQuick 2.12 import QtQuick 2.10
import QtQuick.Layouts 1.12 import QtQuick.Layouts 1.10
import QtQuick.Controls 2.12 import QtQuick.Controls 2.10
import Qt.labs.settings 1.1 import Qt.labs.settings 1.0
import SerialStudio 1.0 as SerialStudio import SerialStudio 1.0 as SerialStudio
Item { Item {

6
assets/qml/Widgets/Window.qml
View File

@ -20,9 +20,9 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
import QtQuick 2.12 import QtQuick 2.10
import QtQuick.Layouts 1.12 import QtQuick.Layouts 1.10
import QtQuick.Controls 2.12 import QtQuick.Controls 2.10
Page { Page {
id: root id: root

16
assets/qml/Windows/About.qml
View File

@ -20,10 +20,10 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
import QtQuick 2.12 import QtQuick 2.10
import QtQuick.Window 2.12 import QtQuick.Window 2.10
import QtQuick.Layouts 1.12 import QtQuick.Layouts 1.10
import QtQuick.Controls 2.12 import QtQuick.Controls 2.10
import "../FramelessWindow" as FramelessWindow import "../FramelessWindow" as FramelessWindow
@ -94,10 +94,10 @@ FramelessWindow.CustomWindow {
Item { Item {
anchors.fill: parent anchors.fill: parent
DragHandler { MouseArea {
grabPermissions: TapHandler.CanTakeOverFromAnything anchors.fill: parent
onActiveChanged: { onPressedChanged: {
if (active) if (pressed)
root.startSystemMove() root.startSystemMove()
} }
} }

8
assets/qml/Windows/Acknowledgements.qml
View File

@ -20,10 +20,10 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
import QtQuick 2.12 import QtQuick 2.10
import QtQuick.Window 2.12 import QtQuick.Window 2.10
import QtQuick.Layouts 1.12 import QtQuick.Layouts 1.10
import QtQuick.Controls 2.12 import QtQuick.Controls 2.10
import "../FramelessWindow" as FramelessWindow import "../FramelessWindow" as FramelessWindow

8
assets/qml/Windows/CsvPlayer.qml
View File

@ -20,10 +20,10 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
import QtQuick 2.12 import QtQuick 2.10
import QtQuick.Window 2.12 import QtQuick.Window 2.10
import QtQuick.Layouts 1.12 import QtQuick.Layouts 1.10
import QtQuick.Controls 2.12 import QtQuick.Controls 2.10
import "../FramelessWindow" as FramelessWindow import "../FramelessWindow" as FramelessWindow

18
assets/qml/Windows/Donate.qml
View File

@ -20,12 +20,12 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
import QtQuick 2.12 import QtQuick 2.10
import QtQuick.Window 2.12 import QtQuick.Window 2.10
import QtQuick.Layouts 1.12 import QtQuick.Layouts 1.10
import QtQuick.Controls 2.12 import QtQuick.Controls 2.10
import Qt.labs.settings 1.1 import Qt.labs.settings 1.0
import "../FramelessWindow" as FramelessWindow import "../FramelessWindow" as FramelessWindow
FramelessWindow.CustomWindow { FramelessWindow.CustomWindow {
@ -124,10 +124,10 @@ FramelessWindow.CustomWindow {
Item { Item {
anchors.fill: parent anchors.fill: parent
DragHandler { MouseArea {
grabPermissions: TapHandler.CanTakeOverFromAnything anchors.fill: parent
onActiveChanged: { onPressedChanged: {
if (active) if (pressed)
root.startSystemMove() root.startSystemMove()
} }
} }

10
assets/qml/Windows/JsonEditor.qml
View File

@ -20,12 +20,12 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
import QtQuick 2.12 import QtQuick 2.10
import QtQuick.Window 2.12 import QtQuick.Window 2.10
import QtQuick.Layouts 1.12 import QtQuick.Layouts 1.10
import QtQuick.Controls 2.12 import QtQuick.Controls 2.10
import Qt.labs.settings 1.1 import Qt.labs.settings 1.0
import "../JsonEditor" import "../JsonEditor"
import "../Widgets" as Widgets import "../Widgets" as Widgets

25
assets/qml/Windows/MQTTConfiguration.qml
View File

@ -20,12 +20,12 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
import QtQuick 2.12 import QtQuick 2.10
import QtQuick.Window 2.12 import QtQuick.Window 2.10
import QtQuick.Layouts 1.12 import QtQuick.Layouts 1.10
import QtQuick.Controls 2.12 import QtQuick.Controls 2.10
import Qt.labs.settings 1.1 import Qt.labs.settings 1.0
import "../FramelessWindow" as FramelessWindow 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 // Window controls
// //

10
assets/qml/Windows/MainWindow.qml
View File

@ -20,12 +20,12 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
import QtQuick 2.12 import QtQuick 2.10
import QtQuick.Window 2.12 import QtQuick.Window 2.10
import QtQuick.Layouts 1.12 import QtQuick.Layouts 1.10
import QtQuick.Controls 2.12 import QtQuick.Controls 2.10
import Qt.labs.settings 1.1 import Qt.labs.settings 1.0
import "../Panes" import "../Panes"
import "../Windows" import "../Windows"

6
assets/qml/main.qml
View File

@ -20,9 +20,9 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
import QtQuick 2.12 import QtQuick 2.10
import QtQuick.Window 2.12 import QtQuick.Window 2.10
import QtQuick.Controls 2.12 import QtQuick.Controls 2.10
import "Windows" as Windows import "Windows" as Windows

16
src/UI/Widgets/Terminal.cpp
View File

@ -604,9 +604,7 @@ QString Widgets::Terminal::vt100Processing(const QString &data)
//---------------------------------------------------------º----------------------------------------- //---------------------------------------------------------º-----------------------------------------
#define QTC_ASSERT(cond, action) \ #define QTC_ASSERT(cond, action) \
if (Q_LIKELY(cond)) \ if (Q_LIKELY(cond)) { } \
{ \
} \
else \ else \
{ \ { \
action; \ action; \
@ -866,13 +864,13 @@ Widgets::AnsiEscapeCodeHandler::parseText(const FormattedText &input)
{ {
(code == RgbTextColor) (code == RgbTextColor)
? charFormat.setForeground( ? charFormat.setForeground(
QColor(numbers.at(i + 1).toInt(), QColor(numbers.at(i + 1).toInt(),
numbers.at(i + 2).toInt(), numbers.at(i + 2).toInt(),
numbers.at(i + 3).toInt())) numbers.at(i + 3).toInt()))
: charFormat.setBackground( : charFormat.setBackground(
QColor(numbers.at(i + 1).toInt(), QColor(numbers.at(i + 1).toInt(),
numbers.at(i + 2).toInt(), numbers.at(i + 2).toInt(),
numbers.at(i + 3).toInt())); numbers.at(i + 3).toInt()));
setFormatScope(charFormat); setFormatScope(charFormat);
} }
i += 3; i += 3;