diff --git a/resources/qml/InviteDialog.qml b/resources/qml/dialogs/InviteDialog.qml similarity index 99% rename from resources/qml/InviteDialog.qml rename to resources/qml/dialogs/InviteDialog.qml index 916bdd39bf625a5693dbaf28a4e375a73557aaee..86c176be2006f5d6300be1919ad1268454a4cad2 100644 --- a/resources/qml/InviteDialog.qml +++ b/resources/qml/dialogs/InviteDialog.qml @@ -2,6 +2,7 @@ // // SPDX-License-Identifier: GPL-3.0-or-later +import ".." import QtQuick 2.12 import QtQuick.Controls 2.12 import QtQuick.Layouts 1.12 diff --git a/resources/qml/RawMessageDialog.qml b/resources/qml/dialogs/RawMessageDialog.qml similarity index 100% rename from resources/qml/RawMessageDialog.qml rename to resources/qml/dialogs/RawMessageDialog.qml diff --git a/resources/qml/ReadReceipts.qml b/resources/qml/dialogs/ReadReceipts.qml similarity index 99% rename from resources/qml/ReadReceipts.qml rename to resources/qml/dialogs/ReadReceipts.qml index e1dd7c00b1726494351a5d2b6931be62f25fd46e..e825dd810f6f7d1d95b6703a245003e8b4ec7797 100644 --- a/resources/qml/ReadReceipts.qml +++ b/resources/qml/dialogs/ReadReceipts.qml @@ -2,6 +2,7 @@ // // SPDX-License-Identifier: GPL-3.0-or-later +import ".." import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.15 diff --git a/resources/qml/RoomDirectory.qml b/resources/qml/dialogs/RoomDirectory.qml similarity index 99% rename from resources/qml/RoomDirectory.qml rename to resources/qml/dialogs/RoomDirectory.qml index 54d405ffbaff38300b50c9442d2db36a884245a5..5c27fc260fa7b517845d56e2420c805ac12055c5 100644 --- a/resources/qml/RoomDirectory.qml +++ b/resources/qml/dialogs/RoomDirectory.qml @@ -2,7 +2,8 @@ // // SPDX-License-Identifier: GPL-3.0-or-later -import "./ui" +import ".." +import "../ui" import QtQuick 2.9 import QtQuick.Controls 2.3 import QtQuick.Layouts 1.3 diff --git a/resources/qml/RoomMembers.qml b/resources/qml/dialogs/RoomMembers.qml similarity index 99% rename from resources/qml/RoomMembers.qml rename to resources/qml/dialogs/RoomMembers.qml index 3376a4b61ffea9f26a1f393155800a0c88999aba..b28062924625c053ef8810b1517fa8fa12002a56 100644 --- a/resources/qml/RoomMembers.qml +++ b/resources/qml/dialogs/RoomMembers.qml @@ -2,7 +2,8 @@ // // SPDX-License-Identifier: GPL-3.0-or-later -import "./ui" +import ".." +import "../ui" import QtQuick 2.12 import QtQuick.Controls 2.12 import QtQuick.Layouts 1.12 diff --git a/resources/qml/RoomSettings.qml b/resources/qml/dialogs/RoomSettings.qml similarity index 99% rename from resources/qml/RoomSettings.qml rename to resources/qml/dialogs/RoomSettings.qml index 6caf879064ec393a9fc9ad651139e0a705616e7a..0e7749ce62b1c96974e5ed86e727652ac8e918c8 100644 --- a/resources/qml/RoomSettings.qml +++ b/resources/qml/dialogs/RoomSettings.qml @@ -2,7 +2,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.3 diff --git a/resources/qml/UserProfile.qml b/resources/qml/dialogs/UserProfile.qml similarity index 99% rename from resources/qml/UserProfile.qml rename to resources/qml/dialogs/UserProfile.qml index f57a944110b1c1908ef0076e4cfe971cfb712ad6..9bf548e3cfdafa595a66bed275c169c1b1ae2799 100644 --- a/resources/qml/UserProfile.qml +++ b/resources/qml/dialogs/UserProfile.qml @@ -2,8 +2,9 @@ // // SPDX-License-Identifier: GPL-3.0-or-later -import "./device-verification" -import "./ui" +import ".." +import "../device-verification" +import "../ui" import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.2 diff --git a/resources/res.qrc b/resources/res.qrc index 3514ebcaca22d2239900e3b0da65d007e6e95d1e..a001a92907160afc16b8863d5bc2c76905a7f77b 100644 --- a/resources/res.qrc +++ b/resources/res.qrc @@ -139,11 +139,8 @@ <file>qml/ForwardCompleter.qml</file> <file>qml/TypingIndicator.qml</file> <file>qml/NotificationWarning.qml</file> - <file>qml/RoomSettings.qml</file> <file>qml/emoji/EmojiPicker.qml</file> <file>qml/emoji/StickerPicker.qml</file> - <file>qml/UserProfile.qml</file> - <file>qml/RoomDirectory.qml</file> <file>qml/delegates/MessageDelegate.qml</file> <file>qml/delegates/Encrypted.qml</file> <file>qml/delegates/FileMessage.qml</file> @@ -179,10 +176,13 @@ <file>qml/components/AdaptiveLayoutElement.qml</file> <file>qml/components/AvatarListTile.qml</file> <file>qml/components/FlatButton.qml</file> - <file>qml/RoomMembers.qml</file> - <file>qml/InviteDialog.qml</file> - <file>qml/ReadReceipts.qml</file> - <file>qml/RawMessageDialog.qml</file> + <file>qml/dialogs/InviteDialog.qml</file> + <file>qml/dialogs/RawMessageDialog.qml</file> + <file>qml/dialogs/ReadReceipts.qml</file> + <file>qml/dialogs/RoomDirectory.qml</file> + <file>qml/dialogs/RoomMembers.qml</file> + <file>qml/dialogs/RoomSettings.qml</file> + <file>qml/dialogs/UserProfile.qml</file> </qresource> <qresource prefix="/media"> <file>media/ring.ogg</file>