fixesss

3 files changed, 42 insertions, 55 deletions

diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index ffb2e1e..70cbf96 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -898,25 +898,32 @@ 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 ) ) );
         cell->updateConfig(KOPrefs::instance()->mMonthViewUsesBigFont );
     }
 
     //connect( mWeekLabels[mNumWeeks], SIGNAL( clicked() ), SLOT( switchView() ) );
     mContextMenu = eventPopup();
-    updateConfig(); //useless here
+    //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 ( mShowWeekView )
         mWidStack->raiseWidget( mWeekView );
     else
         mWidStack->raiseWidget( mMonthView );
 
     emit incidenceSelected( 0 );
 }
 
 KOMonthView::~KOMonthView()
@@ -998,25 +1005,24 @@ void KOMonthView::printPreview(CalPrinter *calPrinter, const QDate &fd,
 }
 
 void KOMonthView::updateConfig()
 {
  
     mWeekStartsMonday = KGlobal::locale()->weekStartsMonday();
 
     if ( mShowWeekView ) {
         mWeekStartsMonday = true;
     } 
     QFontMetrics fontmetric(mDayLabels[0]->font());
     mWidthLongDayLabel = 0;
-    qDebug("KOMonthView::updateConfig() ");
     for (int i = 0; i < 7; i++) {
         int width = fontmetric.width(KOGlobals::self()->calendarSystem()->weekDayName(i+1));
         if ( width > mWidthLongDayLabel ) mWidthLongDayLabel = width;
     }
     if ( !  mShowWeekView ) {
             computeLayout();
     }
     updateDayLabels();
     //qDebug("KOMonthView::updateConfig() %d %d %d ",height(), mDayLabels[0]->sizeHint().height() ,mNumWeeks);
     //int cellHeight = (height() - mDayLabels[0]->sizeHint().height()) /mNumWeeks;
     //resizeEvent( 0 );
     for (uint i = 0; i < mCells.count(); ++i) {
@@ -1027,31 +1033,25 @@ void KOMonthView::updateConfig()
         mCellsW[i]->updateConfig(KOPrefs::instance()->mMonthViewUsesBigFont);
     }
 #ifdef DESKTOP_VERSION
     MonthViewCell::toolTipGroup()->setEnabled(KOPrefs::instance()->mEnableToolTips); 
 #endif
     updateView();
 }
 
 void KOMonthView::updateDayLabels()
 {
   
     QPtrVector<QLabel> *mDayLabelsT;
-#if 0
-    if (mShowWeekView  ) 
-        mDayLabelsT = &mDayLabelsW;
-    else
-        mDayLabelsT = &mDayLabels;
-#endif
-    qDebug("updateDayLabels W %d  M %d ",mShortDayLabelsW ,mShortDayLabelsM);
+
     mDayLabelsT = &mDayLabelsW;
     for (int i = 0; i < 7; i++) {
         if (mWeekStartsMonday) {
             bool show = mShortDayLabelsW;
             if ( i > 4  && mWidthLongDayLabel > (*mDayLabelsT)[i]->width()  )
                 show = true;
             (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i+1,show));
         } else {
             if (i==0) (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabelsW));
             else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabelsW));
 
         }
