aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaptak S <saptak013@gmail.com>2022-04-30 22:02:26 +0530
committerSaptak S <saptak013@gmail.com>2022-04-30 22:02:26 +0530
commitfea650322300d41de66bd21813b43d6be42a9520 (patch)
tree3fe96139902f02a5608506f71eacb0168efc511d
parent49d951f43de469c5dc6f8cd7aced7710ec25d8c9 (diff)
downloadonionshare-fea650322300d41de66bd21813b43d6be42a9520.tar.gz
onionshare-fea650322300d41de66bd21813b43d6be42a9520.zip
Adds a group box for the bridge settings options in the bridge auto connect widget
-rw-r--r--desktop/onionshare/connection_tab.py10
-rw-r--r--desktop/onionshare/gui_common.py11
-rw-r--r--desktop/onionshare/resources/locale/en.json1
3 files changed, 21 insertions, 1 deletions
diff --git a/desktop/onionshare/connection_tab.py b/desktop/onionshare/connection_tab.py
index 9f5f023a..916a56b6 100644
--- a/desktop/onionshare/connection_tab.py
+++ b/desktop/onionshare/connection_tab.py
@@ -586,6 +586,14 @@ class AutoConnectUseBridgeWidget(QtWidgets.QWidget):
detect_layout.addWidget(self.no_bridge)
detect_layout.addWidget(self.detect_automatic_radio)
detect_layout.addWidget(self.detect_manual_radio)
+ bridge_setting_options = QtWidgets.QGroupBox(
+ strings._("gui_autoconnect_bridge_setting_options")
+ )
+ bridge_setting_options.setLayout(detect_layout)
+ bridge_setting_options.setFlat(True)
+ bridge_setting_options.setStyleSheet(
+ common.gui.css["autoconnect_bridge_setting_options"]
+ )
# Country list
locale = self.common.settings.get("locale")
@@ -660,7 +668,7 @@ class AutoConnectUseBridgeWidget(QtWidgets.QWidget):
layout.addWidget(self.connection_status_label)
layout.addWidget(self.connection_error_message)
layout.addWidget(self.description_label)
- layout.addLayout(detect_layout)
+ layout.addWidget(bridge_setting_options)
layout.addWidget(self.country_combobox)
layout.addWidget(self.task_label)
layout.addWidget(cta_widget)
diff --git a/desktop/onionshare/gui_common.py b/desktop/onionshare/gui_common.py
index c717fd22..9497c749 100644
--- a/desktop/onionshare/gui_common.py
+++ b/desktop/onionshare/gui_common.py
@@ -209,6 +209,17 @@ class GuiCommon:
font-size: 18px;
font-weight: bold;
}""",
+ "autoconnect_bridge_setting_options": """
+ QGroupBox {
+ border: 0;
+ border-color: transparent;
+ background-color: transparent;
+ font-weight: bold;
+ margin-top: 16px;
+ }
+ QGroupBox::title {
+ subcontrol-origin: margin;
+ }""",
# Common styles between modes and their child widgets
"mode_settings_toggle_advanced": """
QPushButton {
diff --git a/desktop/onionshare/resources/locale/en.json b/desktop/onionshare/resources/locale/en.json
index 69429335..8c0a8470 100644
--- a/desktop/onionshare/resources/locale/en.json
+++ b/desktop/onionshare/resources/locale/en.json
@@ -50,6 +50,7 @@
"gui_autoconnect_bridge_description": "It's also possible that your internet is being censored. You might be able to bypass this using a bridge.",
"gui_autoconnect_bridge_detect_automatic": "Automatically determine my country from my IP address for bridge settings",
"gui_autoconnect_bridge_detect_manual": "Manually select my country for bridge settings",
+ "gui_autoconnect_bridge_setting_options": "Bridge Settings",
"gui_autoconnect_start": "Connect to Tor",
"gui_autoconnect_configure": "Network Settings",
"gui_autoconnect_no_bridge": "Try again without bridge",