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

Display desktop notification to the user when the receiver closes the server, and finish up closing the server

Browse source
This commit is contained in:
Micah Lee 2018-04-29 15:49:18 -07:00
parent ae13492749
commit 7f320d3535
5 changed files with 78 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

24
onionshare_gui/onionshare_gui.py
View file

@ -382,41 +382,43 @@ class OnionShareGui(QtWidgets.QMainWindow):
# Process events from the web object
if self.mode == self.MODE_SHARE:
web = self.share_mode.web
mode = self.share_mode
else:
web = self.receive_mode.web
mode = self.receive_mode
events = []
done = False
while not done:
try:
r = web.q.get(False)
r = mode.web.q.get(False)
events.append(r)
except queue.Empty:
done = True
for event in events:
if event["type"] == Web.REQUEST_LOAD:
self.share_mode.handle_request_load(event)
mode.handle_request_load(event)
elif event["type"] == Web.REQUEST_DOWNLOAD:
self.share_mode.handle_request_download(event)
mode.handle_request_download(event)
elif event["type"] == Web.REQUEST_RATE_LIMIT:
self.share_mode.handle_request_rate_limit(event)
mode.handle_request_rate_limit(event)
elif event["type"] == Web.REQUEST_PROGRESS:
self.share_mode.handle_request_progress(event)
mode.handle_request_progress(event)
elif event["type"] == Web.REQUEST_CANCELED:
self.share_mode.handle_request_canceled(event)
mode.handle_request_canceled(event)
elif event["type"] == Web.REQUEST_CLOSE_SERVER:
mode.handle_request_close_server(event)
elif event["path"] != '/favicon.ico':
self.status_bar.showMessage('[#{0:d}] {1:s}: {2:s}'.format(web.error404_count, strings._('other_page_loaded', True), event["path"]))
self.status_bar.showMessage('[#{0:d}] {1:s}: {2:s}'.format(mode.web.error404_count, strings._('other_page_loaded', True), event["path"]))
self.share_mode.timer_callback()
self.receive_mode.timer_callback()
mode.timer_callback()
def copy_url(self):
"""