5 files changed, 46 insertions, 43 deletions

diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp
index cd78f54..ce66863 100644
--- a/korganizer/koeditorgeneraltodo.cpp
+++ b/korganizer/koeditorgeneraltodo.cpp
@@ -160,8 +160,11 @@ void KOEditorGeneralTodo::initCompletion(QWidget *parent, QBoxLayout *topLayout)
   mCompletedCombo->setSizePolicy( QSizePolicy( QSizePolicy::Preferred,QSizePolicy::Preferred) );
   mCompletedLabel->setSizePolicy( QSizePolicy( QSizePolicy::Expanding,QSizePolicy::Preferred) );
 
-  if (  QApplication::desktop()->width() < 320 ) {
-      mCompleteDateEdit->setMaximumWidth( 85 );
+  if (  QApplication::desktop()->width() <= 480 ) {
+      if (  QApplication::desktop()->width() < 320 )
+          mCompleteDateEdit->setMaximumWidth( 85 );
+      else
+          mCompleteDateEdit->setMaximumWidth( 130 );
       topLayout->setSpacing( 0 );
   }
 }
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index 2faf18f..de11c13 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -421,7 +421,7 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
     formatReadOnly(event);
     formatAttendees(event);
     if ( event->relatedTo() ) {
-        addTag("b",i18n("Parent todo: "));
+        addTag("b",i18n("Parent todo:<br>"));
         mText.append(event->relatedTo()->summary()+" [" +QString::number(event->relatedTo()->priority()) + "/" + QString::number(((Todo*)event->relatedTo())->percentComplete())+"%] <br>");
     }
     QPtrList<Incidence> Relations = event->relations();
@@ -534,11 +534,11 @@ void KOEventViewer::formatAttendees(Incidence *event)
                 if (iconPath) {
                     mText += "<a href=\"mailto:" + a->name() +" <" + a->email() + ">:" + mMailSubject + "\">";
                     if ( a->RSVP() ) {
-                        ++a_count;
+                        ++a_count_nr;
                         mText += "<IMG src=\"" + iconPath + "\">";
                     }
                     else {
-                    ++a_count_nr;
+                        ++a_count;
                         mText += "<IMG src=\"" + NOiconPath + "\">";
                     }
                     mText += "</a>\n";
@@ -550,7 +550,7 @@ void KOEventViewer::formatAttendees(Incidence *event)
                 mText +="(" + a->roleStr().left(1) + ".)";
         }
         mText.append("</li></ul>");
-        if ( a_count > 1 ) {
+        if ( (a_count+a_count_nr) > 1 ) {
                 mText += "<a href=\"mailto:ALL\">";
                 mText += i18n( "Mail to all" );
                 mText += "</a> ( ";
@@ -566,7 +566,7 @@ void KOEventViewer::formatAttendees(Incidence *event)
                 mText += i18n( "Mail to selected" );
                 mText += "</a> ( ";
                 mText += i18n( "<IMG src=\"%1\"> only )").arg ( iconPath );
-                mText += "\n";
+                mText += "<br>\n";
         }
     }
 
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 65accdc..5926abe 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -795,9 +795,11 @@ void MonthViewCell::selection( QListBoxItem *item )
 KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
     : KOEventView( calendar, parent, name ),
       mDaysPerWeek( 7 ), mNumWeeks( 6 ), mNumCells( mDaysPerWeek * mNumWeeks ),
-      mShortDayLabels( false ), mWidthLongDayLabel( 0 ), mSelectedCell( 0 )
+      mWidthLongDayLabel( 0 ), mSelectedCell( 0 )
 {
- 
+    ignoreResizeEvent = 0;
+    mShortDayLabelsW = false;
+    mShortDayLabelsM = false;
     clPending = true;
     mWidStack = new QWidgetStack( this );
     QHBoxLayout* hb = new QHBoxLayout( this );
@@ -817,7 +819,6 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
         mWeekStartsMonday = true;
     updatePossible = false;
     mCells.setAutoDelete( true );
-    mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ;
     mDayLabels.resize( mDaysPerWeek );
     mDayLabelsW.resize( mDaysPerWeek );
     QFont bfont = font();
@@ -906,14 +907,10 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
 
     //connect( mWeekLabels[mNumWeeks], SIGNAL( clicked() ), SLOT( switchView() ) );
     mContextMenu = eventPopup();
-    // updateConfig(); //useless here
+    updateConfig(); //useless here
 
     //mWeekLabels[mNumWeeks]->setText( i18n("W"));
-#if 0
-    mWidStack = new QWidgetStack( this );
-    mMonthView = new QWidget( mWidStack );
-    mWeekView = new QWidget( mWidStack );
-#endif
+
     if ( mShowWeekView )
         mWidStack->raiseWidget( mWeekView );
     else
@@ -1010,15 +1007,12 @@ void KOMonthView::updateConfig()
     } 
     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;
     }
-    bool temp = mShowSatSunComp ;
-    mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ;
     if ( !  mShowWeekView ) {
-        if ( temp != KOPrefs::instance()->mMonthViewSatSunTog )
             computeLayout();
     }
     updateDayLabels();
@@ -1048,30 +1042,30 @@ void KOMonthView::updateDayLabels()
     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 = mShortDayLabels;
-            if ( i > 4 && mShowSatSunComp && mWidthLongDayLabel > (*mDayLabelsT)[i]->width()  )
+            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,mShortDayLabels));
-            else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabels));
+            if (i==0) (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabelsW));
+            else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabelsW));
 
         }
     }
     mDayLabelsT = &mDayLabels;
     for (int i = 0; i < 7; i++) {
         if (mWeekStartsMonday) {
-            bool show = mShortDayLabels;
-            if ( i > 4 && mShowSatSunComp && mWidthLongDayLabel > (*mDayLabelsT)[i]->width()  )
+            bool show = mShortDayLabelsM;
+            if ( i > 4 && KOPrefs::instance()->mMonthViewSatSunTog && 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,mShortDayLabels));
-            else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabels));
+            if (i==0) (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabelsM));
+            else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabelsM));
 
         }
     }
