summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@yahoo.com.ar>2013-07-09 12:06:47 -0300
committerIvan Alejandro <ivanalejandro0@yahoo.com.ar>2013-07-09 17:25:31 -0300
commit0af86db5ec084c3ba10f2865c2568e1f350764a4 (patch)
tree3e50fb364747c55dabf289fbc5c3d2f8cdc065fc
parent1c002eb9797107eb89540d70ca499c3a379d2bee (diff)
Bugfix: EIP status button moved to status panel.
Also add and update some docstrings.
-rw-r--r--changes/bugfix_eip-status-button-moved1
-rw-r--r--src/leap/gui/mainwindow.py11
2 files changed, 9 insertions, 3 deletions
diff --git a/changes/bugfix_eip-status-button-moved b/changes/bugfix_eip-status-button-moved
new file mode 100644
index 00000000..29298420
--- /dev/null
+++ b/changes/bugfix_eip-status-button-moved
@@ -0,0 +1 @@
+ o Bugfix: EIP status button moved to status panel.
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):
"""