very good fix

2 files changed, 49 insertions, 27 deletions

diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index d3db89a..c8cef44 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -76,6 +76,8 @@ extern int globalFlagBlockAgendaItemUpdate;
 extern int globalFlagBlockLabel;
 using namespace KOrg;
 
+
+
 TimeLabels::TimeLabels(int rows,QWidget *parent,const char *name,WFlags f) :
     QScrollView(parent,name,f)
 {
@@ -609,34 +611,29 @@ void KOAgendaView::resizeEvent( QResizeEvent* e )
     //qDebug("resizeEvent end "); 
    
 }
-void KOAgendaView::slotDaylabelClicked()
+void KOAgendaView::slotDaylabelClicked( int num )
 {
-    QString cap = ((QPushButton*) sender() )->caption();
     
     QDate firstDate = mSelectedDates.first();
-    if ( cap == "0" )
+    if ( num == -1 )
         emit showDateView( 6, firstDate );
-    else if ( cap != "last" ) {
+    else if (num >= 0 ) {
         if ( mSelectedDates.count() == 1)
-            emit showDateView( 9, firstDate.addDays( cap.toInt()-1 ) );
+            emit showDateView( 9, firstDate.addDays( num ) );
         else
-            emit showDateView( 3, firstDate.addDays( cap.toInt()-1 ) );
+            emit showDateView( 3, firstDate.addDays( num ) );
     }
     else
         showDateView( 10, firstDate.addDays(1) );
 }
 
-QPushButton* KOAgendaView::getNewDaylabel()
+KOAgendaButton* KOAgendaView::getNewDaylabel()
 {
 
-    QPushButton * dayLabel = new QPushButton(mDayLabels);
-    dayLabel->setFlat( true );
-    connect( dayLabel, SIGNAL( clicked() ), this, SLOT ( slotDaylabelClicked() ) );
-    dayLabel->setFocusPolicy(NoFocus);
-    dayLabel->setSizePolicy(QSizePolicy( QSizePolicy::Expanding ,QSizePolicy::Expanding ));
+    KOAgendaButton * dayLabel = new KOAgendaButton(mDayLabels);
+    connect( dayLabel, SIGNAL( numClicked(int) ), this, SLOT ( slotDaylabelClicked(int) ) );
     mDayLabelsList.append( dayLabel );
     mLayoutDayLabels->addWidget(dayLabel);
-    //mLayoutDayLabels->setStretchFactor(dayLabel, 100);
     return dayLabel ;
 }
 
@@ -662,11 +659,11 @@ void KOAgendaView::createDayLabels()
     QFont dlf = KOPrefs::instance()->mTimeLabelsFont;
     QFontMetrics fm ( dlf );
     int selCount = mSelectedDates.count();
-    QString dayTest = "Won 20";
+    QString dayTest = "Mon 20";
     //QString dayTest = "Mon 20";
     int wid = fm.width( dayTest );
     //maxWid  -= ( selCount * 3 );  //working for QLabels
-    maxWid  -= ( selCount * 5 );  //working for QPushButton
+    maxWid  -= ( selCount * 3 );  //working for QPushButton
     if ( maxWid < 0 )
         maxWid = 20;
     int needWid = wid * selCount;
@@ -675,7 +672,7 @@ void KOAgendaView::createDayLabels()
     //  qDebug("DAYLABELS TOOOOOOO BIG ");
     while ( needWid > maxWid   ) {
         dayTest = dayTest.left( dayTest.length() - 1 );
-        wid = fm.width( dayTest )+1;
+        wid = fm.width( dayTest );
         needWid = wid * selCount;
     }
     int maxLen =  dayTest.length();
@@ -686,7 +683,7 @@ void KOAgendaView::createDayLabels()
             --fontPoint;
             dlf.setPointSize( fontPoint );
             QFontMetrics f( dlf );
-            wid = f.width( "30" )+3;
+            wid = f.width( "30" );
             needWid = wid * selCount;
             if ( needWid < maxWid )
                 break;
@@ -703,7 +700,7 @@ void KOAgendaView::createDayLabels()
     //mLayoutDayLabels->addSpacing( 2 );
     // QFont lFont = dlf;
     bool appendLabels = false;
-    QPushButton *dayLabel;
+    KOAgendaButton *dayLabel;
     dayLabel = mDayLabelsList.first();
     if ( !dayLabel  ) {
         appendLabels = true;
@@ -711,13 +708,13 @@ void KOAgendaView::createDayLabels()
     }
     dayLabel->setFixedWidth( mTimeLabels->width()+2  ); 
     dayLabel->setFont( dlf );
-    dayLabel->setCaption("0");
+    dayLabel->setNum( -1 );
     //dayLabel->setAlignment(QLabel::AlignHCenter);
     dayLabel->setText( KOGlobals::self()->calendarSystem()->monthName( mSelectedDates.first(), true ) );
     dayLabel->show();
     DateList::ConstIterator dit;
     bool oneday = (mSelectedDates.first() == mSelectedDates.last() );
-    int counter = 0;
+    int counter = -1;
     for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) {
         ++counter;
         QDate date = *dit;
@@ -731,10 +728,10 @@ void KOAgendaView::createDayLabels()
             dayLabel = getNewDaylabel();
         }
         dayLabel->setMinimumWidth( 1 );
