fixes

1 files changed, 21 insertions, 20 deletions

diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index aa36553..8c27c43 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -627,2 +627,17 @@ void KOAgendaView::slotDaylabelClicked()
 }
+
+QPushButton* 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 ));
+    mDayLabelsList.append( dayLabel );
+    mLayoutDayLabels->addWidget(dayLabel);
+    //mLayoutDayLabels->setStretchFactor(dayLabel, 100);
+    return dayLabel ;
+}
+
 void KOAgendaView::createDayLabels()
@@ -651,3 +666,4 @@ void KOAgendaView::createDayLabels()
     int wid = fm.width( dayTest );
-    maxWid  -= ( selCount * 3 );  
+    //maxWid  -= ( selCount * 3 );  //working for QLabels
+    maxWid  -= ( selCount * 5 );  //working for QPushButton
     if ( maxWid < 0 )
@@ -671,3 +687,3 @@ void KOAgendaView::createDayLabels()
             QFontMetrics f( dlf );
-            wid = f.width( "20" );
+            wid = f.width( "20" )+2;
             needWid = wid * selCount;
@@ -692,8 +708,3 @@ void KOAgendaView::createDayLabels()
         appendLabels = true;
-        dayLabel = new QPushButton(mDayLabels);
-        dayLabel->setFlat( true );
-        connect( dayLabel, SIGNAL( clicked() ), this, SLOT ( slotDaylabelClicked() ) );
-        dayLabel->setFocusPolicy(NoFocus);
-        mDayLabelsList.append( dayLabel );
-        mLayoutDayLabels->addWidget(dayLabel);
+        dayLabel = getNewDaylabel();
     }
@@ -718,8 +729,3 @@ void KOAgendaView::createDayLabels()
         if ( appendLabels ) {
-            dayLabel = new QPushButton(mDayLabels);
-            dayLabel->setFlat( true );
-            connect( dayLabel, SIGNAL( clicked() ), this, SLOT ( slotDaylabelClicked() ) );
-            dayLabel->setFocusPolicy(NoFocus);
-            mDayLabelsList.append( dayLabel );
-            mLayoutDayLabels->addWidget(dayLabel);
+            dayLabel = getNewDaylabel();
         }
@@ -809,8 +815,3 @@ void KOAgendaView::createDayLabels()
     if ( appendLabels ) {
-        dayLabel = new QPushButton(mDayLabels);
-        dayLabel->setFlat( true );
-        connect( dayLabel, SIGNAL( clicked() ), this, SLOT ( slotDaylabelClicked() ) );
-        dayLabel->setFocusPolicy(NoFocus);
-        mDayLabelsList.append( dayLabel );
-        mLayoutDayLabels->addWidget(dayLabel);
+        dayLabel = getNewDaylabel();
     }