diff options
author | Tomás Touceda <chiiph@leap.se> | 2013-07-10 17:11:16 -0300 |
---|---|---|
committer | Tomás Touceda <chiiph@leap.se> | 2013-07-10 17:11:16 -0300 |
commit | 4b7c319d3234ec40e4c2ca63204c0efbc0e55f37 (patch) | |
tree | a91bbac79841f057fdd41a9a5c48b60507aaab0e /src/leap/gui/mainwindow.py | |
parent | 02d5af749b0eb2843302668fa0138afc6dc927da (diff) | |
parent | cc1d8f31071bb99690a355c244b945aa753918a9 (diff) |
Merge remote-tracking branch 'ivan/bug/3125_systray-turn-on-problem' into develop
Diffstat (limited to 'src/leap/gui/mainwindow.py')
-rw-r--r-- | src/leap/gui/mainwindow.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py index e8f91700..7bcd54b0 100644 --- a/src/leap/gui/mainwindow.py +++ b/src/leap/gui/mainwindow.py @@ -238,9 +238,12 @@ class MainWindow(QtGui.QMainWindow): self._action_eip_status) self._action_eip_startstop = QtGui.QAction( - self.tr("Turn ON"), self) + self.tr("Turn OFF"), self) self._action_eip_startstop.triggered.connect( self._stop_eip) + self._action_eip_startstop.setEnabled(False) + self._status_panel.set_action_eip_startstop( + self._action_eip_startstop) self._action_visible = QtGui.QAction(self.tr("Hide Main Window"), self) self._action_visible.triggered.connect(self._toggle_visible) |