-rw-r--r-- | korganizer/komonthview.cpp | 7 | ||||
-rw-r--r-- | korganizer/kotodoviewitem.cpp | 9 |
2 files changed, 10 insertions, 6 deletions
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 02d2585..da81586 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp | |||
@@ -917,19 +917,26 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name) | |||
917 | 917 | ||
918 | //mWeekLabels[mNumWeeks]->setText( i18n("W")); | 918 | //mWeekLabels[mNumWeeks]->setText( i18n("W")); |
919 | 919 | ||
920 | #if 0 | ||
920 | if ( mShowWeekView ) | 921 | if ( mShowWeekView ) |
921 | mWidStack->raiseWidget( mWeekView ); | 922 | mWidStack->raiseWidget( mWeekView ); |
922 | else | 923 | else |
923 | mWidStack->raiseWidget( mMonthView ); | 924 | mWidStack->raiseWidget( mMonthView ); |
925 | #endif | ||
924 | 926 | ||
925 | emit incidenceSelected( 0 ); | 927 | emit incidenceSelected( 0 ); |
926 | #ifndef DESKTOP_VERSION | 928 | #ifndef DESKTOP_VERSION |
927 | resize( QApplication::desktop()->size() ); | 929 | resize( QApplication::desktop()->size() ); |
928 | #else | 930 | #else |
929 | resize(640, 480 ); | 931 | resize(640, 480 ); |
932 | updatePossible = true; | ||
930 | #endif | 933 | #endif |
931 | computeLayout(); | 934 | computeLayout(); |
932 | 935 | ||
936 | if ( mShowWeekView ) | ||
937 | mWidStack->raiseWidget( mWeekView ); | ||
938 | else | ||
939 | mWidStack->raiseWidget( mMonthView ); | ||
933 | } | 940 | } |
934 | 941 | ||
935 | KOMonthView::~KOMonthView() | 942 | KOMonthView::~KOMonthView() |
diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp index 78d4027..44db209 100644 --- a/korganizer/kotodoviewitem.cpp +++ b/korganizer/kotodoviewitem.cpp | |||
@@ -266,7 +266,7 @@ void KOTodoViewItem::stateChange(bool state) | |||
266 | 266 | ||
267 | bool KOTodoViewItem::isAlternate() | 267 | bool KOTodoViewItem::isAlternate() |
268 | { | 268 | { |
269 | #ifndef KORG_NOLVALTERNATION | 269 | |
270 | KOTodoListView *lv = static_cast<KOTodoListView *>(listView()); | 270 | KOTodoListView *lv = static_cast<KOTodoListView *>(listView()); |
271 | if (lv && lv->alternateBackground().isValid()) | 271 | if (lv && lv->alternateBackground().isValid()) |
272 | { | 272 | { |
@@ -303,9 +303,6 @@ bool KOTodoViewItem::isAlternate() | |||
303 | return m_odd; | 303 | return m_odd; |
304 | } | 304 | } |
305 | return false; | 305 | return false; |
306 | #else | ||
307 | return false; | ||
308 | #endif | ||
309 | } | 306 | } |
310 | 307 | ||
311 | void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int alignment) | 308 | void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int alignment) |
@@ -317,8 +314,8 @@ void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, i | |||
317 | else | 314 | else |
318 | role = QColorGroup::Base; | 315 | role = QColorGroup::Base; |
319 | //#ifndef KORG_NOLVALTERNATION | 316 | //#ifndef KORG_NOLVALTERNATION |
320 | // if (isAlternate()) | 317 | if (isAlternate()) |
321 | // _cg.setColor(QColorGroup::Base, static_cast< KOTodoListView* >(listView())->alternateBackground()); | 318 | _cg.setColor(QColorGroup::Base, static_cast< KOTodoListView* >(listView())->alternateBackground()); |
322 | bool setColor = KOPrefs::instance()->mTodoViewUsesCatColors; | 319 | bool setColor = KOPrefs::instance()->mTodoViewUsesCatColors; |
323 | QColor colorToSet; | 320 | QColor colorToSet; |
324 | if ( setColor ) { | 321 | if ( setColor ) { |