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

Merge branch 'mig5-440_settings_menu_button_disable'

Browse source
This commit is contained in:
Micah Lee 2017-07-09 14:19:08 -07:00
commit 6cd4b4391d
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
onionshare_gui/onionshare_gui.py
View file

@ -154,12 +154,12 @@ class OnionShareGui(QtWidgets.QMainWindow):
system = common.get_platform()
menu = QtWidgets.QMenu()
settingsAction = menu.addAction(strings._('gui_settings_window_title', True))
settingsAction.triggered.connect(self.open_settings)
helpAction = menu.addAction(strings._('gui_settings_button_help', True))
helpAction.triggered.connect(SettingsDialog.help_clicked)
exitAction = menu.addAction(strings._('systray_menu_exit', True))
exitAction.triggered.connect(self.close)
self.settingsAction = menu.addAction(strings._('gui_settings_window_title', True))
self.settingsAction.triggered.connect(self.open_settings)
self.helpAction = menu.addAction(strings._('gui_settings_button_help', True))
self.helpAction.triggered.connect(SettingsDialog.help_clicked)
self.exitAction = menu.addAction(strings._('systray_menu_exit', True))
self.exitAction.triggered.connect(self.close)
self.systemTray = QtWidgets.QSystemTrayIcon(self)
# The convention is Mac systray icons are always grayscale
@ -454,6 +454,9 @@ class OnionShareGui(QtWidgets.QMainWindow):
else:
self.settings_button.setIcon( QtGui.QIcon(common.get_resource_path('images/settings.png')) )
# Disable settings menu action when server is active
self.settingsAction.setEnabled(not active)
def closeEvent(self, e):
common.log('OnionShareGui', 'closeEvent')
try: