diff --git a/src/settings/AccountsPage.qml b/src/settings/AccountsPage.qml index e9f54b04b..c80782248 100644 --- a/src/settings/AccountsPage.qml +++ b/src/settings/AccountsPage.qml @@ -28,7 +28,7 @@ FormCard.FormCardPage { interval: 10 running: false onTriggered: root.QQC2.ApplicationWindow.window.pageStack.layers.push(Qt.createComponent('org.kde.neochat.settings', 'AccountEditorPage'), { - connection: initialAccount + connection: root.initialAccount }, { title: i18n("Account editor") }) diff --git a/src/settings/DevicesPage.qml b/src/settings/DevicesPage.qml index 09a0a655c..0ded92910 100644 --- a/src/settings/DevicesPage.qml +++ b/src/settings/DevicesPage.qml @@ -75,7 +75,7 @@ FormCard.FormCardPage { FormCard.AbstractFormDelegate { Layout.fillWidth: true - visible: root.connection && devicesModel.count === 0 // We can assume 0 means loading since there is at least one device + visible: root.connection && root.devicesModel.count === 0 // We can assume 0 means loading since there is at least one device contentItem: Kirigami.LoadingPlaceholder {} } diff --git a/src/settings/EmoticonEditorPage.qml b/src/settings/EmoticonEditorPage.qml index ecdaea224..395650594 100644 --- a/src/settings/EmoticonEditorPage.qml +++ b/src/settings/EmoticonEditorPage.qml @@ -29,7 +29,7 @@ FormCard.FormCardPage { title: emoticonType === EmoticonFormCard.Stickers ? (newEmoticon ? i18nc("@title:window", "Add Sticker") : i18nc("@title:window", "Edit Sticker")) : (newEmoticon ? i18nc("@title:window", "Add Emoji") : i18nc("@title:window", "Edit Emoji")) FormCard.FormHeader { - title: emoticonType === EmoticonFormCard.Stickers ? i18nc("@info:group", "Sticker") : i18nc("@info:group", "Emoji") + title: root.emoticonType === EmoticonFormCard.Stickers ? i18nc("@info:group", "Sticker") : i18nc("@info:group", "Emoji") } FormCard.FormCard { FormCard.AbstractFormDelegate { @@ -44,11 +44,9 @@ FormCard.FormCardPage { source: root.url sourceSize.width: Kirigami.Units.gridUnit * 4 sourceSize.height: Kirigami.Units.gridUnit * 4 - width: Kirigami.Units.gridUnit * 4 - height: Kirigami.Units.gridUnit * 4 Kirigami.Icon { - source: emoticonType === EmoticonFormCard.Stickers ? "stickers" : "preferences-desktop-emoticons" + source: root.emoticonType === EmoticonFormCard.Stickers ? "stickers" : "preferences-desktop-emoticons" anchors.fill: parent visible: parent.status !== Image.Ready } @@ -75,7 +73,7 @@ FormCard.FormCardPage { if (fileDialog != null) { return; } - fileDialog = openFileDialog.createObject(QQC2.Overlay.overlay); + fileDialog = root.openFileDialog.createObject(QQC2.Overlay.overlay); fileDialog.chosen.connect(function (receivedSource) { mouseArea.fileDialog = null; if (!receivedSource) {