-rw-r--r-- | korganizer/koagendaview.cpp | 43 | ||||
-rw-r--r-- | korganizer/koagendaview.h | 33 |
2 files changed, 49 insertions, 27 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index d3db89a..c8cef44 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp | |||
@@ -67,24 +67,26 @@ | |||
67 | 67 | ||
68 | #include "koagendaview.h" | 68 | #include "koagendaview.h" |
69 | //#include "koagendaview.moc" | 69 | //#include "koagendaview.moc" |
70 | 70 | ||
71 | //extern bool globalFlagBlockPainting; | 71 | //extern bool globalFlagBlockPainting; |
72 | extern int globalFlagBlockAgenda; | 72 | extern int globalFlagBlockAgenda; |
73 | extern int globalFlagBlockStartup; | 73 | extern int globalFlagBlockStartup; |
74 | extern int globalFlagBlockAgendaItemPaint; | 74 | extern int globalFlagBlockAgendaItemPaint; |
75 | extern int globalFlagBlockAgendaItemUpdate; | 75 | extern int globalFlagBlockAgendaItemUpdate; |
76 | extern int globalFlagBlockLabel; | 76 | extern int globalFlagBlockLabel; |
77 | using namespace KOrg; | 77 | using namespace KOrg; |
78 | 78 | ||
79 | |||
80 | |||
79 | TimeLabels::TimeLabels(int rows,QWidget *parent,const char *name,WFlags f) : | 81 | TimeLabels::TimeLabels(int rows,QWidget *parent,const char *name,WFlags f) : |
80 | QScrollView(parent,name,f) | 82 | QScrollView(parent,name,f) |
81 | { | 83 | { |
82 | mRows = rows; | 84 | mRows = rows; |
83 | 85 | ||
84 | setMinimumHeight( 20 ); | 86 | setMinimumHeight( 20 ); |
85 | mCellHeight = KOPrefs::instance()->mHourSize*4; | 87 | mCellHeight = KOPrefs::instance()->mHourSize*4; |
86 | 88 | ||
87 | enableClipper(true); | 89 | enableClipper(true); |
88 | 90 | ||
89 | setHScrollBarMode(AlwaysOff); | 91 | setHScrollBarMode(AlwaysOff); |
90 | setVScrollBarMode(AlwaysOff); | 92 | setVScrollBarMode(AlwaysOff); |
@@ -600,52 +602,47 @@ void KOAgendaView::resizeEvent( QResizeEvent* e ) | |||
600 | mUpcomingWidth = e->size().width() ; | 602 | mUpcomingWidth = e->size().width() ; |
601 | if ( mBlockUpdating || uc ) { | 603 | if ( mBlockUpdating || uc ) { |
602 | mBlockUpdating = false; | 604 | mBlockUpdating = false; |
603 | //mAgenda->setMinimumSize(800 , 600 ); | 605 | //mAgenda->setMinimumSize(800 , 600 ); |
604 | //qDebug("mAgenda->resize+++++++++++++++ "); | 606 | //qDebug("mAgenda->resize+++++++++++++++ "); |
605 | updateConfig(); | 607 | updateConfig(); |
606 | //qDebug("KOAgendaView::Updating now possible "); | 608 | //qDebug("KOAgendaView::Updating now possible "); |
607 | } else | 609 | } else |
608 | createDayLabels(); | 610 | createDayLabels(); |
609 | //qDebug("resizeEvent end "); | 611 | //qDebug("resizeEvent end "); |
610 | 612 | ||
611 | } | 613 | } |
612 | void KOAgendaView::slotDaylabelClicked() | 614 | void KOAgendaView::slotDaylabelClicked( int num ) |
613 | { | 615 | { |
614 | QString cap = ((QPushButton*) sender() )->caption(); | ||
615 | 616 | ||
616 | QDate firstDate = mSelectedDates.first(); | 617 | QDate firstDate = mSelectedDates.first(); |
617 | if ( cap == "0" ) | 618 | if ( num == -1 ) |
618 | emit showDateView( 6, firstDate ); | 619 | emit showDateView( 6, firstDate ); |
619 | else if ( cap != "last" ) { | 620 | else if (num >= 0 ) { |
620 | if ( mSelectedDates.count() == 1) | 621 | if ( mSelectedDates.count() == 1) |
621 | emit showDateView( 9, firstDate.addDays( cap.toInt()-1 ) ); | 622 | emit showDateView( 9, firstDate.addDays( num ) ); |
622 | else | 623 | else |
623 | emit showDateView( 3, firstDate.addDays( cap.toInt()-1 ) ); | 624 | emit showDateView( 3, firstDate.addDays( num ) ); |
624 | } | 625 | } |
625 | else | 626 | else |
626 | showDateView( 10, firstDate.addDays(1) ); | 627 | showDateView( 10, firstDate.addDays(1) ); |
627 | } | 628 | } |
628 | 629 | ||
629 | QPushButton* KOAgendaView::getNewDaylabel() | 630 | KOAgendaButton* KOAgendaView::getNewDaylabel() |
630 | { | 631 | { |
631 | 632 | ||
632 | QPushButton * dayLabel = new QPushButton(mDayLabels); | 633 | KOAgendaButton * dayLabel = new KOAgendaButton(mDayLabels); |
633 | dayLabel->setFlat( true ); | 634 | connect( dayLabel, SIGNAL( numClicked(int) ), this, SLOT ( slotDaylabelClicked(int) ) ); |
634 | connect( dayLabel, SIGNAL( clicked() ), this, SLOT ( slotDaylabelClicked() ) ); | ||
635 | dayLabel->setFocusPolicy(NoFocus); | ||
636 | dayLabel->setSizePolicy(QSizePolicy( QSizePolicy::Expanding ,QSizePolicy::Expanding )); | ||
637 | mDayLabelsList.append( dayLabel ); | 635 | mDayLabelsList.append( dayLabel ); |
638 | mLayoutDayLabels->addWidget(dayLabel); | 636 | mLayoutDayLabels->addWidget(dayLabel); |
639 | //mLayoutDayLabels->setStretchFactor(dayLabel, 100); | ||
640 | return dayLabel ; | 637 | return dayLabel ; |
641 | } | 638 | } |
642 | 639 | ||
643 | void KOAgendaView::createDayLabels() | 640 | void KOAgendaView::createDayLabels() |
644 | { | 641 | { |
645 | 642 | ||
646 | if ( mBlockUpdating || globalFlagBlockLabel == 1) { | 643 | if ( mBlockUpdating || globalFlagBlockLabel == 1) { |
647 | // qDebug(" KOAgendaView::createDayLabels() blocked "); | 644 | // qDebug(" KOAgendaView::createDayLabels() blocked "); |
648 | return; | 645 | return; |
649 | 646 | ||
650 | } | 647 | } |
651 | int newHight; | 648 | int newHight; |
@@ -653,97 +650,97 @@ void KOAgendaView::createDayLabels() | |||
653 | // ### Before deleting and recreating we could check if mSelectedDates changed... | 650 | // ### Before deleting and recreating we could check if mSelectedDates changed... |
654 | // It would remove some flickering and gain speed (since this is called by | 651 | // It would remove some flickering and gain speed (since this is called by |
655 | // each updateView() call) | 652 | // each updateView() call) |
656 | 653 | ||
657 | int maxWid = mUpcomingWidth - mTimeLabels->width()- mAgenda->verticalScrollBar()->width() - 2; | 654 | int maxWid = mUpcomingWidth - mTimeLabels->width()- mAgenda->verticalScrollBar()->width() - 2; |
658 | mDayLabelsFrame->setMaximumWidth( mUpcomingWidth ); | 655 | mDayLabelsFrame->setMaximumWidth( mUpcomingWidth ); |
659 | if ( maxWid < 0 ) | 656 | if ( maxWid < 0 ) |
660 | maxWid = 20; | 657 | maxWid = 20; |
661 | 658 | ||
662 | QFont dlf = KOPrefs::instance()->mTimeLabelsFont; | 659 | QFont dlf = KOPrefs::instance()->mTimeLabelsFont; |
663 | QFontMetrics fm ( dlf ); | 660 | QFontMetrics fm ( dlf ); |
664 | int selCount = mSelectedDates.count(); | 661 | int selCount = mSelectedDates.count(); |
665 | QString dayTest = "Won 20"; | 662 | QString dayTest = "Mon 20"; |
666 | //QString dayTest = "Mon 20"; | 663 | //QString dayTest = "Mon 20"; |
667 | int wid = fm.width( dayTest ); | 664 | int wid = fm.width( dayTest ); |
668 | //maxWid -= ( selCount * 3 ); //working for QLabels | 665 | //maxWid -= ( selCount * 3 ); //working for QLabels |
669 | maxWid -= ( selCount * 5 ); //working for QPushButton | 666 | maxWid -= ( selCount * 3 ); //working for QPushButton |
670 | if ( maxWid < 0 ) | 667 | if ( maxWid < 0 ) |
671 | maxWid = 20; | 668 | maxWid = 20; |
672 | int needWid = wid * selCount; | 669 | int needWid = wid * selCount; |
673 | //qDebug("++++++++Needed : %d MaxWidth: %d", needWid, maxWid ); | 670 | //qDebug("++++++++Needed : %d MaxWidth: %d", needWid, maxWid ); |
674 | //if ( needWid > maxWid ) | 671 | //if ( needWid > maxWid ) |
675 | // qDebug("DAYLABELS TOOOOOOO BIG "); | 672 | // qDebug("DAYLABELS TOOOOOOO BIG "); |
676 | while ( needWid > maxWid ) { | 673 | while ( needWid > maxWid ) { |
677 | dayTest = dayTest.left( dayTest.length() - 1 ); | 674 | dayTest = dayTest.left( dayTest.length() - 1 ); |
678 | wid = fm.width( dayTest )+1; | 675 | wid = fm.width( dayTest ); |
679 | needWid = wid * selCount; | 676 | needWid = wid * selCount; |
680 | } | 677 | } |
681 | int maxLen = dayTest.length(); | 678 | int maxLen = dayTest.length(); |
682 | int fontPoint = dlf.pointSize(); | 679 | int fontPoint = dlf.pointSize(); |
683 | if ( maxLen < 2 ) { | 680 | if ( maxLen < 2 ) { |
684 | int fontPoint = dlf.pointSize(); | 681 | int fontPoint = dlf.pointSize(); |
685 | while ( fontPoint > 4 ) { | 682 | while ( fontPoint > 4 ) { |
686 | --fontPoint; | 683 | --fontPoint; |
687 | dlf.setPointSize( fontPoint ); | 684 | dlf.setPointSize( fontPoint ); |
688 | QFontMetrics f( dlf ); | 685 | QFontMetrics f( dlf ); |
689 | wid = f.width( "30" )+3; | 686 | wid = f.width( "30" ); |
690 | needWid = wid * selCount; | 687 | needWid = wid * selCount; |
691 | if ( needWid < maxWid ) | 688 | if ( needWid < maxWid ) |
692 | break; | 689 | break; |
693 | } | 690 | } |
694 | maxLen = 2; | 691 | maxLen = 2; |
695 | } | 692 | } |
696 | //qDebug("Max len %d ", dayTest.length() ); | 693 | //qDebug("Max len %d ", dayTest.length() ); |
697 | 694 | ||
698 | QFontMetrics tempF( dlf ); | 695 | QFontMetrics tempF( dlf ); |
699 | newHight = tempF.height(); | 696 | newHight = tempF.height(); |
700 | mDayLabels->setFont( dlf ); | 697 | mDayLabels->setFont( dlf ); |
701 | // mLayoutDayLabels = new QHBoxLayout(mDayLabels);; | 698 | // mLayoutDayLabels = new QHBoxLayout(mDayLabels);; |
702 | // mLayoutDayLabels->addSpacing(mTimeLabels->width()); | 699 | // mLayoutDayLabels->addSpacing(mTimeLabels->width()); |
703 | //mLayoutDayLabels->addSpacing( 2 ); | 700 | //mLayoutDayLabels->addSpacing( 2 ); |
704 | // QFont lFont = dlf; | 701 | // QFont lFont = dlf; |
705 | bool appendLabels = false; | 702 | bool appendLabels = false; |
706 | QPushButton *dayLabel; | 703 | KOAgendaButton *dayLabel; |
707 | dayLabel = mDayLabelsList.first(); | 704 | dayLabel = mDayLabelsList.first(); |
708 | if ( !dayLabel ) { | 705 | if ( !dayLabel ) { |
709 | appendLabels = true; | 706 | appendLabels = true; |
710 | dayLabel = getNewDaylabel(); | 707 | dayLabel = getNewDaylabel(); |
711 | } | 708 | } |
712 | dayLabel->setFixedWidth( mTimeLabels->width()+2 ); | 709 | dayLabel->setFixedWidth( mTimeLabels->width()+2 ); |
713 | dayLabel->setFont( dlf ); | 710 | dayLabel->setFont( dlf ); |
714 | dayLabel->setCaption("0"); | 711 | dayLabel->setNum( -1 ); |
715 | //dayLabel->setAlignment(QLabel::AlignHCenter); | 712 | //dayLabel->setAlignment(QLabel::AlignHCenter); |
716 | dayLabel->setText( KOGlobals::self()->calendarSystem()->monthName( mSelectedDates.first(), true ) ); | 713 | dayLabel->setText( KOGlobals::self()->calendarSystem()->monthName( mSelectedDates.first(), true ) ); |
717 | dayLabel->show(); | 714 | dayLabel->show(); |
718 | DateList::ConstIterator dit; | 715 | DateList::ConstIterator dit; |
719 | bool oneday = (mSelectedDates.first() == mSelectedDates.last() ); | 716 | bool oneday = (mSelectedDates.first() == mSelectedDates.last() ); |
720 | int counter = 0; | 717 | int counter = -1; |
721 | for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) { | 718 | for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) { |
722 | ++counter; | 719 | ++counter; |
723 | QDate date = *dit; | 720 | QDate date = *dit; |
724 | // QBoxLayout *dayLayout = new QVBoxLayout(mLayoutDayLabels); | 721 | // QBoxLayout *dayLayout = new QVBoxLayout(mLayoutDayLabels); |
725 | if ( ! appendLabels ) { | 722 | if ( ! appendLabels ) { |
726 | dayLabel = mDayLabelsList.next(); | 723 | dayLabel = mDayLabelsList.next(); |
727 | if ( !dayLabel ) | 724 | if ( !dayLabel ) |
728 | appendLabels = true; | 725 | appendLabels = true; |
729 | } | 726 | } |
730 | if ( appendLabels ) { | 727 | if ( appendLabels ) { |
731 | dayLabel = getNewDaylabel(); | 728 | dayLabel = getNewDaylabel(); |
732 | } | 729 | } |
733 | dayLabel->setMinimumWidth( 1 ); | 730 | dayLabel->setMinimumWidth( 1 ); |
734 | dayLabel->setMaximumWidth( 2048 ); | 731 | dayLabel->setMaximumWidth( 1024 ); |
735 | dayLabel->setFont( dlf ); | 732 | dayLabel->setFont( dlf ); |
736 | dayLabel->show(); | 733 | dayLabel->show(); |
737 | dayLabel->setCaption(QString::number( counter )); | 734 | dayLabel->setNum( counter ); |
738 | QString str; | 735 | QString str; |
739 | int dW = KOGlobals::self()->calendarSystem()->dayOfWeek(date); | 736 | int dW = KOGlobals::self()->calendarSystem()->dayOfWeek(date); |
740 | QString dayName = KOGlobals::self()->calendarSystem()->weekDayName( dW, true ); | 737 | QString dayName = KOGlobals::self()->calendarSystem()->weekDayName( dW, true ); |
741 | switch ( maxLen ) { | 738 | switch ( maxLen ) { |
742 | case 2: | 739 | case 2: |
743 | str = QString::number( date.day() ); | 740 | str = QString::number( date.day() ); |
744 | break; | 741 | break; |
745 | 742 | ||
746 | case 3: | 743 | case 3: |
747 | str = dayName.left( 1 ) +QString::number( date.day()); | 744 | str = dayName.left( 1 ) +QString::number( date.day()); |
748 | 745 | ||
749 | break; | 746 | break; |
@@ -815,25 +812,25 @@ void KOAgendaView::createDayLabels() | |||
815 | } | 812 | } |
816 | if ( appendLabels ) { | 813 | if ( appendLabels ) { |
817 | dayLabel = getNewDaylabel(); | 814 | dayLabel = getNewDaylabel(); |
818 | } | 815 | } |
819 | //dayLabel->hide();//test only | 816 | //dayLabel->hide();//test only |
820 | 817 | ||
821 | int offset = (mAgenda->width() - mAgenda->verticalScrollBar()->width()-3 ) % mSelectedDates.count() ; | 818 | int offset = (mAgenda->width() - mAgenda->verticalScrollBar()->width()-3 ) % mSelectedDates.count() ; |
822 | if ( offset < 0 ) offset = 0; | 819 | if ( offset < 0 ) offset = 0; |
823 | //qDebug("mLayoutDayLabels->addSpacing %d ", mAgenda->verticalScrollBar()->width()+offset+2 ); | 820 | //qDebug("mLayoutDayLabels->addSpacing %d ", mAgenda->verticalScrollBar()->width()+offset+2 ); |
824 | dayLabel->setText(">");//QString::number ( mSelectedDates.first().month() ) ); | 821 | dayLabel->setText(">");//QString::number ( mSelectedDates.first().month() ) ); |
825 | dayLabel->setFont( dlf ); | 822 | dayLabel->setFont( dlf ); |
826 | dayLabel->show(); | 823 | dayLabel->show(); |
827 | dayLabel->setCaption("last"); | 824 | dayLabel->setNum( -2 ); |
828 | dayLabel->setFixedWidth( mAgenda->verticalScrollBar()->width()+ offset ); | 825 | dayLabel->setFixedWidth( mAgenda->verticalScrollBar()->width()+ offset ); |
829 | //qDebug("setToFixed %d ", mAgenda->verticalScrollBar()->width()+ offset+2); | 826 | //qDebug("setToFixed %d ", mAgenda->verticalScrollBar()->width()+ offset+2); |
830 | //mLayoutDayLabels->addSpacing(mAgenda->verticalScrollBar()->width()+ offset+2); | 827 | //mLayoutDayLabels->addSpacing(mAgenda->verticalScrollBar()->width()+ offset+2); |
831 | if ( !appendLabels ) { | 828 | if ( !appendLabels ) { |
832 | dayLabel = mDayLabelsList.next(); | 829 | dayLabel = mDayLabelsList.next(); |
833 | while ( dayLabel ) { | 830 | while ( dayLabel ) { |
834 | //qDebug("!dayLabel %d",dayLabel ); | 831 | //qDebug("!dayLabel %d",dayLabel ); |
835 | dayLabel->hide(); | 832 | dayLabel->hide(); |
836 | dayLabel = mDayLabelsList.next(); | 833 | dayLabel = mDayLabelsList.next(); |
837 | } | 834 | } |
838 | } | 835 | } |
839 | //mDayLabelsFrame->show(); | 836 | //mDayLabelsFrame->show(); |
diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h index cbe86b6..e9e85cc 100644 --- a/korganizer/koagendaview.h +++ b/korganizer/koagendaview.h | |||
@@ -16,44 +16,69 @@ | |||
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | #ifndef KOAGENDAVIEW_H | 23 | #ifndef KOAGENDAVIEW_H |
24 | #define KOAGENDAVIEW_H | 24 | #define KOAGENDAVIEW_H |
25 | 25 | ||
26 | #include <qscrollview.h> | 26 | #include <qscrollview.h> |
27 | #include <qdatetime.h> | 27 | #include <qdatetime.h> |
28 | #include <qpushbutton.h> | ||
28 | #include <qlayout.h> | 29 | #include <qlayout.h> |
29 | #ifndef DESKTOP_VERSION | 30 | #ifndef DESKTOP_VERSION |
30 | #include <qksplitter.h> | 31 | #include <qksplitter.h> |
31 | #else | 32 | #else |
32 | #include <qsplitter.h> | 33 | #include <qsplitter.h> |
33 | #endif | 34 | #endif |
34 | #include <qmemarray.h> | 35 | #include <qmemarray.h> |
35 | 36 | ||
36 | #include "koeventview.h" | 37 | #include "koeventview.h" |
37 | 38 | ||
38 | |||
39 | class QHBox; | 39 | class QHBox; |
40 | class QFrame; | 40 | class QFrame; |
41 | class QLabel; | 41 | class QLabel; |
42 | class QPushButton; | 42 | class QPushButton; |
43 | class CalendarView; | 43 | class CalendarView; |
44 | class KOAgenda; | 44 | class KOAgenda; |
45 | class KOAgendaItem; | 45 | class KOAgendaItem; |
46 | class KConfig; | 46 | class KConfig; |
47 | class KDGanttMinimizeSplitter; | 47 | class KDGanttMinimizeSplitter; |
48 | |||
49 | class KOAgendaButton : public QPushButton | ||
50 | { | ||
51 | Q_OBJECT | ||
52 | public: | ||
53 | KOAgendaButton( QWidget *parent=0, const char *name=0 ) : | ||
54 | QPushButton( parent, name ) | ||
55 | { | ||
56 | mNum = -3; | ||
57 | setFlat( true ); | ||
58 | setFocusPolicy(NoFocus); | ||
59 | setSizePolicy(QSizePolicy( QSizePolicy::Expanding ,QSizePolicy::Expanding )); | ||
60 | connect( this, SIGNAL( clicked() ), this, SLOT ( bClicked() ) ); | ||
61 | }; | ||
62 | |||
63 | QSize sizeHint () const { return QSize( 5,5) ;} | ||
64 | void setNum( int n) { mNum = n; } | ||
65 | private slots: | ||
66 | void bClicked() {emit numClicked( mNum);} | ||
67 | signals: | ||
68 | void numClicked( int ); | ||
69 | private: | ||
70 | int mNum; | ||
71 | }; | ||
72 | |||
48 | class TimeLabels : public QScrollView { | 73 | class TimeLabels : public QScrollView { |
49 | Q_OBJECT | 74 | Q_OBJECT |
50 | public: | 75 | public: |
51 | TimeLabels(int rows,QWidget *parent=0,const char *name=0,WFlags f=0); | 76 | TimeLabels(int rows,QWidget *parent=0,const char *name=0,WFlags f=0); |
52 | 77 | ||
53 | void setCellHeight(int height); | 78 | void setCellHeight(int height); |
54 | 79 | ||
55 | /** Calculates the minimum width */ | 80 | /** Calculates the minimum width */ |
56 | virtual int minimumWidth() const; | 81 | virtual int minimumWidth() const; |
57 | 82 | ||
58 | /** updates widget's internal state */ | 83 | /** updates widget's internal state */ |
59 | void updateConfig(); | 84 | void updateConfig(); |
@@ -181,43 +206,43 @@ class KOAgendaView : public KOEventView { | |||
181 | void scrollOneHourDown(); | 206 | void scrollOneHourDown(); |
182 | void addToCalSlot(Incidence *, Incidence *); | 207 | void addToCalSlot(Incidence *, Incidence *); |
183 | 208 | ||
184 | signals: | 209 | signals: |
185 | void showDateView( int, QDate ); | 210 | void showDateView( int, QDate ); |
186 | void newTodoSignal( QDateTime ,bool ); | 211 | void newTodoSignal( QDateTime ,bool ); |
187 | void toggleExpand(); | 212 | void toggleExpand(); |
188 | void todoMoved( Todo *, int ); | 213 | void todoMoved( Todo *, int ); |
189 | void incidenceChanged(Incidence * , int ); | 214 | void incidenceChanged(Incidence * , int ); |
190 | // void cloneIncidenceSignal(Incidence *); | 215 | // void cloneIncidenceSignal(Incidence *); |
191 | 216 | ||
192 | protected: | 217 | protected: |
193 | QPushButton* getNewDaylabel(); | 218 | KOAgendaButton* getNewDaylabel(); |
194 | bool mBlockUpdating; | 219 | bool mBlockUpdating; |
195 | int mUpcomingWidth; | 220 | int mUpcomingWidth; |
196 | /** Fill agenda beginning with date startDate */ | 221 | /** Fill agenda beginning with date startDate */ |
197 | void fillAgenda(const QDate &startDate); | 222 | void fillAgenda(const QDate &startDate); |
198 | void resizeEvent( QResizeEvent* e ); | 223 | void resizeEvent( QResizeEvent* e ); |
199 | /** Fill agenda using the current set value for the start date */ | 224 | /** Fill agenda using the current set value for the start date */ |
200 | void fillAgenda(); | 225 | void fillAgenda(); |
201 | 226 | ||
202 | /** Create labels for the selected dates. */ | 227 | /** Create labels for the selected dates. */ |
203 | void createDayLabels(); | 228 | void createDayLabels(); |
204 | 229 | ||
205 | /** | 230 | /** |
206 | Set the masks on the agenda widgets indicating, which days are holidays. | 231 | Set the masks on the agenda widgets indicating, which days are holidays. |
207 | */ | 232 | */ |
208 | void setHolidayMasks(); | 233 | void setHolidayMasks(); |
209 | 234 | ||
210 | protected slots: | 235 | protected slots: |
211 | void slotDaylabelClicked(); | 236 | void slotDaylabelClicked( int ); |
212 | /** Update event belonging to agenda item */ | 237 | /** Update event belonging to agenda item */ |
213 | void updateEventDates(KOAgendaItem *item, int mode = -1); | 238 | void updateEventDates(KOAgendaItem *item, int mode = -1); |
214 | //void updateMovedTodo(); | 239 | //void updateMovedTodo(); |
215 | 240 | ||
216 | void updateEventIndicatorTop(int newY); | 241 | void updateEventIndicatorTop(int newY); |
217 | void updateEventIndicatorBottom(int newY); | 242 | void updateEventIndicatorBottom(int newY); |
218 | 243 | ||
219 | /** Updates data for selected timespan */ | 244 | /** Updates data for selected timespan */ |
220 | void newTimeSpanSelected(int gxStart, int gyStart, int gxEnd, int gyEnd); | 245 | void newTimeSpanSelected(int gxStart, int gyStart, int gxEnd, int gyEnd); |
221 | /** Updates data for selected timespan for all day event*/ | 246 | /** Updates data for selected timespan for all day event*/ |
222 | void newTimeSpanSelectedAllDay(int gxStart, int gyStart, int gxEnd, int gyEnd); | 247 | void newTimeSpanSelectedAllDay(int gxStart, int gyStart, int gxEnd, int gyEnd); |
223 | 248 | ||
@@ -245,20 +270,20 @@ class KOAgendaView : public KOEventView { | |||
245 | KOEventPopupMenu *mAllDayAgendaPopup; | 270 | KOEventPopupMenu *mAllDayAgendaPopup; |
246 | 271 | ||
247 | EventIndicator *mEventIndicatorTop; | 272 | EventIndicator *mEventIndicatorTop; |
248 | EventIndicator *mEventIndicatorBottom; | 273 | EventIndicator *mEventIndicatorBottom; |
249 | 274 | ||
250 | QMemArray<int> mMinY; | 275 | QMemArray<int> mMinY; |
251 | QMemArray<int> mMaxY; | 276 | QMemArray<int> mMaxY; |
252 | 277 | ||
253 | QMemArray<bool> mHolidayMask; | 278 | QMemArray<bool> mHolidayMask; |
254 | 279 | ||
255 | QPixmap mExpandedPixmap; | 280 | QPixmap mExpandedPixmap; |
256 | QPixmap mNotExpandedPixmap; | 281 | QPixmap mNotExpandedPixmap; |
257 | QPtrList<QPushButton> mDayLabelsList; | 282 | QPtrList<KOAgendaButton> mDayLabelsList; |
258 | QDateTime mTimeSpanBegin; | 283 | QDateTime mTimeSpanBegin; |
259 | QDateTime mTimeSpanEnd; | 284 | QDateTime mTimeSpanEnd; |
260 | bool mTimeSpanInAllDay; | 285 | bool mTimeSpanInAllDay; |
261 | void keyPressEvent ( QKeyEvent * e ); | 286 | void keyPressEvent ( QKeyEvent * e ); |
262 | }; | 287 | }; |
263 | 288 | ||
264 | #endif // KOAGENDAVIEW_H | 289 | #endif // KOAGENDAVIEW_H |