| -rw-r--r-- | korganizer/komonthview.cpp | 7 | ||||
| -rw-r--r-- | korganizer/kotodoviewitem.cpp | 11 |
2 files changed, 11 insertions, 7 deletions
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 02d2585..da81586 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp @@ -918,8 +918,10 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name) //mWeekLabels[mNumWeeks]->setText( i18n("W")); +#if 0 if ( mShowWeekView ) mWidStack->raiseWidget( mWeekView ); else mWidStack->raiseWidget( mMonthView ); +#endif emit incidenceSelected( 0 ); @@ -928,7 +930,12 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name) #else resize(640, 480 ); + updatePossible = true; #endif computeLayout(); + if ( mShowWeekView ) + mWidStack->raiseWidget( mWeekView ); + else + mWidStack->raiseWidget( mMonthView ); } diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp index 78d4027..44db209 100644 --- a/korganizer/kotodoviewitem.cpp +++ b/korganizer/kotodoviewitem.cpp @@ -267,5 +267,5 @@ void KOTodoViewItem::stateChange(bool state) bool KOTodoViewItem::isAlternate() { -#ifndef KORG_NOLVALTERNATION + KOTodoListView *lv = static_cast<KOTodoListView *>(listView()); if (lv && lv->alternateBackground().isValid()) @@ -304,7 +304,4 @@ bool KOTodoViewItem::isAlternate() } return false; -#else - return false; -#endif } @@ -318,6 +315,6 @@ void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, i role = QColorGroup::Base; //#ifndef KORG_NOLVALTERNATION - // if (isAlternate()) - // _cg.setColor(QColorGroup::Base, static_cast< KOTodoListView* >(listView())->alternateBackground()); + if (isAlternate()) + _cg.setColor(QColorGroup::Base, static_cast< KOTodoListView* >(listView())->alternateBackground()); bool setColor = KOPrefs::instance()->mTodoViewUsesCatColors; QColor colorToSet; @@ -377,5 +374,5 @@ void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, i if ( !p ) return; - + p->fillRect( 0, 0, width, height(), _cg.brush( QColorGroup::Base ) ); |