summaryrefslogtreecommitdiff
path: root/src/leap/gui/mainwindow.py
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-07-09 17:31:04 -0300
committerTomás Touceda <chiiph@leap.se>2013-07-09 17:31:04 -0300
commit6425331ad6cb74ac44ed95b98adf4eae0f6e6255 (patch)
treec7b42b12facc07f6e2a3c8b4e1d65ab3ad25ac01 /src/leap/gui/mainwindow.py
parent40f3f897a8155719ad961b59ed4deb5cb8e9a32b (diff)
parent0af86db5ec084c3ba10f2865c2568e1f350764a4 (diff)
Merge remote-tracking branch 'ivan/bug/eip_button_moved_to_status_panel' into develop
Diffstat (limited to 'src/leap/gui/mainwindow.py')
-rw-r--r--src/leap/gui/mainwindow.py11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py
index 52caf08e..8283e72f 100644
--- a/src/leap/gui/mainwindow.py
+++ b/src/leap/gui/mainwindow.py
@@ -972,7 +972,7 @@ class MainWindow(QtGui.QMainWindow):
"""
SLOT
TRIGGERS:
- self.ui.btnEipStartStop.clicked
+ self._status_panel.start_eip
self._action_eip_startstop.triggered
or called from _finish_eip_bootstrap
@@ -1045,12 +1045,17 @@ class MainWindow(QtGui.QMainWindow):
def _stop_eip(self, abnormal=False):
"""
+ SLOT
+ TRIGGERS:
+ self._status_panel.stop_eip
+ self._action_eip_startstop.triggered
+ or called from _eip_finished
+
Stops vpn process and makes gui adjustments to reflect
the change of state.
:param abnormal: whether this was an abnormal termination.
:type abnormal: bool
- ""
"""
self.user_stopped_eip = True
self._vpn.terminate()
@@ -1119,7 +1124,7 @@ class MainWindow(QtGui.QMainWindow):
error=True)
else:
self._status_panel.set_eip_status(self.tr("Disabled"))
- self.ui.btnEipStartStop.setEnabled(False)
+ self._status_panel.set_startstop_enabled(False)
def _finish_eip_bootstrap(self, data):
"""