Use AutoTextField.

Fix #81.

imports/Spectral/Component/AutoTextArea.qml

@@ -1,117 +0,0 @@
-import QtQuick 2.9
-import QtQuick.Controls 2.2
-
-import Spectral 0.1
-
-import "qrc:/js/md.js" as Markdown
-
-TextArea {
-    property real progress: 0
-
-    wrapMode: Text.Wrap
-    placeholderText: "Send a Message"
-    leftPadding: 16
-    topPadding: 0
-    bottomPadding: 0
-    selectByMouse: true
-    verticalAlignment: TextEdit.AlignVCenter
-
-    text: currentRoom ? currentRoom.cachedInput : ""
-
-    background: Item {
-    }
-
-    Timer {
-        id: timeoutTimer
-
-        repeat: false
-        interval: 2000
-        onTriggered: {
-            repeatTimer.stop()
-            currentRoom.sendTypingNotification(false)
-        }
-    }
-
-    Timer {
-        id: repeatTimer
-
-        repeat: true
-        interval: 5000
-        triggeredOnStart: true
-        onTriggered: currentRoom.sendTypingNotification(true)
-    }
-
-    ToolTip.visible: currentRoom
-                     && currentRoom.hasUsersTyping
-    ToolTip.text: currentRoom ? currentRoom.usersTyping : ""
-
-    Keys.onReturnPressed: {
-        if (event.modifiers & Qt.ShiftModifier) {
-            insert(cursorPosition, "\n")
-        } else {
-            postMessage(text)
-            text = ""
-        }
-    }
-
-    onTextChanged: {
-        timeoutTimer.restart()
-        repeatTimer.start()
-        currentRoom.cachedInput = text
-    }
-
-    function postMessage(text) {
-        if (text.trim().length === 0) { return }
-        if(!currentRoom) { return }
-
-        var PREFIX_ME = '/me '
-        var PREFIX_NOTICE = '/notice '
-        var PREFIX_RAINBOW = '/rainbow '
-        var PREFIX_HTML = '/html '
-        var PREFIX_MARKDOWN = '/md '
-
-        var replyRe = new RegExp("^> <(.*)><(.*)> (.*)\n\n(.*)")
-        if (text.match(replyRe)) {
-            var matches = text.match(replyRe)
-            currentRoom.sendReply(matches[1], matches[2], matches[3], matches[4])
-            return
-        }
-
-        if (text.indexOf(PREFIX_ME) === 0) {
-            text = text.substr(PREFIX_ME.length)
-            currentRoom.postMessage(text, RoomMessageEvent.Emote)
-            return
-        }
-        if (text.indexOf(PREFIX_NOTICE) === 0) {
-            text = text.substr(PREFIX_NOTICE.length)
-            currentRoom.postMessage(text, RoomMessageEvent.Notice)
-            return
-        }
-        if (text.indexOf(PREFIX_RAINBOW) === 0) {
-            text = text.substr(PREFIX_RAINBOW.length)
-
-            var parsedText = ""
-            var rainbowColor = ["#ff2b00", "#ff5500", "#ff8000", "#ffaa00", "#ffd500", "#ffff00", "#d4ff00", "#aaff00", "#80ff00", "#55ff00", "#2bff00", "#00ff00", "#00ff2b", "#00ff55", "#00ff80", "#00ffaa", "#00ffd5", "#00ffff", "#00d4ff", "#00aaff", "#007fff", "#0055ff", "#002bff", "#0000ff", "#2a00ff", "#5500ff", "#7f00ff", "#aa00ff", "#d400ff", "#ff00ff", "#ff00d4", "#ff00aa", "#ff0080", "#ff0055", "#ff002b", "#ff0000"]
-            for (var i = 0; i < text.length; i++) {
-                parsedText = parsedText + "<font color='" + rainbowColor[i % rainbowColor.length] + "'>" + text.charAt(i) + "</font>"
-            }
-            currentRoom.postHtmlMessage(text, parsedText, RoomMessageEvent.Text)
-            return
-        }
-        if (text.indexOf(PREFIX_HTML) === 0) {
-            text = text.substr(PREFIX_HTML.length)
-            var re = new RegExp("<.*?>")
-            var plainText = text.replace(re, "")
-            currentRoom.postHtmlMessage(plainText, text, RoomMessageEvent.Text)
-            return
-        }
-        if (text.indexOf(PREFIX_MARKDOWN) === 0) {
-            text = text.substr(PREFIX_MARKDOWN.length)
-            var parsedText = Markdown.markdown_parser(text)
-            currentRoom.postHtmlMessage(text, parsedText, RoomMessageEvent.Text)
-            return
-        }
-
-        currentRoom.postPlainText(text)
-    }
-}

