abc

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
@@ -981,5 +981,4 @@ void KOAgendaView::updateEventDates(KOAgendaItem *item, int type)
         } else {
             // todo
-            qDebug("tooooodoooooo ");
             if (item->lastMultiItem()) {
                 endDt.setTime(mAgenda->gyToTime(item->lastMultiItem()->cellYBottom()+1));
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 6294b98..0ef5ae4 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -1160,9 +1160,10 @@ void KOMonthView::computeLayoutWeek()
             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
@@ -1192,4 +1193,7 @@ void KOMonthView::computeLayoutWeek()
                 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;
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 6afd203..8aa0697 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -123,9 +123,6 @@ void KOViewManager::showDateView( int view, QDate date)
         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 );