Minor UI tweaks and clean up project.

This commit is contained in:
Black Hat
2019-04-30 17:02:00 +08:00
parent 5fe8bafbf3
commit 75eb4c5b52
25 changed files with 489 additions and 1336 deletions

View File

@@ -20,7 +20,6 @@ Item {
property int filter: 0
property var enteredRoom: null
property alias errorControl: errorControl
signal enterRoom(var room)
signal leaveRoom(var room)
@@ -184,9 +183,12 @@ Item {
source: root.user ? root.user.avatarMediaId : null
hint: root.user ? root.user.displayName : "?"
MouseArea {
RippleEffect {
anchors.fill: parent
onClicked: detailDialog.open()
circular: true
onClicked: accountDetailDialog.createObject(ApplicationWindow.overlay).open()
}
}
}
@@ -203,52 +205,6 @@ Item {
}
}
Control {
property string error: ""
property string detail: ""
Layout.fillWidth: true
id: errorControl
visible: false
topPadding: 16
bottomPadding: 16
leftPadding: 24
rightPadding: 24
contentItem: ColumnLayout {
Label {
Layout.fillWidth: true
text: errorControl.error
font.pixelSize: 16
color: "white"
wrapMode: Text.Wrap
}
Label {
Layout.fillWidth: true
text: errorControl.detail
font.pixelSize: 14
color: "white"
opacity: 0.6
wrapMode: Text.Wrap
}
}
background: Rectangle {
color: "#273338"
}
RippleEffect {
anchors.fill: parent
onClicked: errorControl.visible = false
}
}
AutoListView {
Layout.fillWidth: true
Layout.fillHeight: true

View File

@@ -23,18 +23,42 @@ Item {
room: currentRoom
}
Label {
Column {
anchors.centerIn: parent
spacing: 16
visible: !currentRoom
text: "Please choose a room."
Image {
anchors.horizontalCenter: parent.horizontalCenter
width: 240
fillMode: Image.PreserveAspectFit
source: "qrc:/assets/img/matrix.svg"
}
Label {
anchors.horizontalCenter: parent.horizontalCenter
text: "Welcome to Matrix, a new era of instant messaging."
}
Label {
anchors.horizontalCenter: parent.horizontalCenter
text: "To start chatting, select a room from the room list."
}
}
Image {
anchors.fill: parent
visible: currentRoom && MSettings.enableTimelineBackground
visible: currentRoom && MSettings.timelineBackground
source: MSettings.timelineBackground || MSettings.darkTheme ? "qrc:/assets/img/roompanel-dark.svg" : "qrc:/assets/img/roompanel.svg"
source: MSettings.timelineBackground
fillMode: Image.PreserveAspectCrop
}