parent
dc8294b6bd
commit
5ce06a94cc
|
@ -574,4 +574,3 @@ QtObject:
|
||||||
self.setActiveChannel(pubKey)
|
self.setActiveChannel(pubKey)
|
||||||
return
|
return
|
||||||
echo "Unsupported deep link structure: " & uri
|
echo "Unsupported deep link structure: " & uri
|
||||||
|
|
|
@ -305,3 +305,4 @@ QtObject:
|
||||||
proc removeChat*(self: ChannelView, chatId: string) =
|
proc removeChat*(self: ChannelView, chatId: string) =
|
||||||
discard self.chats.removeChatItemFromList(chatId)
|
discard self.chats.removeChatItemFromList(chatId)
|
||||||
self.setActiveChannel(backToFirstChat)
|
self.setActiveChannel(backToFirstChat)
|
||||||
|
|
||||||
|
|
|
@ -478,3 +478,16 @@ QtObject:
|
||||||
self.searchedMessageLoaded(messageId)
|
self.searchedMessageLoaded(messageId)
|
||||||
else:
|
else:
|
||||||
self.loadMessagesUntillMessageWithIdIsLoaded(messageId)
|
self.loadMessagesUntillMessageWithIdIsLoaded(messageId)
|
||||||
|
|
||||||
|
proc downloadMessages*(self: MessageView, filePath: string) {.slot.} =
|
||||||
|
let messages = newJArray()
|
||||||
|
for message in self.messageList[self.channelView.activeChannel.id].messages:
|
||||||
|
if message.id == "":
|
||||||
|
continue
|
||||||
|
|
||||||
|
messages.elems.add(%*{
|
||||||
|
"id": message.id, "text": message.text, "clock": message.clock,
|
||||||
|
"alias": message.alias, "from": message.fromAuthor
|
||||||
|
})
|
||||||
|
|
||||||
|
writeFile(url_toLocalFile(filePath), $messages)
|
|
@ -1,6 +1,7 @@
|
||||||
import QtQuick 2.13
|
import QtQuick 2.13
|
||||||
import QtQuick.Controls 2.13
|
import QtQuick.Controls 2.13
|
||||||
import QtQuick.Layouts 1.13
|
import QtQuick.Layouts 1.13
|
||||||
|
import Qt.labs.platform 1.1
|
||||||
import "./"
|
import "./"
|
||||||
import "../../../../shared"
|
import "../../../../shared"
|
||||||
import "../../../../imports"
|
import "../../../../imports"
|
||||||
|
@ -106,6 +107,13 @@ StatusPopupMenu {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
StatusMenuItem {
|
||||||
|
text: qsTr("Download")
|
||||||
|
enabled: appSettings.downloadChannelMessagesEnabled
|
||||||
|
icon.name: "download"
|
||||||
|
onTriggered: downdloadDialog.open()
|
||||||
|
}
|
||||||
|
|
||||||
StatusMenuSeparator {
|
StatusMenuSeparator {
|
||||||
visible: deleteOrLeaveMenuItem.enabled
|
visible: deleteOrLeaveMenuItem.enabled
|
||||||
}
|
}
|
||||||
|
@ -143,6 +151,18 @@ StatusPopupMenu {
|
||||||
enabled: !communityActive || chatsModel.communities.activeCommunity.admin
|
enabled: !communityActive || chatsModel.communities.activeCommunity.admin
|
||||||
}
|
}
|
||||||
|
|
||||||
|
FileDialog {
|
||||||
|
id: downdloadDialog
|
||||||
|
acceptLabel: qsTr("Save")
|
||||||
|
fileMode: FileDialog.SaveFile
|
||||||
|
title: qsTr("Download messages")
|
||||||
|
currentFile: StandardPaths.writableLocation(StandardPaths.DocumentsLocation) + "/messages.json"
|
||||||
|
defaultSuffix: "json"
|
||||||
|
onAccepted: {
|
||||||
|
chatsModel.messageView.downloadMessages(downdloadDialog.currentFile)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Component {
|
Component {
|
||||||
id: deleteChatConfirmationDialogComponent
|
id: deleteChatConfirmationDialogComponent
|
||||||
ConfirmationDialog {
|
ConfirmationDialog {
|
||||||
|
|
|
@ -264,6 +264,15 @@ ScrollView {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
StatusSettingsLineButton {
|
||||||
|
text: qsTr("Download messages")
|
||||||
|
isSwitch: true
|
||||||
|
switchChecked: appSettings.downloadChannelMessagesEnabled
|
||||||
|
onClicked: {
|
||||||
|
appSettings.downloadChannelMessagesEnabled = !appSettings.downloadChannelMessagesEnabled
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
StatusSettingsLineButton {
|
StatusSettingsLineButton {
|
||||||
text: qsTr("Stickers/ENS on ropsten")
|
text: qsTr("Stickers/ENS on ropsten")
|
||||||
visible: profileModel.network.current === Constants.networkRopsten
|
visible: profileModel.network.current === Constants.networkRopsten
|
||||||
|
|
|
@ -186,6 +186,7 @@ Item {
|
||||||
property bool quitOnClose: false
|
property bool quitOnClose: false
|
||||||
property string skinColor: ""
|
property string skinColor: ""
|
||||||
property bool showDeleteMessageWarning: true
|
property bool showDeleteMessageWarning: true
|
||||||
|
property bool downloadChannelMessagesEnabled: false
|
||||||
|
|
||||||
// Browser settings
|
// Browser settings
|
||||||
property bool showBrowserSelector: true
|
property bool showBrowserSelector: true
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 9da380cf964df3bcddbbd4ac929223a322523465
|
Subproject commit 10af6b307428612fa974d1ba3d70649351b766b0
|
|
@ -1 +1 @@
|
||||||
Subproject commit b67014a56a8d525f0fef7d4600d449138b16bdcb
|
Subproject commit ca381eb8a20cf02f712a423f85b22901e14fa982
|
Loading…
Reference in New Issue