Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-12-25 23:39:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1781 from onionshare/enforce_one_receive_mode_type

Browse Source 
Prevent disabling files as well as text (or vice versa) in receive mode
This commit is contained in:
Saptak Sengupta 2023-10-17 19:40:45 +05:30 committed by GitHub
commit be79d961c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
desktop/onionshare/gui_common.py
View File

@ -471,6 +471,10 @@ class GuiCommon:
QPushButton { QPushButton {
padding: 5px 10px; padding: 5px 10px;
}""", }""",
"receive_options": """
QCheckBox:disabled {
color: #666666;
}""",
# Tor Settings dialogs # Tor Settings dialogs
"tor_settings_error": """ "tor_settings_error": """
QLabel { QLabel {

12
desktop/onionshare/tab/mode/receive_mode/__init__.py
View File

@ -85,12 +85,14 @@ class ReceiveMode(Mode):
self.disable_text_checkbox.setText( self.disable_text_checkbox.setText(
strings._("mode_settings_receive_disable_text_checkbox") strings._("mode_settings_receive_disable_text_checkbox")
) )
self.disable_text_checkbox.setStyleSheet(self.common.gui.css["receive_options"])
self.disable_files_checkbox = self.settings.get("receive", "disable_files") self.disable_files_checkbox = self.settings.get("receive", "disable_files")
self.disable_files_checkbox = QtWidgets.QCheckBox() self.disable_files_checkbox = QtWidgets.QCheckBox()
self.disable_files_checkbox.clicked.connect(self.disable_files_checkbox_clicked) self.disable_files_checkbox.clicked.connect(self.disable_files_checkbox_clicked)
self.disable_files_checkbox.setText( self.disable_files_checkbox.setText(
strings._("mode_settings_receive_disable_files_checkbox") strings._("mode_settings_receive_disable_files_checkbox")
) )
self.disable_files_checkbox.setStyleSheet(self.common.gui.css["receive_options"])
disable_layout = QtWidgets.QHBoxLayout() disable_layout = QtWidgets.QHBoxLayout()
disable_layout.addWidget(self.disable_text_checkbox) disable_layout.addWidget(self.disable_text_checkbox)
disable_layout.addWidget(self.disable_files_checkbox) disable_layout.addWidget(self.disable_files_checkbox)
@ -235,11 +237,21 @@ class ReceiveMode(Mode):
self.settings.set( self.settings.set(
"receive", "disable_text", self.disable_text_checkbox.isChecked() "receive", "disable_text", self.disable_text_checkbox.isChecked()
) )
if self.disable_text_checkbox.isChecked():
# Prevent also disabling files if text is disabled
self.disable_files_checkbox.setDisabled(True)
else:
self.disable_files_checkbox.setDisabled(False)
def disable_files_checkbox_clicked(self): def disable_files_checkbox_clicked(self):
self.settings.set( self.settings.set(
"receive", "disable_files", self.disable_files_checkbox.isChecked() "receive", "disable_files", self.disable_files_checkbox.isChecked()
) )
if self.disable_files_checkbox.isChecked():
# Prevent also disabling text if files is disabled
self.disable_text_checkbox.setDisabled(True)
else:
self.disable_text_checkbox.setDisabled(False)
def webhook_url_checkbox_clicked(self): def webhook_url_checkbox_clicked(self):
if self.webhook_url_checkbox.isChecked(): if self.webhook_url_checkbox.isChecked():