1 files changed, 5 insertions, 3 deletions

diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index d0380e3..f9bc1ca 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -888,141 +888,143 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
             connect( cell, SIGNAL( defaultAction( Incidence * ) ),
                      SLOT( defaultAction( Incidence * ) ) );
             connect( cell, SIGNAL( newEventSignal( QDateTime ) ),
                      SIGNAL( newEventSignal( QDateTime ) ) );
             connect( cell, SIGNAL( showDaySignal( QDate ) ),
                      SIGNAL( showDaySignal( QDate ) ) );
         }
     }
     mCellsW.resize( mDaysPerWeek );
     for( col = 0; col < mDaysPerWeek; ++col ) {
         MonthViewCell *cell = new MonthViewCell( this, mWeekView );
         mCellsW.insert( col, cell );
 
         connect( cell, SIGNAL( defaultAction( Incidence * ) ),
                  SLOT( defaultAction( Incidence * ) ) );
         connect( cell, SIGNAL( newEventSignal( QDateTime ) ),
                  SIGNAL( newEventSignal( QDateTime ) ) );
         connect( cell, SIGNAL( showDaySignal( QDate ) ),
                  SIGNAL( showDaySignal( QDate ) ) );
         cell->updateConfig(KOPrefs::instance()->mMonthViewUsesBigFont );
     }
 
     //connect( mWeekLabels[mNumWeeks], SIGNAL( clicked() ), SLOT( switchView() ) );
     mContextMenu = eventPopup();
     // updateConfig(); //useless here...
     // ... but we need mWidthLongDayLabel computed
     QFontMetrics fontmetric(mDayLabels[0]->font());
     mWidthLongDayLabel = 0;
     for (int i = 0; i < 7; i++) {
         int width = fontmetric.width(KOGlobals::self()->calendarSystem()->weekDayName(i+1));
         if ( width > mWidthLongDayLabel ) mWidthLongDayLabel = width;
     }
 
     //mWeekLabels[mNumWeeks]->setText( i18n("W"));
 
 #if 0
     if ( mShowWeekView )
         mWidStack->raiseWidget( mWeekView );
     else
         mWidStack->raiseWidget( mMonthView );
 #endif
 
     emit incidenceSelected( 0 );
 #ifndef DESKTOP_VERSION
     resize( QApplication::desktop()->size() );
 #else
     resize(640, 480 );
     updatePossible = true;
 #endif
     computeLayout();
 
     if ( mShowWeekView )
         mWidStack->raiseWidget( mWeekView );
     else
         mWidStack->raiseWidget( mMonthView );
 }
 
 KOMonthView::~KOMonthView()
 {
     delete mContextMenu;
 }
 
 void KOMonthView::selectInternalWeekNum ( int n )
 {
-    switchView();
-    emit selectWeekNum ( n );
+    switchView();  
+    if ( !KOPrefs::instance()->mMonthViewWeek )
+        emit selectMonth ();
+    else
+        emit selectWeekNum ( n );
 }
 
 int KOMonthView::currentWeek()
 {
     if ( mShowWeekView )
         return mWeekLabelsW[0]->getWeekNum();
     return mWeekLabels[0]->getWeekNum();
 }
 void KOMonthView::switchView()
 {
-
     if ( selectedCell( ) )
         selectedCell()->deselect();
     mShowWeekView = !mShowWeekView;
     KOPrefs::instance()->mMonthViewWeek = mShowWeekView;
     if ( clPending ) {
       computeLayout();
       updateConfig();
     }
     if ( mShowWeekView )
         mWidStack->raiseWidget( mWeekView );
     else
         mWidStack->raiseWidget( mMonthView ); 
     clPending = false;
 }
 
 int KOMonthView::maxDatesHint()
 {
     return mNumCells;
 }
 
 int KOMonthView::currentDateCount()
 {
     return mNumCells;
 }
 
 QPtrList<Incidence> KOMonthView::selectedIncidences()
 {
     QPtrList<Incidence> selected;
 
     if ( mSelectedCell ) {
         Incidence *incidence = mSelectedCell->selectedIncidence();
         if ( incidence ) selected.append( incidence );
     }
 
     return selected;
 }
 
 DateList KOMonthView::selectedDates()
 {
     DateList selected;
 
     if ( mSelectedCell ) {
         QDate qd = mSelectedCell->selectedIncidenceDate();
         if ( qd.isValid() ) selected.append( qd );
     }
 
     return selected;
 }
 
 void KOMonthView::printPreview(CalPrinter *calPrinter, const QDate &fd,
                                const QDate &td)
 {
 #ifndef KORG_NOPRINTER
     calPrinter->preview(CalPrinter::Month, fd, td);
 #endif
 }
 
 void KOMonthView::updateConfig()
 {
  
     mWeekStartsMonday = KGlobal::locale()->weekStartsMonday();
 
     if ( mShowWeekView ) {
         mWeekStartsMonday = true;