Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-05-03 15:05:11 -04:00
Code Issues Projects Releases Packages Wiki Activity

Allow the user to cancel a share that is still starting up

Browse source
This commit is contained in:
Miguel Jacq 2018-02-09 18:43:57 +11:00
parent af1b56e659
commit 39954c6ee8
No known key found for this signature in database
GPG key ID: EEA4341C6D97A0B6
4 changed files with 63 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
onionshare_gui/server_status.py
View file

@ -29,6 +29,7 @@ class ServerStatus(QtWidgets.QWidget):
"""
server_started = QtCore.pyqtSignal()
server_stopped = QtCore.pyqtSignal()
server_canceled = QtCore.pyqtSignal()
url_copied = QtCore.pyqtSignal()
hidservauth_copied = QtCore.pyqtSignal()
@ -198,7 +199,7 @@ class ServerStatus(QtWidgets.QWidget):
self.shutdown_timeout.setEnabled(False)
elif self.status == self.STATUS_WORKING:
self.server_button.setStyleSheet(button_working_style)
self.server_button.setEnabled(False)
self.server_button.setEnabled(True)
self.server_button.setText(strings._('gui_please_wait'))
self.shutdown_timeout.setEnabled(False)
else:
@ -224,6 +225,8 @@ class ServerStatus(QtWidgets.QWidget):
self.start_server()
elif self.status == self.STATUS_STARTED:
self.stop_server()
elif self.status == self.STATUS_WORKING:
self.cancel_server()
def start_server(self):
"""
@ -250,6 +253,16 @@ class ServerStatus(QtWidgets.QWidget):
self.update()
self.server_stopped.emit()
def cancel_server(self):
"""
Cancel the server.
"""
common.log('ServerStatus', 'cancel_server', 'Canceling the server mid-startup')
self.status = self.STATUS_WORKING
self.shutdown_timeout_reset()
self.update()
self.server_canceled.emit()
def stop_server_finished(self):
"""
The server has finished stopping.