mirror of
https://github.com/onionshare/onionshare.git
synced 2025-07-28 17:17:34 -04:00
Merge branch 'mig5-440_settings_menu_button_disable'
This commit is contained in:
commit
6cd4b4391d
1 changed files with 9 additions and 6 deletions
|
@ -154,12 +154,12 @@ class OnionShareGui(QtWidgets.QMainWindow):
|
||||||
system = common.get_platform()
|
system = common.get_platform()
|
||||||
|
|
||||||
menu = QtWidgets.QMenu()
|
menu = QtWidgets.QMenu()
|
||||||
settingsAction = menu.addAction(strings._('gui_settings_window_title', True))
|
self.settingsAction = menu.addAction(strings._('gui_settings_window_title', True))
|
||||||
settingsAction.triggered.connect(self.open_settings)
|
self.settingsAction.triggered.connect(self.open_settings)
|
||||||
helpAction = menu.addAction(strings._('gui_settings_button_help', True))
|
self.helpAction = menu.addAction(strings._('gui_settings_button_help', True))
|
||||||
helpAction.triggered.connect(SettingsDialog.help_clicked)
|
self.helpAction.triggered.connect(SettingsDialog.help_clicked)
|
||||||
exitAction = menu.addAction(strings._('systray_menu_exit', True))
|
self.exitAction = menu.addAction(strings._('systray_menu_exit', True))
|
||||||
exitAction.triggered.connect(self.close)
|
self.exitAction.triggered.connect(self.close)
|
||||||
|
|
||||||
self.systemTray = QtWidgets.QSystemTrayIcon(self)
|
self.systemTray = QtWidgets.QSystemTrayIcon(self)
|
||||||
# The convention is Mac systray icons are always grayscale
|
# The convention is Mac systray icons are always grayscale
|
||||||
|
@ -454,6 +454,9 @@ class OnionShareGui(QtWidgets.QMainWindow):
|
||||||
else:
|
else:
|
||||||
self.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')) )
|
||||||
|
|
||||||
|
# Disable settings menu action when server is active
|
||||||
|
self.settingsAction.setEnabled(not active)
|
||||||
|
|
||||||
def closeEvent(self, e):
|
def closeEvent(self, e):
|
||||||
common.log('OnionShareGui', 'closeEvent')
|
common.log('OnionShareGui', 'closeEvent')
|
||||||
try:
|
try:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue