2 files changed, 35 insertions, 3 deletions

diff --git a/pwmanager/pwmanager/pwmprefs.cpp b/pwmanager/pwmanager/pwmprefs.cpp
index 7fd347f..fdc34e0 100644
--- a/pwmanager/pwmanager/pwmprefs.cpp
+++ b/pwmanager/pwmanager/pwmprefs.cpp
@@ -46,4 +46,6 @@ PWMPrefs::PWMPrefs()
   addItemInt( "lockTimeout", &mLockTimeout, CONF_DEFAULT_LOCKTIMEOUT );
   addItemInt( "compression", &mCompression, CONF_DEFAULT_COMPRESSION );
+  addItemInt("cryptAlgo", &mCryptAlgo, CONF_DEFAULT_CRYPTALGO);
+  addItemInt("hashAlgo", &mHashAlgo, CONF_DEFAULT_HASHALGO);
   addItemInt( "filePermissions", &mFilePermissions, CONF_DEFAULT_FILEPERMISSIONS );
   addItemInt( "minimizeLock", &mMinimizeLock, CONF_DEFAULT_MINIMIZELOCK );
@@ -195,4 +197,14 @@ bool PWMPrefs::confWndClose()
 }
 
+int PWMPrefs::confGlobCryptAlgo()
+{
+  return mCryptAlgo + 1;
+}
+
+int PWMPrefs::confGlobHashAlgo()
+{
+  return mHashAlgo + 1;
+}
+
 /*******************************************************************
  *  functions for writing the configuration settings
@@ -299,3 +311,11 @@ void PWMPrefs::confWndClose(bool e)
 }
 
+void PWMPrefs::confGlobCryptAlgo(int e)
+{
+  mCryptAlgo = e - 1;
+}
 
+void PWMPrefs::confGlobHashAlgo(int e)
+{
+  mHashAlgo = e - 1;
+}
diff --git a/pwmanager/pwmanager/pwmprefs.h b/pwmanager/pwmanager/pwmprefs.h
index 9fed7d2..1c8b982 100644
--- a/pwmanager/pwmanager/pwmprefs.h
+++ b/pwmanager/pwmanager/pwmprefs.h
@@ -37,10 +37,14 @@ class KConfig;
 
 
+
+
 #define CONF_DEFAULT_PWTIMEOUT		10	/* 10 sec */
 #define CONF_DEFAULT_LOCKTIMEOUT	0	/* 0 == disable */
 #define CONF_DEFAULT_TRAY		true
-#define CONF_DEFAULT_UNLOCKONOPEN	false
-#define CONF_DEFAULT_MAINVIEWSTYLE	0
+#define CONF_DEFAULT_UNLOCKONOPEN      true
+#define CONF_DEFAULT_MAINVIEWSTYLE     1/* Category List Left */
 #define CONF_DEFAULT_COMPRESSION	0x01	/* gzip */
+#define CONF_DEFAULT_CRYPTALGO         (0x01 - 1)/* blowfish */
+#define CONF_DEFAULT_HASHALGO          (0x01 - 1)/* sha1 */
 #define CONF_DEFAULT_AUTOMINIMIZE	false
 #define CONF_DEFAULT_BROWSERCOMMAND	""
@@ -52,7 +56,8 @@ class KConfig;
 #define CONF_DEFAULT_KWALLETEMU		true
 #define CONF_DEFAULT_MINIMIZELOCK	2	/* deep-lock */
-#define CONF_DEFAULT_NEWENTRLOCKSTAT	true	/* locked */
+#define CONF_DEFAULT_NEWENTRLOCKSTAT   false/* new entries unlocked */
 #define CONF_DEFAULT_WNDCLOSE		true	/* don't minimize to tray */
 
+
 class PWMPrefs : public KPimPrefs
 {
@@ -72,4 +77,6 @@ public:
 	int confGlobLockTimeout();
 	int confGlobCompression();
+	int confGlobCryptAlgo();
+	int confGlobHashAlgo();
 	int confGlobFilePermissions();
 	int confGlobMinimizeLock();
@@ -97,4 +104,7 @@ public:
 	void confGlobLockTimeout(int e);
 	void confGlobCompression(int e);
+	void confGlobCryptAlgo(int e);
+	void confGlobHashAlgo(int e);
+
 	void confGlobFilePermissions(int e);
 	void confGlobMinimizeLock(int e);
@@ -121,4 +131,6 @@ public:
   int mLockTimeout;
   int mCompression;
+  int mCryptAlgo;
+  int mHashAlgo;
   int mFilePermissions;
   int mMinimizeLock;