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

Improve layout of SettingsDialog

Browse Source
This commit is contained in:
Micah Lee 2021-10-13 20:34:11 -07:00
parent 67d61d2c53
commit f2dbc97285
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
desktop/src/onionshare/gui_common.py
View File

@ -395,7 +395,7 @@ class GuiCommon:
# Settings dialogs # Settings dialogs
"settings_version": """ "settings_version": """
QLabel { QLabel {
color: #666666; font-size: 16px;
}""", }""",
"settings_whats_this": """ "settings_whats_this": """
QLabel { QLabel {

2
desktop/src/onionshare/resources/locale/en.json
View File

@ -126,7 +126,7 @@
"error_cannot_create_data_dir": "Could not create OnionShare data folder: {}", "error_cannot_create_data_dir": "Could not create OnionShare data folder: {}",
"gui_receive_mode_warning": "Receive mode lets people upload files to your computer.<br><br><b>Some files can potentially take control of your computer if you open them. Only open things from people you trust, or if you know what you are doing.</b>", "gui_receive_mode_warning": "Receive mode lets people upload files to your computer.<br><br><b>Some files can potentially take control of your computer if you open them. Only open things from people you trust, or if you know what you are doing.</b>",
"gui_open_folder_error": "Failed to open folder with xdg-open. The file is here: {}", "gui_open_folder_error": "Failed to open folder with xdg-open. The file is here: {}",
"gui_settings_language_label": "Preferred language", "gui_settings_language_label": "Language",
"gui_settings_theme_label": "Theme", "gui_settings_theme_label": "Theme",
"gui_settings_theme_auto": "Auto", "gui_settings_theme_auto": "Auto",
"gui_settings_theme_light": "Light", "gui_settings_theme_light": "Light",

20
desktop/src/onionshare/settings_dialog.py
View File

@ -71,6 +71,17 @@ class SettingsDialog(QtWidgets.QDialog):
self.system = platform.system() self.system = platform.system()
# Header
version_label = QtWidgets.QLabel(f"OnionShare {self.common.version}")
version_label.setStyleSheet(self.common.gui.css["settings_version"])
self.help_button = QtWidgets.QPushButton(strings._("gui_settings_button_help"))
self.help_button.clicked.connect(self.help_clicked)
header_layout = QtWidgets.QHBoxLayout()
header_layout.addStretch()
header_layout.addWidget(version_label)
header_layout.addWidget(self.help_button)
header_layout.addStretch()
# Automatic updates options # Automatic updates options
# Autoupdate # Autoupdate
@ -142,24 +153,19 @@ class SettingsDialog(QtWidgets.QDialog):
strings._("gui_settings_button_cancel") strings._("gui_settings_button_cancel")
) )
self.cancel_button.clicked.connect(self.cancel_clicked) self.cancel_button.clicked.connect(self.cancel_clicked)
version_label = QtWidgets.QLabel(f"OnionShare {self.common.version}")
version_label.setStyleSheet(self.common.gui.css["settings_version"])
self.help_button = QtWidgets.QPushButton(strings._("gui_settings_button_help"))
self.help_button.clicked.connect(self.help_clicked)
buttons_layout = QtWidgets.QHBoxLayout() buttons_layout = QtWidgets.QHBoxLayout()
buttons_layout.addWidget(version_label)
buttons_layout.addWidget(self.help_button)
buttons_layout.addStretch() buttons_layout.addStretch()
buttons_layout.addWidget(self.save_button) buttons_layout.addWidget(self.save_button)
buttons_layout.addWidget(self.cancel_button) buttons_layout.addWidget(self.cancel_button)
# Layout # Layout
layout = QtWidgets.QVBoxLayout() layout = QtWidgets.QVBoxLayout()
layout.addLayout(header_layout)
layout.addSpacing(20)
layout.addWidget(autoupdate_group) layout.addWidget(autoupdate_group)
if autoupdate_group.isVisible(): if autoupdate_group.isVisible():
layout.addSpacing(20) layout.addSpacing(20)
layout.addLayout(language_layout) layout.addLayout(language_layout)
layout.addSpacing(20)
layout.addLayout(theme_layout) layout.addLayout(theme_layout)
layout.addSpacing(20) layout.addSpacing(20)
layout.addStretch() layout.addStretch()