Port to declarative type registration

src/qml/AccountEditorPage.qml

@@ -212,7 +212,7 @@ FormCard.FormCardPage {
         FormCard.FormButtonDelegate {
             id: deactivateAccountButton
             text: i18n("Deactivate Account")
-            onClicked: pageStack.pushDialogLayer("qrc:/ConfirmDeactivateAccountDialog.qml", {connection: root.connection}, {title: i18nc("@title", "Confirm Deactivating Account")})
+            onClicked: pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/ConfirmDeactivateAccountDialog.qml", {connection: root.connection}, {title: i18nc("@title", "Confirm Deactivating Account")})
         }
     }
 }

src/qml/AccountMenu.qml

@@ -8,7 +8,7 @@ import QtQuick.Layouts
 import org.kde.kirigami as Kirigami
 
 import org.kde.neochat
-import '../Dialog' as Dialog
+import org.kde.neochat.config
 
 QQC2.Menu {
     id: root
@@ -20,7 +20,7 @@ QQC2.Menu {
     QQC2.MenuItem {
         text: i18n("Edit this account")
         icon.name: "document-edit"
-        onTriggered: pageStack.pushDialogLayer("qrc:/AccountEditorPage.qml", {
+        onTriggered: pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/AccountEditorPage.qml", {
             connection: root.connection
         }, {
             title: i18n("Account editor")
@@ -29,7 +29,7 @@ QQC2.Menu {
     QQC2.MenuItem {
         text: i18n("Notification settings")
         icon.name: "notifications"
-        onTriggered: pageStack.pushDialogLayer("qrc:/SettingsPage.qml", {
+        onTriggered: pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/SettingsPage.qml", {
             defaultPage: "notifications",
             connection: root.connection,
         }, {
@@ -39,7 +39,7 @@ QQC2.Menu {
     QQC2.MenuItem {
         text: i18n("Devices")
         icon.name: "computer-symbolic"
-        onTriggered: pageStack.pushDialogLayer("qrc:/SettingsPage.qml", {
+        onTriggered: pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/SettingsPage.qml", {
             defaultPage: "devices",
             connection: root.connection,
         }, {
@@ -54,7 +54,7 @@ QQC2.Menu {
 
     Component {
         id: confirmLogoutDialogComponent
-        Dialog.ConfirmLogout {
+        ConfirmLogoutDialog {
             connection: root.connection
         }
     }

src/qml/AccountsPage.qml

@@ -12,7 +12,7 @@ import org.kde.kirigamiaddons.formcard as FormCard
 import org.kde.kirigamiaddons.labs.components as KirigamiComponents
 
 import org.kde.neochat
-import 'Dialog' as Dialog
+import org.kde.neochat.accounts
 
 FormCard.FormCardPage {
     id: root
@@ -29,7 +29,7 @@ FormCard.FormCardPage {
                 id: accountDelegate
                 required property NeoChatConnection connection
                 Layout.fillWidth: true
-                onClicked: pageStack.layers.push("qrc:/AccountEditorPage.qml", {
+                onClicked: pageStack.layers.push("qrc:/org/kde/neochat/qml/AccountEditorPage.qml", {
                     connection: accountDelegate.connection
                 }, {
                     title: i18n("Account editor")
@@ -76,7 +76,7 @@ FormCard.FormCardPage {
 
                     Component {
                         id: confirmLogoutDialogComponent
-                        Dialog.ConfirmLogout {
+                        ConfirmLogoutDialog {
                             connection: model.connection
                             onAccepted: {
                                 if (AccountRegistry.accountCount === 1) {
@@ -99,7 +99,7 @@ FormCard.FormCardPage {
             id: addAccountDelegate
             text: i18n("Add Account")
             icon.name: "list-add"
-            onClicked: pageStack.layers.push("qrc:/WelcomePage.qml")
+            onClicked: pageStack.layers.push("qrc:/org/kde/neochat/qml/WelcomePage.qml")
         }
     }
 

src/qml/AppearanceSettingsPage.qml

@@ -11,6 +11,7 @@ import org.kde.kirigamiaddons.formcard as FormCard
 import org.kde.kirigamiaddons.labs.components as KirigamiComponents
 
 import org.kde.neochat
+import org.kde.neochat.config
 
 FormCard.FormCardPage {
     id: root
@@ -212,7 +213,7 @@ FormCard.FormCardPage {
         Loader {
             id: colorSchemeDelegate
             visible: item !== null && Qt.platform.os !== "android"
-            source: "qrc:/ColorScheme.qml"
+            source: "qrc:/org/kde/neochat/qml/ColorScheme.qml"
             Layout.fillWidth: true
         }
     }

src/qml/Captcha.qml

@@ -43,6 +43,6 @@ LoginStep {
         }
     }
     previousAction: Kirigami.Action {
-        onTriggered: root.processed("qrc:/Username.qml")
+        onTriggered: root.processed("qrc:/org/kde/neochat/qml/Username.qml")
     }
 }

src/qml/ChatBar.qml

@@ -10,6 +10,7 @@ import Qt.labs.platform as Platform
 
 import org.kde.kirigami as Kirigami
 import org.kde.neochat
+import org.kde.neochat.config
 
 /**
  * @brief The component which handles the message sending.

src/qml/ChooseRoomDialog.qml

@@ -8,8 +8,6 @@ import org.kde.kirigami as Kirigami
 
 import org.kde.neochat
 
-import "./RoomList"
-
 Kirigami.ScrollablePage {
     id: root
 

src/qml/CollapsedRoomDelegate.qml

@@ -11,8 +11,7 @@ import org.kde.kirigamiaddons.labs.components as KirigamiComponents
 import org.kde.kitemmodels
 
 import org.kde.neochat
-
-import './' as RoomList
+import org.kde.neochat.config
 
 QQC2.ItemDelegate {
     id: root

src/qml/ColorScheme.qml

@@ -7,6 +7,7 @@ import QtQuick.Layouts
 import org.kde.kirigamiaddons.formcard as FormCard
 
 import org.kde.neochat
+import org.kde.neochat.config
 
 FormCard.FormComboBoxDelegate {
     id: root

src/qml/ContextMenu.qml

@@ -120,7 +120,7 @@ Loader {
             QQC2.MenuItem {
                 text: i18n("Room Settings")
                 icon.name: "configure"
-                onTriggered: QQC2.ApplicationWindow.window.pageStack.pushDialogLayer('qrc:/Categories.qml', {room: room, connection: connection}, { title: i18n("Room Settings") })
+                onTriggered: QQC2.ApplicationWindow.window.pageStack.pushDialogLayer('qrc:/org/kde/neochat/qml/Categories.qml', {room: room, connection: connection}, { title: i18n("Room Settings") })
             }
 
             QQC2.MenuSeparator {}
@@ -190,7 +190,7 @@ Loader {
                     QQC2.ToolButton {
                         icon.name: 'settings-configure'
                         onClicked: {
-                            QQC2.ApplicationWindow.window.pageStack.pushDialogLayer('qrc:/Categories.qml', {room: room, connection: root.connection}, { title: i18n("Room Settings") })
+                            QQC2.ApplicationWindow.window.pageStack.pushDialogLayer('qrc:/org/kde/neochat/qml/Categories.qml', {room: room, connection: root.connection}, { title: i18n("Room Settings") })
                             drawer.close()
                         }
                     }

src/qml/Email.qml

@@ -53,6 +53,6 @@ LoginStep {
         }
     }
     previousAction: Kirigami.Action {
-        onTriggered: root.processed("qrc:/Username.qml")
+        onTriggered: root.processed("qrc:/org/kde/neochat/qml/Username.qml")
     }
 }

src/qml/EncryptedDelegate.qml

@@ -6,6 +6,7 @@ import QtQuick.Layouts
 
 import org.kde.kirigami as Kirigami
 import org.kde.neochat
+import org.kde.neochat.config
 
 /**
  * @brief A timeline delegate for an encrypted message that can't be decrypted.

src/qml/ExploreComponent.qml

@@ -21,7 +21,7 @@ RowLayout {
         text: i18n("Explore rooms")
         icon.name: "compass"
         onTriggered: {
-            let dialog = pageStack.pushDialogLayer("qrc:/JoinRoomPage.qml", {connection: root.connection}, {title: i18nc("@title", "Explore Rooms")})
+            let dialog = pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/JoinRoomPage.qml", {connection: root.connection}, {title: i18nc("@title", "Explore Rooms")})
             dialog.roomSelected.connect((roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => {
                 if (isJoined) {
                     RoomManager.enterRoom(root.connection.room(roomId))
@@ -34,13 +34,13 @@ RowLayout {
     property Kirigami.Action chatAction: Kirigami.Action {
         text: i18n("Start a Chat")
         icon.name: "list-add-user"
-        onTriggered: pageStack.pushDialogLayer("qrc:/StartChatPage.qml", {connection: root.connection}, {title: i18nc("@title", "Start a Chat")})
+        onTriggered: pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/StartChatPage.qml", {connection: root.connection}, {title: i18nc("@title", "Start a Chat")})
     }
     property Kirigami.Action roomAction: Kirigami.Action {
         text: i18n("Create a Room")
         icon.name: "system-users"
         onTriggered: {
-            pageStack.pushDialogLayer("qrc:/CreateRoomDialog.qml", {connection: root.connection}, {title: i18nc("@title", "Create a Room")})
+            pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/CreateRoomDialog.qml", {connection: root.connection}, {title: i18nc("@title", "Create a Room")})
         }
         shortcut: StandardKey.New
     }
@@ -48,7 +48,7 @@ RowLayout {
         text: i18n("Create a Space")
         icon.name: "list-add"
         onTriggered: {
-            pageStack.pushDialogLayer("qrc:/CreateSpaceDialog.qml", {connection: root.connection}, {title: i18nc("@title", "Create a Space")})
+            pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/CreateSpaceDialog.qml", {connection: root.connection}, {title: i18nc("@title", "Create a Space")})
         }
     }
 

src/qml/FancyEffectsContainer.qml

@@ -61,7 +61,7 @@ Item {
         }
 
         ImageParticle {
-            source: "qrc:/confetti.png"
+            source: "qrc:/org/kde/neochat/qml/confetti.png"
             entryEffect: ImageParticle.Scale
             rotationVariation: 360
             rotationVelocity: 90
@@ -205,7 +205,7 @@ Item {
     ImageParticle {
         id: fireworksParticleA
         system: fireworksSystem
-        source: "qrc:/glowdot.png"
+        source: "qrc:/org/kde/neochat/qml/glowdot.png"
         alphaVariation: root.isThemeDark ? 0.1 : 0.1
         alpha: root.isThemeDark ? 0.5 : 1
         groups: ["a"]
@@ -216,7 +216,7 @@ Item {
 
     ImageParticle {
         system: fireworksSystem
-        source: "qrc:/glowdot.png"
+        source: "qrc:/org/kde/neochat/qml/glowdot.png"
         color: root.isThemeDark ? "white" : "gold"
         alphaVariation: root.isThemeDark ? 0.1 : 0.1
         alpha: root.isThemeDark ? 0.5 : 1
@@ -229,7 +229,7 @@ Item {
     ImageParticle {
         id: fireworksParticleB
         system: fireworksSystem
-        source: "qrc:/glowdot.png"
+        source: "qrc:/org/kde/neochat/qml/glowdot.png"
         alphaVariation: root.isThemeDark ? 0.1 : 0.1
         alpha: root.isThemeDark ? 0.5 : 1
         groups: ["b"]

src/qml/FileDelegate.qml

@@ -9,6 +9,7 @@ import Qt.labs.platform
 import org.kde.kirigami as Kirigami
 
 import org.kde.neochat
+import org.kde.neochat.config
 
 /**
  * @brief A timeline delegate for an file message.

src/qml/FileDelegateContextMenu.qml

@@ -8,6 +8,7 @@ import Qt.labs.platform
 import org.kde.kirigami as Kirigami
 
 import org.kde.neochat
+import org.kde.neochat.config
 
 /**
  * @brief The menu for media messages.
@@ -75,7 +76,7 @@ MessageDelegateContextMenu {
             text: i18n("Remove")
             icon.name: "edit-delete-remove"
             icon.color: "red"
-            onTriggered: applicationWindow().pageStack.pushDialogLayer("qrc:/RemoveSheet.qml", {room: currentRoom, eventId: eventId}, {
+            onTriggered: applicationWindow().pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/RemoveSheet.qml", {room: currentRoom, eventId: eventId}, {
                 title: i18nc("@title", "Remove Message"),
                 width: Kirigami.Units.gridUnit * 25
             })
@@ -84,7 +85,7 @@ MessageDelegateContextMenu {
             text: i18nc("@action:button 'Report' as in 'Report this event to the administrators'", "Report")
             icon.name: "dialog-warning-symbolic"
             visible: author.id !== currentRoom.localUser.id
-            onTriggered: applicationWindow().pageStack.pushDialogLayer("qrc:/ReportSheet.qml", {room: currentRoom, eventId: eventId}, {
+            onTriggered: applicationWindow().pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/ReportSheet.qml", {room: currentRoom, eventId: eventId}, {
                 title: i18nc("@title", "Report Message"),
                 width: Kirigami.Units.gridUnit * 25
             })

src/qml/GeneralSettingsPage.qml

@@ -9,6 +9,7 @@ import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.formcard as FormCard
 
 import org.kde.neochat
+import org.kde.neochat.config
 
 FormCard.FormCardPage {
     title: i18nc("@title:window", "General")

src/qml/GlobalMenu.qml

@@ -8,6 +8,8 @@ import QtQuick.Window
 import QtQuick.Layouts
 
 import org.kde.neochat
+import org.kde.neochat.config
+import org.kde.neochat.accounts
 
 Labs.MenuBar {
     id: root
@@ -26,7 +28,7 @@ Labs.MenuBar {
             text: i18nc("menu", "Configure NeoChat...")
 
             shortcut: StandardKey.Preferences
-            onTriggered: pageStack.pushDialogLayer("qrc:/SettingsPage.qml", {
+            onTriggered: pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/SettingsPage.qml", {
                 connection: root.connection
             }, {
                 title: i18n("Configure")
@@ -45,7 +47,7 @@ Labs.MenuBar {
         Labs.MenuItem {
             text: i18nc("menu", "New Private Chat…")
             enabled: pageStack.layers.currentItem.title !== i18n("Start a Chat") && AccountRegistry.accountCount > 0
-            onTriggered: pushReplaceLayer("qrc:/StartChatPage.qml", {connection: root.connection})
+            onTriggered: pushReplaceLayer("qrc:/org/kde/neochat/qml/StartChatPage.qml", {connection: root.connection})
         }
         Labs.MenuItem {
             text: i18nc("menu", "New Group…")
@@ -59,7 +61,7 @@ Labs.MenuBar {
         Labs.MenuItem {
             text: i18nc("menu", "Browse Chats…")
             onTriggered: {
-                let dialog = pageStack.pushDialogLayer("qrc:/JoinRoomPage.qml", {connection: root.connection}, {title: i18nc("@title", "Explore Rooms")})
+                let dialog = pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/JoinRoomPage.qml", {connection: root.connection}, {title: i18nc("@title", "Explore Rooms")})
                 dialog.roomSelected.connect((roomId, displayName, avatarUrl, alias, topic, memberCount, isJoined) => {
                     if (isJoined) {
                         RoomManager.enterRoom(root.connection.room(roomId))

src/qml/Homeserver.qml

@@ -38,9 +38,9 @@ LoginStep {
     nextAction: Kirigami.Action {
         text: Registration.testing ? i18n("Loading") : null
         enabled: Registration.status > Registration.ServerNoRegistration
-        onTriggered: root.processed("qrc:/Username.qml");
+        onTriggered: root.processed("qrc:/org/kde/neochat/qml/Username.qml");
     }
     previousAction: Kirigami.Action {
-        onTriggered: root.processed("qrc:/LoginRegister.qml")
+        onTriggered: root.processed("qrc:/org/kde/neochat/qml/LoginRegister.qml")
     }
 }

src/qml/Login.qml

@@ -37,18 +37,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("qrc:/LoginMethod.qml");
+                processed("qrc:/org/kde/neochat/qml/LoginMethod.qml");
             } else if (LoginHelper.supportsSso) {
-                processed("qrc:/Sso.qml");
+                processed("qrc:/org/kde/neochat/qml/Sso.qml");
             } else {
-                processed("qrc:/Password.qml");
+                processed("qrc:/org/kde/neochat/qml/Password.qml");
             }
         }
         enabled: LoginHelper.homeserverReachable
     }
     previousAction: Kirigami.Action {
         onTriggered: {
-            root.processed("qrc:/LoginRegister.qml")
+            root.processed("qrc:/org/kde/neochat/qml/LoginRegister.qml")
         }
     }
 }

src/qml/LoginMethod.qml

@@ -16,12 +16,12 @@ LoginStep {
     FormCard.FormButtonDelegate {
         id: loginPasswordButton
         text: i18nc("@action:button", "Login with password")
-        onClicked: processed("qrc:/Password.qml")
+        onClicked: processed("qrc:/org/kde/neochat/qml/Password.qml")
     }
 
     FormCard.FormButtonDelegate {
         id: loginSsoButton
         text: i18nc("@action:button", "Login with single sign-on")
-        onClicked: processed("qrc:/Sso.qml")
+        onClicked: processed("qrc:/org/kde/neochat/qml/Sso.qml")
     }
 }

src/qml/LoginRegister.qml

@@ -18,11 +18,11 @@ LoginStep {
     FormCard.FormButtonDelegate {
         id: loginButton
         text: i18nc("@action:button", "Login")
-        onClicked: root.processed("qrc:/Login.qml")
+        onClicked: root.processed("qrc:/org/kde/neochat/qml/Login.qml")
     }
 
     FormCard.FormButtonDelegate {
         text: i18nc("@action:button", "Register")
-        onClicked: root.processed("qrc:/Homeserver.qml")
+        onClicked: root.processed("qrc:/org/kde/neochat/qml/Homeserver.qml")
     }
 }

src/qml/MessageDelegate.qml

@@ -10,6 +10,7 @@ import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.labs.components as KirigamiComponents
 
 import org.kde.neochat
+import org.kde.neochat.config
 
 /**
  * @brief The base delegate for all messages in the timeline.

src/qml/MessageDelegateContextMenu.qml

@@ -10,6 +10,7 @@ import org.kde.kirigamiaddons.components as KirigamiComponents
 import org.kde.kirigamiaddons.formcard as FormCard
 
 import org.kde.neochat
+import org.kde.neochat.config
 
 /**
  * @brief The base menu for most message types.
@@ -109,7 +110,7 @@ Loader {
             text: i18nc("@action:inmenu As in 'Forward this message'", "Forward")
             icon.name: "mail-forward-symbolic"
             onTriggered: {
-                let page = applicationWindow().pageStack.pushDialogLayer("qrc:/ChooseRoomDialog.qml", {
+                let page = applicationWindow().pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/ChooseRoomDialog.qml", {
                     connection: root.connection
                 }, {
                     title: i18nc("@title", "Forward Message"),
@@ -126,7 +127,7 @@ Loader {
             text: i18n("Remove")
             icon.name: "edit-delete-remove"
             icon.color: "red"
-            onTriggered: applicationWindow().pageStack.pushDialogLayer("qrc:/RemoveSheet.qml", {room: currentRoom, eventId: eventId}, {
+            onTriggered: applicationWindow().pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/RemoveSheet.qml", {room: currentRoom, eventId: eventId}, {
                 title: i18nc("@title", "Remove Message"),
                 width: Kirigami.Units.gridUnit * 25
             })
@@ -140,7 +141,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("qrc:/ReportSheet.qml", {room: currentRoom, eventId: eventId}, {
+            onTriggered: applicationWindow().pageStack.pushDialogLayer("qrc:/org/kde/neochat/qml/ReportSheet.qml", {room: currentRoom, eventId: eventId}, {
                 title: i18nc("@title", "Report Message"),
                 width: Kirigami.Units.gridUnit * 25
             })

src/qml/NeochatMaximizeComponent.qml

@@ -10,6 +10,7 @@ import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.labs.components as Components
 
 import org.kde.neochat
+import org.kde.neochat.config
 
 Components.AlbumMaximizeComponent {
     id: root

src/qml/NetworkProxyPage.qml

@@ -8,6 +8,7 @@ import QtQuick.Layouts
 import org.kde.kirigamiaddons.formcard as FormCard
 
 import org.kde.neochat
+import org.kde.neochat.config
 
 FormCard.FormCardPage {
     id: root

src/qml/Password.qml

@@ -15,7 +15,7 @@ LoginStep {
     Connections {
         target: LoginHelper
         function onConnected() {
-            processed("qrc:/Loading.qml")
+            processed("qrc:/org/kde/neochat/qml/Loading.qml")
         }
     }
 
@@ -45,6 +45,6 @@ LoginStep {
         }
     }
     previousAction: Kirigami.Action {
-        onTriggered: processed("qrc:/Login.qml")
+        onTriggered: processed("qrc:/org/kde/neochat/qml/Login.qml")
     }
 }

src/qml/QuickSwitcher.qml

@@ -9,7 +9,6 @@ import org.kde.kirigami as Kirigami
 import org.kde.kitemmodels
 
 import org.kde.neochat
-import './RoomList' as RoomList
 
 QQC2.Dialog {
     id: root
@@ -90,7 +89,7 @@ QQC2.Dialog {
                 }
             }
 
-            delegate: RoomList.RoomDelegate {
+            delegate: RoomDelegate {
                 filterText: searchField.text
 
                 connection: root.connection

src/qml/RegisterPassword.qml

@@ -45,6 +45,6 @@ LoginStep {
     }
 
     previousAction: Kirigami.Action {
-        onTriggered: root.processed("qrc:/Username.qml")
+        onTriggered: root.processed("qrc:/org/kde/neochat/qml/Username.qml")
     }
 }