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

fix[StatusChatMenu]: updated menu options as per designs 

Closes #13393
This commit is contained in:
Alexandra Betouni 2024-03-22 15:05:19 +02:00 committed by Lukáš Tinkl
parent 2b0af81139
commit ce525890eb
5 changed files with 54 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/StatusQ/src/StatusQ/Popups/StatusAction.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.13
import QtQuick.Controls 2.13
import QtQuick 2.15
import QtQuick.Controls 2.15
import StatusQ.Core 0.1
import StatusQ.Core.Theme 0.1

9
ui/imports/shared/controls/chat/menuItems/MuteChatMenuItem.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick 2.15
import QtQuick.Controls 2.15
import utils 1.0
@ -31,6 +31,11 @@ StatusMenu {
onTriggered: muteTriggered(Constants.MutingVariations.For8hr)
}
StatusAction {
text: qsTr("For 24 hours")
onTriggered: muteTriggered(Constants.MutingVariations.For24hr)
}
StatusAction {
text: qsTr("For 7 days")
onTriggered: muteTriggered(Constants.MutingVariations.For1week)

62
ui/imports/shared/views/chat/ChatContextMenuView.qml
View File

@ -54,6 +54,15 @@ StatusMenu {
onTriggered: root.displayProfilePopup(root.chatId)
}
StatusAction {
text: qsTr("View Members")
icon.name: "group-chat"
enabled: root.chatType === Constants.chatType.privateGroupChat
onTriggered: {
localAccountSensitiveSettings.expandUsersList = !localAccountSensitiveSettings.expandUsersList;
}
}
StatusAction {
text: root.amIChatAdmin ? qsTr("Add / remove from group") : qsTr("Add to group")
icon.name: "add-to-dm"
@ -92,6 +101,7 @@ StatusMenu {
Component {
id: renameGroupPopupComponent
RenameGroupPopup {
destroyOnClose: true
onUpdateGroupChatDetails: {
root.updateGroupChatDetails(root.chatId, groupName, groupColor, groupImage)
close()
@ -126,7 +136,16 @@ StatusMenu {
}
}
StatusAction {
objectName: "editChannelMenuItem"
text: qsTr("Edit Channel")
icon.name: "edit"
enabled: root.isCommunityChat && root.amIChatAdmin
onTriggered: {
root.displayEditChannelPopup(root.chatId);
}
}
StatusMenu {
title: qsTr("Debug actions")
enabled: root.showDebugOptions
@ -147,16 +166,6 @@ StatusMenu {
}
}
StatusAction {
objectName: "editChannelMenuItem"
text: qsTr("Edit Channel")
icon.name: "edit"
enabled: root.isCommunityChat && root.amIChatAdmin
onTriggered: {
root.displayEditChannelPopup(root.chatId);
}
}
StatusAction {
text: qsTr("Download")
enabled: localAccountSensitiveSettings.downloadChannelMessagesEnabled
@ -165,15 +174,16 @@ StatusMenu {
}
StatusMenuSeparator {
visible: clearHistoryMenuItem.enabled || deleteOrLeaveMenuItem.enabled
visible: clearHistoryGroupMenuItem.enabled || deleteOrLeaveMenuItem.enabled
}
StatusAction {
id: clearHistoryMenuItem
objectName: "clearHistoryMenuItem"
id: clearHistoryGroupMenuItem
objectName: "clearHistoryGroupMenuItem"
enabled: (root.chatType !== Constants.chatType.oneToOne)
text: qsTr("Clear History")
icon.name: "close-circle"
type: deleteOrLeaveMenuItem.enabled ? StatusAction.Type.Normal : StatusAction.Type.Danger
icon.name: "delete"
type: StatusAction.Type.Danger
onTriggered: {
Global.openPopup(clearChatConfirmationDialogComponent);
}
@ -193,7 +203,7 @@ StatusMenu {
qsTr("Close Chat") :
qsTr("Leave Chat")
}
icon.name: root.chatType === Constants.chatType.oneToOne || root.isCommunityChat ? "delete" : "arrow-left"
icon.name: root.chatType === Constants.chatType.oneToOne || root.isCommunityChat ? "close-circle" : "arrow-left"
icon.width: root.chatType === Constants.chatType.oneToOne || root.isCommunityChat ? 18 : 14
type: StatusAction.Type.Danger
@ -208,6 +218,18 @@ StatusMenu {
enabled: !root.isCommunityChat || root.amIChatAdmin
}
StatusAction {
id: clearHistoryMenuItem
objectName: "clearHistoryMenuItem"
enabled: (root.chatType === Constants.chatType.oneToOne)
text: qsTr("Clear History")
icon.name: "delete"
type: StatusAction.Type.Danger
onTriggered: {
Global.openPopup(clearChatConfirmationDialogComponent);
}
}
FileDialog {
id: downloadDialog
acceptLabel: qsTr("Save")
@ -226,8 +248,8 @@ StatusMenu {
ConfirmationDialog {
confirmButtonObjectName: "clearChatConfirmationDialogClearButton"
headerSettings.title: qsTr("Clear chat history")
confirmationText: qsTr("Are you sure you want to clear chat history for <b>%1</b>?").arg(root.chatName)
confirmButtonLabel: qsTr("Clear")
confirmationText: qsTr("Are you sure you want to clear your chat history with <b>%1</b>? All messages will be deleted on your side and will be unrecoverable.").arg(root.chatName)
confirmButtonLabel: qsTr("Clear chat history")
showCancelButton: true
cancelBtnType: "normal"
@ -278,7 +300,7 @@ StatusMenu {
confirmButtonLabel: root.isCommunityChat ? qsTr("Delete") : headerSettings.title
confirmationText: root.isCommunityChat ? qsTr("Are you sure you want to delete #%1 channel?").arg(root.chatName) :
root.chatType === Constants.chatType.oneToOne ?
qsTr("Are you sure you want to close this chat?"):
qsTr("Are you sure you want to close this chat? This will remove the chat from the list. Your chat history will be retained and shown the next time you message each other."):
qsTr("Are you sure you want to leave this chat?")
showCancelButton: true
cancelBtnType: "normal"

3
ui/imports/utils/Constants.qml
View File

@ -1385,7 +1385,8 @@ QtObject {
For1week = 4,
TillUnmuted = 5,
For1min = 6,
Unmuted = 7
Unmuted = 7,
For24hr = 8
}
enum LinkPreviewType {

2
vendor/status-go vendored

@ -1 +1 @@
Subproject commit 970119af7812d24e67d046871eefba7eb60e9db4
Subproject commit 45c6a80c0a659e5c2ee004ea418fb7fce34d99e6