@@ -1254,65 +1254,57 @@ void KOMonthView::updateView()
  
     //qDebug("KOMonthView::updateView() ");
     processSelectionChange();
     // qDebug("---------------------------------------------------------------------+ ");
     (*cells)[0]->setFocus();
 #endif
 
     //qDebug("update time %d ", ti.elapsed());
 }
 
 void KOMonthView::resizeEvent(QResizeEvent * e)
 {
-    qDebug("KOMonthView::resizeEvent %d %d -- %d %d ", e->size().width(), e->size().height(), e->oldSize().width(), e->oldSize().height());
+    //qDebug("KOMonthView::resizeEvent %d %d -- %d %d ", e->size().width(), e->size().height(), e->oldSize().width(), e->oldSize().height());
     if ( ignoreResizeEvent ) {
-        int diff =  e->size().height() - e->oldSize().height();
-        if ( diff < 0 )
-            diff = diff * (-1);
-        if (  diff == ignoreResizeEventHeight ) {
-            qDebug("KOMonthView::resizeEvent ignored ");
+        //qDebug("KOMonthView::resizeEvent ignored ");
             --ignoreResizeEvent;
             return;
         } 
-        ignoreResizeEvent = 0;
-    }
     if ( e->size().width()+ e->size().height() < 240 )
         return;
     computeLayout();
     clPending = true; 
     if ( mShowWeekView )
         mCellsW[0]->setFocus();
     else
         mCells[0]->setFocus();
 }
 void KOMonthView::computeLayoutWeek()
 {
-  
+    static int widd = 0;
+    static int heigg = 0;
+    if ( widd == width() && heigg == height () ) {
+        return;
+    }
+    widd = width() ;
+    heigg =  height ();
     int daysToShow;
-    int tWid = topLevelWidget()->size().width();
-    int tHei = topLevelWidget()->size().height();
-
     int wid = size().width();//e
     int hei = size().height()-1;
-
-    if ( ((wid *3)/2) < tWid && (( hei *3) /2) < tHei  ) 
-        return;
-
     if ( wid < hei )
         daysToShow = 2;
     else
         daysToShow = 3;
     bool combinedSatSun  = true;
         
-    //qDebug("KOMonthView::computeLayout()------------------------------------ ");
     QFontMetrics fm ( mWeekLabels[0]->font() );
     int weeklabelwid = fm.width( "888" );
     wid -= weeklabelwid;
 
     int colWid = wid / daysToShow;
     int lastCol = wid - ( colWid*6  ); 
     int dayLabelHei = mDayLabelsW[0]->sizeHint().height();
     int cellHei = (hei - (5- daysToShow )*dayLabelHei) /(5- daysToShow ); 
     int colModulo = wid % daysToShow;
     int rowModulo = (hei- (5- daysToShow )*dayLabelHei) % daysToShow-1;
     //qDebug("rowmod %d ", rowModulo);
     int i;
@@ -1371,59 +1363,68 @@ void KOMonthView::computeLayoutWeek()
                 
        
         x += w;
         if ( x + w/2 > wid ) {
             x = 0;
             y += h+dayLabelHei ;
         }
     }
     y= dayLabelHei;
     h = cellHei ;
     mWeekLabelsW[0]->setGeometry( 0,y,weeklabelwid,hei-dayLabelHei);
     mWeekLabelsW[1]->setGeometry( 0,0,weeklabelwid,dayLabelHei);
-    // qDebug("RRRRRRRRRRRRR %d %d  old %d %d", e->size().width(),e->size().height() , e->oldSize().width(),e->oldSize().height());
-    //qDebug("parent %d %d ", topLevelWidget()->size().width(), topLevelWidget()->size().height());
+  
     mShortDayLabelsW = mDayLabelsW[0]->width() < mWidthLongDayLabel ;
     updateDayLabels();
     bool forceUpdate = !updatePossible;
     updatePossible = true;
     //mWeekLabels[mNumWeeks]->setText( i18n("M"));
     if ( forceUpdate )
         updateView();
 }
 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 tWid = topLevelWidget()->size().width();
+    int tHei = topLevelWidget()->size().height();
+
+    int wid = size().width();//e
+    int hei = size().height()-1;
+
+    if ( ((wid *3)/2) < tWid && (( hei *3) /2) < tHei  ) 
+        return;
+
+    
     if ( mShowWeekView ){
             computeLayoutWeek();
             return;
     }
+    static int widd = 0;
+    static int heigg = 0;
+    if ( widd == width() && heigg == height () ) {
+        return;
+    }
+    widd = width() ;
+    heigg =  height ();
+
     int daysToShow = 7;
     bool combinedSatSun  = false;
     if (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;
-
-    if ( ((wid *3)/2) < tWid && (( hei *3) /2) < tHei  ) 
-        return;
-    //qDebug("KOMonthView::computeLayout()------------------------------------ ");
     QFontMetrics fm ( mWeekLabels[0]->font() );
     int weeklabelwid = fm.width( "888" );
     wid -= weeklabelwid;
 
     int colWid = wid / daysToShow;
     int lastCol = wid - ( colWid*6  ); 
     int dayLabelHei = mDayLabels[0]->sizeHint().height();
     int cellHei = (hei - dayLabelHei) /6; 
     int colModulo = wid % daysToShow;
     int rowModulo = (hei- dayLabelHei) % 6;
     //qDebug("rowmod %d ", rowModulo);
     int i;
@@ -1478,63 +1479,50 @@ void KOMonthView::computeLayout()
             y += h;
         }
     }
     y= dayLabelHei;
     h = cellHei ;
     for ( i = 0; i < 6; i++) {
         if ( i  == (6-rowModulo))
             ++h;
         mWeekLabels[i]->setGeometry( 0,y,weeklabelwid,h);
         y += h;                            
     }
     mWeekLabels[6]->setGeometry( 0,0,weeklabelwid,dayLabelHei);
