| author | zautrix <zautrix> | 2005-02-02 01:54:29 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2005-02-02 01:54:29 (UTC) |
| commit | 5bc675bc7e9d5d6fa2d2bc48675a7cfa985ab2c7 (patch) (side-by-side diff) | |
| tree | 5d8092ab72fbd191f6045ff0ff4f81f0ec0d088b | |
| parent | 9ecfd0660e36b6b8dd7401f0edb16dd3d6f03289 (diff) | |
| download | kdepimpi-5bc675bc7e9d5d6fa2d2bc48675a7cfa985ab2c7.zip kdepimpi-5bc675bc7e9d5d6fa2d2bc48675a7cfa985ab2c7.tar.gz kdepimpi-5bc675bc7e9d5d6fa2d2bc48675a7cfa985ab2c7.tar.bz2 | |
abc
| -rw-r--r-- | korganizer/koagendaview.cpp | 1 | ||||
| -rw-r--r-- | korganizer/komonthview.cpp | 10 | ||||
| -rw-r--r-- | korganizer/koviewmanager.cpp | 5 |
3 files changed, 8 insertions, 8 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index c8cef44..d4ff77a 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp @@ -977,13 +977,12 @@ void KOAgendaView::updateEventDates(KOAgendaItem *item, int type) endDt.setTime(mAgenda->gyToTime(item->cellYBottom()+1)); endDt.setDate(startDate); } } } else { // todo - qDebug("tooooodoooooo "); if (item->lastMultiItem()) { endDt.setTime(mAgenda->gyToTime(item->lastMultiItem()->cellYBottom()+1)); endDt.setDate(startDate. addDays(item->lastMultiItem()->cellX() - item->cellX())); } else { //qDebug("tem->cellYBottom() %d",item->cellYBottom() ); diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 6294b98..0ef5ae4 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp @@ -1156,17 +1156,18 @@ void KOMonthView::computeLayoutWeek() for ( i = 0; i < 7; i++) { if ( i && !( i % daysToShow) && i < 6) { y += hei/(5-daysToShow); x = 0; w = colWid; } - if ( i == daysToShow-colModulo ) + if ( ((i) % daysToShow) >= daysToShow-colModulo ) { ++w; + } if ( i >= 5 ) { - mDayLabels[i]->setGeometry( x+weeklabelwid,y,w/2+1,h); - x -= w/2 ; + mDayLabels[i]->setGeometry( x+weeklabelwid,y,w/2+w%2,h); + x -= (w/2 ); } else mDayLabels[i]->setGeometry( x+weeklabelwid,y,w,h); x += w; } x= 0; @@ -1188,12 +1189,15 @@ void KOMonthView::computeLayoutWeek() if ( i >= 5 ) { if ( i ==5 ) { mCells[i]->setGeometry ( x+weeklabelwid,y,w,h/2 ); x -= w ;y += h/2; } else { + if ( ((i-1) % daysToShow) >= daysToShow-colModulo ) { + ++w; + } mCells[i]->setGeometry ( x+weeklabelwid,y,w,h-h/2 ); y -= h/2; } } else mCells[i]->setGeometry ( x+weeklabelwid,y,w,h ); diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index 6afd203..8aa0697 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp @@ -119,17 +119,14 @@ void KOViewManager::showDateView( int view, QDate date) mCurrentAgendaView = 7 ; mMainView->dateNavigator()->selectDates( date, 7 ); } else if (view == 5 ) { mCurrentAgendaView = 14 ; mMainView->dateNavigator()->selectDates( date, 14); } else if (view == 6 ) { - mMainView->dateNavigator()->blockSignals( true ); + mMainView->dateNavigator()->selectDates( date, 7 ); showMonthView(); - mMainView->dateNavigator()->selectMonthByDate( date ); - mMainView->dateNavigator()->blockSignals( false ); - mMainView->dateNavigator()->selectDate( date ); } else if (view == 7 ) { mMainView->dateNavigator()->selectDate( date ); showJournalView(); } else if (view == 8 ) { globalFlagBlockAgenda = 1; if ( mCurrentAgendaView != 3 ) |