diff options
| author | Micah Lee <micah@micahflee.com> | 2020-12-22 13:30:59 -0800 |
|---|---|---|
| committer | Micah Lee <micah@micahflee.com> | 2020-12-22 13:30:59 -0800 |
| commit | 6eee7f9c5c42752bb17a1ae2da14a96a55ba7297 (patch) | |
| tree | 9e70ec73bc3611b51bd099bcff9a1c8df7c9e02c /desktop/src/onionshare/tab | |
| parent | 71558afb57d1f3aa9ac747897dda636f371c6d01 (diff) | |
| parent | 96d21853c09690cd94ae086ec9d0541e51b97eef (diff) | |
| download | onionshare-6eee7f9c5c42752bb17a1ae2da14a96a55ba7297.tar.gz onionshare-6eee7f9c5c42752bb17a1ae2da14a96a55ba7297.zip | |
Merge branch 'develop' into 1166_make_cancel_forceful
Diffstat (limited to 'desktop/src/onionshare/tab')
6 files changed, 32 insertions, 0 deletions
diff --git a/desktop/src/onionshare/tab/mode/__init__.py b/desktop/src/onionshare/tab/mode/__init__.py index 7d2159c7..c48f20c0 100644 --- a/desktop/src/onionshare/tab/mode/__init__.py +++ b/desktop/src/onionshare/tab/mode/__init__.py @@ -107,6 +107,12 @@ class Mode(QtWidgets.QWidget): """ pass + def get_type(self): + """ + Returns the type of mode as a string (e.g. "share", "receive", etc.) + """ + pass + def human_friendly_time(self, secs): """ Returns a human-friendly time delta from given seconds. diff --git a/desktop/src/onionshare/tab/mode/chat_mode/__init__.py b/desktop/src/onionshare/tab/mode/chat_mode/__init__.py index 25a02969..a7c2929b 100644 --- a/desktop/src/onionshare/tab/mode/chat_mode/__init__.py +++ b/desktop/src/onionshare/tab/mode/chat_mode/__init__.py @@ -101,6 +101,12 @@ class ChatMode(Mode): self.wrapper_layout.addLayout(self.column_layout) self.setLayout(self.wrapper_layout) + def get_type(self): + """ + Returns the type of mode as a string (e.g. "share", "receive", etc.) + """ + return "chat" + def get_stop_server_autostop_timer_text(self): """ Return the string to put on the stop server button, if there's an auto-stop timer diff --git a/desktop/src/onionshare/tab/mode/receive_mode/__init__.py b/desktop/src/onionshare/tab/mode/receive_mode/__init__.py index 95d1ecbe..95a68dcb 100644 --- a/desktop/src/onionshare/tab/mode/receive_mode/__init__.py +++ b/desktop/src/onionshare/tab/mode/receive_mode/__init__.py @@ -149,6 +149,12 @@ class ReceiveMode(Mode): self.wrapper_layout.addLayout(self.column_layout) self.setLayout(self.wrapper_layout) + def get_type(self): + """ + Returns the type of mode as a string (e.g. "share", "receive", etc.) + """ + return "receive" + def data_dir_button_clicked(self): """ Browse for a new OnionShare data directory, and save to tab settings diff --git a/desktop/src/onionshare/tab/mode/share_mode/__init__.py b/desktop/src/onionshare/tab/mode/share_mode/__init__.py index ccf85dbd..bf1498d5 100644 --- a/desktop/src/onionshare/tab/mode/share_mode/__init__.py +++ b/desktop/src/onionshare/tab/mode/share_mode/__init__.py @@ -173,6 +173,12 @@ class ShareMode(Mode): # Always start with focus on file selection self.file_selection.setFocus() + def get_type(self): + """ + Returns the type of mode as a string (e.g. "share", "receive", etc.) + """ + return "share" + def autostop_sharing_checkbox_clicked(self): """ Save autostop sharing setting to the tab settings diff --git a/desktop/src/onionshare/tab/mode/website_mode/__init__.py b/desktop/src/onionshare/tab/mode/website_mode/__init__.py index 325b22f1..6df6ff02 100644 --- a/desktop/src/onionshare/tab/mode/website_mode/__init__.py +++ b/desktop/src/onionshare/tab/mode/website_mode/__init__.py @@ -173,6 +173,12 @@ class WebsiteMode(Mode): # Always start with focus on file selection self.file_selection.setFocus() + def get_type(self): + """ + Returns the type of mode as a string (e.g. "share", "receive", etc.) + """ + return "website" + def disable_csp_checkbox_clicked(self): """ Save disable CSP setting to the tab settings diff --git a/desktop/src/onionshare/tab/tab.py b/desktop/src/onionshare/tab/tab.py index 8f5ffd08..8cbddfed 100644 --- a/desktop/src/onionshare/tab/tab.py +++ b/desktop/src/onionshare/tab/tab.py @@ -669,7 +669,9 @@ class Tab(QtWidgets.QWidget): return False def cleanup(self): + self.common.log("Tab", "cleanup", f"tab_id={self.tab_id}") if self.get_mode() and self.get_mode().web_thread: + self.get_mode().web.stop(self.get_mode().app.port) self.get_mode().web_thread.quit() self.get_mode().web_thread.wait() self.app.cleanup() |