Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-12-27 16:29:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

Separete onion settings into their own group, and remove css that was breaking the look of the "Copy HidServAuth" button

Browse Source
This commit is contained in:
Micah Lee 2019-01-28 20:30:05 -08:00
parent d986a348fd
commit 2a949802d2
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
3 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
onionshare/common.py
View File

@ -398,13 +398,6 @@ class Common(object):
'settings_connect_to_tor': """ 'settings_connect_to_tor': """
QLabel { QLabel {
font-style: italic; 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;
}""" }"""
} }

28
onionshare_gui/settings_dialog.py
View File

@ -52,7 +52,7 @@ class SettingsDialog(QtWidgets.QDialog):
self.system = platform.system() self.system = platform.system()
# General options # General settings
# Use a slug or not ('public mode') # Use a slug or not ('public mode')
self.public_mode_checkbox = QtWidgets.QCheckBox() self.public_mode_checkbox = QtWidgets.QCheckBox()
@ -88,6 +88,15 @@ class SettingsDialog(QtWidgets.QDialog):
self.shutdown_timeout_widget = QtWidgets.QWidget() self.shutdown_timeout_widget = QtWidgets.QWidget()
self.shutdown_timeout_widget.setLayout(shutdown_timeout_layout) self.shutdown_timeout_widget.setLayout(shutdown_timeout_layout)
# General settings layout
general_group_layout = QtWidgets.QVBoxLayout()
general_group_layout.addWidget(self.public_mode_widget)
general_group_layout.addWidget(self.shutdown_timeout_widget)
general_group = QtWidgets.QGroupBox(strings._("gui_settings_general_label"))
general_group.setLayout(general_group_layout)
# Onion settings
# Label telling user to connect to Tor for onion service settings # Label telling user to connect to Tor for onion service settings
self.connect_to_tor_label = QtWidgets.QLabel(strings._("gui_connect_to_tor_for_onion_settings")) self.connect_to_tor_label = QtWidgets.QLabel(strings._("gui_connect_to_tor_for_onion_settings"))
self.connect_to_tor_label.setStyleSheet(self.common.css['settings_connect_to_tor']) self.connect_to_tor_label.setStyleSheet(self.common.css['settings_connect_to_tor'])
@ -162,17 +171,15 @@ class SettingsDialog(QtWidgets.QDialog):
onion_settings_layout.addWidget(self.hidservauth_details) onion_settings_layout.addWidget(self.hidservauth_details)
onion_settings_layout.addWidget(self.hidservauth_copy_button) onion_settings_layout.addWidget(self.hidservauth_copy_button)
self.onion_settings_widget = QtWidgets.QWidget() 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) self.onion_settings_widget.setLayout(onion_settings_layout)
# General options layout # Onion settings layout
general_group_layout = QtWidgets.QVBoxLayout() onion_group_layout = QtWidgets.QVBoxLayout()
general_group_layout.addWidget(self.public_mode_widget) onion_group_layout.addWidget(self.connect_to_tor_label)
general_group_layout.addWidget(self.shutdown_timeout_widget) onion_group_layout.addWidget(self.onion_settings_widget)
general_group_layout.addWidget(self.connect_to_tor_label) onion_group = QtWidgets.QGroupBox(strings._("gui_settings_onion_label"))
general_group_layout.addWidget(self.onion_settings_widget) onion_group.setLayout(onion_group_layout)
general_group = QtWidgets.QGroupBox(strings._("gui_settings_general_label"))
general_group.setLayout(general_group_layout)
# Sharing options # Sharing options
@ -445,6 +452,7 @@ class SettingsDialog(QtWidgets.QDialog):
# Layout # Layout
left_col_layout = QtWidgets.QVBoxLayout() left_col_layout = QtWidgets.QVBoxLayout()
left_col_layout.addWidget(general_group) left_col_layout.addWidget(general_group)
left_col_layout.addWidget(onion_group)
left_col_layout.addWidget(sharing_group) left_col_layout.addWidget(sharing_group)
left_col_layout.addWidget(receiving_group) left_col_layout.addWidget(receiving_group)
left_col_layout.addWidget(autoupdate_group) left_col_layout.addWidget(autoupdate_group)

3
share/locale/en.json
View File

@ -56,13 +56,14 @@
"gui_settings_window_title": "Settings", "gui_settings_window_title": "Settings",
"gui_settings_whats_this": "<a href='{0:s}'>What's this?</a>", "gui_settings_whats_this": "<a href='{0:s}'>What's this?</a>",
"gui_settings_stealth_option": "Use client authorization", "gui_settings_stealth_option": "Use client authorization",
"gui_settings_stealth_hidservauth_string": "Having saved your private key for reuse, means you can now\nclick to copy your HidServAuth.", "gui_settings_stealth_hidservauth_string": "Having saved your private key for reuse, means you can now click to copy your HidServAuth.",
"gui_settings_autoupdate_label": "Check for new version", "gui_settings_autoupdate_label": "Check for new version",
"gui_settings_autoupdate_option": "Notify me when a new version is available", "gui_settings_autoupdate_option": "Notify me when a new version is available",
"gui_settings_autoupdate_timestamp": "Last checked: {}", "gui_settings_autoupdate_timestamp": "Last checked: {}",
"gui_settings_autoupdate_timestamp_never": "Never", "gui_settings_autoupdate_timestamp_never": "Never",
"gui_settings_autoupdate_check_button": "Check for New Version", "gui_settings_autoupdate_check_button": "Check for New Version",
"gui_settings_general_label": "General settings", "gui_settings_general_label": "General settings",
"gui_settings_onion_label": "Onion settings",
"gui_settings_sharing_label": "Sharing settings", "gui_settings_sharing_label": "Sharing settings",
"gui_settings_close_after_first_download_option": "Stop sharing after files have been sent", "gui_settings_close_after_first_download_option": "Stop sharing after files have been sent",
"gui_settings_connection_type_label": "How should OnionShare connect to Tor?", "gui_settings_connection_type_label": "How should OnionShare connect to Tor?",