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

Disable settings while an OnionShare server is active

Browse source
This commit is contained in:
Micah Lee 2017-05-16 15:41:35 -07:00
parent cc4ac170c7
commit 2cc8f7de99
1 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

25
onionshare_gui/onionshare_gui.py
View file

@ -118,12 +118,12 @@ class OnionShareGui(QtWidgets.QMainWindow):
self.status_bar.setSizeGripEnabled(False) self.status_bar.setSizeGripEnabled(False)
version_label = QtWidgets.QLabel('v{0:s}'.format(common.get_version())) version_label = QtWidgets.QLabel('v{0:s}'.format(common.get_version()))
version_label.setStyleSheet('color: #666666') version_label.setStyleSheet('color: #666666')
settings_button = QtWidgets.QPushButton() self.settings_button = QtWidgets.QPushButton()
settings_button.setDefault(False) self.settings_button.setDefault(False)
settings_button.setIcon( QtGui.QIcon(common.get_resource_path('images/settings.png')) ) self.settings_button.setIcon( QtGui.QIcon(common.get_resource_path('images/settings.png')) )
settings_button.clicked.connect(self.open_settings) self.settings_button.clicked.connect(self.open_settings)
self.status_bar.addPermanentWidget(version_label) self.status_bar.addPermanentWidget(version_label)
self.status_bar.addPermanentWidget(settings_button) self.status_bar.addPermanentWidget(self.settings_button)
self.setStatusBar(self.status_bar) self.setStatusBar(self.status_bar)
# Status bar, zip progress bar # Status bar, zip progress bar
@ -148,6 +148,9 @@ class OnionShareGui(QtWidgets.QMainWindow):
# Always start with focus on file selection # Always start with focus on file selection
self.file_selection.setFocus() self.file_selection.setFocus()
# The server isn't active yet
self.set_server_active(False)
def _tor_connection_canceled(self): def _tor_connection_canceled(self):
""" """
If the user cancels before Tor finishes connecting, ask if they want to If the user cancels before Tor finishes connecting, ask if they want to
@ -194,6 +197,8 @@ class OnionShareGui(QtWidgets.QMainWindow):
""" """
common.log('OnionShareGui', 'start_server') common.log('OnionShareGui', 'start_server')
self.set_server_active(True)
# First, load settings and configure # First, load settings and configure
settings = Settings() settings = Settings()
settings.load() settings.load()
@ -280,6 +285,8 @@ class OnionShareGui(QtWidgets.QMainWindow):
""" """
common.log('OnionShareGui', 'start_server_error') common.log('OnionShareGui', 'start_server_error')
self.set_server_active(False)
Alert(error, QtWidgets.QMessageBox.Warning) Alert(error, QtWidgets.QMessageBox.Warning)
self.server_status.stop_server() self.server_status.stop_server()
self.status_bar.clearMessage() self.status_bar.clearMessage()
@ -296,6 +303,8 @@ class OnionShareGui(QtWidgets.QMainWindow):
self.filesize_warning.hide() self.filesize_warning.hide()
self.stop_server_finished.emit() self.stop_server_finished.emit()
self.set_server_active(False)
@staticmethod @staticmethod
def _compute_total_size(filenames): def _compute_total_size(filenames):
total_size = 0 total_size = 0
@ -378,6 +387,12 @@ class OnionShareGui(QtWidgets.QMainWindow):
""" """
self.status_bar.clearMessage() self.status_bar.clearMessage()
def set_server_active(self, active):
"""
Disable the Settings button while an OnionShare server is active.
"""
self.settings_button.setEnabled(not active)
def closeEvent(self, e): def closeEvent(self, e):
common.log('OnionShareGui', 'closeEvent') common.log('OnionShareGui', 'closeEvent')
try: try: