From f4d7636df69c306d2e723fdf7a7e07cf67017436 Mon Sep 17 00:00:00 2001 From: miruka Date: Wed, 18 Dec 2019 04:53:08 -0400 Subject: [PATCH] Move Chat/ dir under Pages/ --- src/gui/GlobalShortcuts.qml | 6 +++--- src/gui/MainPane/RoomDelegate.qml | 2 +- src/gui/{ => Pages}/Chat/Banners/Banner.qml | 2 +- src/gui/{ => Pages}/Chat/Banners/InviteBanner.qml | 2 +- src/gui/{ => Pages}/Chat/Banners/LeftBanner.qml | 2 +- src/gui/{ => Pages}/Chat/Banners/UnknownDevicesBanner.qml | 2 +- src/gui/{ => Pages}/Chat/Chat.qml | 4 ++-- src/gui/{ => Pages}/Chat/ChatPage.qml | 2 +- src/gui/{ => Pages}/Chat/Composer.qml | 4 ++-- src/gui/{ => Pages}/Chat/FileTransfer/Transfer.qml | 2 +- src/gui/{ => Pages}/Chat/FileTransfer/TransferList.qml | 2 +- src/gui/{ => Pages}/Chat/LoadingRoomProgressBar.qml | 2 +- src/gui/{ => Pages}/Chat/RoomHeader.qml | 2 +- src/gui/{ => Pages}/Chat/RoomPane/MemberDelegate.qml | 2 +- src/gui/{ => Pages}/Chat/RoomPane/MemberView.qml | 2 +- src/gui/{ => Pages}/Chat/RoomPane/RoomPane.qml | 2 +- src/gui/{ => Pages}/Chat/RoomPane/SettingsView.qml | 2 +- src/gui/{ => Pages}/Chat/Timeline/Daybreak.qml | 2 +- src/gui/{ => Pages}/Chat/Timeline/EventAudio.qml | 4 ++-- src/gui/{ => Pages}/Chat/Timeline/EventContent.qml | 2 +- src/gui/{ => Pages}/Chat/Timeline/EventDelegate.qml | 2 +- src/gui/{ => Pages}/Chat/Timeline/EventFile.qml | 2 +- src/gui/{ => Pages}/Chat/Timeline/EventImage.qml | 2 +- src/gui/{ => Pages}/Chat/Timeline/EventImageTextBubble.qml | 2 +- src/gui/{ => Pages}/Chat/Timeline/EventList.qml | 2 +- src/gui/{ => Pages}/Chat/Timeline/EventMediaLoader.qml | 2 +- src/gui/{ => Pages}/Chat/Timeline/EventVideo.qml | 4 ++-- src/gui/{ => Pages}/Chat/TypingMembersBar.qml | 2 +- src/gui/Popups/ForgetRoomPopup.qml | 2 +- src/gui/UI.qml | 6 +++--- 30 files changed, 38 insertions(+), 38 deletions(-) rename src/gui/{ => Pages}/Chat/Banners/Banner.qml (99%) rename src/gui/{ => Pages}/Chat/Banners/InviteBanner.qml (98%) rename src/gui/{ => Pages}/Chat/Banners/LeftBanner.qml (97%) rename src/gui/{ => Pages}/Chat/Banners/UnknownDevicesBanner.qml (95%) rename src/gui/{ => Pages}/Chat/Chat.qml (94%) rename src/gui/{ => Pages}/Chat/ChatPage.qml (98%) rename src/gui/{ => Pages}/Chat/Composer.qml (99%) rename src/gui/{ => Pages}/Chat/FileTransfer/Transfer.qml (99%) rename src/gui/{ => Pages}/Chat/FileTransfer/TransferList.qml (96%) rename src/gui/{ => Pages}/Chat/LoadingRoomProgressBar.qml (91%) rename src/gui/{ => Pages}/Chat/RoomHeader.qml (98%) rename src/gui/{ => Pages}/Chat/RoomPane/MemberDelegate.qml (97%) rename src/gui/{ => Pages}/Chat/RoomPane/MemberView.qml (99%) rename src/gui/{ => Pages}/Chat/RoomPane/RoomPane.qml (98%) rename src/gui/{ => Pages}/Chat/RoomPane/SettingsView.qml (99%) rename src/gui/{ => Pages}/Chat/Timeline/Daybreak.qml (89%) rename src/gui/{ => Pages}/Chat/Timeline/EventAudio.qml (82%) rename src/gui/{ => Pages}/Chat/Timeline/EventContent.qml (99%) rename src/gui/{ => Pages}/Chat/Timeline/EventDelegate.qml (99%) rename src/gui/{ => Pages}/Chat/Timeline/EventFile.qml (98%) rename src/gui/{ => Pages}/Chat/Timeline/EventImage.qml (99%) rename src/gui/{ => Pages}/Chat/Timeline/EventImageTextBubble.qml (95%) rename src/gui/{ => Pages}/Chat/Timeline/EventList.qml (99%) rename src/gui/{ => Pages}/Chat/Timeline/EventMediaLoader.qml (99%) rename src/gui/{ => Pages}/Chat/Timeline/EventVideo.qml (79%) rename src/gui/{ => Pages}/Chat/TypingMembersBar.qml (98%) diff --git a/src/gui/GlobalShortcuts.qml b/src/gui/GlobalShortcuts.qml index 4f20c038..2819841b 100644 --- a/src/gui/GlobalShortcuts.qml +++ b/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, diff --git a/src/gui/MainPane/RoomDelegate.qml b/src/gui/MainPane/RoomDelegate.qml index 80725971..799b057c 100644 --- a/src/gui/MainPane/RoomDelegate.qml +++ b/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 diff --git a/src/gui/Chat/Banners/Banner.qml b/src/gui/Pages/Chat/Banners/Banner.qml similarity index 99% rename from src/gui/Chat/Banners/Banner.qml rename to src/gui/Pages/Chat/Banners/Banner.qml index bdc9fd24..1b65c790 100644 --- a/src/gui/Chat/Banners/Banner.qml +++ b/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 diff --git a/src/gui/Chat/Banners/InviteBanner.qml b/src/gui/Pages/Chat/Banners/InviteBanner.qml similarity index 98% rename from src/gui/Chat/Banners/InviteBanner.qml rename to src/gui/Pages/Chat/Banners/InviteBanner.qml index d824b252..dd29c648 100644 --- a/src/gui/Chat/Banners/InviteBanner.qml +++ b/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 diff --git a/src/gui/Chat/Banners/LeftBanner.qml b/src/gui/Pages/Chat/Banners/LeftBanner.qml similarity index 97% rename from src/gui/Chat/Banners/LeftBanner.qml rename to src/gui/Pages/Chat/Banners/LeftBanner.qml index 9e9d2e45..09f60726 100644 --- a/src/gui/Chat/Banners/LeftBanner.qml +++ b/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 diff --git a/src/gui/Chat/Banners/UnknownDevicesBanner.qml b/src/gui/Pages/Chat/Banners/UnknownDevicesBanner.qml similarity index 95% rename from src/gui/Chat/Banners/UnknownDevicesBanner.qml rename to src/gui/Pages/Chat/Banners/UnknownDevicesBanner.qml index d4eaa74b..399f3406 100644 --- a/src/gui/Chat/Banners/UnknownDevicesBanner.qml +++ b/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 diff --git a/src/gui/Chat/Chat.qml b/src/gui/Pages/Chat/Chat.qml similarity index 94% rename from src/gui/Chat/Chat.qml rename to src/gui/Pages/Chat/Chat.qml index 365e746c..dd891d53 100644 --- a/src/gui/Chat/Chat.qml +++ b/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 } } diff --git a/src/gui/Chat/ChatPage.qml b/src/gui/Pages/Chat/ChatPage.qml similarity index 98% rename from src/gui/Chat/ChatPage.qml rename to src/gui/Pages/Chat/ChatPage.qml index 1d41061a..d64f9151 100644 --- a/src/gui/Chat/ChatPage.qml +++ b/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" diff --git a/src/gui/Chat/Composer.qml b/src/gui/Pages/Chat/Composer.qml similarity index 99% rename from src/gui/Chat/Composer.qml rename to src/gui/Pages/Chat/Composer.qml index 70e6726c..7656769a 100644 --- a/src/gui/Chat/Composer.qml +++ b/src/gui/Pages/Chat/Composer.qml @@ -1,7 +1,7 @@ import QtQuick 2.12 import QtQuick.Layouts 1.12 -import "../Base" -import "../Dialogs" +import "../../Base" +import "../../Dialogs" Rectangle { property string indent: " " diff --git a/src/gui/Chat/FileTransfer/Transfer.qml b/src/gui/Pages/Chat/FileTransfer/Transfer.qml similarity index 99% rename from src/gui/Chat/FileTransfer/Transfer.qml rename to src/gui/Pages/Chat/FileTransfer/Transfer.qml index 7cb2e5d0..0511a1ff 100644 --- a/src/gui/Chat/FileTransfer/Transfer.qml +++ b/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 diff --git a/src/gui/Chat/FileTransfer/TransferList.qml b/src/gui/Pages/Chat/FileTransfer/TransferList.qml similarity index 96% rename from src/gui/Chat/FileTransfer/TransferList.qml rename to src/gui/Pages/Chat/FileTransfer/TransferList.qml index 47780870..eba60c5a 100644 --- a/src/gui/Chat/FileTransfer/TransferList.qml +++ b/src/gui/Pages/Chat/FileTransfer/TransferList.qml @@ -1,5 +1,5 @@ import QtQuick 2.12 -import "../../Base" +import "../../../Base" Rectangle { implicitWidth: 800 diff --git a/src/gui/Chat/LoadingRoomProgressBar.qml b/src/gui/Pages/Chat/LoadingRoomProgressBar.qml similarity index 91% rename from src/gui/Chat/LoadingRoomProgressBar.qml rename to src/gui/Pages/Chat/LoadingRoomProgressBar.qml index 5f66ed9e..31bfcb71 100644 --- a/src/gui/Chat/LoadingRoomProgressBar.qml +++ b/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 diff --git a/src/gui/Chat/RoomHeader.qml b/src/gui/Pages/Chat/RoomHeader.qml similarity index 98% rename from src/gui/Chat/RoomHeader.qml rename to src/gui/Pages/Chat/RoomHeader.qml index bbc347e1..4fecce34 100644 --- a/src/gui/Chat/RoomHeader.qml +++ b/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 diff --git a/src/gui/Chat/RoomPane/MemberDelegate.qml b/src/gui/Pages/Chat/RoomPane/MemberDelegate.qml similarity index 97% rename from src/gui/Chat/RoomPane/MemberDelegate.qml rename to src/gui/Pages/Chat/RoomPane/MemberDelegate.qml index 993b2f65..a8c995fa 100644 --- a/src/gui/Chat/RoomPane/MemberDelegate.qml +++ b/src/gui/Pages/Chat/RoomPane/MemberDelegate.qml @@ -1,5 +1,5 @@ import QtQuick 2.12 -import "../../Base" +import "../../../Base" HTileDelegate { id: memberDelegate diff --git a/src/gui/Chat/RoomPane/MemberView.qml b/src/gui/Pages/Chat/RoomPane/MemberView.qml similarity index 99% rename from src/gui/Chat/RoomPane/MemberView.qml rename to src/gui/Pages/Chat/RoomPane/MemberView.qml index f5aa3cf4..24d747db 100644 --- a/src/gui/Chat/RoomPane/MemberView.qml +++ b/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 { diff --git a/src/gui/Chat/RoomPane/RoomPane.qml b/src/gui/Pages/Chat/RoomPane/RoomPane.qml similarity index 98% rename from src/gui/Chat/RoomPane/RoomPane.qml rename to src/gui/Pages/Chat/RoomPane/RoomPane.qml index bfa82bed..87442f17 100644 --- a/src/gui/Chat/RoomPane/RoomPane.qml +++ b/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 diff --git a/src/gui/Chat/RoomPane/SettingsView.qml b/src/gui/Pages/Chat/RoomPane/SettingsView.qml similarity index 99% rename from src/gui/Chat/RoomPane/SettingsView.qml rename to src/gui/Pages/Chat/RoomPane/SettingsView.qml index 45fbb5fb..02fbacf6 100644 --- a/src/gui/Chat/RoomPane/SettingsView.qml +++ b/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" diff --git a/src/gui/Chat/Timeline/Daybreak.qml b/src/gui/Pages/Chat/Timeline/Daybreak.qml similarity index 89% rename from src/gui/Chat/Timeline/Daybreak.qml rename to src/gui/Pages/Chat/Timeline/Daybreak.qml index 321eedfa..9ef42663 100644 --- a/src/gui/Chat/Timeline/Daybreak.qml +++ b/src/gui/Pages/Chat/Timeline/Daybreak.qml @@ -1,5 +1,5 @@ import QtQuick 2.12 -import "../../Base" +import "../../../Base" HNoticePage { text: model.date.toLocaleDateString() diff --git a/src/gui/Chat/Timeline/EventAudio.qml b/src/gui/Pages/Chat/Timeline/EventAudio.qml similarity index 82% rename from src/gui/Chat/Timeline/EventAudio.qml rename to src/gui/Pages/Chat/Timeline/EventAudio.qml index 5d6e62c2..73598895 100644 --- a/src/gui/Chat/Timeline/EventAudio.qml +++ b/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/MediaPlayer" +import "../../../Base" +import "../../../Base/MediaPlayer" AudioPlayer { id: audio diff --git a/src/gui/Chat/Timeline/EventContent.qml b/src/gui/Pages/Chat/Timeline/EventContent.qml similarity index 99% rename from src/gui/Chat/Timeline/EventContent.qml rename to src/gui/Pages/Chat/Timeline/EventContent.qml index f0b1b0f4..748a1119 100644 --- a/src/gui/Chat/Timeline/EventContent.qml +++ b/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 diff --git a/src/gui/Chat/Timeline/EventDelegate.qml b/src/gui/Pages/Chat/Timeline/EventDelegate.qml similarity index 99% rename from src/gui/Chat/Timeline/EventDelegate.qml rename to src/gui/Pages/Chat/Timeline/EventDelegate.qml index ab205ed0..b3cd30a8 100644 --- a/src/gui/Chat/Timeline/EventDelegate.qml +++ b/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 diff --git a/src/gui/Chat/Timeline/EventFile.qml b/src/gui/Pages/Chat/Timeline/EventFile.qml similarity index 98% rename from src/gui/Chat/Timeline/EventFile.qml rename to src/gui/Pages/Chat/Timeline/EventFile.qml index ec751b87..2da00d58 100644 --- a/src/gui/Chat/Timeline/EventFile.qml +++ b/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 diff --git a/src/gui/Chat/Timeline/EventImage.qml b/src/gui/Pages/Chat/Timeline/EventImage.qml similarity index 99% rename from src/gui/Chat/Timeline/EventImage.qml rename to src/gui/Pages/Chat/Timeline/EventImage.qml index 2c57778a..d90e2ffd 100644 --- a/src/gui/Chat/Timeline/EventImage.qml +++ b/src/gui/Pages/Chat/Timeline/EventImage.qml @@ -1,5 +1,5 @@ import QtQuick 2.12 -import "../../Base" +import "../../../Base" HMxcImage { id: image diff --git a/src/gui/Chat/Timeline/EventImageTextBubble.qml b/src/gui/Pages/Chat/Timeline/EventImageTextBubble.qml similarity index 95% rename from src/gui/Chat/Timeline/EventImageTextBubble.qml rename to src/gui/Pages/Chat/Timeline/EventImageTextBubble.qml index 97ef8754..8ff04ed2 100644 --- a/src/gui/Chat/Timeline/EventImageTextBubble.qml +++ b/src/gui/Pages/Chat/Timeline/EventImageTextBubble.qml @@ -1,5 +1,5 @@ import QtQuick 2.12 -import "../../Base" +import "../../../Base" HLabel { id: bubble diff --git a/src/gui/Chat/Timeline/EventList.qml b/src/gui/Pages/Chat/Timeline/EventList.qml similarity index 99% rename from src/gui/Chat/Timeline/EventList.qml rename to src/gui/Pages/Chat/Timeline/EventList.qml index aaaedef9..88332dfa 100644 --- a/src/gui/Chat/Timeline/EventList.qml +++ b/src/gui/Pages/Chat/Timeline/EventList.qml @@ -1,5 +1,5 @@ import QtQuick 2.12 -import "../../Base" +import "../../../Base" Rectangle { property alias selectableLabelContainer: selectableLabelContainer diff --git a/src/gui/Chat/Timeline/EventMediaLoader.qml b/src/gui/Pages/Chat/Timeline/EventMediaLoader.qml similarity index 99% rename from src/gui/Chat/Timeline/EventMediaLoader.qml rename to src/gui/Pages/Chat/Timeline/EventMediaLoader.qml index 5ef1423c..792963c3 100644 --- a/src/gui/Chat/Timeline/EventMediaLoader.qml +++ b/src/gui/Pages/Chat/Timeline/EventMediaLoader.qml @@ -1,5 +1,5 @@ import QtQuick 2.12 -import "../../Base" +import "../../../Base" HLoader { id: loader diff --git a/src/gui/Chat/Timeline/EventVideo.qml b/src/gui/Pages/Chat/Timeline/EventVideo.qml similarity index 79% rename from src/gui/Chat/Timeline/EventVideo.qml rename to src/gui/Pages/Chat/Timeline/EventVideo.qml index aafa325d..3a9a89c2 100644 --- a/src/gui/Chat/Timeline/EventVideo.qml +++ b/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/MediaPlayer" +import "../../../Base" +import "../../../Base/MediaPlayer" VideoPlayer { id: video diff --git a/src/gui/Chat/TypingMembersBar.qml b/src/gui/Pages/Chat/TypingMembersBar.qml similarity index 98% rename from src/gui/Chat/TypingMembersBar.qml rename to src/gui/Pages/Chat/TypingMembersBar.qml index 59393577..343bcb0d 100644 --- a/src/gui/Chat/TypingMembersBar.qml +++ b/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 diff --git a/src/gui/Popups/ForgetRoomPopup.qml b/src/gui/Popups/ForgetRoomPopup.qml index b4ae2b40..f06912ea 100644 --- a/src/gui/Popups/ForgetRoomPopup.qml +++ b/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) { diff --git a/src/gui/UI.qml b/src/gui/UI.qml index 03a7e945..1043b20f 100644 --- a/src/gui/UI.qml +++ b/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() }