summaryrefslogtreecommitdiffabout
Unidiff
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,98 +1,103 @@
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.
7 12
8KO/Pi: 13KO/Pi:
9Made the todolist using alternate background. 14Made the todolist using alternate background.
10 15
11Other minor fixes in KO/Pi. 16Other minor fixes in KO/Pi.
12 17
13 18
14********** VERSION 2.0.5 ************ 19********** VERSION 2.0.5 ************
15 20
16Bugfixes in KO/Pi. 21Bugfixes in KO/Pi.
17 22
18********** VERSION 2.0.4 ************ 23********** VERSION 2.0.4 ************
19 24
20KO/Pi: 25KO/Pi:
21Fixed problem loading translations for summary/location edit boxes in event/todo editor. 26Fixed problem loading translations for summary/location edit boxes in event/todo editor.
22 27
23Added a general "select week number" to the toolbar. 28Added a general "select week number" to the toolbar.
24 29
25Fixed some small problem of the new features introduced in version 2.0.3. 30Fixed some small problem of the new features introduced in version 2.0.3.
26 31
27Made it possible to specify one specific category as category color, 32Made it possible to specify one specific category as category color,
28if more than one categories are selected. 33if more than one categories are selected.
29 34
30Fixed a bug in saving colors for categories with non-ascii characters. 35Fixed a bug in saving colors for categories with non-ascii characters.
31(Like, e.g. German Umlauts). 36(Like, e.g. German Umlauts).
32Propably you have to set your colors again for those categories. 37Propably you have to set your colors again for those categories.
33 38
34 39
35********** VERSION 2.0.3 ************ 40********** VERSION 2.0.3 ************
36 41
37KO/Pi: 42KO/Pi:
38Added feature for changing alarm settings for many items at once: 43Added feature for changing alarm settings for many items at once:
39Open list view (or search dialog), select the desired items and choose in 44Open list view (or search dialog), select the desired items and choose in
40the popup menu: Set alarm for selected... 45the popup menu: Set alarm for selected...
41 46
42Added to the event/todo viewer the option to send an email to 47Added to the event/todo viewer the option to send an email to
43all attendees or all selected (with RSVP) attendees. 48all attendees or all selected (with RSVP) attendees.
44 49
45Made the week-month mode changing in month view faster. 50Made the week-month mode changing in month view faster.
46 51
47Made month view better useable with keyboard. 52Made month view better useable with keyboard.
48Now TAB key jumps to next cell with an event/todo. 53Now TAB key jumps to next cell with an event/todo.
49Scroll in cell with coursor keys, scroll in time (next week) with 54Scroll in cell with coursor keys, scroll in time (next week) with
50Shift/Control + coursorkeys. 55Shift/Control + coursorkeys.
51 56
52Fixed bug that the todo view flat mode was reset after first view update. 57Fixed bug that the todo view flat mode was reset after first view update.
53 58
54If a todo is displayed closed in the todo view, 59If a todo is displayed closed in the todo view,
55it is now displayed in overdue/due today color depending on the subtodos overdue/due today properties. 60it is now displayed in overdue/due today color depending on the subtodos overdue/due today properties.
56 61
57Added info about the numbers of years to the caption (title) information about a birthday event. 62Added info about the numbers of years to the caption (title) information about a birthday event.
58 63
59Made completion date in todo editor editable. 64Made completion date in todo editor editable.
60 65
61Added possibility to save/load templates for journals. 66Added possibility to save/load templates for journals.
62(Which is just a simple "save text to file" or "insert text from file". 67(Which is just a simple "save text to file" or "insert text from file".
63 68
64********** VERSION 2.0.2 ************ 69********** VERSION 2.0.2 ************
65 70
66KO/Pi: 71KO/Pi:
67Fixed the layout problem of the day label buttons 72Fixed the layout problem of the day label buttons
68of the agenda view introduced in version 2.0.1. 73of the agenda view introduced in version 2.0.1.
69 74
70Added WhatsThis support for the todo view and the list view. 75Added WhatsThis support for the todo view and the list view.
71 76
72Added a quite useful feature to the montview. 77Added a quite useful feature to the montview.
73Just click on the week numbers on the left. 78Just click on the week numbers on the left.
74And in the top right corner of month view/agenda view 79And in the top right corner of month view/agenda view
75there is now a "week number quick selector". 80there is now a "week number quick selector".
76(Click on the black triangle). 81(Click on the black triangle).
77 82
78Made the quite difficult timezone change in KO/Pi easy. 83Made the quite difficult timezone change in KO/Pi easy.
79 84
80OM/Pi: 85OM/Pi:
81Fixed too small icons on desktop. 86Fixed too small icons on desktop.
82Fixed non visible icons in mainwindow on Z with fastload enabled. 87Fixed non visible icons in mainwindow on Z with fastload enabled.
83Added signature file setting to smtp account config. 88Added signature file setting to smtp account config.
84And the signature can be edited and saved in the edit mail dialog. 89And the signature can be edited and saved in the edit mail dialog.
85That does mean: 90That does mean:
86Simply edit the signature for the selected smtp account in the 91Simply edit the signature for the selected smtp account in the
87edit new mail dialog and press the "save signature" button there. 92edit new mail dialog and press the "save signature" button there.
88Then the signature is saved to the file specified in the smtp account settings. 93Then the signature is saved to the file specified in the smtp account settings.
89If there is no file specified, it is saved automatically to the file 94If there is no file specified, it is saved automatically to the file
90kdepim/apps/kopiemail/<accountname>.sig. 95kdepim/apps/kopiemail/<accountname>.sig.
91 96
92 97
93 98
94********** VERSION 2.0.1 ************ 99********** VERSION 2.0.1 ************
95 100
96Oooops ... I forgot to test on the Zaurus 5500 ... 101Oooops ... I forgot to test on the Zaurus 5500 ...
97 102
98Fixed many problems of new (english) strings (and german translations) 103Fixed many problems of new (english) strings (and german translations)
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
@@ -1,140 +1,141 @@
1/* 1/*
2 This file is part of PwManager/Pi 2 This file is part of PwManager/Pi
3 Copyright (c) 2004 Ulf Schenk 3 Copyright (c) 2004 Ulf Schenk
4 4
5 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or 7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 8 (at your option) any later version.
9 9
10 This program is distributed in the hope that it will be useful, 10 This program is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details. 13 GNU General Public License for more details.
14 14
15 You should have received a copy of the GNU General Public License 15 You should have received a copy of the GNU General Public License
16 along with this program; if not, write to the Free Software 16 along with this program; if not, write to the Free Software
17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
18 18
19 As a special exception, permission is given to link this program 19 As a special exception, permission is given to link this program
20 with any edition of Qt, and distribute the resulting executable, 20 with any edition of Qt, and distribute the resulting executable,
21 without including the source code for Qt in the source distribution. 21 without including the source code for Qt in the source distribution.
22 22
23 $Id$ 23 $Id$
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
33PWMPrefs *PWMPrefs::sInstance = 0; 34PWMPrefs *PWMPrefs::sInstance = 0;
34static KStaticDeleter<PWMPrefs> staticDeleterPP; 35static KStaticDeleter<PWMPrefs> staticDeleterPP;
35 36
36PWMPrefs::PWMPrefs() 37PWMPrefs::PWMPrefs()
37 : KPimPrefs("pwmanagerrc") 38 : KPimPrefs("pwmanagerrc")
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 );
51 addItemInt( "minimizeLock", &mMinimizeLock, CONF_DEFAULT_MINIMIZELOCK ); 52 addItemInt( "minimizeLock", &mMinimizeLock, CONF_DEFAULT_MINIMIZELOCK );
52 addItemBool( "unlockOnOpen", &mUnlockOnOpen, CONF_DEFAULT_UNLOCKONOPEN ); 53 addItemBool( "unlockOnOpen", &mUnlockOnOpen, CONF_DEFAULT_UNLOCKONOPEN );
53 addItemBool( "tray", &mTray, CONF_DEFAULT_TRAY ); 54 addItemBool( "tray", &mTray, CONF_DEFAULT_TRAY );
54 addItemBool( "makeFileBackup", &mMakeFileBackup, CONF_DEFAULT_MAKEFILEBACKUP ); 55 addItemBool( "makeFileBackup", &mMakeFileBackup, CONF_DEFAULT_MAKEFILEBACKUP );
55 addItemBool( "autostartDeepLocked", &mAutostartDeeplocked, CONF_DEFAULT_AUTOSTART_DEEPL ); 56 addItemBool( "autostartDeepLocked", &mAutostartDeeplocked, CONF_DEFAULT_AUTOSTART_DEEPL );
56 addItemBool( "autoDeepLock", &mAutoDeeplock, CONF_DEFAULT_AUTODEEPLOCK ); 57 addItemBool( "autoDeepLock", &mAutoDeeplock, CONF_DEFAULT_AUTODEEPLOCK );
57 addItemBool( "kwalletEmu", &mKWalletEmu, CONF_DEFAULT_KWALLETEMU ); 58 addItemBool( "kwalletEmu", &mKWalletEmu, CONF_DEFAULT_KWALLETEMU );
58 addItemBool( "newEntrLockStat", &mNewEntrLockStat, CONF_DEFAULT_NEWENTRLOCKSTAT ); 59 addItemBool( "newEntrLockStat", &mNewEntrLockStat, CONF_DEFAULT_NEWENTRLOCKSTAT );
59 60
60 KPrefs::setCurrentGroup( "Wnd" ); 61 KPrefs::setCurrentGroup( "Wnd" );
61 62
62 addItemSize( "MainWndSize", &mMainWndSize); 63 addItemSize( "MainWndSize", &mMainWndSize);
63 addItemInt( "MainViewStyle", &mMainViewStyle, CONF_DEFAULT_MAINVIEWSTYLE ); 64 addItemInt( "MainViewStyle", &mMainViewStyle, CONF_DEFAULT_MAINVIEWSTYLE );
64 addItemBool( "autoMinimizeOnStart", &mAutoMinimizeOnStart, CONF_DEFAULT_AUTOMINIMIZE ); 65 addItemBool( "autoMinimizeOnStart", &mAutoMinimizeOnStart, CONF_DEFAULT_AUTOMINIMIZE );
65 addItemBool( "close", &mClose, CONF_DEFAULT_WNDCLOSE ); 66 addItemBool( "close", &mClose, CONF_DEFAULT_WNDCLOSE );
66 addItemIntList( "commentSplitter", &mCommentSplitter ); 67 addItemIntList( "commentSplitter", &mCommentSplitter );
67 addItemIntList( "categorySplitter", &mCategorySplitter ); 68 addItemIntList( "categorySplitter", &mCategorySplitter );
68} 69}
69 70
70PWMPrefs::~PWMPrefs() 71PWMPrefs::~PWMPrefs()
71{ 72{
72 if (sInstance == this) 73 if (sInstance == this)
73 sInstance = staticDeleterPP.setObject(0); 74 sInstance = staticDeleterPP.setObject(0);
74 else 75 else
75 qDebug("Whats this? Error in PWMPrefs::~PWMPrefs()?"); 76 qDebug("Whats this? Error in PWMPrefs::~PWMPrefs()?");
76} 77}
77 78
78PWMPrefs *PWMPrefs::instance() 79PWMPrefs *PWMPrefs::instance()
79{ 80{
80 if ( !sInstance ) { 81 if ( !sInstance ) {
81#ifdef PWM_EMBEDDED 82#ifdef PWM_EMBEDDED
82 sInstance = staticDeleterPP.setObject( new PWMPrefs() ); 83 sInstance = staticDeleterPP.setObject( new PWMPrefs() );
83#else //PWM_EMBEDDED 84#else //PWM_EMBEDDED
84 //US the following line has changed ???. Why 85 //US the following line has changed ???. Why
85 staticDeleterPP.setObject( sInstance, new PWMPrefs() ); 86 staticDeleterPP.setObject( sInstance, new PWMPrefs() );
86#endif //KAB_EMBEDDED 87#endif //KAB_EMBEDDED
87 sInstance->readConfig(); 88 sInstance->readConfig();
88 } 89 }
89 90
90 return sInstance; 91 return sInstance;
91} 92}
92 93
93 // US introduce a nonconst way to return the config object. 94 // US introduce a nonconst way to return the config object.
94KConfig* PWMPrefs::getConfig() 95KConfig* PWMPrefs::getConfig()
95{ 96{
96 return config(); 97 return config();
97} 98}
98 99
99/******************************************************************* 100/*******************************************************************
100 * functions for reading the configuration settings 101 * functions for reading the configuration settings
101 *******************************************************************/ 102 *******************************************************************/
102 103
103QString PWMPrefs::confGlobAutoStart() 104QString PWMPrefs::confGlobAutoStart()
104{ 105{
105 return mAutoStart; 106 return mAutoStart;
106} 107}
107 108
108QString PWMPrefs::confGlobBrowserCommand() 109QString PWMPrefs::confGlobBrowserCommand()
109{ 110{
110 return mBrowserCommand; 111 return mBrowserCommand;
111} 112}
112 113
113QString PWMPrefs::confGlobXtermCommand() 114QString PWMPrefs::confGlobXtermCommand()
114{ 115{
115 return mXTermCommand; 116 return mXTermCommand;
116} 117}
117 118
118QFont PWMPrefs::confGlobEntryFont() 119QFont PWMPrefs::confGlobEntryFont()
119{ 120{
120 return mEntryFont; 121 return mEntryFont;
121} 122}
122 123
123int PWMPrefs::confGlobPwTimeout() 124int PWMPrefs::confGlobPwTimeout()
124{ 125{
125 return mPwTimeout; 126 return mPwTimeout;
126} 127}
127 128
128int PWMPrefs::confGlobLockTimeout() 129int PWMPrefs::confGlobLockTimeout()
129{ 130{
130 return mLockTimeout; 131 return mLockTimeout;
131} 132}
132 133
133int PWMPrefs::confGlobCompression() 134int PWMPrefs::confGlobCompression()
134{ 135{
135 return mCompression; 136 return mCompression;
136} 137}
137 138
138int PWMPrefs::confGlobFilePermissions() 139int PWMPrefs::confGlobFilePermissions()
139{ 140{
140 return mFilePermissions; 141 return mFilePermissions;