desktop fixes

7 files changed, 52 insertions, 32 deletions

diff --git a/pwmanager/pwmanager/main.cpp b/pwmanager/pwmanager/main.cpp
index 3f2d055..9d1d863 100644
--- a/pwmanager/pwmanager/main.cpp
+++ b/pwmanager/pwmanager/main.cpp
@@ -205,2 +205,3 @@ int main(int argc, char *argv[])
       */
+      qDebug("exec ");
       a.exec();
diff --git a/pwmanager/pwmanager/pwm.cpp b/pwmanager/pwmanager/pwm.cpp
index 26a44b1..c511661 100644
--- a/pwmanager/pwmanager/pwm.cpp
+++ b/pwmanager/pwmanager/pwm.cpp
@@ -588,6 +588,6 @@ void PwM::addPwd_slot()
 {
-  addPwd_slot(0, 0);
+  addPwd_slot1(0, 0);
 }
 
-void PwM::addPwd_slot(QString *pw, PwMDoc *_doc)
+void PwM::addPwd_slot1(QString *pw, PwMDoc *_doc)
 {
@@ -657,11 +657,11 @@ void PwM::editPwd_slot()
 {
-  editPwd_slot(0,0,0);
+  editPwd_slot3(0,0,0);
 }
 
-void PwM::editPwd_slot(const QString *category)
+void PwM::editPwd_slot1(const QString *category)
 {
-  editPwd_slot(category, 0, 0);
+  editPwd_slot3(category, 0, 0);
 }
 
-void PwM::editPwd_slot(const QString *category, const int *index,
+void PwM::editPwd_slot3(const QString *category, const int *index,
 		       PwMDoc *_doc)
diff --git a/pwmanager/pwmanager/pwm.h b/pwmanager/pwmanager/pwm.h
index fe1f7a1..116bc66 100644
--- a/pwmanager/pwmanager/pwm.h
+++ b/pwmanager/pwmanager/pwm.h
@@ -136,4 +136,5 @@ public slots:
 	//US ENH : changed code to run with older MOC
+
 	void addPwd_slot();
-	void addPwd_slot(QString *pw, PwMDoc *_doc);
+	void addPwd_slot1(QString *pw, PwMDoc *_doc);
 	/** manage/edit triggered */
@@ -141,5 +142,6 @@ public slots:
 	void editPwd_slot();
-	void editPwd_slot(const QString *category);
-	void editPwd_slot(const QString *category = 0, const int *index = 0,
+	void editPwd_slot1(const QString *category);
+	void editPwd_slot3(const QString *category = 0, const int *index = 0,
 			  PwMDoc *_doc = 0);
+
 	/** manage/delete triggered */
diff --git a/pwmanager/pwmanager/pwmanager.pro b/pwmanager/pwmanager/pwmanager.pro
index 34f7403..7f39c76 100644
--- a/pwmanager/pwmanager/pwmanager.pro
+++ b/pwmanager/pwmanager/pwmanager.pro
@@ -2,10 +2,7 @@ TEMPLATE	= app
 CONFIG		+= qt warn_on
-
-
+DESTDIR= ../../bin
 TARGET		= pwmpi
-OBJECTS_DIR = obj/$(PLATFORM)
-MOC_DIR = moc/$(PLATFORM)
-DESTDIR=$(QPEDIR)/bin
+include( ../../variables.pri )
 
-INCLUDEPATH += . ../../ ../../qtcompat ../../qtcompat/xml ../../libkdepim ../../microkde ../../microkde/kdecore ../../microkde/kdeui ../../microkde/kutils $(QPEDIR)/include
+INCLUDEPATH += . ../../  ../../libkdepim ../../microkde ../../microkde/kdecore ../../microkde/kdeui ../../microkde/kutils 
 DEFINES += PWM_EMBEDDED CONFIG_PWMANAGER_GCRY DESKTOP_VERSION
@@ -14,13 +11,7 @@ DEFINES += PWM_EMBEDDED CONFIG_PWMANAGER_GCRY DESKTOP_VERSION
 #DEFINES += CONFIG_DEBUG
-LIBS += -L../libcrypt/$(PLATFORM)
+LIBS += -L../libcrypt/
+LIBS += -L../../bin/
 LIBS += -lmicrokde
-LIBS += -lmicroqtcompat
 LIBS += -lmicrokdepim
-LIBS += -L$(QPEDIR)/lib
-LIBS += -lqpe
 LIBS += -lzlib
-#LIBS += -lbz2
-#LIBS += -lkpmicrogcrypt
-LIBS += -ljpeg
-LIBS += $(QTOPIALIB)
 LIBS += -lkpmicrocipher
@@ -30,2 +21,16 @@ LIBS += -lstdc++
 
+unix:{
+OBJECTS_DIR = obj/unix
+MOC_DIR = moc/unix
+
+}
+win32:{
+
+DEFINES += _WIN32_
+OBJECTS_DIR = obj/win
+MOC_DIR = moc/win
+QMAKE_LINK += /NODEFAULTLIB:LIBC
+
+}
+
 #INTERFACES = \
diff --git a/pwmanager/pwmanager/pwmdoc.cpp b/pwmanager/pwmanager/pwmdoc.cpp
index e29e3d1..8869f3a 100644
--- a/pwmanager/pwmanager/pwmdoc.cpp
+++ b/pwmanager/pwmanager/pwmdoc.cpp
@@ -2331,4 +2331,4 @@ PwMerror PwMDoc::exportToText(const QString *file)
 
-	header += KGlobal::locale()->formatDate(currDate, true, KLocale::Userdefined);
-	header += KGlobal::locale()->formatTime(currTime, true);
+	header += KGlobal::locale()->formatDate(currDate, true, KLocale::Userdefined).latin1();
+	header += KGlobal::locale()->formatTime(currTime, true).latin1();
 	KGlobal::locale()->setDateFormatShort(dfs);
@@ -3020,3 +3020,3 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s
       PwMSyncItem newSyncItemLocal;
-      newSyncItemLocal.syncName = mCurrentSyncDevice;
+      newSyncItemLocal.syncName = mCurrentSyncDevice.latin1();
       newSyncItemLocal.lastSyncDate = mLastSync;
@@ -3040,3 +3040,3 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s
       PwMSyncItem newSyncItemRemote;
-      newSyncItemRemote.syncName = mCurrentSyncName;
+      newSyncItemRemote.syncName = mCurrentSyncName.latin1();
       newSyncItemRemote.lastSyncDate = mLastSync;
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
@@ -21,2 +21,3 @@
 #include "randomizer.h"
+#include <qdir.h>
 
@@ -130,2 +131,3 @@ void PwMInit::initializeApp()
 {
+    qDebug("PwMInit::initializeApp() ");
 	PWM_ASSERT(runStatus == unknown);
@@ -142,3 +144,3 @@ void PwMInit::initializeApp()
 	handleCmdLineArgs();
-
+    qDebug("handle ");
 	bool openDeeplocked = false;
@@ -147,5 +149,8 @@ void PwMInit::initializeApp()
 		openDeeplocked = true;
-	if (conf()->confWndAutoMinimizeOnStart() ||
-	    savedCmd.minToTray) {
+    if ( false ){
+    // LR is not working
+	//if (conf()->confWndAutoMinimizeOnStart() ||
+    //   savedCmd.minToTray) {
 		PwMDoc *newDoc = createDoc();
+        qDebug("  createDoc()");
 		if (!newDoc->openDocUi(newDoc,
@@ -154,2 +159,3 @@ void PwMInit::initializeApp()
 			delete newDoc;
+        }
 
@@ -165,3 +171,3 @@ void PwMInit::initializeApp()
 
-		}
+            //	}
 	} else {
@@ -288,2 +294,3 @@ PwM * PwMInit::createMainWnd(const QString &loadFile,
 {
+    qDebug("PwMInit::createMainWnd ");
 	PwM *newWnd;
@@ -319,2 +326,3 @@ PwM * PwMInit::createMainWnd(const QString &loadFile,
        newWnd->show();
+       qDebug("show ");
 #endif //DESKTOP_VERSION
diff --git a/pwmanager/pwmanager/serializer.cpp b/pwmanager/pwmanager/serializer.cpp
index 2d6498e..ed0f754 100644
--- a/pwmanager/pwmanager/serializer.cpp
+++ b/pwmanager/pwmanager/serializer.cpp
@@ -172,3 +172,7 @@ bool Serializer::parseXml(const QCString &buffer)
 #else
+#ifdef DESKTOP_VERSION
+	if (!domDoc->setContent(buffer, true))
+#else
 	if (!domDoc->setContent(buffer))
+#endif
 		return false;
@@ -734,3 +738,3 @@ bool Serializer::readSyncData(const QDomNode &n, vector<PwMSyncItem> *dta)
 
-			curSync.syncName = devicename;
+			curSync.syncName = devicename.latin1();
 #ifndef PWM_EMBEDDED