Merge pull request #744 from LorenDB/reorganizeQml
Reorganize all the dialogs into the dialogs folder
8 files changed, 18 insertions, 12 deletions
diff --git a/resources/qml/InviteDialog.qml b/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
index c171de7e..c171de7e 100644
--- a/resources/qml/RawMessageDialog.qml
+++ b/resources/qml/dialogs/RawMessageDialog.qml
diff --git a/resources/qml/ReadReceipts.qml b/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
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
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
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
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 @@
<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>
|
