Move Chat/ dir under Pages/

src/gui/GlobalShortcuts.qml

@@ -182,7 +182,7 @@ Item {
     // Chat
 
     HShortcut {
-        enabled: window.uiState.page === "Chat/Chat.qml"
+        enabled: window.uiState.page === "Pages/Chat/Chat.qml"
         sequences: settings.keys.clearRoomMessages
         onActivated: utils.makePopup(
             "Popups/ClearMessagesPopup.qml",
@@ -195,7 +195,7 @@ Item {
     }
 
     HShortcut {
-        enabled: window.uiState.page === "Chat/Chat.qml"
+        enabled: window.uiState.page === "Pages/Chat/Chat.qml"
         sequences: settings.keys.sendFile
         onActivated: utils.makeObject(
             "Dialogs/SendFilePicker.qml",
@@ -210,7 +210,7 @@ Item {
     }
 
     HShortcut {
-        enabled: window.uiState.page === "Chat/Chat.qml"
+        enabled: window.uiState.page === "Pages/Chat/Chat.qml"
         sequences: settings.keys.sendFileFromPathInClipboard
         onActivated: utils.sendFile(
             window.uiState.pageProperties.userId,

src/gui/MainPane/RoomDelegate.qml

@@ -9,7 +9,7 @@ HTileDelegate {
     opacity: model.data.left ? theme.mainPane.room.leftRoomOpacity : 1
 
     shouldBeCurrent:
-        window.uiState.page === "Chat/Chat.qml" &&
+        window.uiState.page === "Pages/Chat/Chat.qml" &&
         window.uiState.pageProperties.userId === model.user_id &&
         window.uiState.pageProperties.roomId === model.data.room_id
 

src/gui/Pages/Chat/Banners/Banner.qml

@@ -1,6 +1,6 @@
 import QtQuick 2.12
 import QtQuick.Layouts 1.12
-import "../../Base"
+import "../../../Base"
 
 Rectangle {
     id: banner

src/gui/Pages/Chat/Banners/InviteBanner.qml

@@ -1,5 +1,5 @@
 import QtQuick 2.12
-import "../../Base"
+import "../../../Base"
 
 Banner {
     property string inviterId: chat.roomInfo.inviter

src/gui/Pages/Chat/Banners/LeftBanner.qml

@@ -1,5 +1,5 @@
 import QtQuick 2.12
-import "../../Base"
+import "../../../Base"
 
 Banner {
     color: theme.chat.leftBanner.background

src/gui/Pages/Chat/Banners/UnknownDevicesBanner.qml

@@ -1,5 +1,5 @@
 import QtQuick 2.12
-import "../../Base"
+import "../../../Base"
 
 Banner {
     color: theme.chat.unknownDevices.background

src/gui/Pages/Chat/Chat.qml

@@ -1,6 +1,6 @@
 import QtQuick 2.12
 import QtQuick.Layouts 1.12
-import "../Base"
+import "../../Base"
 import "RoomPane"
 
 Item {
@@ -41,7 +41,7 @@ Item {
             width: 96 * theme.uiScale
             height: width
 
-            source: opacity > 0 ? "../Base/HBusyIndicator.qml" : ""
+            source: opacity > 0 ? "../../Base/HBusyIndicator.qml" : ""
             opacity: ready ? 0 : 1
 
             Behavior on opacity { HNumberAnimation { factor: 2 } }

src/gui/Pages/Chat/ChatPage.qml

@@ -1,6 +1,6 @@
 import QtQuick 2.12
 import QtQuick.Layouts 1.12
-import "../Base"
+import "../../Base"
 import "Banners"
 import "Timeline"
 import "FileTransfer"

src/gui/Pages/Chat/Composer.qml

@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Layouts 1.12
-import "../Base"
+import "../../Base"
-import "../Dialogs"
+import "../../Dialogs"
 
 Rectangle {
     property string indent: "    "

src/gui/Pages/Chat/FileTransfer/Transfer.qml

@@ -1,6 +1,6 @@
 import QtQuick 2.12
 import QtQuick.Layouts 1.12
-import "../../Base"
+import "../../../Base"
 
 HColumnLayout {
     id: transfer

src/gui/Pages/Chat/FileTransfer/TransferList.qml

@@ -1,5 +1,5 @@
 import QtQuick 2.12
-import "../../Base"
+import "../../../Base"
 
 Rectangle {
     implicitWidth: 800

src/gui/Pages/Chat/LoadingRoomProgressBar.qml

@@ -1,6 +1,6 @@
 import QtQuick 2.12
 import QtQuick.Layouts 1.12
-import "../Base"
+import "../../Base"
 
 HProgressBar {
     indeterminate: true

src/gui/Pages/Chat/RoomHeader.qml

@@ -1,6 +1,6 @@
 import QtQuick 2.12
 import QtQuick.Layouts 1.12
-import "../Base"
+import "../../Base"
 
 Rectangle {
     implicitHeight: theme.baseElementsHeight

src/gui/Pages/Chat/RoomPane/MemberDelegate.qml

@@ -1,5 +1,5 @@
 import QtQuick 2.12
-import "../../Base"
+import "../../../Base"
 
 HTileDelegate {
     id: memberDelegate

src/gui/Pages/Chat/RoomPane/MemberView.qml

@@ -1,6 +1,6 @@
 import QtQuick 2.12
 import QtQuick.Layouts 1.12
-import "../../Base"
+import "../../../Base"
 
 HColumnLayout {
     HListView {

src/gui/Pages/Chat/RoomPane/RoomPane.qml

@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
-import "../../Base"
+import "../../../Base"
 
 HDrawer {
     id: roomPane

src/gui/Pages/Chat/RoomPane/SettingsView.qml

@@ -1,6 +1,6 @@
 import QtQuick 2.12
 import QtQuick.Layouts 1.12
-import "../../Base"
+import "../../../Base"
 
 HBox {
     color: "transparent"

src/gui/Pages/Chat/Timeline/Daybreak.qml

@@ -1,5 +1,5 @@
 import QtQuick 2.12
-import "../../Base"
+import "../../../Base"
 
 HNoticePage {
     text: model.date.toLocaleDateString()

src/gui/Pages/Chat/Timeline/EventAudio.qml

@@ -1,8 +1,8 @@
 import QtQuick 2.12
 import QtQuick.Layouts 1.12
 import QtAV 1.7
-import "../../Base"
+import "../../../Base"
-import "../../Base/MediaPlayer"
+import "../../../Base/MediaPlayer"
 
 AudioPlayer {
     id: audio

src/gui/Pages/Chat/Timeline/EventContent.qml

@@ -1,6 +1,6 @@
 import QtQuick 2.12
 import QtQuick.Layouts 1.12
-import "../../Base"
+import "../../../Base"
 
 HRowLayout {
     id: eventContent

src/gui/Pages/Chat/Timeline/EventDelegate.qml

@@ -1,6 +1,6 @@
 import QtQuick 2.12
 import QtQuick.Layouts 1.12
-import "../../Base"
+import "../../../Base"
 
 HColumnLayout {
     id: eventDelegate

src/gui/Pages/Chat/Timeline/EventFile.qml

@@ -1,6 +1,6 @@
 import QtQuick 2.12
 import QtQuick.Layouts 1.12
-import "../../Base"
+import "../../../Base"
 
 HTile {
     id: file

src/gui/Pages/Chat/Timeline/EventImage.qml

@@ -1,5 +1,5 @@
 import QtQuick 2.12
-import "../../Base"
+import "../../../Base"
 
 HMxcImage {
     id: image

src/gui/Pages/Chat/Timeline/EventImageTextBubble.qml

@@ -1,5 +1,5 @@
 import QtQuick 2.12
-import "../../Base"
+import "../../../Base"
 
 HLabel {
     id: bubble

src/gui/Pages/Chat/Timeline/EventList.qml

@@ -1,5 +1,5 @@
 import QtQuick 2.12
-import "../../Base"
+import "../../../Base"
 
 Rectangle {
     property alias selectableLabelContainer: selectableLabelContainer

src/gui/Pages/Chat/Timeline/EventMediaLoader.qml

@@ -1,5 +1,5 @@
 import QtQuick 2.12
-import "../../Base"
+import "../../../Base"
 
 HLoader {
     id: loader

src/gui/Pages/Chat/Timeline/EventVideo.qml

@@ -1,8 +1,8 @@
 import QtQuick 2.12
 import QtQuick.Layouts 1.12
 import QtAV 1.7
-import "../../Base"
+import "../../../Base"
-import "../../Base/MediaPlayer"
+import "../../../Base/MediaPlayer"
 
 VideoPlayer {
     id: video

src/gui/Pages/Chat/TypingMembersBar.qml

@@ -1,6 +1,6 @@
 import QtQuick 2.12
 import QtQuick.Layouts 1.12
-import "../Base"
+import "../../Base"
 
 Rectangle {
     id: typingMembersBar

src/gui/Popups/ForgetRoomPopup.qml

@@ -15,7 +15,7 @@ BoxPopup {
     box.focusButton: "ok"
 
     onOk: py.callClientCoro(userId, "room_forget", [roomId], () => {
-        if (window.uiState.page === "Chat/Chat.qml" &&
+        if (window.uiState.page === "Pages/Chat/Chat.qml" &&
             window.uiState.pageProperties.userId === userId &&
             window.uiState.pageProperties.roomId === roomId)
         {

src/gui/UI.qml

@@ -86,7 +86,7 @@ Item {
             let page  = window.uiState.page
             let props = window.uiState.pageProperties
 
-            if (page === "Chat/Chat.qml") {
+            if (page === "Pages/Chat/Chat.qml") {
                 pageLoader.showRoom(props.userId, props.roomId)
             } else {
                 pageLoader._show(page, props)
@@ -110,9 +110,9 @@ Item {
         }
 
         function showRoom(userId, roomId) {
-            _show("Chat/Chat.qml", {userId, roomId})
+            _show("Pages/Chat/Chat.qml", {userId, roomId})
 
-            window.uiState.page           = "Chat/Chat.qml"
+            window.uiState.page           = "Pages/Chat/Chat.qml"
             window.uiState.pageProperties = {userId, roomId}
             window.uiStateChanged()
         }