summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-09-22 00:34:51 (UTC)
committer zautrix <zautrix>2004-09-22 00:34:51 (UTC)
commit01572248367c63119514d15d7401a5b2b83349a0 (patch) (unidiff)
tree892544498d4b989a9c319b21b243b818652e9718
parentcc0e64e64da1b2d25dd95ab6d2c2f55bd8822e8f (diff)
downloadkdepimpi-01572248367c63119514d15d7401a5b2b83349a0.zip
kdepimpi-01572248367c63119514d15d7401a5b2b83349a0.tar.gz
kdepimpi-01572248367c63119514d15d7401a5b2b83349a0.tar.bz2
make it compile
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kmicromail/koprefsdialog.cpp74
1 files changed, 37 insertions, 37 deletions
diff --git a/kmicromail/koprefsdialog.cpp b/kmicromail/koprefsdialog.cpp
index 87a6715..7d7bd2a 100644
--- a/kmicromail/koprefsdialog.cpp
+++ b/kmicromail/koprefsdialog.cpp
@@ -74,121 +74,121 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
74 74
75#if 0 75#if 0
76 76
77 setupMainTab(); 77 setupMainTab();
78 setupLocaleTab(); 78 setupLocaleTab();
79 setupTimeZoneTab(); 79 setupTimeZoneTab();
80 setupTimeTab(); 80 setupTimeTab();
81 setupLocaleDateTab(); 81 setupLocaleDateTab();
82 setupFontsTab(); 82 setupFontsTab();
83 setupColorsTab(); 83 setupColorsTab();
84 setupViewsTab(); 84 setupViewsTab();
85 //setupSyncTab(); 85 //setupSyncTab();
86 //setupSyncAlgTab(); 86 //setupSyncAlgTab();
87 //setupPrinterTab(); 87 //setupPrinterTab();
88 //setupGroupSchedulingTab(); 88 //setupGroupSchedulingTab();
89 //setupGroupAutomationTab(); 89 //setupGroupAutomationTab();
90#endif 90#endif
91} 91}
92 92
93 93
94KOPrefsDialog::~KOPrefsDialog() 94KOPrefsDialog::~KOPrefsDialog()
95{ 95{
96} 96}
97 97
98void KOPrefsDialog::setupMainTab() 98void KOPrefsDialog::setupMainTab()
99{ 99{
100 QFrame *topFrame = addPage(i18n("General"),0,0); 100 QFrame *topFrame = addPage(i18n("General"),0,0);
101 101
102 QGridLayout *topLayout = new QGridLayout(topFrame,6,2); 102 QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
103 topLayout->setSpacing(spacingHint()); 103 topLayout->setSpacing(spacingHint());
104 topLayout->setMargin(marginHint()); 104 topLayout->setMargin(marginHint());
105 105
106 106
107 mNameEdit = new QLineEdit(topFrame); 107 mNameEdit = new QLineEdit(topFrame);
108 mNameLabel = new QLabel(mNameEdit, i18n("Full &name:"), topFrame); 108 mNameLabel = new QLabel(mNameEdit, i18n("Full &name:"), topFrame);
109 topLayout->addWidget(mNameLabel,0,0); 109 topLayout->addWidget(mNameLabel,0,0);
110 topLayout->addWidget(mNameEdit,0,1); 110 topLayout->addWidget(mNameEdit,0,1);
111 111
112 mEmailEdit = new QLineEdit(topFrame); 112 mEmailEdit = new QLineEdit(topFrame);
113 mEmailLabel = new QLabel(mEmailEdit, i18n("E&mail address:"),topFrame); 113 mEmailLabel = new QLabel(mEmailEdit, i18n("E&mail address:"),topFrame);
114 topLayout->addWidget(mEmailLabel,1,0); 114 topLayout->addWidget(mEmailLabel,1,0);
115 topLayout->addWidget(mEmailEdit,1,1); 115 topLayout->addWidget(mEmailEdit,1,1);
116 QLabel *lab = new QLabel( i18n("HINT: Separate multiple\neMail addresses by \";\""), topFrame); 116 QLabel *lab = new QLabel( i18n("HINT: Separate multiple\neMail addresses by \";\""), topFrame);
117 topLayout->addMultiCellWidget(lab,2,2,0,1); 117 topLayout->addMultiCellWidget(lab,2,2,0,1);
118 KPrefsWidBool* ttt = addWidBool(i18n("Ignore above settings and\nuse KA/Pi \"Who am I\" instead!"), 118 KPrefsDialogWidBool* ttt = addWidBool(i18n("Ignore above settings and\nuse KA/Pi \"Who am I\" instead!"),
119 &(KOPrefs::instance()->mUseKapi),topFrame); 119 &(KOPrefs::instance()->mUseKapi),topFrame);
120 topLayout->addMultiCellWidget(ttt->checkBox(),3,3,0,1); 120 topLayout->addMultiCellWidget(ttt->checkBox(),3,3,0,1);
121} 121}
122 122
123void KOPrefsDialog::setupMailTab() 123void KOPrefsDialog::setupMailTab()
124{ 124{
125 QFrame *topFrame = addPage(i18n("Mail"),0,0); 125 QFrame *topFrame = addPage(i18n("Mail"),0,0);
126 126
127 QGridLayout *topLayout = new QGridLayout(topFrame,4,2); 127 QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
128 topLayout->setSpacing(spacingHint()); 128 topLayout->setSpacing(spacingHint());
129 topLayout->setMargin(marginHint()); 129 topLayout->setMargin(marginHint());
130 130
131 KPrefsWidBool* ttt = addWidBool(i18n("View mail as html"), 131 KPrefsDialogWidBool* ttt = addWidBool(i18n("View mail as html"),
132 &(KOPrefs::instance()->mViewAsHtml),topFrame); 132 &(KOPrefs::instance()->mViewAsHtml),topFrame);
133 topLayout->addMultiCellWidget(ttt->checkBox(),0,0,0,1); 133 topLayout->addMultiCellWidget(ttt->checkBox(),0,0,0,1);
134 134
135 135
136 ttt = addWidBool(i18n("Send mails later"), 136 ttt = addWidBool(i18n("Send mails later"),
137 &(KOPrefs::instance()->mSendLater),topFrame); 137 &(KOPrefs::instance()->mSendLater),topFrame);
138 topLayout->addMultiCellWidget(ttt->checkBox(),1,1,0,1); 138 topLayout->addMultiCellWidget(ttt->checkBox(),1,1,0,1);
139 139
140 140
141} 141}
142void KOPrefsDialog::setupFontsTab() 142void KOPrefsDialog::setupFontsTab()
143{ 143{
144 144
145 QFrame *topFrame = addPage(i18n("Fonts"),0,0); 145 QFrame *topFrame = addPage(i18n("Fonts"),0,0);
146 // DesktopIcon("fonts",KIcon::SizeMedium)); 146 // DesktopIcon("fonts",KIcon::SizeMedium));
147 147
148 QGridLayout *topLayout = new QGridLayout(topFrame,7,3); 148 QGridLayout *topLayout = new QGridLayout(topFrame,7,3);
149 topLayout->setSpacing(1); 149 topLayout->setSpacing(1);
150 topLayout->setMargin(3); 150 topLayout->setMargin(3);
151 KPrefsWidFont * tVFont; 151 KPrefsDialogWidFont * tVFont;
152 int i = 0; 152 int i = 0;
153 KPrefsWidFont *timeLabelsFont = 153 KPrefsDialogWidFont *timeLabelsFont =
154 addWidFont(i18n("OK"),i18n("Application(nr)"), 154 addWidFont(i18n("OK"),i18n("Application(nr)"),
155 &(KOPrefs::instance()->mAppFont),topFrame); 155 &(KOPrefs::instance()->mAppFont),topFrame);
156 topLayout->addWidget(timeLabelsFont->label(),i,0); 156 topLayout->addWidget(timeLabelsFont->label(),i,0);
157 topLayout->addWidget(timeLabelsFont->preview(),i,1); 157 topLayout->addWidget(timeLabelsFont->preview(),i,1);
158 topLayout->addWidget(timeLabelsFont->button(),i,2); 158 topLayout->addWidget(timeLabelsFont->button(),i,2);
159 ++i; 159 ++i;
160 160
161 161
162 timeLabelsFont = 162 timeLabelsFont =
163 addWidFont(i18n("Dear Mr."),i18n("Compose mail:"), 163 addWidFont(i18n("Dear Mr."),i18n("Compose mail:"),
164 &(KOPrefs::instance()->mComposeFont),topFrame); 164 &(KOPrefs::instance()->mComposeFont),topFrame);
165 topLayout->addWidget(timeLabelsFont->label(),i,0); 165 topLayout->addWidget(timeLabelsFont->label(),i,0);
166 topLayout->addWidget(timeLabelsFont->preview(),i,1); 166 topLayout->addWidget(timeLabelsFont->preview(),i,1);
167 topLayout->addWidget(timeLabelsFont->button(),i,2); 167 topLayout->addWidget(timeLabelsFont->button(),i,2);
168 ++i; 168 ++i;
169 169
170 KPrefsWidFont *timeBarFont = 170 KPrefsDialogWidFont *timeBarFont =
171 addWidFont(i18n("Hello"),i18n("Read mail:"), 171 addWidFont(i18n("Hello"),i18n("Read mail:"),
172 &(KOPrefs::instance()->mReadFont),topFrame); 172 &(KOPrefs::instance()->mReadFont),topFrame);
173 topLayout->addWidget(timeBarFont->label(),i,0); 173 topLayout->addWidget(timeBarFont->label(),i,0);
174 topLayout->addWidget(timeBarFont->preview(),i,1); 174 topLayout->addWidget(timeBarFont->preview(),i,1);
175 topLayout->addWidget(timeBarFont->button(),i,2); 175 topLayout->addWidget(timeBarFont->button(),i,2);
176 ++i; 176 ++i;
177 177
178 topLayout->setColStretch(1,1); 178 topLayout->setColStretch(1,1);
179 topLayout->setRowStretch(4,1); 179 topLayout->setRowStretch(4,1);
180 180
181} 181}
182void KOPrefsDialog::usrReadConfig() 182void KOPrefsDialog::usrReadConfig()
183{ 183{
184 qDebug("read "); 184 qDebug("read ");
185 mNameEdit->setText(KOPrefs::instance()->mName); 185 mNameEdit->setText(KOPrefs::instance()->mName);
186 mEmailEdit->setText(KOPrefs::instance()->mEmail); 186 mEmailEdit->setText(KOPrefs::instance()->mEmail);
187} 187}
188void KOPrefsDialog::usrWriteConfig() 188void KOPrefsDialog::usrWriteConfig()
189{ 189{
190 qDebug("write "); 190 qDebug("write ");
191 KOPrefs::instance()->mName = mNameEdit->text(); 191 KOPrefs::instance()->mName = mNameEdit->text();
192 KOPrefs::instance()->mEmail = mEmailEdit->text(); 192 KOPrefs::instance()->mEmail = mEmailEdit->text();
193 193
194 194
@@ -255,49 +255,49 @@ void KOPrefsDialog::setupLocaleTab()
255 QGridLayout *topLayout = new QGridLayout(topFrame,4,2); 255 QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
256 topLayout->setSpacing(spacingHint()); 256 topLayout->setSpacing(spacingHint());
257 topLayout->setMargin(marginHint()); 257 topLayout->setMargin(marginHint());
258 int iii = 0; 258 int iii = 0;
259 KPrefsWidRadios *syncPrefsGroup = 259 KPrefsWidRadios *syncPrefsGroup =
260 addWidRadios(i18n("Language:(needs restart)"),&(KOPrefs::instance()->mPreferredLanguage),topFrame); 260 addWidRadios(i18n("Language:(needs restart)"),&(KOPrefs::instance()->mPreferredLanguage),topFrame);
261 syncPrefsGroup->addRadio(i18n("English")); 261 syncPrefsGroup->addRadio(i18n("English"));
262 syncPrefsGroup->addRadio(i18n("German")); 262 syncPrefsGroup->addRadio(i18n("German"));
263 syncPrefsGroup->addRadio(i18n("French")); 263 syncPrefsGroup->addRadio(i18n("French"));
264 syncPrefsGroup->addRadio(i18n("User defined (usertranslation.txt)")); 264 syncPrefsGroup->addRadio(i18n("User defined (usertranslation.txt)"));
265 if ( QApplication::desktop()->width() < 300 ) 265 if ( QApplication::desktop()->width() < 300 )
266 ;// syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical); 266 ;// syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical);
267 topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1); 267 topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1);
268 ++iii; 268 ++iii;
269 269
270 syncPrefsGroup = 270 syncPrefsGroup =
271 addWidRadios(i18n("Time Format(nr):"),&(KOPrefs::instance()->mPreferredTime),topFrame); 271 addWidRadios(i18n("Time Format(nr):"),&(KOPrefs::instance()->mPreferredTime),topFrame);
272 if ( QApplication::desktop()->width() > 300 ) 272 if ( QApplication::desktop()->width() > 300 )
273 syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical); 273 syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical);
274 syncPrefsGroup->addRadio(i18n("24:00")); 274 syncPrefsGroup->addRadio(i18n("24:00"));
275 syncPrefsGroup->addRadio(i18n("12:00am")); 275 syncPrefsGroup->addRadio(i18n("12:00am"));
276 syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical); 276 syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical);
277 topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1); 277 topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1);
278 ++iii; 278 ++iii;
279 KPrefsWidBool *sb; 279 KPrefsDialogWidBool *sb;
280 if ( QApplication::desktop()->width() < 300 ) { 280 if ( QApplication::desktop()->width() < 300 ) {
281 sb = 281 sb =
282 addWidBool(i18n("Week starts on Sunday"), 282 addWidBool(i18n("Week starts on Sunday"),
283 &(KOPrefs::instance()->mWeekStartsOnSunday),topFrame); 283 &(KOPrefs::instance()->mWeekStartsOnSunday),topFrame);
284 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); 284 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
285 ++iii; 285 ++iii;
286 sb = 286 sb =
287 addWidBool(i18n("Use short date in (WN/E) view"), 287 addWidBool(i18n("Use short date in (WN/E) view"),
288 &(KOPrefs::instance()->mShortDateInViewer),topFrame); 288 &(KOPrefs::instance()->mShortDateInViewer),topFrame);
289 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); 289 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
290 } 290 }
291 else { 291 else {
292 QWidget * hb = new QWidget( topFrame ); 292 QWidget * hb = new QWidget( topFrame );
293 QHBoxLayout *hbLayout = new QHBoxLayout(hb); 293 QHBoxLayout *hbLayout = new QHBoxLayout(hb);
294 sb = 294 sb =
295 addWidBool(i18n("Week starts on Sunday"), 295 addWidBool(i18n("Week starts on Sunday"),
296 &(KOPrefs::instance()->mWeekStartsOnSunday),hb); 296 &(KOPrefs::instance()->mWeekStartsOnSunday),hb);
297 hbLayout->addWidget(sb->checkBox() ); 297 hbLayout->addWidget(sb->checkBox() );
298 sb = 298 sb =
299 addWidBool(i18n("Use short date in (WN/E) view"), 299 addWidBool(i18n("Use short date in (WN/E) view"),
300 &(KOPrefs::instance()->mShortDateInViewer),hb); 300 &(KOPrefs::instance()->mShortDateInViewer),hb);
301 hbLayout->addWidget(sb->checkBox() ); 301 hbLayout->addWidget(sb->checkBox() );
302 topLayout->addMultiCellWidget(hb, iii,iii,0,1); 302 topLayout->addMultiCellWidget(hb, iii,iii,0,1);
303 303
@@ -306,49 +306,49 @@ void KOPrefsDialog::setupLocaleTab()
306#if 0 306#if 0
307 ++iii; 307 ++iii;
308 sb = 308 sb =
309 addWidBool(i18n("Quick load/save (w/o Unicode)"), 309 addWidBool(i18n("Quick load/save (w/o Unicode)"),
310 &(KOPrefs::instance()->mUseQuicksave),topFrame); 310 &(KOPrefs::instance()->mUseQuicksave),topFrame);
311 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); 311 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
312#endif 312#endif
313} 313}
314void KOPrefsDialog::showSyncPage() 314void KOPrefsDialog::showSyncPage()
315{ 315{
316 showPage ( 2 ) ; 316 showPage ( 2 ) ;
317 317
318} 318}
319void KOPrefsDialog::setupSyncAlgTab() 319void KOPrefsDialog::setupSyncAlgTab()
320{ 320{
321#if 0 321#if 0
322 QLabel * lab; 322 QLabel * lab;
323 QFrame *topFrame = addPage(i18n("Sync Prefs"),0,0); 323 QFrame *topFrame = addPage(i18n("Sync Prefs"),0,0);
324 mSetupSyncAlgTab = topFrame; 324 mSetupSyncAlgTab = topFrame;
325 QGridLayout *topLayout = new QGridLayout(topFrame,6,2); 325 QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
326 topLayout->setSpacing(spacingHint()); 326 topLayout->setSpacing(spacingHint());
327 topLayout->setMargin(marginHint()); 327 topLayout->setMargin(marginHint());
328 int iii = 0; 328 int iii = 0;
329 329
330 KPrefsWidBool *sb = 330 KPrefsDialogWidBool *sb =
331 addWidBool(i18n("Ask for preferences before syncing"), 331 addWidBool(i18n("Ask for preferences before syncing"),
332 &(KOPrefs::instance()->mAskForPreferences),topFrame); 332 &(KOPrefs::instance()->mAskForPreferences),topFrame);
333 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); 333 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
334 334
335 ++iii; 335 ++iii;
336 336
337 KPrefsWidRadios *syncPrefsGroup = 337 KPrefsWidRadios *syncPrefsGroup =
338 addWidRadios(i18n("Sync preferences:"),&(KOPrefs::instance()->mSyncAlgoPrefs), 338 addWidRadios(i18n("Sync preferences:"),&(KOPrefs::instance()->mSyncAlgoPrefs),
339 topFrame); 339 topFrame);
340 syncPrefsGroup->addRadio(i18n("Take local entry on conflict")); 340 syncPrefsGroup->addRadio(i18n("Take local entry on conflict"));
341 syncPrefsGroup->addRadio(i18n("Take remote entry on conflict")); 341 syncPrefsGroup->addRadio(i18n("Take remote entry on conflict"));
342 syncPrefsGroup->addRadio(i18n("Take newest entry on conflict")); 342 syncPrefsGroup->addRadio(i18n("Take newest entry on conflict"));
343 syncPrefsGroup->addRadio(i18n("Ask for every entry on conflict")); 343 syncPrefsGroup->addRadio(i18n("Ask for every entry on conflict"));
344 syncPrefsGroup->addRadio(i18n("Force take local entry always")); 344 syncPrefsGroup->addRadio(i18n("Force take local entry always"));
345 syncPrefsGroup->addRadio(i18n("Force take remote entry always")); 345 syncPrefsGroup->addRadio(i18n("Force take remote entry always"));
346 topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1); 346 topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1);
347 ++iii; 347 ++iii;
348 sb = 348 sb =
349 addWidBool(i18n("Show summary after syncing"), 349 addWidBool(i18n("Show summary after syncing"),
350 &(KOPrefs::instance()->mShowSyncSummary),topFrame); 350 &(KOPrefs::instance()->mShowSyncSummary),topFrame);
351 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); 351 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
352 352
353 ++iii; 353 ++iii;
354#endif 354#endif
@@ -373,215 +373,215 @@ void KOPrefsDialog::setupSyncTab()
373 373
374 mRemoteIPEdit = new QLineEdit(topFrame); 374 mRemoteIPEdit = new QLineEdit(topFrame);
375 lab = new QLabel(mRemoteIPEdit, i18n("Remote IP:"), topFrame); 375 lab = new QLabel(mRemoteIPEdit, i18n("Remote IP:"), topFrame);
376 topLayout->addWidget(lab ,iii,0); 376 topLayout->addWidget(lab ,iii,0);
377 topLayout->addWidget(mRemoteIPEdit,iii,1); 377 topLayout->addWidget(mRemoteIPEdit,iii,1);
378 ++iii; 378 ++iii;
379 mRemoteUser = new QLineEdit(topFrame); 379 mRemoteUser = new QLineEdit(topFrame);
380 lab = new QLabel(mRemoteUser, i18n("Remote user:"), topFrame); 380 lab = new QLabel(mRemoteUser, i18n("Remote user:"), topFrame);
381 topLayout->addWidget(lab ,iii,0); 381 topLayout->addWidget(lab ,iii,0);
382 topLayout->addWidget(mRemoteUser, iii,1); 382 topLayout->addWidget(mRemoteUser, iii,1);
383 ++iii; 383 ++iii;
384 384
385 mRemoteFile = new QLineEdit(topFrame); 385 mRemoteFile = new QLineEdit(topFrame);
386 lab = new QLabel(mRemoteFile, i18n("Remote file:"), topFrame); 386 lab = new QLabel(mRemoteFile, i18n("Remote file:"), topFrame);
387 topLayout->addWidget(lab ,iii,0); 387 topLayout->addWidget(lab ,iii,0);
388 topLayout->addWidget(mRemoteFile,iii,1); 388 topLayout->addWidget(mRemoteFile,iii,1);
389 ++iii; 389 ++iii;
390 390
391 mLocalTempFile = new QLineEdit(topFrame); 391 mLocalTempFile = new QLineEdit(topFrame);
392 lab = new QLabel(mLocalTempFile, i18n("Local temp file:"), topFrame); 392 lab = new QLabel(mLocalTempFile, i18n("Local temp file:"), topFrame);
393 topLayout->addWidget(lab ,iii,0); 393 topLayout->addWidget(lab ,iii,0);
394 topLayout->addWidget(mLocalTempFile,iii,1); 394 topLayout->addWidget(mLocalTempFile,iii,1);
395 ++iii; 395 ++iii;
396 396
397 KPrefsWidBool *wb = 397 KPrefsDialogWidBool *wb =
398 addWidBool(i18n("Write back synced file"), 398 addWidBool(i18n("Write back synced file"),
399 &(KOPrefs::instance()->mWriteBackFile),topFrame); 399 &(KOPrefs::instance()->mWriteBackFile),topFrame);
400 topLayout->addMultiCellWidget(wb->checkBox(), iii,iii,0,1); 400 topLayout->addMultiCellWidget(wb->checkBox(), iii,iii,0,1);
401 ++iii; 401 ++iii;
402 wb = 402 wb =
403 addWidBool(i18n("Write back existing entries only"), 403 addWidBool(i18n("Write back existing entries only"),
404 &(KOPrefs::instance()->mWriteBackExistingOnly),topFrame); 404 &(KOPrefs::instance()->mWriteBackExistingOnly),topFrame);
405 topLayout->addMultiCellWidget(wb->checkBox(), iii,iii,0,1); 405 topLayout->addMultiCellWidget(wb->checkBox(), iii,iii,0,1);
406 ++iii; 406 ++iii;
407 407
408#endif 408#endif
409} 409}
410 410
411void KOPrefsDialog::setupMainTab() 411void KOPrefsDialog::setupMainTab()
412{ 412{
413 QFrame *topFrame = addPage(i18n("General"),0,0); 413 QFrame *topFrame = addPage(i18n("General"),0,0);
414 // DesktopIcon("identity",KIcon::SizeMedium)); 414 // DesktopIcon("identity",KIcon::SizeMedium));
415 415
416 QGridLayout *topLayout = new QGridLayout(topFrame,6,2); 416 QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
417 topLayout->setSpacing(spacingHint()); 417 topLayout->setSpacing(spacingHint());
418 topLayout->setMargin(marginHint()); 418 topLayout->setMargin(marginHint());
419 419
420 // KPrefsWidBool *emailControlCenter = 420 // KPrefsDialogWidBool *emailControlCenter =
421// addWidBool(i18n("&Use email settings from Control Center"), 421// addWidBool(i18n("&Use email settings from Control Center"),
422// &(KOPrefs::instance()->mEmailControlCenter),topFrame); 422// &(KOPrefs::instance()->mEmailControlCenter),topFrame);
423// topLayout->addMultiCellWidget(emailControlCenter->checkBox(),0,0,0,1); 423// topLayout->addMultiCellWidget(emailControlCenter->checkBox(),0,0,0,1);
424 // connect(emailControlCenter->checkBox(),SIGNAL(toggled(bool)), 424 // connect(emailControlCenter->checkBox(),SIGNAL(toggled(bool)),
425 // SLOT(toggleEmailSettings(bool))); 425 // SLOT(toggleEmailSettings(bool)));
426 426
427 mNameEdit = new QLineEdit(topFrame); 427 mNameEdit = new QLineEdit(topFrame);
428 mNameLabel = new QLabel(mNameEdit, i18n("Full &name:"), topFrame); 428 mNameLabel = new QLabel(mNameEdit, i18n("Full &name:"), topFrame);
429 topLayout->addWidget(mNameLabel,0,0); 429 topLayout->addWidget(mNameLabel,0,0);
430 topLayout->addWidget(mNameEdit,0,1); 430 topLayout->addWidget(mNameEdit,0,1);
431 431
432 mEmailEdit = new QLineEdit(topFrame); 432 mEmailEdit = new QLineEdit(topFrame);
433 mEmailLabel = new QLabel(mEmailEdit, i18n("E&mail address:"),topFrame); 433 mEmailLabel = new QLabel(mEmailEdit, i18n("E&mail address:"),topFrame);
434 topLayout->addWidget(mEmailLabel,1,0); 434 topLayout->addWidget(mEmailLabel,1,0);
435 topLayout->addWidget(mEmailEdit,1,1); 435 topLayout->addWidget(mEmailEdit,1,1);
436 KPrefsWidBool *wb; 436 KPrefsDialogWidBool *wb;
437 QHBox *dummy; 437 QHBox *dummy;
438 if ( QApplication::desktop()->width() > 480 ) { 438 if ( QApplication::desktop()->width() > 480 ) {
439 dummy = new QHBox(topFrame); 439 dummy = new QHBox(topFrame);
440 } else { 440 } else {
441 dummy = new QVBox(topFrame); 441 dummy = new QVBox(topFrame);
442 } 442 }
443 443
444 topLayout->addMultiCellWidget(dummy, 2,2,0,1); 444 topLayout->addMultiCellWidget(dummy, 2,2,0,1);
445 addWidBool(i18n("Full menu bar(nr)"), 445 addWidBool(i18n("Full menu bar(nr)"),
446 &(KOPrefs::instance()->mShowFullMenu),dummy); 446 &(KOPrefs::instance()->mShowFullMenu),dummy);
447 447
448 448
449 addWidBool(i18n("Mini icons in toolbar(nr)"), 449 addWidBool(i18n("Mini icons in toolbar(nr)"),
450 &(KOPrefs::instance()->mToolBarMiniIcons),dummy); 450 &(KOPrefs::instance()->mToolBarMiniIcons),dummy);
451 451
452 452
453 dummy = new QHBox(topFrame); 453 dummy = new QHBox(topFrame);
454 new QLabel(i18n("Days in What's Next:"),dummy); 454 new QLabel(i18n("Days in What's Next:"),dummy);
455 mWhatsNextSpin = new QSpinBox(1,14,1,dummy); 455 mWhatsNextSpin = new QSpinBox(1,14,1,dummy);
456 456
457 topLayout->addMultiCellWidget(dummy,3,3,0,1); 457 topLayout->addMultiCellWidget(dummy,3,3,0,1);
458 458
459 459
460 460
461 dummy = new QHBox(topFrame); 461 dummy = new QHBox(topFrame);
462 new QLabel(i18n("Days in Next-X-Days:"),dummy); 462 new QLabel(i18n("Days in Next-X-Days:"),dummy);
463 mNextXDaysSpin = new QSpinBox(2,14,1,dummy); 463 mNextXDaysSpin = new QSpinBox(2,14,1,dummy);
464 464
465 topLayout->addMultiCellWidget(dummy,4,4,0,1); 465 topLayout->addMultiCellWidget(dummy,4,4,0,1);
466 466
467 QHBox *prioBox = new QHBox(topFrame); 467 QHBox *prioBox = new QHBox(topFrame);
468 // intervalBox->setSpacing(spacingHint()); 468 // intervalBox->setSpacing(spacingHint());
469 topLayout->addMultiCellWidget(prioBox,5,5,0,1); 469 topLayout->addMultiCellWidget(prioBox,5,5,0,1);
470 QString messa = i18n("Show topmost todo prios in What's Next:"); 470 QString messa = i18n("Show topmost todo prios in What's Next:");
471 471
472 if ( QApplication::desktop()->width() < 300 ) 472 if ( QApplication::desktop()->width() < 300 )
473 messa = i18n("Show topmost todo prios in What's N.:"); 473 messa = i18n("Show topmost todo prios in What's N.:");
474 QLabel *prioLabel = new QLabel(messa, prioBox); 474 QLabel *prioLabel = new QLabel(messa, prioBox);
475 mPrioSpin = new QSpinBox(0,5,1,prioBox); 475 mPrioSpin = new QSpinBox(0,5,1,prioBox);
476 if ( QApplication::desktop()->width() < 300 ) 476 if ( QApplication::desktop()->width() < 300 )
477 mPrioSpin->setFixedWidth( 40 ); 477 mPrioSpin->setFixedWidth( 40 );
478 478
479 // KPrefsWidBool *bcc = 479 // KPrefsDialogWidBool *bcc =
480// addWidBool(i18n("Send copy to owner when mailing events"), 480// addWidBool(i18n("Send copy to owner when mailing events"),
481// &(KOPrefs::instance()->mBcc),topFrame); 481// &(KOPrefs::instance()->mBcc),topFrame);
482// topLayout->addMultiCellWidget(bcc->checkBox(),4,4,0,1); 482// topLayout->addMultiCellWidget(bcc->checkBox(),4,4,0,1);
483 483
484 484
485 // QGroupBox *autoSaveGroup = new QGroupBox(1,Horizontal,i18n("Auto-Save"), topFrame); 485 // QGroupBox *autoSaveGroup = new QGroupBox(1,Horizontal,i18n("Auto-Save"), topFrame);
486 //topLayout->addMultiCellWidget(autoSaveGroup,6,6,0,1); 486 //topLayout->addMultiCellWidget(autoSaveGroup,6,6,0,1);
487 487
488 // addWidBool(i18n("Enable automatic saving of calendar"), 488 // addWidBool(i18n("Enable automatic saving of calendar"),
489 // &(KOPrefs::instance()->mAutoSave),autoSaveGroup); 489 // &(KOPrefs::instance()->mAutoSave),autoSaveGroup);
490 490
491 QHBox *intervalBox = new QHBox(topFrame); 491 QHBox *intervalBox = new QHBox(topFrame);
492 // intervalBox->setSpacing(spacingHint()); 492 // intervalBox->setSpacing(spacingHint());
493 topLayout->addMultiCellWidget(intervalBox,6,6,0,1); 493 topLayout->addMultiCellWidget(intervalBox,6,6,0,1);
494 QLabel *autoSaveIntervalLabel = new QLabel(i18n("Auto save delay in minutes:"),intervalBox); 494 QLabel *autoSaveIntervalLabel = new QLabel(i18n("Auto save delay in minutes:"),intervalBox);
495 mAutoSaveIntervalSpin = new QSpinBox(0,500,1,intervalBox); 495 mAutoSaveIntervalSpin = new QSpinBox(0,500,1,intervalBox);
496 autoSaveIntervalLabel->setBuddy(mAutoSaveIntervalSpin); 496 autoSaveIntervalLabel->setBuddy(mAutoSaveIntervalSpin);
497 /* 497 /*
498 QHBox * agendasize = new QHBox ( topFrame ); 498 QHBox * agendasize = new QHBox ( topFrame );
499 499
500 new QLabel (i18n("AllDayAgenda Height:"), agendasize ); 500 new QLabel (i18n("AllDayAgenda Height:"), agendasize );
501 501
502 502
503 mHourSizeSlider = new QSlider(24,47,1,24,Horizontal,agendasize); 503 mHourSizeSlider = new QSlider(24,47,1,24,Horizontal,agendasize);
504 topLayout->addMultiCellWidget(agendasize,7,7,0,1); 504 topLayout->addMultiCellWidget(agendasize,7,7,0,1);
505 */ 505 */
506 KPrefsWidBool *verticalScreen = 506 KPrefsDialogWidBool *verticalScreen =
507 addWidBool(i18n("Show vertical screen (Needs restart)"), 507 addWidBool(i18n("Show vertical screen (Needs restart)"),
508 &(KOPrefs::instance()->mVerticalScreen),topFrame); 508 &(KOPrefs::instance()->mVerticalScreen),topFrame);
509 //topLayout->addWidget(verticalScreen->checkBox(),ii++,0); 509 //topLayout->addWidget(verticalScreen->checkBox(),ii++,0);
510 topLayout->addMultiCellWidget(verticalScreen->checkBox(),7,7,0,1); 510 topLayout->addMultiCellWidget(verticalScreen->checkBox(),7,7,0,1);
511 511
512 KPrefsWidBool *ask = 512 KPrefsDialogWidBool *ask =
513 addWidBool(i18n("Ask for quit when closing KO/Pi"), 513 addWidBool(i18n("Ask for quit when closing KO/Pi"),
514 &(KOPrefs::instance()->mAskForQuit),topFrame); 514 &(KOPrefs::instance()->mAskForQuit),topFrame);
515 topLayout->addMultiCellWidget(ask->checkBox(),8,8,0,1); 515 topLayout->addMultiCellWidget(ask->checkBox(),8,8,0,1);
516 516
517 517
518 /* 518 /*
519 KPrefsWidBool *confirmCheck = 519 KPrefsDialogWidBool *confirmCheck =
520 addWidBool(i18n("Confirm &deletes"),&(KOPrefs::instance()->mConfirm), 520 addWidBool(i18n("Confirm &deletes"),&(KOPrefs::instance()->mConfirm),
521 topFrame); 521 topFrame);
522 topLayout->addMultiCellWidget(confirmCheck->checkBox(),7,7,0,1); 522 topLayout->addMultiCellWidget(confirmCheck->checkBox(),7,7,0,1);
523 523
524 524
525 mEnableGroupScheduling = 525 mEnableGroupScheduling =
526 addWidBool(i18n("Enable group scheduling"), 526 addWidBool(i18n("Enable group scheduling"),
527 &(KOPrefs::instance()->mEnableGroupScheduling),topFrame); 527 &(KOPrefs::instance()->mEnableGroupScheduling),topFrame);
528 topLayout->addWidget(mEnableGroupScheduling->checkBox(),8,0); 528 topLayout->addWidget(mEnableGroupScheduling->checkBox(),8,0);
529 connect(mEnableGroupScheduling->checkBox(),SIGNAL(clicked()), 529 connect(mEnableGroupScheduling->checkBox(),SIGNAL(clicked()),
530 SLOT(warningGroupScheduling())); 530 SLOT(warningGroupScheduling()));
531 531
532 mEnableProjectView = 532 mEnableProjectView =
533 addWidBool(i18n("Enable project view"), 533 addWidBool(i18n("Enable project view"),
534 &(KOPrefs::instance()->mEnableProjectView),topFrame); 534 &(KOPrefs::instance()->mEnableProjectView),topFrame);
535 topLayout->addWidget(mEnableProjectView->checkBox(),9,0); 535 topLayout->addWidget(mEnableProjectView->checkBox(),9,0);
536 connect(mEnableProjectView->checkBox(),SIGNAL(clicked()), 536 connect(mEnableProjectView->checkBox(),SIGNAL(clicked()),
537 SLOT(warningProjectView())); 537 SLOT(warningProjectView()));
538 538
539 // Can't be disabled anymore 539 // Can't be disabled anymore
540 mEnableGroupScheduling->checkBox()->hide(); 540 mEnableGroupScheduling->checkBox()->hide();
541 541
542 // Disable setting, because this feature now becomes stable 542 // Disable setting, because this feature now becomes stable
543 mEnableProjectView->checkBox()->hide(); 543 mEnableProjectView->checkBox()->hide();
544 544
545 KPrefsWidRadios *defaultFormatGroup = 545 KPrefsWidRadios *defaultFormatGroup =
546 addWidRadios(i18n("Default Calendar Format"), 546 addWidRadios(i18n("Default Calendar Format"),
547 &(KOPrefs::instance()->mDefaultFormat),topFrame); 547 &(KOPrefs::instance()->mDefaultFormat),topFrame);
548 defaultFormatGroup->addRadio(i18n("vCalendar")); 548 defaultFormatGroup->addRadio(i18n("vCalendar"));
549 defaultFormatGroup->addRadio(i18n("iCalendar")); 549 defaultFormatGroup->addRadio(i18n("iCalendar"));
550 550
551 topLayout->addMultiCellWidget(defaultFormatGroup->groupBox(),10,10,0,1); 551 topLayout->addMultiCellWidget(defaultFormatGroup->groupBox(),10,10,0,1);
552 552
553 // Default format unconditionally is iCalendar 553 // Default format unconditionally is iCalendar
554 defaultFormatGroup->groupBox()->hide(); 554 defaultFormatGroup->groupBox()->hide();
555 555
556 KPrefsWidRadios *mailClientGroup = 556 KPrefsWidRadios *mailClientGroup =
557 addWidRadios(i18n("Mail Client"),&(KOPrefs::instance()->mMailClient), 557 addWidRadios(i18n("Mail Client"),&(KOPrefs::instance()->mMailClient),
558 topFrame); 558 topFrame);
559 mailClientGroup->addRadio(i18n("KMail")); 559 mailClientGroup->addRadio(i18n("KMail"));
560 mailClientGroup->addRadio(i18n("Sendmail")); 560 mailClientGroup->addRadio(i18n("Sendmail"));
561 topLayout->addMultiCellWidget(mailClientGroup->groupBox(),11,11,0,1); 561 topLayout->addMultiCellWidget(mailClientGroup->groupBox(),11,11,0,1);
562 562
563 KPrefsWidBool *htmlsave = 563 KPrefsDialogWidBool *htmlsave =
564 addWidBool(i18n("Export to HTML with every save"),&(KOPrefs::instance()->mHtmlWithSave), 564 addWidBool(i18n("Export to HTML with every save"),&(KOPrefs::instance()->mHtmlWithSave),
565 topFrame); 565 topFrame);
566 topLayout->addMultiCellWidget(htmlsave->checkBox(),12,12,0,1); 566 topLayout->addMultiCellWidget(htmlsave->checkBox(),12,12,0,1);
567 567
568 KPrefsWidRadios *destinationGroup = 568 KPrefsWidRadios *destinationGroup =
569 addWidRadios(i18n("New Events/Todos should"),&(KOPrefs::instance()->mDestination), 569 addWidRadios(i18n("New Events/Todos should"),&(KOPrefs::instance()->mDestination),
570 topFrame); 570 topFrame);
571 destinationGroup->addRadio(i18n("be added to the standard resource")); 571 destinationGroup->addRadio(i18n("be added to the standard resource"));
572 destinationGroup->addRadio(i18n("be asked which resource to use")); 572 destinationGroup->addRadio(i18n("be asked which resource to use"));
573 topLayout->addMultiCellWidget(destinationGroup->groupBox(),13,13,0,1); 573 topLayout->addMultiCellWidget(destinationGroup->groupBox(),13,13,0,1);
574 574
575 topLayout->setRowStretch(14,1); 575 topLayout->setRowStretch(14,1);
576 */ 576 */
577} 577}
578 578
579 579
580void KOPrefsDialog::setupTimeTab() 580void KOPrefsDialog::setupTimeTab()
581{ 581{
582 QFrame *topFrame = addPage(i18n("Time"),0,0); 582 QFrame *topFrame = addPage(i18n("Time"),0,0);
583 // DesktopIcon("clock",KIcon::SizeMedium)); 583 // DesktopIcon("clock",KIcon::SizeMedium));
584 584
585 QGridLayout *topLayout = new QGridLayout(topFrame,4,2); 585 QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
586 topLayout->setSpacing(spacingHint()); 586 topLayout->setSpacing(spacingHint());
587 topLayout->setMargin(marginHint()); 587 topLayout->setMargin(marginHint());
@@ -619,175 +619,175 @@ void KOPrefsDialog::setupTimeTab()
619 619
620 QGroupBox *workingHoursGroup = new QGroupBox(1,Horizontal, 620 QGroupBox *workingHoursGroup = new QGroupBox(1,Horizontal,
621 i18n("Working Hours"), 621 i18n("Working Hours"),
622 topFrame); 622 topFrame);
623 topLayout->addMultiCellWidget(workingHoursGroup,4,4,0,1); 623 topLayout->addMultiCellWidget(workingHoursGroup,4,4,0,1);
624 workingHoursGroup->layout()->setSpacing( 0 ); 624 workingHoursGroup->layout()->setSpacing( 0 );
625 workingHoursGroup->layout()->setMargin( 4 ); 625 workingHoursGroup->layout()->setMargin( 4 );
626 QHBox *workStartBox = new QHBox(workingHoursGroup); 626 QHBox *workStartBox = new QHBox(workingHoursGroup);
627 // workStartBox->setMargin( 0 ); 627 // workStartBox->setMargin( 0 );
628 addWidTime(i18n("Daily starting hour:"), 628 addWidTime(i18n("Daily starting hour:"),
629 &(KOPrefs::instance()->mWorkingHoursStart),workStartBox); 629 &(KOPrefs::instance()->mWorkingHoursStart),workStartBox);
630 630
631 QHBox *workEndBox = new QHBox(workingHoursGroup); 631 QHBox *workEndBox = new QHBox(workingHoursGroup);
632 //workEndBox->setMargin( 0 ); 632 //workEndBox->setMargin( 0 );
633 addWidTime(i18n("Daily ending hour:"), 633 addWidTime(i18n("Daily ending hour:"),
634 &(KOPrefs::instance()->mWorkingHoursEnd),workEndBox); 634 &(KOPrefs::instance()->mWorkingHoursEnd),workEndBox);
635 QVBox *excludeBox = new QVBox(workingHoursGroup); 635 QVBox *excludeBox = new QVBox(workingHoursGroup);
636 //excludeBox->setMargin( 0 ); 636 //excludeBox->setMargin( 0 );
637 addWidBool(i18n("Exclude holidays"), 637 addWidBool(i18n("Exclude holidays"),
638 &(KOPrefs::instance()->mExcludeHolidays),excludeBox); 638 &(KOPrefs::instance()->mExcludeHolidays),excludeBox);
639 639
640 addWidBool(i18n("Exclude Saturdays"), 640 addWidBool(i18n("Exclude Saturdays"),
641 &(KOPrefs::instance()->mExcludeSaturdays),excludeBox); 641 &(KOPrefs::instance()->mExcludeSaturdays),excludeBox);
642 642
643// KPrefsWidBool *marcusBainsShowSeconds = addWidBool(i18n("Show seconds on Marcus Bains line"), 643// KPrefsDialogWidBool *marcusBainsShowSeconds = addWidBool(i18n("Show seconds on Marcus Bains line"),
644 // &(KOPrefs::instance()->mMarcusBainsShowSeconds), 644 // &(KOPrefs::instance()->mMarcusBainsShowSeconds),
645 // topFrame); 645 // topFrame);
646// topLayout->addWidget(marcusBainsShowSeconds->checkBox(),5,0); 646// topLayout->addWidget(marcusBainsShowSeconds->checkBox(),5,0);
647 647
648 // topLayout->setRowStretch(6,1); 648 // topLayout->setRowStretch(6,1);
649} 649}
650 650
651 651
652void KOPrefsDialog::setupViewsTab() 652void KOPrefsDialog::setupViewsTab()
653{ 653{
654 654
655 QFrame *topFrame = addPage(i18n("Views"),0,0); 655 QFrame *topFrame = addPage(i18n("Views"),0,0);
656 // DesktopIcon("viewmag",KIcon::SizeMedium)); 656 // DesktopIcon("viewmag",KIcon::SizeMedium));
657 657
658 QGridLayout *topLayout = new QGridLayout(topFrame,6,1); 658 QGridLayout *topLayout = new QGridLayout(topFrame,6,1);
659 topLayout->setSpacing(spacingHint()); 659 topLayout->setSpacing(spacingHint());
660 topLayout->setMargin(marginHint()); 660 topLayout->setMargin(marginHint());
661 661
662// QBoxLayout *dayBeginsLayout = new QHBoxLayout; 662// QBoxLayout *dayBeginsLayout = new QHBoxLayout;
663// topLayout->addLayout(dayBeginsLayout,0,0); 663// topLayout->addLayout(dayBeginsLayout,0,0);
664 664
665// KPrefsWidTime *dayBegins = 665// KPrefsWidTime *dayBegins =
666// addWidTime(i18n("Day begins at:"),&(KOPrefs::instance()->mDayBegins), 666// addWidTime(i18n("Day begins at:"),&(KOPrefs::instance()->mDayBegins),
667// topFrame); 667// topFrame);
668// dayBeginsLayout->addWidget(dayBegins->label()); 668// dayBeginsLayout->addWidget(dayBegins->label());
669// dayBeginsLayout->addStretch(1); 669// dayBeginsLayout->addStretch(1);
670// dayBeginsLayout->addWidget(dayBegins->spinBox()); 670// dayBeginsLayout->addWidget(dayBegins->spinBox());
671 671
672// QBoxLayout *nextDaysLayout = new QHBoxLayout; 672// QBoxLayout *nextDaysLayout = new QHBoxLayout;
673// topLayout->addLayout(nextDaysLayout,1,0); 673// topLayout->addLayout(nextDaysLayout,1,0);
674// nextDaysLayout->addWidget(new QLabel(i18n("Days to show in Next-X-Days view:"),topFrame)); 674// nextDaysLayout->addWidget(new QLabel(i18n("Days to show in Next-X-Days view:"),topFrame));
675// mNextXDaysSpin = new QSpinBox(2,14,1,topFrame); 675// mNextXDaysSpin = new QSpinBox(2,14,1,topFrame);
676// nextDaysLayout->addStretch(1); 676// nextDaysLayout->addStretch(1);
677// nextDaysLayout->addWidget(mNextXDaysSpin); 677// nextDaysLayout->addWidget(mNextXDaysSpin);
678 678
679 679
680 int ii = 0; 680 int ii = 0;
681 KPrefsWidBool *dummy = 681 KPrefsDialogWidBool *dummy =
682 addWidBool(i18n("Edit item on doubleclick (if not, show)"), 682 addWidBool(i18n("Edit item on doubleclick (if not, show)"),
683 &(KOPrefs::instance()->mEditOnDoubleClick),topFrame); 683 &(KOPrefs::instance()->mEditOnDoubleClick),topFrame);
684 topLayout->addWidget(dummy->checkBox(),ii++,0); 684 topLayout->addWidget(dummy->checkBox(),ii++,0);
685 685
686 dummy = 686 dummy =
687 addWidBool(i18n("Highlight current day in agenda"), 687 addWidBool(i18n("Highlight current day in agenda"),
688 &(KOPrefs::instance()->mHighlightCurrentDay),topFrame); 688 &(KOPrefs::instance()->mHighlightCurrentDay),topFrame);
689 topLayout->addWidget(dummy->checkBox(),ii++,0); 689 topLayout->addWidget(dummy->checkBox(),ii++,0);
690 690
691 dummy = 691 dummy =
692 addWidBool(i18n("Use light color for highlight current day"), 692 addWidBool(i18n("Use light color for highlight current day"),
693 &(KOPrefs::instance()->mUseHighlightLightColor),topFrame); 693 &(KOPrefs::instance()->mUseHighlightLightColor),topFrame);
694 topLayout->addWidget(dummy->checkBox(),ii++,0); 694 topLayout->addWidget(dummy->checkBox(),ii++,0);
695 695
696 KPrefsWidBool *dailyRecur = 696 KPrefsDialogWidBool *dailyRecur =
697 addWidBool(i18n("Show events that recur daily in date nav."), 697 addWidBool(i18n("Show events that recur daily in date nav."),
698 &(KOPrefs::instance()->mDailyRecur),topFrame); 698 &(KOPrefs::instance()->mDailyRecur),topFrame);
699 topLayout->addWidget(dailyRecur->checkBox(),ii++,0); 699 topLayout->addWidget(dailyRecur->checkBox(),ii++,0);
700 700
701 KPrefsWidBool *weeklyRecur = 701 KPrefsDialogWidBool *weeklyRecur =
702 addWidBool(i18n("Show ev. that recur weekly in date nav."), 702 addWidBool(i18n("Show ev. that recur weekly in date nav."),
703 &(KOPrefs::instance()->mWeeklyRecur),topFrame); 703 &(KOPrefs::instance()->mWeeklyRecur),topFrame);
704 topLayout->addWidget(weeklyRecur->checkBox(),ii++,0); 704 topLayout->addWidget(weeklyRecur->checkBox(),ii++,0);
705 if ( QApplication::desktop()->width() > 640 ) { 705 if ( QApplication::desktop()->width() > 640 ) {
706 706
707 KPrefsWidBool *enableToolTips = 707 KPrefsDialogWidBool *enableToolTips =
708 addWidBool(i18n("Enable tooltips displaying summary of ev."), 708 addWidBool(i18n("Enable tooltips displaying summary of ev."),
709 &(KOPrefs::instance()->mEnableToolTips),topFrame); 709 &(KOPrefs::instance()->mEnableToolTips),topFrame);
710 topLayout->addWidget(enableToolTips->checkBox(),ii++,0); 710 topLayout->addWidget(enableToolTips->checkBox(),ii++,0);
711 711
712 } 712 }
713 KPrefsWidBool *passwdk = 713 KPrefsDialogWidBool *passwdk =
714 addWidBool(i18n("Show parent To-Do's in What's Next view"), 714 addWidBool(i18n("Show parent To-Do's in What's Next view"),
715 &(KOPrefs::instance()->mWNViewShowsParents),topFrame); 715 &(KOPrefs::instance()->mWNViewShowsParents),topFrame);
716 topLayout->addWidget(passwdk->checkBox(), ii++,0); 716 topLayout->addWidget(passwdk->checkBox(), ii++,0);
717 717
718 passwdk = 718 passwdk =
719 addWidBool(i18n("Show location in What's Next view"), 719 addWidBool(i18n("Show location in What's Next view"),
720 &(KOPrefs::instance()->mWNViewShowLocation),topFrame); 720 &(KOPrefs::instance()->mWNViewShowLocation),topFrame);
721 topLayout->addWidget(passwdk->checkBox(), ii++,0); 721 topLayout->addWidget(passwdk->checkBox(), ii++,0);
722 722
723 passwdk = 723 passwdk =
724 addWidBool(i18n("Show Sync Events in WN/Agenda view"), 724 addWidBool(i18n("Show Sync Events in WN/Agenda view"),
725 &(KOPrefs::instance()->mShowSyncEvents),topFrame); 725 &(KOPrefs::instance()->mShowSyncEvents),topFrame);
726 topLayout->addWidget(passwdk->checkBox(), ii++,0); 726 topLayout->addWidget(passwdk->checkBox(), ii++,0);
727 727
728 728
729 KPrefsWidBool *marcusBainsEnabled = 729 KPrefsDialogWidBool *marcusBainsEnabled =
730 addWidBool(i18n("Show Marcus Bains line"), 730 addWidBool(i18n("Show Marcus Bains line"),
731 &(KOPrefs::instance()->mMarcusBainsEnabled),topFrame); 731 &(KOPrefs::instance()->mMarcusBainsEnabled),topFrame);
732 topLayout->addWidget(marcusBainsEnabled->checkBox(),ii++,0); 732 topLayout->addWidget(marcusBainsEnabled->checkBox(),ii++,0);
733 733
734 734
735 // topLayout->addWidget(hourSizeGroup,ii++,0); 735 // topLayout->addWidget(hourSizeGroup,ii++,0);
736 // topLayout->addMultiCellWidget(hourSizeGroup,ii,ii,0,0); 736 // topLayout->addMultiCellWidget(hourSizeGroup,ii,ii,0,0);
737 //topLayout->setRowStretch(11,1); 737 //topLayout->setRowStretch(11,1);
738 738
739 739
740 740
741 741
742 742
743 743
744 topFrame = addPage(i18n("ViewChange"),0,0); 744 topFrame = addPage(i18n("ViewChange"),0,0);
745 // DesktopIcon("viewmag",KIcon::SizeMedium)); 745 // DesktopIcon("viewmag",KIcon::SizeMedium));
746 746
747 topLayout = new QGridLayout(topFrame,6,1); 747 topLayout = new QGridLayout(topFrame,6,1);
748 topLayout->setSpacing(spacingHint()); 748 topLayout->setSpacing(spacingHint());
749 topLayout->setMargin(marginHint()); 749 topLayout->setMargin(marginHint());
750 ii = 0; 750 ii = 0;
751 751
752 752
753 dummy = 753 dummy =
754 addWidBool(i18n("Hold fullscreen on view change"), 754 addWidBool(i18n("Hold fullscreen on view change"),
755 &(KOPrefs::instance()->mViewChangeHoldFullscreen),topFrame); 755 &(KOPrefs::instance()->mViewChangeHoldFullscreen),topFrame);
756 topLayout->addWidget(dummy->checkBox(),ii++,0); 756 topLayout->addWidget(dummy->checkBox(),ii++,0);
757 757
758 dummy = 758 dummy =
759 addWidBool(i18n("Hold non-fullscreen on view change"), 759 addWidBool(i18n("Hold non-fullscreen on view change"),
760 &(KOPrefs::instance()->mViewChangeHoldNonFullscreen),topFrame); 760 &(KOPrefs::instance()->mViewChangeHoldNonFullscreen),topFrame);
761 topLayout->addWidget(dummy->checkBox(),ii++,0); 761 topLayout->addWidget(dummy->checkBox(),ii++,0);
762 762
763 763
764 KPrefsWidBool *fullViewTodo = 764 KPrefsDialogWidBool *fullViewTodo =
765 addWidBool(i18n("Event list view uses full window"), 765 addWidBool(i18n("Event list view uses full window"),
766 &(KOPrefs::instance()->mFullViewTodo),topFrame); 766 &(KOPrefs::instance()->mFullViewTodo),topFrame);
767 topLayout->addWidget(fullViewTodo->checkBox(),ii++,0); 767 topLayout->addWidget(fullViewTodo->checkBox(),ii++,0);
768 768
769 KPrefsWidBool *fullViewMonth = 769 KPrefsDialogWidBool *fullViewMonth =
770 addWidBool(i18n("Next days view uses full window"), 770 addWidBool(i18n("Next days view uses full window"),
771 &(KOPrefs::instance()->mFullViewMonth),topFrame); 771 &(KOPrefs::instance()->mFullViewMonth),topFrame);
772 topLayout->addWidget(fullViewMonth->checkBox(),ii++,0); 772 topLayout->addWidget(fullViewMonth->checkBox(),ii++,0);
773 773
774 dummy = 774 dummy =
775 addWidBool(i18n("Set agenda to DayBeginsAt on change"), 775 addWidBool(i18n("Set agenda to DayBeginsAt on change"),
776 &(KOPrefs::instance()->mSetTimeToDayStartAt),topFrame); 776 &(KOPrefs::instance()->mSetTimeToDayStartAt),topFrame);
777 topLayout->addWidget(dummy->checkBox(),ii++,0); 777 topLayout->addWidget(dummy->checkBox(),ii++,0);
778 778
779 dummy = 779 dummy =
780 addWidBool(i18n("Set agenda to current time on change"), 780 addWidBool(i18n("Set agenda to current time on change"),
781 &(KOPrefs::instance()->mCenterOnCurrentTime),topFrame); 781 &(KOPrefs::instance()->mCenterOnCurrentTime),topFrame);
782 topLayout->addWidget(dummy->checkBox(),ii++,0); 782 topLayout->addWidget(dummy->checkBox(),ii++,0);
783 783
784 dummy = 784 dummy =
785 addWidBool(i18n("Listview uses monthly timespan"), 785 addWidBool(i18n("Listview uses monthly timespan"),
786 &(KOPrefs::instance()->mListViewMonthTimespan),topFrame); 786 &(KOPrefs::instance()->mListViewMonthTimespan),topFrame);
787 topLayout->addWidget(dummy->checkBox(),ii++,0); 787 topLayout->addWidget(dummy->checkBox(),ii++,0);
788 dummy = 788 dummy =
789 addWidBool(i18n("Highlight selection in Time Edit"), 789 addWidBool(i18n("Highlight selection in Time Edit"),
790 &(KOPrefs::instance()->mHightlightDateTimeEdit),topFrame); 790 &(KOPrefs::instance()->mHightlightDateTimeEdit),topFrame);
791 topLayout->addWidget( dummy->checkBox(), ii++,0); 791 topLayout->addWidget( dummy->checkBox(), ii++,0);
792 792
793 793
@@ -822,103 +822,103 @@ void KOPrefsDialog::setupViewsTab()
822 &(KOPrefs::instance()->mMonthWeeklyRecur),habo); 822 &(KOPrefs::instance()->mMonthWeeklyRecur),habo);
823 topLayout->addMultiCellWidget(habo,ii, ii,0,1); 823 topLayout->addMultiCellWidget(habo,ii, ii,0,1);
824 ii++; 824 ii++;
825 825
826 826
827 habo = new QHBox( topFrame ); 827 habo = new QHBox( topFrame );
828 if ( QApplication::desktop()->width() < 320 ) { 828 if ( QApplication::desktop()->width() < 320 ) {
829 lab = new QLabel (i18n("Show in every cell ") , topFrame ); 829 lab = new QLabel (i18n("Show in every cell ") , topFrame );
830 topLayout->addMultiCellWidget(lab,ii, ii,0,1); 830 topLayout->addMultiCellWidget(lab,ii, ii,0,1);
831 ii++; 831 ii++;
832 832
833 } else { 833 } else {
834 new QLabel ( i18n("Show in every cell "), habo ); 834 new QLabel ( i18n("Show in every cell "), habo );
835 } 835 }
836 weeklyRecur = 836 weeklyRecur =
837 addWidBool(i18n("short month"), 837 addWidBool(i18n("short month"),
838 &(KOPrefs::instance()->mMonthShowShort),habo); 838 &(KOPrefs::instance()->mMonthShowShort),habo);
839 weeklyRecur = 839 weeklyRecur =
840 addWidBool(i18n("icons"), 840 addWidBool(i18n("icons"),
841 &(KOPrefs::instance()->mMonthShowIcons),habo); 841 &(KOPrefs::instance()->mMonthShowIcons),habo);
842 842
843 topLayout->addMultiCellWidget(habo,ii, ii,0,1); 843 topLayout->addMultiCellWidget(habo,ii, ii,0,1);
844 ii++; 844 ii++;
845#ifdef DESKTOP_VERSION 845#ifdef DESKTOP_VERSION
846 KPrefsWidBool *enableMonthScroll = 846 KPrefsDialogWidBool *enableMonthScroll =
847 addWidBool(i18n("Enable scrollbars in month view cells"), 847 addWidBool(i18n("Enable scrollbars in month view cells"),
848 &(KOPrefs::instance()->mEnableMonthScroll),topFrame); 848 &(KOPrefs::instance()->mEnableMonthScroll),topFrame);
849 topLayout->addWidget(enableMonthScroll->checkBox(),ii++,0); 849 topLayout->addWidget(enableMonthScroll->checkBox(),ii++,0);
850#endif 850#endif
851 851
852 dummy = 852 dummy =
853 addWidBool(i18n("Show Sat/Sun together"), 853 addWidBool(i18n("Show Sat/Sun together"),
854 &(KOPrefs::instance()->mMonthViewSatSunTog),topFrame); 854 &(KOPrefs::instance()->mMonthViewSatSunTog),topFrame);
855 topLayout->addWidget(dummy->checkBox(),ii++,0); 855 topLayout->addWidget(dummy->checkBox(),ii++,0);
856 856
857 KPrefsWidBool *coloredCategoriesInMonthView = 857 KPrefsDialogWidBool *coloredCategoriesInMonthView =
858 addWidBool(i18n("Month view uses category colors"), 858 addWidBool(i18n("Month view uses category colors"),
859 &(KOPrefs::instance()->mMonthViewUsesCategoryColor),topFrame); 859 &(KOPrefs::instance()->mMonthViewUsesCategoryColor),topFrame);
860 topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0); 860 topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0);
861 861
862 dummy = 862 dummy =
863 addWidBool(i18n("Categorie colors are applied to text"), 863 addWidBool(i18n("Categorie colors are applied to text"),
864 &(KOPrefs::instance()->mMonthViewUsesForegroundColor),topFrame); 864 &(KOPrefs::instance()->mMonthViewUsesForegroundColor),topFrame);
865 topLayout->addWidget(dummy->checkBox(),ii++,0); 865 topLayout->addWidget(dummy->checkBox(),ii++,0);
866 coloredCategoriesInMonthView = 866 coloredCategoriesInMonthView =
867 addWidBool(i18n("Month view uses day colors"), 867 addWidBool(i18n("Month view uses day colors"),
868 &(KOPrefs::instance()->mMonthViewUsesDayColors),topFrame); 868 &(KOPrefs::instance()->mMonthViewUsesDayColors),topFrame);
869 topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0); 869 topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0);
870 870
871 KPrefsWidColor *holidayColor = 871 KPrefsWidColor *holidayColor =
872 addWidColor(i18n("Day color odd months"), 872 addWidColor(i18n("Day color odd months"),
873 &(KOPrefs::instance()->mMonthViewOddColor),topFrame); 873 &(KOPrefs::instance()->mMonthViewOddColor),topFrame);
874 topLayout->addWidget(holidayColor->label(),ii,0); 874 topLayout->addWidget(holidayColor->label(),ii,0);
875 topLayout->addWidget(holidayColor->button(),ii++,1); 875 topLayout->addWidget(holidayColor->button(),ii++,1);
876 876
877 holidayColor = 877 holidayColor =
878 addWidColor(i18n("Day color even months"), 878 addWidColor(i18n("Day color even months"),
879 &(KOPrefs::instance()->mMonthViewEvenColor),topFrame); 879 &(KOPrefs::instance()->mMonthViewEvenColor),topFrame);
880 topLayout->addWidget(holidayColor->label(),ii,0); 880 topLayout->addWidget(holidayColor->label(),ii,0);
881 topLayout->addWidget(holidayColor->button(),ii++,1); 881 topLayout->addWidget(holidayColor->button(),ii++,1);
882 882
883 883
884 holidayColor = 884 holidayColor =
885 addWidColor(i18n("Color for Sundays + category \"Holiday\""), 885 addWidColor(i18n("Color for Sundays + category \"Holiday\""),
886 &(KOPrefs::instance()->mMonthViewHolidayColor),topFrame); 886 &(KOPrefs::instance()->mMonthViewHolidayColor),topFrame);
887 topLayout->addWidget(holidayColor->label(),ii,0); 887 topLayout->addWidget(holidayColor->label(),ii,0);
888 topLayout->addWidget(holidayColor->button(),ii++,1); 888 topLayout->addWidget(holidayColor->button(),ii++,1);
889 889
890 // *********************** Todo View 890 // *********************** Todo View
891 891
892 topFrame = addPage(i18n("Todo View"),0,0); 892 topFrame = addPage(i18n("Todo View"),0,0);
893 // DesktopIcon("viewmag",KIcon::SizeMedium)); 893 // DesktopIcon("viewmag",KIcon::SizeMedium));
894 894
895 topLayout = new QGridLayout(topFrame,4,1); 895 topLayout = new QGridLayout(topFrame,4,1);
896 topLayout->setSpacing(spacingHint()); 896 topLayout->setSpacing(spacingHint());
897 topLayout->setMargin(marginHint()); 897 topLayout->setMargin(marginHint());
898 ii = 0; 898 ii = 0;
899 899
900 KPrefsWidBool *showCompletedTodo = 900 KPrefsDialogWidBool *showCompletedTodo =
901 addWidBool(i18n("To-do view shows completed Todos"), 901 addWidBool(i18n("To-do view shows completed Todos"),
902 &(KOPrefs::instance()->mShowCompletedTodo),topFrame); 902 &(KOPrefs::instance()->mShowCompletedTodo),topFrame);
903 topLayout->addWidget(showCompletedTodo->checkBox(),ii++,0); 903 topLayout->addWidget(showCompletedTodo->checkBox(),ii++,0);
904 dummy = 904 dummy =
905 addWidBool(i18n("To-do view shows complete as 'xx %'"), 905 addWidBool(i18n("To-do view shows complete as 'xx %'"),
906 &(KOPrefs::instance()->mTodoViewShowsPercentage),topFrame); 906 &(KOPrefs::instance()->mTodoViewShowsPercentage),topFrame);
907 topLayout->addWidget(dummy->checkBox(),ii++,0); 907 topLayout->addWidget(dummy->checkBox(),ii++,0);
908 908
909 dummy = 909 dummy =
910 addWidBool(i18n("Small To-do view uses smaller font"), 910 addWidBool(i18n("Small To-do view uses smaller font"),
911 &(KOPrefs::instance()->mTodoViewUsesSmallFont),topFrame); 911 &(KOPrefs::instance()->mTodoViewUsesSmallFont),topFrame);
912 topLayout->addWidget(dummy->checkBox(),ii++,0); 912 topLayout->addWidget(dummy->checkBox(),ii++,0);
913 913
914 914
915 915
916 dummy = 916 dummy =
917 addWidBool(i18n("Todo view uses category colors"), 917 addWidBool(i18n("Todo view uses category colors"),
918 &(KOPrefs::instance()->mTodoViewUsesCatColors),topFrame); 918 &(KOPrefs::instance()->mTodoViewUsesCatColors),topFrame);
919 topLayout->addWidget(dummy->checkBox(),ii++,0); 919 topLayout->addWidget(dummy->checkBox(),ii++,0);
920 920
921 921
922 QWidget* wid = new QWidget( topFrame ); 922 QWidget* wid = new QWidget( topFrame );
923 // Todo due today color 923 // Todo due today color
924 KPrefsWidColor *todoDueTodayColor = 924 KPrefsWidColor *todoDueTodayColor =
@@ -1026,142 +1026,142 @@ void KOPrefsDialog::setupViewsTab()
1026// #else 1026// #else
1027// lab->setAlignment( AlignLeft|BreakAnywhere|WordBreak|AlignTop); 1027// lab->setAlignment( AlignLeft|BreakAnywhere|WordBreak|AlignTop);
1028// lab->setSizePolicy( QSizePolicy( QSizePolicy::Ignored , QSizePolicy::Ignored,true) ); 1028// lab->setSizePolicy( QSizePolicy( QSizePolicy::Ignored , QSizePolicy::Ignored,true) );
1029// #endif 1029// #endif
1030 1030
1031 1031
1032} 1032}
1033 1033
1034void KOPrefsDialog::selectSoundFile() 1034void KOPrefsDialog::selectSoundFile()
1035{ 1035{
1036 QString fileName = mDefaultAlarmFile->text(); 1036 QString fileName = mDefaultAlarmFile->text();
1037 fileName = KFileDialog::getSaveFileName( mDefaultAlarmFile->text() , "Choose default alarm file", this ); 1037 fileName = KFileDialog::getSaveFileName( mDefaultAlarmFile->text() , "Choose default alarm file", this );
1038 if ( fileName.length() > 0 ) 1038 if ( fileName.length() > 0 )
1039 mDefaultAlarmFile->setText( fileName ); 1039 mDefaultAlarmFile->setText( fileName );
1040} 1040}
1041void KOPrefsDialog::setupFontsTab() 1041void KOPrefsDialog::setupFontsTab()
1042{ 1042{
1043 1043
1044 QFrame *topFrame = addPage(i18n("Fonts"),0,0); 1044 QFrame *topFrame = addPage(i18n("Fonts"),0,0);
1045 // DesktopIcon("fonts",KIcon::SizeMedium)); 1045 // DesktopIcon("fonts",KIcon::SizeMedium));
1046 1046
1047 QGridLayout *topLayout = new QGridLayout(topFrame,7,3); 1047 QGridLayout *topLayout = new QGridLayout(topFrame,7,3);
1048 topLayout->setSpacing(1); 1048 topLayout->setSpacing(1);
1049 topLayout->setMargin(3); 1049 topLayout->setMargin(3);
1050 KPrefsWidFont * tVFont; 1050 KPrefsDialogWidFont * tVFont;
1051 int i = 0; 1051 int i = 0;
1052 KPrefsWidFont *timeLabelsFont = 1052 KPrefsDialogWidFont *timeLabelsFont =
1053 addWidFont(i18n("23"),i18n("DateNavigator:(nr)"), 1053 addWidFont(i18n("23"),i18n("DateNavigator:(nr)"),
1054 &(KOPrefs::instance()->mDateNavigatorFont),topFrame); 1054 &(KOPrefs::instance()->mDateNavigatorFont),topFrame);
1055 topLayout->addWidget(timeLabelsFont->label(),i,0); 1055 topLayout->addWidget(timeLabelsFont->label(),i,0);
1056 topLayout->addWidget(timeLabelsFont->preview(),i,1); 1056 topLayout->addWidget(timeLabelsFont->preview(),i,1);
1057 topLayout->addWidget(timeLabelsFont->button(),i,2); 1057 topLayout->addWidget(timeLabelsFont->button(),i,2);
1058 ++i; 1058 ++i;
1059 1059
1060 1060
1061 timeLabelsFont = 1061 timeLabelsFont =
1062 addWidFont(i18n("Mon 15"),i18n("Date Labels:"), 1062 addWidFont(i18n("Mon 15"),i18n("Date Labels:"),
1063 &(KOPrefs::instance()->mTimeLabelsFont),topFrame); 1063 &(KOPrefs::instance()->mTimeLabelsFont),topFrame);
1064 topLayout->addWidget(timeLabelsFont->label(),i,0); 1064 topLayout->addWidget(timeLabelsFont->label(),i,0);
1065 topLayout->addWidget(timeLabelsFont->preview(),i,1); 1065 topLayout->addWidget(timeLabelsFont->preview(),i,1);
1066 topLayout->addWidget(timeLabelsFont->button(),i,2); 1066 topLayout->addWidget(timeLabelsFont->button(),i,2);
1067 ++i; 1067 ++i;
1068 1068
1069 KPrefsWidFont *timeBarFont = 1069 KPrefsDialogWidFont *timeBarFont =
1070 addWidFont(KGlobal::locale()->formatTime(QTime(12,34)),i18n("Time bar:"), 1070 addWidFont(KGlobal::locale()->formatTime(QTime(12,34)),i18n("Time bar:"),
1071 &(KOPrefs::instance()->mTimeBarFont),topFrame); 1071 &(KOPrefs::instance()->mTimeBarFont),topFrame);
1072 topLayout->addWidget(timeBarFont->label(),i,0); 1072 topLayout->addWidget(timeBarFont->label(),i,0);
1073 topLayout->addWidget(timeBarFont->preview(),i,1); 1073 topLayout->addWidget(timeBarFont->preview(),i,1);
1074 topLayout->addWidget(timeBarFont->button(),i,2); 1074 topLayout->addWidget(timeBarFont->button(),i,2);
1075 ++i; 1075 ++i;
1076 1076
1077 1077
1078 KPrefsWidFont *marcusBainsFont = 1078 KPrefsDialogWidFont *marcusBainsFont =
1079 addWidFont(KGlobal::locale()->formatTime(QTime(12,34,23)),i18n("M. Bains line:"), 1079 addWidFont(KGlobal::locale()->formatTime(QTime(12,34,23)),i18n("M. Bains line:"),
1080 &(KOPrefs::instance()->mMarcusBainsFont),topFrame); 1080 &(KOPrefs::instance()->mMarcusBainsFont),topFrame);
1081 topLayout->addWidget(marcusBainsFont->label(),i,0); 1081 topLayout->addWidget(marcusBainsFont->label(),i,0);
1082 topLayout->addWidget(marcusBainsFont->preview(),i,1); 1082 topLayout->addWidget(marcusBainsFont->preview(),i,1);
1083 topLayout->addWidget(marcusBainsFont->button(),i,2); 1083 topLayout->addWidget(marcusBainsFont->button(),i,2);
1084 ++i; 1084 ++i;
1085 1085
1086 tVFont = 1086 tVFont =
1087 addWidFont(i18n("Summary"),i18n("Event Viewer:"), 1087 addWidFont(i18n("Summary"),i18n("Event Viewer:"),
1088 &(KOPrefs::instance()->mEventViewFont),topFrame); 1088 &(KOPrefs::instance()->mEventViewFont),topFrame);
1089 topLayout->addWidget(tVFont->label(),i,0); 1089 topLayout->addWidget(tVFont->label(),i,0);
1090 topLayout->addWidget(tVFont->preview(),i,1); 1090 topLayout->addWidget(tVFont->preview(),i,1);
1091 topLayout->addWidget(tVFont->button(),i,2); 1091 topLayout->addWidget(tVFont->button(),i,2);
1092 ++i; 1092 ++i;
1093 1093
1094 1094
1095 1095
1096 tVFont = 1096 tVFont =
1097 addWidFont(i18n("Details"),i18n("EditorBox:"), 1097 addWidFont(i18n("Details"),i18n("EditorBox:"),
1098 &(KOPrefs::instance()->mEditBoxFont),topFrame); 1098 &(KOPrefs::instance()->mEditBoxFont),topFrame);
1099 topLayout->addWidget(tVFont->label(),i,0); 1099 topLayout->addWidget(tVFont->label(),i,0);
1100 topLayout->addWidget(tVFont->preview(),i,1); 1100 topLayout->addWidget(tVFont->preview(),i,1);
1101 topLayout->addWidget(tVFont->button(),i,2); 1101 topLayout->addWidget(tVFont->button(),i,2);
1102 ++i; 1102 ++i;
1103 1103
1104 1104
1105 1105
1106 topLayout->setColStretch(1,1); 1106 topLayout->setColStretch(1,1);
1107 topLayout->setRowStretch(4,1); 1107 topLayout->setRowStretch(4,1);
1108 1108
1109 1109
1110 i = 0; 1110 i = 0;
1111 topFrame = addPage(i18n("View Fonts"),0, 1111 topFrame = addPage(i18n("View Fonts"),0,
1112 DesktopIcon("fonts",KIcon::SizeMedium)); 1112 DesktopIcon("fonts",KIcon::SizeMedium));
1113 1113
1114 topLayout = new QGridLayout(topFrame,7,3); 1114 topLayout = new QGridLayout(topFrame,7,3);
1115 topLayout->setSpacing(1); 1115 topLayout->setSpacing(1);
1116 topLayout->setMargin(3); 1116 topLayout->setMargin(3);
1117 1117
1118 tVFont = 1118 tVFont =
1119 addWidFont(i18n("Configure KO"),i18n("What's Next View:"), 1119 addWidFont(i18n("Configure KO"),i18n("What's Next View:"),
1120 &(KOPrefs::instance()->mWhatsNextFont),topFrame); 1120 &(KOPrefs::instance()->mWhatsNextFont),topFrame);
1121 topLayout->addWidget(tVFont->label(),i,0); 1121 topLayout->addWidget(tVFont->label(),i,0);
1122 topLayout->addWidget(tVFont->preview(),i,1); 1122 topLayout->addWidget(tVFont->preview(),i,1);
1123 topLayout->addWidget(tVFont->button(),i,2); 1123 topLayout->addWidget(tVFont->button(),i,2);
1124 ++i; 1124 ++i;
1125 KPrefsWidFont *agendaViewFont = 1125 KPrefsDialogWidFont *agendaViewFont =
1126 addWidFont(i18n("Event text"),i18n("Agenda view:"), 1126 addWidFont(i18n("Event text"),i18n("Agenda view:"),
1127 &(KOPrefs::instance()->mAgendaViewFont),topFrame); 1127 &(KOPrefs::instance()->mAgendaViewFont),topFrame);
1128 topLayout->addWidget(agendaViewFont->label(),i,0); 1128 topLayout->addWidget(agendaViewFont->label(),i,0);
1129 topLayout->addWidget(agendaViewFont->preview(),i,1); 1129 topLayout->addWidget(agendaViewFont->preview(),i,1);
1130 topLayout->addWidget(agendaViewFont->button(),i,2); 1130 topLayout->addWidget(agendaViewFont->button(),i,2);
1131 ++i; 1131 ++i;
1132 1132
1133 1133
1134 KPrefsWidFont *monthViewFont = 1134 KPrefsDialogWidFont *monthViewFont =
1135 addWidFont(KGlobal::locale()->formatTime(QTime(12,34)) + " " + i18n("Event"), 1135 addWidFont(KGlobal::locale()->formatTime(QTime(12,34)) + " " + i18n("Event"),
1136 i18n("Month view:"),&(KOPrefs::instance()->mMonthViewFont),topFrame); 1136 i18n("Month view:"),&(KOPrefs::instance()->mMonthViewFont),topFrame);
1137 topLayout->addWidget(monthViewFont->label(),i,0); 1137 topLayout->addWidget(monthViewFont->label(),i,0);
1138 topLayout->addWidget(monthViewFont->preview(),i,1); 1138 topLayout->addWidget(monthViewFont->preview(),i,1);
1139 topLayout->addWidget(monthViewFont->button(),i,2); 1139 topLayout->addWidget(monthViewFont->button(),i,2);
1140 ++i; 1140 ++i;
1141 1141
1142 1142
1143 KPrefsWidFont *lVFont = 1143 KPrefsDialogWidFont *lVFont =
1144 addWidFont(i18n("Event"),i18n("List View:"), 1144 addWidFont(i18n("Event"),i18n("List View:"),
1145 &(KOPrefs::instance()->mListViewFont),topFrame); 1145 &(KOPrefs::instance()->mListViewFont),topFrame);
1146 topLayout->addWidget(lVFont->label(),i,0); 1146 topLayout->addWidget(lVFont->label(),i,0);
1147 topLayout->addWidget(lVFont->preview(),i,1); 1147 topLayout->addWidget(lVFont->preview(),i,1);
1148 topLayout->addWidget(lVFont->button(),i,2); 1148 topLayout->addWidget(lVFont->button(),i,2);
1149 ++i; 1149 ++i;
1150 1150
1151 1151
1152 tVFont = 1152 tVFont =
1153 addWidFont(i18n("ToDo"),i18n("ToDoView:"), 1153 addWidFont(i18n("ToDo"),i18n("ToDoView:"),
1154 &(KOPrefs::instance()->mTodoViewFont),topFrame); 1154 &(KOPrefs::instance()->mTodoViewFont),topFrame);
1155 topLayout->addWidget(tVFont->label(),i,0); 1155 topLayout->addWidget(tVFont->label(),i,0);
1156 topLayout->addWidget(tVFont->preview(),i,1); 1156 topLayout->addWidget(tVFont->preview(),i,1);
1157 topLayout->addWidget(tVFont->button(),i,2); 1157 topLayout->addWidget(tVFont->button(),i,2);
1158 ++i; 1158 ++i;
1159 1159
1160 1160
1161 tVFont = 1161 tVFont =
1162 addWidFont(i18n("Today"),i18n("JournalView:"), 1162 addWidFont(i18n("Today"),i18n("JournalView:"),
1163 &(KOPrefs::instance()->mJornalViewFont),topFrame); 1163 &(KOPrefs::instance()->mJornalViewFont),topFrame);
1164 topLayout->addWidget(tVFont->label(),i,0); 1164 topLayout->addWidget(tVFont->label(),i,0);
1165 topLayout->addWidget(tVFont->preview(),i,1); 1165 topLayout->addWidget(tVFont->preview(),i,1);
1166 topLayout->addWidget(tVFont->button(),i,2); 1166 topLayout->addWidget(tVFont->button(),i,2);
1167 ++i; 1167 ++i;
@@ -1220,49 +1220,49 @@ void KOPrefsDialog::setupColorsTab()
1220 topLayout->addWidget(highlightColor->label(),ii,0); 1220 topLayout->addWidget(highlightColor->label(),ii,0);
1221 topLayout->addWidget(highlightColor->button(),ii++,1); 1221 topLayout->addWidget(highlightColor->button(),ii++,1);
1222 1222
1223 // Event color 1223 // Event color
1224 KPrefsWidColor *eventColor = 1224 KPrefsWidColor *eventColor =
1225 addWidColor(i18n("Default event color:"), 1225 addWidColor(i18n("Default event color:"),
1226 &(KOPrefs::instance()->mEventColor),topFrame); 1226 &(KOPrefs::instance()->mEventColor),topFrame);
1227 topLayout->addWidget(eventColor->label(),ii,0); 1227 topLayout->addWidget(eventColor->label(),ii,0);
1228 topLayout->addWidget(eventColor->button(),ii++,1); 1228 topLayout->addWidget(eventColor->button(),ii++,1);
1229 1229
1230 // agenda view background color 1230 // agenda view background color
1231 KPrefsWidColor *agendaBgColor = 1231 KPrefsWidColor *agendaBgColor =
1232 addWidColor(i18n("Agenda view background color:"), 1232 addWidColor(i18n("Agenda view background color:"),
1233 &(KOPrefs::instance()->mAgendaBgColor),topFrame); 1233 &(KOPrefs::instance()->mAgendaBgColor),topFrame);
1234 topLayout->addWidget(agendaBgColor->label(),ii,0); 1234 topLayout->addWidget(agendaBgColor->label(),ii,0);
1235 topLayout->addWidget(agendaBgColor->button(),ii++,1); 1235 topLayout->addWidget(agendaBgColor->button(),ii++,1);
1236 1236
1237 // working hours color 1237 // working hours color
1238 KPrefsWidColor *workingHoursColor = 1238 KPrefsWidColor *workingHoursColor =
1239 addWidColor(i18n("Working hours color:"), 1239 addWidColor(i18n("Working hours color:"),
1240 &(KOPrefs::instance()->mWorkingHoursColor),topFrame); 1240 &(KOPrefs::instance()->mWorkingHoursColor),topFrame);
1241 topLayout->addWidget(workingHoursColor->label(),ii,0); 1241 topLayout->addWidget(workingHoursColor->label(),ii,0);
1242 topLayout->addWidget(workingHoursColor->button(),ii++,1); 1242 topLayout->addWidget(workingHoursColor->button(),ii++,1);
1243 1243
1244 KPrefsWidBool *sb = 1244 KPrefsDialogWidBool *sb =
1245 addWidBool(i18n("Use colors for application:"), 1245 addWidBool(i18n("Use colors for application:"),
1246 &(KOPrefs::instance()->mUseAppColors),topFrame); 1246 &(KOPrefs::instance()->mUseAppColors),topFrame);
1247 topLayout->addMultiCellWidget(sb->checkBox(), ii, ii, 0,1 ); 1247 topLayout->addMultiCellWidget(sb->checkBox(), ii, ii, 0,1 );
1248 1248
1249 ii++; 1249 ii++;
1250 KPrefsWidColor * workingHoursColor1 = 1250 KPrefsWidColor * workingHoursColor1 =
1251 addWidColor(i18n("Buttons, menus, etc.:"), 1251 addWidColor(i18n("Buttons, menus, etc.:"),
1252 &(KOPrefs::instance()->mAppColor1),topFrame); 1252 &(KOPrefs::instance()->mAppColor1),topFrame);
1253 topLayout->addWidget(workingHoursColor1->label(),ii,0); 1253 topLayout->addWidget(workingHoursColor1->label(),ii,0);
1254 topLayout->addWidget(workingHoursColor1->button(),ii++,1); 1254 topLayout->addWidget(workingHoursColor1->button(),ii++,1);
1255 1255
1256 KPrefsWidColor * workingHoursColor2 = 1256 KPrefsWidColor * workingHoursColor2 =
1257 addWidColor(i18n("Frames, labels, etc.:"), 1257 addWidColor(i18n("Frames, labels, etc.:"),
1258 &(KOPrefs::instance()->mAppColor2),topFrame); 1258 &(KOPrefs::instance()->mAppColor2),topFrame);
1259 topLayout->addWidget(workingHoursColor2->label(),ii,0); 1259 topLayout->addWidget(workingHoursColor2->label(),ii,0);
1260 topLayout->addWidget(workingHoursColor2->button(),ii++,1); 1260 topLayout->addWidget(workingHoursColor2->button(),ii++,1);
1261 1261
1262 1262
1263 1263
1264} 1264}
1265 1265
1266void KOPrefsDialog::setCategoryColor() 1266void KOPrefsDialog::setCategoryColor()
1267{ 1267{
1268 mCategoryDict.replace(mCategoryCombo->currentText(), new QColor(mCategoryButton->color())); 1268 mCategoryDict.replace(mCategoryCombo->currentText(), new QColor(mCategoryButton->color()));
@@ -1654,49 +1654,49 @@ void KOPrefsDialog::setupTimeZoneTab()
1654 1654
1655 new QLabel( i18n("Timezone:"), timeZoneBox ); 1655 new QLabel( i18n("Timezone:"), timeZoneBox );
1656 mTimeZoneCombo = new QComboBox( timeZoneBox ); 1656 mTimeZoneCombo = new QComboBox( timeZoneBox );
1657 if ( QApplication::desktop()->width() < 300 ) { 1657 if ( QApplication::desktop()->width() < 300 ) {
1658 mTimeZoneCombo->setMaximumWidth(150); 1658 mTimeZoneCombo->setMaximumWidth(150);
1659 } 1659 }
1660 1660
1661 QStringList list; 1661 QStringList list;
1662 list = KGlobal::locale()->timeZoneList(); 1662 list = KGlobal::locale()->timeZoneList();
1663 mTimeZoneCombo->insertStringList(list); 1663 mTimeZoneCombo->insertStringList(list);
1664 1664
1665 // find the currently set time zone and select it 1665 // find the currently set time zone and select it
1666 QString sCurrentlySet = KOPrefs::instance()->mTimeZoneId; 1666 QString sCurrentlySet = KOPrefs::instance()->mTimeZoneId;
1667 int nCurrentlySet = 11; 1667 int nCurrentlySet = 11;
1668 for (int i = 0; i < mTimeZoneCombo->count(); i++) 1668 for (int i = 0; i < mTimeZoneCombo->count(); i++)
1669 { 1669 {
1670 if (mTimeZoneCombo->text(i) == sCurrentlySet) 1670 if (mTimeZoneCombo->text(i) == sCurrentlySet)
1671 { 1671 {
1672 nCurrentlySet = i; 1672 nCurrentlySet = i;
1673 break; 1673 break;
1674 } 1674 }
1675 } 1675 }
1676 mTimeZoneCombo->setCurrentItem(nCurrentlySet); 1676 mTimeZoneCombo->setCurrentItem(nCurrentlySet);
1677 int iii = 1; 1677 int iii = 1;
1678 KPrefsWidBool *sb = 1678 KPrefsDialogWidBool *sb =
1679 addWidBool(i18n("Timezone has daylight saving"), 1679 addWidBool(i18n("Timezone has daylight saving"),
1680 &(KOPrefs::instance()->mUseDaylightsaving),topFrame); 1680 &(KOPrefs::instance()->mUseDaylightsaving),topFrame);
1681 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); 1681 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
1682 ++iii; 1682 ++iii;
1683 QLabel* lab = new QLabel( i18n("Actual start and end is the\nsunday before this date."), topFrame ); 1683 QLabel* lab = new QLabel( i18n("Actual start and end is the\nsunday before this date."), topFrame );
1684 topLayout->addMultiCellWidget(lab, iii,iii,0,1); 1684 topLayout->addMultiCellWidget(lab, iii,iii,0,1);
1685 ++iii; 1685 ++iii;
1686 lab = new QLabel( i18n("The year in the date is ignored."), topFrame ); 1686 lab = new QLabel( i18n("The year in the date is ignored."), topFrame );
1687 topLayout->addMultiCellWidget(lab, iii,iii,0,1); 1687 topLayout->addMultiCellWidget(lab, iii,iii,0,1);
1688 ++iii; 1688 ++iii;
1689 lab = new QLabel( i18n("Daylight start:"), topFrame ); 1689 lab = new QLabel( i18n("Daylight start:"), topFrame );
1690 topLayout->addWidget(lab, iii,0); 1690 topLayout->addWidget(lab, iii,0);
1691 mStartDateSavingEdit = new KDateEdit(topFrame); 1691 mStartDateSavingEdit = new KDateEdit(topFrame);
1692 topLayout->addWidget(mStartDateSavingEdit, iii,1); 1692 topLayout->addWidget(mStartDateSavingEdit, iii,1);
1693 ++iii; 1693 ++iii;
1694 1694
1695 lab = new QLabel( i18n("Daylight end:"), topFrame ); 1695 lab = new QLabel( i18n("Daylight end:"), topFrame );
1696 topLayout->addWidget(lab, iii,0); 1696 topLayout->addWidget(lab, iii,0);
1697 mEndDateSavingEdit = new KDateEdit(topFrame); 1697 mEndDateSavingEdit = new KDateEdit(topFrame);
1698 topLayout->addWidget(mEndDateSavingEdit, iii,1); 1698 topLayout->addWidget(mEndDateSavingEdit, iii,1);
1699 ++iii; 1699 ++iii;
1700 QDate current ( 2001, 1,1); 1700 QDate current ( 2001, 1,1);
1701 mStartDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingStart-1)); 1701 mStartDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingStart-1));
1702 mEndDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingEnd-1)); 1702 mEndDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingEnd-1));