-    // qDebug("RRRRRRRRRRRRR %d %d  old %d %d", e->size().width(),e->size().height() , e->oldSize().width(),e->oldSize().height());
-    //qDebug("parent %d %d ", topLevelWidget()->size().width(), topLevelWidget()->size().height());
     mShortDayLabelsM = mDayLabels[0]->width() < mWidthLongDayLabel ;
     qDebug("dlwid %d %d ",mDayLabels[0]->width() , mWidthLongDayLabel);
     updateDayLabels();
     bool forceUpdate = !updatePossible;
     updatePossible = true;
-    //mWeekLabels[mNumWeeks]->setText( i18n("W"));
     if ( forceUpdate )
         updateView();
 }
 
 void KOMonthView::showContextMenu( Incidence *incidence )
 {
     mContextMenu->showIncidencePopup(incidence);
-    /*
-      if( incidence && incidence->type() == "Event" ) {
-      Event *event = static_cast<Event *>(incidence);
-      mContextMenu->showEventPopup(event);
-      } else {
-      kdDebug() << "MonthView::showContextMenu(): cast failed." << endl;
-      }
-    */
+ 
 }
 MonthViewCell * KOMonthView::selectedCell( )
 {
     return mSelectedCell;
 }
 void KOMonthView::setSelectedCell( MonthViewCell *cell )
 {
-    //qDebug("KOMonthView::setSelectedCell %x ", cell);
     if ( mSelectedCell && mSelectedCell != cell ) {
         MonthViewCell * mvc = mSelectedCell;
         mSelectedCell = cell;
         mvc->deselect();
     } else 
         mSelectedCell = cell;
-    //  if ( mSelectedCell )
-    //         mSelectedCell->select();
     if ( !mSelectedCell )
         emit incidenceSelected( 0 );
     else 
         emit incidenceSelected( mSelectedCell->selectedIncidence() );
 }
 
 void KOMonthView::processSelectionChange()
 {
     QPtrList<Incidence> incidences = selectedIncidences();
     if (incidences.count() > 0) {
         emit incidenceSelected( incidences.first() );
     } else {
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index d70cda1..9dbe319 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -217,25 +217,25 @@ class KOMonthView: public KOEventView
     virtual int currentDateCount();
 
     /** returns the currently selected events */
     virtual QPtrList<Incidence> selectedIncidences();
 
     /** returns dates of the currently selected events */
     virtual DateList selectedDates();
 
     virtual void printPreview(CalPrinter *calPrinter,
                               const QDate &, const QDate &);
     bool isMonthView() { return true; }
     bool isUpdatePossible() { return updatePossible; }
-    void setIgnoreResizeEvent( int c, int h ) {  ignoreResizeEvent = c ;ignoreResizeEventHeight = h;}
+    void setIgnoreResizeEvent( int c ) {  ignoreResizeEvent = c ;}
 
     MonthViewCell * selectedCell();
   public slots:
     virtual void updateView();
     virtual void updateConfig();
     virtual void showDates(const QDate &start, const QDate &end);
     virtual void showEvents(QPtrList<Event> eventList);
 
     void changeEventDisplay(Event *, int);
 
     void clearSelection();
 
@@ -251,25 +251,24 @@ class KOMonthView: public KOEventView
     void nextMonth();
     void prevMonth();
     void showNavigator( bool );
     void selectWeekNum ( int );
     void showDaySignal( QDate );
   protected:
     void resizeEvent(QResizeEvent *);
     void viewChanged();
     void updateDayLabels();
 
   private:
     int ignoreResizeEvent;
-    int ignoreResizeEventHeight;
     int currentWeek();
     bool clPending;
     QWidgetStack * mWidStack;
     QWidget* mMonthView;
     QWidget* mWeekView;
     bool mShowWeekView;
     bool updatePossible;
     int mDaysPerWeek;
     int mNumWeeks;
     int mNumCells;
     bool mWeekStartsMonday;
     void computeLayout();
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index c35de0a..62d3e7f 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -191,49 +191,49 @@ void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen )
     //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 {
+        if ( view == mMonthView && mMonthView)
+            mMonthView->setIgnoreResizeEvent( 1 ); 
         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 );
     mMainView->processIncidenceSelection( 0 );
     //mMainView->updateView();
     raiseCurrentView( full, true );
     mMainView->adaptNavigationUnits();
 }
 
 void KOViewManager::raiseCurrentView( bool fullScreen, bool callUpdateView  )
 {
     mCurrentAgendaView = 0;
     int wid =  mMainView->width() ;
     int hei  = mMainView->height();
     if ( mCurrentView == mMonthView   ) { 
         if ( true /* !KOPrefs::instance()->mMonthViewWeek*/ ) {
-            
-            mMonthView->setIgnoreResizeEvent( 2 ,mMainView->navigatorBar()->height()); 
             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 )