summaryrefslogtreecommitdiffabout
path: root/korganizer/koprefsdialog.cpp
authorulf69 <ulf69>2004-09-21 19:52:42 (UTC)
committer ulf69 <ulf69>2004-09-21 19:52:42 (UTC)
commit186ee062d9169860fbab1613ca21b956c69296a6 (patch) (unidiff)
tree62df959e22100e6fc6d3129a19aaa22f7a7beefa /korganizer/koprefsdialog.cpp
parent93313aa8d66c01aa0e4562449020af20b5cef0a7 (diff)
downloadkdepimpi-186ee062d9169860fbab1613ca21b956c69296a6.zip
kdepimpi-186ee062d9169860fbab1613ca21b956c69296a6.tar.gz
kdepimpi-186ee062d9169860fbab1613ca21b956c69296a6.tar.bz2
changed name of prefs edit widgets to distinguish between krefsdialog and the same implementation in kprefswidget
Diffstat (limited to 'korganizer/koprefsdialog.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koprefsdialog.cpp114
1 files changed, 57 insertions, 57 deletions
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 5ba4817..1c30faa 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -107,7 +107,7 @@ QFrame *topFrame = addPage(i18n("Date Format"),0,0);
107 int iii = 0; 107 int iii = 0;
108 108
109 109
110 KPrefsWidRadios *syncPrefsGroup = 110 KPrefsDialogWidRadios *syncPrefsGroup =
111 addWidRadios(i18n("Date Format:"),&(KOPrefs::instance()->mPreferredDate),topFrame); 111 addWidRadios(i18n("Date Format:"),&(KOPrefs::instance()->mPreferredDate),topFrame);
112 QString format; 112 QString format;
113 if ( QApplication::desktop()->width() < 480 ) 113 if ( QApplication::desktop()->width() < 480 )
@@ -159,7 +159,7 @@ void KOPrefsDialog::setupLocaleTab()
159 topLayout->setSpacing(spacingHint()); 159 topLayout->setSpacing(spacingHint());
160 topLayout->setMargin(marginHint()); 160 topLayout->setMargin(marginHint());
161 int iii = 0; 161 int iii = 0;
162 KPrefsWidRadios *syncPrefsGroup = 162 KPrefsDialogWidRadios *syncPrefsGroup =
163 addWidRadios(i18n("Language:(needs restart)"),&(KOPrefs::instance()->mPreferredLanguage),topFrame); 163 addWidRadios(i18n("Language:(needs restart)"),&(KOPrefs::instance()->mPreferredLanguage),topFrame);
164 syncPrefsGroup->addRadio(i18n("English")); 164 syncPrefsGroup->addRadio(i18n("English"));
165 syncPrefsGroup->addRadio(i18n("German")); 165 syncPrefsGroup->addRadio(i18n("German"));
@@ -179,7 +179,7 @@ void KOPrefsDialog::setupLocaleTab()
179 syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical); 179 syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical);
180 topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1); 180 topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1);
181 ++iii; 181 ++iii;
182 KPrefsWidBool *sb; 182 KPrefsDialogWidBool *sb;
183 if ( QApplication::desktop()->width() < 300 ) { 183 if ( QApplication::desktop()->width() < 300 ) {
184 sb = 184 sb =
185 addWidBool(i18n("Week starts on Sunday"), 185 addWidBool(i18n("Week starts on Sunday"),
@@ -205,7 +205,7 @@ void KOPrefsDialog::setupLocaleTab()
205 topLayout->addMultiCellWidget(hb, iii,iii,0,1); 205 topLayout->addMultiCellWidget(hb, iii,iii,0,1);
206 206
207 } 207 }
208 //#ifndef DESKTOP_VERSION 208 // KPrefsDialogWidBool *sb; //#ifndef DESKTOP_VERSION
209#if 0 209#if 0
210 ++iii; 210 ++iii;
211 sb = 211 sb =
@@ -230,14 +230,14 @@ void KOPrefsDialog::setupSyncAlgTab()
230 topLayout->setMargin(marginHint()); 230 topLayout->setMargin(marginHint());
231 int iii = 0; 231 int iii = 0;
232 232
233 KPrefsWidBool *sb = 233 KPrefsDialogWidBool *sb =
234 addWidBool(i18n("Ask for preferences before syncing"), 234 addWidBool(i18n("Ask for preferences before syncing"),
235 &(KOPrefs::instance()->mAskForPreferences),topFrame); 235 &(KOPrefs::instance()->mAskForPreferences),topFrame);
236 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); 236 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
237 237
238 ++iii; 238 ++iii;
239 239
240 KPrefsWidRadios *syncPrefsGroup = 240 KPrefsDialogWidRadios *syncPrefsGroup =
241 addWidRadios(i18n("Sync preferences:"),&(KOPrefs::instance()->mSyncAlgoPrefs), 241 addWidRadios(i18n("Sync preferences:"),&(KOPrefs::instance()->mSyncAlgoPrefs),
242 topFrame); 242 topFrame);
243 syncPrefsGroup->addRadio(i18n("Take local entry on conflict")); 243 syncPrefsGroup->addRadio(i18n("Take local entry on conflict"));
@@ -297,7 +297,7 @@ void KOPrefsDialog::setupSyncTab()
297 topLayout->addWidget(mLocalTempFile,iii,1); 297 topLayout->addWidget(mLocalTempFile,iii,1);
298 ++iii; 298 ++iii;
299 299
300 KPrefsWidBool *wb = 300 KPrefsDialogWidBool *wb =
301 addWidBool(i18n("Write back synced file"), 301 addWidBool(i18n("Write back synced file"),
302 &(KOPrefs::instance()->mWriteBackFile),topFrame); 302 &(KOPrefs::instance()->mWriteBackFile),topFrame);
303 topLayout->addMultiCellWidget(wb->checkBox(), iii,iii,0,1); 303 topLayout->addMultiCellWidget(wb->checkBox(), iii,iii,0,1);
@@ -320,7 +320,7 @@ void KOPrefsDialog::setupMainTab()
320 topLayout->setSpacing(spacingHint()); 320 topLayout->setSpacing(spacingHint());
321 topLayout->setMargin(marginHint()); 321 topLayout->setMargin(marginHint());
322 322
323 // KPrefsWidBool *emailControlCenter = 323 // KPrefsDialogWidBool *emailControlCenter =
324// addWidBool(i18n("&Use email settings from Control Center"), 324// addWidBool(i18n("&Use email settings from Control Center"),
325// &(KOPrefs::instance()->mEmailControlCenter),topFrame); 325// &(KOPrefs::instance()->mEmailControlCenter),topFrame);
326// topLayout->addMultiCellWidget(emailControlCenter->checkBox(),0,0,0,1); 326// topLayout->addMultiCellWidget(emailControlCenter->checkBox(),0,0,0,1);
@@ -336,7 +336,7 @@ void KOPrefsDialog::setupMainTab()
336 mEmailLabel = new QLabel(mEmailEdit, i18n("E&mail address:"),topFrame); 336 mEmailLabel = new QLabel(mEmailEdit, i18n("E&mail address:"),topFrame);
337 topLayout->addWidget(mEmailLabel,1,0); 337 topLayout->addWidget(mEmailLabel,1,0);
338 topLayout->addWidget(mEmailEdit,1,1); 338 topLayout->addWidget(mEmailEdit,1,1);
339 KPrefsWidBool *wb; 339 KPrefsDialogWidBool *wb;
340 QHBox *dummy; 340 QHBox *dummy;
341 if ( QApplication::desktop()->width() > 480 ) { 341 if ( QApplication::desktop()->width() > 480 ) {
342 dummy = new QHBox(topFrame); 342 dummy = new QHBox(topFrame);
@@ -379,7 +379,7 @@ void KOPrefsDialog::setupMainTab()
379 if ( QApplication::desktop()->width() < 300 ) 379 if ( QApplication::desktop()->width() < 300 )
380 mPrioSpin->setFixedWidth( 40 ); 380 mPrioSpin->setFixedWidth( 40 );
381 381
382 // KPrefsWidBool *bcc = 382 // KPrefsDialogWidBool *bcc =
383// addWidBool(i18n("Send copy to owner when mailing events"), 383// addWidBool(i18n("Send copy to owner when mailing events"),
384// &(KOPrefs::instance()->mBcc),topFrame); 384// &(KOPrefs::instance()->mBcc),topFrame);
385// topLayout->addMultiCellWidget(bcc->checkBox(),4,4,0,1); 385// topLayout->addMultiCellWidget(bcc->checkBox(),4,4,0,1);
@@ -406,20 +406,20 @@ void KOPrefsDialog::setupMainTab()
406 mHourSizeSlider = new QSlider(24,47,1,24,Horizontal,agendasize); 406 mHourSizeSlider = new QSlider(24,47,1,24,Horizontal,agendasize);
407 topLayout->addMultiCellWidget(agendasize,7,7,0,1); 407 topLayout->addMultiCellWidget(agendasize,7,7,0,1);
408 */ 408 */
409 KPrefsWidBool *verticalScreen = 409 KPrefsDialogWidBool *verticalScreen =
410 addWidBool(i18n("Show vertical screen (Needs restart)"), 410 addWidBool(i18n("Show vertical screen (Needs restart)"),
411 &(KOPrefs::instance()->mVerticalScreen),topFrame); 411 &(KOPrefs::instance()->mVerticalScreen),topFrame);
412 //topLayout->addWidget(verticalScreen->checkBox(),ii++,0); 412 //topLayout->addWidget(verticalScreen->checkBox(),ii++,0);
413 topLayout->addMultiCellWidget(verticalScreen->checkBox(),7,7,0,1); 413 topLayout->addMultiCellWidget(verticalScreen->checkBox(),7,7,0,1);
414 414
415 KPrefsWidBool *ask = 415 KPrefsDialogWidBool *ask =
416 addWidBool(i18n("Ask for quit when closing KO/Pi"), 416 addWidBool(i18n("Ask for quit when closing KO/Pi"),
417 &(KOPrefs::instance()->mAskForQuit),topFrame); 417 &(KOPrefs::instance()->mAskForQuit),topFrame);
418 topLayout->addMultiCellWidget(ask->checkBox(),8,8,0,1); 418 topLayout->addMultiCellWidget(ask->checkBox(),8,8,0,1);
419 419
420 420
421 /* 421 /*
422 KPrefsWidBool *confirmCheck = 422 KPrefsDialogWidBool *confirmCheck =
423 addWidBool(i18n("Confirm &deletes"),&(KOPrefs::instance()->mConfirm), 423 addWidBool(i18n("Confirm &deletes"),&(KOPrefs::instance()->mConfirm),
424 topFrame); 424 topFrame);
425 topLayout->addMultiCellWidget(confirmCheck->checkBox(),7,7,0,1); 425 topLayout->addMultiCellWidget(confirmCheck->checkBox(),7,7,0,1);
@@ -445,7 +445,7 @@ void KOPrefsDialog::setupMainTab()
445 // Disable setting, because this feature now becomes stable 445 // Disable setting, because this feature now becomes stable
446 mEnableProjectView->checkBox()->hide(); 446 mEnableProjectView->checkBox()->hide();
447 447
448 KPrefsWidRadios *defaultFormatGroup = 448 KPrefsDialogWidRadios *defaultFormatGroup =
449 addWidRadios(i18n("Default Calendar Format"), 449 addWidRadios(i18n("Default Calendar Format"),
450 &(KOPrefs::instance()->mDefaultFormat),topFrame); 450 &(KOPrefs::instance()->mDefaultFormat),topFrame);
451 defaultFormatGroup->addRadio(i18n("vCalendar")); 451 defaultFormatGroup->addRadio(i18n("vCalendar"));
@@ -456,19 +456,19 @@ void KOPrefsDialog::setupMainTab()
456 // Default format unconditionally is iCalendar 456 // Default format unconditionally is iCalendar
457 defaultFormatGroup->groupBox()->hide(); 457 defaultFormatGroup->groupBox()->hide();
458 458
459 KPrefsWidRadios *mailClientGroup = 459 KPrefsDialogWidRadios *mailClientGroup =
460 addWidRadios(i18n("Mail Client"),&(KOPrefs::instance()->mMailClient), 460 addWidRadios(i18n("Mail Client"),&(KOPrefs::instance()->mMailClient),
461 topFrame); 461 topFrame);
462 mailClientGroup->addRadio(i18n("KMail")); 462 mailClientGroup->addRadio(i18n("KMail"));
463 mailClientGroup->addRadio(i18n("Sendmail")); 463 mailClientGroup->addRadio(i18n("Sendmail"));
464 topLayout->addMultiCellWidget(mailClientGroup->groupBox(),11,11,0,1); 464 topLayout->addMultiCellWidget(mailClientGroup->groupBox(),11,11,0,1);
465 465
466 KPrefsWidBool *htmlsave = 466 KPrefsDialogWidBool *htmlsave =
467 addWidBool(i18n("Export to HTML with every save"),&(KOPrefs::instance()->mHtmlWithSave), 467 addWidBool(i18n("Export to HTML with every save"),&(KOPrefs::instance()->mHtmlWithSave),
468 topFrame); 468 topFrame);
469 topLayout->addMultiCellWidget(htmlsave->checkBox(),12,12,0,1); 469 topLayout->addMultiCellWidget(htmlsave->checkBox(),12,12,0,1);
470 470
471 KPrefsWidRadios *destinationGroup = 471 KPrefsDialogWidRadios *destinationGroup =
472 addWidRadios(i18n("New Events/Todos should"),&(KOPrefs::instance()->mDestination), 472 addWidRadios(i18n("New Events/Todos should"),&(KOPrefs::instance()->mDestination),
473 topFrame); 473 topFrame);
474 destinationGroup->addRadio(i18n("be added to the standard resource")); 474 destinationGroup->addRadio(i18n("be added to the standard resource"));
@@ -490,7 +490,7 @@ void KOPrefsDialog::setupTimeTab()
490 topLayout->setMargin(marginHint()); 490 topLayout->setMargin(marginHint());
491 491
492 QHBox *dummy = new QHBox(topFrame); 492 QHBox *dummy = new QHBox(topFrame);
493 KPrefsWidTime *dayBegins = 493 KPrefsDialogWidTime *dayBegins =
494 addWidTime(i18n("Day begins at:"),&(KOPrefs::instance()->mDayBegins), 494 addWidTime(i18n("Day begins at:"),&(KOPrefs::instance()->mDayBegins),
495 dummy); 495 dummy);
496 //topLayout->addWidget(dayBegins->label(),2,0); 496 //topLayout->addWidget(dayBegins->label(),2,0);
@@ -543,7 +543,7 @@ void KOPrefsDialog::setupTimeTab()
543 addWidBool(i18n("Exclude Saturdays"), 543 addWidBool(i18n("Exclude Saturdays"),
544 &(KOPrefs::instance()->mExcludeSaturdays),excludeBox); 544 &(KOPrefs::instance()->mExcludeSaturdays),excludeBox);
545 545
546// KPrefsWidBool *marcusBainsShowSeconds = addWidBool(i18n("Show seconds on Marcus Bains line"), 546// KPrefsDialogWidBool *marcusBainsShowSeconds = addWidBool(i18n("Show seconds on Marcus Bains line"),
547 // &(KOPrefs::instance()->mMarcusBainsShowSeconds), 547 // &(KOPrefs::instance()->mMarcusBainsShowSeconds),
548 // topFrame); 548 // topFrame);
549// topLayout->addWidget(marcusBainsShowSeconds->checkBox(),5,0); 549// topLayout->addWidget(marcusBainsShowSeconds->checkBox(),5,0);
@@ -565,7 +565,7 @@ void KOPrefsDialog::setupViewsTab()
565// QBoxLayout *dayBeginsLayout = new QHBoxLayout; 565// QBoxLayout *dayBeginsLayout = new QHBoxLayout;
566// topLayout->addLayout(dayBeginsLayout,0,0); 566// topLayout->addLayout(dayBeginsLayout,0,0);
567 567
568// KPrefsWidTime *dayBegins = 568// KPrefsDialogWidTime *dayBegins =
569// addWidTime(i18n("Day begins at:"),&(KOPrefs::instance()->mDayBegins), 569// addWidTime(i18n("Day begins at:"),&(KOPrefs::instance()->mDayBegins),
570// topFrame); 570// topFrame);
571// dayBeginsLayout->addWidget(dayBegins->label()); 571// dayBeginsLayout->addWidget(dayBegins->label());
@@ -581,7 +581,7 @@ void KOPrefsDialog::setupViewsTab()
581 581
582 582
583 int ii = 0; 583 int ii = 0;
584 KPrefsWidBool *dummy = 584 KPrefsDialogWidBool *dummy =
585 addWidBool(i18n("Edit item on doubleclick (if not, show)"), 585 addWidBool(i18n("Edit item on doubleclick (if not, show)"),
586 &(KOPrefs::instance()->mEditOnDoubleClick),topFrame); 586 &(KOPrefs::instance()->mEditOnDoubleClick),topFrame);
587 topLayout->addWidget(dummy->checkBox(),ii++,0); 587 topLayout->addWidget(dummy->checkBox(),ii++,0);
@@ -596,24 +596,24 @@ void KOPrefsDialog::setupViewsTab()
596 &(KOPrefs::instance()->mUseHighlightLightColor),topFrame); 596 &(KOPrefs::instance()->mUseHighlightLightColor),topFrame);
597 topLayout->addWidget(dummy->checkBox(),ii++,0); 597 topLayout->addWidget(dummy->checkBox(),ii++,0);
598 598
599 KPrefsWidBool *dailyRecur = 599 KPrefsDialogWidBool *dailyRecur =
600 addWidBool(i18n("Show events that recur daily in date nav."), 600 addWidBool(i18n("Show events that recur daily in date nav."),
601 &(KOPrefs::instance()->mDailyRecur),topFrame); 601 &(KOPrefs::instance()->mDailyRecur),topFrame);
602 topLayout->addWidget(dailyRecur->checkBox(),ii++,0); 602 topLayout->addWidget(dailyRecur->checkBox(),ii++,0);
603 603
604 KPrefsWidBool *weeklyRecur = 604 KPrefsDialogWidBool *weeklyRecur =
605 addWidBool(i18n("Show ev. that recur weekly in date nav."), 605 addWidBool(i18n("Show ev. that recur weekly in date nav."),
606 &(KOPrefs::instance()->mWeeklyRecur),topFrame); 606 &(KOPrefs::instance()->mWeeklyRecur),topFrame);
607 topLayout->addWidget(weeklyRecur->checkBox(),ii++,0); 607 topLayout->addWidget(weeklyRecur->checkBox(),ii++,0);
608 if ( QApplication::desktop()->width() > 640 ) { 608 if ( QApplication::desktop()->width() > 640 ) {
609 609
610 KPrefsWidBool *enableToolTips = 610 KPrefsDialogWidBool *enableToolTips =
611 addWidBool(i18n("Enable tooltips displaying summary of ev."), 611 addWidBool(i18n("Enable tooltips displaying summary of ev."),
612 &(KOPrefs::instance()->mEnableToolTips),topFrame); 612 &(KOPrefs::instance()->mEnableToolTips),topFrame);
613 topLayout->addWidget(enableToolTips->checkBox(),ii++,0); 613 topLayout->addWidget(enableToolTips->checkBox(),ii++,0);
614 614
615 } 615 }
616 KPrefsWidBool *passwdk = 616 KPrefsDialogWidBool *passwdk =
617 addWidBool(i18n("Show parent To-Do's in What's Next view"), 617 addWidBool(i18n("Show parent To-Do's in What's Next view"),
618 &(KOPrefs::instance()->mWNViewShowsParents),topFrame); 618 &(KOPrefs::instance()->mWNViewShowsParents),topFrame);
619 topLayout->addWidget(passwdk->checkBox(), ii++,0); 619 topLayout->addWidget(passwdk->checkBox(), ii++,0);
@@ -629,7 +629,7 @@ void KOPrefsDialog::setupViewsTab()
629 topLayout->addWidget(passwdk->checkBox(), ii++,0); 629 topLayout->addWidget(passwdk->checkBox(), ii++,0);
630 630
631 631
632 KPrefsWidBool *marcusBainsEnabled = 632 KPrefsDialogWidBool *marcusBainsEnabled =
633 addWidBool(i18n("Show Marcus Bains line"), 633 addWidBool(i18n("Show Marcus Bains line"),
634 &(KOPrefs::instance()->mMarcusBainsEnabled),topFrame); 634 &(KOPrefs::instance()->mMarcusBainsEnabled),topFrame);
635 topLayout->addWidget(marcusBainsEnabled->checkBox(),ii++,0); 635 topLayout->addWidget(marcusBainsEnabled->checkBox(),ii++,0);
@@ -664,12 +664,12 @@ void KOPrefsDialog::setupViewsTab()
664 topLayout->addWidget(dummy->checkBox(),ii++,0); 664 topLayout->addWidget(dummy->checkBox(),ii++,0);
665 665
666 666
667 KPrefsWidBool *fullViewTodo = 667 KPrefsDialogWidBool *fullViewTodo =
668 addWidBool(i18n("Event list view uses full window"), 668 addWidBool(i18n("Event list view uses full window"),
669 &(KOPrefs::instance()->mFullViewTodo),topFrame); 669 &(KOPrefs::instance()->mFullViewTodo),topFrame);
670 topLayout->addWidget(fullViewTodo->checkBox(),ii++,0); 670 topLayout->addWidget(fullViewTodo->checkBox(),ii++,0);
671 671
672 KPrefsWidBool *fullViewMonth = 672 KPrefsDialogWidBool *fullViewMonth =
673 addWidBool(i18n("Next days view uses full window"), 673 addWidBool(i18n("Next days view uses full window"),
674 &(KOPrefs::instance()->mFullViewMonth),topFrame); 674 &(KOPrefs::instance()->mFullViewMonth),topFrame);
675 topLayout->addWidget(fullViewMonth->checkBox(),ii++,0); 675 topLayout->addWidget(fullViewMonth->checkBox(),ii++,0);
@@ -746,7 +746,7 @@ void KOPrefsDialog::setupViewsTab()
746 topLayout->addMultiCellWidget(habo,ii, ii,0,1); 746 topLayout->addMultiCellWidget(habo,ii, ii,0,1);
747 ii++; 747 ii++;
748#ifdef DESKTOP_VERSION 748#ifdef DESKTOP_VERSION
749 KPrefsWidBool *enableMonthScroll = 749 KPrefsDialogWidBool *enableMonthScroll =
750 addWidBool(i18n("Enable scrollbars in month view cells"), 750 addWidBool(i18n("Enable scrollbars in month view cells"),
751 &(KOPrefs::instance()->mEnableMonthScroll),topFrame); 751 &(KOPrefs::instance()->mEnableMonthScroll),topFrame);
752 topLayout->addWidget(enableMonthScroll->checkBox(),ii++,0); 752 topLayout->addWidget(enableMonthScroll->checkBox(),ii++,0);
@@ -757,7 +757,7 @@ void KOPrefsDialog::setupViewsTab()
757 &(KOPrefs::instance()->mMonthViewSatSunTog),topFrame); 757 &(KOPrefs::instance()->mMonthViewSatSunTog),topFrame);
758 topLayout->addWidget(dummy->checkBox(),ii++,0); 758 topLayout->addWidget(dummy->checkBox(),ii++,0);
759 759
760 KPrefsWidBool *coloredCategoriesInMonthView = 760 KPrefsDialogWidBool *coloredCategoriesInMonthView =
761 addWidBool(i18n("Month view uses category colors"), 761 addWidBool(i18n("Month view uses category colors"),
762 &(KOPrefs::instance()->mMonthViewUsesCategoryColor),topFrame); 762 &(KOPrefs::instance()->mMonthViewUsesCategoryColor),topFrame);
763 topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0); 763 topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0);
@@ -771,7 +771,7 @@ void KOPrefsDialog::setupViewsTab()
771 &(KOPrefs::instance()->mMonthViewUsesDayColors),topFrame); 771 &(KOPrefs::instance()->mMonthViewUsesDayColors),topFrame);
772 topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0); 772 topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0);
773 773
774 KPrefsWidColor *holidayColor = 774 KPrefsDialogWidColor *holidayColor =
775 addWidColor(i18n("Day color odd months"), 775 addWidColor(i18n("Day color odd months"),
776 &(KOPrefs::instance()->mMonthViewOddColor),topFrame); 776 &(KOPrefs::instance()->mMonthViewOddColor),topFrame);
777 topLayout->addWidget(holidayColor->label(),ii,0); 777 topLayout->addWidget(holidayColor->label(),ii,0);
@@ -800,7 +800,7 @@ void KOPrefsDialog::setupViewsTab()
800 topLayout->setMargin(marginHint()); 800 topLayout->setMargin(marginHint());
801 ii = 0; 801 ii = 0;
802 802
803 KPrefsWidBool *showCompletedTodo = 803 KPrefsDialogWidBool *showCompletedTodo =
804 addWidBool(i18n("To-do view shows completed Todos"), 804 addWidBool(i18n("To-do view shows completed Todos"),
805 &(KOPrefs::instance()->mShowCompletedTodo),topFrame); 805 &(KOPrefs::instance()->mShowCompletedTodo),topFrame);
806 topLayout->addWidget(showCompletedTodo->checkBox(),ii++,0); 806 topLayout->addWidget(showCompletedTodo->checkBox(),ii++,0);
@@ -824,7 +824,7 @@ void KOPrefsDialog::setupViewsTab()
824 824
825 QWidget* wid = new QWidget( topFrame ); 825 QWidget* wid = new QWidget( topFrame );
826 // Todo due today color 826 // Todo due today color
827 KPrefsWidColor *todoDueTodayColor = 827 KPrefsDialogWidColor *todoDueTodayColor =
828 addWidColor(i18n("Todo due today color:"), 828 addWidColor(i18n("Todo due today color:"),
829 &(KOPrefs::instance()->mTodoDueTodayColor),wid); 829 &(KOPrefs::instance()->mTodoDueTodayColor),wid);
830 QHBoxLayout *widLayout = new QHBoxLayout(wid); 830 QHBoxLayout *widLayout = new QHBoxLayout(wid);
@@ -836,7 +836,7 @@ void KOPrefsDialog::setupViewsTab()
836 // Todo overdue color 836 // Todo overdue color
837 wid = new QWidget( topFrame ); 837 wid = new QWidget( topFrame );
838 widLayout = new QHBoxLayout(wid); 838 widLayout = new QHBoxLayout(wid);
839 KPrefsWidColor *todoOverdueColor = 839 KPrefsDialogWidColor *todoOverdueColor =
840 addWidColor(i18n("Todo overdue color:"), 840 addWidColor(i18n("Todo overdue color:"),
841 &(KOPrefs::instance()->mTodoOverdueColor),wid); 841 &(KOPrefs::instance()->mTodoOverdueColor),wid);
842 widLayout->addWidget(todoOverdueColor->label()); 842 widLayout->addWidget(todoOverdueColor->label());
@@ -950,9 +950,9 @@ void KOPrefsDialog::setupFontsTab()
950 QGridLayout *topLayout = new QGridLayout(topFrame,7,3); 950 QGridLayout *topLayout = new QGridLayout(topFrame,7,3);
951 topLayout->setSpacing(1); 951 topLayout->setSpacing(1);
952 topLayout->setMargin(3); 952 topLayout->setMargin(3);
953 KPrefsWidFont * tVFont; 953 KPrefsDialogWidFont * tVFont;
954 int i = 0; 954 int i = 0;
955 KPrefsWidFont *timeLabelsFont = 955 KPrefsDialogWidFont *timeLabelsFont =
956 addWidFont(i18n("23"),i18n("DateNavigator:(nr)"), 956 addWidFont(i18n("23"),i18n("DateNavigator:(nr)"),
957 &(KOPrefs::instance()->mDateNavigatorFont),topFrame); 957 &(KOPrefs::instance()->mDateNavigatorFont),topFrame);
958 topLayout->addWidget(timeLabelsFont->label(),i,0); 958 topLayout->addWidget(timeLabelsFont->label(),i,0);
@@ -969,7 +969,7 @@ void KOPrefsDialog::setupFontsTab()
969 topLayout->addWidget(timeLabelsFont->button(),i,2); 969 topLayout->addWidget(timeLabelsFont->button(),i,2);
970 ++i; 970 ++i;
971 971
972 KPrefsWidFont *timeBarFont = 972 KPrefsDialogWidFont *timeBarFont =
973 addWidFont(KGlobal::locale()->formatTime(QTime(12,34)),i18n("Time bar:"), 973 addWidFont(KGlobal::locale()->formatTime(QTime(12,34)),i18n("Time bar:"),
974 &(KOPrefs::instance()->mTimeBarFont),topFrame); 974 &(KOPrefs::instance()->mTimeBarFont),topFrame);
975 topLayout->addWidget(timeBarFont->label(),i,0); 975 topLayout->addWidget(timeBarFont->label(),i,0);
@@ -978,7 +978,7 @@ void KOPrefsDialog::setupFontsTab()
978 ++i; 978 ++i;
979 979
980 980
981 KPrefsWidFont *marcusBainsFont = 981 KPrefsDialogWidFont *marcusBainsFont =
982 addWidFont(KGlobal::locale()->formatTime(QTime(12,34,23)),i18n("M. Bains line:"), 982 addWidFont(KGlobal::locale()->formatTime(QTime(12,34,23)),i18n("M. Bains line:"),
983 &(KOPrefs::instance()->mMarcusBainsFont),topFrame); 983 &(KOPrefs::instance()->mMarcusBainsFont),topFrame);
984 topLayout->addWidget(marcusBainsFont->label(),i,0); 984 topLayout->addWidget(marcusBainsFont->label(),i,0);
@@ -1025,7 +1025,7 @@ void KOPrefsDialog::setupFontsTab()
1025 topLayout->addWidget(tVFont->preview(),i,1); 1025 topLayout->addWidget(tVFont->preview(),i,1);
1026 topLayout->addWidget(tVFont->button(),i,2); 1026 topLayout->addWidget(tVFont->button(),i,2);
1027 ++i; 1027 ++i;
1028 KPrefsWidFont *agendaViewFont = 1028 KPrefsDialogWidFont *agendaViewFont =
1029 addWidFont(i18n("Event text"),i18n("Agenda view:"), 1029 addWidFont(i18n("Event text"),i18n("Agenda view:"),
1030 &(KOPrefs::instance()->mAgendaViewFont),topFrame); 1030 &(KOPrefs::instance()->mAgendaViewFont),topFrame);
1031 topLayout->addWidget(agendaViewFont->label(),i,0); 1031 topLayout->addWidget(agendaViewFont->label(),i,0);
@@ -1034,7 +1034,7 @@ void KOPrefsDialog::setupFontsTab()
1034 ++i; 1034 ++i;
1035 1035
1036 1036
1037 KPrefsWidFont *monthViewFont = 1037 KPrefsDialogWidFont *monthViewFont =
1038 addWidFont(KGlobal::locale()->formatTime(QTime(12,34)) + " " + i18n("Event"), 1038 addWidFont(KGlobal::locale()->formatTime(QTime(12,34)) + " " + i18n("Event"),
1039 i18n("Month view:"),&(KOPrefs::instance()->mMonthViewFont),topFrame); 1039 i18n("Month view:"),&(KOPrefs::instance()->mMonthViewFont),topFrame);
1040 topLayout->addWidget(monthViewFont->label(),i,0); 1040 topLayout->addWidget(monthViewFont->label(),i,0);
@@ -1043,7 +1043,7 @@ void KOPrefsDialog::setupFontsTab()
1043 ++i; 1043 ++i;
1044 1044
1045 1045
1046 KPrefsWidFont *lVFont = 1046 KPrefsDialogWidFont *lVFont =
1047 addWidFont(i18n("Event"),i18n("List View:"), 1047 addWidFont(i18n("Event"),i18n("List View:"),
1048 &(KOPrefs::instance()->mListViewFont),topFrame); 1048 &(KOPrefs::instance()->mListViewFont),topFrame);
1049 topLayout->addWidget(lVFont->label(),i,0); 1049 topLayout->addWidget(lVFont->label(),i,0);
@@ -1110,53 +1110,53 @@ void KOPrefsDialog::setupColorsTab()
1110 1110
1111 // Holiday Color 1111 // Holiday Color
1112 1112
1113 KPrefsWidColor *holidayColor = 1113 KPrefsDialogWidColor *holidayColor =
1114 addWidColor(i18n("Holiday color:"), 1114 addWidColor(i18n("Holiday color:"),
1115 &(KOPrefs::instance()->mHolidayColor),topFrame); 1115 &(KOPrefs::instance()->mHolidayColor),topFrame);
1116 topLayout->addWidget(holidayColor->label(),ii,0); 1116 topLayout->addWidget(holidayColor->label(),ii,0);
1117 topLayout->addWidget(holidayColor->button(),ii++,1); 1117 topLayout->addWidget(holidayColor->button(),ii++,1);
1118 1118
1119 // Highlight Color 1119 // Highlight Color
1120 KPrefsWidColor *highlightColor = 1120 KPrefsDialogWidColor *highlightColor =
1121 addWidColor(i18n("Highlight color:"), 1121 addWidColor(i18n("Highlight color:"),
1122 &(KOPrefs::instance()->mHighlightColor),topFrame); 1122 &(KOPrefs::instance()->mHighlightColor),topFrame);
1123 topLayout->addWidget(highlightColor->label(),ii,0); 1123 topLayout->addWidget(highlightColor->label(),ii,0);
1124 topLayout->addWidget(highlightColor->button(),ii++,1); 1124 topLayout->addWidget(highlightColor->button(),ii++,1);
1125 1125
1126 // Event color 1126 // Event color
1127 KPrefsWidColor *eventColor = 1127 KPrefsDialogWidColor *eventColor =
1128 addWidColor(i18n("Default event color:"), 1128 addWidColor(i18n("Default event color:"),
1129 &(KOPrefs::instance()->mEventColor),topFrame); 1129 &(KOPrefs::instance()->mEventColor),topFrame);
1130 topLayout->addWidget(eventColor->label(),ii,0); 1130 topLayout->addWidget(eventColor->label(),ii,0);
1131 topLayout->addWidget(eventColor->button(),ii++,1); 1131 topLayout->addWidget(eventColor->button(),ii++,1);
1132 1132
1133 // agenda view background color 1133 // agenda view background color
1134 KPrefsWidColor *agendaBgColor = 1134 KPrefsDialogWidColor *agendaBgColor =
1135 addWidColor(i18n("Agenda view background color:"), 1135 addWidColor(i18n("Agenda view background color:"),
1136 &(KOPrefs::instance()->mAgendaBgColor),topFrame); 1136 &(KOPrefs::instance()->mAgendaBgColor),topFrame);
1137 topLayout->addWidget(agendaBgColor->label(),ii,0); 1137 topLayout->addWidget(agendaBgColor->label(),ii,0);
1138 topLayout->addWidget(agendaBgColor->button(),ii++,1); 1138 topLayout->addWidget(agendaBgColor->button(),ii++,1);
1139 1139
1140 // working hours color 1140 // working hours color
1141 KPrefsWidColor *workingHoursColor = 1141 KPrefsDialogWidColor *workingHoursColor =
1142 addWidColor(i18n("Working hours color:"), 1142 addWidColor(i18n("Working hours color:"),
1143 &(KOPrefs::instance()->mWorkingHoursColor),topFrame); 1143 &(KOPrefs::instance()->mWorkingHoursColor),topFrame);
1144 topLayout->addWidget(workingHoursColor->label(),ii,0); 1144 topLayout->addWidget(workingHoursColor->label(),ii,0);
1145 topLayout->addWidget(workingHoursColor->button(),ii++,1); 1145 topLayout->addWidget(workingHoursColor->button(),ii++,1);
1146 1146
1147 KPrefsWidBool *sb = 1147 KPrefsDialogWidBool *sb =
1148 addWidBool(i18n("Use colors for application:"), 1148 addWidBool(i18n("Use colors for application:"),
1149 &(KOPrefs::instance()->mUseAppColors),topFrame); 1149 &(KOPrefs::instance()->mUseAppColors),topFrame);
1150 topLayout->addMultiCellWidget(sb->checkBox(), ii, ii, 0,1 ); 1150 topLayout->addMultiCellWidget(sb->checkBox(), ii, ii, 0,1 );
1151 1151
1152 ii++; 1152 ii++;
1153 KPrefsWidColor * workingHoursColor1 = 1153 KPrefsDialogWidColor * workingHoursColor1 =
1154 addWidColor(i18n("Buttons, menus, etc.:"), 1154 addWidColor(i18n("Buttons, menus, etc.:"),
1155 &(KOPrefs::instance()->mAppColor1),topFrame); 1155 &(KOPrefs::instance()->mAppColor1),topFrame);
1156 topLayout->addWidget(workingHoursColor1->label(),ii,0); 1156 topLayout->addWidget(workingHoursColor1->label(),ii,0);
1157 topLayout->addWidget(workingHoursColor1->button(),ii++,1); 1157 topLayout->addWidget(workingHoursColor1->button(),ii++,1);
1158 1158
1159 KPrefsWidColor * workingHoursColor2 = 1159 KPrefsDialogWidColor * workingHoursColor2 =
1160 addWidColor(i18n("Frames, labels, etc.:"), 1160 addWidColor(i18n("Frames, labels, etc.:"),
1161 &(KOPrefs::instance()->mAppColor2),topFrame); 1161 &(KOPrefs::instance()->mAppColor2),topFrame);
1162 topLayout->addWidget(workingHoursColor2->label(),ii,0); 1162 topLayout->addWidget(workingHoursColor2->label(),ii,0);
@@ -1206,7 +1206,7 @@ void KOPrefsDialog::setupGroupSchedulingTab()
1206 topLayout->setMargin(marginHint()); 1206 topLayout->setMargin(marginHint());
1207 1207
1208#if 0 1208#if 0
1209 KPrefsWidRadios *schedulerGroup = 1209 KPrefsDialogWidRadios *schedulerGroup =
1210 addWidRadios(i18n("Scheduler Mail Client"),&(KOPrefs::instance()->mIMIPScheduler), 1210 addWidRadios(i18n("Scheduler Mail Client"),&(KOPrefs::instance()->mIMIPScheduler),
1211 topFrame); 1211 topFrame);
1212 schedulerGroup->addRadio("Dummy"); // Only for debugging 1212 schedulerGroup->addRadio("Dummy"); // Only for debugging
@@ -1215,7 +1215,7 @@ void KOPrefsDialog::setupGroupSchedulingTab()
1215 topLayout->addMultiCellWidget(schedulerGroup->groupBox(),0,0,0,1); 1215 topLayout->addMultiCellWidget(schedulerGroup->groupBox(),0,0,0,1);
1216#endif 1216#endif
1217 1217
1218 KPrefsWidRadios *sendGroup = 1218 KPrefsDialogWidRadios *sendGroup =
1219 addWidRadios(i18n("Scheduler Mails Should Be"),&(KOPrefs::instance()->mIMIPSend), 1219 addWidRadios(i18n("Scheduler Mails Should Be"),&(KOPrefs::instance()->mIMIPSend),
1220 topFrame); 1220 topFrame);
1221 sendGroup->addRadio(i18n("Send to outbox")); 1221 sendGroup->addRadio(i18n("Send to outbox"));
@@ -1256,7 +1256,7 @@ void KOPrefsDialog::setupGroupAutomationTab()
1256 topLayout->setSpacing(spacingHint()); 1256 topLayout->setSpacing(spacingHint());
1257 topLayout->setMargin(marginHint()); 1257 topLayout->setMargin(marginHint());
1258 1258
1259 KPrefsWidRadios *autoRefreshGroup = 1259 KPrefsDialogWidRadios *autoRefreshGroup =
1260 addWidRadios(i18n("Auto Send Refresh"), 1260 addWidRadios(i18n("Auto Send Refresh"),
1261 &(KOPrefs::instance()->mIMIPAutoRefresh),topFrame); 1261 &(KOPrefs::instance()->mIMIPAutoRefresh),topFrame);
1262 autoRefreshGroup->addRadio(i18n("Never")); 1262 autoRefreshGroup->addRadio(i18n("Never"));
@@ -1264,7 +1264,7 @@ void KOPrefsDialog::setupGroupAutomationTab()
1264 //autoRefreshGroup->addRadio(i18n("selected emails")); 1264 //autoRefreshGroup->addRadio(i18n("selected emails"));
1265 topLayout->addMultiCellWidget(autoRefreshGroup->groupBox(),0,0,0,0); 1265 topLayout->addMultiCellWidget(autoRefreshGroup->groupBox(),0,0,0,0);
1266 1266
1267 KPrefsWidRadios *autoInsertGroup = 1267 KPrefsDialogWidRadios *autoInsertGroup =
1268 addWidRadios(i18n("Auto Insert IMIP Replies"), 1268 addWidRadios(i18n("Auto Insert IMIP Replies"),
1269 &(KOPrefs::instance()->mIMIPAutoInsertReply),topFrame); 1269 &(KOPrefs::instance()->mIMIPAutoInsertReply),topFrame);
1270 autoInsertGroup->addRadio(i18n("Never")); 1270 autoInsertGroup->addRadio(i18n("Never"));
@@ -1272,7 +1272,7 @@ void KOPrefsDialog::setupGroupAutomationTab()
1272 //autoInsertGroup->addRadio(i18n("selected emails")); 1272 //autoInsertGroup->addRadio(i18n("selected emails"));
1273 topLayout->addMultiCellWidget(autoInsertGroup->groupBox(),1,1,0,0); 1273 topLayout->addMultiCellWidget(autoInsertGroup->groupBox(),1,1,0,0);
1274 1274
1275 KPrefsWidRadios *autoRequestGroup = 1275 KPrefsDialogWidRadios *autoRequestGroup =
1276 addWidRadios(i18n("Auto Insert IMIP Requests"), 1276 addWidRadios(i18n("Auto Insert IMIP Requests"),
1277 &(KOPrefs::instance()->mIMIPAutoInsertRequest),topFrame); 1277 &(KOPrefs::instance()->mIMIPAutoInsertRequest),topFrame);
1278 autoRequestGroup->addRadio(i18n("Never")); 1278 autoRequestGroup->addRadio(i18n("Never"));
@@ -1280,7 +1280,7 @@ void KOPrefsDialog::setupGroupAutomationTab()
1280 //autoInsertGroup->addRadio(i18n("selected emails")); 1280 //autoInsertGroup->addRadio(i18n("selected emails"));
1281 topLayout->addMultiCellWidget(autoRequestGroup->groupBox(),2,2,0,0); 1281 topLayout->addMultiCellWidget(autoRequestGroup->groupBox(),2,2,0,0);
1282 1282
1283 KPrefsWidRadios *autoFreeBusyGroup = 1283 KPrefsDialogWidRadios *autoFreeBusyGroup =
1284 addWidRadios(i18n("Auto Send FreeBusy Information"), 1284 addWidRadios(i18n("Auto Send FreeBusy Information"),
1285 &(KOPrefs::instance()->mIMIPAutoFreeBusy),topFrame); 1285 &(KOPrefs::instance()->mIMIPAutoFreeBusy),topFrame);
1286 autoFreeBusyGroup->addRadio(i18n("Never")); 1286 autoFreeBusyGroup->addRadio(i18n("Never"));
@@ -1288,7 +1288,7 @@ void KOPrefsDialog::setupGroupAutomationTab()
1288 //autoFreeBusyGroup->addRadio(i18n("selected emails")); 1288 //autoFreeBusyGroup->addRadio(i18n("selected emails"));
1289 topLayout->addMultiCellWidget(autoFreeBusyGroup->groupBox(),3,3,0,0); 1289 topLayout->addMultiCellWidget(autoFreeBusyGroup->groupBox(),3,3,0,0);
1290 1290
1291 KPrefsWidRadios *autoFreeBusyReplyGroup = 1291 KPrefsDialogWidRadios *autoFreeBusyReplyGroup =
1292 addWidRadios(i18n("Auto Save FreeBusy Replies"), 1292 addWidRadios(i18n("Auto Save FreeBusy Replies"),
1293 &(KOPrefs::instance()->mIMIPAutoFreeBusyReply),topFrame); 1293 &(KOPrefs::instance()->mIMIPAutoFreeBusyReply),topFrame);
1294 autoFreeBusyReplyGroup->addRadio(i18n("Never")); 1294 autoFreeBusyReplyGroup->addRadio(i18n("Never"));
@@ -1578,7 +1578,7 @@ void KOPrefsDialog::setupTimeZoneTab()
1578 } 1578 }
1579 mTimeZoneCombo->setCurrentItem(nCurrentlySet); 1579 mTimeZoneCombo->setCurrentItem(nCurrentlySet);
1580 int iii = 1; 1580 int iii = 1;
1581 KPrefsWidBool *sb = 1581 KPrefsDialogWidBool *sb =
1582 addWidBool(i18n("Timezone has daylight saving"), 1582 addWidBool(i18n("Timezone has daylight saving"),
1583 &(KOPrefs::instance()->mUseDaylightsaving),topFrame); 1583 &(KOPrefs::instance()->mUseDaylightsaving),topFrame);
1584 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1); 1584 topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);