author | zautrix <zautrix> | 2005-03-22 16:21:03 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-22 16:21:03 (UTC) |
commit | ab8db23d665b276caa28471bb4db37e6b0de44ef (patch) (unidiff) | |
tree | 4697da2d9426f155237614368f993328560d0b21 /korganizer | |
parent | f36f0308a955f869f18c88ab359f9d605e838f1c (diff) | |
download | kdepimpi-ab8db23d665b276caa28471bb4db37e6b0de44ef.zip kdepimpi-ab8db23d665b276caa28471bb4db37e6b0de44ef.tar.gz kdepimpi-ab8db23d665b276caa28471bb4db37e6b0de44ef.tar.bz2 |
fix
-rw-r--r-- | korganizer/datenavigatorcontainer.cpp | 35 | ||||
-rw-r--r-- | korganizer/datenavigatorcontainer.h | 2 | ||||
-rw-r--r-- | korganizer/kodaymatrix.cpp | 21 |
3 files changed, 33 insertions, 25 deletions
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp index 9720146..ba97fa6 100644 --- a/korganizer/datenavigatorcontainer.cpp +++ b/korganizer/datenavigatorcontainer.cpp | |||
@@ -46,8 +46,11 @@ DateNavigatorContainer::DateNavigatorContainer( QWidget *parent, | |||
46 | 46 | ||
47 | connectNavigatorView( mNavigatorView ); | 47 | connectNavigatorView( mNavigatorView ); |
48 | //setSizePolicy( QSizePolicy (QSizePolicy::Expanding,QSizePolicy::Expanding) ); | 48 | //setSizePolicy( QSizePolicy (QSizePolicy::Expanding,QSizePolicy::Expanding) ); |
49 | mLastDisplayedDN = 0; | 49 | mLastDisplayedDN = 0; |
50 | mUpdateTimer; | ||
51 | mUpdateTimer = new QTimer( this ); | ||
52 | connect (mUpdateTimer ,SIGNAL(timeout()), this, SLOT ( checkUpdateDayMatrixDates() )); | ||
50 | } | 53 | } |
51 | 54 | ||
52 | DateNavigatorContainer::~DateNavigatorContainer() | 55 | DateNavigatorContainer::~DateNavigatorContainer() |
53 | { | 56 | { |
@@ -134,11 +137,26 @@ void DateNavigatorContainer::setCalendar( Calendar *cal ) | |||
134 | KDateNavigator *n = mExtraViews.at( i ); | 137 | KDateNavigator *n = mExtraViews.at( i ); |
135 | n->setCalendar( cal ); | 138 | n->setCalendar( cal ); |
136 | } | 139 | } |
137 | } | 140 | } |
138 | void DateNavigatorContainer::updateDayMatrixDates() | 141 | void DateNavigatorContainer::checkUpdateDayMatrixDates() |
139 | { | 142 | { |
143 | QDate last = lastAvailableDate(); | ||
144 | QDate first = firstAvailableDate(); | ||
140 | 145 | ||
146 | QDate selFirst = mFirstSelectedDate; | ||
147 | QDate selLast = selFirst.addDays( mSelectedDateCount-1 ); | ||
148 | if ( selFirst >= first && selLast <= last ) { | ||
149 | updateDayMatrixDates(); | ||
150 | } | ||
151 | else { | ||
152 | updateDayMatrixDates(); | ||
153 | emit monthSelected( mFirstSelectedDate.month() ); | ||
154 | } | ||
155 | } | ||
156 | void DateNavigatorContainer::updateDayMatrixDates() | ||
157 | { | ||
158 | mUpdateTimer->stop(); | ||
141 | QDate fDate = mFirstSelectedDate; | 159 | QDate fDate = mFirstSelectedDate; |
142 | QDate lDate = fDate.addDays( mSelectedDateCount - 1 ); | 160 | QDate lDate = fDate.addDays( mSelectedDateCount - 1 ); |
143 | mNavigatorView->dayMatrix()->setSelectedDaysFrom( fDate , lDate ); | 161 | mNavigatorView->dayMatrix()->setSelectedDaysFrom( fDate , lDate ); |
144 | mNavigatorView->dayMatrix()->repaint( false ); | 162 | mNavigatorView->dayMatrix()->repaint( false ); |
@@ -217,22 +235,8 @@ void DateNavigatorContainer::selectDates( const DateList &dateList ) | |||
217 | return; | 235 | return; |
218 | } | 236 | } |
219 | QDate fDate = dateList.first(); | 237 | QDate fDate = dateList.first(); |
220 | QDate lDate = dateList.last(); | 238 | QDate lDate = dateList.last(); |
221 | if ( mLastDisplayedDN <= 2 ) { | ||
222 | mNavigatorView->selectDates( dateList ); | ||
223 | KDateNavigator *view = mExtraViews.at( 0 ); | ||
224 | QDate bDate = fDate.addDays( fDate.daysInMonth () - fDate.day() +1 ); | ||
225 | view->setBaseDate( bDate, false ); | ||
226 | view->dayMatrix()->setSelectedDaysFrom(fDate , lDate); | ||
227 | if ( mLastDisplayedDN == 2 ) { | ||
228 | view = mExtraViews.at( 1 ); | ||
229 | bDate = bDate.addDays( bDate.daysInMonth () - bDate.day() +1 ); | ||
230 | view->setBaseDate( bDate, false ); | ||
231 | view->dayMatrix()->setSelectedDaysFrom(fDate , lDate); | ||
232 | } | ||
233 | return; | ||
234 | } | ||
235 | //qDebug("%s %s ", lastAvailableDate().toString().latin1(), firstAvailableDate().toString().latin1() ); | 239 | //qDebug("%s %s ", lastAvailableDate().toString().latin1(), firstAvailableDate().toString().latin1() ); |
236 | //qDebug("End %s %s ",lDate.toString().latin1(),curEnd.toString().latin1() ); | 240 | //qDebug("End %s %s ",lDate.toString().latin1(),curEnd.toString().latin1() ); |
237 | if ( lDate <= lastAvailableDate() && firstAvailableDate() <= fDate) { | 241 | if ( lDate <= lastAvailableDate() && firstAvailableDate() <= fDate) { |
238 | updateDayMatrixDates(); | 242 | updateDayMatrixDates(); |
@@ -371,8 +375,9 @@ void DateNavigatorContainer::resizeEvent( QResizeEvent * e ) | |||
371 | } | 375 | } |
372 | view->setGeometry( x * width, | 376 | view->setGeometry( x * width, |
373 | y * height, width, height ); | 377 | y * height, width, height ); |
374 | } | 378 | } |
379 | mUpdateTimer->start( 250 ); | ||
375 | //updateDayMatrixDates(); | 380 | //updateDayMatrixDates(); |
376 | } | 381 | } |
377 | 382 | ||
378 | QSize DateNavigatorContainer::minimumSizeHint() const | 383 | QSize DateNavigatorContainer::minimumSizeHint() const |
diff --git a/korganizer/datenavigatorcontainer.h b/korganizer/datenavigatorcontainer.h index d5e5adf..df8efae 100644 --- a/korganizer/datenavigatorcontainer.h +++ b/korganizer/datenavigatorcontainer.h | |||
@@ -54,8 +54,9 @@ class DateNavigatorContainer: public QWidget | |||
54 | void updateView(); | 54 | void updateView(); |
55 | void updateConfig(); | 55 | void updateConfig(); |
56 | void updateDayMatrix(); | 56 | void updateDayMatrix(); |
57 | void updateDayMatrixDates(); | 57 | void updateDayMatrixDates(); |
58 | void checkUpdateDayMatrixDates(); | ||
58 | void updateToday(); | 59 | void updateToday(); |
59 | void slotMonthSelected( int month ); | 60 | void slotMonthSelected( int month ); |
60 | 61 | ||
61 | signals: | 62 | signals: |
@@ -80,8 +81,9 @@ class DateNavigatorContainer: public QWidget | |||
80 | void setBaseDates(); | 81 | void setBaseDates(); |
81 | void connectNavigatorView( KDateNavigator *v ); | 82 | void connectNavigatorView( KDateNavigator *v ); |
82 | 83 | ||
83 | private: | 84 | private: |
85 | QTimer* mUpdateTimer; | ||
84 | int mLastDisplayedDN; | 86 | int mLastDisplayedDN; |
85 | QDate mFirstSelectedDate; | 87 | QDate mFirstSelectedDate; |
86 | int mSelectedDateCount; | 88 | int mSelectedDateCount; |
87 | KDateNavigator *mNavigatorView; | 89 | KDateNavigator *mNavigatorView; |
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index 366e8b8..59618bf 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp | |||
@@ -659,17 +659,17 @@ void KODayMatrix::dropEvent(QDropEvent *e) | |||
659 | // ---------------------------------------------------------------------------- | 659 | // ---------------------------------------------------------------------------- |
660 | 660 | ||
661 | void KODayMatrix::paintEvent(QPaintEvent * pevent) | 661 | void KODayMatrix::paintEvent(QPaintEvent * pevent) |
662 | { | 662 | { |
663 | QRect sz = frameRect(); | 663 | |
664 | if ( sz.width() <= 0 || sz.height() <= 0 ) | 664 | if ( width() <= 0 || height() <= 0 ) |
665 | return; | 665 | return; |
666 | if ( mPendingUpdateBeforeRepaint ) { | 666 | if ( mPendingUpdateBeforeRepaint ) { |
667 | updateViewTimed(); | 667 | updateViewTimed(); |
668 | mPendingUpdateBeforeRepaint = false; | 668 | mPendingUpdateBeforeRepaint = false; |
669 | } | 669 | } |
670 | if ( myPix.width() != sz.width() || myPix.height()!=sz.height() ) { | 670 | if ( myPix.width() != width() || myPix.height()!=height() ) { |
671 | myPix.resize(sz.size() ); | 671 | myPix.resize(size() ); |
672 | } | 672 | } |
673 | QPainter p(&myPix); | 673 | QPainter p(&myPix); |
674 | p.setFont(font()); | 674 | p.setFont(font()); |
675 | 675 | ||
@@ -678,18 +678,18 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) | |||
678 | int dwidth = daysize.width(); | 678 | int dwidth = daysize.width(); |
679 | int row,col; | 679 | int row,col; |
680 | int selw, selh; | 680 | int selw, selh; |
681 | int xyOff = frameWidth(); | 681 | int xyOff = frameWidth(); |
682 | int colModulo = sz.width() % 7; | 682 | int colModulo = (width()-2) % 7; |
683 | int rowModulo = sz.height() % 6; | 683 | int rowModulo = (height()-2) % 6; |
684 | //qDebug("col %d row %d ",colModulo,rowModulo ); | 684 | //qDebug("col %d row %d ",colModulo,rowModulo ); |
685 | 685 | ||
686 | bool isRTL = KOGlobals::self()->reverseLayout(); | 686 | bool isRTL = KOGlobals::self()->reverseLayout(); |
687 | 687 | ||
688 | // draw background and topleft frame | 688 | // draw background and topleft frame |
689 | p.fillRect(pevent->rect(), mDefaultBackColor); | 689 | p.fillRect(0,0,width(),height(), mDefaultBackColor); |
690 | p.setPen(mDefaultTextColor); | 690 | p.setPen(mDefaultTextColor); |
691 | p.drawRect(0, 0, sz.width()+1, sz.height()+1); | 691 | p.drawRect(0, 0, width(), height()); |
692 | int mSelStartT = mSelStart; | 692 | int mSelStartT = mSelStart; |
693 | int mSelEndT = mSelEnd; | 693 | int mSelEndT = mSelEnd; |
694 | if ( mSelEndT >= NUMDAYS ) | 694 | if ( mSelEndT >= NUMDAYS ) |
695 | mSelEndT = NUMDAYS-1; | 695 | mSelEndT = NUMDAYS-1; |
@@ -762,9 +762,10 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) | |||
762 | addRow = row - 5 + rowModulo; | 762 | addRow = row - 5 + rowModulo; |
763 | } | 763 | } |
764 | if ( row == 0) | 764 | if ( row == 0) |
765 | addRow = 1; | 765 | addRow = 1; |
766 | p.fillRect(isRTL ? 0 : col*dwidth+1+addCol2, row*dheight+addRow, (7-col)*dwidth+colModulo, | 766 | int drawWid = width()-(col*dwidth+1+addCol2)-1; |
767 | p.fillRect(isRTL ? 0 : col*dwidth+1+addCol2, row*dheight+addRow, drawWid, | ||
767 | dheight+1, selcol); | 768 | dheight+1, selcol); |
768 | // draw full block till last line | 769 | // draw full block till last line |
769 | selh = mSelEndT/7-row; | 770 | selh = mSelEndT/7-row; |
770 | addRow = 0; | 771 | addRow = 0; |
@@ -913,9 +914,9 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) | |||
913 | myFont.setBold(false); | 914 | myFont.setBold(false); |
914 | p.setFont(myFont); | 915 | p.setFont(myFont); |
915 | } | 916 | } |
916 | } | 917 | } |
917 | int off = xyOff; | 918 | int off = 0;//xyOff; |
918 | bitBlt (this, off, off, &myPix, 0 ,0,width(), height() ,CopyROP); | 919 | bitBlt (this, off, off, &myPix, 0 ,0,width(), height() ,CopyROP); |
919 | //qDebug("ffffffffff %d ", off); | 920 | //qDebug("ffffffffff %d ", off); |
920 | } | 921 | } |
921 | 922 | ||