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

First UI redesign.

This commit is contained in:
Black Hat 2018-09-02 21:26:42 +08:00
parent 2c10b2272c
commit 64749ba32f
7 changed files with 354 additions and 366 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
qml/Room.qml
View File

@ -18,28 +18,35 @@ Page {
onNewMessage: if (!window.active) matriqueController.showMessage(roomName, content, icon) onNewMessage: if (!window.active) matriqueController.showMessage(roomName, content, icon)
} }
RowLayout { Rectangle {
anchors.fill: parent anchors.fill: parent
spacing: 0
RoomListForm { color: MSettings.darkTheme ? "#363636" : "#f3f3f3"
id: roomListForm
Layout.fillHeight: true RowLayout {
Layout.preferredWidth: MSettings.miniMode ? 80 : page.width * 0.35 anchors.fill: parent
Layout.minimumWidth: 80
Layout.maximumWidth: 360
listModel: roomListModel spacing: 0
}
RoomForm { RoomListForm {
id: roomForm id: roomListForm
Layout.fillWidth: true Layout.fillHeight: true
Layout.fillHeight: true Layout.preferredWidth: MSettings.miniMode ? 64 : page.width * 0.35
Layout.minimumWidth: 64
Layout.maximumWidth: 360
currentRoom: roomListForm.enteredRoom listModel: roomListModel
}
RoomForm {
id: roomForm
Layout.fillWidth: true
Layout.fillHeight: true
currentRoom: roomListForm.enteredRoom
}
} }
} }
} }

36
qml/component/SideNavButton.qml
View File

@ -3,41 +3,29 @@ import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import QtQuick.Controls.Material 2.2 import QtQuick.Controls.Material 2.2
Item { ItemDelegate {
property var page property var page
property alias contentItem: buttonDelegate.contentItem readonly property bool selected: stackView.currentItem === page
signal clicked
id: sideNavButton
Layout.fillWidth: true
Layout.preferredHeight: width
Rectangle { Rectangle {
width: stackView.currentItem === page ? parent.width : 0 width: selected ? 4 : 0
height: parent.height height: parent.height
anchors.bottom: buttonDelegate.bottom
color: Qt.lighter(Material.accent) color: Material.accent
Behavior on width { Behavior on width {
PropertyAnimation { easing.type: Easing.InOutCubic; duration: 200 } PropertyAnimation { easing.type: Easing.InOutCubic; duration: 200 }
} }
} }
ItemDelegate { onClicked: {
id: buttonDelegate if(page && stackView.currentItem !== page) {
anchors.fill: parent if(stackView.depth === 1) {
stackView.replace(page)
onClicked: { } else {
if(page && stackView.currentItem !== page) { stackView.clear()
if(stackView.depth === 1) { stackView.push(page)
stackView.replace(page)
} else {
stackView.clear()
stackView.push(page)
}
} }
sideNavButton.clicked()
} }
} }
} }

4
qml/component/TextDelegate.qml
View File

