Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-12-28 08:49:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Improvements to the custom bridges textfield widget, still not perfect when used in conjunction with Tor socket/auth option widgets

Browse Source
This commit is contained in:
Miguel Jacq 2017-12-11 16:48:26 +11:00
parent 304059ddaa
commit b23a4f2bee
No known key found for this signature in database
GPG Key ID: EEA4341C6D97A0B6
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
onionshare_gui/settings_dialog.py
View File

@ -204,7 +204,12 @@ class SettingsDialog(QtWidgets.QDialog):
self.tor_bridges_use_custom_textbox = QtWidgets.QPlainTextEdit() self.tor_bridges_use_custom_textbox = QtWidgets.QPlainTextEdit()
self.tor_bridges_use_custom_textbox.setPlaceholderText('Bridge [address:port] [identifier]') self.tor_bridges_use_custom_textbox.setPlaceholderText('Bridge [address:port] [identifier]')
self.tor_bridges_use_custom_textbox.hide() tor_bridges_use_custom_textbox_options_layout = QtWidgets.QHBoxLayout()
tor_bridges_use_custom_textbox_options_layout.addWidget(self.tor_bridges_use_custom_textbox)
self.tor_bridges_use_custom_textbox_options = QtWidgets.QWidget()
self.tor_bridges_use_custom_textbox_options.setLayout(tor_bridges_use_custom_textbox_options_layout)
self.tor_bridges_use_custom_textbox_options.hide()
self.tor_bridges_use_custom_textbox_options.adjustSize()
# Test tor settings button # Test tor settings button
self.connection_type_test_button = QtWidgets.QPushButton(strings._('gui_settings_connection_type_test_button', True)) self.connection_type_test_button = QtWidgets.QPushButton(strings._('gui_settings_connection_type_test_button', True))
@ -233,7 +238,7 @@ class SettingsDialog(QtWidgets.QDialog):
connection_type_bridges_radio_group_layout.addWidget(self.tor_bridges_no_bridges_radio) connection_type_bridges_radio_group_layout.addWidget(self.tor_bridges_no_bridges_radio)
connection_type_bridges_radio_group_layout.addWidget(self.tor_bridges_use_obfs4_radio) connection_type_bridges_radio_group_layout.addWidget(self.tor_bridges_use_obfs4_radio)
connection_type_bridges_radio_group_layout.addWidget(self.tor_bridges_use_custom_radio) connection_type_bridges_radio_group_layout.addWidget(self.tor_bridges_use_custom_radio)
connection_type_bridges_radio_group_layout.addWidget(self.tor_bridges_use_custom_textbox) connection_type_bridges_radio_group_layout.addWidget(self.tor_bridges_use_custom_textbox_options)
connection_type_bridges_radio_group_layout.addWidget(self.connection_type_test_button) connection_type_bridges_radio_group_layout.addWidget(self.connection_type_test_button)
connection_type_bridges_radio_group = QtWidgets.QGroupBox(strings._("gui_settings_tor_bridges", True)) connection_type_bridges_radio_group = QtWidgets.QGroupBox(strings._("gui_settings_tor_bridges", True))
connection_type_bridges_radio_group.setLayout(connection_type_bridges_radio_group_layout) connection_type_bridges_radio_group.setLayout(connection_type_bridges_radio_group_layout)
@ -364,7 +369,7 @@ class SettingsDialog(QtWidgets.QDialog):
if checked: if checked:
self.tor_bridges_use_obfs4_radio.setEnabled(True) self.tor_bridges_use_obfs4_radio.setEnabled(True)
self.tor_bridges_use_custom_radio.setEnabled(True) self.tor_bridges_use_custom_radio.setEnabled(True)
self.tor_bridges_use_custom_textbox.hide() self.tor_bridges_use_custom_textbox_options.hide()
def tor_bridges_use_obfs4_radio_toggled(self, checked): def tor_bridges_use_obfs4_radio_toggled(self, checked):
""" """
@ -372,7 +377,7 @@ class SettingsDialog(QtWidgets.QDialog):
""" """
if checked: if checked:
self.tor_bridges_use_custom_radio.setEnabled(False) self.tor_bridges_use_custom_radio.setEnabled(False)
self.tor_bridges_use_custom_textbox.hide() self.tor_bridges_use_custom_textbox_options.hide()
def tor_bridges_use_custom_radio_toggled(self, checked): def tor_bridges_use_custom_radio_toggled(self, checked):
""" """
@ -380,7 +385,7 @@ class SettingsDialog(QtWidgets.QDialog):
""" """
if checked: if checked:
self.tor_bridges_use_obfs4_radio.setEnabled(False) self.tor_bridges_use_obfs4_radio.setEnabled(False)
self.tor_bridges_use_custom_textbox.show() self.tor_bridges_use_custom_textbox_options.show()
def connection_type_automatic_toggled(self, checked): def connection_type_automatic_toggled(self, checked):
""" """