fixi

7 files changed, 174 insertions, 17 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index cca73f2..be78057 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -3854,6 +3854,11 @@ NavigatorBar *CalendarView::navigatorBar()
 {
     return mNavigatorBar;
 }
+void CalendarView::showNavigatorBar( bool  b)
+{
+    if ( b ) mNavigatorBar->show();
+    else  mNavigatorBar->hide();
+}
 
 
 
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index 7c59a8d..6ea8287 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -174,6 +174,7 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
 
 
   public slots:
+    void showNavigatorBar(bool);
     void showOpenError();
     void watchSavedFile();
     void recheckTimerAlarm();
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 6411156..9888566 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -465,6 +465,13 @@ void MonthViewCell::insertEvent(Event *event)
                     prefix ="<-" ;
                 }
             }
+            if ( !event->doesFloat() ) {
+                if ( mDate == event->dtStart().date () )
+                    prefix += KGlobal::locale()->formatTime(event->dtStart().time())+" ";
+                else if ( mDate == event->dtEnd().date () )
+                    prefix += KGlobal::locale()->formatTime(event->dtEnd().time())+" ";
+
+            }
             text = prefix + event->summary();
             mToolTip += text;
         } else {
@@ -567,12 +574,12 @@ void MonthViewCell::finishUpdateCell()
     if (mToolTip != "")
         QToolTip::add(this,mToolTip,toolTipGroup(),"");
 #endif
- 
+    mItemList->sort();
     //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) { 
+    if ( KOPrefs::instance()->mMonthViewWeek || 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) );
@@ -688,10 +695,10 @@ void MonthViewCell::resizeEvent ( QResizeEvent * )
         return;
     }
 #endif
-    int size = height() - mLabel->height();
+    int size = height() - mLabel->height() - 2;
     if ( size > 0 )
         mItemList->verticalScrollBar()->setMaximumHeight( size );
-    size = width() - mLabel->width();
+    size = width() - mLabel->width() -2;
     if ( size > 0 )
         mItemList->horizontalScrollBar()->setMaximumWidth( size );
     mLabel->move( width()-mItemList->lineWidth() - mLabel->width(), height()-mItemList->lineWidth() - mLabel->height() );
@@ -732,7 +739,7 @@ void MonthViewCell::cellClicked( QListBoxItem *item )
     */
  
     mMonthView->setSelectedCell( this );
-    if( KOPrefs::instance()->mEnableMonthScroll ) enableScrollBars( true );
+    if( KOPrefs::instance()->mEnableMonthScroll || KOPrefs::instance()->mMonthViewWeek ) enableScrollBars( true );
     select();
 }
 
@@ -763,7 +770,10 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
       mDaysPerWeek( 7 ), mNumWeeks( 6 ), mNumCells( mDaysPerWeek * mNumWeeks ),
       mShortDayLabels( false ), mWidthLongDayLabel( 0 ), mSelectedCell( 0 )
 {
-
+    mWeekStartsMonday = KGlobal::locale()->weekStartsMonday();
+    mShowWeekView = KOPrefs::instance()->mMonthViewWeek;
+    if ( mShowWeekView )
+        mWeekStartsMonday = true;
     updatePossible = false;
     mCells.setAutoDelete( true );
     mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ;
@@ -817,6 +827,8 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
         }
     }
 
+    connect( mWeekLabels[mNumWeeks], SIGNAL( clicked() ),
+                     SLOT( switchView() ) );
     mContextMenu = eventPopup();
     // updateConfig(); //useless here
 
@@ -827,6 +839,14 @@ KOMonthView::~KOMonthView()
 {
     delete mContextMenu;
 }