@ -20,8 +20,8 @@ Rectangle {
width: Math.min(Math.max(messageText.implicitWidth, (timeText.visible ? timeText.implicitWidth : 0), (authorLabelVisible ? authorText.implicitWidth : 0)) + 24, maximumWidth) width: Math.min(Math.max(messageText.implicitWidth, (timeText.visible ? timeText.implicitWidth : 0), (authorLabelVisible ? authorText.implicitWidth : 0)) + 24, maximumWidth)
height: (authorText.visible ? authorText.implicitHeight : 0) + messageText.implicitHeight + (timeText.visible ? timeText.implicitHeight : 0) + 24 height: (authorText.visible ? authorText.implicitHeight : 0) + messageText.implicitHeight + (timeText.visible ? timeText.implicitHeight : 0) + 24
color: flat ? "transparent" : highlighted ? Material.accent : background color: flat ? "transparent" : highlighted ? Material.primary : background
border.color: Material.accent border.color: Material.primary
border.width: flat ? 2 : 0 border.width: flat ? 2 : 0
ColumnLayout { ColumnLayout {

282
qml/form/RoomForm.qml
View File

@ -39,7 +39,6 @@ Item {
ColumnLayout { ColumnLayout {
anchors.fill: parent anchors.fill: parent
anchors.margins: 32 anchors.margins: 32
spacing: 16
ImageStatus { ImageStatus {
Layout.preferredWidth: 64 Layout.preferredWidth: 64
@ -116,7 +115,7 @@ Item {
RowLayout { RowLayout {
anchors.fill: parent anchors.fill: parent
anchors.margins: 8 anchors.margins: 8
spacing: 16 spacing: 12
ImageStatus { ImageStatus {
Layout.preferredWidth: height Layout.preferredWidth: height
@ -159,9 +158,9 @@ Item {
Rectangle { Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 80 Layout.preferredHeight: 64
color: MSettings.darkTheme ? "#242424" : "#eaeaea" color: Material.accent
ItemDelegate { ItemDelegate {
anchors.fill: parent anchors.fill: parent
@ -170,9 +169,9 @@ Item {
RowLayout { RowLayout {
anchors.fill: parent anchors.fill: parent
anchors.margins: 16 anchors.margins: 12
spacing: 16 spacing: 12
ImageStatus { ImageStatus {
Layout.preferredWidth: height Layout.preferredWidth: height
@ -186,14 +185,15 @@ Item {
Layout.fillHeight: true Layout.fillHeight: true
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
visible: parent.width > 80 visible: parent.width > 64
Label { Label {
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
text: currentRoom ? currentRoom.displayName : "" text: currentRoom ? currentRoom.displayName : ""
font.pointSize: 16 color: "white"
font.pointSize: 12
elide: Text.ElideRight elide: Text.ElideRight
wrapMode: Text.NoWrap wrapMode: Text.NoWrap
} }
@ -203,6 +203,7 @@ Item {
Layout.fillHeight: true Layout.fillHeight: true
text: currentRoom ? currentRoom.topic : "" text: currentRoom ? currentRoom.topic : ""
color: "white"
elide: Text.ElideRight elide: Text.ElideRight
wrapMode: Text.NoWrap wrapMode: Text.NoWrap
} }
@ -304,7 +305,7 @@ Item {
RoundButton { RoundButton {
id: goTopFab id: goTopFab
width: height width: 64
height: 64 height: 64
visible: !parent.atYEnd visible: !parent.atYEnd
@ -313,12 +314,12 @@ Item {
contentItem: MaterialIcon { contentItem: MaterialIcon {
anchors.fill: parent anchors.fill: parent
icon: "\ue313" icon: "\ue313"
color: "white" color: "white"
} }
opacity: pressed ? 1 : hovered ? 0.7 : 0.4 Material.background: Material.accent
Material.background: Qt.lighter(Material.accent)
onClicked: parent.positionViewAtBeginning() onClicked: parent.positionViewAtBeginning()
@ -334,152 +335,149 @@ Item {
} }
} }
Pane { RowLayout {
padding: 16
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 80 Layout.preferredHeight: 48
Layout.margins: 16
Timer { spacing: 0
id: timeoutTimer
repeat: false ItemDelegate {
interval: 2000 Layout.preferredWidth: 48
onTriggered: { Layout.preferredHeight: 48
repeatTimer.stop()
currentRoom.sendTypingNotification(false) contentItem: MaterialIcon { icon: "\ue226" }
onClicked: currentRoom.chooseAndUploadFile()
}
TextField {
property real progress: 0
id: inputField
Layout.fillWidth: true
Layout.preferredHeight: 48
placeholderText: "Send a Message"
leftPadding: 16
topPadding: 0
bottomPadding: 0
selectByMouse: true
text: currentRoom ? currentRoom.cachedInput : ""
onTextChanged: {
timeoutTimer.restart()
repeatTimer.start()
currentRoom.cachedInput = text
}
Keys.onReturnPressed: {
if (inputField.text) {
inputField.postMessage(inputField.text)
inputField.text = ""
}
}
background: Rectangle {
color: MSettings.darkTheme ? "#242424" : "#eaeaea"
}
ToolTip.visible: currentRoom && currentRoom.hasUsersTyping
ToolTip.text: currentRoom ? currentRoom.usersTyping : ""
Timer {
id: timeoutTimer
repeat: false
interval: 2000
onTriggered: {
repeatTimer.stop()
currentRoom.sendTypingNotification(false)
}
}
Timer {
id: repeatTimer
repeat: true
interval: 5000
triggeredOnStart: true
onTriggered: currentRoom.sendTypingNotification(true)
}
function postMessage(text) {
if (text.trim().length === 0) { return }
if(!currentRoom) { return }
var PREFIX_ME = '/me '
var PREFIX_NOTICE = '/notice '
var PREFIX_RAINBOW = '/rainbow '
var PREFIX_HTML = '/html '
var PREFIX_MARKDOWN = '/md '
if (text.indexOf(PREFIX_ME) === 0) {
text = text.substr(PREFIX_ME.length)
currentRoom.postMessage(text, RoomMessageEvent.Emote)
return
}
if (text.indexOf(PREFIX_NOTICE) === 0) {
text = text.substr(PREFIX_NOTICE.length)
currentRoom.postMessage(text, RoomMessageEvent.Notice)
return
}
if (text.indexOf(PREFIX_RAINBOW) === 0) {
text = text.substr(PREFIX_RAINBOW.length)
var parsedText = ""
var rainbowColor = ["#ff2b00", "#ff5500", "#ff8000", "#ffaa00", "#ffd500", "#ffff00", "#d4ff00", "#aaff00", "#80ff00", "#55ff00", "#2bff00", "#00ff00", "#00ff2b", "#00ff55", "#00ff80", "#00ffaa", "#00ffd5", "#00ffff", "#00d4ff", "#00aaff", "#007fff", "#0055ff", "#002bff", "#0000ff", "#2a00ff", "#5500ff", "#7f00ff", "#aa00ff", "#d400ff", "#ff00ff", "#ff00d4", "#ff00aa", "#ff0080", "#ff0055", "#ff002b", "#ff0000"]
for (var i = 0; i < text.length; i++) {
parsedText = parsedText + "<font color='" + rainbowColor[i % rainbowColor.length] + "'>" + text.charAt(i) + "</font>"
}
currentRoom.postHtmlMessage(text, parsedText, RoomMessageEvent.Text)
return
}
if (text.indexOf(PREFIX_HTML) === 0) {
text = text.substr(PREFIX_HTML.length)
var re = new RegExp("<.*?>")
var plainText = text.replace(re, "")
currentRoom.postHtmlMessage(plainText, text, RoomMessageEvent.Text)
return
}
if (text.indexOf(PREFIX_MARKDOWN) === 0) {
text = text.substr(PREFIX_MARKDOWN.length)
var parsedText = Markdown.markdown_parser(text)
currentRoom.postHtmlMessage(text, parsedText, RoomMessageEvent.Text)
return
}
currentRoom.postPlainText(text)
} }
} }
Timer { ItemDelegate {
id: repeatTimer id: emojiButton
repeat: true Layout.preferredWidth: 48
interval: 5000 Layout.preferredHeight: 48
triggeredOnStart: true
onTriggered: currentRoom.sendTypingNotification(true)
}
RowLayout { contentItem: MaterialIcon { icon: "\ue24e" }
anchors.fill: parent
spacing: 0
ItemDelegate { background: Rectangle { color: MSettings.darkTheme ? "#242424" : "#eaeaea" }
Layout.preferredWidth: height
Layout.fillHeight: true
contentItem: MaterialIcon { icon: "\ue226" } onClicked: emojiPicker.visible ? emojiPicker.close() : emojiPicker.open()
onClicked: currentRoom.chooseAndUploadFile() EmojiPicker {
} id: emojiPicker
TextField { parent: ApplicationWindow.overlay
property real progress: 0
id: inputField x: window.width - 370
Layout.fillWidth: true y: window.height - 440
Layout.fillHeight: true
placeholderText: "Send a Message"
leftPadding: 16
topPadding: 0
bottomPadding: 0
selectByMouse: true
text: currentRoom ? currentRoom.cachedInput : "" width: 360
onTextChanged: { height: 360
timeoutTimer.restart()
repeatTimer.start()
currentRoom.cachedInput = text
}
Keys.onReturnPressed: { textArea: inputField
if (inputField.text) {
inputField.postMessage(inputField.text)
inputField.text = ""
}
}
background: Rectangle {
color: MSettings.darkTheme ? "#242424" : "#eaeaea"
}
ToolTip.visible: currentRoom && currentRoom.hasUsersTyping
ToolTip.text: currentRoom ? currentRoom.usersTyping : ""
function postMessage(text) {
if (text.trim().length === 0) { return }
if(!currentRoom) { return }
var PREFIX_ME = '/me '
var PREFIX_NOTICE = '/notice '
var PREFIX_RAINBOW = '/rainbow '
var PREFIX_HTML = '/html '
var PREFIX_MARKDOWN = '/md '
if (text.indexOf(PREFIX_ME) === 0) {
text = text.substr(PREFIX_ME.length)
currentRoom.postMessage(text, RoomMessageEvent.Emote)
return
}
if (text.indexOf(PREFIX_NOTICE) === 0) {
text = text.substr(PREFIX_NOTICE.length)
currentRoom.postMessage(text, RoomMessageEvent.Notice)
return
}
if (text.indexOf(PREFIX_RAINBOW) === 0) {
text = text.substr(PREFIX_RAINBOW.length)
var parsedText = ""
var rainbowColor = ["#ff2b00", "#ff5500", "#ff8000", "#ffaa00", "#ffd500", "#ffff00", "#d4ff00", "#aaff00", "#80ff00", "#55ff00", "#2bff00", "#00ff00", "#00ff2b", "#00ff55", "#00ff80", "#00ffaa", "#00ffd5", "#00ffff", "#00d4ff", "#00aaff", "#007fff", "#0055ff", "#002bff", "#0000ff", "#2a00ff", "#5500ff", "#7f00ff", "#aa00ff", "#d400ff", "#ff00ff", "#ff00d4", "#ff00aa", "#ff0080", "#ff0055", "#ff002b", "#ff0000"]
for (var i = 0; i < text.length; i++) {
parsedText = parsedText + "<font color='" + rainbowColor[i % rainbowColor.length] + "'>" + text.charAt(i) + "</font>"
}
currentRoom.postHtmlMessage(text, parsedText, RoomMessageEvent.Text)
return
}
if (text.indexOf(PREFIX_HTML) === 0) {
text = text.substr(PREFIX_HTML.length)
var re = new RegExp("<.*?>")
var plainText = text.replace(re, "")
currentRoom.postHtmlMessage(plainText, text, RoomMessageEvent.Text)
return
}
if (text.indexOf(PREFIX_MARKDOWN) === 0) {
text = text.substr(PREFIX_MARKDOWN.length)
var parsedText = Markdown.markdown_parser(text)
currentRoom.postHtmlMessage(text, parsedText, RoomMessageEvent.Text)
return
}
currentRoom.postPlainText(text)
}
}
ItemDelegate {
id: emojiButton
Layout.preferredWidth: height
Layout.fillHeight: true
contentItem: MaterialIcon { icon: "\ue24e" }
background: Rectangle { color: MSettings.darkTheme ? "#242424" : "#eaeaea" }
onClicked: emojiPicker.visible ? emojiPicker.close() : emojiPicker.open()
EmojiPicker {
id: emojiPicker
parent: ApplicationWindow.overlay
x: window.width - 370
y: window.height - 440
width: 360
height: 360
textArea: inputField
}
} }
} }
} }

310
qml/form/RoomListForm.qml
View File

@ -14,215 +14,183 @@ Item {
property alias listModel: roomListProxyModel.sourceModel property alias listModel: roomListProxyModel.sourceModel
property var enteredRoom: null property var enteredRoom: null
Label {
z: 10
text: MSettings.miniMode ? "Empty" : "Here? No, not here."
anchors.centerIn: parent
visible: listView.count === 0
}
ColumnLayout { ColumnLayout {
anchors.fill: parent anchors.fill: parent
spacing: 0 spacing: 0
Rectangle { TextField {
z: 10 id: searchField
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 80 Layout.preferredHeight: 40
color: Qt.tint(Material.accent, "#20FFFFFF") Layout.margins: 12
leftPadding: MSettings.miniMode ? 4 : 32
topPadding: 0
bottomPadding: 0
placeholderText: "Search..."
TextField { background: Rectangle {
id: searchField color: MSettings.darkTheme ? "#242424" : "#fafafa"
width: parent.width - 18 }
height: 36
color: "white"
leftPadding: MSettings.miniMode ? 4 : 32
topPadding: 0
bottomPadding: 0
anchors.centerIn: parent
background: Row { Shortcut {
visible: !parent.text sequence: StandardKey.Find
onActivated: searchField.forceActiveFocus()
MaterialIcon {
icon: "\ue8b6"
color: "white"
width: MSettings.miniMode ? parent.width : parent.height
height: parent.height
}
Label {
height: parent.height
visible: !MSettings.miniMode
text: "Search"
color: "white"
font.pointSize: 12
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
}
}
Shortcut {
sequence: StandardKey.Find
onActivated: searchField.forceActiveFocus()
}
} }
} }
Rectangle { SortFilterProxyModel {
id: roomListProxyModel
filters: RegExpFilter {
roleName: "name"
pattern: searchField.text
caseSensitivity: Qt.CaseInsensitive
}
proxyRoles: ExpressionRole {
name: "display"
expression: {
switch (category) {
case 1: return "Invited"
case 2: return "Favorites"
case 3: return "Rooms"
case 4: return "People"
case 5: return "Low Priorities"
}
}
}
sorters: [
RoleSorter { roleName: "category" },
RoleSorter {
enabled: MSettings.rearrangeByActivity
roleName: "unreadCount"
sortOrder: Qt.DescendingOrder
},
StringSorter { roleName: "name" }
]
}
ListView {
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
color: MSettings.darkTheme ? "#242424" : "#eaeaea" id: listView
Label { spacing: 1
z: 10 clip: true
text: MSettings.miniMode ? "Empty" : "Here? No, not here."
anchors.centerIn: parent
visible: listView.count === 0
}
SortFilterProxyModel { model: roomListProxyModel
id: roomListProxyModel
filters: RegExpFilter { currentIndex: -1
roleName: "name"
pattern: searchField.text boundsBehavior: Flickable.DragOverBounds
caseSensitivity: Qt.CaseInsensitive
} ScrollBar.vertical: ScrollBar {}
proxyRoles: ExpressionRole {
name: "display" delegate: Rectangle {
expression: { readonly property bool highlighted: currentRoom === enteredRoom
switch (category) {
case 1: return "Invited" width: parent.width
case 2: return "Favorites" height: 64
case 3: return "Rooms"
case 4: return "People" color: "#fafafa"
case 5: return "Low Priorities"
} AutoMouseArea {
} anchors.fill: parent
hoverEnabled: MSettings.miniMode
onSecondaryClicked: Qt.createComponent("qrc:/qml/menu/RoomContextMenu.qml").createObject(this)
onPrimaryClicked: category === RoomType.Invited ? inviteDialog.open() : enteredRoom = currentRoom
ToolTip.visible: MSettings.miniMode && containsMouse
ToolTip.text: name
} }
sorters: [ Rectangle {
RoleSorter { roleName: "category" }, width: 4
RoleSorter { height: parent.height
enabled: MSettings.rearrangeByActivity color: Material.accent
roleName: "unreadCount" visible: unreadCount > 0 || highlighted
sortOrder: Qt.DescendingOrder }
},
StringSorter { roleName: "name" }
]
}
ListView { RowLayout {
id: listView anchors.fill: parent
anchors.fill: parent anchors.margins: 12
spacing: 12
model: roomListProxyModel ImageStatus {
Layout.preferredWidth: height
Layout.fillHeight: true
currentIndex: -1 source: avatar ? "image://mxc/" + avatar : ""
displayText: name
boundsBehavior: Flickable.DragOverBounds
ScrollBar.vertical: ScrollBar { id: scrollBar }
delegate: Rectangle {
readonly property bool highlighted: currentRoom === enteredRoom
id: swipeDelegate
width: parent.width
height: 80
color: highlighted ? Material.background : "transparent"
AutoMouseArea {
anchors.fill: parent
hoverEnabled: MSettings.miniMode
onSecondaryClicked: Qt.createComponent("qrc:/qml/menu/RoomContextMenu.qml").createObject(this)
onPrimaryClicked: category === RoomType.Invited ? inviteDialog.open() : enteredRoom = currentRoom
ToolTip.visible: MSettings.miniMode && containsMouse
ToolTip.text: name
} }
Rectangle { ColumnLayout {
width: 4 Layout.fillWidth: true
height: parent.height Layout.fillHeight: true
color: Qt.tint(Material.accent, "#20FFFFFF") Layout.alignment: Qt.AlignHCenter
visible: unreadCount > 0 || highlighted
}
RowLayout { visible: parent.width > 64
anchors.fill: parent
anchors.margins: 16
spacing: 16
ImageStatus { Label {
Layout.preferredWidth: height
Layout.fillHeight: true
source: avatar ? "image://mxc/" + avatar : ""
displayText: name
}
ColumnLayout {
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
Layout.alignment: Qt.AlignHCenter
visible: parent.width > 80 text: name || "No Name"
font.pointSize: 12
elide: Text.ElideRight
wrapMode: Text.NoWrap
}
Label { Label {
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
text: name || "No Name" text: (lastEvent || topic).replace(/(\r\n\t|\n|\r\t)/gm,"");
font.pointSize: 16 elide: Text.ElideRight
elide: Text.ElideRight wrapMode: Text.NoWrap
wrapMode: Text.NoWrap
}
Label {
Layout.fillWidth: true
Layout.fillHeight: true
text: lastEvent || topic
elide: Text.ElideRight
wrapMode: Text.NoWrap
}
} }
} }
} }
}
section.property: "display" section.property: "display"
section.criteria: ViewSection.FullString section.criteria: ViewSection.FullString
section.delegate: Label { section.delegate: Label {
width: parent.width width: parent.width
height: 24 height: 24
text: section text: section
color: "grey" color: "grey"
leftPadding: MSettings.miniMode ? undefined : 16 leftPadding: MSettings.miniMode ? undefined : 16
elide: Text.ElideRight elide: Text.ElideRight
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
horizontalAlignment: MSettings.miniMode ? Text.AlignHCenter : undefined horizontalAlignment: MSettings.miniMode ? Text.AlignHCenter : undefined
background: Rectangle { }
anchors.fill: parent
color: MSettings.darkTheme ? "#363636" : "#dbdbdb"
}
}
Dialog { Dialog {
id: inviteDialog id: inviteDialog
parent: ApplicationWindow.overlay parent: ApplicationWindow.overlay
x: (window.width - width) / 2 x: (window.width - width) / 2
y: (window.height - height) / 2 y: (window.height - height) / 2
width: 360 width: 360
title: "Action Required" title: "Action Required"
modal: true modal: true
standardButtons: Dialog.Ok | Dialog.Cancel standardButtons: Dialog.Ok | Dialog.Cancel
contentItem: Label { text: "Accept this invitation?" } contentItem: Label { text: "Accept this invitation?" }
onAccepted: currentRoom.acceptInvitation() onAccepted: currentRoom.acceptInvitation()
onRejected: currentRoom.forget() onRejected: currentRoom.forget()
}
} }
} }
} }

45
qml/main.qml
View File

@ -82,19 +82,21 @@ ApplicationWindow {
Rectangle { Rectangle {
id: sideNav id: sideNav
Layout.preferredWidth: 80 Layout.preferredWidth: 64
Layout.fillHeight: true Layout.fillHeight: true
color: Material.accent color: Material.primary
ColumnLayout { ColumnLayout {
anchors.fill: parent anchors.fill: parent
spacing: 0 spacing: 0
SideNavButton { SideNavButton {
id: statusNavButton Layout.fillWidth: true
contentItem: ImageStatus { Layout.preferredHeight: width
ImageStatus {
anchors.fill: parent anchors.fill: parent
anchors.margins: 15 anchors.margins: 12
source: matriqueController.isLogin ? connection.localUser && connection.localUser.avatarUrl ? "image://mxc/" + connection.localUser.avatarUrl : "" : "qrc:/asset/img/avatar.png" source: matriqueController.isLogin ? connection.localUser && connection.localUser.avatarUrl ? "image://mxc/" + connection.localUser.avatarUrl : "" : "qrc:/asset/img/avatar.png"
displayText: matriqueController.isLogin && connection.localUser.displayName ? connection.localUser.displayName : "" displayText: matriqueController.isLogin && connection.localUser.displayName ? connection.localUser.displayName : ""
@ -109,7 +111,16 @@ ApplicationWindow {
} }
SideNavButton { SideNavButton {
contentItem: MaterialIcon { icon: "\ue145"; color: "white" } Layout.fillWidth: true
Layout.preferredHeight: width
MaterialIcon {
anchors.fill: parent
icon: "\ue145"
color: "white"
}
onClicked: addRoomMenu.popup() onClicked: addRoomMenu.popup()
Menu { Menu {
@ -171,6 +182,7 @@ ApplicationWindow {
onAccepted: matriqueController.joinRoom(joinRoomDialogTextField.text) onAccepted: matriqueController.joinRoom(joinRoomDialogTextField.text)
} }
} }
MenuItem { MenuItem {
text: "Direct Chat" text: "Direct Chat"
onTriggered: directChatDialog.open() onTriggered: directChatDialog.open()
@ -199,12 +211,29 @@ ApplicationWindow {
} }
SideNavButton { SideNavButton {
contentItem: MaterialIcon { icon: "\ue8b8"; color: "white" } Layout.fillWidth: true
Layout.preferredHeight: width
MaterialIcon {
anchors.fill: parent
icon: "\ue8b8"
color: parent.highlighted ? Material.accent : "white"
}
page: settingPage page: settingPage
} }
SideNavButton { SideNavButton {
contentItem: MaterialIcon { icon: "\ue879"; color: "white" } Layout.fillWidth: true
Layout.preferredHeight: width
MaterialIcon {
anchors.fill: parent
icon: "\ue879"
color: "white"
}
onClicked: Qt.quit() onClicked: Qt.quit()
} }
} }

6
qtquickcontrols2.conf
View File

@ -7,9 +7,7 @@ Style=Material
[Material] [Material]
Theme=Light Theme=Light
Primary=#00695c Primary=#344955
Accent=#00695c Accent=#498882
;Primary=#1565c0
;Accent=#1565c0
;Foreground=Black ;Foreground=Black
;Background=#161616 ;Background=#161616