summaryrefslogtreecommitdiffabout
path: root/korganizer
authorzautrix <zautrix>2005-02-07 22:39:50 (UTC)
committer zautrix <zautrix>2005-02-07 22:39:50 (UTC)
commit9927a063f34bb826a4b5f7f7029308c9c66acbce (patch) (side-by-side diff)
tree740386010794c8f5d50b92d49146642709a52e67 /korganizer
parentd7a005e6c1a27d1084f30b940d54291a8d660f0e (diff)
downloadkdepimpi-9927a063f34bb826a4b5f7f7029308c9c66acbce.zip
kdepimpi-9927a063f34bb826a4b5f7f7029308c9c66acbce.tar.gz
kdepimpi-9927a063f34bb826a4b5f7f7029308c9c66acbce.tar.bz2
fihix
Diffstat (limited to 'korganizer') (more/less context) (show whitespace changes)
-rw-r--r--korganizer/komonthview.cpp20
-rw-r--r--korganizer/komonthview.h3
-rw-r--r--korganizer/koviewmanager.cpp4
3 files changed, 16 insertions, 11 deletions
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;
}