| -rw-r--r-- | bin/kdepim/WhatsNew.txt | 4 | ||||
| -rw-r--r-- | desktop/rpm/kdepim_rpm | 2 | ||||
| -rw-r--r-- | korganizer/komonthview.cpp | 20 | ||||
| -rw-r--r-- | korganizer/komonthview.h | 3 | ||||
| -rw-r--r-- | korganizer/koviewmanager.cpp | 4 | ||||
| -rw-r--r-- | version | 2 |
6 files changed, 22 insertions, 13 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index 6945864..65bb075 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt @@ -2,2 +2,6 @@ Info about the changes in new versions of KDE-Pim/Pi +********** VERSION 2.0.5 ************ + +Bugfixes in KO/Pi. + ********** VERSION 2.0.4 ************ diff --git a/desktop/rpm/kdepim_rpm b/desktop/rpm/kdepim_rpm index 04c6aa1..4c53aac 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.4 +Version: 2.0.5 Release: SuSE_9.2 diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 9b9e164..6ae4c6f 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp @@ -792,4 +792,6 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name) mDaysPerWeek( 7 ), mNumWeeks( 6 ), mNumCells( mDaysPerWeek * mNumWeeks ), - mShortDayLabels( false ), mWidthLongDayLabel( 0 ), mSelectedCell( 0 ) + mWidthLongDayLabel( 0 ), mSelectedCell( 0 ) { + mShortDayLabelsM = false; + mShortDayLabelsW = false; skipResize = false; @@ -1052,3 +1054,3 @@ void KOMonthView::updateDayLabels() if (mWeekStartsMonday) { - bool show = mShortDayLabels; + bool show = mShortDayLabelsW; if ( i > 4 && mShowSatSunComp && mWidthLongDayLabel > (*mDayLabelsT)[i]->width() ) @@ -1057,4 +1059,4 @@ void KOMonthView::updateDayLabels() } else { - if (i==0) (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabels)); - else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabels)); + if (i==0) (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabelsW)); + else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabelsW)); @@ -1065,3 +1067,3 @@ void KOMonthView::updateDayLabels() if (mWeekStartsMonday) { - bool show = mShortDayLabels; + bool show = mShortDayLabelsM; if ( i > 4 && mShowSatSunComp && mWidthLongDayLabel > (*mDayLabelsT)[i]->width() ) @@ -1070,4 +1072,4 @@ void KOMonthView::updateDayLabels() } else { - if (i==0) (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabels)); - else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabels)); + if (i==0) (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabelsM)); + else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabelsM)); @@ -1388,3 +1390,3 @@ void KOMonthView::computeLayoutWeek() //qDebug("parent %d %d ", topLevelWidget()->size().width(), topLevelWidget()->size().height()); - mShortDayLabels = mDayLabelsW[0]->width() < mWidthLongDayLabel ; + mShortDayLabelsW = mDayLabelsW[0]->width()-2 < mWidthLongDayLabel ; updateDayLabels(); @@ -1504,3 +1506,3 @@ void KOMonthView::computeLayout() //qDebug("parent %d %d ", topLevelWidget()->size().width(), topLevelWidget()->size().height()); - mShortDayLabels = mDayLabels[0]->width() < mWidthLongDayLabel ; + mShortDayLabelsM = mDayLabels[0]->width()-2 < mWidthLongDayLabel ; updateDayLabels(); diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h index bf861ef..03f9dc6 100644 --- a/korganizer/komonthview.h +++ b/korganizer/komonthview.h @@ -284,3 +284,4 @@ class KOMonthView: public KOEventView - bool mShortDayLabels; + bool mShortDayLabelsM; + bool mShortDayLabelsW; int mWidthLongDayLabel; diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index 90be237..b0f26d1 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp @@ -108,2 +108,4 @@ void KOViewManager::showDateView( int view, QDate date) + if (view != 9) + lastMode = 0; //qDebug("%d %d ", lastNDMode, mFlagShowNextxDays ); @@ -117,2 +119,3 @@ void KOViewManager::showDateView( int view, QDate date) mMainView->showDay( date ); + lastMode = 1; } else if (view == 4 ) { @@ -152,3 +155,2 @@ void KOViewManager::showDateView( int view, QDate date) } - lastMode = view; } @@ -1 +1 @@ -version = "2.0.4"; +version = "2.0.5"; |