Merge pull request #760 from themighty1/minimize-to-tray-linux
fix minimize-to-tray linux
This commit is contained in:
commit
95bcce1d0c
|
@ -1450,18 +1450,16 @@ class MyForm(QtGui.QMainWindow):
|
|||
self.init_blacklist_popup_menu(False)
|
||||
if event.type() == QtCore.QEvent.WindowStateChange:
|
||||
if self.windowState() & QtCore.Qt.WindowMinimized:
|
||||
self.actionShow.setChecked(False)
|
||||
if shared.config.getboolean('bitmessagesettings', 'minimizetotray') and not 'darwin' in sys.platform:
|
||||
if event.type() == QtCore.QEvent.WindowStateChange:
|
||||
if self.windowState() & QtCore.Qt.WindowMinimized:
|
||||
if shared.config.getboolean('bitmessagesettings', 'minimizetotray') and not 'darwin' in sys.platform:
|
||||
self.appIndicatorHide()
|
||||
if 'win32' in sys.platform or 'win64' in sys.platform:
|
||||
self.setWindowFlags(Qt.ToolTip)
|
||||
elif event.oldState() & QtCore.Qt.WindowMinimized:
|
||||
# The window state has just been changed to
|
||||
# Normal/Maximised/FullScreen
|
||||
pass
|
||||
# QtGui.QWidget.changeEvent(self, event)
|
||||
self.setWindowFlags(Qt.ToolTip)
|
||||
elif event.oldState() & QtCore.Qt.WindowMinimized:
|
||||
# The window state has just been changed to
|
||||
# Normal/Maximised/FullScreen
|
||||
pass
|
||||
# QtGui.QWidget.changeEvent(self, event)
|
||||
|
||||
|
||||
def __icon_activated(self, reason):
|
||||
if reason == QtGui.QSystemTrayIcon.Trigger:
|
||||
|
@ -3449,9 +3447,6 @@ class settingsDialog(QtGui.QDialog):
|
|||
self.ui.checkBoxStartOnLogon.setDisabled(True)
|
||||
self.ui.checkBoxStartOnLogon.setText(_translate(
|
||||
"MainWindow", "Start-on-login not yet supported on your OS."))
|
||||
self.ui.checkBoxMinimizeToTray.setDisabled(True)
|
||||
self.ui.checkBoxMinimizeToTray.setText(_translate(
|
||||
"MainWindow", "Minimize-to-tray not yet supported on your OS."))
|
||||
# On the Network settings tab:
|
||||
self.ui.lineEditTCPPort.setText(str(
|
||||
shared.config.get('bitmessagesettings', 'port')))
|
||||
|
|
Reference in New Issue
Block a user