Lower Qt requirement.

2018-07-12 09:44:41 +08:00 · 2018-07-12 09:44:41 +08:00 · 775a04bbc4
parent 144cb8385e
commit 775a04bbc4
19 changed files with 79 additions and 63 deletions
--- a/main.cpp
+++ b/main.cpp
@ -25,7 +25,6 @@ int main(int argc, char *argv[]) {
  //    proxy.setPort(1082);
  //    QNetworkProxy::setApplicationProxy(proxy);

-  qmlRegisterType<Room>();
  qRegisterMetaType<Room *>("Room*");

  qmlRegisterType<Controller>("Matrique", 0, 1, "Controller");
--- 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"

--- 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"
--- 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
--- 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
--- 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
--- 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 {
--- 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 {
--- 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
--- 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
--- 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"
--- 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
--- 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 {
--- 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
--- 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: "<b>" + author.displayName + "</b> " + display
        color: isEmote ? "white" : "black"
+        linkColor: isEmote ? "white" : Material.accent
        anchors.fill: parent
        anchors.margins: 12
        wrapMode: Label.Wrap
--- 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 {
--- 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"
--- 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
--- 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