-rw-r--r-- | korganizer/komonthview.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 0ef5ae4..00b1e92 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp | |||
@@ -714,192 +714,193 @@ void MonthViewCell::showDay() | |||
714 | emit showDaySignal( date() ); | 714 | emit showDaySignal( date() ); |
715 | } | 715 | } |
716 | void MonthViewCell::newEvent() | 716 | void MonthViewCell::newEvent() |
717 | { | 717 | { |
718 | QDateTime dt( date(), QTime( KOPrefs::instance()->mStartTime, 0 ) ); | 718 | QDateTime dt( date(), QTime( KOPrefs::instance()->mStartTime, 0 ) ); |
719 | emit newEventSignal( dt ); | 719 | emit newEventSignal( dt ); |
720 | } | 720 | } |
721 | void MonthViewCell::cellClicked( QListBoxItem *item ) | 721 | void MonthViewCell::cellClicked( QListBoxItem *item ) |
722 | { | 722 | { |
723 | static QListBoxItem * lastClicked = 0; | 723 | static QListBoxItem * lastClicked = 0; |
724 | if ( item == 0 ) { | 724 | if ( item == 0 ) { |
725 | QDateTime dt( date(), QTime( KOPrefs::instance()->mStartTime, 0 ) ); | 725 | QDateTime dt( date(), QTime( KOPrefs::instance()->mStartTime, 0 ) ); |
726 | emit newEventSignal( dt ); | 726 | emit newEventSignal( dt ); |
727 | return; | 727 | return; |
728 | } | 728 | } |
729 | /* | 729 | /* |
730 | if ( lastClicked ) | 730 | if ( lastClicked ) |
731 | if ( ! item ) { | 731 | if ( ! item ) { |
732 | if ( lastClicked->listBox() != item->listBox() ) | 732 | if ( lastClicked->listBox() != item->listBox() ) |
733 | lastClicked->listBox()->clearSelection(); | 733 | lastClicked->listBox()->clearSelection(); |
734 | } | 734 | } |
735 | */ | 735 | */ |
736 | 736 | ||
737 | mMonthView->setSelectedCell( this ); | 737 | mMonthView->setSelectedCell( this ); |
738 | if( KOPrefs::instance()->mEnableMonthScroll || KOPrefs::instance()->mMonthViewWeek ) enableScrollBars( true ); | 738 | if( KOPrefs::instance()->mEnableMonthScroll || KOPrefs::instance()->mMonthViewWeek ) enableScrollBars( true ); |
739 | select(); | 739 | select(); |
740 | } | 740 | } |
741 | 741 | ||
742 | void MonthViewCell::contextMenu( QListBoxItem *item ) | 742 | void MonthViewCell::contextMenu( QListBoxItem *item ) |
743 | { | 743 | { |
744 | if ( !item ) return; | 744 | if ( !item ) return; |
745 | 745 | ||
746 | MonthViewItem *eventItem = static_cast<MonthViewItem *>( item ); | 746 | MonthViewItem *eventItem = static_cast<MonthViewItem *>( item ); |
747 | Incidence *incidence = eventItem->incidence(); | 747 | Incidence *incidence = eventItem->incidence(); |
748 | if ( incidence ) mMonthView->showContextMenu( incidence ); | 748 | if ( incidence ) mMonthView->showContextMenu( incidence ); |
749 | } | 749 | } |
750 | 750 | ||
751 | void MonthViewCell::selection( QListBoxItem *item ) | 751 | void MonthViewCell::selection( QListBoxItem *item ) |
752 | { | 752 | { |
753 | if ( !item ) return; | 753 | if ( !item ) return; |
754 | 754 | ||
755 | mMonthView->setSelectedCell( this ); | 755 | mMonthView->setSelectedCell( this ); |
756 | } | 756 | } |
757 | 757 | ||
758 | 758 | ||
759 | // ******************************************************************************* | 759 | // ******************************************************************************* |
760 | // ******************************************************************************* | 760 | // ******************************************************************************* |
761 | // ******************************************************************************* | 761 | // ******************************************************************************* |
762 | 762 | ||
763 | 763 | ||
764 | KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name) | 764 | KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name) |
765 | : KOEventView( calendar, parent, name ), | 765 | : KOEventView( calendar, parent, name ), |
766 | mDaysPerWeek( 7 ), mNumWeeks( 6 ), mNumCells( mDaysPerWeek * mNumWeeks ), | 766 | mDaysPerWeek( 7 ), mNumWeeks( 6 ), mNumCells( mDaysPerWeek * mNumWeeks ), |
767 | mShortDayLabels( false ), mWidthLongDayLabel( 0 ), mSelectedCell( 0 ) | 767 | mShortDayLabels( false ), mWidthLongDayLabel( 0 ), mSelectedCell( 0 ) |
768 | { | 768 | { |
769 | mWeekStartsMonday = KGlobal::locale()->weekStartsMonday(); | 769 | mWeekStartsMonday = KGlobal::locale()->weekStartsMonday(); |
770 | mShowWeekView = KOPrefs::instance()->mMonthViewWeek; | 770 | mShowWeekView = KOPrefs::instance()->mMonthViewWeek; |
771 | if ( mShowWeekView ) | 771 | if ( mShowWeekView ) |
772 | mWeekStartsMonday = true; | 772 | mWeekStartsMonday = true; |
773 | updatePossible = false; | 773 | updatePossible = false; |
774 | mCells.setAutoDelete( true ); | 774 | mCells.setAutoDelete( true ); |
775 | mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ; | 775 | mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ; |
776 | // mDayLayout = new QGridLayout( this ); | 776 | // mDayLayout = new QGridLayout( this ); |
777 | // create the day of the week labels (Sun, Mon, etc) and add them to | 777 | // create the day of the week labels (Sun, Mon, etc) and add them to |
778 | // the layout. | 778 | // the layout. |
779 | mDayLabels.resize( mDaysPerWeek ); | 779 | mDayLabels.resize( mDaysPerWeek ); |
780 | QFont bfont = font(); | 780 | QFont bfont = font(); |
781 | if ( QApplication::desktop()->width() < 650 ) { | 781 | if ( QApplication::desktop()->width() < 650 ) { |
782 | bfont.setPointSize( bfont.pointSize() - 2 ); | 782 | bfont.setPointSize( bfont.pointSize() - 2 ); |
783 | } | 783 | } |
784 | bfont.setBold( true ); | 784 | bfont.setBold( true ); |
785 | int i; | 785 | int i; |
786 | 786 | ||
787 | for( i = 0; i < mDaysPerWeek; i++ ) { | 787 | for( i = 0; i < mDaysPerWeek; i++ ) { |
788 | QLabel *label = new QLabel( this ); | 788 | QLabel *label = new QLabel( this ); |
789 | label->setFont(bfont); | 789 | label->setFont(bfont); |
790 | label->setFrameStyle(QFrame::Panel|QFrame::Raised); | 790 | label->setFrameStyle(QFrame::Panel|QFrame::Raised); |
791 | label->setLineWidth(1); | 791 | label->setLineWidth(1); |
792 | label->setAlignment(AlignCenter); | 792 | label->setAlignment(AlignCenter); |
793 | mDayLabels.insert( i, label ); | 793 | mDayLabels.insert( i, label ); |
794 | } | 794 | } |
795 | 795 | ||
796 | bfont.setBold( false ); | 796 | bfont.setBold( false ); |
797 | mWeekLabels.resize( mNumWeeks+1 ); | 797 | mWeekLabels.resize( mNumWeeks+1 ); |
798 | for( i = 0; i < mNumWeeks+1; i++ ) { | 798 | for( i = 0; i < mNumWeeks+1; i++ ) { |
799 | KOWeekButton *label = new KOWeekButton( this ); | 799 | KOWeekButton *label = new KOWeekButton( this ); |
800 | label->setFont(bfont); | 800 | label->setFont(bfont); |
801 | connect( label, SIGNAL( selectWeekNum ( int )),this, SIGNAL( selectWeekNum ( int )) ); | 801 | connect( label, SIGNAL( selectWeekNum ( int )),this, SIGNAL( selectWeekNum ( int )) ); |
802 | label->setFlat(true); | 802 | label->setFlat(true); |
803 | QWhatsThis::add(label,i18n("Click on the week number to\nshow week in agenda view")); | 803 | QWhatsThis::add(label,i18n("Click on the week number to\nshow week in agenda view")); |
804 | //label->setFrameStyle(QFrame::Panel|QFrame::Raised); | 804 | //label->setFrameStyle(QFrame::Panel|QFrame::Raised); |
805 | //label->setLineWidth(1); | 805 | //label->setLineWidth(1); |
806 | //label->setAlignment(AlignCenter); | 806 | //label->setAlignment(AlignCenter); |
807 | mWeekLabels.insert( i, label ); | 807 | mWeekLabels.insert( i, label ); |
808 | } | 808 | } |
809 | mWeekLabels[mNumWeeks]->setText( i18n("W")); | 809 | mWeekLabels[mNumWeeks]->setText( i18n("W")); |
810 | QWhatsThis::add(mWeekLabels[mNumWeeks],i18n("Click on this to\nswitch to week mode view")); | ||
810 | int row, col; | 811 | int row, col; |
811 | mCells.resize( mNumCells ); | 812 | mCells.resize( mNumCells ); |
812 | for( row = 0; row < mNumWeeks; ++row ) { | 813 | for( row = 0; row < mNumWeeks; ++row ) { |
813 | for( col = 0; col < mDaysPerWeek; ++col ) { | 814 | for( col = 0; col < mDaysPerWeek; ++col ) { |
814 | MonthViewCell *cell = new MonthViewCell( this ); | 815 | MonthViewCell *cell = new MonthViewCell( this ); |
815 | mCells.insert( row * mDaysPerWeek + col, cell ); | 816 | mCells.insert( row * mDaysPerWeek + col, cell ); |
816 | 817 | ||
817 | connect( cell, SIGNAL( defaultAction( Incidence * ) ), | 818 | connect( cell, SIGNAL( defaultAction( Incidence * ) ), |
818 | SLOT( defaultAction( Incidence * ) ) ); | 819 | SLOT( defaultAction( Incidence * ) ) ); |
819 | connect( cell, SIGNAL( newEventSignal( QDateTime ) ), | 820 | connect( cell, SIGNAL( newEventSignal( QDateTime ) ), |
820 | SIGNAL( newEventSignal( QDateTime ) ) ); | 821 | SIGNAL( newEventSignal( QDateTime ) ) ); |
821 | connect( cell, SIGNAL( showDaySignal( QDate ) ), | 822 | connect( cell, SIGNAL( showDaySignal( QDate ) ), |
822 | SIGNAL( showDaySignal( QDate ) ) ); | 823 | SIGNAL( showDaySignal( QDate ) ) ); |
823 | } | 824 | } |
824 | } | 825 | } |
825 | 826 | ||
826 | connect( mWeekLabels[mNumWeeks], SIGNAL( clicked() ), | 827 | connect( mWeekLabels[mNumWeeks], SIGNAL( clicked() ), |
827 | SLOT( switchView() ) ); | 828 | SLOT( switchView() ) ); |
828 | mContextMenu = eventPopup(); | 829 | mContextMenu = eventPopup(); |
829 | // updateConfig(); //useless here | 830 | // updateConfig(); //useless here |
830 | 831 | ||
831 | emit incidenceSelected( 0 ); | 832 | emit incidenceSelected( 0 ); |
832 | } | 833 | } |
833 | 834 | ||
834 | KOMonthView::~KOMonthView() | 835 | KOMonthView::~KOMonthView() |
835 | { | 836 | { |
836 | delete mContextMenu; | 837 | delete mContextMenu; |
837 | } | 838 | } |
838 | void KOMonthView::switchView() | 839 | void KOMonthView::switchView() |
839 | { | 840 | { |
840 | if ( selectedCell( ) ) | 841 | if ( selectedCell( ) ) |
841 | selectedCell()->deselect(); | 842 | selectedCell()->deselect(); |
842 | mShowWeekView = !mShowWeekView; | 843 | mShowWeekView = !mShowWeekView; |
843 | KOPrefs::instance()->mMonthViewWeek = mShowWeekView; | 844 | KOPrefs::instance()->mMonthViewWeek = mShowWeekView; |
844 | emit showNavigator( !mShowWeekView ); | 845 | emit showNavigator( !mShowWeekView ); |
845 | computeLayout(); | 846 | computeLayout(); |
846 | updateConfig(); | 847 | updateConfig(); |
847 | } | 848 | } |
848 | 849 | ||
849 | int KOMonthView::maxDatesHint() | 850 | int KOMonthView::maxDatesHint() |
850 | { | 851 | { |
851 | return mNumCells; | 852 | return mNumCells; |
852 | } | 853 | } |
853 | 854 | ||
854 | int KOMonthView::currentDateCount() | 855 | int KOMonthView::currentDateCount() |
855 | { | 856 | { |
856 | return mNumCells; | 857 | return mNumCells; |
857 | } | 858 | } |
858 | 859 | ||
859 | QPtrList<Incidence> KOMonthView::selectedIncidences() | 860 | QPtrList<Incidence> KOMonthView::selectedIncidences() |
860 | { | 861 | { |
861 | QPtrList<Incidence> selected; | 862 | QPtrList<Incidence> selected; |
862 | 863 | ||
863 | if ( mSelectedCell ) { | 864 | if ( mSelectedCell ) { |
864 | Incidence *incidence = mSelectedCell->selectedIncidence(); | 865 | Incidence *incidence = mSelectedCell->selectedIncidence(); |
865 | if ( incidence ) selected.append( incidence ); | 866 | if ( incidence ) selected.append( incidence ); |
866 | } | 867 | } |
867 | 868 | ||
868 | return selected; | 869 | return selected; |
869 | } | 870 | } |
870 | 871 | ||
871 | DateList KOMonthView::selectedDates() | 872 | DateList KOMonthView::selectedDates() |
872 | { | 873 | { |
873 | DateList selected; | 874 | DateList selected; |
874 | 875 | ||
875 | if ( mSelectedCell ) { | 876 | if ( mSelectedCell ) { |
876 | QDate qd = mSelectedCell->selectedIncidenceDate(); | 877 | QDate qd = mSelectedCell->selectedIncidenceDate(); |
877 | if ( qd.isValid() ) selected.append( qd ); | 878 | if ( qd.isValid() ) selected.append( qd ); |
878 | } | 879 | } |
879 | 880 | ||
880 | return selected; | 881 | return selected; |
881 | } | 882 | } |
882 | 883 | ||
883 | void KOMonthView::printPreview(CalPrinter *calPrinter, const QDate &fd, | 884 | void KOMonthView::printPreview(CalPrinter *calPrinter, const QDate &fd, |
884 | const QDate &td) | 885 | const QDate &td) |
885 | { | 886 | { |
886 | #ifndef KORG_NOPRINTER | 887 | #ifndef KORG_NOPRINTER |
887 | calPrinter->preview(CalPrinter::Month, fd, td); | 888 | calPrinter->preview(CalPrinter::Month, fd, td); |
888 | #endif | 889 | #endif |
889 | } | 890 | } |
890 | 891 | ||
891 | void KOMonthView::updateConfig() | 892 | void KOMonthView::updateConfig() |
892 | { | 893 | { |
893 | 894 | ||
894 | mWeekStartsMonday = KGlobal::locale()->weekStartsMonday(); | 895 | mWeekStartsMonday = KGlobal::locale()->weekStartsMonday(); |
895 | 896 | ||
896 | if ( mShowWeekView ) | 897 | if ( mShowWeekView ) |
897 | mWeekStartsMonday = true; | 898 | mWeekStartsMonday = true; |
898 | QFontMetrics fontmetric(mDayLabels[0]->font()); | 899 | QFontMetrics fontmetric(mDayLabels[0]->font()); |
899 | mWidthLongDayLabel = 0; | 900 | mWidthLongDayLabel = 0; |
900 | 901 | ||
901 | for (int i = 0; i < 7; i++) { | 902 | for (int i = 0; i < 7; i++) { |
902 | int width = fontmetric.width(KOGlobals::self()->calendarSystem()->weekDayName(i+1)); | 903 | int width = fontmetric.width(KOGlobals::self()->calendarSystem()->weekDayName(i+1)); |
903 | if ( width > mWidthLongDayLabel ) mWidthLongDayLabel = width; | 904 | if ( width > mWidthLongDayLabel ) mWidthLongDayLabel = width; |
904 | } | 905 | } |
905 | bool temp = mShowSatSunComp ; | 906 | bool temp = mShowSatSunComp ; |