author | zautrix <zautrix> | 2005-03-21 13:56:46 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-21 13:56:46 (UTC) |
commit | 41f264fea6caaf9ca0f8b34509a07157c210f851 (patch) (unidiff) | |
tree | f49b5d10db838821f79d5ae3d28b492f76663b62 | |
parent | 098a3c6dd844a880beb2851be53314613c3a038d (diff) | |
download | kdepimpi-41f264fea6caaf9ca0f8b34509a07157c210f851.zip kdepimpi-41f264fea6caaf9ca0f8b34509a07157c210f851.tar.gz kdepimpi-41f264fea6caaf9ca0f8b34509a07157c210f851.tar.bz2 |
fixes
-rw-r--r-- | korganizer/kdatenavigator.cpp | 2 | ||||
-rw-r--r-- | korganizer/kdatenavigator.h | 2 | ||||
-rw-r--r-- | korganizer/kodaymatrix.cpp | 8 |
3 files changed, 8 insertions, 4 deletions
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp index 4b50b5a..2321acb 100644 --- a/korganizer/kdatenavigator.cpp +++ b/korganizer/kdatenavigator.cpp | |||
@@ -172,9 +172,9 @@ QSize KDateNavigator::sizeHintTwoButtons() const | |||
172 | void KDateNavigator::slotMonthSelected( int m ) | 172 | void KDateNavigator::slotMonthSelected( int m ) |
173 | { | 173 | { |
174 | if ( m_MthYr.month() <= mMonthSignalOffset) | 174 | if ( m_MthYr.month() <= mMonthSignalOffset) |
175 | m += 12; | 175 | m += 12; |
176 | int mo = m - mMonthSignalOffset; | 176 | //qDebug("%d mMonthSignalOffset %d emit %d", m, mMonthSignalOffset, m - mMonthSignalOffset); |
177 | emit monthSelected( m - mMonthSignalOffset ); | 177 | emit monthSelected( m - mMonthSignalOffset ); |
178 | 178 | ||
179 | } | 179 | } |
180 | void KDateNavigator::setCalendar( Calendar *cal ) | 180 | void KDateNavigator::setCalendar( Calendar *cal ) |
diff --git a/korganizer/kdatenavigator.h b/korganizer/kdatenavigator.h index d1f32b6..77b9b7c 100644 --- a/korganizer/kdatenavigator.h +++ b/korganizer/kdatenavigator.h | |||
@@ -62,9 +62,9 @@ class KDateNavigator: public QFrame | |||
62 | void setCalendar( Calendar * ); | 62 | void setCalendar( Calendar * ); |
63 | void setBaseDate( const QDate & , bool doRepaint = true ); | 63 | void setBaseDate( const QDate & , bool doRepaint = true ); |
64 | KCal::DateList selectedDates() const { return mSelectedDates; } | 64 | KCal::DateList selectedDates() const { return mSelectedDates; } |
65 | NavigatorBar *navigatorBar() const { return mNavigatorBar; } | 65 | NavigatorBar *navigatorBar() const { return mNavigatorBar; } |
66 | void setMonthSignalOffset ( int off ) { mMonthSignalOffset = off;} | 66 | void setMonthSignalOffset ( int off ) { mMonthSignalOffset = off%12;} |
67 | QSize yourSizeHint() { return mySizeHint; } | 67 | QSize yourSizeHint() { return mySizeHint; } |
68 | QFont yourFontHint( QSize , bool * b); | 68 | QFont yourFontHint( QSize , bool * b); |
69 | bool fontChanged() {return mFontChanged; } | 69 | bool fontChanged() {return mFontChanged; } |
70 | void unsetFontChanged() { mFontChanged = false; } | 70 | void unsetFontChanged() { mFontChanged = false; } |
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index 9baff20..493382d 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp | |||
@@ -410,10 +410,10 @@ void KODayMatrix::updateView(QDate actdate) | |||
410 | if ( !isVisible() ) { | 410 | if ( !isVisible() ) { |
411 | mPendingUpdateBeforeRepaint = true; | 411 | mPendingUpdateBeforeRepaint = true; |
412 | } else { | 412 | } else { |
413 | #ifdef DESKTOP_VERSION | 413 | #ifdef DESKTOP_VERSION |
414 | //mRepaintTimer->start( 150 ); | 414 | //mRepaintTimer->start( 100 ); |
415 | mUpdateTimer->start( 150 ); | 415 | mUpdateTimer->start( 100 ); |
416 | #else | 416 | #else |
417 | mRepaintTimer->start( 350 ); | 417 | mRepaintTimer->start( 350 ); |
418 | mUpdateTimer->start( 1200 ); | 418 | mUpdateTimer->start( 1200 ); |
419 | #endif | 419 | #endif |
@@ -834,8 +834,10 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) | |||
834 | if ( colModulo ) { | 834 | if ( colModulo ) { |
835 | if ( col >= 7 - colModulo ) | 835 | if ( col >= 7 - colModulo ) |
836 | addCol = col - 6 + colModulo-1; | 836 | addCol = col - 6 + colModulo-1; |
837 | } | 837 | } |
838 | if ( col == 0 ) | ||
839 | addCol = 1; | ||
838 | p.drawRect(col*dwidth+addCol, row*dheight+addRow, dwidth, dheight+1); | 840 | p.drawRect(col*dwidth+addCol, row*dheight+addRow, dwidth, dheight+1); |
839 | p.setPen(tmppen); | 841 | p.setPen(tmppen); |
840 | } | 842 | } |
841 | 843 | ||
@@ -876,8 +878,10 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) | |||
876 | addRow = row - 5 + rowModulo; | 878 | addRow = row - 5 + rowModulo; |
877 | } | 879 | } |
878 | //qDebug("add %d %d -- %d %d ", col, addCol, row, addRow); | 880 | //qDebug("add %d %d -- %d %d ", col, addCol, row, addRow); |
879 | ++addCol;//++addCol; | 881 | ++addCol;//++addCol; |
882 | if ( row == 0) | ||
883 | addRow = 1; | ||
880 | p.drawText(col*dwidth+addCol, row*dheight+addRow, dwidth, dheight, | 884 | p.drawText(col*dwidth+addCol, row*dheight+addRow, dwidth, dheight, |
881 | Qt::AlignHCenter | Qt::AlignVCenter, daylbls[i]); | 885 | Qt::AlignHCenter | Qt::AlignVCenter, daylbls[i]); |
882 | 886 | ||
883 | // reset color to actual color | 887 | // reset color to actual color |