author | zautrix <zautrix> | 2004-10-23 06:49:54 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-23 06:49:54 (UTC) |
commit | 65989e4ab454f228fb6cd2fa532145ed54366701 (patch) (unidiff) | |
tree | a93a8cd6ef806dd5b6c38e8792a6e007b9e5e413 /pwmanager | |
parent | 0f0dc54f0edc8c4ec5b320118c82fa5150591fed (diff) | |
download | kdepimpi-65989e4ab454f228fb6cd2fa532145ed54366701.zip kdepimpi-65989e4ab454f228fb6cd2fa532145ed54366701.tar.gz kdepimpi-65989e4ab454f228fb6cd2fa532145ed54366701.tar.bz2 |
statusmessage added topwm.fixed initialization problem.changed sring in translation
-rw-r--r-- | pwmanager/pwmanager/pwm.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/pwmanager/pwmanager/pwm.cpp b/pwmanager/pwmanager/pwm.cpp index ac0c978..9798e8e 100644 --- a/pwmanager/pwmanager/pwm.cpp +++ b/pwmanager/pwmanager/pwm.cpp | |||
@@ -37,12 +37,17 @@ | |||
37 | #include <kpimglobalprefs.h> | 37 | #include <kpimglobalprefs.h> |
38 | #include <kcmconfigs/kcmpwmconfig.h> | 38 | #include <kcmconfigs/kcmpwmconfig.h> |
39 | #include <kcmconfigs/kcmkdepimconfig.h> | 39 | #include <kcmconfigs/kcmkdepimconfig.h> |
40 | #include <kcmultidialog.h> | 40 | #include <kcmultidialog.h> |
41 | #endif | 41 | #endif |
42 | 42 | ||
43 | |||
44 | #ifndef DESKTOP_VERSION | ||
45 | #include <qpe/global.h> | ||
46 | #endif | ||
47 | |||
43 | #include <qpixmap.h> | 48 | #include <qpixmap.h> |
44 | #include <qcheckbox.h> | 49 | #include <qcheckbox.h> |
45 | #include <qspinbox.h> | 50 | #include <qspinbox.h> |
46 | #include <qlineedit.h> | 51 | #include <qlineedit.h> |
47 | #include <qfileinfo.h> | 52 | #include <qfileinfo.h> |
48 | #include <qclipboard.h> | 53 | #include <qclipboard.h> |
@@ -162,12 +167,13 @@ PwM::PwM(PwMInit *_init, PwMDoc *doc, | |||
162 | bool virginity, | 167 | bool virginity, |
163 | QWidget *parent, const char *name) | 168 | QWidget *parent, const char *name) |
164 | : KMainWindow(parent, "HALLO") | 169 | : KMainWindow(parent, "HALLO") |
165 | , forceQuit (false) | 170 | , forceQuit (false) |
166 | , forceMinimizeToTray (false) | 171 | , forceMinimizeToTray (false) |
167 | { | 172 | { |
173 | virgin = !virginity; | ||
168 | init = _init; | 174 | init = _init; |
169 | connect(doc, SIGNAL(docClosed(PwMDoc *)), | 175 | connect(doc, SIGNAL(docClosed(PwMDoc *)), |
170 | this, SLOT(docClosed(PwMDoc *))); | 176 | this, SLOT(docClosed(PwMDoc *))); |
171 | initMenubar(); | 177 | initMenubar(); |
172 | initToolbar(); | 178 | initToolbar(); |
173 | initMetrics(); | 179 | initMetrics(); |
@@ -1356,12 +1362,15 @@ void PwM::showStatMsg(const QString &msg) | |||
1356 | { | 1362 | { |
1357 | #ifndef PWM_EMBEDDED | 1363 | #ifndef PWM_EMBEDDED |
1358 | KStatusBar *statBar = statusBar(); | 1364 | KStatusBar *statBar = statusBar(); |
1359 | statBar->message(msg, STATUSBAR_MSG_TIMEOUT * 1000); | 1365 | statBar->message(msg, STATUSBAR_MSG_TIMEOUT * 1000); |
1360 | #else | 1366 | #else |
1361 | qDebug("Statusbar : %s",msg.latin1()); | 1367 | qDebug("Statusbar : %s",msg.latin1()); |
1368 | #ifndef DESKTOP_VERSION | ||
1369 | Global::statusMessage(msg); | ||
1370 | #endif | ||
1362 | #endif | 1371 | #endif |
1363 | } | 1372 | } |
1364 | 1373 | ||
1365 | void PwM::focusInEvent(QFocusEvent *e) | 1374 | void PwM::focusInEvent(QFocusEvent *e) |
1366 | { | 1375 | { |
1367 | if (e->gotFocus()) { | 1376 | if (e->gotFocus()) { |