tan
/
Spectral
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Lower Qt requirement.

This commit is contained in:
Black Hat 2018-07-12 09:44:41 +08:00
parent 144cb8385e
commit 775a04bbc4
19 changed files with 79 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
main.cpp
View File

@ -25,7 +25,6 @@ int main(int argc, char *argv[]) {
// proxy.setPort(1082); // proxy.setPort(1082);
// QNetworkProxy::setApplicationProxy(proxy); // QNetworkProxy::setApplicationProxy(proxy);
qmlRegisterType<Room>();
qRegisterMetaType<Room *>("Room*"); qRegisterMetaType<Room *>("Room*");
qmlRegisterType<Controller>("Matrique", 0, 1, "Controller"); qmlRegisterType<Controller>("Matrique", 0, 1, "Controller");

8
qml/Login.qml
View File

@ -1,8 +1,8 @@
import QtQuick 2.11 import QtQuick 2.9
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.3
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import QtQuick.Controls 2.4 import QtQuick.Controls 2.2
import QtQuick.Controls.Material 2.4 import QtQuick.Controls.Material 2.2
import Qt.labs.settings 1.0 import Qt.labs.settings 1.0
import "qrc:/qml/component" import "qrc:/qml/component"

6
qml/Room.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.11 import QtQuick 2.9
import QtQuick.Controls 2.4 import QtQuick.Controls 2.2
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.3
import Matrique 0.1 import Matrique 0.1
import "qrc:/qml/form" import "qrc:/qml/form"

4
qml/component/AvatarContainer.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.11 import QtQuick 2.9
import QtQuick.Controls 2.4 import QtQuick.Controls 2.2
Row { Row {
spacing: 6 spacing: 6

4
qml/component/ButtonDelegate.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.11 import QtQuick 2.9
import QtQuick.Controls 2.4 import QtQuick.Controls 2.2
ItemDelegate { ItemDelegate {
id: itemDelegate id: itemDelegate

4
qml/component/DownloadableContent.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.11 import QtQuick 2.9
import QtQuick.Controls 2.4 import QtQuick.Controls 2.2
Item { Item {
width: parent.width width: parent.width

6
qml/component/FileBubble.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.11 import QtQuick 2.9
import QtQuick.Controls 2.4 import QtQuick.Controls 2.2
import QtQuick.Controls.Material 2.4 import QtQuick.Controls.Material 2.2
AvatarContainer { AvatarContainer {
DownloadableContent { DownloadableContent {

6
qml/component/ImageBubble.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.11 import QtQuick 2.9
import QtQuick.Controls 2.4 import QtQuick.Controls 2.2
import QtQuick.Controls.Material 2.4 import QtQuick.Controls.Material 2.2
AvatarContainer { AvatarContainer {
Rectangle { Rectangle {

6
qml/component/ImageStatus.qml
View File

@ -1,7 +1,7 @@
import QtQuick 2.11 import QtQuick 2.9
import QtQuick.Controls 2.4 import QtQuick.Controls 2.2
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import QtQuick.Controls.Material 2.4 import QtQuick.Controls.Material 2.2
Item { Item {
property bool opaqueBackground: false property bool opaqueBackground: false

8
qml/component/MaterialIcon.qml
View File

@ -1,7 +1,7 @@
import QtQuick 2.11 import QtQuick 2.9
import QtQuick.Controls 2.4 import QtQuick.Controls 2.2
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.3
import QtQuick.Controls.Material 2.4 import QtQuick.Controls.Material 2.2
Item { Item {
property alias icon: iconText.text property alias icon: iconText.text

6
qml/component/MessageBubble.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.11 import QtQuick 2.9
import QtQuick.Controls 2.4 import QtQuick.Controls 2.2
import QtQuick.Controls.Material 2.4 import QtQuick.Controls.Material 2.2
AvatarContainer { AvatarContainer {
readonly property bool isNotice: eventType === "notice" readonly property bool isNotice: eventType === "notice"

6
qml/component/MessageDelegate.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.11 import QtQuick 2.9
import QtQuick.Controls 2.4 import QtQuick.Controls 2.2
import QtQuick.Controls.Material 2.4 import QtQuick.Controls.Material 2.2
Item { Item {
id: messageDelegate id: messageDelegate

8
qml/component/SideNav.qml
View File

@ -1,7 +1,7 @@
import QtQuick 2.11 import QtQuick 2.9
import QtQuick.Controls 2.4 import QtQuick.Controls 2.2
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.3
import QtQuick.Controls.Material 2.4 import QtQuick.Controls.Material 2.2
Item { Item {
Rectangle { Rectangle {

8
qml/component/SideNavButton.qml
View File

@ -1,7 +1,7 @@
import QtQuick 2.11 import QtQuick 2.9
import QtQuick.Controls 2.4 import QtQuick.Controls 2.2
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.3
import QtQuick.Controls.Material 2.4 import QtQuick.Controls.Material 2.2
Item { Item {
property var page property var page

7
qml/component/StateBubble.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.11 import QtQuick 2.9
import QtQuick.Controls 2.4 import QtQuick.Controls 2.2
import QtQuick.Controls.Material 2.4 import QtQuick.Controls.Material 2.2
Rectangle { Rectangle {
readonly property bool isEmote: eventType === "emote" readonly property bool isEmote: eventType === "emote"
@ -16,6 +16,7 @@ Rectangle {
id: stateText id: stateText
text: "<b>" + author.displayName + "</b> " + display text: "<b>" + author.displayName + "</b> " + display
color: isEmote ? "white" : "black" color: isEmote ? "white" : "black"
linkColor: isEmote ? "white" : Material.accent
anchors.fill: parent anchors.fill: parent
anchors.margins: 12 anchors.margins: 12
wrapMode: Label.Wrap wrapMode: Label.Wrap

8
qml/form/DetailForm.qml
View File

@ -1,7 +1,7 @@
import QtQuick 2.11 import QtQuick 2.9
import QtQuick.Controls 2.4 import QtQuick.Controls 2.2
import QtQuick.Layouts 1.4 import QtQuick.Layouts 1.3
import QtQuick.Controls.Material 2.4 import QtQuick.Controls.Material 2.2
import "qrc:/qml/component" import "qrc:/qml/component"
Item { Item {

10
qml/form/ListForm.qml
View File

@ -1,9 +1,9 @@
import QtQuick 2.11 import QtQuick 2.9
import QtQuick.Controls 2.4 import QtQuick.Controls 2.2
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.3
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import QtQuick.Controls.Material 2.4 import QtQuick.Controls.Material 2.2
import QtQml.Models 2.4 import QtQml.Models 2.3
import Matrique 0.1 import Matrique 0.1
import "qrc:/qml/component" import "qrc:/qml/component"

28
qml/form/RoomForm.qml
View File

@ -1,8 +1,8 @@
import QtQuick 2.11 import QtQuick 2.9
import QtQuick.Controls 2.4 import QtQuick.Controls 2.2
import QtQuick.Dialogs 1.3 import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.3
import QtQuick.Controls.Material 2.4 import QtQuick.Controls.Material 2.2
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import Matrique 0.1 import Matrique 0.1
import "qrc:/qml/component" import "qrc:/qml/component"
@ -97,7 +97,9 @@ Item {
id: messageEventModel id: messageEventModel
room: currentRoom room: currentRoom
onRoomChanged: if (room.timelineSize === 0) room.getPreviousContent(50) onRoomChanged: {
if (room.timelineSize === 0) room.getPreviousContent(50)
}
} }
delegate: MessageDelegate {} delegate: MessageDelegate {}
@ -110,6 +112,20 @@ Item {
PropertyAnimation { easing.type: Easing.InOutCubic; duration: 200 } 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 { RoundButton {
id: goTopFab id: goTopFab
width: height width: height

8
qml/main.qml
View File

@ -1,7 +1,7 @@
import QtQuick 2.11 import QtQuick 2.9
import QtQuick.Controls 2.4 import QtQuick.Controls 2.2
import QtQuick.Layouts 1.11 import QtQuick.Layouts 1.3
import QtQuick.Controls.Material 2.4 import QtQuick.Controls.Material 2.2
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import Qt.labs.settings 1.0 import Qt.labs.settings 1.0
import Qt.labs.platform 1.0 as Platform import Qt.labs.platform 1.0 as Platform