author | zautrix <zautrix> | 2004-10-19 23:38:16 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-19 23:38:16 (UTC) |
commit | f013ff3c0108100c6dbf037a05502ed493361fbf (patch) (unidiff) | |
tree | bf274ac58b55cea0e2f609db8ae5f27f4418a2df /pwmanager/pwmanager/pwminit.cpp | |
parent | f605b2d40ff0f90b132ca880afa83ac751162a2e (diff) | |
download | kdepimpi-f013ff3c0108100c6dbf037a05502ed493361fbf.zip kdepimpi-f013ff3c0108100c6dbf037a05502ed493361fbf.tar.gz kdepimpi-f013ff3c0108100c6dbf037a05502ed493361fbf.tar.bz2 |
desktop fixes
Diffstat (limited to 'pwmanager/pwmanager/pwminit.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | pwmanager/pwmanager/pwminit.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/pwmanager/pwmanager/pwminit.cpp b/pwmanager/pwmanager/pwminit.cpp index 8946443..ea9e330 100644 --- a/pwmanager/pwmanager/pwminit.cpp +++ b/pwmanager/pwmanager/pwminit.cpp | |||
@@ -19,6 +19,7 @@ | |||
19 | 19 | ||
20 | #include "pwminit.h" | 20 | #include "pwminit.h" |
21 | #include "randomizer.h" | 21 | #include "randomizer.h" |
22 | #include <qdir.h> | ||
22 | 23 | ||
23 | #ifndef PWM_EMBEDDED | 24 | #ifndef PWM_EMBEDDED |
24 | #include "selftest.h" | 25 | #include "selftest.h" |
@@ -128,6 +129,7 @@ PwMInit::~PwMInit() | |||
128 | 129 | ||
129 | void PwMInit::initializeApp() | 130 | void PwMInit::initializeApp() |
130 | { | 131 | { |
132 | qDebug("PwMInit::initializeApp() "); | ||
131 | PWM_ASSERT(runStatus == unknown); | 133 | PWM_ASSERT(runStatus == unknown); |
132 | runStatus = init; | 134 | runStatus = init; |
133 | initPosixSignalHandler(); | 135 | initPosixSignalHandler(); |
@@ -140,18 +142,22 @@ void PwMInit::initializeApp() | |||
140 | initKeycard(); | 142 | initKeycard(); |
141 | initTray(); | 143 | initTray(); |
142 | handleCmdLineArgs(); | 144 | handleCmdLineArgs(); |
143 | 145 | qDebug("handle "); | |
144 | bool openDeeplocked = false; | 146 | bool openDeeplocked = false; |
145 | if (conf()->confGlobAutostartDeepLocked() || | 147 | if (conf()->confGlobAutostartDeepLocked() || |
146 | savedCmd.open_deeplocked) | 148 | savedCmd.open_deeplocked) |
147 | openDeeplocked = true; | 149 | openDeeplocked = true; |
148 | if (conf()->confWndAutoMinimizeOnStart() || | 150 | if ( false ){ |
149 | savedCmd.minToTray) { | 151 | // LR is not working |
152 | //if (conf()->confWndAutoMinimizeOnStart() || | ||
153 | // savedCmd.minToTray) { | ||
150 | PwMDoc *newDoc = createDoc(); | 154 | PwMDoc *newDoc = createDoc(); |
155 | qDebug(" createDoc()"); | ||
151 | if (!newDoc->openDocUi(newDoc, | 156 | if (!newDoc->openDocUi(newDoc, |
152 | conf()->confGlobAutoStart(), | 157 | conf()->confGlobAutoStart(), |
153 | openDeeplocked)) { | 158 | openDeeplocked)) { |
154 | delete newDoc; | 159 | delete newDoc; |
160 | } | ||
155 | 161 | ||
156 | //US ENH for embedded devices: in the case of failure, open a document the default way | 162 | //US ENH for embedded devices: in the case of failure, open a document the default way |
157 | createMainWnd(conf()->confGlobAutoStart(), | 163 | createMainWnd(conf()->confGlobAutoStart(), |
@@ -163,7 +169,7 @@ void PwMInit::initializeApp() | |||
163 | 169 | ||
164 | 170 | ||
165 | 171 | ||
166 | } | 172 | //} |
167 | } else { | 173 | } else { |
168 | createMainWnd(conf()->confGlobAutoStart(), | 174 | createMainWnd(conf()->confGlobAutoStart(), |
169 | openDeeplocked, | 175 | openDeeplocked, |
@@ -286,6 +292,7 @@ PwM * PwMInit::createMainWnd(const QString &loadFile, | |||
286 | PwMDoc *doc, | 292 | PwMDoc *doc, |
287 | bool minimized) | 293 | bool minimized) |
288 | { | 294 | { |
295 | qDebug("PwMInit::createMainWnd "); | ||
289 | PwM *newWnd; | 296 | PwM *newWnd; |
290 | if (!doc) | 297 | if (!doc) |
291 | doc = createDoc(); | 298 | doc = createDoc(); |
@@ -317,6 +324,7 @@ PwM * PwMInit::createMainWnd(const QString &loadFile, | |||
317 | app->setMainWidget( newWnd ); | 324 | app->setMainWidget( newWnd ); |
318 | newWnd->resize (640, 480 ); | 325 | newWnd->resize (640, 480 ); |
319 | newWnd->show(); | 326 | newWnd->show(); |
327 | qDebug("show "); | ||
320 | #endif //DESKTOP_VERSION | 328 | #endif //DESKTOP_VERSION |
321 | 329 | ||
322 | #endif //PWM_EMBEDDED | 330 | #endif //PWM_EMBEDDED |