| -rw-r--r-- | desktop/rpm/kdepim_rpm | 2 | ||||
| -rw-r--r-- | korganizer/komonthview.cpp | 7 | ||||
| -rw-r--r-- | korganizer/kotodoviewitem.cpp | 9 | ||||
| -rw-r--r-- | microkde/kdatetbl.cpp | 2 | ||||
| -rw-r--r-- | version | 2 |
5 files changed, 13 insertions, 9 deletions
diff --git a/desktop/rpm/kdepim_rpm b/desktop/rpm/kdepim_rpm index 4c53aac..b7f00ed 100644 --- a/desktop/rpm/kdepim_rpm +++ b/desktop/rpm/kdepim_rpm @@ -1,9 +1,9 @@ Summary: A collection of PIM programs Name: KDE-Pim-Pi -Version: 2.0.5 +Version: 2.0.6 Release: SuSE_9.2 Copyright:GPL Group: Productivity/Pim Source:http://sourceforge.net/projects/kdepimpi/ URL:http://sourceforge.net/projects/kdepimpi/ Packager: zautrix diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 02d2585..da81586 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp @@ -914,25 +914,32 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name) int width = fontmetric.width(KOGlobals::self()->calendarSystem()->weekDayName(i+1)); if ( width > mWidthLongDayLabel ) mWidthLongDayLabel = width; } //mWeekLabels[mNumWeeks]->setText( i18n("W")); +#if 0 if ( mShowWeekView ) mWidStack->raiseWidget( mWeekView ); else mWidStack->raiseWidget( mMonthView ); +#endif emit incidenceSelected( 0 ); #ifndef DESKTOP_VERSION resize( QApplication::desktop()->size() ); #else resize(640, 480 ); + updatePossible = true; #endif computeLayout(); + if ( mShowWeekView ) + mWidStack->raiseWidget( mWeekView ); + else + mWidStack->raiseWidget( mMonthView ); } KOMonthView::~KOMonthView() { delete mContextMenu; } diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp index 78d4027..44db209 100644 --- a/korganizer/kotodoviewitem.cpp +++ b/korganizer/kotodoviewitem.cpp @@ -263,13 +263,13 @@ void KOTodoViewItem::stateChange(bool state) setMyPixmap(); mTodoView->setTodoModified( mTodo ); } bool KOTodoViewItem::isAlternate() { -#ifndef KORG_NOLVALTERNATION + KOTodoListView *lv = static_cast<KOTodoListView *>(listView()); if (lv && lv->alternateBackground().isValid()) { KOTodoViewItem *above = 0; above = dynamic_cast<KOTodoViewItem *>(itemAbove()); m_known = above ? above->m_known : true; @@ -300,28 +300,25 @@ bool KOTodoViewItem::isAlternate() item = dynamic_cast<KOTodoViewItem *>(item->nextSibling()); } } return m_odd; } return false; -#else - return false; -#endif } void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int alignment) { QColorGroup _cg = cg; QColorGroup::ColorRole role; if ( KOPrefs::instance()->mTodoViewUsesForegroundColor ) role = QColorGroup::Text; else 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; if ( setColor ) { QStringList categories = mTodo->categories(); QString cat = categories.first(); if ( !cat.isEmpty()) { diff --git a/microkde/kdatetbl.cpp b/microkde/kdatetbl.cpp index 1024796..d182279 100644 --- a/microkde/kdatetbl.cpp +++ b/microkde/kdatetbl.cpp @@ -455,13 +455,13 @@ KDateInternalMonthPicker::KDateInternalMonthPicker font=KGlobalSettings::generalFont(); int fontsize = 10; int add = 2; if ( QApplication::desktop()->width() >= 480 && QApplication::desktop()->width() <= 640 ) add += 8; if ( QApplication::desktop()->width() > 640 ) - add += 4; + add += 6; font.setPointSize(fontsize+add); setFont(font); setHScrollBarMode(AlwaysOff); setVScrollBarMode(AlwaysOff); setFrameStyle(QFrame::NoFrame); setNumRows(4); @@ -1 +1 @@ -version = "2.0.5"; +version = "2.0.6"; |