-        dayLabel->setMaximumWidth( 2048 );
+        dayLabel->setMaximumWidth( 1024 );
         dayLabel->setFont( dlf );
         dayLabel->show();
-        dayLabel->setCaption(QString::number( counter ));
+        dayLabel->setNum( counter );
         QString str;
         int dW = KOGlobals::self()->calendarSystem()->dayOfWeek(date);
         QString dayName = KOGlobals::self()->calendarSystem()->weekDayName( dW, true );
@@ -824,7 +821,7 @@ void KOAgendaView::createDayLabels()
     dayLabel->setText(">");//QString::number ( mSelectedDates.first().month() ) );
     dayLabel->setFont( dlf );
     dayLabel->show();
-    dayLabel->setCaption("last");
+    dayLabel->setNum( -2 );
     dayLabel->setFixedWidth( mAgenda->verticalScrollBar()->width()+ offset );
     //qDebug("setToFixed %d ", mAgenda->verticalScrollBar()->width()+ offset+2);
     //mLayoutDayLabels->addSpacing(mAgenda->verticalScrollBar()->width()+ offset+2);
diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h
index cbe86b6..e9e85cc 100644
--- a/korganizer/koagendaview.h
+++ b/korganizer/koagendaview.h
@@ -25,6 +25,7 @@
 
 #include <qscrollview.h>
 #include <qdatetime.h>
+#include <qpushbutton.h>
 #include <qlayout.h>
 #ifndef DESKTOP_VERSION
 #include <qksplitter.h>
@@ -35,7 +36,6 @@
 
 #include "koeventview.h"
 
-
 class QHBox;
 class QFrame;
 class QLabel;
@@ -45,6 +45,31 @@ class KOAgenda;
 class KOAgendaItem;
 class KConfig;
 class KDGanttMinimizeSplitter;
+
+class KOAgendaButton : public QPushButton
+{
+ Q_OBJECT
+  public:
+    KOAgendaButton( QWidget *parent=0, const char *name=0 ) :
+      QPushButton( parent, name ) 
+    {
+        mNum = -3;
+        setFlat( true );
+        setFocusPolicy(NoFocus); 
+        setSizePolicy(QSizePolicy( QSizePolicy::Expanding ,QSizePolicy::Expanding ));
+        connect( this, SIGNAL( clicked() ), this, SLOT ( bClicked() ) );
+    };
+     
+    QSize sizeHint () const { return QSize( 5,5) ;}
+    void setNum( int n) { mNum = n; }
+private slots:
+    void bClicked() {emit numClicked( mNum);}
+signals:
+    void numClicked( int );
+private:
+    int mNum;
+};
+
 class TimeLabels : public QScrollView {
     Q_OBJECT
   public:
@@ -190,7 +215,7 @@ class KOAgendaView : public KOEventView {
     // void cloneIncidenceSignal(Incidence *);
 
   protected:
-    QPushButton* getNewDaylabel();
+    KOAgendaButton* getNewDaylabel();
     bool mBlockUpdating;
     int mUpcomingWidth;
     /** Fill agenda beginning with date startDate */
@@ -208,7 +233,7 @@ class KOAgendaView : public KOEventView {
     void setHolidayMasks();
 
   protected slots:
-    void slotDaylabelClicked();
+    void slotDaylabelClicked( int );
     /** Update event belonging to agenda item */
     void updateEventDates(KOAgendaItem *item, int mode = -1);
   //void updateMovedTodo();
@@ -254,7 +279,7 @@ class KOAgendaView : public KOEventView {
     
     QPixmap mExpandedPixmap;
     QPixmap mNotExpandedPixmap;
-    QPtrList<QPushButton> mDayLabelsList;
+    QPtrList<KOAgendaButton> mDayLabelsList;
     QDateTime mTimeSpanBegin;
     QDateTime mTimeSpanEnd;
     bool mTimeSpanInAllDay;