author | zautrix <zautrix> | 2005-02-07 22:39:50 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-02-07 22:39:50 (UTC) |
commit | 9927a063f34bb826a4b5f7f7029308c9c66acbce (patch) (unidiff) | |
tree | 740386010794c8f5d50b92d49146642709a52e67 /korganizer | |
parent | d7a005e6c1a27d1084f30b940d54291a8d660f0e (diff) | |
download | kdepimpi-9927a063f34bb826a4b5f7f7029308c9c66acbce.zip kdepimpi-9927a063f34bb826a4b5f7f7029308c9c66acbce.tar.gz kdepimpi-9927a063f34bb826a4b5f7f7029308c9c66acbce.tar.bz2 |
fihix
-rw-r--r-- | korganizer/komonthview.cpp | 20 | ||||
-rw-r--r-- | korganizer/komonthview.h | 3 | ||||
-rw-r--r-- | korganizer/koviewmanager.cpp | 4 |
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 | |||
@@ -791,6 +791,8 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name) | |||
791 | : KOEventView( calendar, parent, name ), | 791 | : KOEventView( calendar, parent, name ), |
792 | mDaysPerWeek( 7 ), mNumWeeks( 6 ), mNumCells( mDaysPerWeek * mNumWeeks ), | 792 | mDaysPerWeek( 7 ), mNumWeeks( 6 ), mNumCells( mDaysPerWeek * mNumWeeks ), |
793 | mShortDayLabels( false ), mWidthLongDayLabel( 0 ), mSelectedCell( 0 ) | 793 | mWidthLongDayLabel( 0 ), mSelectedCell( 0 ) |
794 | { | 794 | { |
795 | mShortDayLabelsM = false; | ||
796 | mShortDayLabelsW = false; | ||
795 | skipResize = false; | 797 | skipResize = false; |
796 | clPending = true; | 798 | clPending = true; |
@@ -1051,11 +1053,11 @@ void KOMonthView::updateDayLabels() | |||
1051 | for (int i = 0; i < 7; i++) { | 1053 | for (int i = 0; i < 7; i++) { |
1052 | if (mWeekStartsMonday) { | 1054 | if (mWeekStartsMonday) { |
1053 | bool show = mShortDayLabels; | 1055 | bool show = mShortDayLabelsW; |
1054 | if ( i > 4 && mShowSatSunComp && mWidthLongDayLabel > (*mDayLabelsT)[i]->width() ) | 1056 | if ( i > 4 && mShowSatSunComp && mWidthLongDayLabel > (*mDayLabelsT)[i]->width() ) |
1055 | show = true; | 1057 | show = true; |
1056 | (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i+1,show)); | 1058 | (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i+1,show)); |
1057 | } else { | 1059 | } else { |
1058 | if (i==0) (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabels)); | 1060 | if (i==0) (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabelsW)); |
1059 | else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabels)); | 1061 | else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabelsW)); |
1060 | 1062 | ||
1061 | } | 1063 | } |
@@ -1064,11 +1066,11 @@ void KOMonthView::updateDayLabels() | |||
1064 | for (int i = 0; i < 7; i++) { | 1066 | for (int i = 0; i < 7; i++) { |
1065 | if (mWeekStartsMonday) { | 1067 | if (mWeekStartsMonday) { |
1066 | bool show = mShortDayLabels; | 1068 | bool show = mShortDayLabelsM; |
1067 | if ( i > 4 && mShowSatSunComp && mWidthLongDayLabel > (*mDayLabelsT)[i]->width() ) | 1069 | if ( i > 4 && mShowSatSunComp && mWidthLongDayLabel > (*mDayLabelsT)[i]->width() ) |
1068 | show = true; | 1070 | show = true; |
1069 | (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i+1,show)); | 1071 | (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i+1,show)); |
1070 | } else { | 1072 | } else { |
1071 | if (i==0) (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabels)); | 1073 | if (i==0) (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabelsM)); |
1072 | else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabels)); | 1074 | else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabelsM)); |
1073 | 1075 | ||
1074 | } | 1076 | } |
@@ -1387,5 +1389,5 @@ void KOMonthView::computeLayoutWeek() | |||
1387 | // qDebug("RRRRRRRRRRRRR %d %d old %d %d", e->size().width(),e->size().height() , e->oldSize().width(),e->oldSize().height()); | 1389 | // qDebug("RRRRRRRRRRRRR %d %d old %d %d", e->size().width(),e->size().height() , e->oldSize().width(),e->oldSize().height()); |
1388 | //qDebug("parent %d %d ", topLevelWidget()->size().width(), topLevelWidget()->size().height()); | 1390 | //qDebug("parent %d %d ", topLevelWidget()->size().width(), topLevelWidget()->size().height()); |
1389 | mShortDayLabels = mDayLabelsW[0]->width() < mWidthLongDayLabel ; | 1391 | mShortDayLabelsW = mDayLabelsW[0]->width()-2 < mWidthLongDayLabel ; |
1390 | updateDayLabels(); | 1392 | updateDayLabels(); |
1391 | //bool forceUpdate = !updatePossible; | 1393 | //bool forceUpdate = !updatePossible; |
@@ -1503,5 +1505,5 @@ void KOMonthView::computeLayout() | |||
1503 | // qDebug("RRRRRRRRRRRRR %d %d old %d %d", e->size().width(),e->size().height() , e->oldSize().width(),e->oldSize().height()); | 1505 | // qDebug("RRRRRRRRRRRRR %d %d old %d %d", e->size().width(),e->size().height() , e->oldSize().width(),e->oldSize().height()); |
1504 | //qDebug("parent %d %d ", topLevelWidget()->size().width(), topLevelWidget()->size().height()); | 1506 | //qDebug("parent %d %d ", topLevelWidget()->size().width(), topLevelWidget()->size().height()); |
1505 | mShortDayLabels = mDayLabels[0]->width() < mWidthLongDayLabel ; | 1507 | mShortDayLabelsM = mDayLabels[0]->width()-2 < mWidthLongDayLabel ; |
1506 | updateDayLabels(); | 1508 | updateDayLabels(); |
1507 | //bool forceUpdate = !updatePossible; | 1509 | //bool forceUpdate = !updatePossible; |
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h index bf861ef..03f9dc6 100644 --- a/korganizer/komonthview.h +++ b/korganizer/komonthview.h | |||
@@ -283,5 +283,6 @@ class KOMonthView: public KOEventView | |||
283 | QPtrVector<KOWeekButton> mWeekLabelsW; | 283 | QPtrVector<KOWeekButton> mWeekLabelsW; |
284 | 284 | ||
285 | bool mShortDayLabels; | 285 | bool mShortDayLabelsM; |
286 | bool mShortDayLabelsW; | ||
286 | int mWidthLongDayLabel; | 287 | int mWidthLongDayLabel; |
287 | 288 | ||
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index 90be237..b0f26d1 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp | |||
@@ -107,4 +107,6 @@ void KOViewManager::showDateView( int view, QDate date) | |||
107 | //qDebug("date %d %s", view, date.toString().latin1()); | 107 | //qDebug("date %d %s", view, date.toString().latin1()); |
108 | 108 | ||
109 | if (view != 9) | ||
110 | lastMode = 0; | ||
109 | //qDebug("%d %d ", lastNDMode, mFlagShowNextxDays ); | 111 | //qDebug("%d %d ", lastNDMode, mFlagShowNextxDays ); |
110 | bool savemFlagShowNextxDays = mFlagShowNextxDays; | 112 | bool savemFlagShowNextxDays = mFlagShowNextxDays; |
@@ -116,4 +118,5 @@ void KOViewManager::showDateView( int view, QDate date) | |||
116 | lastNDMode = savemFlagShowNextxDays; | 118 | lastNDMode = savemFlagShowNextxDays; |
117 | mMainView->showDay( date ); | 119 | mMainView->showDay( date ); |
120 | lastMode = 1; | ||
118 | } else if (view == 4 ) { | 121 | } else if (view == 4 ) { |
119 | mCurrentAgendaView = 7 ; | 122 | mCurrentAgendaView = 7 ; |
@@ -151,5 +154,4 @@ void KOViewManager::showDateView( int view, QDate date) | |||
151 | mMainView->dateNavigator()->selectDates( date,mMainView->dateNavigator()->selectedDates().count() ); | 154 | mMainView->dateNavigator()->selectDates( date,mMainView->dateNavigator()->selectedDates().count() ); |
152 | } | 155 | } |
153 | lastMode = view; | ||
154 | } | 156 | } |
155 | 157 | ||