Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-05-04 15:35:13 -04:00
Code Issues Projects Releases Packages Wiki Activity

Remove the "Allow downloading individual files" setting altogether, and make it just automatically enabled if "Stop sharing..." is disabled

Browse source
This commit is contained in:
Micah Lee 2019-09-01 21:22:59 -07:00
parent d7a7538686
commit 877a73ab59
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
6 changed files with 4 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

26
onionshare_gui/settings_dialog.py
View file

@ -204,17 +204,10 @@ class SettingsDialog(QtWidgets.QDialog):
self.close_after_first_download_checkbox = QtWidgets.QCheckBox()
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.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_group_layout = QtWidgets.QVBoxLayout()
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.setLayout(sharing_group_layout)
@ -510,16 +503,8 @@ class SettingsDialog(QtWidgets.QDialog):
close_after_first_download = self.old_settings.get('close_after_first_download')
if close_after_first_download:
self.close_after_first_download_checkbox.setCheckState(QtCore.Qt.Checked)
self.allow_downloading_individual_files_checkbox.setEnabled(False)
else:
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')
if autostart_timer:
@ -644,16 +629,6 @@ class SettingsDialog(QtWidgets.QDialog):
self.connect_to_tor_label.show()
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):
"""
Connection type bundled was toggled. If checked, hide authentication fields.
@ -980,7 +955,6 @@ class SettingsDialog(QtWidgets.QDialog):
settings.load() # To get the last update timestamp
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('autostop_timer', self.autostop_timer_checkbox.isChecked())