Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-10-01 01:35:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hide_primary_action_on_tor_disconnection' of https://github.com/mig5/onionshare into develop

Browse Source
This commit is contained in:
Micah Lee 2018-04-22 16:09:32 -07:00
commit 1201205dee
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
onionshare_gui/onionshare_gui.py
View File

@ -347,7 +347,8 @@ class OnionShareGui(QtWidgets.QMainWindow):
# If there were some files listed for sharing, we should be ok to # If there were some files listed for sharing, we should be ok to
# re-enable the 'Start Sharing' button now. # re-enable the 'Start Sharing' button now.
if self.server_status.file_selection.get_num_files() > 0: if self.server_status.file_selection.get_num_files() > 0:
self.server_status.server_button.setEnabled(True) self.primary_action.show()
self.info_widget.show()
self.status_bar.clearMessage() self.status_bar.clearMessage()
# If we switched off the shutdown timeout setting, ensure the widget is hidden. # If we switched off the shutdown timeout setting, ensure the widget is hidden.
if not self.settings.get('shutdown_timeout'): if not self.settings.get('shutdown_timeout'):
@ -556,7 +557,8 @@ class OnionShareGui(QtWidgets.QMainWindow):
self.timer.stop() self.timer.stop()
if self.server_status.status != self.server_status.STATUS_STOPPED: if self.server_status.status != self.server_status.STATUS_STOPPED:
self.server_status.stop_server() self.server_status.stop_server()
self.server_status.server_button.setEnabled(False) self.primary_action.hide()
self.info_widget.hide()
self.status_bar.showMessage(strings._('gui_tor_connection_lost', True)) self.status_bar.showMessage(strings._('gui_tor_connection_lost', True))
if self.systemTray.supportsMessages() and self.settings.get('systray_notifications'): if self.systemTray.supportsMessages() and self.settings.get('systray_notifications'):
self.systemTray.showMessage(strings._('gui_tor_connection_lost', True), strings._('gui_tor_connection_error_settings', True)) self.systemTray.showMessage(strings._('gui_tor_connection_lost', True), strings._('gui_tor_connection_error_settings', True))