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) (show whitespace changes)
-rw-r--r--desktop/rpm/kdepim_rpm2
-rw-r--r--korganizer/komonthview.cpp7
-rw-r--r--korganizer/kotodoviewitem.cpp9
-rw-r--r--microkde/kdatetbl.cpp2
-rw-r--r--version2
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
@@ -2,3 +2,3 @@ Summary: A collection of PIM programs
Name: KDE-Pim-Pi
-Version: 2.0.5
+Version: 2.0.6
Release: SuSE_9.2
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 02d2585..da81586 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -919,2 +919,3 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
+#if 0
if ( mShowWeekView )
@@ -923,2 +924,3 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
mWidStack->raiseWidget( mMonthView );
+#endif
@@ -929,2 +931,3 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
resize(640, 480 );
+ updatePossible = true;
#endif
@@ -932,2 +935,6 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
+ 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
@@ -268,3 +268,3 @@ bool KOTodoViewItem::isAlternate()
{
-#ifndef KORG_NOLVALTERNATION
+
KOTodoListView *lv = static_cast<KOTodoListView *>(listView());
@@ -305,5 +305,2 @@ bool KOTodoViewItem::isAlternate()
return false;
-#else
- return false;
-#endif
}
@@ -319,4 +316,4 @@ void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, i
//#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;
diff --git a/microkde/kdatetbl.cpp b/microkde/kdatetbl.cpp
index 1024796..d182279 100644
--- a/microkde/kdatetbl.cpp
+++ b/microkde/kdatetbl.cpp
@@ -460,3 +460,3 @@ KDateInternalMonthPicker::KDateInternalMonthPicker
if ( QApplication::desktop()->width() > 640 )
- add += 4;
+ add += 6;
font.setPointSize(fontsize+add);
diff --git a/version b/version
index 2976531..c98eacc 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-version = "2.0.5";
+version = "2.0.6";