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

Change black to primary. 

Improvements on ImageDelegate.
Change reply style.
This commit is contained in:
Black Hat 2019-04-22 09:28:33 +08:00
parent a86c9de17b
commit dda8738e8c
7 changed files with 48 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
imports/Spectral/Component/AutoTextField.qml
View File

@ -1,6 +1,8 @@
import QtQuick 2.12 import QtQuick 2.12
import QtQuick.Controls 2.12 import QtQuick.Controls 2.12
import Spectral.Setting 0.1
TextField { TextField {
selectByMouse: true selectByMouse: true
} }

19
imports/Spectral/Component/Timeline/ImageDelegate.qml
View File

@ -9,6 +9,7 @@ import Spectral 0.1
import Spectral.Setting 0.1 import Spectral.Setting 0.1
import Spectral.Component 2.0 import Spectral.Component 2.0
import Spectral.Effect 2.0
import Spectral.Font 0.1 import Spectral.Font 0.1
ColumnLayout { ColumnLayout {
@ -69,16 +70,23 @@ ColumnLayout {
verticalAlignment: Label.AlignVCenter verticalAlignment: Label.AlignVCenter
} }
BusyIndicator {
Layout.preferredWidth: 64
Layout.preferredHeight: 64
visible: img.status == Image.Loading
}
Image { Image {
Layout.maximumWidth: messageListView.width - (!sentByMe ? 32 + messageRow.spacing : 0) - 48 Layout.maximumWidth: messageListView.width - (!sentByMe ? 32 + messageRow.spacing : 0) - 48
id: img id: img
source: downloaded ? progressInfo.localPath : "image://mxc/" + source: "image://mxc/" +
(content.info && content.info.thumbnail_info ? (content.info && content.info.thumbnail_info ?
content.thumbnailMediaId : content.mediaId) content.thumbnailMediaId : content.mediaId)
sourceSize.width: 200 sourceSize.width: messageListView.width * 0.6
sourceSize.height: 200 sourceSize.height: messageListView.height
layer.enabled: true layer.enabled: true
layer.effect: OpacityMask { layer.effect: OpacityMask {
@ -94,12 +102,13 @@ ColumnLayout {
color: "transparent" color: "transparent"
radius: 24 radius: 24
antialiasing: true
border.width: 2 border.width: 4
border.color: MPalette.banner border.color: MPalette.banner
} }
AutoMouseArea { RippleEffect {
anchors.fill: parent anchors.fill: parent
id: messageMouseArea id: messageMouseArea

25
imports/Spectral/Component/Timeline/MessageDelegate.qml
View File

@ -7,6 +7,7 @@ import Spectral 0.1
import Spectral.Setting 0.1 import Spectral.Setting 0.1
import Spectral.Component 2.0 import Spectral.Component 2.0
import Spectral.Effect 2.0
import Spectral.Font 0.1 import Spectral.Font 0.1
ColumnLayout { ColumnLayout {
@ -74,6 +75,7 @@ ColumnLayout {
background: Rectangle { background: Rectangle {
color: sentByMe ? "#009DC2" : eventType === "notice" ? "#4285F4" : "#673AB7" color: sentByMe ? "#009DC2" : eventType === "notice" ? "#4285F4" : "#673AB7"
radius: 18 radius: 18
antialiasing: true
AutoMouseArea { AutoMouseArea {
anchors.fill: parent anchors.fill: parent
@ -123,19 +125,10 @@ ColumnLayout {
padding: 8 padding: 8
background: Item { background: RippleEffect {
Rectangle { anchors.fill: parent
anchors.leftMargin: 0
width: 2
height: parent.height
color: "white" onPrimaryClicked: goToEvent(replyEventId)
}
MouseArea {
anchors.fill: parent
onClicked: goToEvent(replyEventId)
}
} }
contentItem: RowLayout { contentItem: RowLayout {
@ -178,6 +171,14 @@ ColumnLayout {
} }
} }
Rectangle {
Layout.fillWidth: true
Layout.preferredHeight: 1
visible: replyEventId || ""
color: "white"
}
TextEdit { TextEdit {
Layout.fillWidth: true Layout.fillWidth: true

1
imports/Spectral/Component/Timeline/StateDelegate.qml
View File

@ -23,5 +23,6 @@ Label {
background: Rectangle { background: Rectangle {
color: MPalette.banner color: MPalette.banner
radius: 4 radius: 4
antialiasing: true
} }
} }

27
imports/Spectral/Panel/RoomDrawer.qml
View File

@ -4,6 +4,7 @@ import QtQuick.Controls.Material 2.12
import QtQuick.Layouts 1.12 import QtQuick.Layouts 1.12
import Spectral.Component 2.0 import Spectral.Component 2.0
import Spectral.Effect 2.0
import Spectral.Setting 0.1 import Spectral.Setting 0.1
import Spectral 0.1 import Spectral 0.1
@ -68,7 +69,7 @@ Drawer {
Layout.preferredHeight: 32 Layout.preferredHeight: 32
Layout.alignment: Qt.AlignTop Layout.alignment: Qt.AlignTop
icon: "\ue88e" icon: "\ue88f"
color: MPalette.lighter color: MPalette.lighter
} }
@ -96,7 +97,7 @@ Drawer {
wrapMode: Label.Wrap wrapMode: Label.Wrap
text: room && room.topic ? room.topic : "No Topic" text: room && room.topic ? room.topic : "No Topic"
color: MPalette.accent color: MPalette.foreground
} }
Label { Label {
@ -161,7 +162,7 @@ Drawer {
room: roomDrawer.room room: roomDrawer.room
} }
delegate: SwipeDelegate { delegate: Item {
width: userListView.width width: userListView.width
height: 48 height: 48
@ -185,25 +186,9 @@ Drawer {
} }
} }
swipe.right: Rectangle { RippleEffect {
width: height anchors.fill: parent
height: parent.height
anchors.right: parent.right
color: Material.accent
MaterialIcon {
anchors.fill: parent
icon: "\ue879"
color: "white"
}
SwipeDelegate.onClicked: {
room.kickMember(userId)
swipe.close()
}
} }
onClicked: swipe.open(SwipeDelegate.Right)
} }
ScrollBar.vertical: ScrollBar {} ScrollBar.vertical: ScrollBar {}

61
imports/Spectral/Panel/RoomPanel.qml
View File

@ -83,7 +83,6 @@ Item {
highlightMoveDuration: 500 highlightMoveDuration: 500
boundsBehavior: Flickable.DragOverBounds boundsBehavior: Flickable.DragOverBounds
model: SortFilterProxyModel { model: SortFilterProxyModel {
id: sortedMessageEventModel id: sortedMessageEventModel
@ -173,8 +172,7 @@ Item {
visible: section !== aboveSection || Math.abs(time - aboveTime) > 600000 visible: section !== aboveSection || Math.abs(time - aboveTime) > 600000
} }
MessageDelegate { MessageDelegate {}
}
} }
} }
@ -191,8 +189,7 @@ Item {
visible: section !== aboveSection || Math.abs(time - aboveTime) > 600000 visible: section !== aboveSection || Math.abs(time - aboveTime) > 600000
} }
MessageDelegate { MessageDelegate {}
}
} }
} }
@ -300,60 +297,6 @@ Item {
} }
} }
} }
Popup {
property alias listModel: readMarkerListView.model
x: (window.width - width) / 2
y: (window.height - height) / 2
width: 320
id: readMarkerDialog
parent: ApplicationWindow.overlay
modal: true
padding: 16
closePolicy: Dialog.CloseOnEscape | Dialog.CloseOnPressOutside
contentItem: AutoListView {
implicitHeight: Math.min(window.height - 64,
readMarkerListView.contentHeight)
id: readMarkerListView
clip: true
boundsBehavior: Flickable.DragOverBounds
delegate: ItemDelegate {
width: parent.width
height: 48
RowLayout {
anchors.fill: parent
anchors.margins: 8
spacing: 12
Avatar {
Layout.preferredWidth: height
Layout.fillHeight: true
source: modelData.avatar
hint: modelData.displayName
}
Label {
Layout.fillWidth: true
text: modelData.displayName
}
}
}
ScrollBar.vertical: ScrollBar {}
}
}
} }
Control { Control {

10
qml/main.qml
View File

@ -279,12 +279,14 @@ ApplicationWindow {
Layout.preferredWidth: 48 Layout.preferredWidth: 48
Layout.preferredHeight: 48 Layout.preferredHeight: 48
color: MPalette.foreground
icon: "\ue7ff" icon: "\ue7ff"
} }
Label { Label {
Layout.fillWidth: true Layout.fillWidth: true
color: MPalette.foreground
text: "Start a Chat" text: "Start a Chat"
} }
} }
@ -304,12 +306,14 @@ ApplicationWindow {
Layout.preferredWidth: 48 Layout.preferredWidth: 48
Layout.preferredHeight: 48 Layout.preferredHeight: 48
color: MPalette.foreground
icon: "\ue7fc" icon: "\ue7fc"
} }
Label { Label {
Layout.fillWidth: true Layout.fillWidth: true
color: MPalette.foreground
text: "Create a Room" text: "Create a Room"
} }
} }
@ -333,12 +337,14 @@ ApplicationWindow {
Layout.preferredWidth: 48 Layout.preferredWidth: 48
Layout.preferredHeight: 48 Layout.preferredHeight: 48
color: MPalette.foreground
icon: "\ue3a9" icon: "\ue3a9"
} }
Label { Label {
Layout.fillWidth: true Layout.fillWidth: true
color: MPalette.foreground
text: "Night Mode" text: "Night Mode"
} }
@ -365,12 +371,14 @@ ApplicationWindow {
Layout.preferredWidth: 48 Layout.preferredWidth: 48
Layout.preferredHeight: 48 Layout.preferredHeight: 48
color: MPalette.foreground
icon: "\ue5d2" icon: "\ue5d2"
} }
Label { Label {
Layout.fillWidth: true Layout.fillWidth: true
color: MPalette.foreground
text: "Enable System Tray" text: "Enable System Tray"
} }
@ -397,12 +405,14 @@ ApplicationWindow {
Layout.preferredWidth: 48 Layout.preferredWidth: 48
Layout.preferredHeight: 48 Layout.preferredHeight: 48
color: MPalette.foreground
icon: "\ue7f5" icon: "\ue7f5"
} }
Label { Label {
Layout.fillWidth: true Layout.fillWidth: true
color: MPalette.foreground
text: "Enable Notifications" text: "Enable Notifications"
} }