diff options
| -rw-r--r-- | onionshare/common.py | 7 | ||||
| -rw-r--r-- | onionshare_gui/settings_dialog.py | 11 |
2 files changed, 10 insertions, 8 deletions
diff --git a/onionshare/common.py b/onionshare/common.py index d0fe79db..d740d2ed 100644 --- a/onionshare/common.py +++ b/onionshare/common.py @@ -398,6 +398,13 @@ class Common(object): 'settings_connect_to_tor': """ QLabel { font-style: italic; + }""", + + # For some reason, this prevents extra padding around the v2 onion + # settings when viewing in macOS + 'settings_onion_settings': """ + QWidget { + border: 0; }""" } diff --git a/onionshare_gui/settings_dialog.py b/onionshare_gui/settings_dialog.py index 92c84262..b933c30f 100644 --- a/onionshare_gui/settings_dialog.py +++ b/onionshare_gui/settings_dialog.py @@ -162,6 +162,7 @@ class SettingsDialog(QtWidgets.QDialog): onion_settings_layout.addWidget(hidservauth_details) onion_settings_layout.addWidget(self.hidservauth_copy_button) self.onion_settings_widget = QtWidgets.QWidget() + self.onion_settings_widget.setStyleSheet(self.common.css['settings_onion_settings']) self.onion_settings_widget.setLayout(onion_settings_layout) # General options layout @@ -283,10 +284,6 @@ class SettingsDialog(QtWidgets.QDialog): self.tor_bridges_use_meek_lite_azure_radio = QtWidgets.QRadioButton(strings._('gui_settings_tor_bridges_meek_lite_azure_radio_option')) self.tor_bridges_use_meek_lite_azure_radio.toggled.connect(self.tor_bridges_use_meek_lite_azure_radio_toggled) - # meek_lite currently not supported on the version of obfs4proxy bundled with TorBrowser - if self.system == 'Windows' or self.system == 'Darwin': - self.tor_bridges_use_meek_lite_azure_radio.hide() - # Custom bridges radio and textbox self.tor_bridges_use_custom_radio = QtWidgets.QRadioButton(strings._('gui_settings_tor_bridges_custom_radio_option')) self.tor_bridges_use_custom_radio.toggled.connect(self.tor_bridges_use_custom_radio_toggled) @@ -1059,10 +1056,8 @@ class SettingsDialog(QtWidgets.QDialog): ipv6_pattern = re.compile("(obfs4\s+)?\[(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))\]:[0-9]+\s+[A-Z0-9]+(.+)$") meek_lite_pattern = re.compile("(meek_lite)(\s)+([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+:[0-9]+)(\s)+([0-9A-Z]+)(\s)+url=(.+)(\s)+front=(.+)") if ipv4_pattern.match(bridge) or \ - ipv6_pattern.match(bridge): - new_bridges.append(''.join(['Bridge ', bridge, '\n'])) - bridges_valid = True - if self.system != 'Windows' and self.system != 'Darwin' and meek_lite_pattern.match(bridge): + ipv6_pattern.match(bridge) or \ + meek_lite_pattern.match(bridge): new_bridges.append(''.join(['Bridge ', bridge, '\n'])) bridges_valid = True |