diff --git a/resources/qml/MatrixText.qml b/resources/qml/MatrixText.qml
index 94b8bb98..b3a8a05a 100644
--- a/resources/qml/MatrixText.qml
+++ b/resources/qml/MatrixText.qml
@@ -2,9 +2,9 @@
//
// SPDX-License-Identifier: GPL-3.0-or-later
-import QtQuick 2.5
-import QtQuick.Controls 2.3
-import im.nheko 1.0
+import QtQuick
+import QtQuick.Controls
+import im.nheko
TextEdit {
id: r
@@ -28,7 +28,6 @@ TextEdit {
color: palette.text
focus: false
readOnly: true
- selectByMouse: !Settings.mobileMode
textFormat: TextEdit.RichText
wrapMode: Text.Wrap
diff --git a/resources/qml/delegates/TextMessage.qml b/resources/qml/delegates/TextMessage.qml
index 1eb5e2c0..aabb7136 100644
--- a/resources/qml/delegates/TextMessage.qml
+++ b/resources/qml/delegates/TextMessage.qml
@@ -3,8 +3,8 @@
// SPDX-License-Identifier: GPL-3.0-or-later
import ".."
-import QtQuick.Controls 2.3
-import im.nheko 1.0
+import QtQuick.Controls
+import im.nheko
MatrixText {
required property string body
@@ -42,8 +42,8 @@ MatrixText {
width: parent?.width ?? 0
height: !keepFullText ? Math.round(Math.min(timelineView.height / 8, implicitHeight)) : implicitHeight
clip: !keepFullText
- selectByMouse: !Settings.mobileMode && !isReply
- enabled: !Settings.mobileMode
+ selectByMouse: !isReply
+// enabled: !Settings.mobileMode
font.pointSize: (Settings.enlargeEmojiOnlyMessages && isOnlyEmoji > 0 && isOnlyEmoji < 4) ? Settings.fontSize * 3 : Settings.fontSize
NhekoCursorShape {
diff --git a/resources/qml/dialogs/InviteDialog.qml b/resources/qml/dialogs/InviteDialog.qml
index 58bae7fd..ce17bd0f 100644
--- a/resources/qml/dialogs/InviteDialog.qml
+++ b/resources/qml/dialogs/InviteDialog.qml
@@ -100,7 +100,7 @@ ApplicationWindow {
property bool isValidMxid: text.match("@.+?:.{3,}")
backgroundColor: palette.window
- placeholderText: qsTr("@joe:matrix.org", "Example user id. The name 'joe' can be localized however you want.")
+ placeholderText: qsTr("@user:yourserver.example.com", "Example user id. The name 'user' can be localized however you want.")
Layout.fillWidth: true
onAccepted: {
if (isValidMxid) {
diff --git a/resources/qml/dialogs/RawMessageDialog.qml b/resources/qml/dialogs/RawMessageDialog.qml
index a27d988e..653b136f 100644
--- a/resources/qml/dialogs/RawMessageDialog.qml
+++ b/resources/qml/dialogs/RawMessageDialog.qml
@@ -2,9 +2,9 @@
//
// SPDX-License-Identifier: GPL-3.0-or-later
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import im.nheko 1.0
+import QtQuick
+import QtQuick.Controls
+import im.nheko
ApplicationWindow {
id: rawMessageRoot
@@ -32,7 +32,6 @@ ApplicationWindow {
font: Nheko.monospaceFont()
color: palette.text
readOnly: true
- selectByMouse: !Settings.mobileMode
textFormat: Text.PlainText
anchors.fill: parent
diff --git a/resources/qml/dialogs/RoomSettings.qml b/resources/qml/dialogs/RoomSettings.qml
index 3b8e1903..1ff6876e 100644
--- a/resources/qml/dialogs/RoomSettings.qml
+++ b/resources/qml/dialogs/RoomSettings.qml
@@ -208,7 +208,6 @@ ApplicationWindow {
: (roomSettings.plainRoomTopic === "" ? ("<i>" + qsTr("No topic set") + "</i>") : roomSettings.roomTopic)
wrapMode: TextEdit.WordWrap
background: null
- selectByMouse: !Settings.mobileMode
color: palette.text
horizontalAlignment: TextEdit.AlignHCenter
onLinkActivated: Nheko.openLink(link)
diff --git a/resources/qml/pages/LoginPage.qml b/resources/qml/pages/LoginPage.qml
index 9bf4e97e..f94e0082 100644
--- a/resources/qml/pages/LoginPage.qml
+++ b/resources/qml/pages/LoginPage.qml
@@ -56,10 +56,10 @@ Item {
MatrixTextField {
id: matrixIdLabel
label: qsTr("Matrix ID")
- placeholderText: qsTr("e.g @joe:matrix.org")
+ placeholderText: qsTr("e.g @user:yourserver.example.com")
onEditingFinished: login.mxid = text
- ToolTip.text: qsTr("Your login name. A mxid should start with @ followed by the user ID. After the user ID you need to include your server name after a :.\nYou can also put your homeserver address there if your server doesn't support .well-known lookup.\nExample: @user:server.my\nIf Nheko fails to discover your homeserver, it will show you a field to enter the server manually.")
+ ToolTip.text: qsTr("Your login name. A mxid should start with @ followed by the user ID. After the user ID you need to include your server name after a :.\nYou can also put your homeserver address there if your server doesn't support .well-known lookup.\nExample: @user:yourserver.example.com\nIf Nheko fails to discover your homeserver, it will show you a field to enter the server manually.")
Keys.forwardTo: [pwBtn, ssoRepeater]
}
@@ -109,10 +109,10 @@ Item {
Layout.fillWidth: true
label: qsTr("Homeserver address")
- placeholderText: qsTr("server.my:8787")
+ placeholderText: qsTr("yourserver.example.com:8787")
text: login.homeserver
onEditingFinished: login.homeserver = text
- ToolTip.text: qsTr("The address that can be used to contact you homeserver's client API.\nExample: https://server.my:8787")
+ ToolTip.text: qsTr("The address that can be used to contact your homeserver's client API.\nExample: https://yourserver.example.com:8787")
Keys.forwardTo: [pwBtn, ssoRepeater]
}
diff --git a/resources/qml/pages/UserSettingsPage.qml b/resources/qml/pages/UserSettingsPage.qml
index f23095b6..97ee7c27 100644
--- a/resources/qml/pages/UserSettingsPage.qml
+++ b/resources/qml/pages/UserSettingsPage.qml
@@ -5,12 +5,12 @@
pragma ComponentBehavior: Bound
import ".."
import "../ui"
-import Qt.labs.platform 1.1 as Platform
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.2
-import QtQuick.Window 2.15
-import im.nheko 1.0
+import Qt.labs.platform as Platform
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Window
+import im.nheko
Rectangle {
id: userSettingsDialog
@@ -163,7 +163,6 @@ Rectangle {
color: palette.text
text: model.value
readOnly: true
- selectByMouse: !Settings.mobileMode
textFormat: Text.PlainText
}
}
@@ -216,6 +215,24 @@ Rectangle {
}
}
DelegateChoice {
+ roleValue: UserSettingsModel.ConfigureHiddenEvents
+ Button {
+ text: qsTr("CONFIGURE")
+ onClicked: {
+ var dialog = hiddenEventsDialog.createObject();
+ dialog.show();
+ destroyOnClose(dialog);
+ }
+
+ Component {
+ id: hiddenEventsDialog
+
+ HiddenEventsDialog {}
+ }
+ }
+ }
+
+ DelegateChoice {
Text {
text: model.value
}
|
