9 files changed, 107 insertions, 31 deletions

diff --git a/pwmanager/pwmanager/pwmdoc.cpp b/pwmanager/pwmanager/pwmdoc.cpp
index 9fe4809..c167c2c 100644
--- a/pwmanager/pwmanager/pwmdoc.cpp
+++ b/pwmanager/pwmanager/pwmdoc.cpp
@@ -44,11 +44,13 @@
 #include <qfileinfo.h>
 #include <qfile.h>
 
+#define __USE_GNU
+#define _GNU_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
-#include <iostream>
+//US#include <iostream>
 #include <algorithm>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -1154,7 +1156,9 @@ bool PwMDoc::serializeDta(string *d)
 bool PwMDoc::deSerializeDta(const string *d, bool entriesLocked)
 {
         PWM_ASSERT(d);
+#ifndef PWM_EMBEDDED
         try {
+
                 Serializer ser(d->c_str());
                 ser.setDefaultLockStat(entriesLocked);
                 if (!ser.deSerialize(&dta))
@@ -1162,6 +1166,15 @@ bool PwMDoc::deSerializeDta(const string *d, bool entriesLocked)
         } catch (PwMException) {
                 return false;
         }
+#else
+        Serializer ser(d->c_str());
+        ser.setDefaultLockStat(entriesLocked);
+        if (!ser.deSerialize(&dta))
+          return false;
+        else
+          return false;
+#endif
+
         emitDataChanged(this);
         return true;
 }
diff --git a/pwmanager/pwmanager/pwmprefs.cpp b/pwmanager/pwmanager/pwmprefs.cpp
index 5779ecc..d3847f6 100644
--- a/pwmanager/pwmanager/pwmprefs.cpp
+++ b/pwmanager/pwmanager/pwmprefs.cpp
@@ -61,6 +61,7 @@ PWMPrefs::PWMPrefs()
   addItemInt( "MainViewStyle", &mMainViewStyle, CONF_DEFAULT_MAINVIEWSTYLE );
   addItemBool( "autoMinimizeOnStart", &mAutoMinimizeOnStart, CONF_DEFAULT_AUTOMINIMIZE );
   addItemBool( "close", &mClose, CONF_DEFAULT_WNDCLOSE );
+  addItemIntList( "CommentSplitter", &mCommentSplitter );
 }
 
 PWMPrefs::~PWMPrefs()
diff --git a/pwmanager/pwmanager/pwmprefs.h b/pwmanager/pwmanager/pwmprefs.h
index bf7d8b1..6a89d10 100644
--- a/pwmanager/pwmanager/pwmprefs.h
+++ b/pwmanager/pwmanager/pwmprefs.h
@@ -134,6 +134,10 @@ public:
   bool mAutoMinimizeOnStart;
   bool mClose;
 
+  //US ENH
+  QValueList<int> mCommentSplitter;
+
+
     // US introduce a nonconst way to return the config object.
     KConfig* getConfig();
 
