From 775a04bbc4b00c058326628305d2884202b22659 Mon Sep 17 00:00:00 2001 From: Black Hat Date: Thu, 12 Jul 2018 09:44:41 +0800 Subject: [PATCH] Lower Qt requirement. --- main.cpp | 1 - qml/Login.qml | 8 ++++---- qml/Room.qml | 6 +++--- qml/component/AvatarContainer.qml | 4 ++-- qml/component/ButtonDelegate.qml | 4 ++-- qml/component/DownloadableContent.qml | 4 ++-- qml/component/FileBubble.qml | 6 +++--- qml/component/ImageBubble.qml | 6 +++--- qml/component/ImageStatus.qml | 6 +++--- qml/component/MaterialIcon.qml | 8 ++++---- qml/component/MessageBubble.qml | 6 +++--- qml/component/MessageDelegate.qml | 6 +++--- qml/component/SideNav.qml | 8 ++++---- qml/component/SideNavButton.qml | 8 ++++---- qml/component/StateBubble.qml | 7 ++++--- qml/form/DetailForm.qml | 8 ++++---- qml/form/ListForm.qml | 10 +++++----- qml/form/RoomForm.qml | 28 +++++++++++++++++++++------ qml/main.qml | 8 ++++---- 19 files changed, 79 insertions(+), 63 deletions(-) diff --git a/main.cpp b/main.cpp index 36b3e73..cf8d5fa 100644 --- a/main.cpp +++ b/main.cpp @@ -25,7 +25,6 @@ int main(int argc, char *argv[]) { // proxy.setPort(1082); // QNetworkProxy::setApplicationProxy(proxy); - qmlRegisterType(); qRegisterMetaType("Room*"); qmlRegisterType("Matrique", 0, 1, "Controller"); diff --git a/qml/Login.qml b/qml/Login.qml index 55d79eb..c5c2bfd 100644 --- a/qml/Login.qml +++ b/qml/Login.qml @@ -1,8 +1,8 @@ -import QtQuick 2.11 -import QtQuick.Layouts 1.11 +import QtQuick 2.9 +import QtQuick.Layouts 1.3 import QtGraphicalEffects 1.0 -import QtQuick.Controls 2.4 -import QtQuick.Controls.Material 2.4 +import QtQuick.Controls 2.2 +import QtQuick.Controls.Material 2.2 import Qt.labs.settings 1.0 import "qrc:/qml/component" diff --git a/qml/Room.qml b/qml/Room.qml index 68b2dad..93bbe6a 100644 --- a/qml/Room.qml +++ b/qml/Room.qml @@ -1,6 +1,6 @@ -import QtQuick 2.11 -import QtQuick.Controls 2.4 -import QtQuick.Layouts 1.11 +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Layouts 1.3 import Matrique 0.1 import "qrc:/qml/form" diff --git a/qml/component/AvatarContainer.qml b/qml/component/AvatarContainer.qml index 00df03b..73a78ef 100644 --- a/qml/component/AvatarContainer.qml +++ b/qml/component/AvatarContainer.qml @@ -1,5 +1,5 @@ -import QtQuick 2.11 -import QtQuick.Controls 2.4 +import QtQuick 2.9 +import QtQuick.Controls 2.2 Row { spacing: 6 diff --git a/qml/component/ButtonDelegate.qml b/qml/component/ButtonDelegate.qml index 547b50c..bd1217a 100644 --- a/qml/component/ButtonDelegate.qml +++ b/qml/component/ButtonDelegate.qml @@ -1,5 +1,5 @@ -import QtQuick 2.11 -import QtQuick.Controls 2.4 +import QtQuick 2.9 +import QtQuick.Controls 2.2 ItemDelegate { id: itemDelegate diff --git a/qml/component/DownloadableContent.qml b/qml/component/DownloadableContent.qml index 98153a9..debdc77 100644 --- a/qml/component/DownloadableContent.qml +++ b/qml/component/DownloadableContent.qml @@ -1,5 +1,5 @@ -import QtQuick 2.11 -import QtQuick.Controls 2.4 +import QtQuick 2.9 +import QtQuick.Controls 2.2 Item { width: parent.width diff --git a/qml/component/FileBubble.qml b/qml/component/FileBubble.qml index 302bff8..ec292fc 100644 --- a/qml/component/FileBubble.qml +++ b/qml/component/FileBubble.qml @@ -1,6 +1,6 @@ -import QtQuick 2.11 -import QtQuick.Controls 2.4 -import QtQuick.Controls.Material 2.4 +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.Material 2.2 AvatarContainer { DownloadableContent { diff --git a/qml/component/ImageBubble.qml b/qml/component/ImageBubble.qml index 699dddf..2c96cf6 100644 --- a/qml/component/ImageBubble.qml +++ b/qml/component/ImageBubble.qml @@ -1,6 +1,6 @@ -import QtQuick 2.11 -import QtQuick.Controls 2.4 -import QtQuick.Controls.Material 2.4 +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.Material 2.2 AvatarContainer { Rectangle { diff --git a/qml/component/ImageStatus.qml b/qml/component/ImageStatus.qml index 7dfa39b..41d4bc7 100644 --- a/qml/component/ImageStatus.qml +++ b/qml/component/ImageStatus.qml @@ -1,7 +1,7 @@ -import QtQuick 2.11 -import QtQuick.Controls 2.4 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import QtGraphicalEffects 1.0 -import QtQuick.Controls.Material 2.4 +import QtQuick.Controls.Material 2.2 Item { property bool opaqueBackground: false diff --git a/qml/component/MaterialIcon.qml b/qml/component/MaterialIcon.qml index ecf74d2..68394aa 100644 --- a/qml/component/MaterialIcon.qml +++ b/qml/component/MaterialIcon.qml @@ -1,7 +1,7 @@ -import QtQuick 2.11 -import QtQuick.Controls 2.4 -import QtQuick.Layouts 1.11 -import QtQuick.Controls.Material 2.4 +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Layouts 1.3 +import QtQuick.Controls.Material 2.2 Item { property alias icon: iconText.text diff --git a/qml/component/MessageBubble.qml b/qml/component/MessageBubble.qml index 17c0cd1..18476fa 100644 --- a/qml/component/MessageBubble.qml +++ b/qml/component/MessageBubble.qml @@ -1,6 +1,6 @@ -import QtQuick 2.11 -import QtQuick.Controls 2.4 -import QtQuick.Controls.Material 2.4 +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.Material 2.2 AvatarContainer { readonly property bool isNotice: eventType === "notice" diff --git a/qml/component/MessageDelegate.qml b/qml/component/MessageDelegate.qml index 7a0d2a7..f1f3cdf 100644 --- a/qml/component/MessageDelegate.qml +++ b/qml/component/MessageDelegate.qml @@ -1,6 +1,6 @@ -import QtQuick 2.11 -import QtQuick.Controls 2.4 -import QtQuick.Controls.Material 2.4 +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.Material 2.2 Item { id: messageDelegate diff --git a/qml/component/SideNav.qml b/qml/component/SideNav.qml index 5109b58..21a11e8 100644 --- a/qml/component/SideNav.qml +++ b/qml/component/SideNav.qml @@ -1,7 +1,7 @@ -import QtQuick 2.11 -import QtQuick.Controls 2.4 -import QtQuick.Layouts 1.11 -import QtQuick.Controls.Material 2.4 +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Layouts 1.3 +import QtQuick.Controls.Material 2.2 Item { Rectangle { diff --git a/qml/component/SideNavButton.qml b/qml/component/SideNavButton.qml index 7e04fa0..2be1de0 100644 --- a/qml/component/SideNavButton.qml +++ b/qml/component/SideNavButton.qml @@ -1,7 +1,7 @@ -import QtQuick 2.11 -import QtQuick.Controls 2.4 -import QtQuick.Layouts 1.11 -import QtQuick.Controls.Material 2.4 +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Layouts 1.3 +import QtQuick.Controls.Material 2.2 Item { property var page diff --git a/qml/component/StateBubble.qml b/qml/component/StateBubble.qml index 59d585b..d79ebf5 100644 --- a/qml/component/StateBubble.qml +++ b/qml/component/StateBubble.qml @@ -1,6 +1,6 @@ -import QtQuick 2.11 -import QtQuick.Controls 2.4 -import QtQuick.Controls.Material 2.4 +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Controls.Material 2.2 Rectangle { readonly property bool isEmote: eventType === "emote" @@ -16,6 +16,7 @@ Rectangle { id: stateText text: "" + author.displayName + " " + display color: isEmote ? "white" : "black" + linkColor: isEmote ? "white" : Material.accent anchors.fill: parent anchors.margins: 12 wrapMode: Label.Wrap diff --git a/qml/form/DetailForm.qml b/qml/form/DetailForm.qml index cef4a22..2d327c3 100644 --- a/qml/form/DetailForm.qml +++ b/qml/form/DetailForm.qml @@ -1,7 +1,7 @@ -import QtQuick 2.11 -import QtQuick.Controls 2.4 -import QtQuick.Layouts 1.4 -import QtQuick.Controls.Material 2.4 +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Layouts 1.3 +import QtQuick.Controls.Material 2.2 import "qrc:/qml/component" Item { diff --git a/qml/form/ListForm.qml b/qml/form/ListForm.qml index dc8daee..3800c6c 100644 --- a/qml/form/ListForm.qml +++ b/qml/form/ListForm.qml @@ -1,9 +1,9 @@ -import QtQuick 2.11 -import QtQuick.Controls 2.4 -import QtQuick.Layouts 1.11 +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Layouts 1.3 import QtGraphicalEffects 1.0 -import QtQuick.Controls.Material 2.4 -import QtQml.Models 2.4 +import QtQuick.Controls.Material 2.2 +import QtQml.Models 2.3 import Matrique 0.1 import "qrc:/qml/component" diff --git a/qml/form/RoomForm.qml b/qml/form/RoomForm.qml index d2a9f77..6a6f66c 100644 --- a/qml/form/RoomForm.qml +++ b/qml/form/RoomForm.qml @@ -1,8 +1,8 @@ -import QtQuick 2.11 -import QtQuick.Controls 2.4 -import QtQuick.Dialogs 1.3 -import QtQuick.Layouts 1.11 -import QtQuick.Controls.Material 2.4 +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Dialogs 1.2 +import QtQuick.Layouts 1.3 +import QtQuick.Controls.Material 2.2 import QtGraphicalEffects 1.0 import Matrique 0.1 import "qrc:/qml/component" @@ -97,7 +97,9 @@ Item { id: messageEventModel room: currentRoom - onRoomChanged: if (room.timelineSize === 0) room.getPreviousContent(50) + onRoomChanged: { + if (room.timelineSize === 0) room.getPreviousContent(50) + } } delegate: MessageDelegate {} @@ -110,6 +112,20 @@ Item { PropertyAnimation { easing.type: Easing.InOutCubic; duration: 200 } } +// Popup { +// id: loadingPopup + +// x: item.x + (item.width - width) / 2 +// y: 90 + +// modal: true +// focus: true + +// closePolicy: Popup.CloseOnEscape + +// BusyIndicator { running: true } +// } + RoundButton { id: goTopFab width: height diff --git a/qml/main.qml b/qml/main.qml index dda7a2d..6f5ceb3 100644 --- a/qml/main.qml +++ b/qml/main.qml @@ -1,7 +1,7 @@ -import QtQuick 2.11 -import QtQuick.Controls 2.4 -import QtQuick.Layouts 1.11 -import QtQuick.Controls.Material 2.4 +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQuick.Layouts 1.3 +import QtQuick.Controls.Material 2.2 import QtGraphicalEffects 1.0 import Qt.labs.settings 1.0 import Qt.labs.platform 1.0 as Platform