imports/Spectral/Component/AutoTextField.qml

@@ -0,0 +1,6 @@
+import QtQuick 2.9
+import QtQuick.Controls 2.2
+
+TextField {
+    selectByMouse: true
+}

imports/Spectral/Component/Timeline/MessageDelegate.qml

@@ -60,7 +60,7 @@ RowLayout {
 
             spacing: 0
 
-            AutoLabel {
+            TimelineLabel {
                 id: authorLabel
 
                 visible: messageRow.avatarVisible
@@ -71,6 +71,7 @@ RowLayout {
 
                 MouseArea {
                     anchors.fill: parent
+                    cursorShape: Qt.PointingHandCursor
                     onClicked: inputField.insert(inputField.cursorPosition, author.displayName)
                 }
             }
@@ -123,7 +124,7 @@ RowLayout {
 
                 spacing: 4
 
-                AutoLabel {
+                TimelineLabel {
                     visible: userMarker.length > 5
                     text: userMarker.length - 5 + "+"
                     coloredBackground: highlighted
@@ -140,10 +141,21 @@ RowLayout {
 
                         hint: modelData.displayName
                         image: modelData.avatar
+
+                        MouseArea {
+                            anchors.fill: parent
+
+                            cursorShape: Qt.PointingHandCursor
+
+                            onClicked: {
+                                readMarkerDialog.listModel = userMarker
+                                readMarkerDialog.open()
+                            }
+                        }
                     }
                 }
 
-                AutoLabel {
+                TimelineLabel {
                     id: timeLabel
 
                     visible: Math.abs(time - aboveTime) > 600000 || index == 0
@@ -164,7 +176,7 @@ RowLayout {
 
                 id: downloadable
 
-                AutoImage {
+                TimelineImage {
                     z: -4
 
                     id: messageImage
@@ -185,7 +197,7 @@ RowLayout {
         Component {
             id: fileComponent
 
-            AutoLabel {
+            TimelineLabel {
                 Layout.fillWidth: true
 
                 id: downloadDelegate
@@ -207,7 +219,7 @@ RowLayout {
         Component {
             id: audioComponent
 
-            AutoLabel {
+            TimelineLabel {
                 id: downloadDelegate
 
                 text: content.info.duration / 1000 + '"'

imports/Spectral/Component/Timeline/TimelineLabel.qml

@@ -11,7 +11,7 @@ Label {
 
     wrapMode: Label.Wrap
     linkColor: coloredBackground ? "white" : Material.accent
-    textFormat: MSettings.richText ? Text.RichText : Text.StyledText
+    textFormat: Text.RichText
 
     onLinkActivated: Qt.openUrlExternally(link)
 }

imports/Spectral/Component/qmldir

@@ -2,8 +2,6 @@ module Spectral.Component
 AutoMouseArea 2.0 AutoMouseArea.qml
 MaterialIcon 2.0 MaterialIcon.qml
 SideNavButton 2.0 SideNavButton.qml
-AutoImage 2.0 AutoImage.qml
-AutoLabel 2.0 AutoLabel.qml
-AutoTextArea 2.0 AutoTextArea.qml
 ScrollHelper 2.0 ScrollHelper.qml
 AutoListView 2.0 AutoListView.qml
+AutoTextField 2.0 AutoTextField.qml