2 files changed, 27 insertions, 1 deletions
diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml
index a717cb31..55860ad6 100644
--- a/resources/qml/MessageView.qml
+++ b/resources/qml/MessageView.qml
@@ -7,6 +7,7 @@ import "./components"
import "./delegates"
import "./emoji"
import "./ui"
+import "./dialogs"
import Qt.labs.platform 1.1 as Platform
import QtQuick 2.15
import QtQuick.Controls 2.15
@@ -585,6 +586,21 @@ Item {
open();
}
+ Component {
+ id: removeReason
+ InputDialog {
+ id: removeReasonDialog
+
+ property string eventId
+
+ title: qsTr("Reason for removal")
+ prompt: qsTr("Enter reason for removal or hit enter for no reason:")
+ onAccepted: function(text) {
+ room.redactEvent(eventId, text);
+ }
+ }
+ }
+
Platform.MenuItem {
visible: messageContextMenu.text
enabled: visible
@@ -665,7 +681,13 @@ Item {
Platform.MenuItem {
visible: (room ? room.permissions.canRedact() : false) || messageContextMenu.isSender
text: qsTr("Remo&ve message")
- onTriggered: room.redactEvent(messageContextMenu.eventId)
+ onTriggered: function() {
+ var dialog = removeReason.createObject(timelineRoot);
+ dialog.eventId = messageContextMenu.eventId;
+ dialog.show();
+ dialog.forceActiveFocus();
+ timelineRoot.destroyOnClose(dialog);
+ }
}
Platform.MenuItem {
diff --git a/resources/qml/dialogs/InputDialog.qml b/resources/qml/dialogs/InputDialog.qml
index cf1474dc..a674c3fb 100644
--- a/resources/qml/dialogs/InputDialog.qml
+++ b/resources/qml/dialogs/InputDialog.qml
@@ -21,6 +21,10 @@ ApplicationWindow {
width: 350
height: fontMetrics.lineSpacing * 7
+ function forceActiveFocus() {
+ statusInput.forceActiveFocus();
+ }
+
Shortcut {
sequence: StandardKey.Cancel
onActivated: dbb.rejected()
|
