summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-09-22 04:05:36 (UTC)
committer zautrix <zautrix>2004-09-22 04:05:36 (UTC)
commita56783aace3496c8b40008d0dec4c42437165e54 (patch) (unidiff)
tree7c3c070c3346d67356508d586327212d97b457cb
parentd63eac7a612a9724705bc58ad98c65c6ac052d07 (diff)
downloadkdepimpi-a56783aace3496c8b40008d0dec4c42437165e54.zip
kdepimpi-a56783aace3496c8b40008d0dec4c42437165e54.tar.gz
kdepimpi-a56783aace3496c8b40008d0dec4c42437165e54.tar.bz2
Fix for startup question for timezone
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koprefsdialog.cpp3
-rw-r--r--libkdepim/kcmconfigs/kdepimconfigwidget.cpp5
-rw-r--r--libkdepim/kcmconfigs/kdepimconfigwidget.h1
3 files changed, 7 insertions, 2 deletions
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index b4b3b27..393e6e6 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -1,745 +1,746 @@
1/* 1/*
2 This file is part of KOrganizer. 2 This file is part of KOrganizer.
3 Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org> 3 Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org>
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 23
24#include <qlayout.h> 24#include <qlayout.h>
25#include <qlabel.h> 25#include <qlabel.h>
26#include <qgroupbox.h> 26#include <qgroupbox.h>
27#include <qbuttongroup.h> 27#include <qbuttongroup.h>
28#include <qlineedit.h> 28#include <qlineedit.h>
29#include <qfont.h> 29#include <qfont.h>
30#include <qslider.h> 30#include <qslider.h>
31#include <qfile.h> 31#include <qfile.h>
32#include <qtextstream.h> 32#include <qtextstream.h>
33#include <qcombobox.h> 33#include <qcombobox.h>
34#include <qvbox.h> 34#include <qvbox.h>
35#include <qhbox.h> 35#include <qhbox.h>
36#include <qregexp.h> 36#include <qregexp.h>
37#include <qspinbox.h> 37#include <qspinbox.h>
38#include <qdatetime.h> 38#include <qdatetime.h>
39#include <qcheckbox.h> 39#include <qcheckbox.h>
40#include <qradiobutton.h> 40#include <qradiobutton.h>
41#include <qpushbutton.h> 41#include <qpushbutton.h>
42#include <qstrlist.h> 42#include <qstrlist.h>
43#include <qapplication.h> 43#include <qapplication.h>
44 44
45#include <kcolorbutton.h> 45#include <kcolorbutton.h>
46#include <kdebug.h> 46#include <kdebug.h>
47#include <klocale.h> 47#include <klocale.h>
48#include <kglobal.h> 48#include <kglobal.h>
49#include <kfontdialog.h> 49#include <kfontdialog.h>
50#include <kfiledialog.h> 50#include <kfiledialog.h>
51#include <kmessagebox.h> 51#include <kmessagebox.h>
52#include <kcolordialog.h> 52#include <kcolordialog.h>
53#include <kiconloader.h> 53#include <kiconloader.h>
54#include <kemailsettings.h> 54#include <kemailsettings.h>
55#include <kstandarddirs.h> 55#include <kstandarddirs.h>
56 56
57#include <kurlrequester.h> 57#include <kurlrequester.h>
58#include <klineedit.h> 58#include <klineedit.h>
59 59
60#if defined(USE_SOLARIS) 60#if defined(USE_SOLARIS)
61#include <sys/param.h> 61#include <sys/param.h>
62 62
63#define ZONEINFODIR "/usr/share/lib/zoneinfo" 63#define ZONEINFODIR "/usr/share/lib/zoneinfo"
64#define INITFILE "/etc/default/init" 64#define INITFILE "/etc/default/init"
65#endif 65#endif
66 66
67#include "koprefs.h" 67#include "koprefs.h"
68 68
69#include "koprefsdialog.h" 69#include "koprefsdialog.h"
70#include "kpimglobalprefs.h" 70#include "kpimglobalprefs.h"
71 71
72 72
73KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : 73KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
74 KPrefsDialog(KOPrefs::instance(),parent,name,true) 74 KPrefsDialog(KOPrefs::instance(),parent,name,true)
75{ 75{
76 76
77 setCaption( i18n("Preferences - some settings need a restart (nr)")); 77 setCaption( i18n("Preferences - some settings need a restart (nr)"));
78 mCategoryDict.setAutoDelete(true); 78 mCategoryDict.setAutoDelete(true);
79 79
80 KGlobal::locale()->insertCatalogue("timezones"); 80 KGlobal::locale()->insertCatalogue("timezones");
81 81
82 setupGlobalTab(); 82 setupGlobalTab();
83 setupMainTab(); 83 setupMainTab();
84 // setupLocaleTab(); 84 // setupLocaleTab();
85 //setupTimeZoneTab(); 85 //setupTimeZoneTab();
86 setupTimeTab(); 86 setupTimeTab();
87 //setupLocaleDateTab(); 87 //setupLocaleDateTab();
88 setupFontsTab(); 88 setupFontsTab();
89 setupColorsTab(); 89 setupColorsTab();
90 setupViewsTab(); 90 setupViewsTab();
91 //setupSyncTab(); 91 //setupSyncTab();
92 //setupSyncAlgTab(); 92 //setupSyncAlgTab();
93 //setupPrinterTab(); 93 //setupPrinterTab();
94 //setupGroupSchedulingTab(); 94 //setupGroupSchedulingTab();
95 //setupGroupAutomationTab(); 95 //setupGroupAutomationTab();
96} 96}
97 97
98 98
99KOPrefsDialog::~KOPrefsDialog() 99KOPrefsDialog::~KOPrefsDialog()
100{ 100{
101} 101}
102void KOPrefsDialog::setupGlobalTab() 102void KOPrefsDialog::setupGlobalTab()
103{ 103{
104 QFrame *topFrame = addPage(i18n("Global"),0,0); 104 QFrame *topFrame = addPage(i18n("Global"),0,0);
105 kdelibcfg = new KDEPIMConfigWidget( KPimGlobalPrefs::instance(), topFrame, "KCMKdeLibConfig" ); 105 kdelibcfg = new KDEPIMConfigWidget( KPimGlobalPrefs::instance(), topFrame, "KCMKdeLibConfig" );
106 QVBoxLayout *topLayout = new QVBoxLayout(topFrame); 106 QVBoxLayout *topLayout = new QVBoxLayout(topFrame);
107 topLayout->addWidget( kdelibcfg ); 107 topLayout->addWidget( kdelibcfg );
108 108
109 109
110} 110}
111void KOPrefsDialog::setupLocaleDateTab() 111void KOPrefsDialog::setupLocaleDateTab()
112{ 112{
113#if 0 113#if 0
114QFrame *topFrame = addPage(i18n("Date Format"),0,0); 114QFrame *topFrame = addPage(i18n("Date Format"),0,0);
115 QGridLayout *topLayout = new QGridLayout(topFrame,3,2); 115 QGridLayout *topLayout = new QGridLayout(topFrame,3,2);
116 topLayout->setSpacing(spacingHint()); 116 topLayout->setSpacing(spacingHint());
117 topLayout->setMargin(marginHint()); 117 topLayout->setMargin(marginHint());
118 int iii = 0; 118 int iii = 0;
119 119
120 120
121 KPrefsDialogWidRadios *syncPrefsGroup = 121 KPrefsDialogWidRadios *syncPrefsGroup =
122 addWidRadios(i18n("Date Format:"),&(KOPrefs::instance()->mPreferredDate),topFrame); 122 addWidRadios(i18n("Date Format:"),&(KOPrefs::instance()->mPreferredDate),topFrame);
123 QString format; 123 QString format;
124 if ( QApplication::desktop()->width() < 480 ) 124 if ( QApplication::desktop()->width() < 480 )
125 format = "(%d.%m.%Y)"; 125 format = "(%d.%m.%Y)";
126 else 126 else
127 format = "(%d.%m.%Y|%A %d %B %Y)"; 127 format = "(%d.%m.%Y|%A %d %B %Y)";
128 syncPrefsGroup->addRadio(i18n("24.03.2004 "+format)); 128 syncPrefsGroup->addRadio(i18n("24.03.2004 "+format));
129 if ( QApplication::desktop()->width() < 480 ) 129 if ( QApplication::desktop()->width() < 480 )
130 format = "(%m.%d.%Y)"; 130 format = "(%m.%d.%Y)";
131 else 131 else
132 format = "(%m.%d.%Y|%A %B %d %Y)"; 132 format = "(%m.%d.%Y|%A %B %d %Y)";
133 syncPrefsGroup->addRadio(i18n("03.24.2004 "+format)); 133 syncPrefsGroup->addRadio(i18n("03.24.2004 "+format));
134 if ( QApplication::desktop()->width() < 480 ) 134 if ( QApplication::desktop()->width() < 480 )
135 format = "(%Y-%m-%d)"; 135 format = "(%Y-%m-%d)";
136 else 136 else
137 format = "(%Y-%m-%d|%A %Y %B %d)"; 137 format = "(%Y-%m-%d|%A %Y %B %d)";
138 syncPrefsGroup->addRadio(i18n("2004-03-24 "+format)); 138 syncPrefsGroup->addRadio(i18n("2004-03-24 "+format));
139 syncPrefsGroup->addRadio(i18n("User defined")); 139 syncPrefsGroup->addRadio(i18n("User defined"));
140 topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1); 140 topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1);
141 ++iii; 141 ++iii;
142 ++iii; 142 ++iii;
143 QLabel * lab; 143 QLabel * lab;
144 mUserDateFormatLong = new QLineEdit(topFrame); 144 mUserDateFormatLong = new QLineEdit(topFrame);
145 lab = new QLabel(mUserDateFormatLong, i18n("User long date:"), topFrame); 145 lab = new QLabel(mUserDateFormatLong, i18n("User long date:"), topFrame);
146 topLayout->addWidget(lab ,iii,0); 146 topLayout->addWidget(lab ,iii,0);
147 topLayout->addWidget(mUserDateFormatLong,iii,1); 147 topLayout->addWidget(mUserDateFormatLong,iii,1);
148 ++iii; 148 ++iii;
149 mUserDateFormatShort = new QLineEdit(topFrame); 149 mUserDateFormatShort = new QLineEdit(topFrame);
150 lab = new QLabel(mUserDateFormatShort, i18n("User short date:"), topFrame); 150 lab = new QLabel(mUserDateFormatShort, i18n("User short date:"), topFrame);
151 topLayout->addWidget(lab ,iii,0); 151 topLayout->addWidget(lab ,iii,0);
152 topLayout->addWidget(mUserDateFormatShort,iii,1); 152 topLayout->addWidget(mUserDateFormatShort,iii,1);
153 ++iii; 153 ++iii;
154 lab = new QLabel( i18n("Monday 19 April 2004: %A %d %B %Y"), topFrame); 154 lab = new QLabel( i18n("Monday 19 April 2004: %A %d %B %Y"), topFrame);
155 topLayout->addMultiCellWidget(lab ,iii,iii,0,1); 155 topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
156 ++iii; 156 ++iii;
157 lab = new QLabel( i18n("Mon 19.04.04: %a %d.%m.%y"), topFrame); 157 lab = new QLabel( i18n("Mon 19.04.04: %a %d.%m.%y"), topFrame);
158 topLayout->addMultiCellWidget(lab ,iii,iii,0,1); 158 topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
159 ++iii; 159 ++iii;
160 lab = new QLabel( i18n("Mon, 19.Apr.04: %a, %d.%b.%y"), topFrame); 160 lab = new QLabel( i18n("Mon, 19.Apr.04: %a, %d.%b.%y"), topFrame);
161 topLayout->addMultiCellWidget(lab ,iii,iii,0,1); 161 topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
162 ++iii; 162 ++iii;
163#endif 163#endif
164 164
165} 165}
166 166
167void KOPrefsDialog::setupLocaleTab() 167void KOPrefsDialog::setupLocaleTab()
168{ 168{
169#if 0 169#if 0
170 QFrame *topFrame = addPage(i18n("Locale"),0,0); 170 QFrame *topFrame = addPage(i18n("Locale"),0,0);
171 QGridLayout *topLayout = new QGridLayout(topFrame,4,2); 171 QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
172 topLayout->setSpacing(spacingHint()); 172 topLayout->setSpacing(spacingHint());
173 topLayout->setMargin(marginHint()); 173 topLayout->setMargin(marginHint());
174 int iii = 0; 174 int iii = 0;
175 KPrefsDialogWidRadios *syncPrefsGroup = 175 KPrefsDialogWidRadios *syncPrefsGroup =
176 addWidRadios(i18n("Language:(needs restart)"),&(KOPrefs::instance()->mPreferredLanguage),topFrame); 176 addWidRadios(i18n("Language:(needs restart)"),&(KOPrefs::instance()->mPreferredLanguage),topFrame);
177 syncPrefsGroup->addRadio(i18n("English")); 177 syncPrefsGroup->addRadio(i18n("English"));
178 syncPrefsGroup->addRadio(i18n("German")); 178 syncPrefsGroup->addRadio(i18n("German"));
179 syncPrefsGroup->addRadio(i18n("French")); 179 syncPrefsGroup->addRadio(i18n("French"));
180 syncPrefsGroup->addRadio(i18n("User defined (usertranslation.txt)")); 180 syncPrefsGroup->addRadio(i18n("User defined (usertranslation.txt)"));
181 if ( QApplication::desktop()->width() < 300 ) 181 if ( QApplication::desktop()->width() < 300 )
182 ;// syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical); 182 ;// syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical);
183 topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1); 183 topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1);
184 ++iii; 184 ++iii;
185 185
186 syncPrefsGroup = 186 syncPrefsGroup =
187 addWidRadios(i18n("Time Format(nr):"),&(KOPrefs::instance()->mPreferredTime),topFrame); 187 addWidRadios(i18n("Time Format(nr):"),&(KOPrefs::instance()->mPreferredTime),topFrame);
188 if ( QApplication::desktop()->width() > 300 ) 188 if ( QApplication::desktop()->width() > 300 )
189 syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical); 189 syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical);
190 syncPrefsGroup->addRadio(i18n("24:00")); 190 syncPrefsGroup->addRadio(i18n("24:00"));
191 syncPrefsGroup->addRadio(i18n("12:00am")); 191 syncPrefsGroup->addRadio(i18n("12:00am"));
192 syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical); 192 syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical);
193 topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1); 193 topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1);
194 ++iii; 194 ++iii;
195 KPrefsDialogWidBool *sb; 195 KPrefsDialogWidBool *sb;
196 if ( QApplication::desktop()->width() < 300 ) { 196 if ( QApplication::desktop()->width() < 300 ) {
197 sb = 197 sb =
198 addWidBool(i18n("Week starts on Sunday"), 198 addWidBool(i18n("Week starts on Sunday"),
199 &(KOPrefs::instance()->mWeekStartsOnSunday),topFrame); 199 &(KOPrefs::instance()->mWeekStartsOnSunday),topFrame);
200 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); 200 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
201 ++iii; 201 ++iii;
202 sb = 202 sb =
203 addWidBool(i18n("Use short date in (WN/E) view"), 203 addWidBool(i18n("Use short date in (WN/E) view"),
204 &(KOPrefs::instance()->mShortDateInViewer),topFrame); 204 &(KOPrefs::instance()->mShortDateInViewer),topFrame);
205 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); 205 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
206 } 206 }
207 else { 207 else {
208 QWidget * hb = new QWidget( topFrame ); 208 QWidget * hb = new QWidget( topFrame );
209 QHBoxLayout *hbLayout = new QHBoxLayout(hb); 209 QHBoxLayout *hbLayout = new QHBoxLayout(hb);
210 sb = 210 sb =
211 addWidBool(i18n("Week starts on Sunday"), 211 addWidBool(i18n("Week starts on Sunday"),
212 &(KOPrefs::instance()->mWeekStartsOnSunday),hb); 212 &(KOPrefs::instance()->mWeekStartsOnSunday),hb);
213 hbLayout->addWidget(sb->checkBox() ); 213 hbLayout->addWidget(sb->checkBox() );
214 sb = 214 sb =
215 addWidBool(i18n("Use short date in (WN/E) view"), 215 addWidBool(i18n("Use short date in (WN/E) view"),
216 &(KOPrefs::instance()->mShortDateInViewer),hb); 216 &(KOPrefs::instance()->mShortDateInViewer),hb);
217 hbLayout->addWidget(sb->checkBox() ); 217 hbLayout->addWidget(sb->checkBox() );
218 topLayout->addMultiCellWidget(hb, iii,iii,0,1); 218 topLayout->addMultiCellWidget(hb, iii,iii,0,1);
219 219
220 } 220 }
221 // KPrefsDialogWidBool *sb; //#ifndef DESKTOP_VERSION 221 // KPrefsDialogWidBool *sb; //#ifndef DESKTOP_VERSION
222#if 0 222#if 0
223 ++iii; 223 ++iii;
224 sb = 224 sb =
225 addWidBool(i18n("Quick load/save (w/o Unicode)"), 225 addWidBool(i18n("Quick load/save (w/o Unicode)"),
226 &(KOPrefs::instance()->mUseQuicksave),topFrame); 226 &(KOPrefs::instance()->mUseQuicksave),topFrame);
227 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); 227 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
228#endif 228#endif
229#endif 229#endif
230} 230}
231void KOPrefsDialog::showSyncPage() 231void KOPrefsDialog::showSyncPage()
232{ 232{
233 showPage ( 2 ) ; 233 showPage ( 0 ) ;
234 kdelibcfg->showTimeZoneTab() ;
234 235
235} 236}
236void KOPrefsDialog::setupSyncAlgTab() 237void KOPrefsDialog::setupSyncAlgTab()
237{ 238{
238#if 0 239#if 0
239 QLabel * lab; 240 QLabel * lab;
240 QFrame *topFrame = addPage(i18n("Sync Prefs"),0,0); 241 QFrame *topFrame = addPage(i18n("Sync Prefs"),0,0);
241 mSetupSyncAlgTab = topFrame; 242 mSetupSyncAlgTab = topFrame;
242 QGridLayout *topLayout = new QGridLayout(topFrame,6,2); 243 QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
243 topLayout->setSpacing(spacingHint()); 244 topLayout->setSpacing(spacingHint());
244 topLayout->setMargin(marginHint()); 245 topLayout->setMargin(marginHint());
245 int iii = 0; 246 int iii = 0;
246 247
247 KPrefsDialogWidBool *sb = 248 KPrefsDialogWidBool *sb =
248 addWidBool(i18n("Ask for preferences before syncing"), 249 addWidBool(i18n("Ask for preferences before syncing"),
249 &(KOPrefs::instance()->mAskForPreferences),topFrame); 250 &(KOPrefs::instance()->mAskForPreferences),topFrame);
250 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); 251 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
251 252
252 ++iii; 253 ++iii;
253 254
254 KPrefsDialogWidRadios *syncPrefsGroup = 255 KPrefsDialogWidRadios *syncPrefsGroup =
255 addWidRadios(i18n("Sync preferences:"),&(KOPrefs::instance()->mSyncAlgoPrefs), 256 addWidRadios(i18n("Sync preferences:"),&(KOPrefs::instance()->mSyncAlgoPrefs),
256 topFrame); 257 topFrame);
257 syncPrefsGroup->addRadio(i18n("Take local entry on conflict")); 258 syncPrefsGroup->addRadio(i18n("Take local entry on conflict"));
258 syncPrefsGroup->addRadio(i18n("Take remote entry on conflict")); 259 syncPrefsGroup->addRadio(i18n("Take remote entry on conflict"));
259 syncPrefsGroup->addRadio(i18n("Take newest entry on conflict")); 260 syncPrefsGroup->addRadio(i18n("Take newest entry on conflict"));
260 syncPrefsGroup->addRadio(i18n("Ask for every entry on conflict")); 261 syncPrefsGroup->addRadio(i18n("Ask for every entry on conflict"));
261 syncPrefsGroup->addRadio(i18n("Force take local entry always")); 262 syncPrefsGroup->addRadio(i18n("Force take local entry always"));
262 syncPrefsGroup->addRadio(i18n("Force take remote entry always")); 263 syncPrefsGroup->addRadio(i18n("Force take remote entry always"));
263 topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1); 264 topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1);
264 ++iii; 265 ++iii;
265 sb = 266 sb =
266 addWidBool(i18n("Show summary after syncing"), 267 addWidBool(i18n("Show summary after syncing"),
267 &(KOPrefs::instance()->mShowSyncSummary),topFrame); 268 &(KOPrefs::instance()->mShowSyncSummary),topFrame);
268 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); 269 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
269 270
270 ++iii; 271 ++iii;
271#endif 272#endif
272 273
273 274
274 275
275} 276}
276 277
277 278
278void KOPrefsDialog::setupSyncTab() 279void KOPrefsDialog::setupSyncTab()
279{ 280{
280#if 0 281#if 0
281 QLabel * lab; 282 QLabel * lab;
282 QFrame *topFrame = addPage(i18n("Sync Network"),0,0); 283 QFrame *topFrame = addPage(i18n("Sync Network"),0,0);
283 QGridLayout *topLayout = new QGridLayout(topFrame,6,2); 284 QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
284 topLayout->setSpacing(spacingHint()); 285 topLayout->setSpacing(spacingHint());
285 topLayout->setMargin(marginHint()); 286 topLayout->setMargin(marginHint());
286 lab = new QLabel(i18n("Remote syncing (via ssh/scp)\nnetwork settings "), topFrame); 287 lab = new QLabel(i18n("Remote syncing (via ssh/scp)\nnetwork settings "), topFrame);
287 int iii = 0; 288 int iii = 0;
288 topLayout->addMultiCellWidget(lab , iii,iii,0,1); 289 topLayout->addMultiCellWidget(lab , iii,iii,0,1);
289 ++iii; 290 ++iii;
290 291
291 mRemoteIPEdit = new QLineEdit(topFrame); 292 mRemoteIPEdit = new QLineEdit(topFrame);
292 lab = new QLabel(mRemoteIPEdit, i18n("Remote IP:"), topFrame); 293 lab = new QLabel(mRemoteIPEdit, i18n("Remote IP:"), topFrame);
293 topLayout->addWidget(lab ,iii,0); 294 topLayout->addWidget(lab ,iii,0);
294 topLayout->addWidget(mRemoteIPEdit,iii,1); 295 topLayout->addWidget(mRemoteIPEdit,iii,1);
295 ++iii; 296 ++iii;
296 mRemoteUser = new QLineEdit(topFrame); 297 mRemoteUser = new QLineEdit(topFrame);
297 lab = new QLabel(mRemoteUser, i18n("Remote user:"), topFrame); 298 lab = new QLabel(mRemoteUser, i18n("Remote user:"), topFrame);
298 topLayout->addWidget(lab ,iii,0); 299 topLayout->addWidget(lab ,iii,0);
299 topLayout->addWidget(mRemoteUser, iii,1); 300 topLayout->addWidget(mRemoteUser, iii,1);
300 ++iii; 301 ++iii;
301 302
302 mRemoteFile = new QLineEdit(topFrame); 303 mRemoteFile = new QLineEdit(topFrame);
303 lab = new QLabel(mRemoteFile, i18n("Remote file:"), topFrame); 304 lab = new QLabel(mRemoteFile, i18n("Remote file:"), topFrame);
304 topLayout->addWidget(lab ,iii,0); 305 topLayout->addWidget(lab ,iii,0);
305 topLayout->addWidget(mRemoteFile,iii,1); 306 topLayout->addWidget(mRemoteFile,iii,1);
306 ++iii; 307 ++iii;
307 308
308 mLocalTempFile = new QLineEdit(topFrame); 309 mLocalTempFile = new QLineEdit(topFrame);
309 lab = new QLabel(mLocalTempFile, i18n("Local temp file:"), topFrame); 310 lab = new QLabel(mLocalTempFile, i18n("Local temp file:"), topFrame);
310 topLayout->addWidget(lab ,iii,0); 311 topLayout->addWidget(lab ,iii,0);
311 topLayout->addWidget(mLocalTempFile,iii,1); 312 topLayout->addWidget(mLocalTempFile,iii,1);
312 ++iii; 313 ++iii;
313 314
314 KPrefsDialogWidBool *wb = 315 KPrefsDialogWidBool *wb =
315 addWidBool(i18n("Write back synced file"), 316 addWidBool(i18n("Write back synced file"),
316 &(KOPrefs::instance()->mWriteBackFile),topFrame); 317 &(KOPrefs::instance()->mWriteBackFile),topFrame);
317 topLayout->addMultiCellWidget(wb->checkBox(), iii,iii,0,1); 318 topLayout->addMultiCellWidget(wb->checkBox(), iii,iii,0,1);
318 ++iii; 319 ++iii;
319 wb = 320 wb =
320 addWidBool(i18n("Write back existing entries only"), 321 addWidBool(i18n("Write back existing entries only"),
321 &(KOPrefs::instance()->mWriteBackExistingOnly),topFrame); 322 &(KOPrefs::instance()->mWriteBackExistingOnly),topFrame);
322 topLayout->addMultiCellWidget(wb->checkBox(), iii,iii,0,1); 323 topLayout->addMultiCellWidget(wb->checkBox(), iii,iii,0,1);
323 ++iii; 324 ++iii;
324 325
325#endif 326#endif
326} 327}
327 328
328void KOPrefsDialog::setupMainTab() 329void KOPrefsDialog::setupMainTab()
329{ 330{
330 QFrame *topFrame = addPage(i18n("General"),0,0); 331 QFrame *topFrame = addPage(i18n("General"),0,0);
331 // DesktopIcon("identity",KIcon::SizeMedium)); 332 // DesktopIcon("identity",KIcon::SizeMedium));
332 333
333 QGridLayout *topLayout = new QGridLayout(topFrame,6,2); 334 QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
334 topLayout->setSpacing(spacingHint()); 335 topLayout->setSpacing(spacingHint());
335 topLayout->setMargin(marginHint()); 336 topLayout->setMargin(marginHint());
336 337
337 // KPrefsDialogWidBool *emailControlCenter = 338 // KPrefsDialogWidBool *emailControlCenter =
338// addWidBool(i18n("&Use email settings from Control Center"), 339// addWidBool(i18n("&Use email settings from Control Center"),
339// &(KOPrefs::instance()->mEmailControlCenter),topFrame); 340// &(KOPrefs::instance()->mEmailControlCenter),topFrame);
340// topLayout->addMultiCellWidget(emailControlCenter->checkBox(),0,0,0,1); 341// topLayout->addMultiCellWidget(emailControlCenter->checkBox(),0,0,0,1);
341 // connect(emailControlCenter->checkBox(),SIGNAL(toggled(bool)), 342 // connect(emailControlCenter->checkBox(),SIGNAL(toggled(bool)),
342 // SLOT(toggleEmailSettings(bool))); 343 // SLOT(toggleEmailSettings(bool)));
343 344
344 mNameEdit = new QLineEdit(topFrame); 345 mNameEdit = new QLineEdit(topFrame);
345 mNameLabel = new QLabel(mNameEdit, i18n("Full &name:"), topFrame); 346 mNameLabel = new QLabel(mNameEdit, i18n("Full &name:"), topFrame);
346 topLayout->addWidget(mNameLabel,0,0); 347 topLayout->addWidget(mNameLabel,0,0);
347 topLayout->addWidget(mNameEdit,0,1); 348 topLayout->addWidget(mNameEdit,0,1);
348 349
349 mEmailEdit = new QLineEdit(topFrame); 350 mEmailEdit = new QLineEdit(topFrame);
350 mEmailLabel = new QLabel(mEmailEdit, i18n("E&mail address:"),topFrame); 351 mEmailLabel = new QLabel(mEmailEdit, i18n("E&mail address:"),topFrame);
351 topLayout->addWidget(mEmailLabel,1,0); 352 topLayout->addWidget(mEmailLabel,1,0);
352 topLayout->addWidget(mEmailEdit,1,1); 353 topLayout->addWidget(mEmailEdit,1,1);
353 KPrefsDialogWidBool *wb; 354 KPrefsDialogWidBool *wb;
354 QHBox *dummy; 355 QHBox *dummy;
355 if ( QApplication::desktop()->width() > 480 ) { 356 if ( QApplication::desktop()->width() > 480 ) {
356 dummy = new QHBox(topFrame); 357 dummy = new QHBox(topFrame);
357 } else { 358 } else {
358 dummy = new QVBox(topFrame); 359 dummy = new QVBox(topFrame);
359 } 360 }
360 361
361 topLayout->addMultiCellWidget(dummy, 2,2,0,1); 362 topLayout->addMultiCellWidget(dummy, 2,2,0,1);
362 addWidBool(i18n("Full menu bar(nr)"), 363 addWidBool(i18n("Full menu bar(nr)"),
363 &(KOPrefs::instance()->mShowFullMenu),dummy); 364 &(KOPrefs::instance()->mShowFullMenu),dummy);
364 365
365 366
366 addWidBool(i18n("Mini icons in toolbar(nr)"), 367 addWidBool(i18n("Mini icons in toolbar(nr)"),
367 &(KOPrefs::instance()->mToolBarMiniIcons),dummy); 368 &(KOPrefs::instance()->mToolBarMiniIcons),dummy);
368 369
369 370
370 dummy = new QHBox(topFrame); 371 dummy = new QHBox(topFrame);
371 new QLabel(i18n("Days in What's Next:"),dummy); 372 new QLabel(i18n("Days in What's Next:"),dummy);
372 mWhatsNextSpin = new QSpinBox(1,14,1,dummy); 373 mWhatsNextSpin = new QSpinBox(1,14,1,dummy);
373 374
374 topLayout->addMultiCellWidget(dummy,3,3,0,1); 375 topLayout->addMultiCellWidget(dummy,3,3,0,1);
375 376
376 377
377 378
378 dummy = new QHBox(topFrame); 379 dummy = new QHBox(topFrame);
379 new QLabel(i18n("Days in Next-X-Days:"),dummy); 380 new QLabel(i18n("Days in Next-X-Days:"),dummy);
380 mNextXDaysSpin = new QSpinBox(2,14,1,dummy); 381 mNextXDaysSpin = new QSpinBox(2,14,1,dummy);
381 382
382 topLayout->addMultiCellWidget(dummy,4,4,0,1); 383 topLayout->addMultiCellWidget(dummy,4,4,0,1);
383 384
384 QHBox *prioBox = new QHBox(topFrame); 385 QHBox *prioBox = new QHBox(topFrame);
385 // intervalBox->setSpacing(spacingHint()); 386 // intervalBox->setSpacing(spacingHint());
386 topLayout->addMultiCellWidget(prioBox,5,5,0,1); 387 topLayout->addMultiCellWidget(prioBox,5,5,0,1);
387 QString messa = i18n("Show topmost todo prios in What's Next:"); 388 QString messa = i18n("Show topmost todo prios in What's Next:");
388 389
389 if ( QApplication::desktop()->width() < 300 ) 390 if ( QApplication::desktop()->width() < 300 )
390 messa = i18n("Show topmost todo prios in What's N.:"); 391 messa = i18n("Show topmost todo prios in What's N.:");
391 QLabel *prioLabel = new QLabel(messa, prioBox); 392 QLabel *prioLabel = new QLabel(messa, prioBox);
392 mPrioSpin = new QSpinBox(0,5,1,prioBox); 393 mPrioSpin = new QSpinBox(0,5,1,prioBox);
393 if ( QApplication::desktop()->width() < 300 ) 394 if ( QApplication::desktop()->width() < 300 )
394 mPrioSpin->setFixedWidth( 40 ); 395 mPrioSpin->setFixedWidth( 40 );
395 396
396 // KPrefsDialogWidBool *bcc = 397 // KPrefsDialogWidBool *bcc =
397// addWidBool(i18n("Send copy to owner when mailing events"), 398// addWidBool(i18n("Send copy to owner when mailing events"),
398// &(KOPrefs::instance()->mBcc),topFrame); 399// &(KOPrefs::instance()->mBcc),topFrame);
399// topLayout->addMultiCellWidget(bcc->checkBox(),4,4,0,1); 400// topLayout->addMultiCellWidget(bcc->checkBox(),4,4,0,1);
400 401
401 402
402 // QGroupBox *autoSaveGroup = new QGroupBox(1,Horizontal,i18n("Auto-Save"), topFrame); 403 // QGroupBox *autoSaveGroup = new QGroupBox(1,Horizontal,i18n("Auto-Save"), topFrame);
403 //topLayout->addMultiCellWidget(autoSaveGroup,6,6,0,1); 404 //topLayout->addMultiCellWidget(autoSaveGroup,6,6,0,1);
404 405
405 // addWidBool(i18n("Enable automatic saving of calendar"), 406 // addWidBool(i18n("Enable automatic saving of calendar"),
406 // &(KOPrefs::instance()->mAutoSave),autoSaveGroup); 407 // &(KOPrefs::instance()->mAutoSave),autoSaveGroup);
407 408
408 QHBox *intervalBox = new QHBox(topFrame); 409 QHBox *intervalBox = new QHBox(topFrame);
409 // intervalBox->setSpacing(spacingHint()); 410 // intervalBox->setSpacing(spacingHint());
410 topLayout->addMultiCellWidget(intervalBox,6,6,0,1); 411 topLayout->addMultiCellWidget(intervalBox,6,6,0,1);
411 QLabel *autoSaveIntervalLabel = new QLabel(i18n("Auto save delay in minutes:"),intervalBox); 412 QLabel *autoSaveIntervalLabel = new QLabel(i18n("Auto save delay in minutes:"),intervalBox);
412 mAutoSaveIntervalSpin = new QSpinBox(0,500,1,intervalBox); 413 mAutoSaveIntervalSpin = new QSpinBox(0,500,1,intervalBox);
413 autoSaveIntervalLabel->setBuddy(mAutoSaveIntervalSpin); 414 autoSaveIntervalLabel->setBuddy(mAutoSaveIntervalSpin);
414 /* 415 /*
415 QHBox * agendasize = new QHBox ( topFrame ); 416 QHBox * agendasize = new QHBox ( topFrame );
416 417
417 new QLabel (i18n("AllDayAgenda Height:"), agendasize ); 418 new QLabel (i18n("AllDayAgenda Height:"), agendasize );
418 419
419 420
420 mHourSizeSlider = new QSlider(24,47,1,24,Horizontal,agendasize); 421 mHourSizeSlider = new QSlider(24,47,1,24,Horizontal,agendasize);
421 topLayout->addMultiCellWidget(agendasize,7,7,0,1); 422 topLayout->addMultiCellWidget(agendasize,7,7,0,1);
422 */ 423 */
423 KPrefsDialogWidBool *verticalScreen = 424 KPrefsDialogWidBool *verticalScreen =
424 addWidBool(i18n("Show vertical screen (Needs restart)"), 425 addWidBool(i18n("Show vertical screen (Needs restart)"),
425 &(KOPrefs::instance()->mVerticalScreen),topFrame); 426 &(KOPrefs::instance()->mVerticalScreen),topFrame);
426 //topLayout->addWidget(verticalScreen->checkBox(),ii++,0); 427 //topLayout->addWidget(verticalScreen->checkBox(),ii++,0);
427 topLayout->addMultiCellWidget(verticalScreen->checkBox(),7,7,0,1); 428 topLayout->addMultiCellWidget(verticalScreen->checkBox(),7,7,0,1);
428 429
429 KPrefsDialogWidBool *ask = 430 KPrefsDialogWidBool *ask =
430 addWidBool(i18n("Ask for quit when closing KO/Pi"), 431 addWidBool(i18n("Ask for quit when closing KO/Pi"),
431 &(KOPrefs::instance()->mAskForQuit),topFrame); 432 &(KOPrefs::instance()->mAskForQuit),topFrame);
432 topLayout->addMultiCellWidget(ask->checkBox(),8,8,0,1); 433 topLayout->addMultiCellWidget(ask->checkBox(),8,8,0,1);
433 434
434 435
435 /* 436 /*
436 KPrefsDialogWidBool *confirmCheck = 437 KPrefsDialogWidBool *confirmCheck =
437 addWidBool(i18n("Confirm &deletes"),&(KOPrefs::instance()->mConfirm), 438 addWidBool(i18n("Confirm &deletes"),&(KOPrefs::instance()->mConfirm),
438 topFrame); 439 topFrame);
439 topLayout->addMultiCellWidget(confirmCheck->checkBox(),7,7,0,1); 440 topLayout->addMultiCellWidget(confirmCheck->checkBox(),7,7,0,1);
440 441
441 442
442 mEnableGroupScheduling = 443 mEnableGroupScheduling =
443 addWidBool(i18n("Enable group scheduling"), 444 addWidBool(i18n("Enable group scheduling"),
444 &(KOPrefs::instance()->mEnableGroupScheduling),topFrame); 445 &(KOPrefs::instance()->mEnableGroupScheduling),topFrame);
445 topLayout->addWidget(mEnableGroupScheduling->checkBox(),8,0); 446 topLayout->addWidget(mEnableGroupScheduling->checkBox(),8,0);
446 connect(mEnableGroupScheduling->checkBox(),SIGNAL(clicked()), 447 connect(mEnableGroupScheduling->checkBox(),SIGNAL(clicked()),
447 SLOT(warningGroupScheduling())); 448 SLOT(warningGroupScheduling()));
448 449
449 mEnableProjectView = 450 mEnableProjectView =
450 addWidBool(i18n("Enable project view"), 451 addWidBool(i18n("Enable project view"),
451 &(KOPrefs::instance()->mEnableProjectView),topFrame); 452 &(KOPrefs::instance()->mEnableProjectView),topFrame);
452 topLayout->addWidget(mEnableProjectView->checkBox(),9,0); 453 topLayout->addWidget(mEnableProjectView->checkBox(),9,0);
453 connect(mEnableProjectView->checkBox(),SIGNAL(clicked()), 454 connect(mEnableProjectView->checkBox(),SIGNAL(clicked()),
454 SLOT(warningProjectView())); 455 SLOT(warningProjectView()));
455 456
456 // Can't be disabled anymore 457 // Can't be disabled anymore
457 mEnableGroupScheduling->checkBox()->hide(); 458 mEnableGroupScheduling->checkBox()->hide();
458 459
459 // Disable setting, because this feature now becomes stable 460 // Disable setting, because this feature now becomes stable
460 mEnableProjectView->checkBox()->hide(); 461 mEnableProjectView->checkBox()->hide();
461 462
462 KPrefsDialogWidRadios *defaultFormatGroup = 463 KPrefsDialogWidRadios *defaultFormatGroup =
463 addWidRadios(i18n("Default Calendar Format"), 464 addWidRadios(i18n("Default Calendar Format"),
464 &(KOPrefs::instance()->mDefaultFormat),topFrame); 465 &(KOPrefs::instance()->mDefaultFormat),topFrame);
465 defaultFormatGroup->addRadio(i18n("vCalendar")); 466 defaultFormatGroup->addRadio(i18n("vCalendar"));
466 defaultFormatGroup->addRadio(i18n("iCalendar")); 467 defaultFormatGroup->addRadio(i18n("iCalendar"));
467 468
468 topLayout->addMultiCellWidget(defaultFormatGroup->groupBox(),10,10,0,1); 469 topLayout->addMultiCellWidget(defaultFormatGroup->groupBox(),10,10,0,1);
469 470
470 // Default format unconditionally is iCalendar 471 // Default format unconditionally is iCalendar
471 defaultFormatGroup->groupBox()->hide(); 472 defaultFormatGroup->groupBox()->hide();
472 473
473 KPrefsDialogWidRadios *mailClientGroup = 474 KPrefsDialogWidRadios *mailClientGroup =
474 addWidRadios(i18n("Mail Client"),&(KOPrefs::instance()->mMailClient), 475 addWidRadios(i18n("Mail Client"),&(KOPrefs::instance()->mMailClient),
475 topFrame); 476 topFrame);
476 mailClientGroup->addRadio(i18n("KMail")); 477 mailClientGroup->addRadio(i18n("KMail"));
477 mailClientGroup->addRadio(i18n("Sendmail")); 478 mailClientGroup->addRadio(i18n("Sendmail"));
478 topLayout->addMultiCellWidget(mailClientGroup->groupBox(),11,11,0,1); 479 topLayout->addMultiCellWidget(mailClientGroup->groupBox(),11,11,0,1);
479 480
480 KPrefsDialogWidBool *htmlsave = 481 KPrefsDialogWidBool *htmlsave =
481 addWidBool(i18n("Export to HTML with every save"),&(KOPrefs::instance()->mHtmlWithSave), 482 addWidBool(i18n("Export to HTML with every save"),&(KOPrefs::instance()->mHtmlWithSave),
482 topFrame); 483 topFrame);
483 topLayout->addMultiCellWidget(htmlsave->checkBox(),12,12,0,1); 484 topLayout->addMultiCellWidget(htmlsave->checkBox(),12,12,0,1);
484 485
485 KPrefsDialogWidRadios *destinationGroup = 486 KPrefsDialogWidRadios *destinationGroup =
486 addWidRadios(i18n("New Events/Todos should"),&(KOPrefs::instance()->mDestination), 487 addWidRadios(i18n("New Events/Todos should"),&(KOPrefs::instance()->mDestination),
487 topFrame); 488 topFrame);
488 destinationGroup->addRadio(i18n("be added to the standard resource")); 489 destinationGroup->addRadio(i18n("be added to the standard resource"));
489 destinationGroup->addRadio(i18n("be asked which resource to use")); 490 destinationGroup->addRadio(i18n("be asked which resource to use"));
490 topLayout->addMultiCellWidget(destinationGroup->groupBox(),13,13,0,1); 491 topLayout->addMultiCellWidget(destinationGroup->groupBox(),13,13,0,1);
491 492
492 topLayout->setRowStretch(14,1); 493 topLayout->setRowStretch(14,1);
493 */ 494 */
494} 495}
495 496
496 497
497void KOPrefsDialog::setupTimeTab() 498void KOPrefsDialog::setupTimeTab()
498{ 499{
499 QFrame *topFrame = addPage(i18n("Time"),0,0); 500 QFrame *topFrame = addPage(i18n("Time"),0,0);
500 // DesktopIcon("clock",KIcon::SizeMedium)); 501 // DesktopIcon("clock",KIcon::SizeMedium));
501 502
502 QGridLayout *topLayout = new QGridLayout(topFrame,4,2); 503 QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
503 topLayout->setSpacing(spacingHint()); 504 topLayout->setSpacing(spacingHint());
504 topLayout->setMargin(marginHint()); 505 topLayout->setMargin(marginHint());
505 506
506 QHBox *dummy = new QHBox(topFrame); 507 QHBox *dummy = new QHBox(topFrame);
507 KPrefsDialogWidTime *dayBegins = 508 KPrefsDialogWidTime *dayBegins =
508 addWidTime(i18n("Day begins at:"),&(KOPrefs::instance()->mDayBegins), 509 addWidTime(i18n("Day begins at:"),&(KOPrefs::instance()->mDayBegins),
509 dummy); 510 dummy);
510 //topLayout->addWidget(dayBegins->label(),2,0); 511 //topLayout->addWidget(dayBegins->label(),2,0);
511 512
512 //topLayout->addWidget(dayBegins->spinBox(),2,1); 513 //topLayout->addWidget(dayBegins->spinBox(),2,1);
513 topLayout->addMultiCellWidget(dummy,0,0,0,1); 514 topLayout->addMultiCellWidget(dummy,0,0,0,1);
514 515
515 topLayout->addWidget(new QLabel(i18n("Default appointment time:"), 516 topLayout->addWidget(new QLabel(i18n("Default appointment time:"),
516 topFrame),1,0); 517 topFrame),1,0);
517 mStartTimeSpin = new QSpinBox(0,23,1,topFrame); 518 mStartTimeSpin = new QSpinBox(0,23,1,topFrame);
518 mStartTimeSpin->setSuffix(":00"); 519 mStartTimeSpin->setSuffix(":00");
519 topLayout->addWidget(mStartTimeSpin,1,1); 520 topLayout->addWidget(mStartTimeSpin,1,1);
520 521
521 topLayout->addWidget(new QLabel(i18n("Def. duration of new app.:"), 522 topLayout->addWidget(new QLabel(i18n("Def. duration of new app.:"),
522 topFrame),2,0); 523 topFrame),2,0);
523 mDefaultDurationSpin = new QSpinBox(0,23,1,topFrame); 524 mDefaultDurationSpin = new QSpinBox(0,23,1,topFrame);
524 mDefaultDurationSpin->setSuffix(":00"); 525 mDefaultDurationSpin->setSuffix(":00");
525 topLayout->addWidget(mDefaultDurationSpin,2,1); 526 topLayout->addWidget(mDefaultDurationSpin,2,1);
526 527
527 QStringList alarmList; 528 QStringList alarmList;
528 alarmList << i18n("1 minute") << i18n("5 minutes") << i18n("10 minutes") 529 alarmList << i18n("1 minute") << i18n("5 minutes") << i18n("10 minutes")
529 << i18n("15 minutes") << i18n("30 minutes")<< i18n("1 hour")<< i18n("3 hours") << i18n("24 hours") ; 530 << i18n("15 minutes") << i18n("30 minutes")<< i18n("1 hour")<< i18n("3 hours") << i18n("24 hours") ;
530 topLayout->addWidget(new QLabel(i18n("Default alarm time:"),topFrame), 531 topLayout->addWidget(new QLabel(i18n("Default alarm time:"),topFrame),
531 3,0); 532 3,0);
532 mAlarmTimeCombo = new QComboBox(topFrame); 533 mAlarmTimeCombo = new QComboBox(topFrame);
533 mAlarmTimeCombo->insertStringList(alarmList); 534 mAlarmTimeCombo->insertStringList(alarmList);
534 topLayout->addWidget(mAlarmTimeCombo,3,1); 535 topLayout->addWidget(mAlarmTimeCombo,3,1);
535 536
536 537
537 QGroupBox *workingHoursGroup = new QGroupBox(1,Horizontal, 538 QGroupBox *workingHoursGroup = new QGroupBox(1,Horizontal,
538 i18n("Working Hours"), 539 i18n("Working Hours"),
539 topFrame); 540 topFrame);
540 topLayout->addMultiCellWidget(workingHoursGroup,4,4,0,1); 541 topLayout->addMultiCellWidget(workingHoursGroup,4,4,0,1);
541 workingHoursGroup->layout()->setSpacing( 0 ); 542 workingHoursGroup->layout()->setSpacing( 0 );
542 workingHoursGroup->layout()->setMargin( 4 ); 543 workingHoursGroup->layout()->setMargin( 4 );
543 QHBox *workStartBox = new QHBox(workingHoursGroup); 544 QHBox *workStartBox = new QHBox(workingHoursGroup);
544 // workStartBox->setMargin( 0 ); 545 // workStartBox->setMargin( 0 );
545 addWidTime(i18n("Daily starting hour:"), 546 addWidTime(i18n("Daily starting hour:"),
546 &(KOPrefs::instance()->mWorkingHoursStart),workStartBox); 547 &(KOPrefs::instance()->mWorkingHoursStart),workStartBox);
547 548
548 QHBox *workEndBox = new QHBox(workingHoursGroup); 549 QHBox *workEndBox = new QHBox(workingHoursGroup);
549 //workEndBox->setMargin( 0 ); 550 //workEndBox->setMargin( 0 );
550 addWidTime(i18n("Daily ending hour:"), 551 addWidTime(i18n("Daily ending hour:"),
551 &(KOPrefs::instance()->mWorkingHoursEnd),workEndBox); 552 &(KOPrefs::instance()->mWorkingHoursEnd),workEndBox);
552 QVBox *excludeBox = new QVBox(workingHoursGroup); 553 QVBox *excludeBox = new QVBox(workingHoursGroup);
553 //excludeBox->setMargin( 0 ); 554 //excludeBox->setMargin( 0 );
554 addWidBool(i18n("Exclude holidays"), 555 addWidBool(i18n("Exclude holidays"),
555 &(KOPrefs::instance()->mExcludeHolidays),excludeBox); 556 &(KOPrefs::instance()->mExcludeHolidays),excludeBox);
556 557
557 addWidBool(i18n("Exclude Saturdays"), 558 addWidBool(i18n("Exclude Saturdays"),
558 &(KOPrefs::instance()->mExcludeSaturdays),excludeBox); 559 &(KOPrefs::instance()->mExcludeSaturdays),excludeBox);
559 560
560// KPrefsDialogWidBool *marcusBainsShowSeconds = addWidBool(i18n("Show seconds on Marcus Bains line"), 561// KPrefsDialogWidBool *marcusBainsShowSeconds = addWidBool(i18n("Show seconds on Marcus Bains line"),
561 // &(KOPrefs::instance()->mMarcusBainsShowSeconds), 562 // &(KOPrefs::instance()->mMarcusBainsShowSeconds),
562 // topFrame); 563 // topFrame);
563// topLayout->addWidget(marcusBainsShowSeconds->checkBox(),5,0); 564// topLayout->addWidget(marcusBainsShowSeconds->checkBox(),5,0);
564 565
565 // topLayout->setRowStretch(6,1); 566 // topLayout->setRowStretch(6,1);
566} 567}
567 568
568 569
569void KOPrefsDialog::setupViewsTab() 570void KOPrefsDialog::setupViewsTab()
570{ 571{
571 572
572 QFrame *topFrame = addPage(i18n("Views"),0,0); 573 QFrame *topFrame = addPage(i18n("Views"),0,0);
573 // DesktopIcon("viewmag",KIcon::SizeMedium)); 574 // DesktopIcon("viewmag",KIcon::SizeMedium));
574 575
575 QGridLayout *topLayout = new QGridLayout(topFrame,6,1); 576 QGridLayout *topLayout = new QGridLayout(topFrame,6,1);
576 topLayout->setSpacing(spacingHint()); 577 topLayout->setSpacing(spacingHint());
577 topLayout->setMargin(marginHint()); 578 topLayout->setMargin(marginHint());
578 579
579// QBoxLayout *dayBeginsLayout = new QHBoxLayout; 580// QBoxLayout *dayBeginsLayout = new QHBoxLayout;
580// topLayout->addLayout(dayBeginsLayout,0,0); 581// topLayout->addLayout(dayBeginsLayout,0,0);
581 582
582// KPrefsDialogWidTime *dayBegins = 583// KPrefsDialogWidTime *dayBegins =
583// addWidTime(i18n("Day begins at:"),&(KOPrefs::instance()->mDayBegins), 584// addWidTime(i18n("Day begins at:"),&(KOPrefs::instance()->mDayBegins),
584// topFrame); 585// topFrame);
585// dayBeginsLayout->addWidget(dayBegins->label()); 586// dayBeginsLayout->addWidget(dayBegins->label());
586// dayBeginsLayout->addStretch(1); 587// dayBeginsLayout->addStretch(1);
587// dayBeginsLayout->addWidget(dayBegins->spinBox()); 588// dayBeginsLayout->addWidget(dayBegins->spinBox());
588 589
589// QBoxLayout *nextDaysLayout = new QHBoxLayout; 590// QBoxLayout *nextDaysLayout = new QHBoxLayout;
590// topLayout->addLayout(nextDaysLayout,1,0); 591// topLayout->addLayout(nextDaysLayout,1,0);
591// nextDaysLayout->addWidget(new QLabel(i18n("Days to show in Next-X-Days view:"),topFrame)); 592// nextDaysLayout->addWidget(new QLabel(i18n("Days to show in Next-X-Days view:"),topFrame));
592// mNextXDaysSpin = new QSpinBox(2,14,1,topFrame); 593// mNextXDaysSpin = new QSpinBox(2,14,1,topFrame);
593// nextDaysLayout->addStretch(1); 594// nextDaysLayout->addStretch(1);
594// nextDaysLayout->addWidget(mNextXDaysSpin); 595// nextDaysLayout->addWidget(mNextXDaysSpin);
595 596
596 597
597 int ii = 0; 598 int ii = 0;
598 KPrefsDialogWidBool *dummy = 599 KPrefsDialogWidBool *dummy =
599 addWidBool(i18n("Edit item on doubleclick (if not, show)"), 600 addWidBool(i18n("Edit item on doubleclick (if not, show)"),
600 &(KOPrefs::instance()->mEditOnDoubleClick),topFrame); 601 &(KOPrefs::instance()->mEditOnDoubleClick),topFrame);
601 topLayout->addWidget(dummy->checkBox(),ii++,0); 602 topLayout->addWidget(dummy->checkBox(),ii++,0);
602 603
603 dummy = 604 dummy =
604 addWidBool(i18n("Highlight current day in agenda"), 605 addWidBool(i18n("Highlight current day in agenda"),
605 &(KOPrefs::instance()->mHighlightCurrentDay),topFrame); 606 &(KOPrefs::instance()->mHighlightCurrentDay),topFrame);
606 topLayout->addWidget(dummy->checkBox(),ii++,0); 607 topLayout->addWidget(dummy->checkBox(),ii++,0);
607 608
608 dummy = 609 dummy =
609 addWidBool(i18n("Use light color for highlight current day"), 610 addWidBool(i18n("Use light color for highlight current day"),
610 &(KOPrefs::instance()->mUseHighlightLightColor),topFrame); 611 &(KOPrefs::instance()->mUseHighlightLightColor),topFrame);
611 topLayout->addWidget(dummy->checkBox(),ii++,0); 612 topLayout->addWidget(dummy->checkBox(),ii++,0);
612 613
613 KPrefsDialogWidBool *dailyRecur = 614 KPrefsDialogWidBool *dailyRecur =
614 addWidBool(i18n("Show events that recur daily in date nav."), 615 addWidBool(i18n("Show events that recur daily in date nav."),
615 &(KOPrefs::instance()->mDailyRecur),topFrame); 616 &(KOPrefs::instance()->mDailyRecur),topFrame);
616 topLayout->addWidget(dailyRecur->checkBox(),ii++,0); 617 topLayout->addWidget(dailyRecur->checkBox(),ii++,0);
617 618
618 KPrefsDialogWidBool *weeklyRecur = 619 KPrefsDialogWidBool *weeklyRecur =
619 addWidBool(i18n("Show ev. that recur weekly in date nav."), 620 addWidBool(i18n("Show ev. that recur weekly in date nav."),
620 &(KOPrefs::instance()->mWeeklyRecur),topFrame); 621 &(KOPrefs::instance()->mWeeklyRecur),topFrame);
621 topLayout->addWidget(weeklyRecur->checkBox(),ii++,0); 622 topLayout->addWidget(weeklyRecur->checkBox(),ii++,0);
622 if ( QApplication::desktop()->width() > 640 ) { 623 if ( QApplication::desktop()->width() > 640 ) {
623 624
624 KPrefsDialogWidBool *enableToolTips = 625 KPrefsDialogWidBool *enableToolTips =
625 addWidBool(i18n("Enable tooltips displaying summary of ev."), 626 addWidBool(i18n("Enable tooltips displaying summary of ev."),
626 &(KOPrefs::instance()->mEnableToolTips),topFrame); 627 &(KOPrefs::instance()->mEnableToolTips),topFrame);
627 topLayout->addWidget(enableToolTips->checkBox(),ii++,0); 628 topLayout->addWidget(enableToolTips->checkBox(),ii++,0);
628 629
629 } 630 }
630 631
631 KPrefsDialogWidBool *marcusBainsEnabled = 632 KPrefsDialogWidBool *marcusBainsEnabled =
632 addWidBool(i18n("Show Marcus Bains line"), 633 addWidBool(i18n("Show Marcus Bains line"),
633 &(KOPrefs::instance()->mMarcusBainsEnabled),topFrame); 634 &(KOPrefs::instance()->mMarcusBainsEnabled),topFrame);
634 topLayout->addWidget(marcusBainsEnabled->checkBox(),ii++,0); 635 topLayout->addWidget(marcusBainsEnabled->checkBox(),ii++,0);
635 636
636 637
637 // topLayout->addWidget(hourSizeGroup,ii++,0); 638 // topLayout->addWidget(hourSizeGroup,ii++,0);
638 // topLayout->addMultiCellWidget(hourSizeGroup,ii,ii,0,0); 639 // topLayout->addMultiCellWidget(hourSizeGroup,ii,ii,0,0);
639 //topLayout->setRowStretch(11,1); 640 //topLayout->setRowStretch(11,1);
640 641
641 642
642 643
643 644
644 645
645 646
646 topFrame = addPage(i18n("ViewChange"),0,0); 647 topFrame = addPage(i18n("ViewChange"),0,0);
647 // DesktopIcon("viewmag",KIcon::SizeMedium)); 648 // DesktopIcon("viewmag",KIcon::SizeMedium));
648 649
649 topLayout = new QGridLayout(topFrame,6,1); 650 topLayout = new QGridLayout(topFrame,6,1);
650 topLayout->setSpacing(spacingHint()); 651 topLayout->setSpacing(spacingHint());
651 topLayout->setMargin(marginHint()); 652 topLayout->setMargin(marginHint());
652 ii = 0; 653 ii = 0;
653 654
654 655
655 dummy = 656 dummy =
656 addWidBool(i18n("Hold fullscreen on view change"), 657 addWidBool(i18n("Hold fullscreen on view change"),
657 &(KOPrefs::instance()->mViewChangeHoldFullscreen),topFrame); 658 &(KOPrefs::instance()->mViewChangeHoldFullscreen),topFrame);
658 topLayout->addWidget(dummy->checkBox(),ii++,0); 659 topLayout->addWidget(dummy->checkBox(),ii++,0);
659 660
660 dummy = 661 dummy =
661 addWidBool(i18n("Hold non-fullscreen on view change"), 662 addWidBool(i18n("Hold non-fullscreen on view change"),
662 &(KOPrefs::instance()->mViewChangeHoldNonFullscreen),topFrame); 663 &(KOPrefs::instance()->mViewChangeHoldNonFullscreen),topFrame);
663 topLayout->addWidget(dummy->checkBox(),ii++,0); 664 topLayout->addWidget(dummy->checkBox(),ii++,0);
664 665
665 666
666 KPrefsDialogWidBool *fullViewTodo = 667 KPrefsDialogWidBool *fullViewTodo =
667 addWidBool(i18n("Event list view uses full window"), 668 addWidBool(i18n("Event list view uses full window"),
668 &(KOPrefs::instance()->mFullViewTodo),topFrame); 669 &(KOPrefs::instance()->mFullViewTodo),topFrame);
669 topLayout->addWidget(fullViewTodo->checkBox(),ii++,0); 670 topLayout->addWidget(fullViewTodo->checkBox(),ii++,0);
670 671
671 KPrefsDialogWidBool *fullViewMonth = 672 KPrefsDialogWidBool *fullViewMonth =
672 addWidBool(i18n("Next days view uses full window"), 673 addWidBool(i18n("Next days view uses full window"),
673 &(KOPrefs::instance()->mFullViewMonth),topFrame); 674 &(KOPrefs::instance()->mFullViewMonth),topFrame);
674 topLayout->addWidget(fullViewMonth->checkBox(),ii++,0); 675 topLayout->addWidget(fullViewMonth->checkBox(),ii++,0);
675 676
676 dummy = 677 dummy =
677 addWidBool(i18n("Set agenda to DayBeginsAt on change"), 678 addWidBool(i18n("Set agenda to DayBeginsAt on change"),
678 &(KOPrefs::instance()->mSetTimeToDayStartAt),topFrame); 679 &(KOPrefs::instance()->mSetTimeToDayStartAt),topFrame);
679 topLayout->addWidget(dummy->checkBox(),ii++,0); 680 topLayout->addWidget(dummy->checkBox(),ii++,0);
680 681
681 dummy = 682 dummy =
682 addWidBool(i18n("Set agenda to current time on change"), 683 addWidBool(i18n("Set agenda to current time on change"),
683 &(KOPrefs::instance()->mCenterOnCurrentTime),topFrame); 684 &(KOPrefs::instance()->mCenterOnCurrentTime),topFrame);
684 topLayout->addWidget(dummy->checkBox(),ii++,0); 685 topLayout->addWidget(dummy->checkBox(),ii++,0);
685 686
686 dummy = 687 dummy =
687 addWidBool(i18n("Listview uses monthly timespan"), 688 addWidBool(i18n("Listview uses monthly timespan"),
688 &(KOPrefs::instance()->mListViewMonthTimespan),topFrame); 689 &(KOPrefs::instance()->mListViewMonthTimespan),topFrame);
689 topLayout->addWidget(dummy->checkBox(),ii++,0); 690 topLayout->addWidget(dummy->checkBox(),ii++,0);
690 dummy = 691 dummy =
691 addWidBool(i18n("Highlight selection in Time Edit"), 692 addWidBool(i18n("Highlight selection in Time Edit"),
692 &(KOPrefs::instance()->mHightlightDateTimeEdit),topFrame); 693 &(KOPrefs::instance()->mHightlightDateTimeEdit),topFrame);
693 topLayout->addWidget( dummy->checkBox(), ii++,0); 694 topLayout->addWidget( dummy->checkBox(), ii++,0);
694 695
695 696
696 697
697 698
698 699
699 topFrame = addPage(i18n("Month View"),0,0); 700 topFrame = addPage(i18n("Month View"),0,0);
700 // DesktopIcon("viewmag",KIcon::SizeMedium)); 701 // DesktopIcon("viewmag",KIcon::SizeMedium));
701 702
702 topLayout = new QGridLayout(topFrame,5,1); 703 topLayout = new QGridLayout(topFrame,5,1);
703 topLayout->setSpacing(spacingHint()); 704 topLayout->setSpacing(spacingHint());
704 topLayout->setMargin(marginHint()); 705 topLayout->setMargin(marginHint());
705 ii = 0; 706 ii = 0;
706 QLabel *lab; 707 QLabel *lab;
707 QHBox *habo = new QHBox( topFrame ); 708 QHBox *habo = new QHBox( topFrame );
708 if ( QApplication::desktop()->width() < 320 ) { 709 if ( QApplication::desktop()->width() < 320 ) {
709 lab = new QLabel ( i18n("Show events that recur "), topFrame ); 710 lab = new QLabel ( i18n("Show events that recur "), topFrame );
710 topLayout->addMultiCellWidget(lab,ii, ii,0,1); 711 topLayout->addMultiCellWidget(lab,ii, ii,0,1);
711 ii++; 712 ii++;
712 713
713 } else { 714 } else {
714 new QLabel ( i18n("Show events that recur "), habo ); 715 new QLabel ( i18n("Show events that recur "), habo );
715 716
716 } 717 }
717 dailyRecur = 718 dailyRecur =
718 addWidBool(i18n("daily"), 719 addWidBool(i18n("daily"),
719 &(KOPrefs::instance()->mMonthDailyRecur),habo); 720 &(KOPrefs::instance()->mMonthDailyRecur),habo);
720 // topLayout->addWidget(dailyRecur->checkBox(),ii++,0); 721 // topLayout->addWidget(dailyRecur->checkBox(),ii++,0);
721 722
722 weeklyRecur = 723 weeklyRecur =
723 addWidBool(i18n("weekly"), 724 addWidBool(i18n("weekly"),
724 &(KOPrefs::instance()->mMonthWeeklyRecur),habo); 725 &(KOPrefs::instance()->mMonthWeeklyRecur),habo);
725 topLayout->addMultiCellWidget(habo,ii, ii,0,1); 726 topLayout->addMultiCellWidget(habo,ii, ii,0,1);
726 ii++; 727 ii++;
727 728
728 729
729 habo = new QHBox( topFrame ); 730 habo = new QHBox( topFrame );
730 if ( QApplication::desktop()->width() < 320 ) { 731 if ( QApplication::desktop()->width() < 320 ) {
731 lab = new QLabel (i18n("Show in every cell ") , topFrame ); 732 lab = new QLabel (i18n("Show in every cell ") , topFrame );
732 topLayout->addMultiCellWidget(lab,ii, ii,0,1); 733 topLayout->addMultiCellWidget(lab,ii, ii,0,1);
733 ii++; 734 ii++;
734 735
735 } else { 736 } else {
736 new QLabel ( i18n("Show in every cell "), habo ); 737 new QLabel ( i18n("Show in every cell "), habo );
737 } 738 }
738 weeklyRecur = 739 weeklyRecur =
739 addWidBool(i18n("short month"), 740 addWidBool(i18n("short month"),
740 &(KOPrefs::instance()->mMonthShowShort),habo); 741 &(KOPrefs::instance()->mMonthShowShort),habo);
741 weeklyRecur = 742 weeklyRecur =
742 addWidBool(i18n("icons"), 743 addWidBool(i18n("icons"),
743 &(KOPrefs::instance()->mMonthShowIcons),habo); 744 &(KOPrefs::instance()->mMonthShowIcons),habo);
744 745
745 topLayout->addMultiCellWidget(habo,ii, ii,0,1); 746 topLayout->addMultiCellWidget(habo,ii, ii,0,1);
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
index 2819ab1..073ab74 100644
--- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
+++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
@@ -1,619 +1,622 @@
1/* 1/*
2 This file is part of KdePim/Pi. 2 This file is part of KdePim/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 23
24/* 24/*
25Enhanced Version of the file for platform independent KDE tools. 25Enhanced Version of the file for platform independent KDE tools.
26Copyright (c) 2004 Ulf Schenk 26Copyright (c) 2004 Ulf Schenk
27 27
28$Id$ 28$Id$
29*/ 29*/
30 30
31#include <qlayout.h> 31#include <qlayout.h>
32#include <qtabwidget.h> 32#include <qtabwidget.h>
33#include <qcombobox.h> 33#include <qcombobox.h>
34#include <qgroupbox.h> 34#include <qgroupbox.h>
35#include <qlabel.h> 35#include <qlabel.h>
36#include <qlineedit.h> 36#include <qlineedit.h>
37#include <qbuttongroup.h> 37#include <qbuttongroup.h>
38#include <qfile.h> 38#include <qfile.h>
39 39
40#include <kdialog.h> 40#include <kdialog.h>
41#include <klocale.h> 41#include <klocale.h>
42#include <kdateedit.h> 42#include <kdateedit.h>
43#include <kglobal.h> 43#include <kglobal.h>
44#include <stdlib.h> 44#include <stdlib.h>
45 45
46/*US 46/*US
47#include <qcheckbox.h> 47#include <qcheckbox.h>
48#include <qframe.h> 48#include <qframe.h>
49#include <qpushbutton.h> 49#include <qpushbutton.h>
50#include <qcombobox.h> 50#include <qcombobox.h>
51#include <qlineedit.h> 51#include <qlineedit.h>
52#include <qlabel.h> 52#include <qlabel.h>
53#include <qfile.h> 53#include <qfile.h>
54 54
55#include <kconfig.h> 55#include <kconfig.h>
56#include <kdebug.h> 56#include <kdebug.h>
57#include <kdialog.h> 57#include <kdialog.h>
58#include <klistview.h> 58#include <klistview.h>
59#include <klocale.h> 59#include <klocale.h>
60#include <kglobal.h> 60#include <kglobal.h>
61#include <kmessagebox.h> 61#include <kmessagebox.h>
62#include <kstandarddirs.h> 62#include <kstandarddirs.h>
63 63
64#ifndef KAB_EMBEDDED 64#ifndef KAB_EMBEDDED
65#include <ktrader.h> 65#include <ktrader.h>
66#else // KAB_EMBEDDED 66#else // KAB_EMBEDDED
67#include <mergewidget.h> 67#include <mergewidget.h>
68#include <distributionlistwidget.h> 68#include <distributionlistwidget.h>
69#endif // KAB_EMBEDDED 69#endif // KAB_EMBEDDED
70 70
71#include "addresseewidget.h" 71#include "addresseewidget.h"
72#include "extensionconfigdialog.h" 72#include "extensionconfigdialog.h"
73#include "extensionwidget.h" 73#include "extensionwidget.h"
74*/ 74*/
75 75
76#include "qapplication.h" 76#include "qapplication.h"
77 77
78#include "kpimglobalprefs.h" 78#include "kpimglobalprefs.h"
79 79
80#include "kdepimconfigwidget.h" 80#include "kdepimconfigwidget.h"
81 81
82 82
83KDEPIMConfigWidget::KDEPIMConfigWidget(KPimGlobalPrefs *prefs, QWidget *parent, const char *name ) 83KDEPIMConfigWidget::KDEPIMConfigWidget(KPimGlobalPrefs *prefs, QWidget *parent, const char *name )
84 : KPrefsWidget(prefs, parent, name ) 84 : KPrefsWidget(prefs, parent, name )
85{ 85{
86 mExternalAppsMap.insert(ExternalAppHandler::EMAIL, i18n("Email")); 86 mExternalAppsMap.insert(ExternalAppHandler::EMAIL, i18n("Email"));
87 mExternalAppsMap.insert(ExternalAppHandler::PHONE, i18n("Phone")); 87 mExternalAppsMap.insert(ExternalAppHandler::PHONE, i18n("Phone"));
88 mExternalAppsMap.insert(ExternalAppHandler::SMS, i18n("SMS")); 88 mExternalAppsMap.insert(ExternalAppHandler::SMS, i18n("SMS"));
89 mExternalAppsMap.insert(ExternalAppHandler::FAX, i18n("Fax")); 89 mExternalAppsMap.insert(ExternalAppHandler::FAX, i18n("Fax"));
90 mExternalAppsMap.insert(ExternalAppHandler::PAGER, i18n("Pager")); 90 mExternalAppsMap.insert(ExternalAppHandler::PAGER, i18n("Pager"));
91 mExternalAppsMap.insert(ExternalAppHandler::SIP, i18n("SIP")); 91 mExternalAppsMap.insert(ExternalAppHandler::SIP, i18n("SIP"));
92 92
93 93
94 QVBoxLayout *topLayout = new QVBoxLayout( this, 0, 94 QVBoxLayout *topLayout = new QVBoxLayout( this, 0,
95 KDialog::spacingHint() ); 95 KDialog::spacingHint() );
96 96
97 tabWidget = new QTabWidget( this ); 97 tabWidget = new QTabWidget( this );
98 topLayout->addWidget( tabWidget ); 98 topLayout->addWidget( tabWidget );
99 99
100 100
101 setupLocaleTab(); 101 setupLocaleTab();
102 setupLocaleDateTab(); 102 setupLocaleDateTab();
103 setupTimeZoneTab(); 103 setupTimeZoneTab();
104 setupExternalAppTab(); 104 setupExternalAppTab();
105 105
106} 106}
107 107void KDEPIMConfigWidget::showTimeZoneTab()
108{
109 tabWidget->setCurrentPage ( 2 ) ;
110}
108void KDEPIMConfigWidget::setupExternalAppTab() 111void KDEPIMConfigWidget::setupExternalAppTab()
109{ 112{
110 QWidget *externalAppsPage = new QWidget( this ); 113 QWidget *externalAppsPage = new QWidget( this );
111 QVBoxLayout* layout = new QVBoxLayout( externalAppsPage, KDialog::marginHintSmall(), 114 QVBoxLayout* layout = new QVBoxLayout( externalAppsPage, KDialog::marginHintSmall(),
112 KDialog::spacingHintSmall() ); 115 KDialog::spacingHintSmall() );
113 116
114 mExternalApps = new QComboBox( externalAppsPage ); 117 mExternalApps = new QComboBox( externalAppsPage );
115 118
116 QMap<ExternalAppHandler::Types, QString>::Iterator it; 119 QMap<ExternalAppHandler::Types, QString>::Iterator it;
117 for( it = mExternalAppsMap.begin(); it != mExternalAppsMap.end(); ++it ) 120 for( it = mExternalAppsMap.begin(); it != mExternalAppsMap.end(); ++it )
118 mExternalApps->insertItem( it.data(), it.key() ); 121 mExternalApps->insertItem( it.data(), it.key() );
119 122
120 layout->addWidget( mExternalApps ); 123 layout->addWidget( mExternalApps );
121 124
122 connect( mExternalApps, SIGNAL( activated( int ) ), 125 connect( mExternalApps, SIGNAL( activated( int ) ),
123 this, SLOT (externalapp_changed( int ) ) ); 126 this, SLOT (externalapp_changed( int ) ) );
124 127
125 128
126 mExternalAppGroupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Used Mail Client" ), externalAppsPage ); 129 mExternalAppGroupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Used Mail Client" ), externalAppsPage );
127 QGridLayout *boxLayout = new QGridLayout( mExternalAppGroupBox->layout(), 4, 2, -1, "gridlayout" ); 130 QGridLayout *boxLayout = new QGridLayout( mExternalAppGroupBox->layout(), 4, 2, -1, "gridlayout" );
128 131
129 132
130 mClient = new QComboBox( mExternalAppGroupBox ); 133 mClient = new QComboBox( mExternalAppGroupBox );
131 boxLayout->addMultiCellWidget( mClient, 0, 0, 0, 1 ); 134 boxLayout->addMultiCellWidget( mClient, 0, 0, 0, 1 );
132 135
133 connect( mClient, SIGNAL( activated( int ) ), 136 connect( mClient, SIGNAL( activated( int ) ),
134 this, SLOT (client_changed( int ) ) ); 137 this, SLOT (client_changed( int ) ) );
135 138
136 QLabel* lab = new QLabel( i18n("Channel:"), mExternalAppGroupBox); 139 QLabel* lab = new QLabel( i18n("Channel:"), mExternalAppGroupBox);
137 boxLayout->addWidget( lab, 1, 0 ); 140 boxLayout->addWidget( lab, 1, 0 );
138 mChannel = new QLineEdit(mExternalAppGroupBox); 141 mChannel = new QLineEdit(mExternalAppGroupBox);
139 mChannel->setReadOnly(true); 142 mChannel->setReadOnly(true);
140 boxLayout->addMultiCellWidget( mChannel, 2 , 2, 0, 1 ); 143 boxLayout->addMultiCellWidget( mChannel, 2 , 2, 0, 1 );
141 144
142 lab = new QLabel( i18n("Message:"), mExternalAppGroupBox); 145 lab = new QLabel( i18n("Message:"), mExternalAppGroupBox);
143 boxLayout->addWidget( lab, 3, 0 ); 146 boxLayout->addWidget( lab, 3, 0 );
144 mMessage = new QLineEdit(mExternalAppGroupBox); 147 mMessage = new QLineEdit(mExternalAppGroupBox);
145 mMessage->setReadOnly(true); 148 mMessage->setReadOnly(true);
146 boxLayout->addWidget( mMessage , 4, 0); 149 boxLayout->addWidget( mMessage , 4, 0);
147 150
148 lab = new QLabel( i18n("Parameters:"), mExternalAppGroupBox); 151 lab = new QLabel( i18n("Parameters:"), mExternalAppGroupBox);
149 boxLayout->addWidget( lab, 3, 1 ); 152 boxLayout->addWidget( lab, 3, 1 );
150 mParameters = new QLineEdit(mExternalAppGroupBox); 153 mParameters = new QLineEdit(mExternalAppGroupBox);
151 mParameters->setReadOnly(true); 154 mParameters->setReadOnly(true);
152 boxLayout->addWidget( mParameters, 4, 1 ); 155 boxLayout->addWidget( mParameters, 4, 1 );
153 156
154 lab = new QLabel( i18n("HINT: Delimiter=; Name=%1,Email=%2"), mExternalAppGroupBox); 157 lab = new QLabel( i18n("HINT: Delimiter=; Name=%1,Email=%2"), mExternalAppGroupBox);
155 boxLayout->addMultiCellWidget( lab, 5, 5, 0, 1 ); 158 boxLayout->addMultiCellWidget( lab, 5, 5, 0, 1 );
156 159
157 lab = new QLabel( i18n("extra Message:"), mExternalAppGroupBox); 160 lab = new QLabel( i18n("extra Message:"), mExternalAppGroupBox);
158 boxLayout->addWidget( lab, 6, 0 ); 161 boxLayout->addWidget( lab, 6, 0 );
159 mMessage2 = new QLineEdit(mExternalAppGroupBox); 162 mMessage2 = new QLineEdit(mExternalAppGroupBox);
160 mMessage2->setReadOnly(true); 163 mMessage2->setReadOnly(true);
161 boxLayout->addWidget( mMessage2 , 7, 0); 164 boxLayout->addWidget( mMessage2 , 7, 0);
162 165
163 lab = new QLabel( i18n("extra Parameters:"), mExternalAppGroupBox); 166 lab = new QLabel( i18n("extra Parameters:"), mExternalAppGroupBox);
164 boxLayout->addWidget( lab, 6, 1 ); 167 boxLayout->addWidget( lab, 6, 1 );
165 mParameters2 = new QLineEdit(mExternalAppGroupBox); 168 mParameters2 = new QLineEdit(mExternalAppGroupBox);
166 mParameters2->setReadOnly(true); 169 mParameters2->setReadOnly(true);
167 boxLayout->addWidget( mParameters2, 7, 1 ); 170 boxLayout->addWidget( mParameters2, 7, 1 );
168 171
169 lab = new QLabel( i18n("HINT: Emails=%1,Attachments=%2"), mExternalAppGroupBox); 172 lab = new QLabel( i18n("HINT: Emails=%1,Attachments=%2"), mExternalAppGroupBox);
170 boxLayout->addMultiCellWidget( lab, 8, 8, 0, 1 ); 173 boxLayout->addMultiCellWidget( lab, 8, 8, 0, 1 );
171 174
172 175
173 connect( mChannel, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); 176 connect( mChannel, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) );
174 connect( mMessage, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); 177 connect( mMessage, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) );
175 connect( mParameters, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); 178 connect( mParameters, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) );
176 connect( mMessage2, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); 179 connect( mMessage2, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) );
177 connect( mParameters2, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); 180 connect( mParameters2, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) );
178 181
179 182
180 layout->addWidget( mExternalAppGroupBox ); 183 layout->addWidget( mExternalAppGroupBox );
181 tabWidget->addTab( externalAppsPage, i18n( "External Apps." ) ); 184 tabWidget->addTab( externalAppsPage, i18n( "External Apps." ) );
182 185
183} 186}
184 187
185 188
186void KDEPIMConfigWidget::setupLocaleDateTab() 189void KDEPIMConfigWidget::setupLocaleDateTab()
187{ 190{
188 QWidget *topFrame = new QWidget( this ); 191 QWidget *topFrame = new QWidget( this );
189 QGridLayout *topLayout = new QGridLayout( topFrame, 3, 2); 192 QGridLayout *topLayout = new QGridLayout( topFrame, 3, 2);
190 193
191 topLayout->setSpacing(KDialog::spacingHint()); 194 topLayout->setSpacing(KDialog::spacingHint());
192 topLayout->setMargin(KDialog::marginHint()); 195 topLayout->setMargin(KDialog::marginHint());
193 int iii = 0; 196 int iii = 0;
194 197
195 198
196 KPrefsWidRadios *syncPrefsGroup = 199 KPrefsWidRadios *syncPrefsGroup =
197 addWidRadios(i18n("Date Format:"),&(KPimGlobalPrefs::instance()->mPreferredDate),topFrame); 200 addWidRadios(i18n("Date Format:"),&(KPimGlobalPrefs::instance()->mPreferredDate),topFrame);
198 QString format; 201 QString format;
199 if ( QApplication::desktop()->width() < 480 ) 202 if ( QApplication::desktop()->width() < 480 )
200 format = "(%d.%m.%Y)"; 203 format = "(%d.%m.%Y)";
201 else 204 else
202 format = "(%d.%m.%Y|%A %d %B %Y)"; 205 format = "(%d.%m.%Y|%A %d %B %Y)";
203 syncPrefsGroup->addRadio(i18n("24.03.2004 "+format)); 206 syncPrefsGroup->addRadio(i18n("24.03.2004 "+format));
204 if ( QApplication::desktop()->width() < 480 ) 207 if ( QApplication::desktop()->width() < 480 )
205 format = "(%m.%d.%Y)"; 208 format = "(%m.%d.%Y)";
206 else 209 else
207 format = "(%m.%d.%Y|%A %B %d %Y)"; 210 format = "(%m.%d.%Y|%A %B %d %Y)";
208 syncPrefsGroup->addRadio(i18n("03.24.2004 "+format)); 211 syncPrefsGroup->addRadio(i18n("03.24.2004 "+format));
209 if ( QApplication::desktop()->width() < 480 ) 212 if ( QApplication::desktop()->width() < 480 )
210 format = "(%Y-%m-%d)"; 213 format = "(%Y-%m-%d)";
211 else 214 else
212 format = "(%Y-%m-%d|%A %Y %B %d)"; 215 format = "(%Y-%m-%d|%A %Y %B %d)";
213 syncPrefsGroup->addRadio(i18n("2004-03-24 "+format)); 216 syncPrefsGroup->addRadio(i18n("2004-03-24 "+format));
214 syncPrefsGroup->addRadio(i18n("User defined")); 217 syncPrefsGroup->addRadio(i18n("User defined"));
215 topLayout->addMultiCellWidget( (QWidget*)syncPrefsGroup->groupBox(),iii,iii,0,1); 218 topLayout->addMultiCellWidget( (QWidget*)syncPrefsGroup->groupBox(),iii,iii,0,1);
216 ++iii; 219 ++iii;
217 ++iii; 220 ++iii;
218 QLabel * lab; 221 QLabel * lab;
219 mUserDateFormatLong = new QLineEdit(topFrame); 222 mUserDateFormatLong = new QLineEdit(topFrame);
220 lab = new QLabel(mUserDateFormatLong, i18n("User long date:"), topFrame); 223 lab = new QLabel(mUserDateFormatLong, i18n("User long date:"), topFrame);
221 topLayout->addWidget(lab ,iii,0); 224 topLayout->addWidget(lab ,iii,0);
222 topLayout->addWidget(mUserDateFormatLong,iii,1); 225 topLayout->addWidget(mUserDateFormatLong,iii,1);
223 ++iii; 226 ++iii;
224 mUserDateFormatShort = new QLineEdit(topFrame); 227 mUserDateFormatShort = new QLineEdit(topFrame);
225 lab = new QLabel(mUserDateFormatShort, i18n("User short date:"), topFrame); 228 lab = new QLabel(mUserDateFormatShort, i18n("User short date:"), topFrame);
226 topLayout->addWidget(lab ,iii,0); 229 topLayout->addWidget(lab ,iii,0);
227 topLayout->addWidget(mUserDateFormatShort,iii,1); 230 topLayout->addWidget(mUserDateFormatShort,iii,1);
228 ++iii; 231 ++iii;
229 lab = new QLabel( i18n("Monday 19 April 2004: %A %d %B %Y"), topFrame); 232 lab = new QLabel( i18n("Monday 19 April 2004: %A %d %B %Y"), topFrame);
230 topLayout->addMultiCellWidget(lab ,iii,iii,0,1); 233 topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
231 ++iii; 234 ++iii;
232 lab = new QLabel( i18n("Mon 19.04.04: %a %d.%m.%y"), topFrame); 235 lab = new QLabel( i18n("Mon 19.04.04: %a %d.%m.%y"), topFrame);
233 topLayout->addMultiCellWidget(lab ,iii,iii,0,1); 236 topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
234 ++iii; 237 ++iii;
235 lab = new QLabel( i18n("Mon, 19.Apr.04: %a, %d.%b.%y"), topFrame); 238 lab = new QLabel( i18n("Mon, 19.Apr.04: %a, %d.%b.%y"), topFrame);
236 topLayout->addMultiCellWidget(lab ,iii,iii,0,1); 239 topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
237 ++iii; 240 ++iii;
238 241
239 connect( mUserDateFormatLong, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); 242 connect( mUserDateFormatLong, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) );
240 connect( mUserDateFormatShort, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) ); 243 connect( mUserDateFormatShort, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) );
241 244
242 245
243 tabWidget->addTab( topFrame, i18n( "Date Format" ) ); 246 tabWidget->addTab( topFrame, i18n( "Date Format" ) );
244} 247}
245 248
246void KDEPIMConfigWidget::setupLocaleTab() 249void KDEPIMConfigWidget::setupLocaleTab()
247{ 250{
248 251
249 QWidget *topFrame = new QWidget( this ); 252 QWidget *topFrame = new QWidget( this );
250 QGridLayout *topLayout = new QGridLayout(topFrame,4,2); 253 QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
251 254
252 topLayout->setSpacing(KDialog::spacingHint()); 255 topLayout->setSpacing(KDialog::spacingHint());
253 topLayout->setMargin(KDialog::marginHint()); 256 topLayout->setMargin(KDialog::marginHint());
254 int iii = 0; 257 int iii = 0;
255 KPrefsWidRadios *syncPrefsGroup = 258 KPrefsWidRadios *syncPrefsGroup =
256 addWidRadios(i18n("Language:(needs restart)"),&(KPimGlobalPrefs::instance()->mPreferredLanguage),topFrame); 259 addWidRadios(i18n("Language:(needs restart)"),&(KPimGlobalPrefs::instance()->mPreferredLanguage),topFrame);
257 syncPrefsGroup->addRadio(i18n("English")); 260 syncPrefsGroup->addRadio(i18n("English"));
258 syncPrefsGroup->addRadio(i18n("German")); 261 syncPrefsGroup->addRadio(i18n("German"));
259 syncPrefsGroup->addRadio(i18n("French")); 262 syncPrefsGroup->addRadio(i18n("French"));
260 syncPrefsGroup->addRadio(i18n("User defined (usertranslation.txt)")); 263 syncPrefsGroup->addRadio(i18n("User defined (usertranslation.txt)"));
261 if ( QApplication::desktop()->width() < 300 ) 264 if ( QApplication::desktop()->width() < 300 )
262 ;// syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical); 265 ;// syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical);
263 topLayout->addMultiCellWidget( (QWidget*)syncPrefsGroup->groupBox(),iii,iii,0,1); 266 topLayout->addMultiCellWidget( (QWidget*)syncPrefsGroup->groupBox(),iii,iii,0,1);
264 ++iii; 267 ++iii;
265 268
266 syncPrefsGroup = 269 syncPrefsGroup =
267 addWidRadios(i18n("Time Format(nr):"),&(KPimGlobalPrefs::instance()->mPreferredTime),topFrame); 270 addWidRadios(i18n("Time Format(nr):"),&(KPimGlobalPrefs::instance()->mPreferredTime),topFrame);
268 if ( QApplication::desktop()->width() > 300 ) 271 if ( QApplication::desktop()->width() > 300 )
269 syncPrefsGroup->groupBox()->setOrientation (Qt::Vertical); 272 syncPrefsGroup->groupBox()->setOrientation (Qt::Vertical);
270 syncPrefsGroup->addRadio(i18n("24:00")); 273 syncPrefsGroup->addRadio(i18n("24:00"));
271 syncPrefsGroup->addRadio(i18n("12:00am")); 274 syncPrefsGroup->addRadio(i18n("12:00am"));
272 syncPrefsGroup->groupBox()->setOrientation (Qt::Vertical); 275 syncPrefsGroup->groupBox()->setOrientation (Qt::Vertical);
273 topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1); 276 topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1);
274 ++iii; 277 ++iii;
275 278
276 KPrefsWidBool *sb = addWidBool(i18n("Week starts on Sunday"), 279 KPrefsWidBool *sb = addWidBool(i18n("Week starts on Sunday"),
277 &(KPimGlobalPrefs::instance()->mWeekStartsOnSunday),topFrame); 280 &(KPimGlobalPrefs::instance()->mWeekStartsOnSunday),topFrame);
278 topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1); 281 topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1);
279 ++iii; 282 ++iii;
280 283
281 284
282 tabWidget->addTab( topFrame, i18n( "Locale" ) ); 285 tabWidget->addTab( topFrame, i18n( "Locale" ) );
283 286
284} 287}
285 288
286 289
287void KDEPIMConfigWidget::setupTimeZoneTab() 290void KDEPIMConfigWidget::setupTimeZoneTab()
288{ 291{
289 QWidget *topFrame = new QWidget( this ); 292 QWidget *topFrame = new QWidget( this );
290 QGridLayout *topLayout = new QGridLayout( topFrame, 5, 2); 293 QGridLayout *topLayout = new QGridLayout( topFrame, 5, 2);
291 topLayout->setSpacing(KDialog::spacingHint()); 294 topLayout->setSpacing(KDialog::spacingHint());
292 topLayout->setMargin(KDialog::marginHint()); 295 topLayout->setMargin(KDialog::marginHint());
293 296
294 QHBox *timeZoneBox = new QHBox( topFrame ); 297 QHBox *timeZoneBox = new QHBox( topFrame );
295 topLayout->addMultiCellWidget( timeZoneBox, 0, 0, 0, 1 ); 298 topLayout->addMultiCellWidget( timeZoneBox, 0, 0, 0, 1 );
296 299
297 new QLabel( i18n("Timezone:"), timeZoneBox ); 300 new QLabel( i18n("Timezone:"), timeZoneBox );
298 mTimeZoneCombo = new QComboBox( timeZoneBox ); 301 mTimeZoneCombo = new QComboBox( timeZoneBox );
299 if ( QApplication::desktop()->width() < 300 ) { 302 if ( QApplication::desktop()->width() < 300 ) {
300 mTimeZoneCombo->setMaximumWidth(150); 303 mTimeZoneCombo->setMaximumWidth(150);
301 } 304 }
302 305
303 QStringList list; 306 QStringList list;
304 list = KGlobal::locale()->timeZoneList(); 307 list = KGlobal::locale()->timeZoneList();
305 mTimeZoneCombo->insertStringList(list); 308 mTimeZoneCombo->insertStringList(list);
306 309
307 // find the currently set time zone and select it 310 // find the currently set time zone and select it
308 QString sCurrentlySet = KPimGlobalPrefs::instance()->mTimeZoneId; 311 QString sCurrentlySet = KPimGlobalPrefs::instance()->mTimeZoneId;
309 int nCurrentlySet = 11; 312 int nCurrentlySet = 11;
310 for (int i = 0; i < mTimeZoneCombo->count(); i++) 313 for (int i = 0; i < mTimeZoneCombo->count(); i++)
311 { 314 {
312 if (mTimeZoneCombo->text(i) == sCurrentlySet) 315 if (mTimeZoneCombo->text(i) == sCurrentlySet)
313 { 316 {
314 nCurrentlySet = i; 317 nCurrentlySet = i;
315 break; 318 break;
316 } 319 }
317 } 320 }
318 mTimeZoneCombo->setCurrentItem(nCurrentlySet); 321 mTimeZoneCombo->setCurrentItem(nCurrentlySet);
319 int iii = 1; 322 int iii = 1;
320 KPrefsWidBool *sb = 323 KPrefsWidBool *sb =
321 addWidBool(i18n("Timezone has daylight saving"), 324 addWidBool(i18n("Timezone has daylight saving"),
322 &(KPimGlobalPrefs::instance()->mUseDaylightsaving),topFrame); 325 &(KPimGlobalPrefs::instance()->mUseDaylightsaving),topFrame);
323 topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1); 326 topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1);
324 ++iii; 327 ++iii;
325 QLabel* lab = new QLabel( i18n("Actual start and end is the\nsunday before this date."), topFrame ); 328 QLabel* lab = new QLabel( i18n("Actual start and end is the\nsunday before this date."), topFrame );
326 topLayout->addMultiCellWidget(lab, iii,iii,0,1); 329 topLayout->addMultiCellWidget(lab, iii,iii,0,1);
327 ++iii; 330 ++iii;
328 lab = new QLabel( i18n("The year in the date is ignored."), topFrame ); 331 lab = new QLabel( i18n("The year in the date is ignored."), topFrame );
329 topLayout->addMultiCellWidget(lab, iii,iii,0,1); 332 topLayout->addMultiCellWidget(lab, iii,iii,0,1);
330 ++iii; 333 ++iii;
331 lab = new QLabel( i18n("Daylight start:"), topFrame ); 334 lab = new QLabel( i18n("Daylight start:"), topFrame );
332 topLayout->addWidget(lab, iii,0); 335 topLayout->addWidget(lab, iii,0);
333 mStartDateSavingEdit = new KDateEdit(topFrame); 336 mStartDateSavingEdit = new KDateEdit(topFrame);
334 topLayout->addWidget(mStartDateSavingEdit, iii,1); 337 topLayout->addWidget(mStartDateSavingEdit, iii,1);
335 ++iii; 338 ++iii;
336 339
337 lab = new QLabel( i18n("Daylight end:"), topFrame ); 340 lab = new QLabel( i18n("Daylight end:"), topFrame );
338 topLayout->addWidget(lab, iii,0); 341 topLayout->addWidget(lab, iii,0);
339 mEndDateSavingEdit = new KDateEdit(topFrame); 342 mEndDateSavingEdit = new KDateEdit(topFrame);
340 topLayout->addWidget(mEndDateSavingEdit, iii,1); 343 topLayout->addWidget(mEndDateSavingEdit, iii,1);
341 ++iii; 344 ++iii;
342 QDate current ( 2001, 1,1); 345 QDate current ( 2001, 1,1);
343 mStartDateSavingEdit->setDate(current.addDays(KPimGlobalPrefs::instance()->mDaylightsavingStart-1)); 346 mStartDateSavingEdit->setDate(current.addDays(KPimGlobalPrefs::instance()->mDaylightsavingStart-1));
344 mEndDateSavingEdit->setDate(current.addDays(KPimGlobalPrefs::instance()->mDaylightsavingEnd-1)); 347 mEndDateSavingEdit->setDate(current.addDays(KPimGlobalPrefs::instance()->mDaylightsavingEnd-1));
345 348
346 connect( mStartDateSavingEdit, SIGNAL( dateChanged(QDate)), this, SLOT( modified()) ); 349 connect( mStartDateSavingEdit, SIGNAL( dateChanged(QDate)), this, SLOT( modified()) );
347 connect( mEndDateSavingEdit, SIGNAL( dateChanged(QDate)), this, SLOT( modified()) ); 350 connect( mEndDateSavingEdit, SIGNAL( dateChanged(QDate)), this, SLOT( modified()) );
348 connect( mTimeZoneCombo, SIGNAL( activated( int ) ), this, SLOT (modified() ) ); 351 connect( mTimeZoneCombo, SIGNAL( activated( int ) ), this, SLOT (modified() ) );
349 352
350 353
351 354
352 tabWidget->addTab( topFrame, i18n( "Time Zone" ) ); 355 tabWidget->addTab( topFrame, i18n( "Time Zone" ) );
353 356
354} 357}
355 358
356void KDEPIMConfigWidget::externalapp_changed( int newApp ) 359void KDEPIMConfigWidget::externalapp_changed( int newApp )
357{ 360{
358 // first store the current data 361 // first store the current data
359 saveEditFieldSettings(); 362 saveEditFieldSettings();
360 363
361 // set mCurrentApp 364 // set mCurrentApp
362 mCurrentApp = (ExternalAppHandler::Types)newApp; 365 mCurrentApp = (ExternalAppHandler::Types)newApp;
363 366
364 // set mCurrentClient 367 // set mCurrentClient
365 switch(mCurrentApp) 368 switch(mCurrentApp)
366 { 369 {
367 case(ExternalAppHandler::EMAIL): 370 case(ExternalAppHandler::EMAIL):
368 mCurrentClient = mEmailClient; 371 mCurrentClient = mEmailClient;
369 break; 372 break;
370 case(ExternalAppHandler::PHONE): 373 case(ExternalAppHandler::PHONE):
371 mCurrentClient = mPhoneClient; 374 mCurrentClient = mPhoneClient;
372 break; 375 break;
373 case(ExternalAppHandler::SMS): 376 case(ExternalAppHandler::SMS):
374 mCurrentClient = mSMSClient; 377 mCurrentClient = mSMSClient;
375 break; 378 break;
376 case(ExternalAppHandler::FAX): 379 case(ExternalAppHandler::FAX):
377 mCurrentClient = mFaxClient; 380 mCurrentClient = mFaxClient;
378 break; 381 break;
379 case(ExternalAppHandler::PAGER): 382 case(ExternalAppHandler::PAGER):
380 mCurrentClient = mPagerClient; 383 mCurrentClient = mPagerClient;
381 break; 384 break;
382 case(ExternalAppHandler::SIP): 385 case(ExternalAppHandler::SIP):
383 mCurrentClient = mSipClient; 386 mCurrentClient = mSipClient;
384 break; 387 break;
385 default: 388 default:
386 return; 389 return;
387 } 390 }
388 391
389 // and at last update the widgets 392 // and at last update the widgets
390 updateClientWidgets(); 393 updateClientWidgets();
391} 394}
392 395
393 396
394 397
395void KDEPIMConfigWidget::client_changed( int newClient ) 398void KDEPIMConfigWidget::client_changed( int newClient )
396{ 399{
397 if (newClient == mCurrentClient) 400 if (newClient == mCurrentClient)
398 return; 401 return;
399 402
400 // first store the current data 403 // first store the current data
401 saveEditFieldSettings(); 404 saveEditFieldSettings();
402 405
403 406
404 //then reset the clientvariable 407 //then reset the clientvariable
405 mCurrentClient = newClient; 408 mCurrentClient = newClient;
406 409
407 // and at last update the widgets 410 // and at last update the widgets
408 updateClientWidgets(); 411 updateClientWidgets();
409 412
410 KPrefsWidget::modified(); 413 KPrefsWidget::modified();
411} 414}
412 415
413void KDEPIMConfigWidget::saveEditFieldSettings() 416void KDEPIMConfigWidget::saveEditFieldSettings()
414{ 417{
415 418
416 switch(mCurrentApp) 419 switch(mCurrentApp)
417 { 420 {
418 case(ExternalAppHandler::EMAIL): 421 case(ExternalAppHandler::EMAIL):
419 mEmailClient = mClient->currentItem(); 422 mEmailClient = mClient->currentItem();
420 break; 423 break;
421 case(ExternalAppHandler::PHONE): 424 case(ExternalAppHandler::PHONE):
422 mPhoneClient= mClient->currentItem(); 425 mPhoneClient= mClient->currentItem();
423 break; 426 break;
424 case(ExternalAppHandler::SMS): 427 case(ExternalAppHandler::SMS):
425 mSMSClient = mClient->currentItem(); 428 mSMSClient = mClient->currentItem();
426 break; 429 break;
427 case(ExternalAppHandler::FAX): 430 case(ExternalAppHandler::FAX):
428 mFaxClient = mClient->currentItem(); 431 mFaxClient = mClient->currentItem();
429 break; 432 break;
430 case(ExternalAppHandler::PAGER): 433 case(ExternalAppHandler::PAGER):
431 mPagerClient = mClient->currentItem(); 434 mPagerClient = mClient->currentItem();
432 break; 435 break;
433 case(ExternalAppHandler::SIP): 436 case(ExternalAppHandler::SIP):
434 mSipClient = mClient->currentItem(); 437 mSipClient = mClient->currentItem();
435 break; 438 break;
436 default: 439 default:
437 return; 440 return;
438 } 441 }
439 442
440 //store the current data back to the apropriate membervariables if we had set it to "other" 443 //store the current data back to the apropriate membervariables if we had set it to "other"
441 if ((mCurrentApp == ExternalAppHandler::EMAIL) && (mCurrentClient == KPimGlobalPrefs::OTHER_EMC)) 444 if ((mCurrentApp == ExternalAppHandler::EMAIL) && (mCurrentClient == KPimGlobalPrefs::OTHER_EMC))
442 { 445 {
443 mEmailOtherChannel = mChannel->text(); 446 mEmailOtherChannel = mChannel->text();
444 mEmailOtherMessage = mMessage->text(); 447 mEmailOtherMessage = mMessage->text();
445 mEmailOtherMessageParameters = mParameters->text(); 448 mEmailOtherMessageParameters = mParameters->text();
446 mEmailOtherMessage2 = mMessage2->text(); 449 mEmailOtherMessage2 = mMessage2->text();
447 mEmailOtherMessageParameters2 = mParameters2->text(); 450 mEmailOtherMessageParameters2 = mParameters2->text();
448 } 451 }
449 else if ((mCurrentApp == ExternalAppHandler::PHONE) && (mCurrentClient == KPimGlobalPrefs::OTHER_PHC)) 452 else if ((mCurrentApp == ExternalAppHandler::PHONE) && (mCurrentClient == KPimGlobalPrefs::OTHER_PHC))
450 { 453 {
451 mPhoneOtherChannel = mChannel->text(); 454 mPhoneOtherChannel = mChannel->text();
452 mPhoneOtherMessage = mMessage->text(); 455 mPhoneOtherMessage = mMessage->text();
453 mPhoneOtherMessageParameters = mParameters->text(); 456 mPhoneOtherMessageParameters = mParameters->text();
454 } 457 }
455 else if ((mCurrentApp == ExternalAppHandler::SMS) && (mCurrentClient == KPimGlobalPrefs::OTHER_SMC)) 458 else if ((mCurrentApp == ExternalAppHandler::SMS) && (mCurrentClient == KPimGlobalPrefs::OTHER_SMC))
456 { 459 {
457 mSMSOtherChannel = mChannel->text(); 460 mSMSOtherChannel = mChannel->text();
458 mSMSOtherMessage = mMessage->text(); 461 mSMSOtherMessage = mMessage->text();
459 mSMSOtherMessageParameters = mParameters->text(); 462 mSMSOtherMessageParameters = mParameters->text();
460 } 463 }
461 else if ((mCurrentApp == ExternalAppHandler::FAX) && (mCurrentClient == KPimGlobalPrefs::OTHER_FAC)) 464 else if ((mCurrentApp == ExternalAppHandler::FAX) && (mCurrentClient == KPimGlobalPrefs::OTHER_FAC))
462 { 465 {
463 mFaxOtherChannel = mChannel->text(); 466 mFaxOtherChannel = mChannel->text();
464 mFaxOtherMessage = mMessage->text(); 467 mFaxOtherMessage = mMessage->text();
465 mFaxOtherMessageParameters = mParameters->text(); 468 mFaxOtherMessageParameters = mParameters->text();
466 } 469 }
467 else if ((mCurrentApp == ExternalAppHandler::PAGER) && (mCurrentClient == KPimGlobalPrefs::OTHER_PAC)) 470 else if ((mCurrentApp == ExternalAppHandler::PAGER) && (mCurrentClient == KPimGlobalPrefs::OTHER_PAC))
468 { 471 {
469 mPagerOtherChannel = mChannel->text(); 472 mPagerOtherChannel = mChannel->text();
470 mPagerOtherMessage = mMessage->text(); 473 mPagerOtherMessage = mMessage->text();
471 mPagerOtherMessageParameters = mParameters->text(); 474 mPagerOtherMessageParameters = mParameters->text();
472 } 475 }
473 else if ((mCurrentApp == ExternalAppHandler::SIP) && (mCurrentClient == KPimGlobalPrefs::OTHER_SIC)) 476 else if ((mCurrentApp == ExternalAppHandler::SIP) && (mCurrentClient == KPimGlobalPrefs::OTHER_SIC))
474 { 477 {
475 mSipOtherChannel = mChannel->text(); 478 mSipOtherChannel = mChannel->text();
476 mSipOtherMessage = mMessage->text(); 479 mSipOtherMessage = mMessage->text();
477 mSipOtherMessageParameters = mParameters->text(); 480 mSipOtherMessageParameters = mParameters->text();
478 } 481 }
479 482
480 483
481} 484}
482 485
483void KDEPIMConfigWidget::updateClientWidgets() 486void KDEPIMConfigWidget::updateClientWidgets()
484{ 487{
485 bool blocked = signalsBlocked(); 488 bool blocked = signalsBlocked();
486 blockSignals( true ); 489 blockSignals( true );
487 490
488 // at this point we assume, that mCurrentApp and mCurrentClient are set to the values that we want to display 491 // at this point we assume, that mCurrentApp and mCurrentClient are set to the values that we want to display
489 QMap<ExternalAppHandler::Types, QString>::Iterator it = mExternalAppsMap.find ( mCurrentApp ); 492 QMap<ExternalAppHandler::Types, QString>::Iterator it = mExternalAppsMap.find ( mCurrentApp );
490 if (it == mExternalAppsMap.end()) 493 if (it == mExternalAppsMap.end())
491 return; 494 return;
492 495
493 // update group box 496 // update group box
494 mExternalAppGroupBox->setTitle(i18n( "Used %1 Client" ).arg(it.data())); 497 mExternalAppGroupBox->setTitle(i18n( "Used %1 Client" ).arg(it.data()));
495 498
496 //update the entries in the client combobox 499 //update the entries in the client combobox
497 mClient->clear(); 500 mClient->clear();
498 501
499 QList<DefaultAppItem> items = ExternalAppHandler::instance()->getAvailableDefaultItems(mCurrentApp); 502 QList<DefaultAppItem> items = ExternalAppHandler::instance()->getAvailableDefaultItems(mCurrentApp);
500 DefaultAppItem* dai; 503 DefaultAppItem* dai;
501 for ( dai=items.first(); dai != 0; dai=items.next() ) 504 for ( dai=items.first(); dai != 0; dai=items.next() )
502 { 505 {
503 mClient->insertItem( i18n(dai->_label), dai->_id ); 506 mClient->insertItem( i18n(dai->_label), dai->_id );
504 507
505 if (dai->_id == mCurrentClient) 508 if (dai->_id == mCurrentClient)
506 { 509 {
507 //restore the edit fields with the data of the local membervariables if we had set it to "other". 510 //restore the edit fields with the data of the local membervariables if we had set it to "other".
508 //Otherwise take the default data from externalapphandler. 511 //Otherwise take the default data from externalapphandler.
509 mChannel->setText(dai->_channel); 512 mChannel->setText(dai->_channel);
510 mMessage->setText(dai->_message); 513 mMessage->setText(dai->_message);
511 mParameters->setText(dai->_parameters); 514 mParameters->setText(dai->_parameters);
512 mMessage2->setText(dai->_message2); 515 mMessage2->setText(dai->_message2);
513 mParameters2->setText(dai->_parameters2); 516 mParameters2->setText(dai->_parameters2);
514 517
515 518
516 if ((mCurrentApp == ExternalAppHandler::EMAIL) && (mCurrentClient == KPimGlobalPrefs::OTHER_EMC)) 519 if ((mCurrentApp == ExternalAppHandler::EMAIL) && (mCurrentClient == KPimGlobalPrefs::OTHER_EMC))
517 { 520 {
518 mChannel->setText(mEmailOtherChannel); 521 mChannel->setText(mEmailOtherChannel);
519 mMessage->setText(mEmailOtherMessage); 522 mMessage->setText(mEmailOtherMessage);
520 mParameters->setText(mEmailOtherMessageParameters); 523 mParameters->setText(mEmailOtherMessageParameters);
521 mMessage2->setText(mEmailOtherMessage2); 524 mMessage2->setText(mEmailOtherMessage2);
522 mParameters2->setText(mEmailOtherMessageParameters2); 525 mParameters2->setText(mEmailOtherMessageParameters2);
523 } 526 }
524 else if ((mCurrentApp == ExternalAppHandler::PHONE) && (mCurrentClient == KPimGlobalPrefs::OTHER_PHC)) 527 else if ((mCurrentApp == ExternalAppHandler::PHONE) && (mCurrentClient == KPimGlobalPrefs::OTHER_PHC))
525 { 528 {
526 mChannel->setText(mPhoneOtherChannel); 529 mChannel->setText(mPhoneOtherChannel);
527 mMessage->setText(mPhoneOtherMessage); 530 mMessage->setText(mPhoneOtherMessage);
528 mParameters->setText(mPhoneOtherMessageParameters); 531 mParameters->setText(mPhoneOtherMessageParameters);
529 } 532 }
530 else if ((mCurrentApp == ExternalAppHandler::SMS) && (mCurrentClient == KPimGlobalPrefs::OTHER_SMC)) 533 else if ((mCurrentApp == ExternalAppHandler::SMS) && (mCurrentClient == KPimGlobalPrefs::OTHER_SMC))
531 { 534 {
532 mChannel->setText(mSMSOtherChannel); 535 mChannel->setText(mSMSOtherChannel);
533 mMessage->setText(mSMSOtherMessage); 536 mMessage->setText(mSMSOtherMessage);
534 mParameters->setText(mSMSOtherMessageParameters); 537 mParameters->setText(mSMSOtherMessageParameters);
535 } 538 }
536 else if ((mCurrentApp == ExternalAppHandler::FAX) && (mCurrentClient == KPimGlobalPrefs::OTHER_FAC)) 539 else if ((mCurrentApp == ExternalAppHandler::FAX) && (mCurrentClient == KPimGlobalPrefs::OTHER_FAC))
537 { 540 {
538 mChannel->setText(mFaxOtherChannel); 541 mChannel->setText(mFaxOtherChannel);
539 mMessage->setText(mFaxOtherMessage); 542 mMessage->setText(mFaxOtherMessage);
540 mParameters->setText(mFaxOtherMessageParameters); 543 mParameters->setText(mFaxOtherMessageParameters);
541 } 544 }
542 else if ((mCurrentApp == ExternalAppHandler::PAGER) && (mCurrentClient == KPimGlobalPrefs::OTHER_PAC)) 545 else if ((mCurrentApp == ExternalAppHandler::PAGER) && (mCurrentClient == KPimGlobalPrefs::OTHER_PAC))
543 { 546 {
544 mChannel->setText(mPagerOtherChannel); 547 mChannel->setText(mPagerOtherChannel);
545 mMessage->setText(mPagerOtherMessage); 548 mMessage->setText(mPagerOtherMessage);
546 mParameters->setText(mPagerOtherMessageParameters); 549 mParameters->setText(mPagerOtherMessageParameters);
547 } 550 }
548 else if ((mCurrentApp == ExternalAppHandler::SIP) && (mCurrentClient == KPimGlobalPrefs::OTHER_SIC)) 551 else if ((mCurrentApp == ExternalAppHandler::SIP) && (mCurrentClient == KPimGlobalPrefs::OTHER_SIC))
549 { 552 {
550 mChannel->setText(mSipOtherChannel); 553 mChannel->setText(mSipOtherChannel);
551 mMessage->setText(mSipOtherMessage); 554 mMessage->setText(mSipOtherMessage);
552 mParameters->setText(mSipOtherMessageParameters); 555 mParameters->setText(mSipOtherMessageParameters);
553 } 556 }
554 } 557 }
555 558
556 } 559 }
557 560
558 bool readonly; 561 bool readonly;
559 bool enabled; 562 bool enabled;
560 if ( ((mCurrentApp == ExternalAppHandler::EMAIL) && (mCurrentClient == KPimGlobalPrefs::OTHER_EMC)) 563 if ( ((mCurrentApp == ExternalAppHandler::EMAIL) && (mCurrentClient == KPimGlobalPrefs::OTHER_EMC))
561 ||((mCurrentApp == ExternalAppHandler::PHONE) && (mCurrentClient == KPimGlobalPrefs::OTHER_PHC)) 564 ||((mCurrentApp == ExternalAppHandler::PHONE) && (mCurrentClient == KPimGlobalPrefs::OTHER_PHC))
562 ||((mCurrentApp == ExternalAppHandler::SMS) && (mCurrentClient == KPimGlobalPrefs::OTHER_SMC)) 565 ||((mCurrentApp == ExternalAppHandler::SMS) && (mCurrentClient == KPimGlobalPrefs::OTHER_SMC))
563 ||((mCurrentApp == ExternalAppHandler::FAX) && (mCurrentClient == KPimGlobalPrefs::OTHER_FAC)) 566 ||((mCurrentApp == ExternalAppHandler::FAX) && (mCurrentClient == KPimGlobalPrefs::OTHER_FAC))
564 ||((mCurrentApp == ExternalAppHandler::PAGER) && (mCurrentClient == KPimGlobalPrefs::OTHER_PAC)) 567 ||((mCurrentApp == ExternalAppHandler::PAGER) && (mCurrentClient == KPimGlobalPrefs::OTHER_PAC))
565 ||((mCurrentApp == ExternalAppHandler::SIP) && (mCurrentClient == KPimGlobalPrefs::OTHER_SIC))) 568 ||((mCurrentApp == ExternalAppHandler::SIP) && (mCurrentClient == KPimGlobalPrefs::OTHER_SIC)))
566 { 569 {
567 readonly = false; 570 readonly = false;
568 } 571 }
569 else 572 else
570 { 573 {
571 readonly = true; 574 readonly = true;
572 } 575 }
573 576
574 if ( ((mCurrentApp == ExternalAppHandler::EMAIL) && (mCurrentClient == KPimGlobalPrefs::NONE_EMC)) 577 if ( ((mCurrentApp == ExternalAppHandler::EMAIL) && (mCurrentClient == KPimGlobalPrefs::NONE_EMC))
575 ||((mCurrentApp == ExternalAppHandler::PHONE) && (mCurrentClient == KPimGlobalPrefs::NONE_PHC)) 578 ||((mCurrentApp == ExternalAppHandler::PHONE) && (mCurrentClient == KPimGlobalPrefs::NONE_PHC))
576 ||((mCurrentApp == ExternalAppHandler::SMS) && (mCurrentClient == KPimGlobalPrefs::NONE_SMC)) 579 ||((mCurrentApp == ExternalAppHandler::SMS) && (mCurrentClient == KPimGlobalPrefs::NONE_SMC))
577 ||((mCurrentApp == ExternalAppHandler::FAX) && (mCurrentClient == KPimGlobalPrefs::NONE_FAC)) 580 ||((mCurrentApp == ExternalAppHandler::FAX) && (mCurrentClient == KPimGlobalPrefs::NONE_FAC))
578 ||((mCurrentApp == ExternalAppHandler::PAGER) && (mCurrentClient == KPimGlobalPrefs::NONE_PAC)) 581 ||((mCurrentApp == ExternalAppHandler::PAGER) && (mCurrentClient == KPimGlobalPrefs::NONE_PAC))
579 ||((mCurrentApp == ExternalAppHandler::SIP) && (mCurrentClient == KPimGlobalPrefs::NONE_SIC))) 582 ||((mCurrentApp == ExternalAppHandler::SIP) && (mCurrentClient == KPimGlobalPrefs::NONE_SIC)))
580 { 583 {
581 enabled = false; 584 enabled = false;
582 } 585 }
583 else 586 else
584 { 587 {
585 enabled = true; 588 enabled = true;
586 } 589 }
587 590
588 591
589 mChannel->setReadOnly(readonly); 592 mChannel->setReadOnly(readonly);
590 mMessage->setReadOnly(readonly); 593 mMessage->setReadOnly(readonly);
591 mParameters->setReadOnly(readonly); 594 mParameters->setReadOnly(readonly);
592 mMessage2->setReadOnly(readonly); 595 mMessage2->setReadOnly(readonly);
593 mParameters2->setReadOnly(readonly); 596 mParameters2->setReadOnly(readonly);
594 597
595 mChannel->setEnabled(enabled); 598 mChannel->setEnabled(enabled);
596 mMessage->setEnabled(enabled); 599 mMessage->setEnabled(enabled);
597 mParameters->setEnabled(enabled); 600 mParameters->setEnabled(enabled);
598 mMessage2->setEnabled(enabled); 601 mMessage2->setEnabled(enabled);
599 mParameters2->setEnabled(enabled); 602 mParameters2->setEnabled(enabled);
600 603
601 604
602 605
603 mClient->setCurrentItem(mCurrentClient); 606 mClient->setCurrentItem(mCurrentClient);
604 607
605 608
606 // enable/disable the extra message/parameter field 609 // enable/disable the extra message/parameter field
607 if (mCurrentApp == ExternalAppHandler::EMAIL) 610 if (mCurrentApp == ExternalAppHandler::EMAIL)
608 { 611 {
609 } 612 }
610 else 613 else
611 { 614 {
612 mMessage2->setText( "" ); 615 mMessage2->setText( "" );
613 mParameters2->setText( "" ); 616 mParameters2->setText( "" );
614 } 617 }
615 618
616 if (enabled == true) { 619 if (enabled == true) {
617 mMessage2->setEnabled(mCurrentApp == ExternalAppHandler::EMAIL); 620 mMessage2->setEnabled(mCurrentApp == ExternalAppHandler::EMAIL);
618 mParameters2->setEnabled(mCurrentApp == ExternalAppHandler::EMAIL); 621 mParameters2->setEnabled(mCurrentApp == ExternalAppHandler::EMAIL);
619 } 622 }
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.h b/libkdepim/kcmconfigs/kdepimconfigwidget.h
index 6f26513..619f3d7 100644
--- a/libkdepim/kcmconfigs/kdepimconfigwidget.h
+++ b/libkdepim/kcmconfigs/kdepimconfigwidget.h
@@ -1,154 +1,155 @@
1/* 1/*
2 This file is part of KDEPim/Pi. 2 This file is part of KDEPim/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 23
24/* 24/*
25Enhanced Version of the file for platform independent KDE tools. 25Enhanced Version of the file for platform independent KDE tools.
26Copyright (c) 2004 Ulf Schenk 26Copyright (c) 2004 Ulf Schenk
27 27
28$Id$ 28$Id$
29*/ 29*/
30 30
31#ifndef KDEPIMCONFIGWIDGET_H 31#ifndef KDEPIMCONFIGWIDGET_H
32#define KDEPIMCONFIGWIDGET_H 32#define KDEPIMCONFIGWIDGET_H
33 33
34#include <kprefswidget.h> 34#include <kprefswidget.h>
35#include <qmap.h> 35#include <qmap.h>
36 36
37#include "externalapphandler.h" 37#include "externalapphandler.h"
38 38
39 39
40class QComboBox; 40class QComboBox;
41class QLineEdit; 41class QLineEdit;
42class KPimGlobalPrefs; 42class KPimGlobalPrefs;
43class QGroupBox; 43class QGroupBox;
44class QTabWidget; 44class QTabWidget;
45class KDateEdit; 45class KDateEdit;
46 46
47class KDEPIMConfigWidget : public KPrefsWidget 47class KDEPIMConfigWidget : public KPrefsWidget
48{ 48{
49 Q_OBJECT 49 Q_OBJECT
50 50
51 public: 51 public:
52 KDEPIMConfigWidget(KPimGlobalPrefs *prefs, QWidget *parent, const char *name = 0 ); 52 KDEPIMConfigWidget(KPimGlobalPrefs *prefs, QWidget *parent, const char *name = 0 );
53 53
54 public slots: 54 public slots:
55 void textChanged( const QString& text ); 55 void textChanged( const QString& text );
56 void showTimeZoneTab();
56 57
57 protected: 58 protected:
58 /** Implement this to read custom configuration widgets. */ 59 /** Implement this to read custom configuration widgets. */
59 virtual void usrReadConfig(); 60 virtual void usrReadConfig();
60 /** Implement this to write custom configuration widgets. */ 61 /** Implement this to write custom configuration widgets. */
61 virtual void usrWriteConfig(); 62 virtual void usrWriteConfig();
62 63
63 64
64 private slots: 65 private slots:
65// void configureExtension(); 66// void configureExtension();
66// void selectionChanged( QListViewItem* ); 67// void selectionChanged( QListViewItem* );
67// void itemClicked( QListViewItem* ); 68// void itemClicked( QListViewItem* );
68 void client_changed( int newClient ); 69 void client_changed( int newClient );
69 void externalapp_changed( int newApp ); 70 void externalapp_changed( int newApp );
70 71
71 private: 72 private:
72 void setupExternalAppTab(); 73 void setupExternalAppTab();
73 void setupLocaleDateTab(); 74 void setupLocaleDateTab();
74 void setupLocaleTab(); 75 void setupLocaleTab();
75 void setupTimeZoneTab(); 76 void setupTimeZoneTab();
76 77
77 void setCombo(QComboBox *combo,const QString & text, const QStringList *tags = 0); 78 void setCombo(QComboBox *combo,const QString & text, const QStringList *tags = 0);
78 79
79 80
80 void saveEditFieldSettings(); 81 void saveEditFieldSettings();
81 void updateClientWidgets(); 82 void updateClientWidgets();
82 83
83 QTabWidget *tabWidget; 84 QTabWidget *tabWidget;
84 85
85 86
86 QLineEdit* mUserDateFormatShort; 87 QLineEdit* mUserDateFormatShort;
87 QLineEdit* mUserDateFormatLong; 88 QLineEdit* mUserDateFormatLong;
88 QComboBox* mTimeZoneCombo; 89 QComboBox* mTimeZoneCombo;
89 KDateEdit* mStartDateSavingEdit; 90 KDateEdit* mStartDateSavingEdit;
90 KDateEdit* mEndDateSavingEdit; 91 KDateEdit* mEndDateSavingEdit;
91 92
92// void restoreExtensionSettings(); 93// void restoreExtensionSettings();
93// void saveExtensionSettings(); 94// void saveExtensionSettings();
94 95
95// KListView *mExtensionView; 96// KListView *mExtensionView;
96 97
97// QCheckBox *mNameParsing; 98// QCheckBox *mNameParsing;
98// QCheckBox *mViewsSingleClickBox; 99// QCheckBox *mViewsSingleClickBox;
99// QPushButton *mConfigureButton; 100// QPushButton *mConfigureButton;
100 QComboBox* mExternalApps; 101 QComboBox* mExternalApps;
101 QGroupBox* mExternalAppGroupBox; 102 QGroupBox* mExternalAppGroupBox;
102 103
103 104
104 QComboBox* mClient; 105 QComboBox* mClient;
105 QLineEdit* mChannel; 106 QLineEdit* mChannel;
106 QLineEdit* mMessage; 107 QLineEdit* mMessage;
107 QLineEdit* mParameters; 108 QLineEdit* mParameters;
108 QLineEdit* mMessage2; 109 QLineEdit* mMessage2;
109 QLineEdit* mParameters2; 110 QLineEdit* mParameters2;
110 111
111 ExternalAppHandler::Types mCurrentApp; 112 ExternalAppHandler::Types mCurrentApp;
112 int mCurrentClient; 113 int mCurrentClient;
113 114
114 115
115 int mEmailClient; 116 int mEmailClient;
116 QString mEmailOtherChannel; 117 QString mEmailOtherChannel;
117 QString mEmailOtherMessage; 118 QString mEmailOtherMessage;
118 QString mEmailOtherMessageParameters; 119 QString mEmailOtherMessageParameters;
119 QString mEmailOtherMessage2; 120 QString mEmailOtherMessage2;
120 QString mEmailOtherMessageParameters2; 121 QString mEmailOtherMessageParameters2;
121 122
122 int mPhoneClient; 123 int mPhoneClient;
123 QString mPhoneOtherChannel; 124 QString mPhoneOtherChannel;
124 QString mPhoneOtherMessage; 125 QString mPhoneOtherMessage;
125 QString mPhoneOtherMessageParameters; 126 QString mPhoneOtherMessageParameters;
126 127
127 int mFaxClient; 128 int mFaxClient;
128 QString mFaxOtherChannel; 129 QString mFaxOtherChannel;
129 QString mFaxOtherMessage; 130 QString mFaxOtherMessage;
130 QString mFaxOtherMessageParameters; 131 QString mFaxOtherMessageParameters;
131 132
132 int mSMSClient; 133 int mSMSClient;
133 QString mSMSOtherChannel; 134 QString mSMSOtherChannel;
134 QString mSMSOtherMessage; 135 QString mSMSOtherMessage;
135 QString mSMSOtherMessageParameters; 136 QString mSMSOtherMessageParameters;
136 137
137 int mPagerClient; 138 int mPagerClient;
138 QString mPagerOtherChannel; 139 QString mPagerOtherChannel;
139 QString mPagerOtherMessage; 140 QString mPagerOtherMessage;
140 QString mPagerOtherMessageParameters; 141 QString mPagerOtherMessageParameters;
141 142
142 int mSipClient; 143 int mSipClient;
143 QString mSipOtherChannel; 144 QString mSipOtherChannel;
144 QString mSipOtherMessage; 145 QString mSipOtherMessage;
145 QString mSipOtherMessageParameters; 146 QString mSipOtherMessageParameters;
146 147
147 148
148 149
149 QMap<ExternalAppHandler::Types, QString> mExternalAppsMap; 150 QMap<ExternalAppHandler::Types, QString> mExternalAppsMap;
150 151
151// AddresseeWidget *mAddresseeWidget; 152// AddresseeWidget *mAddresseeWidget;
152}; 153};
153 154
154#endif 155#endif