diff --git a/pwmanager/pwmanager/pwmviewstyle.cpp b/pwmanager/pwmanager/pwmviewstyle.cpp
index 51d8f6c..9704615 100644
--- a/pwmanager/pwmanager/pwmviewstyle.cpp
+++ b/pwmanager/pwmanager/pwmviewstyle.cpp
@@ -41,9 +41,21 @@ PwMViewStyle::PwMViewStyle(QWidget *parent, const char *name)
 
 PwMViewStyle::~PwMViewStyle()
 {
-        //US ENH : load and store the size of the listviewcolumns
-        lv->saveLayout(conf()->getConfig(), "listview");
-        conf()->getConfig()->sync();
+        //US ENH : store the size of the listviewcolumns
+        switch (curStyle)
+          {
+          case style_0:
+            s0->saveSettings(PWMPrefs::instance());
+            break;
+          case style_1:
+            s1->saveSettings(PWMPrefs::instance());
+            break;
+          default:
+                BUG();
+          }
+
+
+        PWMPrefs::instance()->getConfig()->sync();
 
         delete_ifnot_null(s0);
         delete_ifnot_null(s1);
@@ -88,8 +100,18 @@ void PwMViewStyle::initStyle(style_t style)
         lv->addColumn(i18n("Launcher"), 120);
         v->tmpReEnableSort();
 
-        //US ENH : load and store the size of the listviewcolumns
-        lv->restoreLayout(conf()->getConfig(), "listview");
+        //US ENH : load the size of the listviewcolumns
+        switch (style)
+          {
+          case style_0:
+            s0->restoreSettings(PWMPrefs::instance());
+            break;
+          case style_1:
+            s1->restoreSettings(PWMPrefs::instance());
+            break;
+          default:
+                BUG();
+          }
 
         resizeView(v->size());
         v->updateView();
diff --git a/pwmanager/pwmanager/pwmviewstyle_0.cpp b/pwmanager/pwmanager/pwmviewstyle_0.cpp
index 6d46ac6..7262684 100644
--- a/pwmanager/pwmanager/pwmviewstyle_0.cpp
+++ b/pwmanager/pwmanager/pwmviewstyle_0.cpp
@@ -23,7 +23,7 @@
 #include "commentbox.h"
 
 #include <klocale.h>
-
+#include "pwmprefs.h"
 
 PwMViewStyle_0::PwMViewStyle_0(PwMView *view)
  : QObject()
@@ -91,3 +91,22 @@ void PwMViewStyle_0::selectCategory(const QString &cat)
         // fall back to 0
         categoriesCombo->setCurrentItem(0);
 }
+
+
+//US ENH: I need a place to load the view dependend settings. Eg. splittersize
+void PwMViewStyle_0::restoreSettings(PWMPrefs* prefs)
+{
+  //load and store the size of the listviewcolumns
+  lv->restoreLayout(prefs->getConfig(), "listview");
+  splitter1->setSizes( prefs->mCommentSplitter );
+
+}
+
+//US ENH: I need a place to load the view dependend settings. Eg. splittersize
+void PwMViewStyle_0::saveSettings(PWMPrefs* prefs)
+{
+  //store the size of the listviewcolumns
+  lv->saveLayout(prefs->getConfig(), "listview");
+  prefs->mCommentSplitter = splitter1->sizes();
+
+}
diff --git a/pwmanager/pwmanager/pwmviewstyle_0.h b/pwmanager/pwmanager/pwmviewstyle_0.h
index cc564c3..bd93c06 100644
--- a/pwmanager/pwmanager/pwmviewstyle_0.h
+++ b/pwmanager/pwmanager/pwmviewstyle_0.h
@@ -36,6 +36,7 @@
 class PwMView;
 class ListViewPwM;
 class CommentBox;
+class PWMPrefs;
 
 class PwMViewStyle_0 : public QObject
 {
@@ -71,6 +72,11 @@ public:
         void resize(const QSize &size)
                         { vbox1->resize(size); }
 
+        //US ENH: I need a place to load the view dependend settings. Eg. splittersize
+        void restoreSettings(PWMPrefs* prefs);
+        void saveSettings(PWMPrefs* prefs);
+
+
 protected:
         /** main list view */
         ListViewPwM *lv;
diff --git a/pwmanager/pwmanager/pwmviewstyle_1.cpp b/pwmanager/pwmanager/pwmviewstyle_1.cpp
index 4c24bc4..8b2d6d3 100644
--- a/pwmanager/pwmanager/pwmviewstyle_1.cpp
+++ b/pwmanager/pwmanager/pwmviewstyle_1.cpp
@@ -23,6 +23,7 @@
 #include "commentbox.h"
 
 #include <klocale.h>
+#include "pwmprefs.h"
 
         #define INITIAL_CATEGORIES_WIDTH100
 
@@ -125,6 +126,25 @@ void PwMViewStyle_1::selectCategory(const QString &cat)
         categoriesList->setCurrentItem(0);
 }
 
