summaryrefslogtreecommitdiffabout
path: root/pwmanager
authorzautrix <zautrix>2004-10-23 09:04:58 (UTC)
committer zautrix <zautrix>2004-10-23 09:04:58 (UTC)
commitba2583db0431059cd7368be23c9653e81af16d29 (patch) (side-by-side diff)
tree75d4a662731651d391a5e5bb60e89d1245781593 /pwmanager
parenteb0bc46bfbba45a84c7353f1c9c4dba27273f021 (diff)
downloadkdepimpi-ba2583db0431059cd7368be23c9653e81af16d29.zip
kdepimpi-ba2583db0431059cd7368be23c9653e81af16d29.tar.gz
kdepimpi-ba2583db0431059cd7368be23c9653e81af16d29.tar.bz2
fixed desktop descape bug. added statusbar to embedded and desktop
Diffstat (limited to 'pwmanager') (more/less context) (show whitespace changes)
-rw-r--r--pwmanager/pwmanager/pwm.cpp10
-rw-r--r--pwmanager/pwmanager/pwmdocui.cpp10
-rw-r--r--pwmanager/pwmanager/serializer.cpp8
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
@@ -26,2 +26,4 @@
+#include <qstatusbar.h>
+
#ifndef PWM_EMBEDDED
@@ -1360,13 +1362,11 @@ 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
@@ -381,3 +381,3 @@ bool PwMDocUi::openDocUi(PwMDoc *doc,
+ filename,
- i18n("file error"));
+ i18n("File error"));
goto cancelOpen;
@@ -387,3 +387,3 @@ bool PwMDocUi::openDocUi(PwMDoc *doc,
i18n("This file is already open."),
- i18n("already open"));
+ i18n("Already open"));
goto cancelOpen;
@@ -396,3 +396,3 @@ bool PwMDocUi::openDocUi(PwMDoc *doc,
i18n
- ("incompatible version"));
+ ("Incompatible version"));
goto cancelOpen;
@@ -412,3 +412,3 @@ bool PwMDocUi::openDocUi(PwMDoc *doc,
i18n
- ("no PwM password-file"));
+ ("No PwM password-file"));
goto cancelOpen;
@@ -422,3 +422,3 @@ bool PwMDocUi::openDocUi(PwMDoc *doc,
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
@@ -167,2 +167,4 @@ bool Serializer::parseXml(const QCString &buffer)
{
+ //abort();
+ //qDebug("parse %s ", buffer.data());
PWM_ASSERT(domDoc);
@@ -358,2 +360,3 @@ bool Serializer::extractEntry(const QDomNode &n,
text = ""; // for backward compatibility.
+ //qDebug("entry %s ",unescapeEntryData(text).latin1());
if (name == ENTRY_DESC_NEW ||
@@ -703,2 +706,6 @@ QString Serializer::unescapeEntryData(QString dta)
#else
+#ifdef DESKTOP_VERSION
+ dta.replace("$>--endl--<$", "\n");
+ dta.replace("||>", "]]>");
+#else
dta.replace(QRegExp("\\$>--endl--<\\$"), "\n");
@@ -706,2 +713,3 @@ QString Serializer::unescapeEntryData(QString dta)
#endif
+#endif
return dta;