summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-02-08 23:15:22 (UTC)
committer zautrix <zautrix>2005-02-08 23:15:22 (UTC)
commitd0ab37d35ca9a9d919c9fc4856f3314bfef6dd5a (patch) (side-by-side diff)
tree751d52e216392132e8ad36ba9e8a23ae64083951
parent2124ce7f8c6edbd0e3ec32b1d1e6a625ef9450d6 (diff)
downloadkdepimpi-d0ab37d35ca9a9d919c9fc4856f3314bfef6dd5a.zip
kdepimpi-d0ab37d35ca9a9d919c9fc4856f3314bfef6dd5a.tar.gz
kdepimpi-d0ab37d35ca9a9d919c9fc4856f3314bfef6dd5a.tar.bz2
fff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--desktop/rpm/kdepim_rpm2
-rw-r--r--korganizer/komonthview.cpp7
-rw-r--r--korganizer/kotodoviewitem.cpp11
-rw-r--r--microkde/kdatetbl.cpp2
-rw-r--r--version2
5 files changed, 14 insertions, 10 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,5 +1,5 @@
Summary: A collection of PIM programs
Name: KDE-Pim-Pi
-Version: 2.0.5
+Version: 2.0.6
Release: SuSE_9.2
Copyright:GPL
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 ) );
diff --git a/microkde/kdatetbl.cpp b/microkde/kdatetbl.cpp
index 1024796..d182279 100644
--- a/microkde/kdatetbl.cpp
+++ b/microkde/kdatetbl.cpp
@@ -459,5 +459,5 @@ KDateInternalMonthPicker::KDateInternalMonthPicker
add += 8;
if ( QApplication::desktop()->width() > 640 )
- add += 4;
+ add += 6;
font.setPointSize(fontsize+add);
setFont(font);
diff --git a/version b/version
index 2976531..c98eacc 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-version = "2.0.5";
+version = "2.0.6";