diff options
author | Micah Lee <micah@micahflee.com> | 2019-05-06 18:06:14 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-06 18:06:14 -0700 |
commit | bbf6c02da645fcd4fc50db18dd341178ad4fa2e6 (patch) | |
tree | c1e2757c56f517e051c9f905f8a7a12e1b8d66ae /onionshare_gui/mode/receive_mode/__init__.py | |
parent | a8201593ec0bfe7596ef530e80aa30e5172ef71d (diff) | |
parent | 9e9c29b189cb91ea495a85ed749730395926e07b (diff) | |
download | onionshare-bbf6c02da645fcd4fc50db18dd341178ad4fa2e6.tar.gz onionshare-bbf6c02da645fcd4fc50db18dd341178ad4fa2e6.zip |
Merge pull request #980 from micahflee/developv2.1
Version 2.1
Diffstat (limited to 'onionshare_gui/mode/receive_mode/__init__.py')
-rw-r--r-- | onionshare_gui/mode/receive_mode/__init__.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/onionshare_gui/mode/receive_mode/__init__.py b/onionshare_gui/mode/receive_mode/__init__.py index 5fb33ab3..4c0b49ba 100644 --- a/onionshare_gui/mode/receive_mode/__init__.py +++ b/onionshare_gui/mode/receive_mode/__init__.py @@ -86,24 +86,24 @@ class ReceiveMode(Mode): self.wrapper_layout.addWidget(self.history, stretch=1) self.setLayout(self.wrapper_layout) - def get_stop_server_shutdown_timeout_text(self): + def get_stop_server_autostop_timer_text(self): """ - Return the string to put on the stop server button, if there's a shutdown timeout + Return the string to put on the stop server button, if there's an auto-stop timer """ - return strings._('gui_receive_stop_server_shutdown_timeout') + return strings._('gui_receive_stop_server_autostop_timer') - def timeout_finished_should_stop_server(self): + def autostop_timer_finished_should_stop_server(self): """ - The shutdown timer expired, should we stop the server? Returns a bool + The auto-stop timer expired, should we stop the server? Returns a bool """ # If there were no attempts to upload files, or all uploads are done, we can stop if self.web.receive_mode.upload_count == 0 or not self.web.receive_mode.uploads_in_progress: self.server_status.stop_server() - self.server_status_label.setText(strings._('close_on_timeout')) + self.server_status_label.setText(strings._('close_on_autostop_timer')) return True # An upload is probably still running - hold off on stopping the share, but block new shares. else: - self.server_status_label.setText(strings._('gui_receive_mode_timeout_waiting')) + self.server_status_label.setText(strings._('gui_receive_mode_autostop_timer_waiting')) self.web.receive_mode.can_upload = False return False |