Merge pull request #420 from Nheko-Reborn/render-edits

Switch to new relations format and show edits
Nheko-Reborn · Feb 10, 2021 · 4a5b5f9 · 4a5b5f9
2 parents 463cee7 + 29c89b1
commit 4a5b5f9
Show file tree

Hide file tree

Showing 22 changed files with 555 additions and 169 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -356,7 +356,7 @@ if(USE_BUNDLED_MTXCLIENT)
 	FetchContent_Declare(
 		MatrixClient
 		GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git
-		GIT_TAG        v0.4.1
+		GIT_TAG        fee5298f068394958c2de935836a2c145f273906
 		)
 	set(BUILD_LIB_EXAMPLES OFF CACHE INTERNAL "")
 	set(BUILD_LIB_TESTS OFF CACHE INTERNAL "")

diff --git a/io.github.NhekoReborn.Nheko.json b/io.github.NhekoReborn.Nheko.json
@@ -220,8 +220,7 @@
       "name": "mtxclient",
       "sources": [
         {
-          "commit": "4951190c938740defa0988d98d5e861038622936",
-          "tag": "v0.4.1",
+          "commit": "fee5298f068394958c2de935836a2c145f273906",
           "type": "git",
           "url": "https://github.com/Nheko-Reborn/mtxclient.git"
         }

diff --git a/resources/qml/MessageInput.qml b/resources/qml/MessageInput.qml
@@ -139,6 +139,7 @@ Rectangle {
                     if (TimelineManager.timeline)
                         TimelineManager.timeline.input.updateState(selectionStart, selectionEnd, cursorPosition, text);
 
+                    forceActiveFocus();
                 }
                 onCursorRectangleChanged: textInput.ensureVisible(cursorRectangle)
                 onCursorPositionChanged: {
@@ -260,13 +261,20 @@ Rectangle {
 
                 Connections {
                     ignoreUnknownSignals: true
-                    onInsertText: messageInput.insert(messageInput.cursorPosition, text)
+                    onInsertText: {
+                        messageInput.insert(messageInput.cursorPosition, text);
+                    }
+                    onTextChanged: {
+                        messageInput.text = newText;
+                        messageInput.cursorPosition = newText.length;
+                    }
                     target: TimelineManager.timeline ? TimelineManager.timeline.input : null
                 }
 
                 Connections {
                     ignoreUnknownSignals: true
                     onReplyChanged: messageInput.forceActiveFocus()
+                    onEditChanged: messageInput.forceActiveFocus()
                     target: TimelineManager.timeline
                 }
 

diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml
@@ -50,7 +50,12 @@ ListView {
 
     Shortcut {
         sequence: StandardKey.Cancel
-        onActivated: chat.model.reply = undefined
+        onActivated: {
+            if (chat.model.edit)
+                chat.model.edit = undefined;
+            else
+                chat.model.reply = undefined;
+        }
     }
 
     Shortcut {
@@ -66,6 +71,11 @@ ListView {
         }
     }
 
+    Shortcut {
+        sequence: "Ctrl+E"
+        onActivated: chat.model.edit = chat.model.reply
+    }
+
     Component {
         id: sectionHeader
 

diff --git a/resources/qml/ReplyPopup.qml b/resources/qml/ReplyPopup.qml
@@ -10,15 +10,16 @@ Rectangle {
     property var room: TimelineManager.timeline
 
     Layout.fillWidth: true
-    visible: room && room.reply
+    visible: room && (room.reply || room.edit)
     // Height of child, plus margins, plus border
-    implicitHeight: replyPreview.height + 10
+    implicitHeight: (room && room.reply ? replyPreview.height : closeEditButton.height) + 10
     color: colors.window
     z: 3
 
     Reply {
         id: replyPreview
 
+        visible: room && room.reply
         anchors.left: parent.left
         anchors.leftMargin: 2 * 22 + 3 * 16
         anchors.right: closeReplyButton.left
@@ -32,8 +33,9 @@ Rectangle {
     ImageButton {
         id: closeReplyButton
 
+        visible: room && room.reply
         anchors.right: parent.right
-        anchors.rightMargin: 15
+        anchors.rightMargin: 16
         anchors.top: replyPreview.top
         hoverEnabled: true
         width: 16
@@ -44,4 +46,17 @@ Rectangle {
         onClicked: room.reply = undefined
     }
 
+    Button {
+        id: closeEditButton
+
+        visible: room && room.edit
+        anchors.left: parent.left
+        anchors.rightMargin: 16
+        anchors.topMargin: 10
+        anchors.top: parent.top
+        //height: 16
+        text: qsTr("Cancel edit")
+        onClicked: room.edit = undefined
+    }
+
 }
diff --git a/resources/qml/TimelineRow.qml b/resources/qml/TimelineRow.qml
@@ -85,6 +85,25 @@ Item {
             width: 16
         }
 
+        ImageButton {
+            id: editButton
+
+            visible: (Settings.buttonsInTimeline && model.isEditable) || model.isEdited
+            buttonTextColor: chat.model.edit == model.id ? colors.highlight : colors.buttonText
+            Layout.alignment: Qt.AlignRight | Qt.AlignTop
+            Layout.preferredHeight: 16
+            width: 16
+            hoverEnabled: true
+            image: ":/icons/icons/ui/edit.png"
+            ToolTip.visible: hovered
+            ToolTip.text: model.isEditable ? qsTr("Edit") : qsTr("Edited")
+            onClicked: {
+                if (model.isEditable)
+                    chat.model.editAction(model.id);
+
+            }
+        }
+
         EmojiButton {
             id: reactButton
 

diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml
@@ -91,6 +91,11 @@ Page {
             onClicked: TimelineManager.timeline.replyAction(messageContextMenu.eventId)
         }
 
+        MenuItem {
+            text: qsTr("Edit")
+            onClicked: TimelineManager.timeline.editAction(messageContextMenu.eventId)
+        }
+
         MenuItem {
             text: qsTr("Read receipts")
             onTriggered: TimelineManager.timeline.readReceiptsAction(messageContextMenu.eventId)