From 348fb4b284e642efd0bdb206fb493a07d42ec834 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Tue, 13 Apr 2021 18:18:44 -0400 Subject: [PATCH] Put the title and persistent options at the top of the options widget, above mode-specific options --- desktop/src/onionshare/tab/mode/mode_settings_widget.py | 2 +- desktop/src/onionshare/tab_widget.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/desktop/src/onionshare/tab/mode/mode_settings_widget.py b/desktop/src/onionshare/tab/mode/mode_settings_widget.py index 990e1a92..f93f37bf 100644 --- a/desktop/src/onionshare/tab/mode/mode_settings_widget.py +++ b/desktop/src/onionshare/tab/mode/mode_settings_widget.py @@ -171,9 +171,9 @@ class ModeSettingsWidget(QtWidgets.QWidget): self.advanced_widget.hide() layout = QtWidgets.QVBoxLayout() - layout.addLayout(self.mode_specific_layout) layout.addLayout(title_layout) layout.addWidget(self.persistent_checkbox) + layout.addLayout(self.mode_specific_layout) layout.addWidget(self.public_checkbox) layout.addWidget(self.advanced_widget) layout.addWidget(self.toggle_advanced_button) diff --git a/desktop/src/onionshare/tab_widget.py b/desktop/src/onionshare/tab_widget.py index 94f51616..3df924d3 100644 --- a/desktop/src/onionshare/tab_widget.py +++ b/desktop/src/onionshare/tab_widget.py @@ -178,7 +178,8 @@ class TabWidget(QtWidgets.QTabWidget): tab.init(mode_settings) # Make sure the title is set - tab.get_mode().mode_settings_widget.title_editing_finished() + if tab.get_mode(): + tab.get_mode().mode_settings_widget.title_editing_finished() # If it's persistent, set the persistent image in the tab self.change_persistent(tab.tab_id, tab.settings.get("persistent", "enabled"))