From de3072125ec40449076da35614c3f6d87edbcda6 Mon Sep 17 00:00:00 2001 From: Tobias Fella Date: Tue, 5 Sep 2023 16:46:58 +0200 Subject: [PATCH] Change all remaining QML file ids to "root" --- src/qml/Component/ChatBox/CompletionMenu.qml | 8 ++-- src/qml/Component/Emoji/EmojiDelegate.qml | 20 ++++----- src/qml/Component/Emoji/EmojiGrid.qml | 22 +++++----- src/qml/Component/Emoji/EmojiTonesPicker.qml | 16 +++---- src/qml/Component/FancyEffectsContainer.qml | 32 +++++++------- src/qml/Component/LocationPage.qml | 6 +-- src/qml/Component/ShimmerGradient.qml | 12 ++--- .../Component/Timeline/ReadMarkerDelegate.qml | 11 ++--- .../Component/Timeline/SectionDelegate.qml | 4 +- src/qml/Component/Timeline/StateDelegate.qml | 8 ++-- src/qml/Dialog/ConfirmEncryptionDialog.qml | 8 ++-- src/qml/Dialog/EmojiDialog.qml | 12 ++--- src/qml/Dialog/KeyVerification/EmojiItem.qml | 6 +-- src/qml/Dialog/KeyVerification/EmojiRow.qml | 4 +- src/qml/Dialog/KeyVerification/EmojiSas.qml | 10 ++--- .../KeyVerification/KeyVerificationDialog.qml | 37 ++++++++-------- src/qml/Dialog/KeyVerification/Message.qml | 7 +-- .../KeyVerification/VerificationCanceled.qml | 4 +- src/qml/Menu/EditMenu.qml | 44 +++++++++---------- src/qml/Menu/ShareAction.qml | 17 +++---- src/qml/Menu/ShareDialog.qml | 10 ++--- src/qml/Menu/Timeline/BanSheet.qml | 8 ++-- .../Timeline/MessageDelegateContextMenu.qml | 30 ++++++------- src/qml/Menu/Timeline/RemoveSheet.qml | 12 ++--- src/qml/Menu/Timeline/ReportSheet.qml | 8 ++-- src/qml/Page/RoomList/UserInfo.qml | 4 +- src/qml/Page/RoomWindow.qml | 9 ++-- src/qml/Page/SearchPage.qml | 4 +- src/qml/Settings/DeviceDelegate.qml | 30 ++++++------- src/qml/Settings/SettingsPage.qml | 4 +- src/qml/Settings/ThemeRadioButton.qml | 10 ++--- 31 files changed, 211 insertions(+), 206 deletions(-) diff --git a/src/qml/Component/ChatBox/CompletionMenu.qml b/src/qml/Component/ChatBox/CompletionMenu.qml index 36e586f25..6aef27da9 100644 --- a/src/qml/Component/ChatBox/CompletionMenu.qml +++ b/src/qml/Component/ChatBox/CompletionMenu.qml @@ -14,7 +14,7 @@ import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents import org.kde.neochat 1.0 QQC2.Popup { - id: completionMenu + id: root width: parent.width visible: completions.count > 0 @@ -38,7 +38,7 @@ QQC2.Popup { } function complete() { - completionMenu.chatDocumentHandler.complete(completions.currentIndex) + root.chatDocumentHandler.complete(completions.currentIndex) } leftPadding: 0 @@ -52,7 +52,7 @@ QQC2.Popup { id: completions anchors.fill: parent - model: completionMenu.chatDocumentHandler.completionModel + model: root.chatDocumentHandler.completionModel currentIndex: 0 keyNavigationWraps: true highlightMoveDuration: 100 @@ -81,7 +81,7 @@ QQC2.Popup { subtitleItem.textFormat: Text.PlainText } } - onClicked: completionMenu.chatDocumentHandler.complete(completionDelegate.index) + onClicked: root.chatDocumentHandler.complete(completionDelegate.index) } } diff --git a/src/qml/Component/Emoji/EmojiDelegate.qml b/src/qml/Component/Emoji/EmojiDelegate.qml index 4f128f49e..8dc3a5b29 100644 --- a/src/qml/Component/Emoji/EmojiDelegate.qml +++ b/src/qml/Component/Emoji/EmojiDelegate.qml @@ -6,15 +6,15 @@ import QtQuick.Controls 2.15 as QQC2 import org.kde.kirigami 2.20 as Kirigami QQC2.ItemDelegate { - id: emojiDelegate + id: root property string name property string emoji property bool showTones: false property bool isImage: false - QQC2.ToolTip.text: emojiDelegate.name - QQC2.ToolTip.visible: hovered && emojiDelegate.name !== "" + QQC2.ToolTip.text: root.name + QQC2.ToolTip.visible: hovered && root.name !== "" QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay leftInset: Kirigami.Units.smallSpacing topInset: Kirigami.Units.smallSpacing @@ -24,8 +24,8 @@ QQC2.ItemDelegate { contentItem: Item { Kirigami.Heading { anchors.fill: parent - visible: !emojiDelegate.emoji.startsWith("image") && !emojiDelegate.isImage - text: emojiDelegate.emoji + visible: !root.emoji.startsWith("image") && !root.isImage + text: root.emoji horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter font.family: "emoji" @@ -36,25 +36,25 @@ QQC2.ItemDelegate { source: "arrow-down" anchors.bottom: parent.bottom anchors.right: parent.right - visible: emojiDelegate.showTones + visible: root.showTones } } Image { anchors.fill: parent - visible: emojiDelegate.emoji.startsWith("image") || emojiDelegate.isImage - source: visible ? emojiDelegate.emoji : "" + visible: root.emoji.startsWith("image") || root.isImage + source: visible ? root.emoji : "" } } background: Rectangle { - color: emojiDelegate.checked ? Kirigami.Theme.highlightColor : Kirigami.Theme.backgroundColor + color: root.checked ? Kirigami.Theme.highlightColor : Kirigami.Theme.backgroundColor radius: Kirigami.Units.smallSpacing Rectangle { radius: Kirigami.Units.smallSpacing anchors.fill: parent color: Kirigami.Theme.highlightColor - opacity: emojiDelegate.hovered && !emojiDelegate.pressed ? 0.2 : 0 + opacity: root.hovered && !root.pressed ? 0.2 : 0 } } } diff --git a/src/qml/Component/Emoji/EmojiGrid.qml b/src/qml/Component/Emoji/EmojiGrid.qml index 340b0995f..3f4d6c163 100644 --- a/src/qml/Component/Emoji/EmojiGrid.qml +++ b/src/qml/Component/Emoji/EmojiGrid.qml @@ -7,7 +7,7 @@ import org.kde.kirigami 2.20 as Kirigami import org.kde.neochat 1.0 QQC2.ScrollView { - id: emojiGrid + id: root property alias model: emojis.model property alias count: emojis.count @@ -40,10 +40,10 @@ QQC2.ScrollView { } onModelChanged: currentIndex = -1 - cellWidth: emojis.width / emojiGrid.emojisPerRow - cellHeight: emojiGrid.targetIconSize + cellWidth: emojis.width / root.emojisPerRow + cellHeight: root.targetIconSize - KeyNavigation.up: emojiGrid.header + KeyNavigation.up: root.header clip: true @@ -56,14 +56,14 @@ QQC2.ScrollView { width: emojis.cellWidth height: emojis.cellHeight - isImage: emojiGrid.stickers + isImage: root.stickers Keys.onEnterPressed: clicked() Keys.onReturnPressed: clicked() onClicked: { - if (emojiGrid.stickers) { - emojiGrid.stickerChosen(model.index) + if (root.stickers) { + root.stickerChosen(model.index) } - emojiGrid.chosen(modelData.isCustom ? modelData.shortName : modelData.unicode) + root.chosen(modelData.isCustom ? modelData.shortName : modelData.unicode) EmojiModel.emojiUsed(modelData) } Keys.onSpacePressed: pressAndHold() @@ -71,7 +71,7 @@ QQC2.ScrollView { if (EmojiModel.tones(modelData.shortName).length === 0) { return; } - let tones = tonesPopupComponent.createObject(emojiDelegate, {shortName: modelData.shortName, unicode: modelData.unicode, categoryIconSize: emojiGrid.targetIconSize}) + let tones = tonesPopupComponent.createObject(emojiDelegate, {shortName: modelData.shortName, unicode: modelData.unicode, categoryIconSize: root.targetIconSize}) tones.open() tones.forceActiveFocus() } @@ -80,14 +80,14 @@ QQC2.ScrollView { Kirigami.PlaceholderMessage { anchors.centerIn: parent - text: emojiGrid.stickers ? i18n("No stickers") : i18n("No emojis") + text: root.stickers ? i18n("No stickers") : i18n("No emojis") visible: emojis.count === 0 } } Component { id: tonesPopupComponent EmojiTonesPicker { - onChosen: emojiGrid.chosen(emoji) + onChosen: root.chosen(emoji) } } } diff --git a/src/qml/Component/Emoji/EmojiTonesPicker.qml b/src/qml/Component/Emoji/EmojiTonesPicker.qml index f67f4fd7b..e7e8a2e5a 100644 --- a/src/qml/Component/Emoji/EmojiTonesPicker.qml +++ b/src/qml/Component/Emoji/EmojiTonesPicker.qml @@ -8,7 +8,7 @@ import org.kde.kirigami 2.20 as Kirigami import org.kde.neochat 1.0 QQC2.Popup { - id: tones + id: root signal chosen(string emoji) @@ -20,14 +20,14 @@ QQC2.Popup { required property string shortName required property string unicode required property int categoryIconSize - width: tones.categoryIconSize * tonesList.count + 2 * padding - height: tones.categoryIconSize + 2 * padding + width: root.categoryIconSize * tonesList.count + 2 * padding + height: root.categoryIconSize + 2 * padding y: -height padding: 2 modal: true dim: true clip: false - onOpened: x = Math.min(parent.mapFromGlobal(QQC2.Overlay.overlay.width - tones.width, 0).x, -(width - parent.width) / 2) + onOpened: x = Math.min(parent.mapFromGlobal(QQC2.Overlay.overlay.width - root.width, 0).x, -(width - parent.width) / 2) background: Kirigami.ShadowedRectangle { color: Kirigami.Theme.backgroundColor radius: Kirigami.Units.mediumSpacing @@ -47,7 +47,7 @@ QQC2.Popup { width: parent.width height: parent.height orientation: Qt.Horizontal - model: EmojiModel.tones(tones.shortName) + model: EmojiModel.tones(root.shortName) keyNavigationEnabled: true keyNavigationWraps: true @@ -57,15 +57,15 @@ QQC2.Popup { emoji: modelData.unicode name: modelData.shortName - width: tones.categoryIconSize + width: root.categoryIconSize height: width Keys.onEnterPressed: clicked() Keys.onReturnPressed: clicked() onClicked: { - tones.chosen(modelData.unicode) + root.chosen(modelData.unicode) EmojiModel.emojiUsed(modelData) - tones.close() + root.close() } } } diff --git a/src/qml/Component/FancyEffectsContainer.qml b/src/qml/Component/FancyEffectsContainer.qml index 77605f9e7..0e0454c96 100644 --- a/src/qml/Component/FancyEffectsContainer.qml +++ b/src/qml/Component/FancyEffectsContainer.qml @@ -8,7 +8,7 @@ import QtQuick.Particles 2.15 import org.kde.kirigami 2.15 as Kirigami Item { - id: item + id: root property bool enabled: false property int effectInterval: Kirigami.Units.veryLongDuration*10; property color darkSnowColor: "grey" @@ -30,12 +30,12 @@ Item { Timer { id: confettiTimer - interval: item.effectInterval; + interval: root.effectInterval; running: false; repeat: false; triggeredOnStart: true; onTriggered: { - if (item.enabled) { + if (root.enabled) { confettiSystem.running = !confettiSystem.running } } @@ -92,12 +92,12 @@ Item { Timer { id: snowTimer - interval: item.effectInterval; + interval: root.effectInterval; running: false; repeat: false; triggeredOnStart: true; onTriggered: { - if (item.enabled) { + if (root.enabled) { snowSystem.running = !snowSystem.running } } @@ -127,7 +127,7 @@ Item { width: 10 height: width radius: width - color: item.isThemeDark ? "white" : darkSnowColor + color: root.isThemeDark ? "white" : darkSnowColor scale: Math.random() opacity: Math.random() } @@ -157,12 +157,12 @@ Item { Timer { id: fireworksTimer - interval: item.effectInterval; + interval: root.effectInterval; running: false; repeat: false; triggeredOnStart: true; onTriggered: { - if (item.enabled) { + if (root.enabled) { fireworksInternalTimer.running = !fireworksInternalTimer.running } } @@ -206,8 +206,8 @@ Item { id: fireworksParticleA system: fireworksSystem source: "qrc:/glowdot.png" - alphaVariation: item.isThemeDark ? 0.1 : 0.1 - alpha: item.isThemeDark ? 0.5 : 1 + alphaVariation: root.isThemeDark ? 0.1 : 0.1 + alpha: root.isThemeDark ? 0.5 : 1 groups: ["a"] opacity: fireworksSystem.opacity entryEffect: ImageParticle.Scale @@ -217,9 +217,9 @@ Item { ImageParticle { system: fireworksSystem source: "qrc:/glowdot.png" - color: item.isThemeDark ? "white" : "gold" - alphaVariation: item.isThemeDark ? 0.1 : 0.1 - alpha: item.isThemeDark ? 0.5 : 1 + color: root.isThemeDark ? "white" : "gold" + alphaVariation: root.isThemeDark ? 0.1 : 0.1 + alpha: root.isThemeDark ? 0.5 : 1 groups: ["light"] opacity: fireworksSystem.opacity entryEffect: ImageParticle.Scale @@ -230,8 +230,8 @@ Item { id: fireworksParticleB system: fireworksSystem source: "qrc:/glowdot.png" - alphaVariation: item.isThemeDark ? 0.1 : 0.1 - alpha: item.isThemeDark ? 0.5 : 1 + alphaVariation: root.isThemeDark ? 0.1 : 0.1 + alpha: root.isThemeDark ? 0.5 : 1 groups: ["b"] opacity: fireworksSystem.opacity entryEffect: ImageParticle.Scale @@ -257,7 +257,7 @@ Item { onTriggered: { container.destroy(); var randomHue = Math.random() - var lightness = item.isThemeDark ? 0.8 : 0.7 + var lightness = root.isThemeDark ? 0.8 : 0.7 fireworksParticleA.color = Qt.hsla(randomHue, 0.8, lightness, 1) fireworksParticleB.color = Qt.hsla(1-randomHue, 0.8, lightness, 1) } diff --git a/src/qml/Component/LocationPage.qml b/src/qml/Component/LocationPage.qml index 4d5254e94..5a1867026 100644 --- a/src/qml/Component/LocationPage.qml +++ b/src/qml/Component/LocationPage.qml @@ -9,7 +9,7 @@ import org.kde.kirigami 2.20 as Kirigami import org.kde.neochat 1.0 Kirigami.Page { - id: locationsPage + id: root required property var room @@ -31,7 +31,7 @@ Kirigami.Page { MapItemView { model: LocationsModel { id: locationsModel - room: locationsPage.room + room: root.room } delegate: LocationMapItem { isLive: true @@ -42,7 +42,7 @@ Kirigami.Page { MapItemView { model: LiveLocationsModel { id: liveLocationsModel - room: locationsPage.room + room: root.room } delegate: LocationMapItem {} } diff --git a/src/qml/Component/ShimmerGradient.qml b/src/qml/Component/ShimmerGradient.qml index efb75e9c4..1550d5d40 100644 --- a/src/qml/Component/ShimmerGradient.qml +++ b/src/qml/Component/ShimmerGradient.qml @@ -8,7 +8,7 @@ import QtQuick 2.15 import org.kde.kirigami 2.15 as Kirigami Gradient { - id: gradient + id: root orientation: Gradient.Horizontal @@ -25,7 +25,7 @@ Gradient { from: -2.0 to: 2.0 duration: 700 - target: gradient + target: root properties: "pos" } PauseAnimation { @@ -33,7 +33,7 @@ Gradient { } } - GradientStop { position: gradient.pos-gradient.offset; color: gradient.translucent } - GradientStop { position: gradient.pos; color: gradient.bright } - GradientStop { position: gradient.pos+gradient.offset; color: gradient.translucent } -} \ No newline at end of file + GradientStop { position: root.pos-root.offset; color: root.translucent } + GradientStop { position: root.pos; color: root.bright } + GradientStop { position: root.pos+root.offset; color: root.translucent } +} diff --git a/src/qml/Component/Timeline/ReadMarkerDelegate.qml b/src/qml/Component/Timeline/ReadMarkerDelegate.qml index dbe84c825..51cc5a86a 100644 --- a/src/qml/Component/Timeline/ReadMarkerDelegate.qml +++ b/src/qml/Component/Timeline/ReadMarkerDelegate.qml @@ -11,7 +11,8 @@ import org.kde.kirigami 2.15 as Kirigami import org.kde.neochat 1.0 QQC2.ItemDelegate { - id: readMarkerDelegate + id: root + padding: Kirigami.Units.largeSpacing topInset: Kirigami.Units.largeSpacing topPadding: Kirigami.Units.largeSpacing * 2 @@ -41,7 +42,7 @@ QQC2.ItemDelegate { State { name: "alignLeft" AnchorChanges { - target: readMarkerDelegate + target: root anchors.horizontalCenter: undefined anchors.left: parent ? parent.left : undefined } @@ -49,7 +50,7 @@ QQC2.ItemDelegate { State { name: "alignCenter" AnchorChanges { - target: readMarkerDelegate + target: root anchors.horizontalCenter: parent ? parent.horizontalCenter : undefined anchors.left: undefined } @@ -72,7 +73,7 @@ QQC2.ItemDelegate { background: Kirigami.ShadowedRectangle { id: readMarkerBackground color: { - if (readMarkerDelegate.isTemporaryHighlighted) { + if (root.isTemporaryHighlighted) { return Kirigami.Theme.positiveBackgroundColor } else { return Kirigami.Theme.backgroundColor @@ -80,7 +81,7 @@ QQC2.ItemDelegate { } Kirigami.Theme.inherit: false Kirigami.Theme.colorSet: Kirigami.Theme.View - opacity: readMarkerDelegate.isTemporaryHighlighted ? 1 : 0.6 + opacity: root.isTemporaryHighlighted ? 1 : 0.6 radius: Kirigami.Units.smallSpacing shadow.size: Kirigami.Units.smallSpacing shadow.color: Qt.rgba(0.0, 0.0, 0.0, 0.10) diff --git a/src/qml/Component/Timeline/SectionDelegate.qml b/src/qml/Component/Timeline/SectionDelegate.qml index 5d3c46a59..98497b353 100644 --- a/src/qml/Component/Timeline/SectionDelegate.qml +++ b/src/qml/Component/Timeline/SectionDelegate.qml @@ -11,7 +11,7 @@ import org.kde.kirigami 2.15 as Kirigami import org.kde.neochat 1.0 QQC2.ItemDelegate { - id: sectionDelegate + id: root property alias labelText: sectionLabel.text property var maxWidth: Number.POSITIVE_INFINITY @@ -44,6 +44,6 @@ QQC2.ItemDelegate { background: Rectangle { color: Config.blur ? "transparent" : Kirigami.Theme.backgroundColor Kirigami.Theme.inherit: false - Kirigami.Theme.colorSet: sectionDelegate.colorSet + Kirigami.Theme.colorSet: root.colorSet } } diff --git a/src/qml/Component/Timeline/StateDelegate.qml b/src/qml/Component/Timeline/StateDelegate.qml index c9b074c92..6eb2ebb92 100644 --- a/src/qml/Component/Timeline/StateDelegate.qml +++ b/src/qml/Component/Timeline/StateDelegate.qml @@ -11,7 +11,7 @@ import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents import org.kde.neochat 1.0 QQC2.Control { - id: stateDelegate + id: root readonly property bool sectionVisible: model.showSection @@ -23,7 +23,7 @@ QQC2.Control { State { name: "alignLeft" AnchorChanges { - target: stateDelegate + target: root anchors.horizontalCenter: undefined anchors.left: parent ? parent.left : undefined } @@ -31,7 +31,7 @@ QQC2.Control { State { name: "alignCenter" AnchorChanges { - target: stateDelegate + target: root anchors.horizontalCenter: parent ? parent.horizontalCenter : undefined anchors.left: undefined } @@ -204,6 +204,6 @@ QQC2.Control { endPercentWidth: Config.compactLayout ? 100 : 85 maxWidth: Config.compactLayout ? -1 : Kirigami.Units.gridUnit * 60 - parentWidth: stateDelegate.parent ? stateDelegate.parent.width : 0 + parentWidth: root.parent ? root.parent.width : 0 } } diff --git a/src/qml/Dialog/ConfirmEncryptionDialog.qml b/src/qml/Dialog/ConfirmEncryptionDialog.qml index 06d6b6412..0bfb52344 100644 --- a/src/qml/Dialog/ConfirmEncryptionDialog.qml +++ b/src/qml/Dialog/ConfirmEncryptionDialog.qml @@ -10,7 +10,7 @@ import org.kde.kirigami 2.15 as Kirigami import org.kde.neochat 1.0 QQC2.Dialog { - id: confirmEncryptionDialog + id: root property NeoChatRoom room @@ -31,15 +31,15 @@ QQC2.Dialog { QQC2.Button { text: i18n("Cancel") QQC2.DialogButtonBox.buttonRole: QQC2.DialogButtonBox.RejectRole - onClicked: confirmEncryptionDialog.close() + onClicked: root.close() } QQC2.Button { text: i18n("Activate Encryption") QQC2.DialogButtonBox.buttonRole: QQC2.DialogButtonBox.AcceptRole onClicked: { - confirmEncryptionDialog.room.activateEncryption() - confirmEncryptionDialog.close(); + root.room.activateEncryption() + root.close(); } } } diff --git a/src/qml/Dialog/EmojiDialog.qml b/src/qml/Dialog/EmojiDialog.qml index 38fbeb2b0..28a579dbe 100644 --- a/src/qml/Dialog/EmojiDialog.qml +++ b/src/qml/Dialog/EmojiDialog.qml @@ -9,7 +9,7 @@ import org.kde.kirigami 2.15 as Kirigami import org.kde.neochat 1.0 QQC2.Popup { - id: emojiPopup + id: root /** * @brief The current room that user is viewing. @@ -25,7 +25,7 @@ QQC2.Popup { Connections { target: RoomManager function onCurrentRoomChanged() { - emojiPopup.close() + root.close() } } @@ -64,11 +64,11 @@ QQC2.Popup { id: emojiPicker height: 400 currentRoom: root.currentRoom - includeCustom: emojiPopup.includeCustom - showQuickReaction: emojiPopup.showQuickReaction + includeCustom: root.includeCustom + showQuickReaction: root.showQuickReaction onChosen: emoji => { - emojiPopup.chosen(emoji) - if (emojiPopup.closeOnChosen) emojiPopup.close() + root.chosen(emoji) + if (root.closeOnChosen) root.close() } } } diff --git a/src/qml/Dialog/KeyVerification/EmojiItem.qml b/src/qml/Dialog/KeyVerification/EmojiItem.qml index 0b714a048..07a394198 100644 --- a/src/qml/Dialog/KeyVerification/EmojiItem.qml +++ b/src/qml/Dialog/KeyVerification/EmojiItem.qml @@ -9,7 +9,7 @@ import org.kde.kirigami 2.19 as Kirigami import org.kde.neochat 1.0 Column { - id: emojiItem + id: root property string emoji property string description @@ -23,7 +23,7 @@ Column { verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignHCenter - text: emojiItem.emoji + text: root.emoji font.family: "emoji" font.pointSize: Kirigami.Theme.defaultFont.pointSize * 4 } @@ -32,7 +32,7 @@ Column { y: parent.height * 0.75 width: parent.width height: parent.height * 0.25 - text: emojiItem.description + text: root.description verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignHCenter } diff --git a/src/qml/Dialog/KeyVerification/EmojiRow.qml b/src/qml/Dialog/KeyVerification/EmojiRow.qml index 21eeccc81..371ae602b 100644 --- a/src/qml/Dialog/KeyVerification/EmojiRow.qml +++ b/src/qml/Dialog/KeyVerification/EmojiRow.qml @@ -7,7 +7,7 @@ import QtQml 2.15 import org.kde.neochat 1.0 Row { - id: emojiRow + id: root property alias model: repeater.model anchors.horizontalCenter: parent.horizontalCenter @@ -16,7 +16,7 @@ Row { delegate: EmojiItem { emoji: modelData.emoji description: modelData.description - width: emojiRow.height + width: root.height height: width } } diff --git a/src/qml/Dialog/KeyVerification/EmojiSas.qml b/src/qml/Dialog/KeyVerification/EmojiSas.qml index 8d08b5f61..cce8f9a78 100644 --- a/src/qml/Dialog/KeyVerification/EmojiSas.qml +++ b/src/qml/Dialog/KeyVerification/EmojiSas.qml @@ -9,7 +9,7 @@ import org.kde.kirigami 2.19 as Kirigami import org.kde.neochat 1.0 Column { - id: emojiSas + id: root required property var model @@ -25,12 +25,12 @@ Column { EmojiRow { anchors.horizontalCenter: parent.horizontalCenter height: Kirigami.Units.gridUnit * 4 - model: emojiSas.model.slice(0, 4) + model: root.model.slice(0, 4) } EmojiRow { anchors.horizontalCenter: parent.horizontalCenter height: Kirigami.Units.gridUnit * 4 - model: emojiSas.model.slice(4, 7) + model: root.model.slice(4, 7) } Row { anchors.horizontalCenter: parent.horizontalCenter @@ -38,13 +38,13 @@ Column { anchors.bottom: parent.bottom text: i18n("They match") icon.name: "dialog-ok" - onClicked: emojiSas.accept() + onClicked: root.accept() } QQC2.Button { anchors.bottom: parent.bottom text: i18n("They don't match") icon.name: "dialog-cancel" - onClicked: emojiSas.reject() + onClicked: root.reject() } } } diff --git a/src/qml/Dialog/KeyVerification/KeyVerificationDialog.qml b/src/qml/Dialog/KeyVerification/KeyVerificationDialog.qml index 741836ca7..6dbdb1cce 100644 --- a/src/qml/Dialog/KeyVerification/KeyVerificationDialog.qml +++ b/src/qml/Dialog/KeyVerification/KeyVerificationDialog.qml @@ -10,7 +10,8 @@ import org.kde.kirigami 2.19 as Kirigami import org.kde.neochat 1.0 Kirigami.Page { - id: dialog + id: root + title: i18n("Session Verification") required property var session @@ -18,31 +19,31 @@ Kirigami.Page { Item { anchors.fill: parent VerificationCanceled { - visible: dialog.session.state === KeyVerificationSession.CANCELED + visible: root.session.state === KeyVerificationSession.CANCELED anchors.centerIn: parent - reason: dialog.session.error + reason: root.session.error } EmojiSas { anchors.centerIn: parent - visible: dialog.session.state === KeyVerificationSession.WAITINGFORVERIFICATION - model: dialog.session.sasEmojis - onReject: dialog.session.cancelVerification(KeyVerificationSession.MISMATCHED_SAS) - onAccept: dialog.session.sendMac() + visible: root.session.state === KeyVerificationSession.WAITINGFORVERIFICATION + model: root.session.sasEmojis + onReject: root.session.cancelVerification(KeyVerificationSession.MISMATCHED_SAS) + onAccept: root.session.sendMac() } Message { - visible: dialog.session.state === KeyVerificationSession.WAITINGFORREADY + visible: root.session.state === KeyVerificationSession.WAITINGFORREADY anchors.centerIn: parent icon: "security-medium-symbolic" text: i18n("Waiting for device to accept verification.") } Message { - visible: dialog.session.state === KeyVerificationSession.INCOMING + visible: root.session.state === KeyVerificationSession.INCOMING anchors.centerIn: parent icon: "security-medium-symbolic" - text: i18n("Incoming key verification request from device **%1**", dialog.session.remoteDeviceId) + text: i18n("Incoming key verification request from device **%1**", root.session.remoteDeviceId) } Message { - visible: dialog.session.state === KeyVerificationSession.WAITINGFORMAC + visible: root.session.state === KeyVerificationSession.WAITINGFORMAC anchors.centerIn: parent icon: "security-medium-symbolic" text: i18n("Waiting for other party to verify.") @@ -50,35 +51,35 @@ Kirigami.Page { Kirigami.BasicListItem { id: emojiVerification text: "Emoji Verification" - visible: dialog.session.state === KeyVerificationSession.READY + visible: root.session.state === KeyVerificationSession.READY subtitle: i18n("Compare a set of emoji on both devices") onClicked: { - dialog.session.sendStartSas() + root.session.sendStartSas() } } Message { - visible: dialog.session.state === KeyVerificationSession.DONE + visible: root.session.state === KeyVerificationSession.DONE anchors.centerIn: parent - text: i18n("Successfully verified device **%1**", dialog.session.remoteDeviceId) + text: i18n("Successfully verified device **%1**", root.session.remoteDeviceId) icon: "security-high" } } footer: QQC2.ToolBar { - visible: dialog.session.state === KeyVerificationSession.INCOMING + visible: root.session.state === KeyVerificationSession.INCOMING QQC2.DialogButtonBox { anchors.fill: parent Item { Layout.fillWidth: true } QQC2.Button { text: i18n("Accept") icon.name: "dialog-ok" - onClicked: dialog.session.sendReady() + onClicked: root.session.sendReady() QQC2.DialogButtonBox.buttonRole: QQC2.DialogButtonBox.AcceptRole } QQC2.Button { text: i18n("Decline") icon.name: "dialog-cancel" - onClicked: dialog.session.cancelVerification("m.user", "Declined") + onClicked: root.session.cancelVerification("m.user", "Declined") QQC2.DialogButtonBox.buttonRole: QQC2.DialogButtonBox.RejectRole } } diff --git a/src/qml/Dialog/KeyVerification/Message.qml b/src/qml/Dialog/KeyVerification/Message.qml index 3ebd50ff8..c654c07af 100644 --- a/src/qml/Dialog/KeyVerification/Message.qml +++ b/src/qml/Dialog/KeyVerification/Message.qml @@ -9,7 +9,8 @@ import org.kde.kirigami 2.19 as Kirigami import org.kde.neochat 1.0 Column { - id: message + id: root + required property string icon required property string text @@ -18,10 +19,10 @@ Column { width: Kirigami.Units.iconSizes.enormous height: width anchors.horizontalCenter: parent.horizontalCenter - source: message.icon + source: root.icon } QQC2.Label { - text: message.text + text: root.text textFormat: Text.MarkdownText } } diff --git a/src/qml/Dialog/KeyVerification/VerificationCanceled.qml b/src/qml/Dialog/KeyVerification/VerificationCanceled.qml index ddd62cf0c..9bb3c3df8 100644 --- a/src/qml/Dialog/KeyVerification/VerificationCanceled.qml +++ b/src/qml/Dialog/KeyVerification/VerificationCanceled.qml @@ -7,14 +7,14 @@ import QtQml 2.15 import org.kde.neochat 1.0 Message { - id: verificationCanceled + id: root required property int reason anchors.centerIn: parent icon: "security-low" text: { - switch(verificationCanceled.reason) { + switch(root.reason) { case KeyVerificationSession.NONE: return i18n("The session verification was canceled for unknown reason."); case KeyVerificationSession.TIMEOUT: diff --git a/src/qml/Menu/EditMenu.qml b/src/qml/Menu/EditMenu.qml index f903a553d..167db7d87 100644 --- a/src/qml/Menu/EditMenu.qml +++ b/src/qml/Menu/EditMenu.qml @@ -6,27 +6,27 @@ import QtQuick 2.15 import QtQuick.Layouts 1.10 Labs.Menu { - id: editMenu + id: root required property Item field Labs.MenuItem { - enabled: editMenu.field !== null && editMenu.field.canUndo + enabled: root.field !== null && root.field.canUndo text: i18nc("text editing menu action", "Undo") shortcut: StandardKey.Undo onTriggered: { - editMenu.field.undo() - editMenu.close() + root.field.undo() + root.close() } } Labs.MenuItem { - enabled: editMenu.field !== null && editMenu.field.canRedo + enabled: root.field !== null && root.field.canRedo text: i18nc("text editing menu action", "Redo") shortcut: StandardKey.Redo onTriggered: { - editMenu.field.undo() - editMenu.close() + root.field.undo() + root.close() } } @@ -34,42 +34,42 @@ Labs.Menu { } Labs.MenuItem { - enabled: editMenu.field !== null && editMenu.field.selectedText + enabled: root.field !== null && root.field.selectedText text: i18nc("text editing menu action", "Cut") shortcut: StandardKey.Cut onTriggered: { - editMenu.field.cut() - editMenu.close() + root.field.cut() + root.close() } } Labs.MenuItem { - enabled: editMenu.field !== null && editMenu.field.selectedText + enabled: root.field !== null && root.field.selectedText text: i18nc("text editing menu action", "Copy") shortcut: StandardKey.Copy onTriggered: { - editMenu.field.copy() - editMenu.close() + root.field.copy() + root.close() } } Labs.MenuItem { - enabled: editMenu.field !== null && editMenu.field.canPaste + enabled: root.field !== null && root.field.canPaste text: i18nc("text editing menu action", "Paste") shortcut: StandardKey.Paste onTriggered: { - editMenu.field.paste() - editMenu.close() + root.field.paste() + root.close() } } Labs.MenuItem { - enabled: editMenu.field !== null && editMenu.field.selectedText !== "" + enabled: root.field !== null && root.field.selectedText !== "" text: i18nc("text editing menu action", "Delete") shortcut: "" onTriggered: { - editMenu.field.remove(editMenu.field.selectionStart, editMenu.field.selectionEnd) - editMenu.close() + root.field.remove(root.field.selectionStart, root.field.selectionEnd) + root.close() } } @@ -77,12 +77,12 @@ Labs.Menu { } Labs.MenuItem { - enabled: editMenu.field !== null + enabled: root.field !== null text: i18nc("text editing menu action", "Select All") shortcut: StandardKey.SelectAll onTriggered: { - editMenu.field.selectAll() - editMenu.close() + root.field.selectAll() + root.close() } } } diff --git a/src/qml/Menu/ShareAction.qml b/src/qml/Menu/ShareAction.qml index 6ef2cf752..f683c952b 100644 --- a/src/qml/Menu/ShareAction.qml +++ b/src/qml/Menu/ShareAction.qml @@ -13,7 +13,8 @@ import org.kde.kirigami 2.14 as Kirigami * TODO add Android support */ Kirigami.Action { - id: shareAction + id: root + icon.name: "emblem-shared-symbolic" text: i18n("Share") tooltip: i18n("Share the selected media") @@ -40,12 +41,12 @@ Kirigami.Action { const purposeModel = Qt.createQmlObject('import org.kde.purpose 1.0 as Purpose; Purpose.PurposeAlternativesModel { pluginType: "Export" -}', shareAction._instantiator); +}', root._instantiator); purposeModel.inputData = Qt.binding(function() { - return shareAction.inputData; + return root.inputData; }); _instantiator.model = purposeModel; - shareAction.visible = true; + root.visible = true; } delegate: Kirigami.Action { @@ -55,16 +56,16 @@ Purpose.PurposeAlternativesModel { onTriggered: { doBeforeSharing(); applicationWindow().pageStack.pushDialogLayer('qrc:/ShareDialog.qml', { - title: shareAction.tooltip, + title: root.tooltip, index: index, - model: shareAction._instantiator.model + model: root._instantiator.model }) } } onObjectAdded: (index, object) => { object.index = index; - shareAction.children.push(object) + root.children.push(object) } - onObjectRemoved: (index, object) => shareAction.children = Array.from(shareAction.children).filter(obj => obj.pluginId !== object.pluginId) + onObjectRemoved: (index, object) => root.children = Array.from(root.children).filter(obj => obj.pluginId !== object.pluginId) } } diff --git a/src/qml/Menu/ShareDialog.qml b/src/qml/Menu/ShareDialog.qml index 824776e10..30dbdfb6e 100644 --- a/src/qml/Menu/ShareDialog.qml +++ b/src/qml/Menu/ShareDialog.qml @@ -13,7 +13,7 @@ import org.kde.notification 1.0 import org.kde.kirigami 2.14 as Kirigami Kirigami.Page { - id: window + id: root leftPadding: 0 rightPadding: 0 @@ -25,7 +25,7 @@ Kirigami.Page { QQC2.Action { shortcut: 'Escape' - onTriggered: window.closeDialog() + onTriggered: root.closeDialog() } Notification { @@ -54,15 +54,15 @@ Kirigami.Page { sharingSuccess.sendEvent(); Clipboard.saveText(jobView.output.url); } - window.closeDialog() + root.closeDialog() } else if (state === Purpose.PurposeJobController.Error) { // Show failure notification sharingFailed.sendEvent(); - window.closeDialog() + root.closeDialog() } else if (state === Purpose.PurposeJobController.Cancelled) { // Do nothing - window.closeDialog() + root.closeDialog() } } } diff --git a/src/qml/Menu/Timeline/BanSheet.qml b/src/qml/Menu/Timeline/BanSheet.qml index 8858bf857..2e908a2d3 100644 --- a/src/qml/Menu/Timeline/BanSheet.qml +++ b/src/qml/Menu/Timeline/BanSheet.qml @@ -10,7 +10,7 @@ import org.kde.kirigami 2.20 as Kirigami import org.kde.neochat 1.0 Kirigami.Page { - id: banSheet + id: root property NeoChatRoom room property string userId @@ -35,14 +35,14 @@ Kirigami.Page { icon.name: "im-ban-user" QQC2.DialogButtonBox.buttonRole: QQC2.DialogButtonBox.AcceptRole onClicked: { - banSheet.room.ban(banSheet.userId, reason.text) - banSheet.closeDialog() + root.room.ban(root.userId, reason.text) + root.closeDialog() } } QQC2.Button { text: i18nc("@action", "Cancel") QQC2.DialogButtonBox.buttonRole: QQC2.DialogButtonBox.RejectRole - onClicked: banSheet.closeDialog() + onClicked: root.closeDialog() } } } diff --git a/src/qml/Menu/Timeline/MessageDelegateContextMenu.qml b/src/qml/Menu/Timeline/MessageDelegateContextMenu.qml index 69847188b..373c17a2f 100644 --- a/src/qml/Menu/Timeline/MessageDelegateContextMenu.qml +++ b/src/qml/Menu/Timeline/MessageDelegateContextMenu.qml @@ -11,7 +11,7 @@ import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents import org.kde.neochat 1.0 Loader { - id: loadRoot + id: root required property var author required property string eventId @@ -31,7 +31,7 @@ Loader { currentRoom.chatBoxEditId = eventId; currentRoom.chatBoxReplyId = ""; } - visible: author.id === Controller.activeConnection.localUserId && (loadRoot.eventType === DelegateType.Emote || loadRoot.eventType === DelegateType.Message) + visible: author.id === Controller.activeConnection.localUserId && (root.eventType === DelegateType.Emote || root.eventType === DelegateType.Message) }, Kirigami.Action { text: i18n("Reply") @@ -50,7 +50,7 @@ Loader { width: Kirigami.Units.gridUnit * 25 }) page.chosen.connect(function(targetRoomId) { - Controller.activeConnection.room(targetRoomId).postHtmlMessage(loadRoot.plainText, loadRoot.htmlText ? loadRoot.htmlText : loadRoot.plainText) + Controller.activeConnection.room(targetRoomId).postHtmlMessage(root.plainText, root.htmlText ? root.htmlText : root.plainText) page.closeDialog() }) } @@ -68,7 +68,7 @@ Loader { Kirigami.Action { text: i18n("Copy") icon.name: "edit-copy" - onTriggered: Clipboard.saveText(loadRoot.selectedText === "" ? loadRoot.plainText : loadRoot.selectedText) + onTriggered: Clipboard.saveText(root.selectedText === "" ? root.plainText : root.selectedText) }, Kirigami.Action { text: i18nc("@action:button 'Report' as in 'Report this event to the administrators'", "Report") @@ -84,7 +84,7 @@ Loader { icon.name: "code-context" onTriggered: { applicationWindow().pageStack.pushDialogLayer('qrc:/MessageSourceSheet.qml', { - sourceText: loadRoot.source + sourceText: root.eventSource }, { title: i18n("Message Source"), width: Kirigami.Units.gridUnit * 25 @@ -95,7 +95,7 @@ Loader { text: i18n("Copy Link") icon.name: "edit-copy" onTriggered: { - Clipboard.saveText("https://matrix.to/#/" + currentRoom.id + "/" + loadRoot.eventId) + Clipboard.saveText("https://matrix.to/#/" + currentRoom.id + "/" + root.eventId) } } ] @@ -106,7 +106,7 @@ Loader { QQC2.Menu { id: menu Instantiator { - model: loadRoot.nestedActions + model: root.nestedActions delegate: QQC2.Menu { id: menuItem visible: modelData.visible @@ -131,12 +131,12 @@ Loader { } Repeater { - model: loadRoot.actions + model: root.actions QQC2.MenuItem { id: menuItem visible: modelData.visible action: modelData - onClicked: loadRoot.item.close(); + onClicked: root.item.close(); } } QQC2.Menu { @@ -150,7 +150,7 @@ Loader { Instantiator { model: WebShortcutModel { id: webshortcutmodel - selectedText: loadRoot.selectedText ? loadRoot.selectedText : loadRoot.plainText + selectedText: root.selectedText ? root.selectedText : root.plainText onOpenUrl: RoomManager.visitNonMatrix(url) } delegate: QQC2.MenuItem { @@ -222,7 +222,7 @@ Loader { text: modelData.text onClicked: { modelData.triggered() - loadRoot.item.close(); + root.item.close(); } implicitHeight: visible ? Kirigami.Units.gridUnit * 3 : 0 } @@ -285,7 +285,7 @@ Loader { onClicked: { currentRoom.toggleReaction(eventId, modelData); - loadRoot.item.close(); + root.item.close(); } } } @@ -295,7 +295,7 @@ Loader { } Repeater { id: listViewAction - model: loadRoot.actions + model: root.actions Kirigami.BasicListItem { icon: modelData.icon.name @@ -305,14 +305,14 @@ Loader { text: modelData.text onClicked: { modelData.triggered() - loadRoot.item.close(); + root.item.close(); } implicitHeight: visible ? Kirigami.Units.gridUnit * 3 : 0 } } Repeater { - model: loadRoot.nestedActions + model: root.nestedActions Kirigami.BasicListItem { action: modelData diff --git a/src/qml/Menu/Timeline/RemoveSheet.qml b/src/qml/Menu/Timeline/RemoveSheet.qml index c81866a82..28a65e981 100644 --- a/src/qml/Menu/Timeline/RemoveSheet.qml +++ b/src/qml/Menu/Timeline/RemoveSheet.qml @@ -10,7 +10,7 @@ import org.kde.kirigami 2.20 as Kirigami import org.kde.neochat 1.0 Kirigami.Page { - id: deleteSheet + id: root property NeoChatRoom room property string eventId @@ -37,18 +37,18 @@ Kirigami.Page { icon.name: "delete" QQC2.DialogButtonBox.buttonRole: QQC2.DialogButtonBox.AcceptRole onClicked: { - if (deleteSheet.userId.length > 0) { - deleteSheet.room.deleteMessagesByUser(deleteSheet.userId, reason.text) + if (root.userId.length > 0) { + root.room.deleteMessagesByUser(root.userId, reason.text) } else { - deleteSheet.room.redactEvent(deleteSheet.eventId, reason.text); + root.room.redactEvent(root.eventId, reason.text); } - deleteSheet.closeDialog() + root.closeDialog() } } QQC2.Button { text: i18nc("@action", "Cancel") QQC2.DialogButtonBox.buttonRole: QQC2.DialogButtonBox.RejectRole - onClicked: deleteSheet.closeDialog() + onClicked: root.closeDialog() } } } diff --git a/src/qml/Menu/Timeline/ReportSheet.qml b/src/qml/Menu/Timeline/ReportSheet.qml index 3807665ec..4566c0a2b 100644 --- a/src/qml/Menu/Timeline/ReportSheet.qml +++ b/src/qml/Menu/Timeline/ReportSheet.qml @@ -10,7 +10,7 @@ import org.kde.kirigami 2.20 as Kirigami import org.kde.neochat 1.0 Kirigami.Page { - id: reportSheet + id: root property NeoChatRoom room property string eventId @@ -35,14 +35,14 @@ Kirigami.Page { icon.name: "dialog-warning-symbolic" QQC2.DialogButtonBox.buttonRole: QQC2.DialogButtonBox.AcceptRole onClicked: { - reportSheet.room.reportEvent(eventId, reason.text) - reportSheet.closeDialog() + root.room.reportEvent(eventId, reason.text) + root.closeDialog() } } QQC2.Button { text: i18nc("@action", "Cancel") QQC2.DialogButtonBox.buttonRole: QQC2.DialogButtonBox.RejectRole - onClicked: reportSheet.closeDialog() + onClicked: root.closeDialog() } } } diff --git a/src/qml/Page/RoomList/UserInfo.qml b/src/qml/Page/RoomList/UserInfo.qml index 9c7dc7c80..54764fa59 100644 --- a/src/qml/Page/RoomList/UserInfo.qml +++ b/src/qml/Page/RoomList/UserInfo.qml @@ -11,7 +11,7 @@ import org.kde.kirigamiaddons.delegates 1.0 as Delegates import org.kde.neochat 1.0 QQC2.ToolBar { - id: userInfo + id: root padding: 0 @@ -33,7 +33,7 @@ QQC2.ToolBar { id: addButton width: parent.width highlighted: focus || (addAccount.highlighted || addAccount.ListView.isCurrentItem) && !addAccount.pressed - Component.onCompleted: userInfo.addAccount = this + Component.onCompleted: root.addAccount = this icon { name: "list-add" width: Kirigami.Units.iconSizes.smallMedium diff --git a/src/qml/Page/RoomWindow.qml b/src/qml/Page/RoomWindow.qml index 6f5766796..91ae75406 100644 --- a/src/qml/Page/RoomWindow.qml +++ b/src/qml/Page/RoomWindow.qml @@ -10,23 +10,24 @@ import org.kde.kirigami 2.15 as Kirigami import org.kde.neochat 1.0 Kirigami.ApplicationWindow { - id: window + id: root + required property NeoChatRoom currentRoom minimumWidth: Kirigami.Units.gridUnit * 10 minimumHeight: Kirigami.Units.gridUnit * 15 Shortcut { sequence: StandardKey.Cancel - onActivated: window.close() + onActivated: root.close() } pageStack.initialPage: RoomPage { visible: true - currentRoom: window.currentRoom + currentRoom: root.currentRoom disableCancelShortcut: true } onCurrentRoomChanged: if (!currentRoom) { - window.close() + root.close() } property Item hoverLinkIndicator: QQC2.Control { diff --git a/src/qml/Page/SearchPage.qml b/src/qml/Page/SearchPage.qml index 459178bbb..b311bb765 100644 --- a/src/qml/Page/SearchPage.qml +++ b/src/qml/Page/SearchPage.qml @@ -10,7 +10,7 @@ import org.kde.kirigami 2.20 as Kirigami import org.kde.neochat 1.0 Kirigami.ScrollablePage { - id: searchPage + id: root property NeoChatRoom currentRoom @@ -22,7 +22,7 @@ Kirigami.ScrollablePage { id: searchModel connection: Controller.activeConnection searchText: searchField.text - room: searchPage.currentRoom + room: root.currentRoom } header: RowLayout { diff --git a/src/qml/Settings/DeviceDelegate.qml b/src/qml/Settings/DeviceDelegate.qml index 8aab4672e..c2c11581f 100644 --- a/src/qml/Settings/DeviceDelegate.qml +++ b/src/qml/Settings/DeviceDelegate.qml @@ -12,7 +12,7 @@ import org.kde.kirigamiaddons.formcard 1.0 as FormCard import org.kde.neochat 1.0 FormCard.AbstractFormDelegate { - id: deviceDelegate + id: root required property string id required property string timestamp @@ -21,7 +21,7 @@ FormCard.AbstractFormDelegate { property bool editDeviceName: false property bool showVerifyButton - onClicked: deviceDelegate.editDeviceName = true + onClicked: root.editDeviceName = true contentItem: RowLayout { spacing: Kirigami.Units.largeSpacing @@ -35,11 +35,11 @@ FormCard.AbstractFormDelegate { id: deviceLabel Layout.fillWidth: true spacing: Kirigami.Units.smallSpacing - visible: !deviceDelegate.editDeviceName + visible: !root.editDeviceName QQC2.Label { Layout.fillWidth: true - text: deviceDelegate.displayName + text: root.displayName elide: Text.ElideRight wrapMode: Text.Wrap maximumLineCount: 2 @@ -47,7 +47,7 @@ FormCard.AbstractFormDelegate { QQC2.Label { Layout.fillWidth: true - text: i18nc("@label", "%1, Last activity: %2", deviceDelegate.id, deviceDelegate.timestamp) + text: i18nc("@label", "%1, Last activity: %2", root.id, root.timestamp) color: Kirigami.Theme.disabledTextColor font: Kirigami.Theme.smallFont elide: Text.ElideRight @@ -59,29 +59,29 @@ FormCard.AbstractFormDelegate { Accessible.description: i18n("New device name") Layout.fillWidth: true Layout.preferredHeight: deviceLabel.implicitHeight - visible: deviceDelegate.editDeviceName + visible: root.editDeviceName - text: deviceDelegate.displayName + text: root.displayName rightActions: [ Kirigami.Action { text: i18n("Cancel editing display name") icon.name: "edit-delete-remove" onTriggered: { - deviceDelegate.editDeviceName = false + root.editDeviceName = false } }, Kirigami.Action { text: i18n("Confirm new display name") icon.name: "checkmark" - visible: nameField.text !== deviceDelegate.displayName + visible: nameField.text !== root.displayName onTriggered: { - devicesModel.setName(deviceDelegate.id, nameField.text) + devicesModel.setName(root.id, nameField.text) } } ] - onAccepted: devicesModel.setName(deviceDelegate.id, nameField.text) + onAccepted: devicesModel.setName(root.id, nameField.text) } QQC2.ToolButton { display: QQC2.AbstractButton.IconOnly @@ -89,7 +89,7 @@ FormCard.AbstractFormDelegate { id: editDeviceAction text: i18n("Edit device name") icon.name: "document-edit" - onTriggered: deviceDelegate.editDeviceName = true + onTriggered: root.editDeviceName = true } QQC2.ToolTip { text: editDeviceAction.text @@ -98,13 +98,13 @@ FormCard.AbstractFormDelegate { } QQC2.ToolButton { display: QQC2.AbstractButton.IconOnly - visible: deviceDelegate.showVerifyButton + visible: root.showVerifyButton action: Kirigami.Action { id: verifyDeviceAction text: i18n("Verify device") icon.name: "security-low-symbolic" onTriggered: { - devicesModel.connection.startKeyVerificationSession(devicesModel.connection.localUserId, deviceDelegate.id) + devicesModel.connection.startKeyVerificationSession(devicesModel.connection.localUserId, root.id) } } QQC2.ToolTip { @@ -119,7 +119,7 @@ FormCard.AbstractFormDelegate { text: i18n("Logout device") icon.name: "edit-delete-remove" onTriggered: { - passwordSheet.deviceId = deviceDelegate.id + passwordSheet.deviceId = root.id passwordSheet.open() } } diff --git a/src/qml/Settings/SettingsPage.qml b/src/qml/Settings/SettingsPage.qml index b3529b877..d501c8eb0 100644 --- a/src/qml/Settings/SettingsPage.qml +++ b/src/qml/Settings/SettingsPage.qml @@ -9,7 +9,7 @@ import QtQuick.Layouts 1.15 import org.kde.neochat 1.0 KirigamiSettings.CategorizedSettings { - id: settingsPage + id: root required property NeoChatConnection connection @@ -66,7 +66,7 @@ KirigamiSettings.CategorizedSettings { page: Qt.resolvedUrl("DevicesPage.qml") initialProperties: { return { - connection: settingsPage.connection + connection: root.connection } } }, diff --git a/src/qml/Settings/ThemeRadioButton.qml b/src/qml/Settings/ThemeRadioButton.qml index 8743344d4..37e16be9c 100644 --- a/src/qml/Settings/ThemeRadioButton.qml +++ b/src/qml/Settings/ThemeRadioButton.qml @@ -9,7 +9,7 @@ import QtQuick.Layouts 1.15 import org.kde.kirigami 2.15 as Kirigami QQC2.RadioButton { - id: delegate + id: root implicitWidth: contentItem.implicitWidth implicitHeight: contentItem.implicitHeight @@ -20,7 +20,7 @@ QQC2.RadioButton { contentItem: ColumnLayout { Kirigami.ShadowedRectangle { implicitWidth: implicitHeight * 1.6 - implicitHeight: delegate.thin ? Kirigami.Units.gridUnit * 5 : Kirigami.Units.gridUnit * 6 + implicitHeight: root.thin ? Kirigami.Units.gridUnit * 5 : Kirigami.Units.gridUnit * 6 radius: Kirigami.Units.smallSpacing Kirigami.Theme.inherit: false Kirigami.Theme.colorSet: Kirigami.Theme.View @@ -31,9 +31,9 @@ QQC2.RadioButton { shadow.color: Qt.rgba(0, 0, 0, 0.3) color: { - if (delegate.checked) { + if (root.checked) { return Kirigami.Theme.highlightColor; - } else if (delegate.hovered) { + } else if (root.hovered) { // Match appearance of hovered list items return Qt.rgba(Kirigami.Theme.highlightColor.r, Kirigami.Theme.highlightColor.g, @@ -54,7 +54,7 @@ QQC2.RadioButton { QQC2.Label { id: label Layout.fillWidth: true - text: delegate.text + text: root.text horizontalAlignment: Text.AlignHCenter } }