From f5aef8d0c3033869c00e542da77ebe2deb4fbf09 Mon Sep 17 00:00:00 2001 From: Tobias Fella Date: Wed, 10 Apr 2024 21:32:46 +0200 Subject: [PATCH] Use Qt.createComponent in non-weird way Fixed #647 --- src/devtools/AccountData.qml | 2 +- src/devtools/RoomData.qml | 4 ++-- src/devtools/StateKeys.qml | 2 +- src/qml/AccountMenu.qml | 10 +++++----- src/qml/AccountSwitchDialog.qml | 2 +- src/qml/Captcha.qml | 2 +- src/qml/ContextMenu.qml | 4 ++-- src/qml/CreateRoomDialog.qml | 4 ++-- src/qml/DelegateContextMenu.qml | 4 ++-- src/qml/Email.qml | 2 +- src/qml/ExploreComponent.qml | 10 +++++----- src/qml/ExploreComponentMobile.qml | 8 ++++---- src/qml/FileDelegateContextMenu.qml | 2 +- src/qml/GlobalMenu.qml | 6 +++--- src/qml/Homeserver.qml | 4 ++-- src/qml/Login.qml | 8 ++++---- src/qml/LoginMethod.qml | 4 ++-- src/qml/LoginRegister.qml | 4 ++-- src/qml/MessageDelegateContextMenu.qml | 2 +- src/qml/Password.qml | 4 ++-- src/qml/RegisterPassword.qml | 2 +- src/qml/RoomDelegate.qml | 2 +- src/qml/RoomDrawer.qml | 2 +- src/qml/RoomDrawerPage.qml | 2 +- src/qml/RoomInformation.qml | 8 ++++---- src/qml/RoomListPage.qml | 6 +++--- src/qml/RoomPage.qml | 4 ++-- src/qml/SelectParentDialog.qml | 4 ++-- src/qml/ShareAction.qml | 2 +- src/qml/SpaceDrawer.qml | 4 ++-- src/qml/SpaceHomePage.qml | 6 +++--- src/qml/SpaceListContextMenu.qml | 4 ++-- src/qml/Sso.qml | 4 ++-- src/qml/Terms.qml | 2 +- src/qml/UserDetailDialog.qml | 4 ++-- src/qml/UserInfo.qml | 4 ++-- src/qml/Username.qml | 4 ++-- src/qml/WelcomePage.qml | 14 +++++++------- src/qml/main.qml | 12 ++++++------ src/settings/AccountEditorPage.qml | 2 +- src/settings/AccountsPage.qml | 4 ++-- src/settings/AppearanceSettingsPage.qml | 2 +- src/settings/NeoChatGeneralPage.qml | 2 +- 43 files changed, 94 insertions(+), 94 deletions(-) diff --git a/src/devtools/AccountData.qml b/src/devtools/AccountData.qml index f422ff65f..bc09b4a07 100644 --- a/src/devtools/AccountData.qml +++ b/src/devtools/AccountData.qml @@ -23,7 +23,7 @@ ColumnLayout { model: root.connection.accountDataEventTypes delegate: FormCard.FormButtonDelegate { text: modelData - onClicked: applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet.qml'), { + onClicked: applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet'), { sourceText: root.connection.accountDataJsonString(modelData) }, { title: i18nc("@title:window", "Event Source"), diff --git a/src/devtools/RoomData.qml b/src/devtools/RoomData.qml index 4fa28acd2..8a1329dc3 100644 --- a/src/devtools/RoomData.qml +++ b/src/devtools/RoomData.qml @@ -46,7 +46,7 @@ ColumnLayout { model: root.room.accountDataEventTypes delegate: FormCard.FormButtonDelegate { text: modelData - onClicked: applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet.qml'), { + onClicked: applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet'), { sourceText: root.room.roomAcountDataJson(text) }, { title: i18n("Event Source"), @@ -74,7 +74,7 @@ ColumnLayout { description: i18ncp("'Event' being some JSON data, not something physically happening.", "%1 event of this type", "%1 events of this type", model.eventCount) onClicked: { if (model.eventCount === 1) { - onClicked: applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet.qml'), { + onClicked: applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet'), { sourceText: stateModel.stateEventJson(stateModel.index(model.index, 0)) }, { title: i18n("Event Source"), diff --git a/src/devtools/StateKeys.qml b/src/devtools/StateKeys.qml index c10736fc6..09677796b 100644 --- a/src/devtools/StateKeys.qml +++ b/src/devtools/StateKeys.qml @@ -31,7 +31,7 @@ FormCard.FormCardPage { delegate: FormCard.FormButtonDelegate { text: model.stateKey - onClicked: applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet.qml'), { + onClicked: applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet'), { sourceText: stateKeysModel.stateEventJson(stateKeysModel.index(model.index, 0)) }, { title: i18nc("@title:window", "Event Source"), diff --git a/src/qml/AccountMenu.qml b/src/qml/AccountMenu.qml index 357b7ceb8..3ce5b4bdd 100644 --- a/src/qml/AccountMenu.qml +++ b/src/qml/AccountMenu.qml @@ -22,7 +22,7 @@ QQC2.Menu { QQC2.MenuItem { text: i18n("Edit this account") icon.name: "document-edit" - onTriggered: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'AccountEditorPage.qml'), { + onTriggered: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'AccountEditorPage'), { connection: root.connection }, { title: i18n("Account editor") @@ -31,7 +31,7 @@ QQC2.Menu { QQC2.MenuItem { text: i18n("Notification settings") icon.name: "notifications" - onTriggered: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'NeoChatSettings.qml'), { + onTriggered: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'NeoChatSettings'), { defaultPage: "notifications", connection: root.connection }, { @@ -43,7 +43,7 @@ QQC2.Menu { QQC2.MenuItem { text: i18n("Devices") icon.name: "computer-symbolic" - onTriggered: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'NeoChatSettings.qml'), { + onTriggered: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'NeoChatSettings'), { defaultPage: "devices", connection: root.connection }, { @@ -56,7 +56,7 @@ QQC2.Menu { text: i18n("Open developer tools") icon.name: "tools" visible: Config.developerTools - onTriggered: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.devtools', 'DevtoolsPage.qml'), { + onTriggered: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.devtools', 'DevtoolsPage'), { connection: root.connection }, { title: i18nc("@title:window", "Developer Tools"), @@ -68,7 +68,7 @@ QQC2.Menu { text: i18nc("@action:inmenu", "Open Secret Backup") icon.name: "unlock" visible: Config.secretBackup - onTriggered: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'UnlockSSSSDialog.qml'), {}, { + onTriggered: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'UnlockSSSSDialog'), {}, { title: i18nc("@title:window", "Open Key Backup") }) enabled: Controller.ssssSupported diff --git a/src/qml/AccountSwitchDialog.qml b/src/qml/AccountSwitchDialog.qml index e7fef8098..2013d5205 100644 --- a/src/qml/AccountSwitchDialog.qml +++ b/src/qml/AccountSwitchDialog.qml @@ -61,7 +61,7 @@ Kirigami.Dialog { } onClicked: { - pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'WelcomePage.qml'), {}, { + pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'WelcomePage'), {}, { title: i18nc("@title:window", "Login") }); if (switchUserButton.checked) { diff --git a/src/qml/Captcha.qml b/src/qml/Captcha.qml index 2669bc83f..32b8b6a6a 100644 --- a/src/qml/Captcha.qml +++ b/src/qml/Captcha.qml @@ -43,6 +43,6 @@ LoginStep { } } previousAction: Kirigami.Action { - onTriggered: root.processed("Username.qml") + onTriggered: root.processed("Username") } } diff --git a/src/qml/ContextMenu.qml b/src/qml/ContextMenu.qml index 223f6810d..6b30bb9a7 100644 --- a/src/qml/ContextMenu.qml +++ b/src/qml/ContextMenu.qml @@ -110,7 +110,7 @@ Loader { QQC2.MenuItem { text: i18n("Room Settings") icon.name: "configure" - onTriggered: QQC2.ApplicationWindow.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'RoomSettings.qml'), { + onTriggered: QQC2.ApplicationWindow.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'RoomSettings'), { room: room, connection: connection }, { @@ -184,7 +184,7 @@ Loader { QQC2.ToolButton { icon.name: 'settings-configure' onClicked: { - QQC2.ApplicationWindow.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'RoomSettings.qml'), { + QQC2.ApplicationWindow.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'RoomSettings'), { room: room, connection: root.connection }, { diff --git a/src/qml/CreateRoomDialog.qml b/src/qml/CreateRoomDialog.qml index 63d90c7b1..f417688e3 100644 --- a/src/qml/CreateRoomDialog.qml +++ b/src/qml/CreateRoomDialog.qml @@ -111,7 +111,7 @@ FormCard.FormCardPage { visible: !chosenRoomDelegate.visible text: i18nc("@action:button", "Pick room") onClicked: { - let dialog = pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage.qml'), { + let dialog = pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage'), { connection: root.connection }, { title: i18nc("@title", "Explore Rooms") @@ -194,7 +194,7 @@ FormCard.FormCardPage { } onClicked: { - let dialog = pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage.qml'), { + let dialog = pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage'), { connection: root.connection }, { title: i18nc("@title", "Explore Rooms") diff --git a/src/qml/DelegateContextMenu.qml b/src/qml/DelegateContextMenu.qml index 8fb1e0725..84f41e25e 100644 --- a/src/qml/DelegateContextMenu.qml +++ b/src/qml/DelegateContextMenu.qml @@ -95,7 +95,7 @@ Loader { text: i18n("Remove") icon.name: "edit-delete-remove" icon.color: "red" - onTriggered: applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'RemoveSheet.qml'), { + onTriggered: applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'RemoveSheet'), { room: currentRoom, eventId: eventId }, { @@ -118,7 +118,7 @@ Loader { text: i18nc("@action:button 'Report' as in 'Report this event to the administrators'", "Report") icon.name: "dialog-warning-symbolic" visible: !author.isLocalUser - onTriggered: applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ReportSheet.qml'), { + onTriggered: applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ReportSheet'), { room: currentRoom, eventId: eventId }, { diff --git a/src/qml/Email.qml b/src/qml/Email.qml index 5e37178da..d018a8822 100644 --- a/src/qml/Email.qml +++ b/src/qml/Email.qml @@ -55,6 +55,6 @@ LoginStep { } } previousAction: Kirigami.Action { - onTriggered: root.processed("Username.qml") + onTriggered: root.processed("Username") } } diff --git a/src/qml/ExploreComponent.qml b/src/qml/ExploreComponent.qml index f5b9054f7..43e085ff5 100644 --- a/src/qml/ExploreComponent.qml +++ b/src/qml/ExploreComponent.qml @@ -23,7 +23,7 @@ RowLayout { text: i18n("Explore rooms") icon.name: "compass" onTriggered: { - let dialog = pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage.qml'), { + let dialog = pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage'), { connection: root.connection }, { title: i18nc("@title", "Explore Rooms") @@ -36,7 +36,7 @@ RowLayout { property Kirigami.Action chatAction: Kirigami.Action { text: i18n("Find your friends") icon.name: "list-add-user" - onTriggered: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'UserSearchPage.qml'), { + onTriggered: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'UserSearchPage'), { connection: root.connection }, { title: i18nc("@title", "Find your friends") @@ -46,7 +46,7 @@ RowLayout { text: i18n("Create a Room") icon.name: "system-users-symbolic" onTriggered: { - pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'CreateRoomDialog.qml'), { + pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'CreateRoomDialog'), { connection: root.connection }, { title: i18nc("@title", "Create a Room") @@ -58,7 +58,7 @@ RowLayout { text: i18n("Create a Space") icon.name: "list-add" onTriggered: { - pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'CreateRoomDialog.qml'), { + pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'CreateRoomDialog'), { connection: root.connection, isSpace: true, title: i18nc("@title", "Create a Space") @@ -71,7 +71,7 @@ RowLayout { property Kirigami.Action scanAction: Kirigami.Action { text: i18n("Scan a QR Code") icon.name: "view-barcode-qr" - onTriggered: pageStack.pushDialogLayer(Qt.createComponent("org.kde.neochat", "QrScannerPage.qml"), { + onTriggered: pageStack.pushDialogLayer(Qt.createComponent("org.kde.neochat", "QrScannerPage"), { connection: root.connection }, { title: i18nc("@title", "Scan a QR Code") diff --git a/src/qml/ExploreComponentMobile.qml b/src/qml/ExploreComponentMobile.qml index 4fde7ef1d..65ae390ca 100644 --- a/src/qml/ExploreComponentMobile.qml +++ b/src/qml/ExploreComponentMobile.qml @@ -52,7 +52,7 @@ ColumnLayout { text: i18n("Explore rooms") icon.name: "compass" onTriggered: { - let dialog = pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage.qml'), { + let dialog = pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage'), { connection: root.connection }, { title: i18nc("@title", "Explore Rooms") @@ -67,7 +67,7 @@ ColumnLayout { text: i18n("Find your friends") icon.name: "list-add-user" onTriggered: { - pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'UserSearchPage.qml'), { + pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'UserSearchPage'), { connection: root.connection }, { title: i18nc("@title", "Find your friends") @@ -140,7 +140,7 @@ ColumnLayout { text: i18n("Create a Room") icon.name: "system-users-symbolic" onTriggered: { - pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'CreateRoomPage.qml'), { + pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'CreateRoomPage'), { connection: root.connection }, { title: i18nc("@title", "Create a Room") @@ -156,7 +156,7 @@ ColumnLayout { text: i18n("Create a Space") icon.name: "list-add" onTriggered: { - pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'CreateRoomDialog.qml'), { + pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'CreateRoomDialog'), { connection: root.connection, isSpace: true, title: i18nc("@title", "Create a Space") diff --git a/src/qml/FileDelegateContextMenu.qml b/src/qml/FileDelegateContextMenu.qml index 178faa7a5..3de2f0a3c 100644 --- a/src/qml/FileDelegateContextMenu.qml +++ b/src/qml/FileDelegateContextMenu.qml @@ -68,7 +68,7 @@ DelegateContextMenu { text: i18n("Remove") icon.name: "edit-delete-remove" icon.color: "red" - onTriggered: applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'RemoveSheet.qml'), { + onTriggered: applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'RemoveSheet'), { room: currentRoom, eventId: eventId }, { diff --git a/src/qml/GlobalMenu.qml b/src/qml/GlobalMenu.qml index 2425a54b9..e81f22367 100644 --- a/src/qml/GlobalMenu.qml +++ b/src/qml/GlobalMenu.qml @@ -29,7 +29,7 @@ Labs.MenuBar { text: i18nc("menu", "Configure NeoChat...") shortcut: StandardKey.Preferences - onTriggered: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'NeoChatSettings.qml'), { + onTriggered: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'NeoChatSettings'), { connection: root.connection }, { title: i18n("Configure"), @@ -50,7 +50,7 @@ Labs.MenuBar { Labs.MenuItem { text: i18nc("menu", "Find your friends") enabled: pageStack.layers.currentItem.title !== i18n("Find your friends") && AccountRegistry.accountCount > 0 - onTriggered: pushReplaceLayer(Qt.createComponent('org.kde.neochat', 'UserSearchPage.qml'), { + onTriggered: pushReplaceLayer(Qt.createComponent('org.kde.neochat', 'UserSearchPage'), { connection: root.connection }, { title: i18nc("@title", "Find your friends") @@ -68,7 +68,7 @@ Labs.MenuBar { Labs.MenuItem { text: i18nc("menu", "Browse Chats…") onTriggered: { - let dialog = pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage.qml'), { + let dialog = pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage'), { connection: root.connection }, { title: i18nc("@title", "Explore Rooms") diff --git a/src/qml/Homeserver.qml b/src/qml/Homeserver.qml index dd8862f97..122dba69f 100644 --- a/src/qml/Homeserver.qml +++ b/src/qml/Homeserver.qml @@ -40,9 +40,9 @@ LoginStep { nextAction: Kirigami.Action { text: Registration.testing ? i18n("Loading") : null enabled: Registration.status > Registration.ServerNoRegistration - onTriggered: root.processed("Username.qml") + onTriggered: root.processed("Username") } previousAction: Kirigami.Action { - onTriggered: root.processed("LoginRegister.qml") + onTriggered: root.processed("LoginRegister") } } diff --git a/src/qml/Login.qml b/src/qml/Login.qml index 5a2639685..081c03f35 100644 --- a/src/qml/Login.qml +++ b/src/qml/Login.qml @@ -38,18 +38,18 @@ LoginStep { text: LoginHelper.isLoggedIn ? i18n("Already logged in") : (LoginHelper.testing && matrixIdField.acceptableInput) ? i18n("Loading…") : i18nc("@action:button", "Continue") onTriggered: { if (LoginHelper.supportsSso && LoginHelper.supportsPassword) { - processed("LoginMethod.qml"); + processed("LoginMethod"); } else if (LoginHelper.supportsSso) { - processed("Sso.qml"); + processed("Sso"); } else { - processed("Password.qml"); + processed("Password"); } } enabled: LoginHelper.homeserverReachable } previousAction: Kirigami.Action { onTriggered: { - root.processed("LoginRegister.qml"); + root.processed("LoginRegister"); } } } diff --git a/src/qml/LoginMethod.qml b/src/qml/LoginMethod.qml index 934e13cd9..6cbaf180e 100644 --- a/src/qml/LoginMethod.qml +++ b/src/qml/LoginMethod.qml @@ -18,12 +18,12 @@ LoginStep { FormCard.FormButtonDelegate { id: loginPasswordButton text: i18nc("@action:button", "Login with password") - onClicked: processed("Password.qml") + onClicked: processed("Password") } FormCard.FormButtonDelegate { id: loginSsoButton text: i18nc("@action:button", "Login with single sign-on") - onClicked: processed("Sso.qml") + onClicked: processed("Sso") } } diff --git a/src/qml/LoginRegister.qml b/src/qml/LoginRegister.qml index d780b05e4..e6767dba9 100644 --- a/src/qml/LoginRegister.qml +++ b/src/qml/LoginRegister.qml @@ -22,13 +22,13 @@ LoginStep { FormCard.FormButtonDelegate { id: loginButton text: i18nc("@action:button", "Login") - onClicked: root.processed("Login.qml") + onClicked: root.processed("Login") } FormCard.FormDelegateSeparator {} FormCard.FormButtonDelegate { text: i18nc("@action:button", "Register") - onClicked: root.processed("Homeserver.qml") + onClicked: root.processed("Homeserver") } } diff --git a/src/qml/MessageDelegateContextMenu.qml b/src/qml/MessageDelegateContextMenu.qml index 5b37eccd8..8c1686779 100644 --- a/src/qml/MessageDelegateContextMenu.qml +++ b/src/qml/MessageDelegateContextMenu.qml @@ -48,7 +48,7 @@ DelegateContextMenu { text: i18nc("@action:inmenu As in 'Forward this message'", "Forward") icon.name: "mail-forward-symbolic" onTriggered: { - let page = applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ChooseRoomDialog.qml'), { + let page = applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ChooseRoomDialog'), { connection: root.connection }, { title: i18nc("@title", "Forward Message"), diff --git a/src/qml/Password.qml b/src/qml/Password.qml index 003e201d0..9bc9262ab 100644 --- a/src/qml/Password.qml +++ b/src/qml/Password.qml @@ -15,7 +15,7 @@ LoginStep { Connections { target: LoginHelper function onConnected() { - processed("Loading.qml"); + processed("Loading"); } } @@ -46,6 +46,6 @@ LoginStep { } } previousAction: Kirigami.Action { - onTriggered: processed("Login.qml") + onTriggered: processed("Login") } } diff --git a/src/qml/RegisterPassword.qml b/src/qml/RegisterPassword.qml index d768db81b..7ba24efaa 100644 --- a/src/qml/RegisterPassword.qml +++ b/src/qml/RegisterPassword.qml @@ -47,6 +47,6 @@ LoginStep { } previousAction: Kirigami.Action { - onTriggered: root.processed("Username.qml") + onTriggered: root.processed("Username") } } diff --git a/src/qml/RoomDelegate.qml b/src/qml/RoomDelegate.qml index f8ffebd6b..26a7d0dcf 100644 --- a/src/qml/RoomDelegate.qml +++ b/src/qml/RoomDelegate.qml @@ -141,7 +141,7 @@ Delegates.RoundedItemDelegate { } function createRoomListContextMenu() { - const component = Qt.createComponent('org.kde.neochat', 'ContextMenu.qml'); + const component = Qt.createComponent('org.kde.neochat', 'ContextMenu'); if (component.status === Component.Error) { console.error(component.errorString()); } diff --git a/src/qml/RoomDrawer.qml b/src/qml/RoomDrawer.qml index a590392b7..d8aeca43c 100644 --- a/src/qml/RoomDrawer.qml +++ b/src/qml/RoomDrawer.qml @@ -103,7 +103,7 @@ Kirigami.OverlayDrawer { text: i18n("Room settings") display: QQC2.AbstractButton.IconOnly - onClicked: QQC2.ApplicationWindow.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'RoomSettings.qml'), { + onClicked: QQC2.ApplicationWindow.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'RoomSettings'), { room: room, connection: root.connection }, { diff --git a/src/qml/RoomDrawerPage.qml b/src/qml/RoomDrawerPage.qml index 77b85bb2b..ea0bdec28 100644 --- a/src/qml/RoomDrawerPage.qml +++ b/src/qml/RoomDrawerPage.qml @@ -44,7 +44,7 @@ Kirigami.Page { displayHint: Kirigami.DisplayHint.IconOnly text: i18n("Settings") icon.name: "settings-configure" - onTriggered: applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'Categories.qml'), { + onTriggered: applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'Categories'), { room: root.room, connection: root.connection }, { diff --git a/src/qml/RoomInformation.qml b/src/qml/RoomInformation.qml index 7022c6afd..1711cfea7 100644 --- a/src/qml/RoomInformation.qml +++ b/src/qml/RoomInformation.qml @@ -81,7 +81,7 @@ QQC2.ScrollView { Layout.fillWidth: true onClicked: { - pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'RoomSearchPage.qml'), { + pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'RoomSearchPage'), { room: root.room }, { title: i18nc("@action:title", "Search") @@ -106,7 +106,7 @@ QQC2.ScrollView { icon.name: "map-flat" text: i18n("Show locations for this room") - onClicked: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'LocationsPage.qml'), { + onClicked: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'LocationsPage'), { room: root.room }, { title: i18nc("Locations on a map", "Locations") @@ -123,7 +123,7 @@ QQC2.ScrollView { Layout.fillWidth: true onClicked: { - Qt.createComponent('org.kde.neochat', 'ConfirmLeaveDialog.qml').createObject(root.QQC2.ApplicationWindow.window, { + Qt.createComponent('org.kde.neochat', 'ConfirmLeaveDialog').createObject(root.QQC2.ApplicationWindow.window, { room: root.room }).open(); } @@ -142,7 +142,7 @@ QQC2.ScrollView { icon.name: "list-add-user" onClicked: { - applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'InviteUserPage.qml'), { + applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'InviteUserPage'), { room: root.room }, { title: i18nc("@title", "Invite a User") diff --git a/src/qml/RoomListPage.qml b/src/qml/RoomListPage.qml index 10f0f5e59..d0bac42ae 100644 --- a/src/qml/RoomListPage.qml +++ b/src/qml/RoomListPage.qml @@ -186,7 +186,7 @@ Kirigami.Page { icon.width: Kirigami.Units.gridUnit * 2 icon.height: Kirigami.Units.gridUnit * 2 - onClicked: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'UserSearchPage.qml'), { + onClicked: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'UserSearchPage'), { connection: root.connection }, { title: i18nc("@title", "Find your friends") @@ -215,7 +215,7 @@ Kirigami.Page { icon.name: RoomManager.sortFilterRoomTreeModel.filterText.length > 0 ? "search" : "list-add" text: RoomManager.sortFilterRoomTreeModel.filterText.length > 0 ? i18n("Search in room directory") : i18n("Explore rooms") onTriggered: { - let dialog = pageStack.layers.push(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage.qml'), { + let dialog = pageStack.layers.push(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage'), { connection: root.connection, keyword: RoomManager.sortFilterRoomTreeModel.filterText }, { @@ -231,7 +231,7 @@ Kirigami.Page { id: userSearchAction icon.name: RoomManager.sortFilterRoomTreeModel.filterText.length > 0 ? "search" : "list-add" text: RoomManager.sortFilterRoomTreeModel.filterText.length > 0 ? i18n("Search in friend directory") : i18n("Find your friends") - onTriggered: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'UserSearchPage.qml'), { + onTriggered: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'UserSearchPage'), { connection: root.connection }, { title: i18nc("@title", "Find your friends") diff --git a/src/qml/RoomPage.qml b/src/qml/RoomPage.qml index 236bdc9b1..7560eb9d2 100644 --- a/src/qml/RoomPage.qml +++ b/src/qml/RoomPage.qml @@ -258,7 +258,7 @@ Kirigami.Page { target: RoomManager function onShowEventSource(eventId) { - applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet.qml'), { + applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'MessageSourceSheet'), { sourceText: root.currentRoom.getEventJsonSource(eventId) }, { title: i18n("Message Source"), @@ -301,7 +301,7 @@ Kirigami.Page { } function onShowMaximizedCode(author, time, codeText, language) { - let popup = Qt.createComponent('org.kde.neochat', 'CodeMaximizeComponent.qml').createObject(QQC2.Overlay.overlay, { + let popup = Qt.createComponent('org.kde.neochat', 'CodeMaximizeComponent').createObject(QQC2.Overlay.overlay, { author: author, time: time, codeText: codeText, diff --git a/src/qml/SelectParentDialog.qml b/src/qml/SelectParentDialog.qml index 985136e7a..8fc25785c 100644 --- a/src/qml/SelectParentDialog.qml +++ b/src/qml/SelectParentDialog.qml @@ -49,7 +49,7 @@ Kirigami.Dialog { visible: !chosenRoomDelegate.visible text: i18nc("@action:button", "Pick room") onClicked: { - let dialog = pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage.qml'), { + let dialog = pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage'), { connection: root.room.connection, showOnlySpaces: true, showOnlySpacesButton: false @@ -134,7 +134,7 @@ Kirigami.Dialog { } onClicked: { - let dialog = pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage.qml'), { + let dialog = pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ExploreRoomsPage'), { connection: root.room.connection, showOnlySpaces: true, showOnlySpacesButton: false diff --git a/src/qml/ShareAction.qml b/src/qml/ShareAction.qml index 3c2624d44..0c130f98a 100644 --- a/src/qml/ShareAction.qml +++ b/src/qml/ShareAction.qml @@ -60,7 +60,7 @@ Kirigami.Action { if (id != root.eventId) { return; } - applicationWindow().pageStack.pushDialogLayer(Qt.createComponent("org.kde.neochat", "ShareDialog.qml"), { + applicationWindow().pageStack.pushDialogLayer(Qt.createComponent("org.kde.neochat", "ShareDialog"), { title: root.text, index: index, model: root._instantiator.model diff --git a/src/qml/SpaceDrawer.qml b/src/qml/SpaceDrawer.qml index 3630d1c94..45381d8a7 100644 --- a/src/qml/SpaceDrawer.qml +++ b/src/qml/SpaceDrawer.qml @@ -60,7 +60,7 @@ QQC2.Control { source: "notifications" } - onClicked: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'NotificationsView.qml'), { + onClicked: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'NotificationsView'), { connection: root.connection }, { title: i18nc("@title", "Notifications") @@ -275,7 +275,7 @@ QQC2.Control { contentItem: Kirigami.Icon { source: "list-add" } - onClicked: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'CreateRoomDialog.qml'), { + onClicked: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'CreateRoomDialog'), { connection: root.connection, isSpace: true, title: i18nc("@title", "Create a Space") diff --git a/src/qml/SpaceHomePage.qml b/src/qml/SpaceHomePage.qml index 8f2df3629..57b947834 100644 --- a/src/qml/SpaceHomePage.qml +++ b/src/qml/SpaceHomePage.qml @@ -49,7 +49,7 @@ ColumnLayout { visible: root.currentRoom.canSendState("invite") text: i18nc("@button", "Invite user to space") icon.name: "list-add-user" - onClicked: applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'InviteUserPage.qml'), { + onClicked: applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'InviteUserPage'), { room: root.currentRoom }, { title: i18nc("@title", "Invite a User") @@ -73,7 +73,7 @@ ColumnLayout { text: i18nc("@button", "Space settings") icon.name: "settings-configure" display: QQC2.AbstractButton.IconOnly - onClicked: applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'RoomSettings.qml'), { + onClicked: applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'RoomSettings'), { room: root.currentRoom, connection: root.currentRoom.connection }, { @@ -159,7 +159,7 @@ ColumnLayout { QtObject { id: _private function createRoom(parentId) { - let dialog = applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'CreateRoomDialog.qml'), { + let dialog = applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'CreateRoomDialog'), { title: i18nc("@title", "Create a Child"), connection: root.currentRoom.connection, parentId: parentId, diff --git a/src/qml/SpaceListContextMenu.qml b/src/qml/SpaceListContextMenu.qml index 1459e9076..a193356a4 100644 --- a/src/qml/SpaceListContextMenu.qml +++ b/src/qml/SpaceListContextMenu.qml @@ -46,7 +46,7 @@ Loader { QQC2.MenuItem { text: i18nc("'Space' is a matrix space", "Space Settings") icon.name: 'settings-configure' - onTriggered: QQC2.ApplicationWindow.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'RoomSettings.qml'), { + onTriggered: QQC2.ApplicationWindow.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'RoomSettings'), { room: room, connection: connection }, { @@ -131,7 +131,7 @@ Loader { FormCard.FormButtonDelegate { text: i18nc("'Space' is a matrix space", "Space Settings") icon.name: 'settings-configure' - onClicked: QQC2.ApplicationWindow.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'RoomSettings.qml'), { + onClicked: QQC2.ApplicationWindow.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'RoomSettings'), { room: room, connection: connection }, { diff --git a/src/qml/Sso.qml b/src/qml/Sso.qml index 5a815673e..5991f4e84 100644 --- a/src/qml/Sso.qml +++ b/src/qml/Sso.qml @@ -22,7 +22,7 @@ LoginStep { UrlHelper.openUrl(LoginHelper.ssoUrl); } function onConnected() { - processed("Loading.qml"); + processed("Loading"); } } @@ -31,7 +31,7 @@ LoginStep { } previousAction: Kirigami.Action { - onTriggered: processed("Login.qml") + onTriggered: processed("Login") } nextAction: Kirigami.Action { diff --git a/src/qml/Terms.qml b/src/qml/Terms.qml index 34516e53a..621c5500d 100644 --- a/src/qml/Terms.qml +++ b/src/qml/Terms.qml @@ -33,6 +33,6 @@ LoginStep { } } previousAction: Kirigami.Action { - onTriggered: root.processed("Username.qml") + onTriggered: root.processed("Username") } } diff --git a/src/qml/UserDetailDialog.qml b/src/qml/UserDetailDialog.qml index b7b2bd1a9..9ae5045a1 100644 --- a/src/qml/UserDetailDialog.qml +++ b/src/qml/UserDetailDialog.qml @@ -152,7 +152,7 @@ Kirigami.Dialog { icon.name: "im-ban-user" icon.color: Kirigami.Theme.negativeTextColor onTriggered: { - applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'BanSheet.qml'), { + applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'BanSheet'), { room: root.room, userId: root.user.id }, { @@ -210,7 +210,7 @@ Kirigami.Dialog { icon.name: "delete" icon.color: Kirigami.Theme.negativeTextColor onTriggered: { - applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'RemoveSheet.qml'), { + applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'RemoveSheet'), { room: root.room, userId: root.user.id }, { diff --git a/src/qml/UserInfo.qml b/src/qml/UserInfo.qml index 8203a61d3..68e59e2ec 100644 --- a/src/qml/UserInfo.qml +++ b/src/qml/UserInfo.qml @@ -55,7 +55,7 @@ RowLayout { if (button == Qt.RightButton) { accountMenu.open(); } else { - pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'AccountEditorPage.qml'), { + pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'AccountEditorPage'), { connection: root.connection }, { title: i18n("Account editor") @@ -112,7 +112,7 @@ RowLayout { Kirigami.Action { text: i18n("Open Settings") icon.name: "settings-configure" - onTriggered: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'NeoChatSettings.qml'), { + onTriggered: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'NeoChatSettings'), { connection: root.connection }, { title: i18n("Configure"), diff --git a/src/qml/Username.qml b/src/qml/Username.qml index 3e492c7df..4e3181bcf 100644 --- a/src/qml/Username.qml +++ b/src/qml/Username.qml @@ -37,11 +37,11 @@ LoginStep { nextAction: Kirigami.Action { text: Registration.status === Registration.TestingUsername ? i18n("Loading") : null - onTriggered: root.processed("RegisterPassword.qml") + onTriggered: root.processed("RegisterPassword") enabled: Registration.status === Registration.Ready } previousAction: Kirigami.Action { - onTriggered: root.processed("Homeserver.qml") + onTriggered: root.processed("Homeserver") } } diff --git a/src/qml/WelcomePage.qml b/src/qml/WelcomePage.qml index c0b0337a6..0c8346d2e 100644 --- a/src/qml/WelcomePage.qml +++ b/src/qml/WelcomePage.qml @@ -19,7 +19,7 @@ FormCard.FormCardPage { property bool _showExisting: showExisting && root.currentStepString === root.initialStep property alias currentStep: module.item property string currentStepString: initialStep - property string initialStep: "LoginRegister.qml" + property string initialStep: "LoginRegister" signal connectionChosen @@ -136,7 +136,7 @@ FormCard.FormCardPage { target: currentStep function onProcessed(nextStep: string): void { - module.source = nextStep; + module.source = nextStep + ".qml"; root.currentStepString = nextStep; headerMessage.text = ""; headerMessage.visible = false; @@ -167,16 +167,16 @@ FormCard.FormCardPage { target: Registration function onNextStepChanged() { if (Registration.nextStep === "m.login.recaptcha") { - stepConnections.onProcessed("Captcha.qml"); + stepConnections.onProcessed("Captcha"); } if (Registration.nextStep === "m.login.terms") { - stepConnections.onProcessed("Terms.qml"); + stepConnections.onProcessed("Terms"); } if (Registration.nextStep === "m.login.email.identity") { - stepConnections.onProcessed("Email.qml"); + stepConnections.onProcessed("Email"); } if (Registration.nextStep === "loading") { - stepConnections.onProcessed("Loading.qml"); + stepConnections.onProcessed("Loading"); } } } @@ -217,7 +217,7 @@ FormCard.FormCardPage { FormCard.FormButtonDelegate { text: i18nc("@action:button", "Open proxy settings") icon.name: "settings-configure" - onClicked: pageStack.pushDialogLayer(Qt.createComponent("org.kde.neochat.settings", "NetworkProxyPage.qml"), {}, { + onClicked: pageStack.pushDialogLayer(Qt.createComponent("org.kde.neochat.settings", "NetworkProxyPage"), {}, { title: i18nc("@title:window", "Proxy Settings") }); } diff --git a/src/qml/main.qml b/src/qml/main.qml index e5f50672b..ad3bb80c7 100644 --- a/src/qml/main.qml +++ b/src/qml/main.qml @@ -132,7 +132,7 @@ Kirigami.ApplicationWindow { }).open(); } function onExternalUrl(url) { - let dialog = Qt.createComponent("org.kde.neochat", "ConfirmUrlDialog.qml").createObject(applicationWindow()); + let dialog = Qt.createComponent("org.kde.neochat", "ConfirmUrlDialog").createObject(applicationWindow()); dialog.link = url; dialog.open(); } @@ -147,7 +147,7 @@ Kirigami.ApplicationWindow { } function openRoomDrawer() { - pageStack.push(Qt.createComponent('org.kde.neochat', 'RoomDrawerPage.qml'), { + pageStack.push(Qt.createComponent('org.kde.neochat', 'RoomDrawerPage'), { connection: root.connection }); } @@ -259,7 +259,7 @@ Kirigami.ApplicationWindow { function onRowsRemoved() { if (AccountRegistry.rowCount() === 0) { pageStack.clear(); - pageStack.push(Qt.createComponent('org.kde.neochat', '.qml')); + pageStack.push(Qt.createComponent('org.kde.neochat', 'WelcomePage')); } } } @@ -395,7 +395,7 @@ Kirigami.ApplicationWindow { Shortcut { sequence: "Ctrl+Shift+," onActivated: { - pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'NeoChatSettings.qml'), { + pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'NeoChatSettings'), { connection: root.connection }, { title: i18n("Configure"), @@ -413,7 +413,7 @@ Kirigami.ApplicationWindow { } } function handleShare(): void { - const dialog = applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ChooseRoomDialog.qml'), { + const dialog = applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ChooseRoomDialog'), { connection: root.connection }, { title: i18nc("@title", "Share"), @@ -436,7 +436,7 @@ Kirigami.ApplicationWindow { function load() { pageStack.replace(roomListComponent); RoomManager.loadInitialRoom(); - let roomPage = pageStack.push(Qt.createComponent('org.kde.neochat', 'RoomPage.qml'), { + let roomPage = pageStack.push(Qt.createComponent('org.kde.neochat', 'RoomPage'), { connection: root.connection }); roomPage.forceActiveFocus(); diff --git a/src/settings/AccountEditorPage.qml b/src/settings/AccountEditorPage.qml index 324331eef..591daa4d7 100644 --- a/src/settings/AccountEditorPage.qml +++ b/src/settings/AccountEditorPage.qml @@ -229,7 +229,7 @@ FormCard.FormCardPage { FormCard.FormButtonDelegate { id: deactivateAccountButton text: i18n("Deactivate Account") - onClicked: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ConfirmDeactivateAccountDialog.qml'), { + onClicked: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'ConfirmDeactivateAccountDialog'), { connection: root.connection }, { title: i18nc("@title", "Confirm Deactivating Account") diff --git a/src/settings/AccountsPage.qml b/src/settings/AccountsPage.qml index ec485896c..59e660209 100644 --- a/src/settings/AccountsPage.qml +++ b/src/settings/AccountsPage.qml @@ -29,7 +29,7 @@ FormCard.FormCardPage { id: accountDelegate required property NeoChatConnection connection Layout.fillWidth: true - onClicked: applicationWindow().pageStack.layers.push('AccountEditorPage.qml', { + onClicked: applicationWindow().pageStack.layers.push('AccountEditorPage', { connection: accountDelegate.connection }, { title: i18n("Account editor") @@ -101,7 +101,7 @@ FormCard.FormCardPage { id: addAccountDelegate text: i18n("Add Account") icon.name: "list-add" - onClicked: applicationWindow().pageStack.layers.push(Qt.createComponent('org.kde.neochat', 'WelcomePage.qml')) + onClicked: applicationWindow().pageStack.layers.push(Qt.createComponent('org.kde.neochat', 'WelcomePage')) } } diff --git a/src/settings/AppearanceSettingsPage.qml b/src/settings/AppearanceSettingsPage.qml index fb2155d81..19f1dc734 100644 --- a/src/settings/AppearanceSettingsPage.qml +++ b/src/settings/AppearanceSettingsPage.qml @@ -221,7 +221,7 @@ FormCard.FormCardPage { Loader { id: colorSchemeDelegate visible: item !== null - sourceComponent: Qt.createComponent('org.kde.neochat.settings', 'ColorScheme.qml') + sourceComponent: Qt.createComponent('org.kde.neochat.settings', 'ColorScheme') Layout.fillWidth: true } } diff --git a/src/settings/NeoChatGeneralPage.qml b/src/settings/NeoChatGeneralPage.qml index 4801c8074..062c4c4f9 100644 --- a/src/settings/NeoChatGeneralPage.qml +++ b/src/settings/NeoChatGeneralPage.qml @@ -219,7 +219,7 @@ FormCard.FormCardPage { FormCard.FormButtonDelegate { visible: Config.developerTools text: i18n("Open developer tools") - onClicked: applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.devtools', 'DevtoolsPage.qml'), { + onClicked: applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.devtools', 'DevtoolsPage'), { connection: root.connection }, { title: i18n("Developer Tools")