diff options
| author | kali <kali@leap.se> | 2012-11-28 03:01:53 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2012-11-28 03:02:19 +0900 |
| commit | 564b82fa30ebcd8a0abfea54e00506dd77446a54 (patch) | |
| tree | 27e594233eff749f928cb503e3d4a9920aa08062 /src/leap/baseapp | |
| parent | eec567a0a26edddb30b15ea4ef67f042c160d5ba (diff) | |
| parent | a3ce61ea54b0b0f5c1ecd5904379e27cfec885b5 (diff) | |
Merge branch 'feature/catch-ctrl-c' into develop
Closes #760
Diffstat (limited to 'src/leap/baseapp')
| -rw-r--r-- | src/leap/baseapp/mainwindow.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/leap/baseapp/mainwindow.py b/src/leap/baseapp/mainwindow.py index f07ebb7d..8d61bf5c 100644 --- a/src/leap/baseapp/mainwindow.py +++ b/src/leap/baseapp/mainwindow.py @@ -40,6 +40,7 @@ class LeapWindow(QtGui.QMainWindow, networkError = QtCore.pyqtSignal([object]) triggerEIPError = QtCore.pyqtSignal([object]) start_eipconnection = QtCore.pyqtSignal([]) + shutdownSignal = QtCore.pyqtSignal([]) # this is status change got from openvpn management openvpnStatusChange = QtCore.pyqtSignal([object]) @@ -94,6 +95,8 @@ class LeapWindow(QtGui.QMainWindow, lambda: self.start_or_stopVPN()) self.start_eipconnection.connect( lambda: self.start_or_stopVPN()) + self.shutdownSignal.connect( + self.cleanupAndQuit) # status change. # TODO unify @@ -101,7 +104,6 @@ class LeapWindow(QtGui.QMainWindow, lambda status: self.onOpenVPNStatusChange(status)) self.eipStatusChange.connect( lambda newstatus: self.onEIPConnStatusChange(newstatus)) - # can I connect 2 signals? self.eipStatusChange.connect( lambda newstatus: self.toggleEIPAct()) |