@@ -1269,6 +1263,14 @@ void KOMonthView::updateView()
 
 void KOMonthView::resizeEvent(QResizeEvent * e)
 {
+    qDebug("KOMonthView::resizeEvent %d %d -- %d %d ", e->size().width(), e->size().height(), e->oldSize().width(), e->oldSize().height());
+    if ( ignoreResizeEvent ) {
+        qDebug("KOMonthView::resizeEvent ignored ");
+        --ignoreResizeEvent;
+        return;
+    }
+    if ( e->size().width()+ e->size().height() < 240 )
+        return;
     computeLayout();
     clPending = true; 
     if ( mShowWeekView )
@@ -1280,11 +1282,6 @@ void KOMonthView::computeLayoutWeek()
 {
   
     int daysToShow;
-    bool combinedSatSun  = false;
-    if (mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ) {
-        daysToShow = 6;
-        combinedSatSun  = true;
-    }
     int tWid = topLevelWidget()->size().width();
     int tHei = topLevelWidget()->size().height();
 
@@ -1298,8 +1295,7 @@ void KOMonthView::computeLayoutWeek()
         daysToShow = 2;
     else
         daysToShow = 3;
-    mShowSatSunComp = true;
-    combinedSatSun  = true;
+    bool combinedSatSun  = true;
         
     //qDebug("KOMonthView::computeLayout()------------------------------------ ");
     QFontMetrics fm ( mWeekLabels[0]->font() );
@@ -1380,7 +1376,7 @@ void KOMonthView::computeLayoutWeek()
     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());
-    mShortDayLabels = mDayLabelsW[0]->width() < mWidthLongDayLabel ;
+    mShortDayLabelsW = mDayLabelsW[0]->width() < mWidthLongDayLabel ;
     updateDayLabels();
     bool forceUpdate = !updatePossible;
     updatePossible = true;
@@ -1400,7 +1396,7 @@ void KOMonthView::computeLayout()
     }
     int daysToShow = 7;
     bool combinedSatSun  = false;
-    if (mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ) {
+    if (KOPrefs::instance()->mMonthViewSatSunTog ) {
         daysToShow = 6;
         combinedSatSun  = true;
     }
@@ -1487,7 +1483,8 @@ void KOMonthView::computeLayout()
     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());
-    mShortDayLabels = mDayLabels[0]->width() < mWidthLongDayLabel ;
+    mShortDayLabelsM = mDayLabels[0]->width() < mWidthLongDayLabel ;
+    qDebug("dlwid %d %d ",mDayLabels[0]->width() , mWidthLongDayLabel);
     updateDayLabels();
     bool forceUpdate = !updatePossible;
     updatePossible = true;
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index 51eb9e6..9dbe319 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -226,6 +226,7 @@ class KOMonthView: public KOEventView
                               const QDate &, const QDate &);
     bool isMonthView() { return true; }
     bool isUpdatePossible() { return updatePossible; }
+    void setIgnoreResizeEvent( int c ) {  ignoreResizeEvent = c ;}
 
     MonthViewCell * selectedCell();
   public slots:
@@ -258,6 +259,7 @@ class KOMonthView: public KOEventView
     void updateDayLabels();
 
   private:
+    int ignoreResizeEvent;
     int currentWeek();
     bool clPending;
     QWidgetStack * mWidStack;
@@ -269,7 +271,6 @@ class KOMonthView: public KOEventView
     int mNumWeeks;
     int mNumCells;
     bool mWeekStartsMonday;
-    bool mShowSatSunComp;
     void computeLayout();
     void computeLayoutWeek();
 
@@ -280,7 +281,8 @@ class KOMonthView: public KOEventView
     QPtrVector<QLabel> mDayLabelsW;
     QPtrVector<KOWeekButton> mWeekLabelsW;
 
-    bool mShortDayLabels;
+    bool mShortDayLabelsM;
+    bool mShortDayLabelsW;
     int mWidthLongDayLabel;
 
     QDate mStartDate;
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index a74c5fe..dcb51dc 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -122,7 +122,7 @@ void KOViewManager::showDateView( int view, QDate date)
         mCurrentAgendaView = 14 ;
         mMainView->dateNavigator()->selectDates( date, 14);
     } else if (view == 6 ) {
-        mMainView->dateNavigator()->selectDates( date, 7 );
+        //mMainView->dateNavigator()->selectDates( date, 7 );
         showMonthView();
     } else if (view == 7 ) {
         mMainView->dateNavigator()->selectDate( date );
@@ -223,6 +223,7 @@ void KOViewManager::raiseCurrentView( bool fullScreen, bool callUpdateView  )
     int hei  = mMainView->height();
     if ( mCurrentView == mMonthView   ) { 
         if ( true /* !KOPrefs::instance()->mMonthViewWeek*/ ) {
+            mMonthView->setIgnoreResizeEvent( 2 ); 
             mMainView->navigatorBar()->show();
             hei -= mMainView->navigatorBar()->sizeHint().height();
         }
@@ -491,7 +492,7 @@ bool KOViewManager::showsNextDays()
     return mFlagShowNextxDays;
 }
 void KOViewManager::showMonthView()
-{
+ {
     if (!mMonthView) {
         mMonthView = new KOMonthView(mMainView->calendar(), mMainView->viewStack(), "KOViewManager::MonthView");