From ff5853a850497ef3d6dd365d76237dae9b2d7b56 Mon Sep 17 00:00:00 2001 From: James Graham Date: Tue, 26 Mar 2024 13:23:43 +0000 Subject: [PATCH] Create a QML module for settings --- src/CMakeLists.txt | 29 ++-------------- src/main.cpp | 1 + src/qml/AccountMenu.qml | 7 ++-- src/qml/ContextMenu.qml | 5 +-- src/qml/GlobalMenu.qml | 3 +- src/qml/RoomDrawer.qml | 3 +- src/qml/SpaceHomePage.qml | 3 +- src/qml/SpaceListContextMenu.qml | 5 +-- src/qml/UserInfo.qml | 5 +-- src/qml/WelcomePage.qml | 3 +- src/qml/main.qml | 3 +- src/{qml => settings}/About.qml | 0 src/{qml => settings}/AboutKDE.qml | 0 src/{qml => settings}/AccountEditorPage.qml | 0 src/{qml => settings}/AccountsPage.qml | 2 +- .../AppearanceSettingsPage.qml | 2 +- src/settings/CMakeLists.txt | 34 +++++++++++++++++++ src/{qml => settings}/ColorScheme.qml | 0 src/{qml => settings}/DeviceDelegate.qml | 0 src/{qml => settings}/DevicesCard.qml | 0 src/{qml => settings}/DevicesPage.qml | 0 src/{qml => settings}/EmoticonEditorPage.qml | 0 src/{qml => settings}/EmoticonFormCard.qml | 0 src/{qml => settings}/EmoticonsPage.qml | 0 .../GlobalNotificationsPage.qml | 0 src/{qml => settings}/IgnoredUsersDialog.qml | 0 .../NeoChatGeneralPage.qml} | 0 .../NeoChatSecurityPage.qml} | 0 .../NeoChatSettings.qml} | 4 +-- src/{qml => settings}/NetworkProxyPage.qml | 1 - .../NotificationRuleItem.qml | 0 src/{qml => settings}/Permissions.qml | 0 src/{qml => settings}/PushNotification.qml | 0 .../RoomGeneralPage.qml} | 0 .../RoomSecurityPage.qml} | 0 .../RoomSettings.qml} | 4 +-- src/{qml => settings}/SonnetConfigPage.qml | 0 src/{qml => settings}/ThemeRadioButton.qml | 0 38 files changed, 66 insertions(+), 48 deletions(-) rename src/{qml => settings}/About.qml (100%) rename src/{qml => settings}/AboutKDE.qml (100%) rename src/{qml => settings}/AccountEditorPage.qml (100%) rename src/{qml => settings}/AccountsPage.qml (98%) rename src/{qml => settings}/AppearanceSettingsPage.qml (99%) create mode 100644 src/settings/CMakeLists.txt rename src/{qml => settings}/ColorScheme.qml (100%) rename src/{qml => settings}/DeviceDelegate.qml (100%) rename src/{qml => settings}/DevicesCard.qml (100%) rename src/{qml => settings}/DevicesPage.qml (100%) rename src/{qml => settings}/EmoticonEditorPage.qml (100%) rename src/{qml => settings}/EmoticonFormCard.qml (100%) rename src/{qml => settings}/EmoticonsPage.qml (100%) rename src/{qml => settings}/GlobalNotificationsPage.qml (100%) rename src/{qml => settings}/IgnoredUsersDialog.qml (100%) rename src/{qml/GeneralSettingsPage.qml => settings/NeoChatGeneralPage.qml} (100%) rename src/{qml/Security.qml => settings/NeoChatSecurityPage.qml} (100%) rename src/{qml/SettingsPage.qml => settings/NeoChatSettings.qml} (96%) rename src/{qml => settings}/NetworkProxyPage.qml (99%) rename src/{qml => settings}/NotificationRuleItem.qml (100%) rename src/{qml => settings}/Permissions.qml (100%) rename src/{qml => settings}/PushNotification.qml (100%) rename src/{qml/General.qml => settings/RoomGeneralPage.qml} (100%) rename src/{qml/RoomSecurity.qml => settings/RoomSecurityPage.qml} (100%) rename src/{qml/Categories.qml => settings/RoomSettings.qml} (94%) rename src/{qml => settings}/SonnetConfigPage.qml (100%) rename src/{qml => settings}/ThemeRadioButton.qml (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 068b04057..cd238f5b7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -194,11 +194,6 @@ qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN qml/InviteUserPage.qml qml/ImageEditorPage.qml qml/WelcomePage.qml - qml/General.qml - qml/RoomSecurity.qml - qml/PushNotification.qml - qml/Categories.qml - qml/Permissions.qml qml/NeochatMaximizeComponent.qml qml/FancyEffectsContainer.qml qml/TypingPane.qml @@ -245,25 +240,6 @@ qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN qml/FileDelegateContextMenu.qml qml/MessageSourceSheet.qml qml/ReportSheet.qml - qml/SettingsPage.qml - qml/ThemeRadioButton.qml - qml/ColorScheme.qml - qml/GeneralSettingsPage.qml - qml/EmoticonsPage.qml - qml/EmoticonEditorPage.qml - qml/EmoticonFormCard.qml - qml/GlobalNotificationsPage.qml - qml/NotificationRuleItem.qml - qml/AppearanceSettingsPage.qml - qml/AccountsPage.qml - qml/AccountEditorPage.qml - qml/DevicesPage.qml - qml/DeviceDelegate.qml - qml/DevicesCard.qml - qml/About.qml - qml/AboutKDE.qml - qml/SonnetConfigPage.qml - qml/NetworkProxyPage.qml qml/DevtoolsPage.qml qml/ConfirmEncryptionDialog.qml qml/RemoveSheet.qml @@ -292,7 +268,6 @@ qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN qml/SpaceHierarchyDelegate.qml qml/RemoveChildDialog.qml qml/SelectParentDialog.qml - qml/Security.qml qml/QrCodeMaximizeComponent.qml qml/SelectSpacesDialog.qml qml/AttachDialog.qml @@ -306,7 +281,6 @@ qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN qml/DelegateContextMenu.qml qml/ShareDialog.qml qml/FeatureFlagPage.qml - qml/IgnoredUsersDialog.qml qml/AccountData.qml qml/StateKeys.qml qml/UnlockSSSSDialog.qml @@ -315,6 +289,7 @@ qt_add_qml_module(neochat URI org.kde.neochat NO_PLUGIN qml/glowdot.png ) +add_subdirectory(settings) add_subdirectory(timeline) if(UNIX) @@ -407,7 +382,7 @@ if (NOT ANDROID AND NOT WIN32 AND NOT APPLE) endif() target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/models ${CMAKE_CURRENT_SOURCE_DIR}/enums) -target_link_libraries(neochat PRIVATE timelineplugin) +target_link_libraries(neochat PRIVATE settingsplugin timelineplugin) target_link_libraries(neochat PUBLIC Qt::Core Qt::Quick diff --git a/src/main.cpp b/src/main.cpp index 8b13cfd1e..cbf9374d1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -228,6 +228,7 @@ int main(int argc, char *argv[]) KDBusService service(KDBusService::Unique); #endif + Q_IMPORT_QML_PLUGIN(org_kde_neochat_settingsPlugin) Q_IMPORT_QML_PLUGIN(org_kde_neochat_timelinePlugin) qml_register_types_org_kde_neochat(); diff --git a/src/qml/AccountMenu.qml b/src/qml/AccountMenu.qml index f672d10e1..eba318700 100644 --- a/src/qml/AccountMenu.qml +++ b/src/qml/AccountMenu.qml @@ -8,6 +8,7 @@ import QtQuick.Layouts import org.kde.kirigami as Kirigami import org.kde.neochat +import org.kde.neochat.settings import org.kde.neochat.config QQC2.Menu { @@ -20,7 +21,7 @@ QQC2.Menu { QQC2.MenuItem { text: i18n("Edit this account") icon.name: "document-edit" - onTriggered: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'AccountEditorPage.qml'), { + onTriggered: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'AccountEditorPage.qml'), { connection: root.connection }, { title: i18n("Account editor") @@ -29,7 +30,7 @@ QQC2.Menu { QQC2.MenuItem { text: i18n("Notification settings") icon.name: "notifications" - onTriggered: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'SettingsPage.qml'), { + onTriggered: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'NeoChatSettings.qml'), { defaultPage: "notifications", connection: root.connection }, { @@ -41,7 +42,7 @@ QQC2.Menu { QQC2.MenuItem { text: i18n("Devices") icon.name: "computer-symbolic" - onTriggered: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'SettingsPage.qml'), { + onTriggered: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'NeoChatSettings.qml'), { defaultPage: "devices", connection: root.connection }, { diff --git a/src/qml/ContextMenu.qml b/src/qml/ContextMenu.qml index cfd6bae0d..bf54da208 100644 --- a/src/qml/ContextMenu.qml +++ b/src/qml/ContextMenu.qml @@ -11,6 +11,7 @@ import org.kde.kirigamiaddons.components as KirigamiComponents import org.kde.kirigamiaddons.delegates as Delegates import org.kde.neochat +import org.kde.neochat.settings /** * Context menu when clicking on a room in the room list @@ -121,7 +122,7 @@ Loader { QQC2.MenuItem { text: i18n("Room Settings") icon.name: "configure" - onTriggered: QQC2.ApplicationWindow.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'Categories.qml'), { + onTriggered: QQC2.ApplicationWindow.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'RoomSettings.qml'), { room: room, connection: connection }, { @@ -195,7 +196,7 @@ Loader { QQC2.ToolButton { icon.name: 'settings-configure' onClicked: { - QQC2.ApplicationWindow.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'Categories.qml'), { + QQC2.ApplicationWindow.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'RoomSettings.qml'), { room: room, connection: root.connection }, { diff --git a/src/qml/GlobalMenu.qml b/src/qml/GlobalMenu.qml index 51d26ae8a..2425a54b9 100644 --- a/src/qml/GlobalMenu.qml +++ b/src/qml/GlobalMenu.qml @@ -8,6 +8,7 @@ import QtQuick.Window import QtQuick.Layouts import org.kde.neochat +import org.kde.neochat.settings import org.kde.neochat.config import org.kde.neochat.accounts @@ -28,7 +29,7 @@ Labs.MenuBar { text: i18nc("menu", "Configure NeoChat...") shortcut: StandardKey.Preferences - onTriggered: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'SettingsPage.qml'), { + onTriggered: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'NeoChatSettings.qml'), { connection: root.connection }, { title: i18n("Configure"), diff --git a/src/qml/RoomDrawer.qml b/src/qml/RoomDrawer.qml index 44c13b738..a590392b7 100644 --- a/src/qml/RoomDrawer.qml +++ b/src/qml/RoomDrawer.qml @@ -10,6 +10,7 @@ import org.kde.kirigami as Kirigami import org.kde.kitemmodels import org.kde.neochat +import org.kde.neochat.settings import org.kde.neochat.config Kirigami.OverlayDrawer { @@ -102,7 +103,7 @@ Kirigami.OverlayDrawer { text: i18n("Room settings") display: QQC2.AbstractButton.IconOnly - onClicked: QQC2.ApplicationWindow.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'Categories.qml'), { + onClicked: QQC2.ApplicationWindow.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'RoomSettings.qml'), { room: room, connection: root.connection }, { diff --git a/src/qml/SpaceHomePage.qml b/src/qml/SpaceHomePage.qml index e3299b5d1..3f816745c 100644 --- a/src/qml/SpaceHomePage.qml +++ b/src/qml/SpaceHomePage.qml @@ -8,6 +8,7 @@ import QtQuick.Layouts import org.kde.kirigami as Kirigami import org.kde.neochat +import org.kde.neochat.settings Kirigami.Page { id: root @@ -70,7 +71,7 @@ Kirigami.Page { text: i18nc("@button", "Space settings") icon.name: "settings-configure" display: QQC2.AbstractButton.IconOnly - onClicked: applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'Categories.qml'), { + onClicked: applicationWindow().pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'RoomSettings.qml'), { room: root.currentRoom, connection: root.currentRoom.connection }, { diff --git a/src/qml/SpaceListContextMenu.qml b/src/qml/SpaceListContextMenu.qml index a23558e45..1459e9076 100644 --- a/src/qml/SpaceListContextMenu.qml +++ b/src/qml/SpaceListContextMenu.qml @@ -11,6 +11,7 @@ import org.kde.kirigamiaddons.components as KirigamiComponents import org.kde.kirigamiaddons.formcard as FormCard import org.kde.neochat +import org.kde.neochat.settings /** * Context menu when clicking on a room in the room list @@ -45,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', 'Categories.qml'), { + onTriggered: QQC2.ApplicationWindow.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'RoomSettings.qml'), { room: room, connection: connection }, { @@ -130,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', 'Categories.qml'), { + onClicked: QQC2.ApplicationWindow.window.pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'RoomSettings.qml'), { room: room, connection: connection }, { diff --git a/src/qml/UserInfo.qml b/src/qml/UserInfo.qml index 8b9db45a5..a3832357a 100644 --- a/src/qml/UserInfo.qml +++ b/src/qml/UserInfo.qml @@ -9,6 +9,7 @@ import org.kde.kirigamiaddons.labs.components as KirigamiComponents import org.kde.kirigamiaddons.delegates as Delegates import org.kde.neochat +import org.kde.neochat.settings import org.kde.neochat.config import org.kde.neochat.accounts @@ -51,7 +52,7 @@ RowLayout { if (button == Qt.RightButton) { accountMenu.open(); } else { - pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'AccountEditorPage.qml'), { + pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'AccountEditorPage.qml'), { connection: root.connection }, { title: i18n("Account editor") @@ -136,7 +137,7 @@ RowLayout { } QQC2.ToolButton { icon.name: "settings-configure" - onClicked: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'SettingsPage.qml'), { + onClicked: pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'NeoChatSettings.qml'), { connection: root.connection }, { title: i18n("Configure"), diff --git a/src/qml/WelcomePage.qml b/src/qml/WelcomePage.qml index 8913c7b9b..c0b0337a6 100644 --- a/src/qml/WelcomePage.qml +++ b/src/qml/WelcomePage.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.settings import org.kde.neochat.accounts FormCard.FormCardPage { @@ -216,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", "NetworkProxyPage.qml"), {}, { + onClicked: pageStack.pushDialogLayer(Qt.createComponent("org.kde.neochat.settings", "NetworkProxyPage.qml"), {}, { title: i18nc("@title:window", "Proxy Settings") }); } diff --git a/src/qml/main.qml b/src/qml/main.qml index 5eadbf9c4..a8548f216 100644 --- a/src/qml/main.qml +++ b/src/qml/main.qml @@ -8,6 +8,7 @@ import QtQuick.Controls as QQC2 import org.kde.kirigami as Kirigami import org.kde.neochat +import org.kde.neochat.settings import org.kde.neochat.config import org.kde.neochat.accounts @@ -447,7 +448,7 @@ Kirigami.ApplicationWindow { Shortcut { sequence: "Ctrl+Shift+," onActivated: { - pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat', 'SettingsPage.qml'), { + pageStack.pushDialogLayer(Qt.createComponent('org.kde.neochat.settings', 'NeoChatSettings.qml'), { connection: root.connection }, { title: i18n("Configure"), diff --git a/src/qml/About.qml b/src/settings/About.qml similarity index 100% rename from src/qml/About.qml rename to src/settings/About.qml diff --git a/src/qml/AboutKDE.qml b/src/settings/AboutKDE.qml similarity index 100% rename from src/qml/AboutKDE.qml rename to src/settings/AboutKDE.qml diff --git a/src/qml/AccountEditorPage.qml b/src/settings/AccountEditorPage.qml similarity index 100% rename from src/qml/AccountEditorPage.qml rename to src/settings/AccountEditorPage.qml diff --git a/src/qml/AccountsPage.qml b/src/settings/AccountsPage.qml similarity index 98% rename from src/qml/AccountsPage.qml rename to src/settings/AccountsPage.qml index 9519e6477..ec485896c 100644 --- a/src/qml/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(Qt.createComponent('org.kde.neochat', 'AccountEditorPage.qml'), { + onClicked: applicationWindow().pageStack.layers.push('AccountEditorPage.qml', { connection: accountDelegate.connection }, { title: i18n("Account editor") diff --git a/src/qml/AppearanceSettingsPage.qml b/src/settings/AppearanceSettingsPage.qml similarity index 99% rename from src/qml/AppearanceSettingsPage.qml rename to src/settings/AppearanceSettingsPage.qml index 79c4d0c94..fb2155d81 100644 --- a/src/qml/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', 'ColorScheme.qml') + sourceComponent: Qt.createComponent('org.kde.neochat.settings', 'ColorScheme.qml') Layout.fillWidth: true } } diff --git a/src/settings/CMakeLists.txt b/src/settings/CMakeLists.txt new file mode 100644 index 000000000..27f4138c2 --- /dev/null +++ b/src/settings/CMakeLists.txt @@ -0,0 +1,34 @@ +# SPDX-FileCopyrightText: 2024 James Graham +# SPDX-License-Identifier: BSD-2-Clause + +qt_add_library(settings STATIC) +qt_add_qml_module(settings + URI org.kde.neochat.settings + QML_FILES + NeoChatSettings.qml + RoomSettings.qml + About.qml + AboutKDE.qml + AccountsPage.qml + AccountEditorPage.qml + AppearanceSettingsPage.qml + DevicesPage.qml + EmoticonsPage.qml + EmoticonEditorPage.qml + GlobalNotificationsPage.qml + NeoChatGeneralPage.qml + NeoChatSecurityPage.qml + NetworkProxyPage.qml + Permissions.qml + PushNotification.qml + RoomGeneralPage.qml + RoomSecurityPage.qml + SonnetConfigPage.qml + ColorScheme.qml + DevicesCard.qml + DeviceDelegate.qml + EmoticonFormCard.qml + IgnoredUsersDialog.qml + NotificationRuleItem.qml + ThemeRadioButton.qml +) diff --git a/src/qml/ColorScheme.qml b/src/settings/ColorScheme.qml similarity index 100% rename from src/qml/ColorScheme.qml rename to src/settings/ColorScheme.qml diff --git a/src/qml/DeviceDelegate.qml b/src/settings/DeviceDelegate.qml similarity index 100% rename from src/qml/DeviceDelegate.qml rename to src/settings/DeviceDelegate.qml diff --git a/src/qml/DevicesCard.qml b/src/settings/DevicesCard.qml similarity index 100% rename from src/qml/DevicesCard.qml rename to src/settings/DevicesCard.qml diff --git a/src/qml/DevicesPage.qml b/src/settings/DevicesPage.qml similarity index 100% rename from src/qml/DevicesPage.qml rename to src/settings/DevicesPage.qml diff --git a/src/qml/EmoticonEditorPage.qml b/src/settings/EmoticonEditorPage.qml similarity index 100% rename from src/qml/EmoticonEditorPage.qml rename to src/settings/EmoticonEditorPage.qml diff --git a/src/qml/EmoticonFormCard.qml b/src/settings/EmoticonFormCard.qml similarity index 100% rename from src/qml/EmoticonFormCard.qml rename to src/settings/EmoticonFormCard.qml diff --git a/src/qml/EmoticonsPage.qml b/src/settings/EmoticonsPage.qml similarity index 100% rename from src/qml/EmoticonsPage.qml rename to src/settings/EmoticonsPage.qml diff --git a/src/qml/GlobalNotificationsPage.qml b/src/settings/GlobalNotificationsPage.qml similarity index 100% rename from src/qml/GlobalNotificationsPage.qml rename to src/settings/GlobalNotificationsPage.qml diff --git a/src/qml/IgnoredUsersDialog.qml b/src/settings/IgnoredUsersDialog.qml similarity index 100% rename from src/qml/IgnoredUsersDialog.qml rename to src/settings/IgnoredUsersDialog.qml diff --git a/src/qml/GeneralSettingsPage.qml b/src/settings/NeoChatGeneralPage.qml similarity index 100% rename from src/qml/GeneralSettingsPage.qml rename to src/settings/NeoChatGeneralPage.qml diff --git a/src/qml/Security.qml b/src/settings/NeoChatSecurityPage.qml similarity index 100% rename from src/qml/Security.qml rename to src/settings/NeoChatSecurityPage.qml diff --git a/src/qml/SettingsPage.qml b/src/settings/NeoChatSettings.qml similarity index 96% rename from src/qml/SettingsPage.qml rename to src/settings/NeoChatSettings.qml index 824014e6b..82a86b642 100644 --- a/src/qml/SettingsPage.qml +++ b/src/settings/NeoChatSettings.qml @@ -19,7 +19,7 @@ KirigamiSettings.CategorizedSettings { actionName: "general" text: i18n("General") icon.name: "org.kde.neochat" - page: Qt.resolvedUrl("GeneralSettingsPage.qml") + page: Qt.resolvedUrl("NeoChatGeneralPage.qml") }, KirigamiSettings.SettingAction { actionName: "appearance" @@ -42,7 +42,7 @@ KirigamiSettings.CategorizedSettings { actionName: "security" text: i18n("Security") icon.name: "preferences-security" - page: Qt.resolvedUrl("Security.qml") + page: Qt.resolvedUrl("NeoChatSecurityPage.qml") initialProperties: { return { connection: root.connection diff --git a/src/qml/NetworkProxyPage.qml b/src/settings/NetworkProxyPage.qml similarity index 99% rename from src/qml/NetworkProxyPage.qml rename to src/settings/NetworkProxyPage.qml index 7c7f7589b..39ce6e641 100644 --- a/src/qml/NetworkProxyPage.qml +++ b/src/settings/NetworkProxyPage.qml @@ -7,7 +7,6 @@ import QtQuick.Layouts import org.kde.kirigamiaddons.formcard as FormCard -import org.kde.neochat import org.kde.neochat.config FormCard.FormCardPage { diff --git a/src/qml/NotificationRuleItem.qml b/src/settings/NotificationRuleItem.qml similarity index 100% rename from src/qml/NotificationRuleItem.qml rename to src/settings/NotificationRuleItem.qml diff --git a/src/qml/Permissions.qml b/src/settings/Permissions.qml similarity index 100% rename from src/qml/Permissions.qml rename to src/settings/Permissions.qml diff --git a/src/qml/PushNotification.qml b/src/settings/PushNotification.qml similarity index 100% rename from src/qml/PushNotification.qml rename to src/settings/PushNotification.qml diff --git a/src/qml/General.qml b/src/settings/RoomGeneralPage.qml similarity index 100% rename from src/qml/General.qml rename to src/settings/RoomGeneralPage.qml diff --git a/src/qml/RoomSecurity.qml b/src/settings/RoomSecurityPage.qml similarity index 100% rename from src/qml/RoomSecurity.qml rename to src/settings/RoomSecurityPage.qml diff --git a/src/qml/Categories.qml b/src/settings/RoomSettings.qml similarity index 94% rename from src/qml/Categories.qml rename to src/settings/RoomSettings.qml index 6d15f2c3f..9eebce02a 100644 --- a/src/qml/Categories.qml +++ b/src/settings/RoomSettings.qml @@ -20,7 +20,7 @@ KirigamiSettings.CategorizedSettings { actionName: "general" text: i18n("General") icon.name: "settings-configure" - page: Qt.resolvedUrl("General.qml") + page: Qt.resolvedUrl("RoomGeneralPage.qml") initialProperties: { return { room: root.room, @@ -32,7 +32,7 @@ KirigamiSettings.CategorizedSettings { actionName: "security" text: i18n("Security") icon.name: "security-low" - page: Qt.resolvedUrl("RoomSecurity.qml") + page: Qt.resolvedUrl("RoomSecurityPage.qml") initialProperties: { return { room: root.room diff --git a/src/qml/SonnetConfigPage.qml b/src/settings/SonnetConfigPage.qml similarity index 100% rename from src/qml/SonnetConfigPage.qml rename to src/settings/SonnetConfigPage.qml diff --git a/src/qml/ThemeRadioButton.qml b/src/settings/ThemeRadioButton.qml similarity index 100% rename from src/qml/ThemeRadioButton.qml rename to src/settings/ThemeRadioButton.qml