more view fixes

4 files changed, 22 insertions, 10 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index f9af769..8f05276 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -480,50 +480,50 @@ void CalendarView::init()
   connect(ExternalAppHandler::instance(), SIGNAL(receivedBirthdayListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&)),
           this, SLOT(insertBirthdays(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&)));
 #endif
 
 }
 
 
 CalendarView::~CalendarView()
 {
     // kdDebug() << "~CalendarView()" << endl;
     //qDebug("CalendarView::~CalendarView() ");
     delete mDialogManager;
     delete mViewManager;
     delete mStorage;
     delete mDateFrame ;
     delete beamDialog;
     //kdDebug() << "~CalendarView() done" << endl;
 }
 
 void CalendarView::showDay( QDate d )
 {
     dateNavigator()->blockSignals( true );
     dateNavigator()->selectDate( d );
     dateNavigator()->blockSignals( false );
-    mViewManager->showWeekView();
-    dateNavigator()->selectDate( d );
+    mViewManager->showDayView();
+    //dateNavigator()->selectDate( d );
 }
 void CalendarView::timerAlarm()
 {
     //qDebug("CalendarView::timerAlarm() ");
     computeAlarm(mAlarmNotification );
 }
 
 void CalendarView::suspendAlarm()
 {
     //qDebug(" CalendarView::suspendAlarm() ");
     computeAlarm(mSuspendAlarmNotification );
 
 }
 
 void  CalendarView::startAlarm( QString mess , QString filename)
 {
     mAlarmDialog->eventNotification( mess, KOPrefs::instance()->mAlarmPlayBeeps, filename, true,KOPrefs::instance()->mAlarmBeepInterval ,KOPrefs::instance()->mAlarmSuspendCount );
     QTimer::singleShot( 3000, this, SLOT( checkNextTimerAlarm() ) );
 
 }
     
 void CalendarView::checkNextTimerAlarm()
 {
     mCalendar->checkAlarmForIncidence( 0, true );
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 842f6eb..b819eec 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -53,49 +53,49 @@
 
 #include "komonthview.h"
 
 #define PIXMAP_SIZE 5
 #ifdef DESKTOP_VERSION
    QToolTipGroup *MonthViewCell::mToolTipGroup = 0; 
 #endif
 class KNOWhatsThis :public QWhatsThis
 {
 public:
     KNOWhatsThis( KNoScrollListBox* sbox ) : QWhatsThis( sbox ), _wid( sbox) { };
 
 protected:
   virtual QString text( const QPoint& p)
   {
     return _wid->getWhatsThisText(p) ;
   };
 private:
     KNoScrollListBox* _wid;
   
 };
 
 
 KNoScrollListBox::KNoScrollListBox(QWidget *parent,const char *name)
-  : QListBox(parent, name)
+    : QListBox(parent, name, WRepaintNoErase)
 {
 #ifndef DESKTOP_VERSION
     QPEApplication::setStylusOperation( viewport(), QPEApplication::RightOnHold );
 #endif 
     mWT = new KNOWhatsThis(this);
 }
 KNoScrollListBox::~KNoScrollListBox()
 {
  delete mWT;
 }
 QString KNoScrollListBox::getWhatsThisText(QPoint p) 
 {
     QListBoxItem* item = itemAt ( p );
     if ( ! item ) {
         return i18n("Click in the cell\nto add an event!");
     }
     return KIncidenceFormatter::instance()->getFormattedText(((MonthViewItem*) item)->incidence());
 }
 void KNoScrollListBox::keyPressEvent(QKeyEvent *e)
 {
  
   switch(e->key()) {
     case Key_Right:
         // if ( e->state() == Qt::ControlButton )
@@ -361,66 +361,74 @@ bool MonthViewCell::isPrimary() const
 {
   return mPrimary;
 }
 
 void MonthViewCell::setHoliday( bool holiday )
 {
   mHoliday = holiday; 
   //setMyPalette();
 }
 
 void MonthViewCell::setHoliday( const QString &holiday )
 {
   mHolidayString = holiday;
 
   if ( !holiday.isEmpty() ) {
     setHoliday( true );
   }
 }
 void MonthViewCell::keyPressEvent ( QKeyEvent * e )
 {
 
      e->ignore();
 
 }
+void MonthViewCell::clear()
+{
+    mItemList->clear();
+    QApplication::removePostedEvents ( mItemList ); 
+    QApplication::removePostedEvents ( mLabel ); 
+    QApplication::removePostedEvents ( this ); 
+}
 void MonthViewCell::updateCell()
 {
     if ( !mMonthView->isUpdatePossible() )
         return;
+    /*    
     if ( !isVisible() ){
         return;
     }
+    */
+    // qDebug("MonthViewCell::updateCell() ");
     setPrimary( mDate.month()%2 );
     setHoliday( KOGlobals::self()->calendarSystem()->dayOfWeek(mDate) == KOGlobals::self()->calendarSystem()->weekDayOfPray() || ( mDate.dayOfWeek() == 6 ) && KOPrefs::instance()-> mExcludeSaturdays);
     if ( mDate == QDate::currentDate()  ) {
         mItemList->setLineWidth( 3 );
     } else {
             mItemList->setLineWidth( 1 );
     }
     mItemList->clear();
 
-
-
 #ifdef DESKTOP_VERSION
     QToolTip::remove(this); 
 #endif
     QString tipText(""); 
     //qApp->processEvents();
     if ( !mHolidayString.isEmpty() ) {
         MonthViewItem *item = new MonthViewItem( 0, mDate, mHolidayString );
         item->setPalette( mHolidayPalette );
         mItemList->insertItem( item );
         tipText += mHolidayString+"\n"; 
     }
     //mLabel->setMaximumWidth( width() - mItemList->lineWidth()*2);
     QPtrList<Event> events = mMonthView->calendar()->events( mDate, true );
     Event *event;
     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;
         }
         
@@ -545,52 +553,53 @@ void MonthViewCell::updateCell()
         } else {
             pal = mStandardPalette ;
         }
         item->setPalette( pal );
         mItemList->insertItem( item );
         tipText += text+"\n"; 
     }
 #ifdef DESKTOP_VERSION
     if (tipText != "")
         QToolTip::add(this,tipText,toolTipGroup(),"");
 #endif
  
     //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();
 }
 
 void MonthViewCell::updateConfig()
 {
 
   setFont( KOPrefs::instance()->mMonthViewFont );
 
   QFontMetrics fm( font() );
   mLabelSize = fm.size( 0, "30" ) + QSize( 4, 2 );
   mLabelBigSize = fm.size( 0, "Mag 30" ) + QSize( 2, 2 );
   mHolidayPalette = mStandardPalette;
   mPrimaryPalette = mStandardPalette;
   mNonPrimaryPalette = mStandardPalette;
   if ( KOPrefs::instance()->mMonthViewUsesDayColors ) {
       mHolidayPalette.setColor(QColorGroup::Base, KOPrefs::instance()->mMonthViewHolidayColor  );
       mHolidayPalette.setColor(QColorGroup::Background, KOPrefs::instance()->mMonthViewHolidayColor  );
       mHolidayPalette.setColor(QColorGroup::Foreground,  KOPrefs::instance()->mMonthViewHolidayColor.dark());
       mPrimaryPalette.setColor(QColorGroup::Foreground,KOPrefs::instance()->mMonthViewOddColor.dark());
       mPrimaryPalette.setColor(QColorGroup::Base,KOPrefs::instance()->mMonthViewOddColor);
       mPrimaryPalette.setColor(QColorGroup::Background,KOPrefs::instance()->mMonthViewOddColor);
       mNonPrimaryPalette.setColor(QColorGroup::Foreground,KOPrefs::instance()->mMonthViewEvenColor.dark());
       mNonPrimaryPalette.setColor(QColorGroup::Base,KOPrefs::instance()->mMonthViewEvenColor); 
       mNonPrimaryPalette.setColor(QColorGroup::Background,KOPrefs::instance()->mMonthViewEvenColor); 
   }
@@ -915,58 +924,59 @@ void KOMonthView::showDates(const QDate &start, const QDate &)
     if (dayOfYear % 7 != 0)
       wno = dayOfYear / 7 + 1;
     else
       wno =dayOfYear / 7;
     mWeekLabels[i]->setWeekNum( wno );
     date = date.addDays( 7 );
   }
   updateView();
 }
 
 void KOMonthView::showEvents(QPtrList<Event>)
 {
     qDebug("KOMonthView::selectEvents is not implemented yet. ");
 }
 
 void KOMonthView::changeEventDisplay(Event *, int)
 {
   // this should be re-written to be much more efficient, but this
   // quick-and-dirty-hack gets the job done for right now.
   updateView();
 }
 
 void KOMonthView::updateView()
 {
-    static int iii = 0;
-    ++iii; 
     if ( !updatePossible )
         return;
-  uint i;
+    //qDebug("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ");
+    int i;
   for( i = 0; i < mCells.count(); ++i ) {
     mCells[i]->updateCell();
   }
+ 
   //qDebug("KOMonthView::updateView() ");
   processSelectionChange();
+  // qDebug("---------------------------------------------------------------------+ ");
 }
 
 void KOMonthView::resizeEvent(QResizeEvent * e)
 {
     computeLayout();
 }
 void KOMonthView::computeLayout()
 {
   // select the appropriate heading string size. E.g. "Wednesday" or "Wed".
   // note this only changes the text if the requested size crosses the
   // threshold between big enough to support the full name and not big
   // enough.
 
     int daysToShow = 7;
     bool combinedSatSun  = false;
     if (mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ) {
         daysToShow = 6;
         combinedSatSun  = true;
     }
     int tWid = topLevelWidget()->size().width();
     int tHei = topLevelWidget()->size().height();
 
     int wid = size().width();//e
     int hei = size().height()-1;
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index 727f511..a965bf3 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -126,48 +126,49 @@ class MonthViewCell : public QWidget
     Q_OBJECT
   public:
     MonthViewCell( KOMonthView * );
 
     void setDate( const QDate & );
     QDate date() const;
 
     void setPrimary( bool );
     bool isPrimary() const;
 
     void setHoliday( bool );
     void setHoliday( const QString & );
 
     void updateCell();
 
     void updateConfig();
 
     void enableScrollBars( bool );
 
     Incidence *selectedIncidence();
     QDate selectedIncidenceDate();
 
     void deselect();
     void select();
+    void clear();
 
 #ifdef DESKTOP_VERSION
     static QToolTipGroup *toolTipGroup(); 
 #endif
   signals:
     void defaultAction( Incidence * );
     void newEventSignal( QDateTime );
     void showDaySignal( QDate );
     
   protected:
     void resizeEvent( QResizeEvent * );
 
   protected slots:
     void defaultAction( QListBoxItem * );
     void contextMenu( QListBoxItem * );
     void selection( QListBoxItem * );
     void cellClicked( QListBoxItem * );
     void newEvent();
     void showDay();
     
   private:
     KOMonthView *mMonthView;
   
     QDate mDate;
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 00a5842..f6b7718 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -132,51 +132,52 @@ void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen )
  
     //mFlagShowNextxDays = false;
     //if(view == mCurrentView) return;  
     if ( view == 0 ) {
         view = mCurrentView;
         if ( view == 0 )
             return;
     }
     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();
-    raiseCurrentView( full );
+    //raiseCurrentView( full );
     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 {
         mMainView->navigatorBar()->hide();
     }
     if ( fullScreen ) {
         mMainView->leftFrame()->hide();
     } else {
         mMainView->leftFrame()->show();
         if ( KOPrefs::instance()->mVerticalScreen )  
             hei -= mMainView->leftFrame()->height();
         else
             wid -= mMainView->leftFrame()->width();