File r893464.diff of Package kdepim4

Subject: korganizer:
fix alignment of day labels to main matrix
From: wstephenson@suse.de
Bug: 
Patch-upstream: 893464
--- korganizer/koagendaview.cpp	(revision 893463)
+++ korganizer/koagendaview.cpp	(revision 893464)
@@ -173,6 +173,7 @@ KOAgendaView::KOAgendaView( Calendar *ca
   mTimeBarHeaderFrame = new KHBox( mAllDayFrame );
 
   // The widget itself
+  QWidget *dummyAllDayLeft = new QWidget( mAllDayFrame );
   mAllDayAgenda = new KOAgenda( 1, mAllDayFrame );
   QWidget *dummyAllDayRight = new QWidget( mAllDayFrame );
 
@@ -237,6 +238,9 @@ KOAgendaView::KOAgendaView( Calendar *ca
   }
 
   updateTimeBarWidth();
+  // resize dummy widget so the allday agenda lines up with the hourly agenda
+  dummyAllDayLeft->setFixedWidth( mTimeLabelsZone->width() - mTimeBarHeaderFrame->width() );
+
 
   /* Update widgets to reflect user preferences */
 //  updateConfig();
@@ -359,7 +363,7 @@ void KOAgendaView::zoomInHorizontally( c
   if( !dateToZoom.isValid() ) {
     if ( ndays > 1 ) {
       newBegin = begin.addDays(1);
-      count = ndays-1;
+      count = ndays - 1;
       emit zoomViewHorizontally ( newBegin, count );
     }
   } else {
@@ -386,15 +390,15 @@ void KOAgendaView::zoomOutHorizontally(
 
   // zoom with Action and are there a selected Incidence?, Yes, I zoom out to it.
   if ( ! dateToZoom.isValid () ) {
-    dateToZoom=mAgenda->selectedIncidenceDate();
+    dateToZoom = mAgenda->selectedIncidenceDate();
   }
 
   if ( !dateToZoom.isValid() ) {
     newBegin = begin.addDays( -1 );
-    count = ndays+3 ;
+    count = ndays + 3 ;
   } else {
     newBegin = dateToZoom.addDays( -ndays / 2 - 1 );
-    count = ndays+3;
+    count = ndays + 3;
   }
 
   if ( abs( count ) >= 31 ) {
@@ -450,11 +454,15 @@ void KOAgendaView::createDayLabels()
   delete mBottomDayLabels;
 
   mDayLabels = new QFrame ( mDayLabelsFrame );
+  mDayLabelsFrame->setStretchFactor( mDayLabels, 1 );
   mLayoutDayLabels = new QHBoxLayout( mDayLabels );
   mLayoutDayLabels->setMargin( 0 );
+  // this spacer moves the day labels over to line up with the day columns
+  QSpacerItem *spacer =
+    new QSpacerItem( mTimeLabelsZone->timeLabelsWidth(), 1, QSizePolicy::Fixed );
+  mLayoutDayLabels->addSpacerItem( spacer );
   KVBox *weekLabelBox = new KVBox( mDayLabels );
   mLayoutDayLabels->addWidget( weekLabelBox );
-  weekLabelBox->setFixedWidth( mTimeLabelsZone->width() - mAgendaLayout->horizontalSpacing() );
   if ( mIsSideBySide ) {
     weekLabelBox->hide();
   }
@@ -465,8 +473,6 @@ void KOAgendaView::createDayLabels()
   mLayoutBottomDayLabels->setMargin( 0 );
   KVBox *bottomWeekLabelBox = new KVBox( mBottomDayLabels );
   mLayoutBottomDayLabels->addWidget( bottomWeekLabelBox );
-  bottomWeekLabelBox->setFixedWidth( mTimeLabelsZone->width() -
-                                     mAgendaLayout->horizontalSpacing() );
 
   const KCalendarSystem *calsys = KOGlobals::self()->calendarSystem();
 
Index: korganizer/koagendaview.cpp
===================================================================