-rw-r--r-- | bin/kdepim/WhatsNew.txt | 5 | ||||
-rw-r--r-- | pwmanager/pwmanager/pwmprefs.cpp | 3 |
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 @@ | |||
1 | Info about the changes in new versions of KDE-Pim/Pi | 1 | Info about the changes in new versions of KDE-Pim/Pi |
2 | 2 | ||
3 | ********** VERSION 2.0.7 ************ | ||
4 | |||
5 | Added global application font settings | ||
6 | (for all KDE-Pim/Pi apps) to the general settings. | ||
7 | |||
3 | ********** VERSION 2.0.6 ************ | 8 | ********** VERSION 2.0.6 ************ |
4 | 9 | ||
5 | Some bugfixes in the pi-sync mode. | 10 | Some bugfixes in the pi-sync mode. |
6 | Added German translation for pi-sync mode. | 11 | Added German translation for pi-sync mode. |
7 | 12 | ||
8 | KO/Pi: | 13 | 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 @@ | |||
24 | */ | 24 | */ |
25 | 25 | ||
26 | 26 | ||
27 | #include <kconfig.h> | 27 | #include <kconfig.h> |
28 | #include <klocale.h> | 28 | #include <klocale.h> |
29 | #include <kstaticdeleter.h> | 29 | #include <kstaticdeleter.h> |
30 | #include <kglobalsettings.h> | ||
30 | 31 | ||
31 | #include "pwmprefs.h" | 32 | #include "pwmprefs.h" |
32 | 33 | ||
33 | PWMPrefs *PWMPrefs::sInstance = 0; | 34 | PWMPrefs *PWMPrefs::sInstance = 0; |
34 | static KStaticDeleter<PWMPrefs> staticDeleterPP; | 35 | static KStaticDeleter<PWMPrefs> staticDeleterPP; |
35 | 36 | ||
@@ -38,13 +39,13 @@ PWMPrefs::PWMPrefs() | |||
38 | { | 39 | { |
39 | KPrefs::setCurrentGroup( "Global" ); | 40 | KPrefs::setCurrentGroup( "Global" ); |
40 | 41 | ||
41 | addItemString( "autoStart", &mAutoStart, "" ); | 42 | addItemString( "autoStart", &mAutoStart, "" ); |
42 | addItemString( "browserCommand", &mBrowserCommand, "" ); | 43 | addItemString( "browserCommand", &mBrowserCommand, "" ); |
43 | addItemString( "xtermCommand", &mXTermCommand, CONF_DEFAULT_XTERMCOMMAND); | 44 | addItemString( "xtermCommand", &mXTermCommand, CONF_DEFAULT_XTERMCOMMAND); |
44 | addItemFont( "entryFont", &mEntryFont); | 45 | addItemFont( "entryFont", &mEntryFont,KGlobalSettings::generalFont()); |
45 | addItemInt( "pwTimeout", &mPwTimeout, CONF_DEFAULT_PWTIMEOUT ); | 46 | addItemInt( "pwTimeout", &mPwTimeout, CONF_DEFAULT_PWTIMEOUT ); |
46 | addItemInt( "lockTimeout", &mLockTimeout, CONF_DEFAULT_LOCKTIMEOUT ); | 47 | addItemInt( "lockTimeout", &mLockTimeout, CONF_DEFAULT_LOCKTIMEOUT ); |
47 | addItemInt( "compression", &mCompression, CONF_DEFAULT_COMPRESSION ); | 48 | addItemInt( "compression", &mCompression, CONF_DEFAULT_COMPRESSION ); |
48 | addItemInt("cryptAlgo", &mCryptAlgo, CONF_DEFAULT_CRYPTALGO); | 49 | addItemInt("cryptAlgo", &mCryptAlgo, CONF_DEFAULT_CRYPTALGO); |
49 | addItemInt("hashAlgo", &mHashAlgo, CONF_DEFAULT_HASHALGO); | 50 | addItemInt("hashAlgo", &mHashAlgo, CONF_DEFAULT_HASHALGO); |
50 | addItemInt( "filePermissions", &mFilePermissions, CONF_DEFAULT_FILEPERMISSIONS ); | 51 | addItemInt( "filePermissions", &mFilePermissions, CONF_DEFAULT_FILEPERMISSIONS ); |