summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt4
-rw-r--r--korganizer/koprefsdialog.cpp179
2 files changed, 102 insertions, 81 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index e8ac960..b976f1b 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1300,8 +1300,8 @@
1300{ "As iCal (ics) file...","Als iCal (ics) Datei..." }, 1300{ "As iCal (ics) file...","Als iCal (ics) Datei..." },
1301{ "As vCal (vcs) file...","Als vCal (vcs) Datei..." }, 1301{ "As vCal (vcs) file...","Als vCal (vcs) Datei..." },
1302{ "Journal/Details...","Journale/Details..." }, 1302{ "Journal/Details...","Journale/Details..." },
1303{ "","" }, 1303{ "Agenda View","Agenda Ansicht" },
1304{ "","" }, 1304{ "Show current time","Zeige aktuelle Zeit" },
1305{ "","" }, 1305{ "","" },
1306{ "","" }, 1306{ "","" },
1307{ "","" }, 1307{ "","" },
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 443508d..40e8a99 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -336,7 +336,7 @@ void KOPrefsDialog::setupMainTab()
336 QFrame *topFrame = addPage(i18n("General"),0,0); 336 QFrame *topFrame = addPage(i18n("General"),0,0);
337 // DesktopIcon("identity",KIcon::SizeMedium)); 337 // DesktopIcon("identity",KIcon::SizeMedium));
338 338
339 QGridLayout *topLayout = new QGridLayout(topFrame,6,2); 339 QGridLayout *topLayout = new QGridLayout(topFrame,5,2);
340 topLayout->setSpacing(spacingHint()); 340 topLayout->setSpacing(spacingHint());
341 topLayout->setMargin(marginHint()); 341 topLayout->setMargin(marginHint());
342 342
@@ -357,47 +357,33 @@ void KOPrefsDialog::setupMainTab()
357 topLayout->addWidget(mEmailLabel,1,0); 357 topLayout->addWidget(mEmailLabel,1,0);
358 topLayout->addWidget(mEmailEdit,1,1); 358 topLayout->addWidget(mEmailEdit,1,1);
359 KPrefsDialogWidBool *wb; 359 KPrefsDialogWidBool *wb;
360 QHBox *dummy; 360
361 if ( QApplication::desktop()->width() > 480 ) {
362 dummy = new QHBox(topFrame);
363 } else {
364 dummy = new QVBox(topFrame);
365 }
366 361
367 topLayout->addMultiCellWidget(dummy, 2,2,0,1);
368 addWidBool(i18n("Full menu bar(nr)"),
369 &(KOPrefs::instance()->mShowFullMenu),dummy);
370 362
363 KPrefsDialogWidBool *widbool = addWidBool(i18n("Full menu bar(nr)"),
364 &(KOPrefs::instance()->mShowFullMenu),topFrame);
365 topLayout->addMultiCellWidget( widbool->checkBox(), 2,2,0,1);
371 366
372 addWidBool(i18n("Mini icons in toolbar(nr)"), 367
373 &(KOPrefs::instance()->mToolBarMiniIcons),dummy); 368 widbool = addWidBool(i18n("Mini icons in toolbar(nr)"),
374 369 &(KOPrefs::instance()->mToolBarMiniIcons),topFrame);
370 topLayout->addMultiCellWidget( widbool->checkBox(), 3,3,0,1);
375 371
376 dummy = new QHBox(topFrame);
377 new QLabel(i18n("Days in What's Next:"),dummy);
378 mWhatsNextSpin = new QSpinBox(1,14,1,dummy);
379
380 topLayout->addMultiCellWidget(dummy,3,3,0,1);
381 372
373 KPrefsDialogWidBool *verticalScreen =
374 addWidBool(i18n("Show vertical screen (Needs restart)"),
375 &(KOPrefs::instance()->mVerticalScreen),topFrame);
376 //topLayout->addWidget(verticalScreen->checkBox(),ii++,0);
377 topLayout->addMultiCellWidget(verticalScreen->checkBox(),4,4,0,1);
382 378
383 379
384 dummy = new QHBox(topFrame); 380 QHBox *dummy = new QHBox(topFrame);
385 new QLabel(i18n("Days in Next-X-Days:"),dummy); 381 new QLabel(i18n("Days in Next-X-Days:"),dummy);
386 mNextXDaysSpin = new QSpinBox(2,14,1,dummy); 382 mNextXDaysSpin = new QSpinBox(2,14,1,dummy);
387 383
388 topLayout->addMultiCellWidget(dummy,4,4,0,1); 384 topLayout->addMultiCellWidget(dummy,5,5,0,1);
389 385
390 QHBox *prioBox = new QHBox(topFrame); 386
391 // intervalBox->setSpacing(spacingHint());
392 topLayout->addMultiCellWidget(prioBox,5,5,0,1);
393 QString messa = i18n("Show topmost todo prios in What's Next:");
394
395 if ( QApplication::desktop()->width() < 300 )
396 messa = i18n("Show topmost todo prios in What's N.:");
397 QLabel *prioLabel = new QLabel(messa, prioBox);
398 mPrioSpin = new QSpinBox(0,5,1,prioBox);
399 if ( QApplication::desktop()->width() < 300 )
400 mPrioSpin->setFixedWidth( 40 );
401 387
402 // KPrefsDialogWidBool *bcc = 388 // KPrefsDialogWidBool *bcc =
403// addWidBool(i18n("Send copy to owner when mailing events"), 389// addWidBool(i18n("Send copy to owner when mailing events"),
@@ -426,16 +412,12 @@ void KOPrefsDialog::setupMainTab()
426 mHourSizeSlider = new QSlider(24,47,1,24,Horizontal,agendasize); 412 mHourSizeSlider = new QSlider(24,47,1,24,Horizontal,agendasize);
427 topLayout->addMultiCellWidget(agendasize,7,7,0,1); 413 topLayout->addMultiCellWidget(agendasize,7,7,0,1);
428 */ 414 */
429 KPrefsDialogWidBool *verticalScreen = 415
430 addWidBool(i18n("Show vertical screen (Needs restart)"),
431 &(KOPrefs::instance()->mVerticalScreen),topFrame);
432 //topLayout->addWidget(verticalScreen->checkBox(),ii++,0);
433 topLayout->addMultiCellWidget(verticalScreen->checkBox(),7,7,0,1);
434 416
435 KPrefsDialogWidBool *ask = 417 KPrefsDialogWidBool *ask =
436 addWidBool(i18n("Ask for quit when closing KO/Pi"), 418 addWidBool(i18n("Ask for quit when closing KO/Pi"),
437 &(KOPrefs::instance()->mAskForQuit),topFrame); 419 &(KOPrefs::instance()->mAskForQuit),topFrame);
438 topLayout->addMultiCellWidget(ask->checkBox(),8,8,0,1); 420 topLayout->addMultiCellWidget(ask->checkBox(),7,7,0,1);
439 421
440 422
441 /* 423 /*
@@ -606,30 +588,8 @@ void KOPrefsDialog::setupViewsTab()
606 &(KOPrefs::instance()->mEditOnDoubleClick),topFrame); 588 &(KOPrefs::instance()->mEditOnDoubleClick),topFrame);
607 topLayout->addWidget(dummy->checkBox(),ii++,0); 589 topLayout->addWidget(dummy->checkBox(),ii++,0);
608 590
609 dummy = 591
610 addWidBool(i18n("Show time in agenda items"),
611 &(KOPrefs::instance()->mShowTimeInAgenda),topFrame);
612 topLayout->addWidget(dummy->checkBox(),ii++,0);
613
614 dummy =
615 addWidBool(i18n("Highlight current day in agenda"),
616 &(KOPrefs::instance()->mHighlightCurrentDay),topFrame);
617 topLayout->addWidget(dummy->checkBox(),ii++,0);
618
619 dummy =
620 addWidBool(i18n("Use light color for highlight current day"),
621 &(KOPrefs::instance()->mUseHighlightLightColor),topFrame);
622 topLayout->addWidget(dummy->checkBox(),ii++,0);
623
624 KPrefsDialogWidBool *dailyRecur =
625 addWidBool(i18n("Show events that recur daily in date nav."),
626 &(KOPrefs::instance()->mDailyRecur),topFrame);
627 topLayout->addWidget(dailyRecur->checkBox(),ii++,0);
628 592
629 KPrefsDialogWidBool *weeklyRecur =
630 addWidBool(i18n("Show ev. that recur weekly in date nav."),
631 &(KOPrefs::instance()->mWeeklyRecur),topFrame);
632 topLayout->addWidget(weeklyRecur->checkBox(),ii++,0);
633 if ( QApplication::desktop()->width() > 640 ) { 593 if ( QApplication::desktop()->width() > 640 ) {
634 594
635 KPrefsDialogWidBool *enableToolTips = 595 KPrefsDialogWidBool *enableToolTips =
@@ -639,11 +599,7 @@ void KOPrefsDialog::setupViewsTab()
639 599
640 } 600 }
641 601
642 KPrefsDialogWidBool *marcusBainsEnabled = 602
643 addWidBool(i18n("Show Marcus Bains line"),
644 &(KOPrefs::instance()->mMarcusBainsEnabled),topFrame);
645 topLayout->addWidget(marcusBainsEnabled->checkBox(),ii++,0);
646
647 603
648 // topLayout->addWidget(hourSizeGroup,ii++,0); 604 // topLayout->addWidget(hourSizeGroup,ii++,0);
649 // topLayout->addMultiCellWidget(hourSizeGroup,ii,ii,0,0); 605 // topLayout->addMultiCellWidget(hourSizeGroup,ii,ii,0,0);
@@ -652,7 +608,7 @@ void KOPrefsDialog::setupViewsTab()
652 608
653 609
654 610
655 611#if 0
656 612
657 topFrame = addPage(i18n("ViewChange"),0,0); 613 topFrame = addPage(i18n("ViewChange"),0,0);
658 // DesktopIcon("viewmag",KIcon::SizeMedium)); 614 // DesktopIcon("viewmag",KIcon::SizeMedium));
@@ -661,7 +617,8 @@ void KOPrefsDialog::setupViewsTab()
661 topLayout->setSpacing(spacingHint()); 617 topLayout->setSpacing(spacingHint());
662 topLayout->setMargin(marginHint()); 618 topLayout->setMargin(marginHint());
663 ii = 0; 619 ii = 0;
664 620
621#endif
665 622
666 dummy = 623 dummy =
667 addWidBool(i18n("Hold fullscreen on view change"), 624 addWidBool(i18n("Hold fullscreen on view change"),
@@ -674,16 +631,67 @@ void KOPrefsDialog::setupViewsTab()
674 topLayout->addWidget(dummy->checkBox(),ii++,0); 631 topLayout->addWidget(dummy->checkBox(),ii++,0);
675 632
676 633
677 KPrefsDialogWidBool *fullViewTodo =
678 addWidBool(i18n("Event list view uses full window"),
679 &(KOPrefs::instance()->mFullViewTodo),topFrame);
680 topLayout->addWidget(fullViewTodo->checkBox(),ii++,0);
681 634
682 KPrefsDialogWidBool *fullViewMonth = 635 KPrefsDialogWidBool *fullViewMonth =
683 addWidBool(i18n("Next days view uses full window"), 636 addWidBool(i18n("Next days view uses full window"),
684 &(KOPrefs::instance()->mFullViewMonth),topFrame); 637 &(KOPrefs::instance()->mFullViewMonth),topFrame);
685 topLayout->addWidget(fullViewMonth->checkBox(),ii++,0); 638 topLayout->addWidget(fullViewMonth->checkBox(),ii++,0);
686 639
640
641 KPrefsDialogWidBool *fullViewTodo =
642 addWidBool(i18n("Event list view uses full window"),
643 &(KOPrefs::instance()->mFullViewTodo),topFrame);
644 topLayout->addWidget(fullViewTodo->checkBox(),ii++,0);
645 dummy =
646 addWidBool(i18n("Listview uses monthly timespan"),
647 &(KOPrefs::instance()->mListViewMonthTimespan),topFrame);
648 topLayout->addWidget(dummy->checkBox(),ii++,0);
649 dummy =
650 addWidBool(i18n("Highlight selection in Time Edit"),
651 &(KOPrefs::instance()->mHightlightDateTimeEdit),topFrame);
652 topLayout->addWidget( dummy->checkBox(), ii++,0);
653
654 KPrefsDialogWidBool *dailyRecur =
655 addWidBool(i18n("Show events that recur daily in date nav."),
656 &(KOPrefs::instance()->mDailyRecur),topFrame);
657 topLayout->addWidget(dailyRecur->checkBox(),ii++,0);
658
659 KPrefsDialogWidBool *weeklyRecur =
660 addWidBool(i18n("Show ev. that recur weekly in date nav."),
661 &(KOPrefs::instance()->mWeeklyRecur),topFrame);
662 topLayout->addWidget(weeklyRecur->checkBox(),ii++,0);
663
664 topFrame = addPage(i18n("Agenda View"),0,0);
665 // DesktopIcon("viewmag",KIcon::SizeMedium));
666
667 topLayout = new QGridLayout(topFrame,5,1);
668 topLayout->setSpacing(spacingHint());
669 topLayout->setMargin(marginHint());
670 ii = 0;
671
672
673 dummy =
674 addWidBool(i18n("Show time in agenda items"),
675 &(KOPrefs::instance()->mShowTimeInAgenda),topFrame);
676 topLayout->addWidget(dummy->checkBox(),ii++,0);
677
678 dummy =
679 addWidBool(i18n("Highlight current day in agenda"),
680 &(KOPrefs::instance()->mHighlightCurrentDay),topFrame);
681 topLayout->addWidget(dummy->checkBox(),ii++,0);
682
683 dummy =
684 addWidBool(i18n("Use light color for highlight current day"),
685 &(KOPrefs::instance()->mUseHighlightLightColor),topFrame);
686 topLayout->addWidget(dummy->checkBox(),ii++,0);
687
688
689 KPrefsDialogWidBool *marcusBainsEnabled =
690 addWidBool(i18n("Show current time"),
691 &(KOPrefs::instance()->mMarcusBainsEnabled),topFrame);
692 topLayout->addWidget(marcusBainsEnabled->checkBox(),ii++,0);
693
694
687 dummy = 695 dummy =
688 addWidBool(i18n("Set agenda to DayBeginsAt on change"), 696 addWidBool(i18n("Set agenda to DayBeginsAt on change"),
689 &(KOPrefs::instance()->mSetTimeToDayStartAt),topFrame); 697 &(KOPrefs::instance()->mSetTimeToDayStartAt),topFrame);
@@ -694,14 +702,7 @@ void KOPrefsDialog::setupViewsTab()
694 &(KOPrefs::instance()->mCenterOnCurrentTime),topFrame); 702 &(KOPrefs::instance()->mCenterOnCurrentTime),topFrame);
695 topLayout->addWidget(dummy->checkBox(),ii++,0); 703 topLayout->addWidget(dummy->checkBox(),ii++,0);
696 704
697 dummy = 705
698 addWidBool(i18n("Listview uses monthly timespan"),
699 &(KOPrefs::instance()->mListViewMonthTimespan),topFrame);
700 topLayout->addWidget(dummy->checkBox(),ii++,0);
701 dummy =
702 addWidBool(i18n("Highlight selection in Time Edit"),
703 &(KOPrefs::instance()->mHightlightDateTimeEdit),topFrame);
704 topLayout->addWidget( dummy->checkBox(), ii++,0);
705 706
706 707
707 708
@@ -808,6 +809,26 @@ void KOPrefsDialog::setupViewsTab()
808 topLayout->setSpacing(spacingHint()); 809 topLayout->setSpacing(spacingHint());
809 topLayout->setMargin(marginHint()); 810 topLayout->setMargin(marginHint());
810 ii = 0; 811 ii = 0;
812
813
814 QHBox* hdummy = new QHBox(topFrame);
815 new QLabel(i18n("Days in What's Next:"),hdummy);
816 mWhatsNextSpin = new QSpinBox(1,14,1,hdummy);
817
818 topLayout->addWidget(hdummy,ii++,0);
819
820 QHBox *prioBox = new QHBox(topFrame);
821 // intervalBox->setSpacing(spacingHint());
822 topLayout->addWidget(prioBox,ii++,0);
823 QString messa = i18n("Show topmost todo prios in What's Next:");
824
825 if ( QApplication::desktop()->width() < 300 )
826 messa = i18n("Show topmost todo prios in What's N.:");
827 QLabel *prioLabel = new QLabel(messa, prioBox);
828 mPrioSpin = new QSpinBox(0,5,1,prioBox);
829 if ( QApplication::desktop()->width() < 300 )
830 mPrioSpin->setFixedWidth( 40 );
831
811 KPrefsDialogWidBool *passwdk = 832 KPrefsDialogWidBool *passwdk =
812 833
813 addWidBool(i18n("Show events, that are done in \nWhat's Next view"), 834 addWidBool(i18n("Show events, that are done in \nWhat's Next view"),