fix

4 files changed, 8 insertions, 10 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 96fb5ca..db33017 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -3684,17 +3684,17 @@ void CalendarView::toggleExpand()
 {
     //  if ( mLeftFrame->isHidden() ) {
     //     mLeftFrame->show(); 
     //     emit calendarViewExpanded( false );
     //   } else {
     //     mLeftFrame->hide();
     //     emit calendarViewExpanded( true );
     //   }
-
+    //qDebug(" CalendarView::toggleExpand()");
     globalFlagBlockAgenda = 1;
     emit calendarViewExpanded( !mLeftFrame->isHidden() );
     globalFlagBlockAgenda = 5;
     mViewManager->raiseCurrentView( !mLeftFrame->isHidden() );
     //mViewManager->showView( 0, true );
 }
 
 void CalendarView::calendarModified( bool modified, Calendar * )
diff --git a/korganizer/datenavigator.cpp b/korganizer/datenavigator.cpp
index 3156b2b..d2824de 100644
--- a/korganizer/datenavigator.cpp
+++ b/korganizer/datenavigator.cpp
@@ -205,18 +205,17 @@ void DateNavigator::selectTodayMonth()
     selectDates( date , date.daysInMonth ());
 
 }
 void DateNavigator::selectToday()
 {
   QDate d = QDate::currentDate();
 
   int dateCount = mSelectedDates.count();
-
-  if ( dateCount == 5 ) selectWorkWeek( d );
+  if ( dateCount == 5 && d.dayOfWeek() < 6 ) selectWorkWeek( d );
   else if ( dateCount == 7 ) selectWeek( d );
   else selectDates( d, dateCount );
 }
 
 void DateNavigator::selectPreviousYear()
 {
   QDate firstSelected = mSelectedDates.first();
   int weekDay = firstSelected.dayOfWeek();
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 10e4f1d..4cefb26 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -962,17 +962,17 @@ void KOMonthView::updateView()
     int i;
     for( i = 0; i < mCells.count(); ++i ) {
         mCells[i]->updateCell();
     }
  
     //qDebug("KOMonthView::updateView() ");
     processSelectionChange();
     // qDebug("---------------------------------------------------------------------+ ");
-    setFocus();
+    mCells[0]->setFocus();
 }
 
 void KOMonthView::resizeEvent(QResizeEvent * e)
 {
     computeLayout();
 }
 void KOMonthView::computeLayout()
 {
@@ -1126,29 +1126,30 @@ void KOMonthView::clearSelection()
 {
     if ( mSelectedCell ) {
         mSelectedCell->deselect();
         mSelectedCell = 0;
     }
 }
 void KOMonthView::keyPressEvent ( QKeyEvent * e )
 {
+    //qDebug("KOMonthView::keyPressEvent ");
     switch(e->key()) {
-        break;
     case Key_Up: 
         {
             emit prevMonth();
-            setFocus();
+            mCells[0]->setFocus();
         }
         e->accept();
         break;
     case Key_Down:
         {
             emit nextMonth();
-            setFocus();
+            mCells[0]->setFocus();
+           
         }
         e->accept();
         break;
     default:
         e->ignore();     
         break;
     }
 }
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 6da4799..4c03f9a 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -97,17 +97,17 @@ void KOViewManager::readSettings(KConfig *config)
         showAgendaView();
     }
 }
 
 
 void KOViewManager::showDateView( int view, QDate date)
 {
 
-    qDebug("date %d %s", view, date.toString().latin1());
+    //qDebug("date %d %s", view, date.toString().latin1());
 #if 0
     mNewItemPopup->insertItem ( SmallIcon( pathString +"day" ),  i18n("Day view"),3 );  
     mNewItemPopup->insertItem ( SmallIcon( pathString +"week" ),  i18n("Next Week"),4 );  
     mNewItemPopup->insertItem ( SmallIcon( pathString +"month" ),  i18n("Next Two Weeks"),5 );   
     mNewItemPopup->insertItem ( SmallIcon( pathString +"month" ),  i18n("Next Month"),6 );  
     mNewItemPopup->insertItem ( SmallIcon( pathString +"journal" ),  i18n("Journal view"),7 ); 
 #endif
     if ( view == 3 ) {
@@ -187,17 +187,16 @@ void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen )
     }
     bool full = fullScreen;
     if(view == mCurrentView && view != mWhatsNextView ) {
         if ( mCurrentAgendaView < 0 )
             return;
         full = mMainView->leftFrame()->isVisible();
     } else {
         mCurrentView = view;
-        
         // bool full = fullScreen;
         bool isFull = !mMainView->leftFrame()->isVisible();
         if ( isFull && KOPrefs::instance()->mViewChangeHoldFullscreen )
             full = true;
         if ( !isFull && KOPrefs::instance()->mViewChangeHoldNonFullscreen )
             full = false;
     }
     if ( mAgendaView ) mAgendaView->deleteSelectedDateTime();
@@ -205,17 +204,16 @@ void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen )
     mMainView->processIncidenceSelection( 0 );
     mMainView->updateView();
     raiseCurrentView( full );
     mMainView->adaptNavigationUnits();
 }
 
 void KOViewManager::raiseCurrentView( bool fullScreen )
 {
-    //qDebug("raiseCurrentView ");
     mCurrentAgendaView = 0;
     int wid =  mMainView->width() ;
     int hei  = mMainView->height();
     if ( mCurrentView == mMonthView   ) {
         mMainView->navigatorBar()->show();
         hei -= mMainView->navigatorBar()->sizeHint().height();
         //mMainView->navigatorBar()->hide();
     } else {