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 916bdd39..86c176be 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 e1dd7c00..e825dd81 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 54d405ff..5c27fc26 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 3376a4b6..b2806292 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 6caf8790..0e7749ce 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 f57a9441..9bf548e3 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 3514ebca..a001a929 100644 --- a/resources/res.qrc +++ b/resources/res.qrc @@ -139,11 +139,8 @@ qml/ForwardCompleter.qml qml/TypingIndicator.qml qml/NotificationWarning.qml - qml/RoomSettings.qml qml/emoji/EmojiPicker.qml qml/emoji/StickerPicker.qml - qml/UserProfile.qml - qml/RoomDirectory.qml qml/delegates/MessageDelegate.qml qml/delegates/Encrypted.qml qml/delegates/FileMessage.qml @@ -179,10 +176,13 @@ qml/components/AdaptiveLayoutElement.qml qml/components/AvatarListTile.qml qml/components/FlatButton.qml - qml/RoomMembers.qml - qml/InviteDialog.qml - qml/ReadReceipts.qml - qml/RawMessageDialog.qml + qml/dialogs/InviteDialog.qml + qml/dialogs/RawMessageDialog.qml + qml/dialogs/ReadReceipts.qml + qml/dialogs/RoomDirectory.qml + qml/dialogs/RoomMembers.qml + qml/dialogs/RoomSettings.qml + qml/dialogs/UserProfile.qml media/ring.ogg