diff options
author | Micah Lee <micah@micahflee.com> | 2018-02-13 17:28:03 -0800 |
---|---|---|
committer | Micah Lee <micah@micahflee.com> | 2018-02-13 17:28:03 -0800 |
commit | 127d097e96860a515e0ebee5edb9a2e2709b0480 (patch) | |
tree | 0214bdaeabc0c74d350eb274bf511f71120a6e62 /onionshare_gui | |
parent | 7bac366b5cf296af984b26bd0bd44f6770c65952 (diff) | |
parent | 14ece5080755986b706016a156a5adc5a3c76926 (diff) | |
download | onionshare-127d097e96860a515e0ebee5edb9a2e2709b0480.tar.gz onionshare-127d097e96860a515e0ebee5edb9a2e2709b0480.zip |
Merge branch 'clear_messages_on_server_button_click' of https://github.com/mig5/onionshare into mig5-clear_messages_on_server_button_click
Diffstat (limited to 'onionshare_gui')
-rw-r--r-- | onionshare_gui/onionshare_gui.py | 1 | ||||
-rw-r--r-- | onionshare_gui/server_status.py | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/onionshare_gui/onionshare_gui.py b/onionshare_gui/onionshare_gui.py index 7724e69f..cf9720d8 100644 --- a/onionshare_gui/onionshare_gui.py +++ b/onionshare_gui/onionshare_gui.py @@ -90,6 +90,7 @@ class OnionShareGui(QtWidgets.QMainWindow): self.starting_server_step2.connect(self.start_server_step2) self.starting_server_step3.connect(self.start_server_step3) self.starting_server_error.connect(self.start_server_error) + self.server_status.button_clicked.connect(self.clear_message) # Filesize warning self.filesize_warning = QtWidgets.QLabel() diff --git a/onionshare_gui/server_status.py b/onionshare_gui/server_status.py index a2701e6a..dc7a34bb 100644 --- a/onionshare_gui/server_status.py +++ b/onionshare_gui/server_status.py @@ -29,6 +29,7 @@ class ServerStatus(QtWidgets.QWidget): """ server_started = QtCore.pyqtSignal() server_stopped = QtCore.pyqtSignal() + button_clicked = QtCore.pyqtSignal() url_copied = QtCore.pyqtSignal() hidservauth_copied = QtCore.pyqtSignal() @@ -212,6 +213,7 @@ class ServerStatus(QtWidgets.QWidget): self.start_server() elif self.status == self.STATUS_STARTED: self.stop_server() + self.button_clicked.emit() def start_server(self): """ |