Commit 6cd0a92c authored by Nicolas Fella's avatar Nicolas Fella
Browse files

Fix file dialog usage in app and plasmoid

fileDialog.open() does *not* block, so we need to move the sending to onAccepted. Not sure why I thought this ever worked.

BUG: 423975
(cherry picked from commit 198789e6)
parent c3ce9d60
...@@ -105,13 +105,9 @@ Kirigami.ScrollablePage ...@@ -105,13 +105,9 @@ Kirigami.ScrollablePage
device: root.currentDevice device: root.currentDevice
}, },
PluginItem { PluginItem {
readonly property var shareIface: ShareDbusInterfaceFactory.create(root.currentDevice.id())
pluginName: "share" pluginName: "share"
name: i18nd("kdeconnect-app", "Share File") name: i18nd("kdeconnect-app", "Share File")
onClick: () => { onClick: () => fileDialog.open()
fileDialog.open()
shareIface.shareUrl(fileDialog.fileUrl)
}
device: root.currentDevice device: root.currentDevice
}, },
PluginItem { PluginItem {
...@@ -159,7 +155,9 @@ Kirigami.ScrollablePage ...@@ -159,7 +155,9 @@ Kirigami.ScrollablePage
FileDialog { FileDialog {
id: fileDialog id: fileDialog
readonly property var shareIface: ShareDbusInterfaceFactory.create(root.currentDevice.id())
title: i18nd("kdeconnect-app", "Please choose a file") title: i18nd("kdeconnect-app", "Please choose a file")
folder: shortcuts.home folder: shortcuts.home
onAccepted: shareIface.shareUrl(fileDialog.fileUrl)
} }
} }
...@@ -105,18 +105,14 @@ PlasmaComponents.ListItem ...@@ -105,18 +105,14 @@ PlasmaComponents.ListItem
title: i18n("Please choose a file") title: i18n("Please choose a file")
folder: shortcuts.home folder: shortcuts.home
selectMultiple: true selectMultiple: true
onAccepted: fileDialog.fileUrls.forEach(url => share.plugin.shareUrl(url))
} }
id: shareFile id: shareFile
icon: "document-share" icon: "document-share"
visible: share.available visible: share.available
text: i18n("Share file") text: i18n("Share file")
onClicked: { onClicked: fileDialog.open()
fileDialog.open()
fileDialog.fileUrls.forEach(function (url) {
share.plugin.shareUrl(url)
})
}
} }
//Find my phone //Find my phone
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment