ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify menu code and tweak UI.

Browse Source
This commit is contained in:
Black Hat
2018-09-12 08:27:34 +08:00
parent ebe69fd4c0
commit 2d2d35fcf5
7 changed files with 30 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
qml/menu/MessageContextMenu.qml
View File

@@ -2,27 +2,23 @@ import QtQuick 2.9
import QtQuick.Controls 2.2
Menu {
property var row
property bool canRedact
property string eventType
property string plainText
property string toolTip
property string eventId
property var row: null
property var model: null
readonly property bool isFile: eventType === "video" || eventType === "audio" || eventType === "file" || eventType === "image"
readonly property bool isFile: model && (model.eventType === "video" || model.eventType === "audio" || model.eventType === "file" || model.eventType === "image")
id: messageContextMenu
MenuItem {
text: "Copy"
onTriggered: matriqueController.copyToClipboard(plainText)
onTriggered: matriqueController.copyToClipboard(model.plainText)
}
MenuItem {
text: "View Source"
onTriggered: {
sourceDialog.sourceText = toolTip
sourceDialog.sourceText = model.toolTip
sourceDialog.open()
}
}
@@ -41,10 +37,10 @@ Menu {
onTriggered: row.saveFileAs()
}
MenuItem {
visible: canRedact
visible: model && model.author === currentRoom.localUser
height: visible ? undefined : 0
text: "Redact"
onTriggered: currentRoom.redactEvent(eventId)
onTriggered: currentRoom.redactEvent(model.eventId)
}
}

15
qml/menu/RoomContextMenu.qml
View File

@@ -1,34 +1,35 @@
import QtQuick 2.9
import QtQuick.Controls 2.2
import Matrique 0.1
Menu {
property var room: null
property var model: null
id: roomListMenu
MenuItem {
text: "Favourite"
checkable: true
checked: room && room.isFavourite
checked: model && model.category === RoomType.Favorite
onTriggered: room.isFavourite ? room.removeTag("m.favourite") : room.addTag("m.favourite", "1")
onTriggered: model.category === RoomType.Favorite ? model.currentRoom.removeTag("m.favourite") : model.currentRoom.addTag("m.favourite", "1")
}
MenuItem {
text: "Deprioritize"
checkable: true
checked: room && room.isLowPriority
checked: model && model.category === RoomType.Deprioritized
onTriggered: room.isLowPriority ? room.removeTag("m.lowpriority") : room.addTag("m.lowpriority", "1")
onTriggered: model.category === RoomType.Deprioritized ? model.currentRoom.removeTag("m.lowpriority") : model.currentRoom.addTag("m.lowpriority", "1")
}
MenuSeparator {}
MenuItem {
text: "Mark as Read"
onTriggered: room.markAllMessagesAsRead()
onTriggered: model.currentRoom.markAllMessagesAsRead()
}
MenuItem {
text: "Leave Room"
onTriggered: room.forget()
onTriggered: model.currentRoom.forget()
}
}