diff options
| author | kali <kali@leap.se> | 2012-10-24 01:16:05 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2012-10-24 01:16:05 +0900 |
| commit | ac67079632fb96d9da463e0cc9f2367b0ba6886e (patch) | |
| tree | 9c7a8a0adf7f0e4bd7d8c32e65e10f10ac91a7ce /src/leap | |
| parent | 47a9a04145e30476c162a1d76d4d8b4b360de0bd (diff) | |
save geometry (was badly merged)
Diffstat (limited to 'src/leap')
| -rw-r--r-- | src/leap/baseapp/leap_app.py | 4 | ||||
| -rw-r--r-- | src/leap/baseapp/mainwindow.py | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/leap/baseapp/leap_app.py b/src/leap/baseapp/leap_app.py index 6ffb08a8..d1acb8ba 100644 --- a/src/leap/baseapp/leap_app.py +++ b/src/leap/baseapp/leap_app.py @@ -127,8 +127,8 @@ class MainWindowMixin(object): "context menu of the system tray entry.") self.hide() event.ignore() - if self.debugmode: - self.cleanupAndQuit() + return + self.cleanupAndQuit() def cleanupAndQuit(self): """ diff --git a/src/leap/baseapp/mainwindow.py b/src/leap/baseapp/mainwindow.py index 3b6cb544..df7159ce 100644 --- a/src/leap/baseapp/mainwindow.py +++ b/src/leap/baseapp/mainwindow.py @@ -48,17 +48,18 @@ class LeapWindow(QtGui.QMainWindow, if self.debugmode: self.createLogBrowser() - EIPConductorAppMixin.__init__(self, opts=opts) + settings = QtCore.QSettings() + provider_domain = settings.value("provider_domain", None) + logger.debug('provider: %s', provider_domain) + + EIPConductorAppMixin.__init__( + self, opts=opts, provider=provider_domain) StatusAwareTrayIconMixin.__init__(self) NetworkCheckerAppMixin.__init__(self) MainWindowMixin.__init__(self) - settings = QtCore.QSettings() - geom_key = "DebugGeometry" if self.debugmode else "Geometry" geom = settings.value(geom_key) - - geom = settings.value("Geometry") if geom: self.restoreGeometry(geom) self.wizard_done = settings.value("FirstRunWizardDone") |