| author | zautrix <zautrix> | 2004-10-23 09:04:58 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2004-10-23 09:04:58 (UTC) |
| commit | ba2583db0431059cd7368be23c9653e81af16d29 (patch) (side-by-side diff) | |
| tree | 75d4a662731651d391a5e5bb60e89d1245781593 /pwmanager | |
| parent | eb0bc46bfbba45a84c7353f1c9c4dba27273f021 (diff) | |
| download | kdepimpi-ba2583db0431059cd7368be23c9653e81af16d29.zip kdepimpi-ba2583db0431059cd7368be23c9653e81af16d29.tar.gz kdepimpi-ba2583db0431059cd7368be23c9653e81af16d29.tar.bz2 | |
fixed desktop descape bug. added statusbar to embedded and desktop
| -rw-r--r-- | pwmanager/pwmanager/pwm.cpp | 10 | ||||
| -rw-r--r-- | pwmanager/pwmanager/pwmdocui.cpp | 10 | ||||
| -rw-r--r-- | pwmanager/pwmanager/serializer.cpp | 8 |
3 files changed, 18 insertions, 10 deletions
diff --git a/pwmanager/pwmanager/pwm.cpp b/pwmanager/pwmanager/pwm.cpp index 9798e8e..b7b5307 100644 --- a/pwmanager/pwmanager/pwm.cpp +++ b/pwmanager/pwmanager/pwm.cpp @@ -25,4 +25,6 @@ #include <kmessagebox.h> +#include <qstatusbar.h> + #ifndef PWM_EMBEDDED #include <kmenubar.h> @@ -1359,15 +1361,13 @@ void PwM::copyToClipboard(const QString &s) } + void PwM::showStatMsg(const QString &msg) { -#ifndef PWM_EMBEDDED - KStatusBar *statBar = statusBar(); - statBar->message(msg, STATUSBAR_MSG_TIMEOUT * 1000); +#ifdef DESKTOP_VERSION + statusBar()->message(msg, STATUSBAR_MSG_TIMEOUT * 1000); #else qDebug("Statusbar : %s",msg.latin1()); -#ifndef DESKTOP_VERSION Global::statusMessage(msg); #endif -#endif } diff --git a/pwmanager/pwmanager/pwmdocui.cpp b/pwmanager/pwmanager/pwmdocui.cpp index 6ddb6f5..71b4a8d 100644 --- a/pwmanager/pwmanager/pwmdocui.cpp +++ b/pwmanager/pwmanager/pwmdocui.cpp @@ -380,5 +380,5 @@ bool PwMDocUi::openDocUi(PwMDoc *doc, + "\n" + filename, - i18n("file error")); + i18n("File error")); goto cancelOpen; } @@ -386,5 +386,5 @@ bool PwMDocUi::openDocUi(PwMDoc *doc, KMessageBox::error(getCurrentView(), i18n("This file is already open."), - i18n("already open")); + i18n("Already open")); goto cancelOpen; } @@ -395,5 +395,5 @@ bool PwMDocUi::openDocUi(PwMDoc *doc, "Did you create this file with an\nolder or newer version of PwM?"), i18n - ("incompatible version")); + ("Incompatible version")); goto cancelOpen; } @@ -411,5 +411,5 @@ bool PwMDocUi::openDocUi(PwMDoc *doc, "Probably you have selected the wrong file."), i18n - ("no PwM password-file")); + ("No PwM password-file")); goto cancelOpen; } @@ -421,5 +421,5 @@ bool PwMDocUi::openDocUi(PwMDoc *doc, "had bad sectors?"), i18n - ("checksum error")); + ("Checksum error")); goto cancelOpen; } diff --git a/pwmanager/pwmanager/serializer.cpp b/pwmanager/pwmanager/serializer.cpp index ed0f754..5753c1d 100644 --- a/pwmanager/pwmanager/serializer.cpp +++ b/pwmanager/pwmanager/serializer.cpp @@ -166,4 +166,6 @@ void Serializer::clear() bool Serializer::parseXml(const QCString &buffer) { + //abort(); + //qDebug("parse %s ", buffer.data()); PWM_ASSERT(domDoc); #ifndef PWM_EMBEDDED @@ -357,4 +359,5 @@ bool Serializer::extractEntry(const QDomNode &n, if (text == " ") text = ""; // for backward compatibility. + //qDebug("entry %s ",unescapeEntryData(text).latin1()); if (name == ENTRY_DESC_NEW || name == ENTRY_DESC_OLD) { @@ -702,7 +705,12 @@ QString Serializer::unescapeEntryData(QString dta) dta.replace("||>", "]]>"); #else +#ifdef DESKTOP_VERSION + dta.replace("$>--endl--<$", "\n"); + dta.replace("||>", "]]>"); +#else dta.replace(QRegExp("\\$>--endl--<\\$"), "\n"); dta.replace(QRegExp("||>"), "]]>"); #endif +#endif return dta; } |