ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Port MessageSourceDialog to OverlaySheet

Browse Source
This commit is contained in:
Tobias Fella
2020-11-17 19:29:16 +01:00
parent de183caefb
commit a8b95791e2
10 changed files with 42 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
imports/NeoChat/Component/Timeline/AudioDelegate.qml
View File

@@ -34,7 +34,7 @@ Control {
onTriggered: {
let contextMenu = fileDelegateContextMenu.createObject(root)
contextMenu.viewSource.connect(function() {
messageSourceDialog.createObject(ApplicationWindow.overlay, {"sourceText": toolTip}).open()
messagerSourceSheet.createObject(ApplicationWindow.overlay, {"sourceText": toolTip}).open()
})
contextMenu.downloadAndOpen.connect(downloadAndOpen)
contextMenu.saveFileAs.connect(saveFileAs)
@@ -90,9 +90,9 @@ Control {
onSecondaryClicked: saveFileAction.trigger()
Component {
id: messageSourceDialog
id: messagerSourceSheet
MessageSourceDialog {}
MessageSourceSheet {}
}
Component {

6
imports/NeoChat/Component/Timeline/FileDelegate.qml
View File

@@ -63,7 +63,7 @@ RowLayout {
onClicked: {
var contextMenu = fileDelegateContextMenu.createObject(root)
contextMenu.viewSource.connect(function() {
messageSourceDialog.createObject(ApplicationWindow.overlay, {"sourceText": toolTip}).open()
messageSourceSheet.createObject(ApplicationWindow.overlay, {"sourceText": toolTip}).open()
})
contextMenu.downloadAndOpen.connect(downloadAndOpen)
contextMenu.saveFileAs.connect(saveFileAs)
@@ -79,9 +79,9 @@ RowLayout {
}
Component {
id: messageSourceDialog
id: messageSourceSheet
MessageSourceDialog {}
MessageSourceSheet {}
}
Component {

6
imports/NeoChat/Component/Timeline/ImageDelegate.qml
View File

@@ -104,7 +104,7 @@ Image {
onSecondaryClicked: {
var contextMenu = imageDelegateContextMenu.createObject(root)
contextMenu.viewSource.connect(function() {
messageSourceDialog.createObject(ApplicationWindow.overlay, {"sourceText": toolTip}).open()
messageSourceSheet.createObject(ApplicationWindow.overlay, {"sourceText": toolTip}).open()
})
contextMenu.downloadAndOpen.connect(downloadAndOpen)
contextMenu.saveFileAs.connect(saveFileAs)
@@ -120,9 +120,9 @@ Image {
}
Component {
id: messageSourceDialog
id: messageSourceSheet
MessageSourceDialog {}
MessageSourceSheet {}
}
Component {

6
imports/NeoChat/Component/Timeline/VideoDelegate.qml
View File

@@ -191,7 +191,7 @@ RowLayout {
onSecondaryClicked: {
var contextMenu = imageDelegateContextMenu.createObject(root)
contextMenu.viewSource.connect(function() {
messageSourceDialog.createObject(ApplicationWindow.overlay, {"sourceText": toolTip}).open()
messageSourceSheet.createObject(ApplicationWindow.overlay, {"sourceText": toolTip}).open()
})
contextMenu.downloadAndOpen.connect(downloadAndOpen)
contextMenu.saveFileAs.connect(saveFileAs)
@@ -207,9 +207,9 @@ RowLayout {
}
Component {
id: messageSourceDialog
id: messageSourceSheet
MessageSourceDialog {}
MessageSourceSheet {}
}
Component {

32
imports/NeoChat/Dialog/MessageSourceDialog.qml
View File

@@ -1,32 +0,0 @@
/**
* SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
*
* SPDX-License-Identifier: GPL-3.0-only
*/
import QtQuick 2.12
import QtQuick.Controls 2.12
Popup {
property string sourceText
anchors.centerIn: parent
width: 480
id: root
modal: true
padding: 16
closePolicy: Dialog.CloseOnEscape | Dialog.CloseOnPressOutside
contentItem: ScrollView {
clip: true
Label {
text: sourceText
}
}
onClosed: destroy()
}

1
imports/NeoChat/Dialog/qmldir
View File

@@ -1,7 +1,6 @@
module NeoChat.Dialog
RoomSettingsDialog 1.0 RoomSettingsDialog.qml
UserDetailDialog 1.0 UserDetailDialog.qml
MessageSourceDialog 1.0 MessageSourceDialog.qml
LoginDialog 1.0 LoginDialog.qml
CreateRoomDialog 1.0 CreateRoomDialog.qml
InviteUserDialog 1.0 InviteUserDialog.qml

25
imports/NeoChat/Menu/Timeline/MessageSourceSheet.qml Normal file
View File

@@ -0,0 +1,25 @@
/**
* SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
* SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
*
* SPDX-License-Identifier: GPL-3.0-only
*/
import QtQuick 2.12
import QtQuick.Controls 2.12
import org.kde.kirigami 2.12 as Kirigami
Kirigami.OverlaySheet {
property string sourceText
header: Kirigami.Heading {
text: i18n("Message Source")
}
Label {
text: sourceText
wrapMode: Text.WordWrap
}
}

1
imports/NeoChat/Menu/Timeline/qmldir
View File

@@ -1,3 +1,4 @@
module NeoChat.Menu.Timeline
MessageDelegateContextMenu 1.0 MessageDelegateContextMenu.qml
FileDelegateContextMenu 1.0 FileDelegateContextMenu.qml
MessageSourceSheet 1.0 MessageSourceSheet.qml

6
imports/NeoChat/Page/RoomPage.qml
View File

@@ -397,7 +397,7 @@ Kirigami.ScrollablePage {
'eventId': eventId,
});
contextMenu.viewSource.connect(function() {
messageSourceDialog.createObject(page, {
messageSourceSheet.createObject(page, {
'sourceText': toolTip,
}).open();
contextMenu.close();
@@ -424,8 +424,8 @@ Kirigami.ScrollablePage {
}
Component {
id: messageSourceDialog
id: messageSourceSheet
MessageSourceDialog {}
MessageSourceSheet {}
}
}

2
res.qrc
View File

@@ -45,7 +45,7 @@
<file>imports/NeoChat/Dialog/qmldir</file>
<file>imports/NeoChat/Dialog/RoomSettingsDialog.qml</file>
<file>imports/NeoChat/Dialog/UserDetailDialog.qml</file>
<file>imports/NeoChat/Dialog/MessageSourceDialog.qml</file>
<file>imports/NeoChat/Menu/Timeline/MessageSourceSheet.qml</file>
<file>imports/NeoChat/Dialog/CreateRoomDialog.qml</file>
<file>imports/NeoChat/Dialog/AcceptInvitationDialog.qml</file>
<file>imports/NeoChat/Dialog/StartChatDialog.qml</file>