daylables moved down

1 files changed, 10 insertions, 32 deletions

diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 8448a4c..d7ea4d4 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -372,30 +372,4 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
     // Create day name labels for agenda columns
-    mDayLabelsFrame = new QHBox(this);
-    topLayout->addWidget(mDayLabelsFrame);
-    mDayLabels = new QFrame (mDayLabelsFrame);
-    mLayoutDayLabels = new QHBoxLayout(mDayLabels);
     // Create agenda splitter
-#ifndef KORG_NOSPLITTER
-    mSplitterAgenda = new QSplitter(Vertical,this);
-    topLayout->addWidget(mSplitterAgenda);
-    mSplitterAgenda->setOpaqueResize();
-  
-    mAllDayFrame = new QHBox(mSplitterAgenda);
-
-    QWidget *agendaFrame = new QWidget(mSplitterAgenda);
-#else
-#if 0
-    QWidget *mainBox = new QWidget( this );
-    topLayout->addWidget( mainBox );
-    QBoxLayout *mainLayout = new QVBoxLayout(mainBox);
-    mAllDayFrame = new QHBox(mainBox);
-    mainLayout->addWidget(mAllDayFrame);
-    mainLayout->setStretchFactor( mAllDayFrame, 0 );
-    mAllDayFrame->setFocusPolicy(NoFocus);
-    QWidget *agendaFrame = new QWidget(mainBox);
-    mainLayout->addWidget(agendaFrame);
-    mainLayout->setStretchFactor( agendaFrame, 10 );
 
-    agendaFrame->setFocusPolicy(NoFocus);
-#endif
     mSplitterAgenda = new KDGanttMinimizeSplitter( Qt::Vertical, this);
@@ -408,4 +382,2 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
     
-#endif
-
     // Create all-day agenda widget
@@ -435,3 +407,3 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
     // Create agenda frame
-    QGridLayout *agendaLayout = new QGridLayout(agendaFrame,3,3);
+    QGridLayout *agendaLayout = new QGridLayout(agendaFrame,4,3);
     //  QHBox *agendaFrame = new QHBox(splitterAgenda);
@@ -441,2 +413,8 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
     agendaLayout->addWidget(mEventIndicatorTop,0,1);
+
+    mDayLabelsFrame = new QHBox(agendaFrame);
+    //topLayout->addWidget(mDayLabelsFrame);
+    mDayLabels = new QFrame (mDayLabelsFrame);
+    mLayoutDayLabels = new QHBoxLayout(mDayLabels);
+    agendaLayout->addMultiCellWidget(mDayLabelsFrame ,1,1,0,2);
     mEventIndicatorTop->setPaintWidget( mSplitterAgenda );
@@ -444,3 +422,3 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
                                                agendaFrame);
-    agendaLayout->addWidget(mEventIndicatorBottom,2,1);
+    agendaLayout->addWidget(mEventIndicatorBottom,3,1);
     QWidget *dummyAgendaRight = new QWidget(agendaFrame);
@@ -450,3 +428,3 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
     mTimeLabels = new TimeLabels(24,agendaFrame);
-    agendaLayout->addWidget(mTimeLabels,1,0);
+    agendaLayout->addWidget(mTimeLabels,2,0);
     connect(mTimeLabels,SIGNAL( scaleChanged()),
@@ -456,3 +434,3 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
     mAgenda = new KOAgenda(1,96,KOPrefs::instance()->mHourSize,agendaFrame);
-    agendaLayout->addMultiCellWidget(mAgenda,1,1,1,2);
+    agendaLayout->addMultiCellWidget(mAgenda,2,2,1,2);
     agendaLayout->setColStretch(1,1);