2 files changed, 7 insertions, 1 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 81b0d59..77f5829 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,8 +1,13 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
+********** VERSION 2.0.7 ************
+
+Added global application font settings 
+(for all KDE-Pim/Pi apps) to the general settings.
+
 ********** VERSION 2.0.6 ************
 
 Some bugfixes in the pi-sync mode.
 Added German translation for pi-sync mode.
 
 KO/Pi:
diff --git a/pwmanager/pwmanager/pwmprefs.cpp b/pwmanager/pwmanager/pwmprefs.cpp
index 68d5b68..31fb2e0 100644
--- a/pwmanager/pwmanager/pwmprefs.cpp
+++ b/pwmanager/pwmanager/pwmprefs.cpp
@@ -24,12 +24,13 @@
 */
 
 
 #include <kconfig.h>
 #include <klocale.h>
 #include <kstaticdeleter.h>
+#include <kglobalsettings.h>
 
 #include "pwmprefs.h"
 
 PWMPrefs *PWMPrefs::sInstance = 0;
 static KStaticDeleter<PWMPrefs> staticDeleterPP;
 
@@ -38,13 +39,13 @@ PWMPrefs::PWMPrefs()
 {
   KPrefs::setCurrentGroup( "Global" );
 
   addItemString( "autoStart", &mAutoStart, "" );
   addItemString( "browserCommand", &mBrowserCommand, "" );
   addItemString( "xtermCommand", &mXTermCommand, CONF_DEFAULT_XTERMCOMMAND);
-  addItemFont( "entryFont", &mEntryFont);
+  addItemFont( "entryFont", &mEntryFont,KGlobalSettings::generalFont());
   addItemInt( "pwTimeout", &mPwTimeout, CONF_DEFAULT_PWTIMEOUT );
   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 );