Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-01-14 08:49:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add new "Allow downloading of individual files" checkbox to share settings, and only allow it to be enabled when "Stop sharing after files have been sent" is unchecked

Browse Source
This commit is contained in:
Micah Lee 2019-09-01 20:15:30 -07:00
parent 1e1243c8b6
commit 1c465b40fe
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
3 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
onionshare/settings.py
View File

@ -98,6 +98,7 @@ class Settings(object):
'auth_type': 'no_auth', 'auth_type': 'no_auth',
'auth_password': '', 'auth_password': '',
'close_after_first_download': True, 'close_after_first_download': True,
'share_allow_downloading_individual_files': True,
'autostop_timer': False, 'autostop_timer': False,
'autostart_timer': False, 'autostart_timer': False,
'use_stealth': False, 'use_stealth': False,

25
onionshare_gui/settings_dialog.py
View File

@ -204,10 +204,17 @@ class SettingsDialog(QtWidgets.QDialog):
self.close_after_first_download_checkbox = QtWidgets.QCheckBox() self.close_after_first_download_checkbox = QtWidgets.QCheckBox()
self.close_after_first_download_checkbox.setCheckState(QtCore.Qt.Checked) self.close_after_first_download_checkbox.setCheckState(QtCore.Qt.Checked)
self.close_after_first_download_checkbox.setText(strings._("gui_settings_close_after_first_download_option")) self.close_after_first_download_checkbox.setText(strings._("gui_settings_close_after_first_download_option"))
self.close_after_first_download_checkbox.toggled.connect(self.close_after_first_download_toggled)
# Close after first download
self.allow_downloading_individual_files_checkbox = QtWidgets.QCheckBox()
self.allow_downloading_individual_files_checkbox.setCheckState(QtCore.Qt.Checked)
self.allow_downloading_individual_files_checkbox.setText(strings._("gui_settings_allow_downloading_individual_files_option"))
# Sharing options layout # Sharing options layout
sharing_group_layout = QtWidgets.QVBoxLayout() sharing_group_layout = QtWidgets.QVBoxLayout()
sharing_group_layout.addWidget(self.close_after_first_download_checkbox) sharing_group_layout.addWidget(self.close_after_first_download_checkbox)
sharing_group_layout.addWidget(self.allow_downloading_individual_files_checkbox)
sharing_group = QtWidgets.QGroupBox(strings._("gui_settings_sharing_label")) sharing_group = QtWidgets.QGroupBox(strings._("gui_settings_sharing_label"))
sharing_group.setLayout(sharing_group_layout) sharing_group.setLayout(sharing_group_layout)
@ -503,8 +510,16 @@ class SettingsDialog(QtWidgets.QDialog):
close_after_first_download = self.old_settings.get('close_after_first_download') close_after_first_download = self.old_settings.get('close_after_first_download')
if close_after_first_download: if close_after_first_download:
self.close_after_first_download_checkbox.setCheckState(QtCore.Qt.Checked) self.close_after_first_download_checkbox.setCheckState(QtCore.Qt.Checked)
self.allow_downloading_individual_files_checkbox.setEnabled(False)
else: else:
self.close_after_first_download_checkbox.setCheckState(QtCore.Qt.Unchecked) self.close_after_first_download_checkbox.setCheckState(QtCore.Qt.Unchecked)
self.allow_downloading_individual_files_checkbox.setEnabled(True)
allow_downloading_individual_files = self.old_settings.get('share_allow_downloading_individual_files')
if allow_downloading_individual_files:
self.allow_downloading_individual_files_checkbox.setCheckState(QtCore.Qt.Checked)
else:
self.allow_downloading_individual_files_checkbox.setCheckState(QtCore.Qt.Unchecked)
autostart_timer = self.old_settings.get('autostart_timer') autostart_timer = self.old_settings.get('autostart_timer')
if autostart_timer: if autostart_timer:
@ -629,6 +644,15 @@ class SettingsDialog(QtWidgets.QDialog):
self.connect_to_tor_label.show() self.connect_to_tor_label.show()
self.onion_settings_widget.hide() self.onion_settings_widget.hide()
def close_after_first_download_toggled(self, checked):
"""
Stop sharing after files have been sent was toggled. If checked, disable allow downloading of individual files.
"""
self.common.log('SettingsDialog', 'close_after_first_download_toggled')
if checked:
self.allow_downloading_individual_files_checkbox.setEnabled(False)
else:
self.allow_downloading_individual_files_checkbox.setEnabled(True)
def connection_type_bundled_toggled(self, checked): def connection_type_bundled_toggled(self, checked):
""" """
@ -956,6 +980,7 @@ class SettingsDialog(QtWidgets.QDialog):
settings.load() # To get the last update timestamp settings.load() # To get the last update timestamp
settings.set('close_after_first_download', self.close_after_first_download_checkbox.isChecked()) settings.set('close_after_first_download', self.close_after_first_download_checkbox.isChecked())
settings.set('share_allow_downloading_individual_files', self.allow_downloading_individual_files_checkbox.isChecked())
settings.set('autostart_timer', self.autostart_timer_checkbox.isChecked()) settings.set('autostart_timer', self.autostart_timer_checkbox.isChecked())
settings.set('autostop_timer', self.autostop_timer_checkbox.isChecked()) settings.set('autostop_timer', self.autostop_timer_checkbox.isChecked())

1
share/locale/en.json
View File

@ -52,6 +52,7 @@
"gui_settings_onion_label": "Onion settings", "gui_settings_onion_label": "Onion settings",
"gui_settings_sharing_label": "Sharing settings", "gui_settings_sharing_label": "Sharing settings",
"gui_settings_close_after_first_download_option": "Stop sharing after files have been sent", "gui_settings_close_after_first_download_option": "Stop sharing after files have been sent",
"gui_settings_allow_downloading_individual_files_option": "Allow downloading of individual files",
"gui_settings_connection_type_label": "How should OnionShare connect to Tor?", "gui_settings_connection_type_label": "How should OnionShare connect to Tor?",
"gui_settings_connection_type_bundled_option": "Use the Tor version built into OnionShare", "gui_settings_connection_type_bundled_option": "Use the Tor version built into OnionShare",
"gui_settings_connection_type_automatic_option": "Attempt auto-configuration with Tor Browser", "gui_settings_connection_type_automatic_option": "Attempt auto-configuration with Tor Browser",