ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix dev tools

Browse Source
This commit is contained in:
Carl Schwan
2024-06-28 00:28:04 +02:00
parent b98ca5af52
commit af3c4f536a
5 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/settings/NeoChatGeneralPage.qml
View File

@@ -3,6 +3,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
import QtQuick import QtQuick
import QtQuick.Controls as QQC2
import QtQuick.Layouts import QtQuick.Layouts
import org.kde.kirigami as Kirigami import org.kde.kirigami as Kirigami
@@ -12,6 +13,10 @@ import org.kde.neochat
import org.kde.neochat.devtools import org.kde.neochat.devtools
FormCard.FormCardPage { FormCard.FormCardPage {
id: root
required property NeoChatConnection connection
title: i18nc("@title:window", "General") title: i18nc("@title:window", "General")
FormCard.FormHeader { FormCard.FormHeader {
@@ -234,7 +239,7 @@ FormCard.FormCardPage {
FormCard.FormButtonDelegate { FormCard.FormButtonDelegate {
visible: Config.developerTools visible: Config.developerTools
text: i18n("Open developer tools") text: i18n("Open developer tools")
onClicked: applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.devtools', 'DevtoolsPage'), { onClicked: root.QQC2.ApplicationWindow.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.devtools', 'DevtoolsPage'), {
connection: root.connection connection: root.connection
}, { }, {
title: i18n("Developer Tools") title: i18n("Developer Tools")

5
src/settings/NeoChatSettingsView.qml
View File

@@ -22,6 +22,11 @@ KirigamiSettings.ConfigurationView {
text: i18n("General") text: i18n("General")
icon.name: "org.kde.neochat" icon.name: "org.kde.neochat"
page: () => Qt.createComponent("org.kde.neochat.settings", "NeoChatGeneralPage") page: () => Qt.createComponent("org.kde.neochat.settings", "NeoChatGeneralPage")
initialProperties: () => {
return {
connection: root.connection
};
}
}, },
KirigamiSettings.ConfigurationModule { KirigamiSettings.ConfigurationModule {
moduleId: "appearance" moduleId: "appearance"

2
src/settings/Permissions.qml
View File

@@ -211,7 +211,7 @@ FormCard.FormCardPage {
id: editPowerLevelAction id: editPowerLevelAction
onTriggered: { onTriggered: {
userListSearchPopup.close(); userListSearchPopup.close();
let dialog = powerLevelDialog.createObject(applicationWindow().overlay, { let dialog = powerLevelDialog.createObject(root.QQC2.Overlay.overlay, {
room: root.room, room: root.room,
userId: userListItem.userId, userId: userListItem.userId,
powerLevel: userListItem.powerLevel powerLevel: userListItem.powerLevel

2
src/settings/RoomGeneralPage.qml
View File

@@ -348,7 +348,7 @@ FormCard.FormCardPage {
FormCard.FormButtonDelegate { FormCard.FormButtonDelegate {
visible: root.room.canSendState("m.space.parent") visible: root.room.canSendState("m.space.parent")
text: i18nc("@action:button", "Add new official parent") text: i18nc("@action:button", "Add new official parent")
onClicked: selectParentDialog.createObject(applicationWindow().overlay).open() onClicked: selectParentDialog.createObject(QQC2.Overlay.overlay).open()
Component { Component {
id: selectParentDialog id: selectParentDialog

6
src/settings/RoomSecurityPage.qml
View File

@@ -30,7 +30,7 @@ FormCard.FormCardPage {
enabled: room.canEncryptRoom enabled: room.canEncryptRoom
checked: room.usesEncryption checked: room.usesEncryption
onToggled: if (checked) { onToggled: if (checked) {
let dialog = confirmEncryptionDialog.createObject(applicationWindow().overlay, { let dialog = confirmEncryptionDialog.createObject(QQC2.Overlay.overlay, {
room: room room: room
}); });
dialog.open(); dialog.open();
@@ -57,7 +57,7 @@ FormCard.FormCardPage {
checked: room.joinRule === "restricted" checked: room.joinRule === "restricted"
enabled: room.canSendState("m.room.join_rules") && ["8", "9", "10"].includes(room.version) enabled: room.canSendState("m.room.join_rules") && ["8", "9", "10"].includes(room.version)
onCheckedChanged: if (checked && room.joinRule != "restricted") { onCheckedChanged: if (checked && room.joinRule != "restricted") {
selectSpacesDialog.createObject(applicationWindow().overlay).open(); selectSpacesDialog.createObject(QQC2.Overlay.overlay).open();
} }
contentItem.children: QQC2.Button { contentItem.children: QQC2.Button {
@@ -65,7 +65,7 @@ FormCard.FormCardPage {
text: i18n("Select spaces") text: i18n("Select spaces")
icon.name: "list-add" icon.name: "list-add"
onClicked: selectSpacesDialog.createObject(applicationWindow().overlay).open() onClicked: selectSpacesDialog.createObject(QQC2.Overlay.overlay).open()
QQC2.ToolTip.text: text QQC2.ToolTip.text: text
QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay