From 39bf20baede5660921b8b9915d77b513578d2ce5 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Sun, 9 Jan 2022 06:56:02 +0100
Subject: [PATCH] Move usersettings page to pages subdir

---
 resources/qml/Root.qml                         | 1 +
 resources/qml/{ => pages}/UserSettingsPage.qml | 3 ++-
 resources/res.qrc                              | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
 rename resources/qml/{ => pages}/UserSettingsPage.qml (99%)

diff --git a/resources/qml/Root.qml b/resources/qml/Root.qml
index 82025057..e4b164e4 100644
--- a/resources/qml/Root.qml
+++ b/resources/qml/Root.qml
@@ -7,6 +7,7 @@ import "./delegates"
 import "./device-verification"
 import "./dialogs"
 import "./emoji"
+import "./pages"
 import "./voip"
 import Qt.labs.platform 1.1 as Platform
 import QtQuick 2.15
diff --git a/resources/qml/UserSettingsPage.qml b/resources/qml/pages/UserSettingsPage.qml
similarity index 99%
rename from resources/qml/UserSettingsPage.qml
rename to resources/qml/pages/UserSettingsPage.qml
index 588f0c2c..3d24edea 100644
--- a/resources/qml/UserSettingsPage.qml
+++ b/resources/qml/pages/UserSettingsPage.qml
@@ -3,7 +3,8 @@
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-import "ui"
+import ".."
+import "../ui"
 import Qt.labs.platform 1.1 as Platform
 import QtQuick 2.15
 import QtQuick.Controls 2.15
diff --git a/resources/res.qrc b/resources/res.qrc
index 660a48c7..a2ee393f 100644
--- a/resources/res.qrc
+++ b/resources/res.qrc
@@ -86,7 +86,6 @@
         <file>qml/CommunitiesList.qml</file>
         <file>qml/RoomList.qml</file>
         <file>qml/TimelineView.qml</file>
-        <file>qml/UserSettingsPage.qml</file>
         <file>qml/Avatar.qml</file>
         <file>qml/Completer.qml</file>
         <file>qml/EncryptionIndicator.qml</file>
@@ -110,6 +109,7 @@
         <file>qml/SelfVerificationCheck.qml</file>
         <file>qml/TypingIndicator.qml</file>
         <file>qml/NotificationWarning.qml</file>
+        <file>qml/pages/UserSettingsPage.qml</file>
         <file>qml/components/AdaptiveLayout.qml</file>
         <file>qml/components/AdaptiveLayoutElement.qml</file>
         <file>qml/components/AvatarListTile.qml</file>