phantom/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-01-25 10:42:58 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Make the FileSelection widget use native file browser widgets under Flatpak in order to enable the sandbox

Browse source
This commit is contained in:
Micah Lee 2021-11-14 14:24:02 -08:00
parent 365ddc5e34
commit 94c588d0ce
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
desktop/src/onionshare/tab/mode/file_selection.py
View file

@ -342,8 +342,20 @@ class FileSelection(QtWidgets.QVBoxLayout):
self.file_list.files_dropped.connect(self.update)
self.file_list.files_updated.connect(self.update)
# Buttons
# Sandboxes (for masOS, Flatpak, etc.) need separate add files and folders buttons, in
# order to use native file selection dialogs
# macOS
if self.common.platform == "Darwin":
self.sandbox = True
# Flatpack
elif self.common.platform == "Linux" and os.path.exists("/app/manifest.json"):
self.sandbox = True
else:
self.sandbox = False
# Buttons
if self.sandbox:
# The macOS sandbox makes it so the Mac version needs separate add files
# and folders buttons, in order to use native file selection dialogs
self.add_files_button = QtWidgets.QPushButton(strings._("gui_add_files"))
@ -357,7 +369,7 @@ class FileSelection(QtWidgets.QVBoxLayout):
self.remove_button.clicked.connect(self.delete)
button_layout = QtWidgets.QHBoxLayout()
button_layout.addStretch()
if self.common.platform == "Darwin":
if self.sandbox:
button_layout.addWidget(self.add_files_button)
button_layout.addWidget(self.add_folder_button)
else:
@ -376,14 +388,14 @@ class FileSelection(QtWidgets.QVBoxLayout):
"""
# All buttons should be hidden if the server is on
if self.server_on:
if self.common.platform == "Darwin":
if self.sandbox:
self.add_files_button.hide()
self.add_folder_button.hide()
else:
self.add_button.hide()
self.remove_button.hide()
else:
if self.common.platform == "Darwin":
if self.sandbox:
self.add_files_button.show()
self.add_folder_button.show()
else: