diff options
| author | kali <kali@leap.se> | 2012-10-10 05:13:29 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2012-10-10 05:13:29 +0900 |
| commit | cf7ddd017f20ca4a3020628999562e9b3b82bd0b (patch) | |
| tree | cdaf5ec012ee2b13811fe809d803ddddae27e38f | |
| parent | 48792fa7c25530776b871098fd07b600bfc976ba (diff) | |
fix geometry saving for debug/regular mode.
Closes #732
| -rw-r--r-- | src/leap/baseapp/leap_app.py | 3 | ||||
| -rw-r--r-- | src/leap/baseapp/mainwindow.py | 5 | ||||
| -rw-r--r-- | src/leap/eip/eipconnection.py | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/leap/baseapp/leap_app.py b/src/leap/baseapp/leap_app.py index f9eb3bb1..6ffb08a8 100644 --- a/src/leap/baseapp/leap_app.py +++ b/src/leap/baseapp/leap_app.py @@ -136,7 +136,8 @@ class MainWindowMixin(object): """ # save geometry for restoring settings = QtCore.QSettings() - settings.setValue("Geometry", self.saveGeometry()) + geom_key = "DebugGeometry" if self.debugmode else "Geometry" + settings.setValue(geom_key, self.saveGeometry()) # TODO:make sure to shutdown all child process / threads # in conductor diff --git a/src/leap/baseapp/mainwindow.py b/src/leap/baseapp/mainwindow.py index 2348c27d..bbb5203c 100644 --- a/src/leap/baseapp/mainwindow.py +++ b/src/leap/baseapp/mainwindow.py @@ -50,8 +50,9 @@ class LeapWindow(QtGui.QMainWindow, MainWindowMixin.__init__(self) settings = QtCore.QSettings() - # XXX geom_key = "DebugGeometry" if self.debugmode else "Geometry" - #geom = settings.value(geom_key) + + geom_key = "DebugGeometry" if self.debugmode else "Geometry" + geom = settings.value(geom_key) geom = settings.value("Geometry") if geom: diff --git a/src/leap/eip/eipconnection.py b/src/leap/eip/eipconnection.py index 2750d641..bdf70f9c 100644 --- a/src/leap/eip/eipconnection.py +++ b/src/leap/eip/eipconnection.py @@ -54,7 +54,6 @@ class EIPConnection(OpenVPNConnection): run all eip checks previous to attempting a connection """ logger.debug('running conductor checks') - print 'conductor checks!' def push_err(exc): # keep the original traceback! |