-rw-r--r-- | kmicromail/koprefsdialog.cpp | 74 |
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 | |||
@@ -92,13 +92,13 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : | |||
92 | 92 | ||
93 | 93 | ||
94 | KOPrefsDialog::~KOPrefsDialog() | 94 | KOPrefsDialog::~KOPrefsDialog() |
95 | { | 95 | { |
96 | } | 96 | } |
97 | 97 | ||
98 | void KOPrefsDialog::setupMainTab() | 98 | void 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()); |
@@ -112,26 +112,26 @@ void KOPrefsDialog::setupMainTab() | |||
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 | ||
123 | void KOPrefsDialog::setupMailTab() | 123 | void 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); |
@@ -145,15 +145,15 @@ void KOPrefsDialog::setupFontsTab() | |||
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; |
@@ -164,13 +164,13 @@ void KOPrefsDialog::setupFontsTab() | |||
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; |
@@ -273,13 +273,13 @@ void KOPrefsDialog::setupLocaleTab() | |||
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; |
@@ -324,13 +324,13 @@ void KOPrefsDialog::setupSyncAlgTab() | |||
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 | ||
@@ -391,13 +391,13 @@ void KOPrefsDialog::setupSyncTab() | |||
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"), |
@@ -414,13 +414,13 @@ void KOPrefsDialog::setupMainTab() | |||
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 | ||
@@ -430,13 +430,13 @@ void KOPrefsDialog::setupMainTab() | |||
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 | } |
@@ -473,13 +473,13 @@ void KOPrefsDialog::setupMainTab() | |||
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); |
@@ -500,26 +500,26 @@ void KOPrefsDialog::setupMainTab() | |||
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 = |
@@ -557,13 +557,13 @@ void KOPrefsDialog::setupMainTab() | |||
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), |
@@ -637,13 +637,13 @@ void KOPrefsDialog::setupTimeTab() | |||
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 | } |
@@ -675,13 +675,13 @@ void KOPrefsDialog::setupViewsTab() | |||
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"), |
@@ -690,30 +690,30 @@ void KOPrefsDialog::setupViewsTab() | |||
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"), |
@@ -723,13 +723,13 @@ void KOPrefsDialog::setupViewsTab() | |||
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); |
@@ -758,18 +758,18 @@ void KOPrefsDialog::setupViewsTab() | |||
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"), |
@@ -840,24 +840,24 @@ void KOPrefsDialog::setupViewsTab() | |||
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"), |
@@ -894,13 +894,13 @@ void KOPrefsDialog::setupViewsTab() | |||
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); |
@@ -1044,15 +1044,15 @@ void KOPrefsDialog::setupFontsTab() | |||
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; |
@@ -1063,22 +1063,22 @@ void KOPrefsDialog::setupFontsTab() | |||
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; |
@@ -1119,31 +1119,31 @@ void KOPrefsDialog::setupFontsTab() | |||
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; |
@@ -1238,13 +1238,13 @@ void KOPrefsDialog::setupColorsTab() | |||
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 = |
@@ -1672,13 +1672,13 @@ void KOPrefsDialog::setupTimeZoneTab() | |||
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); |