Zergling_man/moment
Zergling_man/moment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move Chat/ dir under Pages/

Browse Source
This commit is contained in:
miruka 2019-12-18 04:53:08 -04:00
parent 2bdf21d528
commit f4d7636df6
30 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/GlobalShortcuts.qml
View File

@ -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,

2
src/gui/MainPane/RoomDelegate.qml
View File

@ -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

2
src/gui/Chat/Banners/Banner.qml → src/gui/Pages/Chat/Banners/Banner.qml
View File

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

2
src/gui/Chat/Banners/InviteBanner.qml → src/gui/Pages/Chat/Banners/InviteBanner.qml
View File

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

2
src/gui/Chat/Banners/LeftBanner.qml → src/gui/Pages/Chat/Banners/LeftBanner.qml
View File

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

2
src/gui/Chat/Banners/UnknownDevicesBanner.qml → src/gui/Pages/Chat/Banners/UnknownDevicesBanner.qml
View File

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

4
src/gui/Chat/Chat.qml → src/gui/Pages/Chat/Chat.qml
View File

@ -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 } }

2
src/gui/Chat/ChatPage.qml → src/gui/Pages/Chat/ChatPage.qml
View File

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

4
src/gui/Chat/Composer.qml → src/gui/Pages/Chat/Composer.qml
View File

@ -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: " "

2
src/gui/Chat/FileTransfer/Transfer.qml → src/gui/Pages/Chat/FileTransfer/Transfer.qml
View File

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

2
src/gui/Chat/FileTransfer/TransferList.qml → src/gui/Pages/Chat/FileTransfer/TransferList.qml
View File

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

2
src/gui/Chat/LoadingRoomProgressBar.qml → src/gui/Pages/Chat/LoadingRoomProgressBar.qml
View File

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

2
src/gui/Chat/RoomHeader.qml → src/gui/Pages/Chat/RoomHeader.qml
View File

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

2
src/gui/Chat/RoomPane/MemberDelegate.qml → src/gui/Pages/Chat/RoomPane/MemberDelegate.qml
View File

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

2
src/gui/Chat/RoomPane/MemberView.qml → src/gui/Pages/Chat/RoomPane/MemberView.qml
View File

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

2
src/gui/Chat/RoomPane/RoomPane.qml → src/gui/Pages/Chat/RoomPane/RoomPane.qml
View File

@ -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

2
src/gui/Chat/RoomPane/SettingsView.qml → src/gui/Pages/Chat/RoomPane/SettingsView.qml
View File

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

2
src/gui/Chat/Timeline/Daybreak.qml → src/gui/Pages/Chat/Timeline/Daybreak.qml
View File

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

4
src/gui/Chat/Timeline/EventAudio.qml → src/gui/Pages/Chat/Timeline/EventAudio.qml
View File

@ -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

2
src/gui/Chat/Timeline/EventContent.qml → src/gui/Pages/Chat/Timeline/EventContent.qml
View File

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

2
src/gui/Chat/Timeline/EventDelegate.qml → src/gui/Pages/Chat/Timeline/EventDelegate.qml
View File

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

2
src/gui/Chat/Timeline/EventFile.qml → src/gui/Pages/Chat/Timeline/EventFile.qml
View File

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

2
src/gui/Chat/Timeline/EventImage.qml → src/gui/Pages/Chat/Timeline/EventImage.qml
View File

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

2
src/gui/Chat/Timeline/EventImageTextBubble.qml → src/gui/Pages/Chat/Timeline/EventImageTextBubble.qml
View File

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

2
src/gui/Chat/Timeline/EventList.qml → src/gui/Pages/Chat/Timeline/EventList.qml
View File

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

2
src/gui/Chat/Timeline/EventMediaLoader.qml → src/gui/Pages/Chat/Timeline/EventMediaLoader.qml
View File

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

4
src/gui/Chat/Timeline/EventVideo.qml → src/gui/Pages/Chat/Timeline/EventVideo.qml
View File

@ -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

2
src/gui/Chat/TypingMembersBar.qml → src/gui/Pages/Chat/TypingMembersBar.qml
View File

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

2
src/gui/Popups/ForgetRoomPopup.qml
View File

@ -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)
{

6
src/gui/UI.qml
View File

@ -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()
}