From a1fd22e2557b9c695bbbce427a72b06eb5750b1d Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Sun, 22 Apr 2018 17:15:15 -0700 Subject: [PATCH 1/2] Rearrange some widgets in the settings dialog, specifically move the bridge options above the test Tor settings button --- onionshare_gui/settings_dialog.py | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/onionshare_gui/settings_dialog.py b/onionshare_gui/settings_dialog.py index f60107af..c9009776 100644 --- a/onionshare_gui/settings_dialog.py +++ b/onionshare_gui/settings_dialog.py @@ -309,16 +309,6 @@ class SettingsDialog(QtWidgets.QDialog): connection_type_radio_group = QtWidgets.QGroupBox(strings._("gui_settings_connection_type_label", True)) connection_type_radio_group.setLayout(connection_type_radio_group_layout) - # Connection type layout - connection_type_group_layout = QtWidgets.QVBoxLayout() - connection_type_group_layout.addWidget(self.connection_type_control_port_extras) - connection_type_group_layout.addWidget(self.connection_type_socket_file_extras) - connection_type_group_layout.addWidget(self.connection_type_socks) - connection_type_group_layout.addWidget(self.authenticate_group) - connection_type_group_layout.addWidget(self.connection_type_test_button) - connection_type_group = QtWidgets.QGroupBox() - connection_type_group.setLayout(connection_type_group_layout) - # The Bridges options are not exclusive (enabling Bridges offers obfs4 or custom bridges) connection_type_bridges_radio_group_layout = QtWidgets.QVBoxLayout() connection_type_bridges_radio_group_layout.addWidget(self.bridges) @@ -326,6 +316,15 @@ class SettingsDialog(QtWidgets.QDialog): self.connection_type_bridges_radio_group.setLayout(connection_type_bridges_radio_group_layout) self.connection_type_bridges_radio_group.hide() + # Connection type layout + connection_type_layout = QtWidgets.QVBoxLayout() + connection_type_layout.addWidget(self.connection_type_control_port_extras) + connection_type_layout.addWidget(self.connection_type_socket_file_extras) + connection_type_layout.addWidget(self.connection_type_socks) + connection_type_layout.addWidget(self.authenticate_group) + connection_type_layout.addWidget(self.connection_type_bridges_radio_group) + connection_type_layout.addWidget(self.connection_type_test_button) + # Buttons self.save_button = QtWidgets.QPushButton(strings._('gui_settings_button_save', True)) self.save_button.clicked.connect(self.save_clicked) @@ -356,8 +355,7 @@ class SettingsDialog(QtWidgets.QDialog): right_col_layout = QtWidgets.QVBoxLayout() right_col_layout.addWidget(connection_type_radio_group) - right_col_layout.addWidget(connection_type_group) - right_col_layout.addWidget(self.connection_type_bridges_radio_group) + right_col_layout.addLayout(connection_type_layout) right_col_layout.addWidget(self.tor_status) right_col_layout.addStretch() From ec08349a184176eeeec3789d7ef6d002205b24c7 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Sun, 22 Apr 2018 17:20:58 -0700 Subject: [PATCH 2/2] Put test Tor button in a so it can be left-aligned --- onionshare_gui/settings_dialog.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/onionshare_gui/settings_dialog.py b/onionshare_gui/settings_dialog.py index c9009776..c70f5695 100644 --- a/onionshare_gui/settings_dialog.py +++ b/onionshare_gui/settings_dialog.py @@ -296,10 +296,6 @@ class SettingsDialog(QtWidgets.QDialog): self.authenticate_group = QtWidgets.QGroupBox(strings._("gui_settings_authenticate_label", True)) self.authenticate_group.setLayout(authenticate_group_layout) - # Test tor settings button - self.connection_type_test_button = QtWidgets.QPushButton(strings._('gui_settings_connection_type_test_button', True)) - self.connection_type_test_button.clicked.connect(self.test_tor_clicked) - # Put the radios into their own group so they are exclusive connection_type_radio_group_layout = QtWidgets.QVBoxLayout() connection_type_radio_group_layout.addWidget(self.connection_type_bundled_radio) @@ -316,6 +312,13 @@ class SettingsDialog(QtWidgets.QDialog): self.connection_type_bridges_radio_group.setLayout(connection_type_bridges_radio_group_layout) self.connection_type_bridges_radio_group.hide() + # Test tor settings button + self.connection_type_test_button = QtWidgets.QPushButton(strings._('gui_settings_connection_type_test_button', True)) + self.connection_type_test_button.clicked.connect(self.test_tor_clicked) + connection_type_test_button_layout = QtWidgets.QHBoxLayout() + connection_type_test_button_layout.addWidget(self.connection_type_test_button) + connection_type_test_button_layout.addStretch() + # Connection type layout connection_type_layout = QtWidgets.QVBoxLayout() connection_type_layout.addWidget(self.connection_type_control_port_extras) @@ -323,7 +326,7 @@ class SettingsDialog(QtWidgets.QDialog): connection_type_layout.addWidget(self.connection_type_socks) connection_type_layout.addWidget(self.authenticate_group) connection_type_layout.addWidget(self.connection_type_bridges_radio_group) - connection_type_layout.addWidget(self.connection_type_test_button) + connection_type_layout.addLayout(connection_type_test_button_layout) # Buttons self.save_button = QtWidgets.QPushButton(strings._('gui_settings_button_save', True))