many view fixes

5 files changed, 85 insertions, 42 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();
+        }
     }
 
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index 646973d..e27da9a 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -481,4 +481,5 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     int  takeEvent( Incidence* local,  Incidence* remote, int mode, bool full = false );
     //Attendee* getYourAttendee(Event *event);
+    void setBlockShowDates( bool b ) { mBlockShowDates = b ;}
   protected:
     void schedule(Scheduler::Method, Incidence *incidence = 0);
@@ -492,4 +493,5 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
 
   private:
+    bool mBlockShowDates;
     KSyncManager* mSyncManager;
     AlarmDialog * mAlarmDialog;
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 9344567..842f6eb 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -80,7 +80,10 @@ KNoScrollListBox::KNoScrollListBox(QWidget *parent,const char *name)
     QPEApplication::setStylusOperation( viewport(), QPEApplication::RightOnHold );
 #endif 
-    new KNOWhatsThis(this);
+    mWT = new KNOWhatsThis(this);
+}
+KNoScrollListBox::~KNoScrollListBox()
+{
+ delete mWT;
 }
-
 QString KNoScrollListBox::getWhatsThisText(QPoint p) 
 {
@@ -309,18 +312,7 @@ void MonthViewCell::setDate( const QDate &date )
 {
 //  kdDebug() << "MonthViewCell::setDate(): " << date.toString() << endl;
-
   mDate = date;
 
-  QString text;
-  bool smallDisplay = QApplication::desktop()->width() < 320 && KOPrefs::instance()->mMonthViewSatSunTog;
-   if ( KOGlobals::self()->calendarSystem()->day( date ) == 1 || (date.dayOfWeek() == 7 && !smallDisplay ) || KOPrefs::instance()->mMonthShowShort) { 
-     text = KOGlobals::self()->calendarSystem()->monthName( date, true ) + " ";
-    mLabel->resize( mLabelBigSize  );
-    text += QString::number( KOGlobals::self()->calendarSystem()->day(mDate) );
-  } else {
-    mLabel->resize( mLabelSize );
-    text += QString::number( KOGlobals::self()->calendarSystem()->day(mDate) );
-  }
-  mLabel->setText( text );
+ 
 
   //resizeEvent( 0 );
@@ -393,5 +385,9 @@ void MonthViewCell::keyPressEvent ( QKeyEvent * e )
 void MonthViewCell::updateCell()
 {
-  
+    if ( !mMonthView->isUpdatePossible() )
+        return;
+    if ( !isVisible() ){
+        return;
+    }
     setPrimary( mDate.month()%2 );
     setHoliday( KOGlobals::self()->calendarSystem()->dayOfWeek(mDate) == KOGlobals::self()->calendarSystem()->weekDayOfPray() || ( mDate.dayOfWeek() == 6 ) && KOPrefs::instance()-> mExcludeSaturdays);
@@ -402,4 +398,7 @@ void MonthViewCell::updateCell()
     }
     mItemList->clear();
+
+
+
 #ifdef DESKTOP_VERSION
     QToolTip::remove(this); 
@@ -416,5 +415,14 @@ void MonthViewCell::updateCell()
     QPtrList<Event> events = mMonthView->calendar()->events( mDate, true );
     Event *event;
-    for( event = events.first(); event; event = events.next() ) {
+    for( event = events.first(); event; event = events.next() ) { // for event
+
+        if ( !(event->doesRecur() == Recurrence::rNone) ) {
+            if ( !KOPrefs::instance()->mMonthDailyRecur && event->doesRecur() == Recurrence::rDaily )
+                continue;
+            else
+                if ( !KOPrefs::instance()->mMonthWeeklyRecur && event->doesRecur() == Recurrence::rWeekly )
+                    continue;
+        }
+        
         if ( event->categories().contains("Holiday") ||
              event->categories().contains(i18n("Holiday"))) {
@@ -484,4 +492,5 @@ void MonthViewCell::updateCell()
         item->setAlarm( event->isAlarmEnabled() );
         item->setMoreInfo( event->description().length() > 0  );
+#ifdef DESKTOP_VERSION
         Attendee *me = event->attendeeByMails(KOPrefs::instance()->mAdditionalMails,
                                               KOPrefs::instance()->email());
@@ -493,18 +502,8 @@ void MonthViewCell::updateCell()
         } else
             item->setReply(false);
-        bool insert = true;
-        if ( !(event->doesRecur() == Recurrence::rNone) ) {
-            if ( !KOPrefs::instance()->mMonthDailyRecur && event->doesRecur() == Recurrence::rDaily )
-                insert = false;
-            else
-                if ( !KOPrefs::instance()->mMonthWeeklyRecur && event->doesRecur() == Recurrence::rWeekly )
-                    insert = false;
-
-        }
-        if ( insert ) {
-            mItemList->insertItem( item );
-            tipText += "\n";
-        } else
-            tipText = "";
+#endif
+        mItemList->insertItem( item );
+        tipText += "\n";
+       
     }
 
@@ -558,7 +557,18 @@ void MonthViewCell::updateCell()
     //setMyPalette(); 
     setMyPalette();
+    QString text;
+    bool smallDisplay = QApplication::desktop()->width() < 320 && KOPrefs::instance()->mMonthViewSatSunTog;
+    if ( KOGlobals::self()->calendarSystem()->day( mDate ) == 1 || (mDate.dayOfWeek() == 7 && !smallDisplay ) || KOPrefs::instance()->mMonthShowShort) { 
+        text = KOGlobals::self()->calendarSystem()->monthName( mDate, true ) + " ";
+        mLabel->resize( mLabelBigSize  );
+        text += QString::number( KOGlobals::self()->calendarSystem()->day(mDate) );
+    } else {
+        mLabel->resize( mLabelSize );
+        text += QString::number( KOGlobals::self()->calendarSystem()->day(mDate) );
+    }
+    mLabel->setText( text );
     resizeEvent( 0 );
     // if ( isVisible())
-    //   qApp->processEvents();
+    qApp->processEvents();
 }
 
@@ -639,4 +649,9 @@ void MonthViewCell::select()
 void MonthViewCell::resizeEvent ( QResizeEvent * )
 {
+    if ( !mMonthView->isUpdatePossible() )
+        return;
+    if ( !isVisible() ){
+        return;
+    }
     int size = height() - mLabel->height();
     if ( size > 0 )
@@ -714,4 +729,5 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
       mShortDayLabels( false ), mWidthLongDayLabel( 0 ), mSelectedCell( 0 )
 {
+    updatePossible = false;
   mCells.setAutoDelete( true );
   mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ;
@@ -921,5 +937,8 @@ void KOMonthView::changeEventDisplay(Event *, int)
 void KOMonthView::updateView()
 {
- 
+    static int iii = 0;
+    ++iii; 
+    if ( !updatePossible )
+        return;
   uint i;
   for( i = 0; i < mCells.count(); ++i ) {
@@ -955,5 +974,5 @@ void KOMonthView::computeLayout()
     if ( ((wid *3)/2) < tWid && (( hei *3) /2) < tHei  ) 
         return;
-
+    //qDebug("KOMonthView::computeLayout()------------------------------------ ");
     QFontMetrics fm ( mWeekLabels[0]->font() );
     int weeklabelwid = fm.width( "888" );
@@ -1033,4 +1052,8 @@ void KOMonthView::computeLayout()
     mShortDayLabels = mDayLabels[0]->width() < mWidthLongDayLabel ;
     updateDayLabels();
+    bool forceUpdate = !updatePossible;
+    updatePossible = true;
+    if ( forceUpdate )
+        updateView();
 }
 
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index 4c1567c..727f511 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -41,4 +41,5 @@ class QToolTipGroup;
 #endif
 
+class KNOWhatsThis; 
 class KOWeekButton : public QPushButton
 {
@@ -66,5 +67,5 @@ class KNoScrollListBox: public QListBox
   public:
     KNoScrollListBox(QWidget *parent=0, const char *name=0);
-    ~KNoScrollListBox() {}
+    ~KNoScrollListBox();
     QString getWhatsThisText(QPoint p) ;
 
@@ -78,4 +79,7 @@ class KNoScrollListBox: public QListBox
     void keyReleaseEvent(QKeyEvent *);
     void mousePressEvent(QMouseEvent *);
+
+ private:
+    KNOWhatsThis * mWT;
 };
 
@@ -213,4 +217,5 @@ class KOMonthView: public KOEventView
                               const QDate &, const QDate &);
     bool isMonthView() { return true; }
+    bool isUpdatePossible() { return updatePossible; }
 
     MonthViewCell * selectedCell();
@@ -240,4 +245,5 @@ class KOMonthView: public KOEventView
 
   private:
+    bool updatePossible;
     int mDaysPerWeek;
     int mNumWeeks;
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index cf56fcf..00a5842 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -46,4 +46,5 @@
 #include "koprefs.h"
 #include "navigatorbar.h"
+#include "kdatenavigator.h"
 
 #include "koviewmanager.h"
@@ -277,6 +278,9 @@ void KOViewManager::showListView()
     //globalFlagBlockPainting = true;
     globalFlagBlockAgenda = 1;
-    if ( KOPrefs::instance()->mListViewMonthTimespan )
+    if ( KOPrefs::instance()->mListViewMonthTimespan ) {
+        mMainView->setBlockShowDates( true );
         mMainView->dateNavigator()->selectMonth();
+        mMainView->setBlockShowDates( false );
+    }
     showView(mListView, KOPrefs::instance()->mFullViewTodo);
     //mFlagShowNextxDays = temp;