summaryrefslogtreecommitdiffabout
path: root/korganizer
Side-by-side diff
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koagendaview.cpp44
1 files changed, 11 insertions, 33 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 8448a4c..d7ea4d4 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -370,34 +370,8 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
QBoxLayout *topLayout = new QVBoxLayout(this);
// 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);
mSplitterAgenda->setMinimizeDirection ( KDGanttMinimizeSplitter::Up );
topLayout->addWidget( mSplitterAgenda );
@@ -405,9 +379,7 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
mAllDayFrame->setFocusPolicy(NoFocus);
QWidget *agendaFrame = new QWidget(mSplitterAgenda);
agendaFrame->setFocusPolicy(NoFocus);
-
-#endif
-
+
// Create all-day agenda widget
mDummyAllDayLeft = new QVBox( mAllDayFrame );
@@ -433,28 +405,34 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
mAllDayAgendaPopup,SLOT(showIncidencePopup(Incidence *)));
// Create agenda frame
- QGridLayout *agendaLayout = new QGridLayout(agendaFrame,3,3);
+ QGridLayout *agendaLayout = new QGridLayout(agendaFrame,4,3);
// QHBox *agendaFrame = new QHBox(splitterAgenda);
// create event indicator bars
mEventIndicatorTop = new EventIndicator(EventIndicator::Top,agendaFrame);
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 );
mEventIndicatorBottom = new EventIndicator(EventIndicator::Bottom,
agendaFrame);
- agendaLayout->addWidget(mEventIndicatorBottom,2,1);
+ agendaLayout->addWidget(mEventIndicatorBottom,3,1);
QWidget *dummyAgendaRight = new QWidget(agendaFrame);
agendaLayout->addWidget(dummyAgendaRight,0,2);
// Create time labels
mTimeLabels = new TimeLabels(24,agendaFrame);
- agendaLayout->addWidget(mTimeLabels,1,0);
+ agendaLayout->addWidget(mTimeLabels,2,0);
connect(mTimeLabels,SIGNAL( scaleChanged()),
this,SLOT(updateConfig()));
// Create agenda
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);
mAgenda->setFocusPolicy(NoFocus);
// Create event context menu for agenda