many view fixes

1 files changed, 15 insertions, 7 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 12af655..f9af769 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -234,4 +234,5 @@ CalendarView::CalendarView( Calendar *calendar,
 void CalendarView::init()
 { 
+    mBlockShowDates = false;
     beamDialog = new KOBeamPrefs();
     mDatePickerMode = 0;
@@ -347,7 +348,7 @@ void CalendarView::init()
     connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ),
              SLOT( showDates( const KCal::DateList & ) ) );
+   
     connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ),
              mDateNavigator, SLOT( selectDates( const KCal::DateList & ) ) );
-
     connect( mNavigatorBar, SIGNAL( goPrevYear() ),
              mNavigator, SLOT( selectPreviousYear() ) );
@@ -358,8 +359,8 @@ void CalendarView::init()
     connect( mNavigatorBar, SIGNAL( goNextMonth() ),
              mNavigator, SLOT( selectNextMonth() ) );
-
+    
     connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ),
              mNavigatorBar, SLOT( selectDates( const KCal::DateList & ) ) );
-
+    
     connect( mDateNavigator, SIGNAL( weekClicked( const QDate & ) ),
              mNavigator, SLOT( selectWeek( const QDate & ) ) );
@@ -498,5 +499,7 @@ CalendarView::~CalendarView()
 void CalendarView::showDay( QDate d )
 {
+    dateNavigator()->blockSignals( true );
     dateNavigator()->selectDate( d );
+    dateNavigator()->blockSignals( false );
     mViewManager->showWeekView();
     dateNavigator()->selectDate( d );
@@ -673,5 +676,7 @@ void CalendarView::removeAlarm(const QDateTime &qdt, const QString &noti  )
 void CalendarView::selectWeekNum ( int num  )
 {
+    dateNavigator()->blockSignals( true );
     dateNavigator()->selectWeek( num );
+    dateNavigator()->blockSignals( false );
     mViewManager->showWeekView();
 }
@@ -3466,8 +3471,11 @@ void CalendarView::showDates(const DateList &selectedDates)
     //  kdDebug() << "CalendarView::selectDates()" << endl;
   
-    if ( mViewManager->currentView() ) {
-        updateView( selectedDates.first(), selectedDates.last() );
-    } else {
-        mViewManager->showAgendaView();
+
+    if ( !mBlockShowDates ) {
+        if ( mViewManager->currentView() ) {
+            updateView( selectedDates.first(), selectedDates.last() );
+        } else {
+            mViewManager->showAgendaView();
+        }
     }