summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koagendaview.cpp1
-rw-r--r--korganizer/komonthview.cpp10
-rw-r--r--korganizer/koviewmanager.cpp5
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
@@ -982,3 +982,2 @@ void KOAgendaView::updateEventDates(KOAgendaItem *item, int type)
// todo
- qDebug("tooooodoooooo ");
if (item->lastMultiItem()) {
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 6294b98..0ef5ae4 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -1161,7 +1161,8 @@ void KOMonthView::computeLayoutWeek()
}
- 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 );
}
@@ -1193,2 +1194,5 @@ void KOMonthView::computeLayoutWeek()
} else {
+ if ( ((i-1) % daysToShow) >= daysToShow-colModulo ) {
+ ++w;
+ }
mCells[i]->setGeometry ( x+weeklabelwid,y,w,h-h/2 );
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 6afd203..8aa0697 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -124,7 +124,4 @@ void KOViewManager::showDateView( int view, QDate date)
} 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 ) {