+//US ENH: I need a place to load the view dependend settings. Eg. splittersize
+void PwMViewStyle_1::restoreSettings(PWMPrefs* prefs)
+{
+  //load and store the size of the listviewcolumns
+  lv->restoreLayout(prefs->getConfig(), "listview");
+  splitter2->setSizes( prefs->mCommentSplitter );
+
+}
+
+//US ENH: I need a place to load the view dependend settings. Eg. splittersize
+void PwMViewStyle_1::saveSettings(PWMPrefs* prefs)
+{
+  //store the size of the listviewcolumns
+  lv->saveLayout(prefs->getConfig(), "listview");
+  prefs->mCommentSplitter = splitter2->sizes();
+
+}
+
+
 #ifndef PWM_EMBEDDED
 #include "pwmviewstyle_1.moc"
 #endif
diff --git a/pwmanager/pwmanager/pwmviewstyle_1.h b/pwmanager/pwmanager/pwmviewstyle_1.h
index a50f587..a7f100c 100644
--- a/pwmanager/pwmanager/pwmviewstyle_1.h
+++ b/pwmanager/pwmanager/pwmviewstyle_1.h
@@ -37,6 +37,7 @@
 class PwMView;
 class ListViewPwM;
 class CommentBox;
+class PWMPrefs;
 
 class PwMViewStyle_1 : public QObject
 {
@@ -73,6 +74,10 @@ public:
         void resize(const QSize &size)
                         { splitter->resize(size); }
 
+        //US ENH: I need a place to load the view dependend settings. Eg. splittersize
+        void restoreSettings(PWMPrefs* prefs);
+        void saveSettings(PWMPrefs* prefs);
+
 protected slots:
         /** user clicked right button in category list */
         void catRightClick(QListBoxItem *item, const QPoint &point);
diff --git a/pwmanager/pwmanager/serializer.cpp b/pwmanager/pwmanager/serializer.cpp
index 9377e3d..a54ba8a 100644
--- a/pwmanager/pwmanager/serializer.cpp
+++ b/pwmanager/pwmanager/serializer.cpp
@@ -404,36 +404,17 @@ bool Serializer::extractMeta(const QDomNode &n,
                 }
 #else
 
-                QDateTime m_dt;
-
-                if ((name == META_CREATE_DATE) ||
-                    (name == META_VALID_DATE)  ||
-                    (name == META_EXPIRE_DATE) ||
-                    (name == META_UPDATE_DATE)) 
-                  {
-                    int pos = val.find("T");
-                    QString date = val.left(pos);
-                    QString time = val.mid(pos+1);
-                    qDebug("Serializer::extractMeta from %s to date=%s ,time=%s",val.latin1(), date.latin1(), time.latin1()  );
-                    bool ok1, ok2;
-
-                    QDate m_date = KGlobal::locale()->readDate(date, &ok1);
-                    QTime m_time = KGlobal::locale()->readTime(time, &ok2);
-                    if ((ok1 == false) || (ok2 == false))
-                      qDebug("Serializer::extractMeta invalid date or time !!!!!!!!!!!!!");
-                    m_dt.setDate(m_date);
-                    m_dt.setTime(m_time);
-                  }
 
+                bool ok = true;
 
                 if (name == META_CREATE_DATE) {
-                        dta->create = m_dt;
+                        dta->create = KGlobal::locale()->readDateTime(val, KLocale::ISODate, &ok);
                 } else if (name == META_VALID_DATE) {
-                        dta->valid = m_dt;
+                        dta->valid = KGlobal::locale()->readDateTime(val, KLocale::ISODate, &ok);
                 } else if (name == META_EXPIRE_DATE) {
-                  dta->expire = m_dt;
+                  dta->expire = KGlobal::locale()->readDateTime(val, KLocale::ISODate, &ok);
                 } else if (name == META_UPDATE_DATE) {
-                  dta->update = m_dt;
+                  dta->update = KGlobal::locale()->readDateTime(val, KLocale::ISODate, &ok);
                 } else if (name == META_UPDATE_INT) {
                         dta->updateInt = strtoul(val.latin1(), 0, 10);
                 } else if (name == META_UNIQUEID) {
@@ -442,6 +423,11 @@ bool Serializer::extractMeta(const QDomNode &n,
                         printDebug(string("extractMeta(): invalid: ")
                                    + name.latin1());
                 }
+
+                if (ok == false)
+                  qDebug("Serializer::extractMeta invalid date or time !!!!!!!!!!!!!");
+
+
 #endif
                 cur = cur.nextSibling();
         }