Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-02-14 21:51:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Get/set tab settings using a getter and setter function

Browse Source
This commit is contained in:
Micah Lee 2019-11-02 10:24:12 -07:00
parent bfd8c4aae6
commit c42c11648c
5 changed files with 38 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
onionshare_gui/tab/mode/mode_settings.py
View File

@ -137,34 +137,34 @@ class ModeSettings(QtWidgets.QWidget):
self.client_auth_checkbox.hide() self.client_auth_checkbox.hide()
def persistent_checkbox_clicked(self): def persistent_checkbox_clicked(self):
self.tab.tab_settings["persistent"][ self.tab.set_tab_setting(
"enabled" "persistent", "enabled", self.persistent_checkbox.isChecked()
] = self.persistent_checkbox.isChecked() )
self.change_persistent.emit( self.change_persistent.emit(
self.tab.tab_id, self.persistent_checkbox.isChecked() self.tab.tab_id, self.persistent_checkbox.isChecked()
) )
def public_checkbox_clicked(self): def public_checkbox_clicked(self):
self.tab.tab_settings["general"]["public"] = self.public_checkbox.isChecked() self.tab.set_tab_setting("general", "public", self.public_checkbox.isChecked())
def autostart_timer_checkbox_clicked(self): def autostart_timer_checkbox_clicked(self):
self.tab.tab_settings["general"][ self.tab.set_tab_setting(
"autostart_timer" "general", "autostart_timer", self.autostart_timer_checkbox.isChecked()
] = self.autostart_timer_checkbox.isChecked() )
def autostop_timer_checkbox_clicked(self): def autostop_timer_checkbox_clicked(self):
self.tab.tab_settings["general"][ self.tab.set_tab_setting(
"autostop_timer" "general", "autostop_timer", self.autostop_timer_checkbox.isChecked()
] = self.autostop_timer_checkbox.isChecked() )
def legacy_checkbox_clicked(self): def legacy_checkbox_clicked(self):
self.tab.tab_settings["general"]["legacy"] = self.legacy_checkbox.isChecked() self.tab.set_tab_setting("general", "legacy", self.legacy_checkbox.isChecked())
def client_auth_checkbox_clicked(self): def client_auth_checkbox_clicked(self):
self.tab.tab_settings["general"][ self.tab.set_tab_setting(
"client_auth" "general", "client_auth", self.client_auth_checkbox.isChecked()
] = self.client_auth_checkbox.isChecked() )
def toggle_advanced_clicked(self): def toggle_advanced_clicked(self):
if self.advanced_widget.isVisible(): if self.advanced_widget.isVisible():

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

@ -140,7 +140,7 @@ class ReceiveMode(Mode):
f"selected dir: {selected_dir}", f"selected dir: {selected_dir}",
) )
self.data_dir_lineedit.setText(selected_dir) self.data_dir_lineedit.setText(selected_dir)
self.tab.tab_settings["receive"]["data_dir"] = data_dir self.tab.set_tab_setting("receive", "data_dir", data_dir)
def get_stop_server_autostop_timer_text(self): def get_stop_server_autostop_timer_text(self):
""" """

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

@ -157,9 +157,9 @@ class ShareMode(Mode):
""" """
Save autostop sharing setting to the tab settings Save autostop sharing setting to the tab settings
""" """
self.tab.tab_settings["share"][ self.tab.set_tab_setting(
"autostop_sharing" "share", "autostop_sharing", self.autostop_sharing_checkbox.isChecked()
] = self.autostop_sharing_checkbox.isChecked() )
def get_stop_server_autostop_timer_text(self): def get_stop_server_autostop_timer_text(self):
""" """
@ -309,7 +309,7 @@ class ShareMode(Mode):
self.history.update_in_progress() self.history.update_in_progress()
# Close on finish? # Close on finish?
if self.common.settings.get("close_after_first_download"): if self.tab.tab_settings["share"]["autostop_sharing"]:
self.server_status.stop_server() self.server_status.stop_server()
self.status_bar.clearMessage() self.status_bar.clearMessage()
self.server_status_label.setText(strings._("closing_automatically")) self.server_status_label.setText(strings._("closing_automatically"))

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

@ -155,9 +155,9 @@ class WebsiteMode(Mode):
""" """
Save disable CSP setting to the tab settings Save disable CSP setting to the tab settings
""" """
self.tab.tab_settings["website"][ self.tab.set_tab_setting(
"disable_csp" "website", "disable_csp", self.disable_csp_checkbox.isChecked()
] = self.disable_csp_checkbox.isChecked() )
def get_stop_server_autostop_timer_text(self): def get_stop_server_autostop_timer_text(self):
""" """

26
onionshare_gui/tab/tab.py
View File

@ -118,6 +118,17 @@ class Tab(QtWidgets.QWidget):
self.timer = QtCore.QTimer() self.timer = QtCore.QTimer()
self.timer.timeout.connect(self.timer_callback) self.timer.timeout.connect(self.timer_callback)
# Persistent image
self.persistent_image_label = QtWidgets.QLabel()
self.persistent_image_label.setPixmap(
QtGui.QPixmap.fromImage(
QtGui.QImage(
self.common.get_resource_path("images/persistent_enabled.png")
)
)
)
self.persistent_image_label.setFixedSize(30, 30)
# Settings for this tab # Settings for this tab
self.tab_settings = { self.tab_settings = {
"persistent": { "persistent": {
@ -138,16 +149,11 @@ class Tab(QtWidgets.QWidget):
"website": {"disable_csp": False}, "website": {"disable_csp": False},
} }
# Persistent image def get_tab_setting(self, group, key):
self.persistent_image_label = QtWidgets.QLabel() return self.tab_settings[group][key]
self.persistent_image_label.setPixmap(
QtGui.QPixmap.fromImage( def set_tab_setting(self, group, key, val):
QtGui.QImage( self.tab_settings[group][key] = val
self.common.get_resource_path("images/persistent_enabled.png")
)
)
)
self.persistent_image_label.setFixedSize(30, 30)
def share_mode_clicked(self): def share_mode_clicked(self):
self.common.log("Tab", "share_mode_clicked") self.common.log("Tab", "share_mode_clicked")