status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

display first menu option; include channel id

This commit is contained in:
Iuri Matias 2020-09-07 12:41:09 -04:00
parent 5e2c3c9ca7
commit aeb8d2958d
3 changed files with 51 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/chat/views/channels_list.nim
View File

@ -17,6 +17,7 @@ type
HasMentions = UserRole + 8
ContentType = UserRole + 9
Muted = UserRole + 10
Id = UserRole + 11
QtObject:
type
@ -69,6 +70,7 @@ QtObject:
of ChannelsRoles.Color: result = newQVariant(chatItem.color)
of ChannelsRoles.HasMentions: result = newQVariant(chatItem.hasMentions)
of ChannelsRoles.Muted: result = newQVariant(chatItem.muted.bool)
of ChannelsRoles.Id: result = newQVariant($chatItem.id)
method roleNames(self: ChannelsList): Table[int, string] =
{
@ -81,7 +83,8 @@ QtObject:
ChannelsRoles.Color.int: "color",
ChannelsRoles.HasMentions.int: "hasMentions",
ChannelsRoles.ContentType.int: "contentType",
ChannelsRoles.Muted.int: "muted"
ChannelsRoles.Muted.int: "muted",
ChannelsRoles.Id.int: "id"
}.toTable
proc addChatItemToList*(self: ChannelsList, channel: Chat): int =

7
ui/app/AppLayouts/Chat/ContactsColumn/Channel.qml
View File

@ -5,6 +5,7 @@ import "../../../../imports"
import "../components"
Rectangle {
property string chatId: ""
property string name: "channelName"
property string lastMessage: "My latest message\n with a return"
property string timestamp: "20/2/2020"
@ -34,7 +35,7 @@ Rectangle {
anchors.fill: parent
onClicked: {
if (mouse.button & Qt.RightButton) {
channelContextMenu.openMenu(index, muted, chatType)
channelContextMenu.openMenu(index, muted, chatType, name, chatId, identicon)
return;
}
chatsModel.setActiveChannelByIndex(index)
@ -179,10 +180,6 @@ Rectangle {
}
}
/*##^##
Designer {
D{i:0;formeditorColor:"#ffffff";height:64;width:640}

100
ui/app/AppLayouts/Chat/ContactsColumn/ChannelList.qml
View File

@ -34,6 +34,7 @@ ScrollView {
hasMentions: model.hasMentions
contentType: model.contentType
searchStr: chatGroupsContainer.searchStr
chatId: model.id
}
onCountChanged: {
if (count > 0 && chatsModel.activeChannelIndex > -1) {
@ -51,10 +52,29 @@ ScrollView {
}
}
ProfilePopup {
id: profilePopup
height: 330
noFooter: true
}
GroupInfoPopup {
id: groupInfoPopup
profileClick: {
profilePopup.openPopup.bind(profilePopup)
}
onClosed: {
mouseArea.menuOpened = false
}
}
PopupMenu {
property int channelIndex
property bool channelMuted
property int chatType
property string chatName
property string chatId
property string chatIdenticon
id: channelContextMenu
width: 175
@ -71,20 +91,41 @@ ScrollView {
}
]
function openMenu(channelIndex, muted, chatType) {
function openMenu(channelIndex, muted, chatType, chatName, chatId, chatIdenticon) {
channelContextMenu.channelIndex = channelIndex
channelContextMenu.channelMuted = muted
channelContextMenu.chatType = chatType
channelContextMenu.chatName = chatName
channelContextMenu.chatId = chatId
channelContextMenu.chatIdenticon = chatIdenticon
channelContextMenu.popup()
}
Action {
//% "View Group"
text: qsTrId("view-group")
enabled: channelContextMenu.chatType !== Constants.chatTypePublic
text: {
if (channelContextMenu.chatType === Constants.chatTypeOneToOne) {
return qsTrId("view-profile")
}
if (channelContextMenu.chatType === Constants.chatTypePrivateGroupChat) {
return qsTrId("view-group")
}
return qsTrId("share-chat")
}
icon.source: "../../../img/group.svg"
icon.width: 16
icon.height: 16
onTriggered: console.log('TODO View group')
onTriggered: {
chatsModel.setActiveChannelByIndex(channelContextMenu.channelIndex)
chatGroupsListView.currentIndex = channelContextMenu.channelIndex
if (channelContextMenu.chatType === Constants.chatTypeOneToOne) {
return profilePopup.openPopup(channelContextMenu.chatName, channelContextMenu.chatId, channelContextMenu.chatIdenticon)
}
if (channelContextMenu.chatType === Constants.chatTypePrivateGroupChat) {
return groupInfoPopup.open()
}
// return qsTrId("share-chat")
}
}
Separator {}
@ -107,57 +148,6 @@ ScrollView {
}
}
/* PopupMenu { */
/* hasArrow: false */
/* title: qstr("Mute chat") */
/* // TODO implement mute chat in Model and call it here */
/* Action { */
//% "15 minutes"
/* text: qsTrId("15-minutes"); */
/* icon.width: 0; */
/* onTriggered: { */
/* chatsModel.muteChannel(channelContextMenu.channelIndex, Constants.muteChat15Minutes) */
/* } */
/* } */
/* Action { */
//% "1 hour"
/* text: qsTrId("1-hour"); */
/* icon.width: 0; */
/* onTriggered: { */
/* chatsModel.muteChannel(channelContextMenu.channelIndex, Constants.muteChatOneHour) */
/* } */
/* } */
/* Action { */
//% "8 hours"
/* text: qsTrId("8-hours"); */
/* icon.width: 0; */
/* onTriggered: { */
/* chatsModel.muteChannel(channelContextMenu.channelIndex, Constants.muteChatEightHours) */
/* } */
/* } */
/* Action { */
//% "24 hours"
/* text: qsTrId("24-hours"); */
/* icon.width: 0; */
/* onTriggered: { */
/* chatsModel.muteChannel(channelContextMenu.channelIndex, Constants.muteChat24Hours) */
/* } */
/* } */
/* Action { */
//% "Until I turn it back on"
/* text: qsTrId("until-i-turn-it-back-on"); */
/* icon.width: 0; */
/* onTriggered: { */
/* console.log(appSettings.mutedChannels) */
/* appSettings.mutedChannels.push({ */
/* name: "Foo" */
/* }) */
/* console.log(appSettings.mutedChannels) */
/* //chatsModel.muteChannel(channelContextMenu.channelIndex, Constants.muteChatUntilUnmuted) */
/* } */
/* } */
/* } */
Action {
//% "Mark as Read"
text: qsTrId("mark-as-read")