-rw-r--r-- | korganizer/koagendaview.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index f6f390b..f452db0 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp | |||
@@ -687,187 +687,189 @@ void KOAgendaView::createDayLabels() | |||
687 | wid = f.width( "30" ); | 687 | wid = f.width( "30" ); |
688 | needWid = wid * selCount; | 688 | needWid = wid * selCount; |
689 | if ( needWid < maxWid ) | 689 | if ( needWid < maxWid ) |
690 | break; | 690 | break; |
691 | } | 691 | } |
692 | maxLen = 2; | 692 | maxLen = 2; |
693 | } | 693 | } |
694 | //qDebug("Max len %d ", dayTest.length() ); | 694 | //qDebug("Max len %d ", dayTest.length() ); |
695 | 695 | ||
696 | QFontMetrics tempF( dlf ); | 696 | QFontMetrics tempF( dlf ); |
697 | newHight = tempF.height(); | 697 | newHight = tempF.height(); |
698 | mDayLabels->setFont( dlf ); | 698 | mDayLabels->setFont( dlf ); |
699 | // mLayoutDayLabels = new QHBoxLayout(mDayLabels);; | 699 | // mLayoutDayLabels = new QHBoxLayout(mDayLabels);; |
700 | // mLayoutDayLabels->addSpacing(mTimeLabels->width()); | 700 | // mLayoutDayLabels->addSpacing(mTimeLabels->width()); |
701 | //mLayoutDayLabels->addSpacing( 2 ); | 701 | //mLayoutDayLabels->addSpacing( 2 ); |
702 | // QFont lFont = dlf; | 702 | // QFont lFont = dlf; |
703 | bool appendLabels = false; | 703 | bool appendLabels = false; |
704 | KOAgendaButton *dayLabel; | 704 | KOAgendaButton *dayLabel; |
705 | dayLabel = mDayLabelsList.first(); | 705 | dayLabel = mDayLabelsList.first(); |
706 | if ( !dayLabel ) { | 706 | if ( !dayLabel ) { |
707 | appendLabels = true; | 707 | appendLabels = true; |
708 | dayLabel = getNewDaylabel(); | 708 | dayLabel = getNewDaylabel(); |
709 | } | 709 | } |
710 | dayLabel->setFixedWidth( mTimeLabels->width()+2 ); | 710 | dayLabel->setFixedWidth( mTimeLabels->width()+2 ); |
711 | dayLabel->setFont( dlf ); | 711 | dayLabel->setFont( dlf ); |
712 | dayLabel->setNum( -1 ); | 712 | dayLabel->setNum( -1 ); |
713 | //dayLabel->setAlignment(QLabel::AlignHCenter); | 713 | //dayLabel->setAlignment(QLabel::AlignHCenter); |
714 | dayLabel->setText( KOGlobals::self()->calendarSystem()->monthName( mSelectedDates.first(), true ) ); | 714 | dayLabel->setText( KOGlobals::self()->calendarSystem()->monthName( mSelectedDates.first(), true ) ); |
715 | dayLabel->show(); | 715 | dayLabel->show(); |
716 | DateList::ConstIterator dit; | 716 | DateList::ConstIterator dit; |
717 | bool oneday = (mSelectedDates.first() == mSelectedDates.last() ); | 717 | bool oneday = (mSelectedDates.first() == mSelectedDates.last() ); |
718 | int counter = -1; | 718 | int counter = -1; |
719 | for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) { | 719 | for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) { |
720 | ++counter; | 720 | ++counter; |
721 | QDate date = *dit; | 721 | QDate date = *dit; |
722 | // QBoxLayout *dayLayout = new QVBoxLayout(mLayoutDayLabels); | 722 | // QBoxLayout *dayLayout = new QVBoxLayout(mLayoutDayLabels); |
723 | if ( ! appendLabels ) { | 723 | if ( ! appendLabels ) { |
724 | dayLabel = mDayLabelsList.next(); | 724 | dayLabel = mDayLabelsList.next(); |
725 | if ( !dayLabel ) | 725 | if ( !dayLabel ) |
726 | appendLabels = true; | 726 | appendLabels = true; |
727 | } | 727 | } |
728 | if ( appendLabels ) { | 728 | if ( appendLabels ) { |
729 | dayLabel = getNewDaylabel(); | 729 | dayLabel = getNewDaylabel(); |
730 | } | 730 | } |
731 | dayLabel->setMinimumWidth( 1 ); | 731 | dayLabel->setMinimumWidth( 1 ); |
732 | dayLabel->setMaximumWidth( 10240 ); | 732 | dayLabel->setMaximumWidth( 10240 ); |
733 | dayLabel->setFont( dlf ); | 733 | dayLabel->setFont( dlf ); |
734 | dayLabel->show(); | 734 | dayLabel->show(); |
735 | dayLabel->setAutoRepeat( false ); | ||
735 | dayLabel->setNum( counter ); | 736 | dayLabel->setNum( counter ); |
736 | QString str; | 737 | QString str; |
737 | int dW = KOGlobals::self()->calendarSystem()->dayOfWeek(date); | 738 | int dW = KOGlobals::self()->calendarSystem()->dayOfWeek(date); |
738 | QString dayName = KOGlobals::self()->calendarSystem()->weekDayName( dW, true ); | 739 | QString dayName = KOGlobals::self()->calendarSystem()->weekDayName( dW, true ); |
739 | switch ( maxLen ) { | 740 | switch ( maxLen ) { |
740 | case 2: | 741 | case 2: |
741 | str = QString::number( date.day() ); | 742 | str = QString::number( date.day() ); |
742 | break; | 743 | break; |
743 | 744 | ||
744 | case 3: | 745 | case 3: |
745 | str = dayName.left( 1 ) +QString::number( date.day()); | 746 | str = dayName.left( 1 ) +QString::number( date.day()); |
746 | 747 | ||
747 | break; | 748 | break; |
748 | case 4: | 749 | case 4: |
749 | str = dayName.left( 1 ) + " " +QString::number( date.day()); | 750 | str = dayName.left( 1 ) + " " +QString::number( date.day()); |
750 | 751 | ||
751 | break; | 752 | break; |
752 | case 5: | 753 | case 5: |
753 | str = dayName.left( 2 ) + " " +QString::number( date.day()); | 754 | str = dayName.left( 2 ) + " " +QString::number( date.day()); |
754 | 755 | ||
755 | break; | 756 | break; |
756 | case 6: | 757 | case 6: |
757 | str = dayName.left( 3 ) + " " +QString::number( date.day()); | 758 | str = dayName.left( 3 ) + " " +QString::number( date.day()); |
758 | break; | 759 | break; |
759 | 760 | ||
760 | default: | 761 | default: |
761 | break; | 762 | break; |
762 | } | 763 | } |
763 | if ( oneday ) { | 764 | if ( oneday ) { |
764 | QString addString; | 765 | QString addString; |
765 | if ( mSelectedDates.first() == QDateTime::currentDateTime().date() ) | 766 | if ( mSelectedDates.first() == QDateTime::currentDateTime().date() ) |
766 | addString = i18n("Today"); | 767 | addString = i18n("Today"); |
767 | else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(1) ) | 768 | else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(1) ) |
768 | addString = i18n("Tomorrow"); | 769 | addString = i18n("Tomorrow"); |
769 | else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-1) ) | 770 | else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-1) ) |
770 | addString = i18n("Yesterday"); | 771 | addString = i18n("Yesterday"); |
771 | else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-2) ) | 772 | else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-2) ) |
772 | addString = i18n("Day before yesterday"); | 773 | addString = i18n("Day before yesterday"); |
773 | else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(2) ) | 774 | else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(2) ) |
774 | addString = i18n("Day after tomorrow"); | 775 | addString = i18n("Day after tomorrow"); |
775 | if ( !addString.isEmpty() ) { | 776 | if ( !addString.isEmpty() ) { |
776 | str = addString+", " + str; | 777 | str = addString+", " + str; |
777 | } else { | 778 | } else { |
778 | str = KGlobal::locale()->formatDate( date, KOPrefs::instance()->mShortDateInViewer); | 779 | str = KGlobal::locale()->formatDate( date, KOPrefs::instance()->mShortDateInViewer); |
779 | } | 780 | } |
780 | } | 781 | } |
781 | dayLabel->setText(str); | 782 | dayLabel->setText(str); |
782 | //dayLabel->setAlignment(QLabel::AlignHCenter); | 783 | //dayLabel->setAlignment(QLabel::AlignHCenter); |
783 | if (date == QDate::currentDate()) { | 784 | if (date == QDate::currentDate()) { |
784 | QFont bFont = dlf; | 785 | QFont bFont = dlf; |
785 | bFont.setBold( true ); | 786 | bFont.setBold( true ); |
786 | dayLabel->setFont(bFont); | 787 | dayLabel->setFont(bFont); |
787 | } | 788 | } |
788 | //dayLayout->addWidget(dayLabel); | 789 | //dayLayout->addWidget(dayLabel); |
789 | 790 | ||
790 | #ifndef KORG_NOPLUGINS | 791 | #ifndef KORG_NOPLUGINS |
791 | CalendarDecoration::List cds = KOCore::self()->calendarDecorations(); | 792 | CalendarDecoration::List cds = KOCore::self()->calendarDecorations(); |
792 | CalendarDecoration *it; | 793 | CalendarDecoration *it; |
793 | for(it = cds.first(); it; it = cds.next()) { | 794 | for(it = cds.first(); it; it = cds.next()) { |
794 | QString text = it->shortText( date ); | 795 | QString text = it->shortText( date ); |
795 | if ( !text.isEmpty() ) { | 796 | if ( !text.isEmpty() ) { |
796 | QLabel *label = new QLabel(text,mDayLabels); | 797 | QLabel *label = new QLabel(text,mDayLabels); |
797 | label->setAlignment(AlignCenter); | 798 | label->setAlignment(AlignCenter); |
798 | dayLayout->addWidget(label); | 799 | dayLayout->addWidget(label); |
799 | } | 800 | } |
800 | } | 801 | } |
801 | 802 | ||
802 | for(it = cds.first(); it; it = cds.next()) { | 803 | for(it = cds.first(); it; it = cds.next()) { |
803 | QWidget *wid = it->smallWidget(mDayLabels,date); | 804 | QWidget *wid = it->smallWidget(mDayLabels,date); |
804 | if ( wid ) { | 805 | if ( wid ) { |
805 | // wid->setHeight(20); | 806 | // wid->setHeight(20); |
806 | dayLayout->addWidget(wid); | 807 | dayLayout->addWidget(wid); |
807 | } | 808 | } |
808 | } | 809 | } |
809 | #endif | 810 | #endif |
810 | } | 811 | } |
811 | if ( ! appendLabels ) { | 812 | if ( ! appendLabels ) { |
812 | dayLabel = mDayLabelsList.next(); | 813 | dayLabel = mDayLabelsList.next(); |
813 | if ( !dayLabel ) | 814 | if ( !dayLabel ) |
814 | appendLabels = true; | 815 | appendLabels = true; |
815 | } | 816 | } |
816 | if ( appendLabels ) { | 817 | if ( appendLabels ) { |
817 | dayLabel = getNewDaylabel(); | 818 | dayLabel = getNewDaylabel(); |
818 | } | 819 | } |
819 | //dayLabel->hide();//test only | 820 | //dayLabel->hide();//test only |
820 | 821 | ||
821 | int offset = (mAgenda->width() - mAgenda->verticalScrollBar()->width()-3 ) % mSelectedDates.count() ; | 822 | int offset = (mAgenda->width() - mAgenda->verticalScrollBar()->width()-3 ) % mSelectedDates.count() ; |
822 | if ( offset < 0 ) offset = 0; | 823 | if ( offset < 0 ) offset = 0; |
823 | //qDebug("mLayoutDayLabels->addSpacing %d ", mAgenda->verticalScrollBar()->width()+offset+2 ); | 824 | //qDebug("mLayoutDayLabels->addSpacing %d ", mAgenda->verticalScrollBar()->width()+offset+2 ); |
824 | dayLabel->setText(">");//QString::number ( mSelectedDates.first().month() ) ); | 825 | dayLabel->setText(">");//QString::number ( mSelectedDates.first().month() ) ); |
825 | dayLabel->setFont( dlf ); | 826 | dayLabel->setFont( dlf ); |
827 | dayLabel->setAutoRepeat( true ); | ||
826 | dayLabel->show(); | 828 | dayLabel->show(); |
827 | dayLabel->setNum( -2 ); | 829 | dayLabel->setNum( -2 ); |
828 | dayLabel->setFixedWidth( mAgenda->verticalScrollBar()->width()+ offset ); | 830 | dayLabel->setFixedWidth( mAgenda->verticalScrollBar()->width()+ offset ); |
829 | //qDebug("setToFixed %d ", mAgenda->verticalScrollBar()->width()+ offset+2); | 831 | //qDebug("setToFixed %d ", mAgenda->verticalScrollBar()->width()+ offset+2); |
830 | //mLayoutDayLabels->addSpacing(mAgenda->verticalScrollBar()->width()+ offset+2); | 832 | //mLayoutDayLabels->addSpacing(mAgenda->verticalScrollBar()->width()+ offset+2); |
831 | if ( !appendLabels ) { | 833 | if ( !appendLabels ) { |
832 | dayLabel = mDayLabelsList.next(); | 834 | dayLabel = mDayLabelsList.next(); |
833 | while ( dayLabel ) { | 835 | while ( dayLabel ) { |
834 | //qDebug("!dayLabel %d",dayLabel ); | 836 | //qDebug("!dayLabel %d",dayLabel ); |
835 | dayLabel->hide(); | 837 | dayLabel->hide(); |
836 | dayLabel = mDayLabelsList.next(); | 838 | dayLabel = mDayLabelsList.next(); |
837 | } | 839 | } |
838 | } | 840 | } |
839 | 841 | ||
840 | mDayLabelsFrame->setFixedHeight( newHight + 4 ); | 842 | mDayLabelsFrame->setFixedHeight( newHight + 4 ); |
841 | } | 843 | } |
842 | 844 | ||
843 | int KOAgendaView::maxDatesHint() | 845 | int KOAgendaView::maxDatesHint() |
844 | { | 846 | { |
845 | // Not sure about the max number of events, so return 0 for now. | 847 | // Not sure about the max number of events, so return 0 for now. |
846 | return 0; | 848 | return 0; |
847 | } | 849 | } |
848 | 850 | ||
849 | int KOAgendaView::currentDateCount() | 851 | int KOAgendaView::currentDateCount() |
850 | { | 852 | { |
851 | return mSelectedDates.count(); | 853 | return mSelectedDates.count(); |
852 | } | 854 | } |
853 | 855 | ||
854 | QPtrList<Incidence> KOAgendaView::selectedIncidences() | 856 | QPtrList<Incidence> KOAgendaView::selectedIncidences() |
855 | { | 857 | { |
856 | QPtrList<Incidence> selected; | 858 | QPtrList<Incidence> selected; |
857 | Incidence *incidence; | 859 | Incidence *incidence; |
858 | 860 | ||
859 | incidence = mAgenda->selectedIncidence(); | 861 | incidence = mAgenda->selectedIncidence(); |
860 | if (incidence) selected.append(incidence); | 862 | if (incidence) selected.append(incidence); |
861 | 863 | ||
862 | incidence = mAllDayAgenda->selectedIncidence(); | 864 | incidence = mAllDayAgenda->selectedIncidence(); |
863 | if (incidence) selected.append(incidence); | 865 | if (incidence) selected.append(incidence); |
864 | 866 | ||
865 | return selected; | 867 | return selected; |
866 | } | 868 | } |
867 | 869 | ||
868 | DateList KOAgendaView::selectedDates() | 870 | DateList KOAgendaView::selectedDates() |
869 | { | 871 | { |
870 | DateList selected; | 872 | DateList selected; |
871 | QDate qd; | 873 | QDate qd; |
872 | 874 | ||
873 | qd = mAgenda->selectedIncidenceDate(); | 875 | qd = mAgenda->selectedIncidenceDate(); |