rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix roomsetting layout

This commit is contained in:
Jedi18 2021-02-13 20:46:40 +05:30
parent f3596aed55
commit 6540352123
2 changed files with 18 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
resources/qml/RoomSettings.qml
View File

@ -26,10 +26,7 @@ ApplicationWindow {
ColumnLayout { ColumnLayout {
id: contentLayout1 id: contentLayout1
anchors.left: parent.left anchors.fill: parent
anchors.right: parent.right
anchors.top: parent.top
anchors.bottom: undefined
anchors.margins: 10 anchors.margins: 10
spacing: 10 spacing: 10
@ -104,32 +101,21 @@ ApplicationWindow {
visible: roomSettings.canChangeNameAndTopic visible: roomSettings.canChangeNameAndTopic
onClicked: roomSettings.openEditModal() onClicked: roomSettings.openEditModal()
} }
}
ScrollView { ScrollView {
id: topicScroll Layout.maximumHeight: 75
anchors.left: parent.left ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
anchors.right: parent.right ScrollBar.vertical.policy: ScrollBar.AlwaysOn
anchors.top: contentLayout1.bottom Layout.alignment: Qt.AlignHCenter
anchors.bottom: undefined Layout.fillWidth: true
anchors.margins: 10
height: 100
TextArea { TextArea {
text: roomSettings.roomTopic text: roomSettings.roomTopic
background: null wrapMode: TextEdit.WordWrap
readOnly: true
background: null
}
} }
}
ColumnLayout {
id: contentLayout2
anchors.left: parent.left
anchors.right: parent.right
anchors.top: topicScroll.bottom
anchors.bottom: parent.bottom
anchors.margins: 10
spacing: 10
MatrixText { MatrixText {
text: "SETTINGS" text: "SETTINGS"
@ -178,8 +164,8 @@ ApplicationWindow {
Layout.fillWidth: true Layout.fillWidth: true
} }
Switch { ToggleButton {
id: encryptionSwitch id: encryptionToggle
checked: roomSettings.isEncryptionEnabled checked: roomSettings.isEncryptionEnabled
onToggled: { onToggled: {
@ -209,7 +195,7 @@ ApplicationWindow {
} }
onRejected: { onRejected: {
encryptionSwitch.checked = false encryptionToggle.checked = false
} }
standardButtons: Dialog.Ok | Dialog.Cancel standardButtons: Dialog.Ok | Dialog.Cancel
@ -227,7 +213,7 @@ ApplicationWindow {
Layout.fillWidth: true Layout.fillWidth: true
} }
Switch { ToggleButton {
ToolTip.text: qsTr("Whether or not the client should respond automatically with the session keys ToolTip.text: qsTr("Whether or not the client should respond automatically with the session keys
upon request. Use with caution, this is a temporary measure to test the upon request. Use with caution, this is a temporary measure to test the
E2E implementation until device verification is completed.") E2E implementation until device verification is completed.")

1
resources/res.qrc
View File

@ -128,6 +128,7 @@
<file>qml/EncryptionIndicator.qml</file> <file>qml/EncryptionIndicator.qml</file>
<file>qml/ImageButton.qml</file> <file>qml/ImageButton.qml</file>
<file>qml/MatrixText.qml</file> <file>qml/MatrixText.qml</file>
<file>qml/ToggleButton.qml</file>
<file>qml/MessageInput.qml</file> <file>qml/MessageInput.qml</file>
<file>qml/MessageView.qml</file> <file>qml/MessageView.qml</file>
<file>qml/NhekoBusyIndicator.qml</file> <file>qml/NhekoBusyIndicator.qml</file>