2 files changed, 45 insertions, 3 deletions

diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index c018dc7..f8301f8 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -423,22 +423,22 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
     mExpandButton->setFixedSize( widebut, widebut);
     connect( mExpandButton, SIGNAL( clicked() ), SIGNAL( toggleExpand() ) );
     mExpandButton->setFocusPolicy(NoFocus);
     mAllDayAgenda = new KOAgenda(1,mAllDayFrame);
     mAllDayAgenda->setFocusPolicy(NoFocus);
     QVBox *dummyAllDayRight = new QVBox(mAllDayFrame);
 
     QPushButton *dummyAllDayRightB = new QPushButton(dummyAllDayRight);
-    QLabel * dummyAllDayRightL = new QLabel ( dummyAllDayRight );
+    mDummyAllDayRightL = new QLabel ( dummyAllDayRight );
 
     dummyAllDayRightB->setFlat( true );
     dummyAllDayRightB->setFocusPolicy(NoFocus); 
     // dummyAllDayRightB->setSizePolicy(QSizePolicy( QSizePolicy::Expanding ,QSizePolicy::Expanding ));
-    //dummyAllDayRightB->setFixedHeight(  dummyAllDayRightB->sizeHint().height()/2 );
+    dummyAllDayRightB->setFixedHeight( (dummyAllDayRightB->sizeHint().height()/4)*3 );
     QPopupMenu * wpo = new QPopupMenu (this);
     wpo->insertItem( i18n("W#"), 0 );
     int i;
     for ( i = 1; i < 53; i++ )
         wpo->insertItem( QString::number( i ),i );
     //Qt bug - we must add some empty fields...
     for ( i = 53; i < 54; ++i ) {
         wpo->insertItem( "", 52 );
@@ -573,16 +573,29 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
              SLOT( updateConfig( ) ) );  
     connect( mAgenda, SIGNAL( addToCalSignal(Incidence *, Incidence *) ),
              SLOT( addToCalSlot(Incidence *, Incidence * ) ) );  
     connect( mAllDayAgenda, SIGNAL( addToCalSignal(Incidence * ,Incidence *) ),
              SLOT( addToCalSlot(Incidence * , Incidence *) ) );  
     // connect( mAgenda, SIGNAL( cloneIncidenceSignal(Incidence *) ), SIGNAL( cloneIncidenceSignal(Incidence *) ) );
     //connect( mAllDayAgenda, SIGNAL( cloneIncidenceSignal(Incidence *) ), SIGNAL( cloneIncidenceSignal(Incidence *) ) );
 
+    QFont dlf = KOPrefs::instance()->mTimeLabelsFont;
+    QFontMetrics fm ( dlf );
+    QString dayTest = "30";
+    int wid = fm.width( dayTest );
+    int maxWid  = dummyAllDayRight->width(); 
+    int fontPoint = dlf.pointSize();
+    while ( wid > maxWid ) {
+        --fontPoint;
+        dlf.setPointSize( fontPoint );
+        QFontMetrics f( dlf );
+        wid = f.width( dayTest );
+    }
+    mDummyAllDayRightL->setFont( dlf );
 
 }
 
 void KOAgendaView::toggleAllDay()
 {
     if ( mSplitterAgenda->firstHandle() ) 
         mSplitterAgenda->firstHandle()->toggle();
 }
@@ -913,17 +926,18 @@ void KOAgendaView::updateView()
 /*
   Update configuration settings for the agenda view. This method is not
   complete.
 */
 void KOAgendaView::updateConfig()
 {
     if ( mBlockUpdating )
         return;
-    //  kdDebug() << "KOAgendaView::updateConfig()" << endl;
+
+    
 
     // update config for children
     mTimeLabels->updateConfig();
     mAgenda->storePosition();
     mAgenda->updateConfig();
     mAllDayAgenda->updateConfig();
     // widget synchronization
     //TODO: find a better way, maybe signal/slot
@@ -1079,16 +1093,43 @@ void KOAgendaView::fillAgenda()
     //if ( globalFlagBlockAgenda == 2 )
     //globalFlagBlockAgenda = 0;
     // globalFlagBlockPainting = false;
     if ( globalFlagBlockAgenda == 0 )
         globalFlagBlockAgenda = 1;
     //  clearView();
     //qDebug("fillAgenda()++++ ");
     globalFlagBlockAgendaItemPaint = 1;
+
+    int weekNum = 0;
+    QDate seda = mSelectedDates.first();
+    QDate d = QDate ( seda.year(), 1,1);
+    seda = seda.addDays( 1-seda.dayOfWeek() );//we are on monday
+    if ( seda.addDays(6).year() != seda.year()  ) {
+        if ( seda.year() != d.year() ) {
+            if ( d.dayOfWeek() > 4 )
+                d = QDate ( seda.year(), 1,1);
+            else
+                weekNum = 1;
+        } else {
+            QDate dd( seda.year()+1, 1,1);
+            if ( dd.dayOfWeek() <= 4 )
+                weekNum = 1;
+        }
+    }
+    if ( weekNum == 0 ){
+        int dow = d.dayOfWeek();
+        if ( dow <= 4 )
+            d = d.addDays( 1-dow );
+        else // 5,6,7
+            d = d.addDays( 8-dow );
+        // we have the first week of the year.we are on monday
+        weekNum =  d.daysTo( seda ) / 7 +1;
+    }
+    mDummyAllDayRightL->setText( QString::number( weekNum) );
     mAllDayAgenda->changeColumns(mSelectedDates.count());
     mAgenda->changeColumns(mSelectedDates.count());
     qApp->processEvents(); 
     mEventIndicatorTop->changeColumns(mSelectedDates.count());
     mEventIndicatorBottom->changeColumns(mSelectedDates.count());
     setHolidayMasks();
 
     //mAgenda->hideUnused();
diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h
index 4a058ce..ba9bc93 100644
--- a/korganizer/koagendaview.h
+++ b/korganizer/koagendaview.h
@@ -211,16 +211,17 @@ class KOAgendaView : public KOEventView {
     void newTodoSignal( QDateTime ,bool );
     void toggleExpand();
     void selectWeekNum( int );
     void todoMoved( Todo *, int );
     void incidenceChanged(Incidence * , int );
     // void cloneIncidenceSignal(Incidence *);
 
   protected:
+    QLabel * mDummyAllDayRightL;
     KOAgendaButton* getNewDaylabel();
     bool mBlockUpdating;
     int mUpcomingWidth;
     /** Fill agenda beginning with date startDate */
     void fillAgenda(const QDate &startDate);
     void resizeEvent( QResizeEvent* e );
     /** Fill agenda using the current set value for the start date */
     void fillAgenda();