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

Rename mode_settings_widget to be more clear, and fix one place that was still using tab_settings

Browse Source
This commit is contained in:
Micah Lee 2019-11-02 11:43:05 -07:00
parent 9534a44051
commit c426cfceb2
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
onionshare_gui/tab/mode/__init__.py
View File

@ -73,15 +73,15 @@ class Mode(QtWidgets.QWidget):
self.header_label.setStyleSheet(self.common.gui.css["mode_header_label"]) self.header_label.setStyleSheet(self.common.gui.css["mode_header_label"])
self.header_label.setAlignment(QtCore.Qt.AlignHCenter) self.header_label.setAlignment(QtCore.Qt.AlignHCenter)
self.mode_settings = ModeSettingsWidget( self.mode_settings_widget = ModeSettingsWidget(
self.common, self.tab.tab_id, self.tab.mode_settings self.common, self.tab.tab_id, self.tab.mode_settings
) )
self.mode_settings.change_persistent.connect(self.change_persistent) self.mode_settings_widget.change_persistent.connect(self.change_persistent)
header_layout = QtWidgets.QVBoxLayout() header_layout = QtWidgets.QVBoxLayout()
header_layout.setContentsMargins(0, 0, 0, 0) header_layout.setContentsMargins(0, 0, 0, 0)
header_layout.addWidget(self.header_label) header_layout.addWidget(self.header_label)
header_layout.addWidget(self.mode_settings) header_layout.addWidget(self.mode_settings_widget)
self.header = QtWidgets.QWidget() self.header = QtWidgets.QWidget()
self.header.setLayout(header_layout) self.header.setLayout(header_layout)

2
onionshare_gui/tab/mode/receive_mode/__init__.py
View File

@ -57,7 +57,7 @@ class ReceiveMode(Mode):
data_dir_layout.addWidget(self.data_dir_lineedit) data_dir_layout.addWidget(self.data_dir_lineedit)
data_dir_layout.addWidget(data_dir_button) data_dir_layout.addWidget(data_dir_button)
self.mode_settings.mode_specific_layout.addLayout(data_dir_layout) self.mode_settings_widget.mode_specific_layout.addLayout(data_dir_layout)
# Server status # Server status
self.server_status.set_mode("receive") self.server_status.set_mode("receive")

2
onionshare_gui/tab/mode/share_mode/__init__.py
View File

@ -59,7 +59,7 @@ class ShareMode(Mode):
self.autostop_sharing_checkbox.setText( self.autostop_sharing_checkbox.setText(
strings._("mode_settings_share_autostop_sharing_checkbox") strings._("mode_settings_share_autostop_sharing_checkbox")
) )
self.mode_settings.mode_specific_layout.addWidget( self.mode_settings_widget.mode_specific_layout.addWidget(
self.autostop_sharing_checkbox self.autostop_sharing_checkbox
) )

4
onionshare_gui/tab/mode/website_mode/__init__.py
View File

@ -59,7 +59,9 @@ class WebsiteMode(Mode):
self.disable_csp_checkbox.setText( self.disable_csp_checkbox.setText(
strings._("mode_settings_website_disable_csp_checkbox") strings._("mode_settings_website_disable_csp_checkbox")
) )
self.mode_settings.mode_specific_layout.addWidget(self.disable_csp_checkbox) self.mode_settings_widget.mode_specific_layout.addWidget(
self.disable_csp_checkbox
)
# File selection # File selection
self.file_selection = FileSelection(self.common, self) self.file_selection = FileSelection(self.common, self)

2
onionshare_gui/tab/tab.py
View File

@ -496,7 +496,7 @@ class Tab(QtWidgets.QWidget):
if self.mode is None: if self.mode is None:
return True return True
if self.tab_settings["persistent"]["enabled"]: if self.mode_settings.get("persistent", "enabled"):
dialog_text = strings._("gui_close_tab_warning_persistent_description") dialog_text = strings._("gui_close_tab_warning_persistent_description")
else: else:
server_status = self.get_mode().server_status server_status = self.get_mode().server_status