Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-01-27 06:47:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into fix_tor_tests

Browse Source
This commit is contained in:
Miguel Jacq 2018-10-17 16:19:03 +11:00
commit 0176535e50
No known key found for this signature in database
GPG Key ID: EEA4341C6D97A0B6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
onionshare_gui/mode/share_mode/__init__.py
View File

@ -284,7 +284,7 @@ class ShareMode(Mode):
# Update in progress count # Update in progress count
self.history.in_progress_count -= 1 self.history.in_progress_count -= 1
self.history.update_in_progress() self.history.update_in_progress()
self.system_tray.showMessage(strings._('systray_download_canceled_title', True), strings._('systray_download_canceled_message', True)) self.system_tray.showMessage(strings._('systray_download_canceled_title'), strings._('systray_download_canceled_message'))
def on_reload_settings(self): def on_reload_settings(self):
""" """

2
onionshare_gui/server_status.py
View File

@ -269,7 +269,7 @@ class ServerStatus(QtWidgets.QWidget):
self.timeout = self.shutdown_timeout.dateTime().toPyDateTime().replace(second=0, microsecond=0) self.timeout = self.shutdown_timeout.dateTime().toPyDateTime().replace(second=0, microsecond=0)
# If the timeout has actually passed already before the user hit Start, refuse to start the server. # If the timeout has actually passed already before the user hit Start, refuse to start the server.
if QtCore.QDateTime.currentDateTime().toPyDateTime() > self.timeout: if QtCore.QDateTime.currentDateTime().toPyDateTime() > self.timeout:
Alert(self.common, strings._('gui_server_timeout_expired', QtWidgets.QMessageBox.Warning)) Alert(self.common, strings._('gui_server_timeout_expired'), QtWidgets.QMessageBox.Warning)
else: else:
self.start_server() self.start_server()
else: else: