summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-02-11 06:29:27 (UTC)
committer zautrix <zautrix>2005-02-11 06:29:27 (UTC)
commit22240f208a62931d28f6a90f6b84869a5a6caa7b (patch) (unidiff)
tree4c5bfc7a73eb58eb070499dc64e6e63731e0a44a
parent0c1191e3253542b4858261241975c159ee7910c6 (diff)
downloadkdepimpi-22240f208a62931d28f6a90f6b84869a5a6caa7b.zip
kdepimpi-22240f208a62931d28f6a90f6b84869a5a6caa7b.tar.gz
kdepimpi-22240f208a62931d28f6a90f6b84869a5a6caa7b.tar.bz2
ffiixx
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt5
-rw-r--r--pwmanager/pwmanager/pwmprefs.cpp3
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,6 +1,11 @@
1Info about the changes in new versions of KDE-Pim/Pi 1Info about the changes in new versions of KDE-Pim/Pi
2 2
3********** VERSION 2.0.7 ************
4
5Added 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
5Some bugfixes in the pi-sync mode. 10Some bugfixes in the pi-sync mode.
6Added German translation for pi-sync mode. 11Added German translation for pi-sync mode.
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
@@ -26,8 +26,9 @@
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
33PWMPrefs *PWMPrefs::sInstance = 0; 34PWMPrefs *PWMPrefs::sInstance = 0;
@@ -40,9 +41,9 @@ PWMPrefs::PWMPrefs()
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);