author | zautrix <zautrix> | 2005-01-23 15:44:48 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-01-23 15:44:48 (UTC) |
commit | abe5f73892c123110faec5648b484628b3265fd6 (patch) (unidiff) | |
tree | 8619e09ffbeb3b5ef9302a8bcb39092b426d3e43 | |
parent | 6946f6ab0ee6eeafee0c8ff5d33fffc0826c7452 (diff) | |
download | kdepimpi-abe5f73892c123110faec5648b484628b3265fd6.zip kdepimpi-abe5f73892c123110faec5648b484628b3265fd6.tar.gz kdepimpi-abe5f73892c123110faec5648b484628b3265fd6.tar.bz2 |
bter today
-rw-r--r-- | bin/kdepim/WhatsNew.txt | 7 | ||||
-rw-r--r-- | korganizer/koagendaview.cpp | 18 |
2 files changed, 21 insertions, 4 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index adbfd67..5bfe1c8 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt | |||
@@ -1,112 +1,113 @@ | |||
1 | Info about the changes in new versions of KDE-Pim/Pi | 1 | Info about the changes in new versions of KDE-Pim/Pi |
2 | 2 | ||
3 | ********** VERSION 1.9.20 ************ | 3 | ********** VERSION 1.9.20 ************ |
4 | 4 | ||
5 | KO/Pi: | 5 | KO/Pi: |
6 | Added for the "dislplay one day" agenda mode | ||
7 | info in the caption and in the day lables: | ||
8 | Now it is displayed, if the selected day is from "day before yesterday" | ||
9 | to "day after tomorrow". | ||
6 | Made it possible to delete a Todo, which has sub-todos. | 10 | Made it possible to delete a Todo, which has sub-todos. |
7 | Fixed two small problems in the todo view. | 11 | Fixed two small problems in the todo view. |
8 | Added missing German translation for filter edit and print dialog. | 12 | Added missing German translation for filter edit and print dialog. |
9 | Made search dialog closeable by cancel key. | 13 | Made search dialog closeable by cancel key. |
10 | 14 | ||
11 | Made it possible to select in the date picker the (ligt grey ) | 15 | Made it possible to select in the date picker the (ligt grey ) |
12 | dates of the prev./next month with the mouse. | 16 | dates of the prev./next month with the mouse. |
13 | 17 | ||
14 | Added for the "dislplay one day" agenda mode info in the caption: | ||
15 | Now it is displayed, if the selected day is from "day before yesterday" | ||
16 | to "day after tomorrow". | ||
17 | 18 | ||
18 | 19 | ||
19 | 20 | ||
20 | ********** VERSION 1.9.19 ************ | 21 | ********** VERSION 1.9.19 ************ |
21 | 22 | ||
22 | Added a lot of missing translations to KA/Pi, | 23 | Added a lot of missing translations to KA/Pi, |
23 | Added some missing translations to KO/Pi and OM/Pi. | 24 | Added some missing translations to KO/Pi and OM/Pi. |
24 | 25 | ||
25 | Fixed some minor problems in KA/Pi + KO/Pi. | 26 | Fixed some minor problems in KA/Pi + KO/Pi. |
26 | 27 | ||
27 | Fixed a crash when closing PwM/Pi. | 28 | Fixed a crash when closing PwM/Pi. |
28 | Added German translation for PwM/Pi. | 29 | Added German translation for PwM/Pi. |
29 | 30 | ||
30 | Made view change and Month View update faster in KO/Pi. | 31 | Made view change and Month View update faster in KO/Pi. |
31 | 32 | ||
32 | 33 | ||
33 | ********** VERSION 1.9.18 ************ | 34 | ********** VERSION 1.9.18 ************ |
34 | 35 | ||
35 | FYI: The VERSION 1.9.17 was a testing release only. | 36 | FYI: The VERSION 1.9.17 was a testing release only. |
36 | Please read the changelog of VERSION 1.9.17 as well. | 37 | Please read the changelog of VERSION 1.9.17 as well. |
37 | 38 | ||
38 | Cleaned up the syncing config dialog. | 39 | Cleaned up the syncing config dialog. |
39 | Added sync config options for date range for events. | 40 | Added sync config options for date range for events. |
40 | Added sync config options for filters on incoming data. | 41 | Added sync config options for filters on incoming data. |
41 | Added sync config options for filters on outgoing data. | 42 | Added sync config options for filters on outgoing data. |
42 | Please read the updated SyncHowTo about the new filter settings. | 43 | Please read the updated SyncHowTo about the new filter settings. |
43 | These filter settings make it now possible to sync with shared | 44 | These filter settings make it now possible to sync with shared |
44 | calendars without writing back private or confidential data | 45 | calendars without writing back private or confidential data |
45 | (via the outgoing filters). | 46 | (via the outgoing filters). |
46 | To sync only with particular parts of a shared calendar, | 47 | To sync only with particular parts of a shared calendar, |
47 | the incoming filter settings can be used. | 48 | the incoming filter settings can be used. |
48 | An example can be found in the SyncHowTo. | 49 | An example can be found in the SyncHowTo. |
49 | Same for shared addressbooks. | 50 | Same for shared addressbooks. |
50 | 51 | ||
51 | Added a setting for the global kdepim data storage. | 52 | Added a setting for the global kdepim data storage. |
52 | Usually the data is stored in (yourhomedir/kdepim). | 53 | Usually the data is stored in (yourhomedir/kdepim). |
53 | Now you can set in the Global config dialog TAB, subTAB "Data storage path" | 54 | Now you can set in the Global config dialog TAB, subTAB "Data storage path" |
54 | a directory where all the kdepim data is stored. | 55 | a directory where all the kdepim data is stored. |
55 | That makes it easy to save all kdepim data on a SD card on the Z, for example. | 56 | That makes it easy to save all kdepim data on a SD card on the Z, for example. |
56 | 57 | ||
57 | KO/Pi: | 58 | KO/Pi: |
58 | The timeedit input has a pulldown list for times. | 59 | The timeedit input has a pulldown list for times. |
59 | If opened, this pulldown list should now has the right time highlighted. | 60 | If opened, this pulldown list should now has the right time highlighted. |
60 | Added the possibility to exclude events/todos/journals in a filter. | 61 | Added the possibility to exclude events/todos/journals in a filter. |
61 | You should exclude journals, if you do not want them to sync with a public calendar. | 62 | You should exclude journals, if you do not want them to sync with a public calendar. |
62 | 63 | ||
63 | KA/Pi: | 64 | KA/Pi: |
64 | Added the possibility to in/exclude public/private/confidential contacts to a filter. | 65 | Added the possibility to in/exclude public/private/confidential contacts to a filter. |
65 | If you have already defined filterrules in KA/Pi you have to adjust them all by setting the "include public/private/confidential" property manually. Sorry for that ... | 66 | If you have already defined filterrules in KA/Pi you have to adjust them all by setting the "include public/private/confidential" property manually. Sorry for that ... |
66 | Added printing of card view and details view on desktop. | 67 | Added printing of card view and details view on desktop. |
67 | Printing of list view is not working... | 68 | Printing of list view is not working... |
68 | Added button for removing pictures in contact editor. | 69 | Added button for removing pictures in contact editor. |
69 | Parsing data fix of KA/Pi version 1.9.17. | 70 | Parsing data fix of KA/Pi version 1.9.17. |
70 | Fixed the "parse name automatically" problem of KA/Pi version 1.9.17. | 71 | Fixed the "parse name automatically" problem of KA/Pi version 1.9.17. |
71 | Fixed some syncing merging problems. | 72 | Fixed some syncing merging problems. |
72 | 73 | ||
73 | 74 | ||
74 | ********** VERSION 1.9.17 ************ | 75 | ********** VERSION 1.9.17 ************ |
75 | 76 | ||
76 | KO/Pi: | 77 | KO/Pi: |
77 | Fixed that tooltips were not updated after moving an item in agenda view. | 78 | Fixed that tooltips were not updated after moving an item in agenda view. |
78 | Fixed a bug in sorting start date for recurring events in list view. | 79 | Fixed a bug in sorting start date for recurring events in list view. |
79 | Changed the left button in todo viewer from "Agenda" to "Set completed". | 80 | Changed the left button in todo viewer from "Agenda" to "Set completed". |
80 | This makes it possible to change a todo in the What's Next View quickly to the completed state without leaving the What's Next View. | 81 | This makes it possible to change a todo in the What's Next View quickly to the completed state without leaving the What's Next View. |
81 | Added more info in the todo viewer: Startdate, parent/sub todos. | 82 | Added more info in the todo viewer: Startdate, parent/sub todos. |
82 | 83 | ||
83 | 84 | ||
84 | KA/Pi: | 85 | KA/Pi: |
85 | All fields search does now actually search all the (possible) fields, | 86 | All fields search does now actually search all the (possible) fields, |
86 | not only those listed in the contact list. | 87 | not only those listed in the contact list. |
87 | Made is possible to inline a picture in a vcard on the Z. | 88 | Made is possible to inline a picture in a vcard on the Z. |
88 | This was only possible on the desktop, now is it possible on the Z as well. | 89 | This was only possible on the desktop, now is it possible on the Z as well. |
89 | Fixed of missing save settings after filter configuration. | 90 | Fixed of missing save settings after filter configuration. |
90 | Made saving of addressbook much faster. | 91 | Made saving of addressbook much faster. |
91 | Fixed extension widget layout problem. | 92 | Fixed extension widget layout problem. |
92 | Fixed saving of default formatted name settings. | 93 | Fixed saving of default formatted name settings. |
93 | Fixed formatted name handling in edit dialog. | 94 | Fixed formatted name handling in edit dialog. |
94 | Added an option for changing formatted names of many contacts | 95 | Added an option for changing formatted names of many contacts |
95 | (menu: File - Change - Set formatted name). | 96 | (menu: File - Change - Set formatted name). |
96 | 97 | ||
97 | QWhatsThis was not working on the Z ( only black rectangle was shown). | 98 | QWhatsThis was not working on the Z ( only black rectangle was shown). |
98 | This is Fixed. | 99 | This is Fixed. |
99 | 100 | ||
100 | KDE-Sync: | 101 | KDE-Sync: |
101 | Now readonly KDE resources are synced as well. | 102 | Now readonly KDE resources are synced as well. |
102 | (They are not changed in KDE itself, of course). | 103 | (They are not changed in KDE itself, of course). |
103 | 104 | ||
104 | 105 | ||
105 | 106 | ||
106 | ********** VERSION 1.9.16 ************ | 107 | ********** VERSION 1.9.16 ************ |
107 | 108 | ||
108 | KO/Pi: | 109 | KO/Pi: |
109 | Fixed search dialog size on Z 6000 (480x640 display). | 110 | Fixed search dialog size on Z 6000 (480x640 display). |
110 | Added setting to hide/show time in agenda items. | 111 | Added setting to hide/show time in agenda items. |
111 | Added setting to hide not running todos in todo view. | 112 | Added setting to hide not running todos in todo view. |
112 | Added columns for start date/time in todo view. | 113 | Added columns for start date/time in todo view. |
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index c5acafd..6428757 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp | |||
@@ -545,237 +545,253 @@ void KOAgendaView::resizeEvent( QResizeEvent* e ) | |||
545 | int ow = e->oldSize().width(); | 545 | int ow = e->oldSize().width(); |
546 | int oh = e->oldSize().height(); | 546 | int oh = e->oldSize().height(); |
547 | int w = e->size().width(); | 547 | int w = e->size().width(); |
548 | int h = e->size().height(); | 548 | int h = e->size().height(); |
549 | if ( (ow > oh && w< h ) || (ow < oh && w > h ) ) { | 549 | if ( (ow > oh && w< h ) || (ow < oh && w > h ) ) { |
550 | if ( ! mBlockUpdating && !globalFlagBlockStartup && !globalFlagBlockAgenda ) | 550 | if ( ! mBlockUpdating && !globalFlagBlockStartup && !globalFlagBlockAgenda ) |
551 | uc = true; | 551 | uc = true; |
552 | //qDebug("view changed %d %d %d %d ", ow, oh , w , h); | 552 | //qDebug("view changed %d %d %d %d ", ow, oh , w , h); |
553 | } | 553 | } |
554 | mUpcomingWidth = e->size().width() ; | 554 | mUpcomingWidth = e->size().width() ; |
555 | if ( mBlockUpdating || uc ) { | 555 | if ( mBlockUpdating || uc ) { |
556 | mBlockUpdating = false; | 556 | mBlockUpdating = false; |
557 | //mAgenda->setMinimumSize(800 , 600 ); | 557 | //mAgenda->setMinimumSize(800 , 600 ); |
558 | //qDebug("mAgenda->resize+++++++++++++++ "); | 558 | //qDebug("mAgenda->resize+++++++++++++++ "); |
559 | updateConfig(); | 559 | updateConfig(); |
560 | //qDebug("KOAgendaView::Updating now possible "); | 560 | //qDebug("KOAgendaView::Updating now possible "); |
561 | } else | 561 | } else |
562 | createDayLabels(); | 562 | createDayLabels(); |
563 | //qDebug("resizeEvent end "); | 563 | //qDebug("resizeEvent end "); |
564 | 564 | ||
565 | } | 565 | } |
566 | void KOAgendaView::createDayLabels() | 566 | void KOAgendaView::createDayLabels() |
567 | { | 567 | { |
568 | 568 | ||
569 | if ( mBlockUpdating || globalFlagBlockLabel == 1) { | 569 | if ( mBlockUpdating || globalFlagBlockLabel == 1) { |
570 | // qDebug(" KOAgendaView::createDayLabels() blocked "); | 570 | // qDebug(" KOAgendaView::createDayLabels() blocked "); |
571 | return; | 571 | return; |
572 | 572 | ||
573 | } | 573 | } |
574 | int newHight; | 574 | int newHight; |
575 | 575 | ||
576 | // ### Before deleting and recreating we could check if mSelectedDates changed... | 576 | // ### Before deleting and recreating we could check if mSelectedDates changed... |
577 | // It would remove some flickering and gain speed (since this is called by | 577 | // It would remove some flickering and gain speed (since this is called by |
578 | // each updateView() call) | 578 | // each updateView() call) |
579 | 579 | ||
580 | int maxWid = mUpcomingWidth - mTimeLabels->width()- mAgenda->verticalScrollBar()->width() - 2; | 580 | int maxWid = mUpcomingWidth - mTimeLabels->width()- mAgenda->verticalScrollBar()->width() - 2; |
581 | mDayLabelsFrame->setMaximumWidth( mUpcomingWidth ); | 581 | mDayLabelsFrame->setMaximumWidth( mUpcomingWidth ); |
582 | if ( maxWid < 0 ) | 582 | if ( maxWid < 0 ) |
583 | maxWid = 20; | 583 | maxWid = 20; |
584 | 584 | ||
585 | QFont dlf = KOPrefs::instance()->mTimeLabelsFont; | 585 | QFont dlf = KOPrefs::instance()->mTimeLabelsFont; |
586 | QFontMetrics fm ( dlf ); | 586 | QFontMetrics fm ( dlf ); |
587 | int selCount = mSelectedDates.count(); | 587 | int selCount = mSelectedDates.count(); |
588 | QString dayTest = "Mon 20"; | 588 | QString dayTest = "Mon 20"; |
589 | int wid = fm.width( dayTest ); | 589 | int wid = fm.width( dayTest ); |
590 | maxWid -= ( selCount * 3 ); | 590 | maxWid -= ( selCount * 3 ); |
591 | if ( maxWid < 0 ) | 591 | if ( maxWid < 0 ) |
592 | maxWid = 20; | 592 | maxWid = 20; |
593 | int needWid = wid * selCount; | 593 | int needWid = wid * selCount; |
594 | //qDebug("++++++++Needed : %d MaxWidth: %d", needWid, maxWid ); | 594 | //qDebug("++++++++Needed : %d MaxWidth: %d", needWid, maxWid ); |
595 | //if ( needWid > maxWid ) | 595 | //if ( needWid > maxWid ) |
596 | // qDebug("DAYLABELS TOOOOOOO BIG "); | 596 | // qDebug("DAYLABELS TOOOOOOO BIG "); |
597 | while ( needWid > maxWid ) { | 597 | while ( needWid > maxWid ) { |
598 | dayTest = dayTest.left( dayTest.length() - 1 ); | 598 | dayTest = dayTest.left( dayTest.length() - 1 ); |
599 | wid = fm.width( dayTest ); | 599 | wid = fm.width( dayTest ); |
600 | needWid = wid * selCount; | 600 | needWid = wid * selCount; |
601 | } | 601 | } |
602 | int maxLen = dayTest.length(); | 602 | int maxLen = dayTest.length(); |
603 | int fontPoint = dlf.pointSize(); | 603 | int fontPoint = dlf.pointSize(); |
604 | if ( maxLen < 2 ) { | 604 | if ( maxLen < 2 ) { |
605 | int fontPoint = dlf.pointSize(); | 605 | int fontPoint = dlf.pointSize(); |
606 | while ( fontPoint > 4 ) { | 606 | while ( fontPoint > 4 ) { |
607 | --fontPoint; | 607 | --fontPoint; |
608 | dlf.setPointSize( fontPoint ); | 608 | dlf.setPointSize( fontPoint ); |
609 | QFontMetrics f( dlf ); | 609 | QFontMetrics f( dlf ); |
610 | wid = f.width( "20" ); | 610 | wid = f.width( "20" ); |
611 | needWid = wid * selCount; | 611 | needWid = wid * selCount; |
612 | if ( needWid < maxWid ) | 612 | if ( needWid < maxWid ) |
613 | break; | 613 | break; |
614 | } | 614 | } |
615 | maxLen = 2; | 615 | maxLen = 2; |
616 | } | 616 | } |
617 | //qDebug("Max len %d ", dayTest.length() ); | 617 | //qDebug("Max len %d ", dayTest.length() ); |
618 | 618 | ||
619 | QFontMetrics tempF( dlf ); | 619 | QFontMetrics tempF( dlf ); |
620 | newHight = tempF.height(); | 620 | newHight = tempF.height(); |
621 | mDayLabels->setFont( dlf ); | 621 | mDayLabels->setFont( dlf ); |
622 | // mLayoutDayLabels = new QHBoxLayout(mDayLabels);; | 622 | // mLayoutDayLabels = new QHBoxLayout(mDayLabels);; |
623 | // mLayoutDayLabels->addSpacing(mTimeLabels->width()); | 623 | // mLayoutDayLabels->addSpacing(mTimeLabels->width()); |
624 | //mLayoutDayLabels->addSpacing( 2 ); | 624 | //mLayoutDayLabels->addSpacing( 2 ); |
625 | // QFont lFont = dlf; | 625 | // QFont lFont = dlf; |
626 | bool appendLabels = false; | 626 | bool appendLabels = false; |
627 | QLabel *dayLabel; | 627 | QLabel *dayLabel; |
628 | dayLabel = mDayLabelsList.first(); | 628 | dayLabel = mDayLabelsList.first(); |
629 | if ( !dayLabel ) { | 629 | if ( !dayLabel ) { |
630 | appendLabels = true; | 630 | appendLabels = true; |
631 | dayLabel = new QLabel(mDayLabels); | 631 | dayLabel = new QLabel(mDayLabels); |
632 | mDayLabelsList.append( dayLabel ); | 632 | mDayLabelsList.append( dayLabel ); |
633 | mLayoutDayLabels->addWidget(dayLabel); | 633 | mLayoutDayLabels->addWidget(dayLabel); |
634 | } | 634 | } |
635 | dayLabel->setFixedWidth( mTimeLabels->width()+2 ); | 635 | dayLabel->setFixedWidth( mTimeLabels->width()+2 ); |
636 | dayLabel->setFont( dlf ); | 636 | dayLabel->setFont( dlf ); |
637 | dayLabel->setAlignment(QLabel::AlignHCenter); | 637 | dayLabel->setAlignment(QLabel::AlignHCenter); |
638 | dayLabel->setText( KOGlobals::self()->calendarSystem()->monthName( mSelectedDates.first(), true ) ); | 638 | dayLabel->setText( KOGlobals::self()->calendarSystem()->monthName( mSelectedDates.first(), true ) ); |
639 | dayLabel->show(); | 639 | dayLabel->show(); |
640 | DateList::ConstIterator dit; | 640 | DateList::ConstIterator dit; |
641 | bool oneday = (mSelectedDates.first() == mSelectedDates.last() ); | ||
641 | for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) { | 642 | for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) { |
642 | QDate date = *dit; | 643 | QDate date = *dit; |
643 | // QBoxLayout *dayLayout = new QVBoxLayout(mLayoutDayLabels); | 644 | // QBoxLayout *dayLayout = new QVBoxLayout(mLayoutDayLabels); |
644 | if ( ! appendLabels ) { | 645 | if ( ! appendLabels ) { |
645 | dayLabel = mDayLabelsList.next(); | 646 | dayLabel = mDayLabelsList.next(); |
646 | if ( !dayLabel ) | 647 | if ( !dayLabel ) |
647 | appendLabels = true; | 648 | appendLabels = true; |
648 | } | 649 | } |
649 | if ( appendLabels ) { | 650 | if ( appendLabels ) { |
650 | dayLabel = new QLabel(mDayLabels); | 651 | dayLabel = new QLabel(mDayLabels); |
651 | mDayLabelsList.append( dayLabel ); | 652 | mDayLabelsList.append( dayLabel ); |
652 | mLayoutDayLabels->addWidget(dayLabel); | 653 | mLayoutDayLabels->addWidget(dayLabel); |
653 | } | 654 | } |
654 | dayLabel->setMinimumWidth( 1 ); | 655 | dayLabel->setMinimumWidth( 1 ); |
655 | dayLabel->setMaximumWidth( 2048 ); | 656 | dayLabel->setMaximumWidth( 2048 ); |
656 | dayLabel->setFont( dlf ); | 657 | dayLabel->setFont( dlf ); |
657 | dayLabel->show(); | 658 | dayLabel->show(); |
658 | QString str; | 659 | QString str; |
659 | int dW = KOGlobals::self()->calendarSystem()->dayOfWeek(date); | 660 | int dW = KOGlobals::self()->calendarSystem()->dayOfWeek(date); |
660 | QString dayName = KOGlobals::self()->calendarSystem()->weekDayName( dW, true ); | 661 | QString dayName = KOGlobals::self()->calendarSystem()->weekDayName( dW, true ); |
661 | switch ( maxLen ) { | 662 | switch ( maxLen ) { |
662 | case 2: | 663 | case 2: |
663 | str = QString::number( date.day() ); | 664 | str = QString::number( date.day() ); |
664 | break; | 665 | break; |
665 | 666 | ||
666 | case 3: | 667 | case 3: |
667 | str = dayName.left( 1 ) +QString::number( date.day()); | 668 | str = dayName.left( 1 ) +QString::number( date.day()); |
668 | 669 | ||
669 | break; | 670 | break; |
670 | case 4: | 671 | case 4: |
671 | str = dayName.left( 1 ) + " " +QString::number( date.day()); | 672 | str = dayName.left( 1 ) + " " +QString::number( date.day()); |
672 | 673 | ||
673 | break; | 674 | break; |
674 | case 5: | 675 | case 5: |
675 | str = dayName.left( 2 ) + " " +QString::number( date.day()); | 676 | str = dayName.left( 2 ) + " " +QString::number( date.day()); |
676 | 677 | ||
677 | break; | 678 | break; |
678 | case 6: | 679 | case 6: |
679 | str = dayName.left( 3 ) + " " +QString::number( date.day()); | 680 | str = dayName.left( 3 ) + " " +QString::number( date.day()); |
680 | break; | 681 | break; |
681 | 682 | ||
682 | default: | 683 | default: |
683 | break; | 684 | break; |
684 | } | 685 | } |
685 | 686 | if ( oneday ) { | |
687 | QString addString; | ||
688 | if ( mSelectedDates.first() == QDateTime::currentDateTime().date() ) | ||
689 | addString = i18n("Today"); | ||
690 | else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(1) ) | ||
691 | addString = i18n("Tomorrow"); | ||
692 | else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-1) ) | ||
693 | addString = i18n("Yesterday"); | ||
694 | else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-2) ) | ||
695 | addString = i18n("Day before yesterday"); | ||
696 | else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(2) ) | ||
697 | addString = i18n("Day after tomorrow"); | ||
698 | if ( !addString.isEmpty() ) { | ||
699 | str = addString+", " + str; | ||
700 | } | ||
701 | } | ||
686 | dayLabel->setText(str); | 702 | dayLabel->setText(str); |
687 | dayLabel->setAlignment(QLabel::AlignHCenter); | 703 | dayLabel->setAlignment(QLabel::AlignHCenter); |
688 | if (date == QDate::currentDate()) { | 704 | if (date == QDate::currentDate()) { |
689 | QFont bFont = dlf; | 705 | QFont bFont = dlf; |
690 | bFont.setBold( true ); | 706 | bFont.setBold( true ); |
691 | dayLabel->setFont(bFont); | 707 | dayLabel->setFont(bFont); |
692 | } | 708 | } |
693 | //dayLayout->addWidget(dayLabel); | 709 | //dayLayout->addWidget(dayLabel); |
694 | 710 | ||
695 | #ifndef KORG_NOPLUGINS | 711 | #ifndef KORG_NOPLUGINS |
696 | CalendarDecoration::List cds = KOCore::self()->calendarDecorations(); | 712 | CalendarDecoration::List cds = KOCore::self()->calendarDecorations(); |
697 | CalendarDecoration *it; | 713 | CalendarDecoration *it; |
698 | for(it = cds.first(); it; it = cds.next()) { | 714 | for(it = cds.first(); it; it = cds.next()) { |
699 | QString text = it->shortText( date ); | 715 | QString text = it->shortText( date ); |
700 | if ( !text.isEmpty() ) { | 716 | if ( !text.isEmpty() ) { |
701 | QLabel *label = new QLabel(text,mDayLabels); | 717 | QLabel *label = new QLabel(text,mDayLabels); |
702 | label->setAlignment(AlignCenter); | 718 | label->setAlignment(AlignCenter); |
703 | dayLayout->addWidget(label); | 719 | dayLayout->addWidget(label); |
704 | } | 720 | } |
705 | } | 721 | } |
706 | 722 | ||
707 | for(it = cds.first(); it; it = cds.next()) { | 723 | for(it = cds.first(); it; it = cds.next()) { |
708 | QWidget *wid = it->smallWidget(mDayLabels,date); | 724 | QWidget *wid = it->smallWidget(mDayLabels,date); |
709 | if ( wid ) { | 725 | if ( wid ) { |
710 | // wid->setHeight(20); | 726 | // wid->setHeight(20); |
711 | dayLayout->addWidget(wid); | 727 | dayLayout->addWidget(wid); |
712 | } | 728 | } |
713 | } | 729 | } |
714 | #endif | 730 | #endif |
715 | } | 731 | } |
716 | if ( ! appendLabels ) { | 732 | if ( ! appendLabels ) { |
717 | dayLabel = mDayLabelsList.next(); | 733 | dayLabel = mDayLabelsList.next(); |
718 | if ( !dayLabel ) | 734 | if ( !dayLabel ) |
719 | appendLabels = true; | 735 | appendLabels = true; |
720 | } | 736 | } |
721 | if ( appendLabels ) { | 737 | if ( appendLabels ) { |
722 | dayLabel = new QLabel(mDayLabels); | 738 | dayLabel = new QLabel(mDayLabels); |
723 | mDayLabelsList.append( dayLabel ); | 739 | mDayLabelsList.append( dayLabel ); |
724 | mLayoutDayLabels->addWidget(dayLabel); | 740 | mLayoutDayLabels->addWidget(dayLabel); |
725 | } | 741 | } |
726 | //dayLabel->hide();//test only | 742 | //dayLabel->hide();//test only |
727 | 743 | ||
728 | int offset = (mAgenda->width() - mAgenda->verticalScrollBar()->width()-3 ) % mSelectedDates.count() ; | 744 | int offset = (mAgenda->width() - mAgenda->verticalScrollBar()->width()-3 ) % mSelectedDates.count() ; |
729 | if ( offset < 0 ) offset = 0; | 745 | if ( offset < 0 ) offset = 0; |
730 | //qDebug("mLayoutDayLabels->addSpacing %d ", mAgenda->verticalScrollBar()->width()+offset+2 ); | 746 | //qDebug("mLayoutDayLabels->addSpacing %d ", mAgenda->verticalScrollBar()->width()+offset+2 ); |
731 | dayLabel->setText("");//QString::number ( mSelectedDates.first().month() ) ); | 747 | dayLabel->setText("");//QString::number ( mSelectedDates.first().month() ) ); |
732 | dayLabel->show(); | 748 | dayLabel->show(); |
733 | dayLabel->setFixedWidth( mAgenda->verticalScrollBar()->width()+ offset ); | 749 | dayLabel->setFixedWidth( mAgenda->verticalScrollBar()->width()+ offset ); |
734 | //qDebug("setToFixed %d ", mAgenda->verticalScrollBar()->width()+ offset+2); | 750 | //qDebug("setToFixed %d ", mAgenda->verticalScrollBar()->width()+ offset+2); |
735 | //mLayoutDayLabels->addSpacing(mAgenda->verticalScrollBar()->width()+ offset+2); | 751 | //mLayoutDayLabels->addSpacing(mAgenda->verticalScrollBar()->width()+ offset+2); |
736 | if ( !appendLabels ) { | 752 | if ( !appendLabels ) { |
737 | dayLabel = mDayLabelsList.next(); | 753 | dayLabel = mDayLabelsList.next(); |
738 | while ( dayLabel ) { | 754 | while ( dayLabel ) { |
739 | //qDebug("!dayLabel %d",dayLabel ); | 755 | //qDebug("!dayLabel %d",dayLabel ); |
740 | dayLabel->hide(); | 756 | dayLabel->hide(); |
741 | dayLabel = mDayLabelsList.next(); | 757 | dayLabel = mDayLabelsList.next(); |
742 | } | 758 | } |
743 | } | 759 | } |
744 | //mDayLabelsFrame->show(); | 760 | //mDayLabelsFrame->show(); |
745 | //mDayLabels->show(); | 761 | //mDayLabels->show(); |
746 | //qDebug("heigt %d %d %d ",mDayLabelsFrame->height(), mDayLabelsFrame->sizeHint().height(), newHight); | 762 | //qDebug("heigt %d %d %d ",mDayLabelsFrame->height(), mDayLabelsFrame->sizeHint().height(), newHight); |
747 | //mDayLabelsFrame->resize( mAgenda->visibleWidth(), newHight ); | 763 | //mDayLabelsFrame->resize( mAgenda->visibleWidth(), newHight ); |
748 | mDayLabelsFrame->setFixedHeight( newHight ); | 764 | mDayLabelsFrame->setFixedHeight( newHight ); |
749 | } | 765 | } |
750 | 766 | ||
751 | int KOAgendaView::maxDatesHint() | 767 | int KOAgendaView::maxDatesHint() |
752 | { | 768 | { |
753 | // Not sure about the max number of events, so return 0 for now. | 769 | // Not sure about the max number of events, so return 0 for now. |
754 | return 0; | 770 | return 0; |
755 | } | 771 | } |
756 | 772 | ||
757 | int KOAgendaView::currentDateCount() | 773 | int KOAgendaView::currentDateCount() |
758 | { | 774 | { |
759 | return mSelectedDates.count(); | 775 | return mSelectedDates.count(); |
760 | } | 776 | } |
761 | 777 | ||
762 | QPtrList<Incidence> KOAgendaView::selectedIncidences() | 778 | QPtrList<Incidence> KOAgendaView::selectedIncidences() |
763 | { | 779 | { |
764 | QPtrList<Incidence> selected; | 780 | QPtrList<Incidence> selected; |
765 | Incidence *incidence; | 781 | Incidence *incidence; |
766 | 782 | ||
767 | incidence = mAgenda->selectedIncidence(); | 783 | incidence = mAgenda->selectedIncidence(); |
768 | if (incidence) selected.append(incidence); | 784 | if (incidence) selected.append(incidence); |
769 | 785 | ||
770 | incidence = mAllDayAgenda->selectedIncidence(); | 786 | incidence = mAllDayAgenda->selectedIncidence(); |
771 | if (incidence) selected.append(incidence); | 787 | if (incidence) selected.append(incidence); |
772 | 788 | ||
773 | return selected; | 789 | return selected; |
774 | } | 790 | } |
775 | 791 | ||
776 | DateList KOAgendaView::selectedDates() | 792 | DateList KOAgendaView::selectedDates() |
777 | { | 793 | { |
778 | DateList selected; | 794 | DateList selected; |
779 | QDate qd; | 795 | QDate qd; |
780 | 796 | ||
781 | qd = mAgenda->selectedIncidenceDate(); | 797 | qd = mAgenda->selectedIncidenceDate(); |