+void KOMonthView::switchView()
+{
+    mShowWeekView = !mShowWeekView;
+    KOPrefs::instance()->mMonthViewWeek = mShowWeekView;
+    emit showNavigator( !mShowWeekView );
+    computeLayout();
+    updateConfig();
+}
 
 int KOMonthView::maxDatesHint()
 {
@@ -875,6 +895,8 @@ void KOMonthView::updateConfig()
  
     mWeekStartsMonday = KGlobal::locale()->weekStartsMonday();
 
+    if ( mShowWeekView )
+        mWeekStartsMonday = true;
     QFontMetrics fontmetric(mDayLabels[0]->font());
     mWidthLongDayLabel = 0;
 
@@ -980,7 +1002,10 @@ void KOMonthView::updateView()
     //ti.start();
 #if 1
     int i;
-    for( i = 0; i < mCells.count(); ++i ) {
+    int timeSpan = mCells.size()-1;
+    if ( KOPrefs::instance()->mMonthViewWeek )         
+        timeSpan = 6;
+    for( i = 0; i < timeSpan + 1; ++i ) {
         mCells[i]->startUpdateCell();
     }
  
@@ -988,7 +1013,6 @@ void KOMonthView::updateView()
     Event *event;
     QDateTime dt;
     bool ok;
-    int timeSpan = mCells.size()-1;
     QDate endDate =  mStartDate.addDays( timeSpan );
     for( event = events.first(); event; event = events.next() ) { // for event
         if ( event->doesRecur() ) {
@@ -1053,13 +1077,13 @@ void KOMonthView::updateView()
         //insertTodo( todo );
         if ( todo->hasDueDate() ) {
             int day = mStartDate.daysTo( todo->dtDue().date() );
-            if ( day >= 0 && day < mCells.size() ) {
+            if ( day >= 0 && day < timeSpan + 1)  {
                 mCells[day]->insertTodo( todo );
             }
         }
     }
 
-    for( i = 0; i < mCells.count(); ++i ) {
+    for( i = 0; i < timeSpan+1; ++i ) {
         mCells[i]->finishUpdateCell();
     }
     processSelectionChange();
@@ -1088,13 +1112,126 @@ void KOMonthView::resizeEvent(QResizeEvent * e)
     computeLayout();
     mCells[0]->setFocus();
 }
+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();
+
+    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;
+    mShowSatSunComp = true;
+    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 = mDayLabels[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;
+    int x,y,w,h;
+    x= 0;
+    y= 0;
+    w = colWid;
+    h = dayLabelHei ;
+    for ( i = 0; i < 7; i++) {
+        if ( i && !( i % daysToShow) && i < 6) {
+            y += hei/(5-daysToShow);
+            x = 0;
+        }
+        if ( i == daysToShow-colModulo )
+            ++w;
+        if ( i >=  5 ) {
+            mDayLabels[i]->setGeometry( x+weeklabelwid,y,w/2,h);
+            x -= w/2 ;
+        }
+        else
+            mDayLabels[i]->setGeometry( x+weeklabelwid,y,w,h);
+        x += w;                                   
+    }
+    x= 0;
+    y= dayLabelHei;
+    w = colWid;
+    h = cellHei;
+    for ( i = 0; i < mCells.count(); ++i) {
+        if ( i > 6 ) {
+            mCells[i]->hide();
+            continue;
+        }
+        
+        w = colWid;
+        if ( ((i) % daysToShow) >= daysToShow-colModulo ) {
+            ++w;
+        }
+        if ( i  == (daysToShow-1-rowModulo)*7)
+            ++h; 
+      
+        if ( i >= 5 ) {
+            if ( i ==5 ) {
+                mCells[i]->setGeometry ( x+weeklabelwid,y,w,h/2 ); 
+                x -= w ;y += h/2;
+            } else {
+                mCells[i]->setGeometry ( x+weeklabelwid,y,w,h-h/2 ); 
+                y -= h/2;
+            }
+        } else
+            mCells[i]->setGeometry ( x+weeklabelwid,y,w,h ); 
+                
+       
+        x += w;
+        if ( x + w/2 > wid ) {
+            x = 0;
+            y += h+dayLabelHei ;
+        }
+    }
+    y= dayLabelHei;
+    h = cellHei ;
+    mWeekLabels[0]->setGeometry( 0,y,weeklabelwid,hei-dayLabelHei);
+    for ( i = 1; i < 6; i++) {
+        mWeekLabels[i]->hide();        
+    }
+    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 ;
+    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.
-
+    if ( mShowWeekView ){
+            computeLayoutWeek();
+            return;
+    }
     int daysToShow = 7;
     bool combinedSatSun  = false;
     if (mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ) {
@@ -1146,7 +1283,7 @@ void KOMonthView::computeLayout()
     w = colWid;
     h = cellHei ;
     for ( i = 0; i < mCells.count(); ++i) {
-        
+        mCells[i]->show();
         w = colWid;
         if ( ((i) % 7) >= 7-colModulo ) {
             ++w;
@@ -1177,6 +1314,7 @@ void KOMonthView::computeLayout()
     y= dayLabelHei;
     h = cellHei ;
     for ( i = 0; i < 6; i++) {
+        mWeekLabels[i]->show();
         if ( i  == (6-rowModulo))
             ++h;
         mWeekLabels[i]->setGeometry( 0,y,weeklabelwid,h);
@@ -1189,6 +1327,7 @@ void KOMonthView::computeLayout()
     updateDayLabels();
     bool forceUpdate = !updatePossible;
     updatePossible = true;
+    mWeekLabels[mNumWeeks]->setText( i18n("W"));
     if ( forceUpdate )
         updateView();
 }
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index b84065e..0bc3743 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -240,10 +240,12 @@ class KOMonthView: public KOEventView
     void setSelectedCell( MonthViewCell * );
 
   protected slots:
+    void switchView();
     void processSelectionChange();
  signals:
     void nextMonth();
     void prevMonth();
+    void showNavigator( bool );
   void selectWeekNum ( int );
   void showDaySignal( QDate );
   protected:
@@ -252,6 +254,7 @@ class KOMonthView: public KOEventView
     void updateDayLabels();
 
   private:
+    bool mShowWeekView;
     bool updatePossible;
     int mDaysPerWeek;
     int mNumWeeks;
@@ -259,6 +262,7 @@ class KOMonthView: public KOEventView
     bool mWeekStartsMonday;
     bool mShowSatSunComp;
     void computeLayout();
+    void computeLayoutWeek();
 
     QPtrVector<MonthViewCell> mCells;
     QPtrVector<QLabel> mDayLabels;
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 0548f14..2fb7c36 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -207,6 +207,7 @@ KOPrefs::KOPrefs() :
   addItemColor("MonthViewHolidayColor",&mMonthViewHolidayColor,QColor( 255,160,160 ));
   addItemBool("MonthViewUsesDayColors",&mMonthViewUsesDayColors,true); 
   addItemBool("MonthViewSatSunTog",&mMonthViewSatSunTog,true);
+  addItemBool("MonthViewWeek",&mMonthViewWeek,false);
   addItemBool("HightlightDateTimeEdit",&mHightlightDateTimeEdit,false); 
   addItemColor("AppColor1",&mAppColor1,QColor( 130,170,255 ));
   addItemColor("AppColor2",&mAppColor2,QColor(  174,216,255 ));
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index 8b849fa..6541af2 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -133,6 +133,7 @@ class KOPrefs : public KPimPrefs
     QColor  mMonthViewHolidayColor;
     bool mMonthViewUsesDayColors;
     bool mMonthViewSatSunTog;
+    bool mMonthViewWeek;
     QColor  mAppColor1;
     QColor  mAppColor2;
     bool mUseAppColors;
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 7e126d9..6afd203 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -224,9 +224,11 @@ void KOViewManager::raiseCurrentView( bool fullScreen, bool callUpdateView  )
     mCurrentAgendaView = 0;
     int wid =  mMainView->width() ;
     int hei  = mMainView->height();
-    if ( mCurrentView == mMonthView   ) {
-        mMainView->navigatorBar()->show();
-        hei -= mMainView->navigatorBar()->sizeHint().height();
+    if ( mCurrentView == mMonthView   ) { 
+        if ( !KOPrefs::instance()->mMonthViewWeek ) {
+            mMainView->navigatorBar()->show();
+            hei -= mMainView->navigatorBar()->sizeHint().height();
+        }
         //mMainView->navigatorBar()->hide();
     } else {
         mMainView->navigatorBar()->hide();
@@ -527,13 +529,17 @@ void KOViewManager::showMonthView()
                  mMainView->navigatorBar(), SIGNAL(goNextMonth() ) );
         connect( mMonthView, SIGNAL(prevMonth() ),
                  mMainView->navigatorBar(), SIGNAL(goPrevMonth() ) );
-        mMonthView->updateConfig();
+        connect( mMonthView, SIGNAL( showNavigator(bool) ),
+                 mMainView, SLOT ( showNavigatorBar(bool) ) );
     }
 
     globalFlagBlockAgenda = 1;
     //mFlagShowNextxDays = false;
     // if(mMonthView == mCurrentView) return;
-    mMainView->dateNavigator()->selectMonth();
+    if ( KOPrefs::instance()->mMonthViewWeek )
+        mMainView->dateNavigator()->selectWeek();
+    else
+        mMainView->dateNavigator()->selectMonth();
 
     showView(mMonthView, true );