summaryrefslogtreecommitdiffabout
path: root/korganizer
Unidiff
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) :
370 QBoxLayout *topLayout = new QVBoxLayout(this); 370 QBoxLayout *topLayout = new QVBoxLayout(this);
371 371
372 // Create day name labels for agenda columns 372 // Create day name labels for agenda columns
373 mDayLabelsFrame = new QHBox(this);
374 topLayout->addWidget(mDayLabelsFrame);
375 mDayLabels = new QFrame (mDayLabelsFrame);
376 mLayoutDayLabels = new QHBoxLayout(mDayLabels);
377 // Create agenda splitter 373 // Create agenda splitter
378#ifndef KORG_NOSPLITTER
379 mSplitterAgenda = new QSplitter(Vertical,this);
380 topLayout->addWidget(mSplitterAgenda);
381 mSplitterAgenda->setOpaqueResize();
382
383 mAllDayFrame = new QHBox(mSplitterAgenda);
384 374
385 QWidget *agendaFrame = new QWidget(mSplitterAgenda);
386#else
387#if 0
388 QWidget *mainBox = new QWidget( this );
389 topLayout->addWidget( mainBox );
390 QBoxLayout *mainLayout = new QVBoxLayout(mainBox);
391 mAllDayFrame = new QHBox(mainBox);
392 mainLayout->addWidget(mAllDayFrame);
393 mainLayout->setStretchFactor( mAllDayFrame, 0 );
394 mAllDayFrame->setFocusPolicy(NoFocus);
395 QWidget *agendaFrame = new QWidget(mainBox);
396 mainLayout->addWidget(agendaFrame);
397 mainLayout->setStretchFactor( agendaFrame, 10 );
398
399 agendaFrame->setFocusPolicy(NoFocus);
400#endif
401 mSplitterAgenda = new KDGanttMinimizeSplitter( Qt::Vertical, this); 375 mSplitterAgenda = new KDGanttMinimizeSplitter( Qt::Vertical, this);
402 mSplitterAgenda->setMinimizeDirection ( KDGanttMinimizeSplitter::Up ); 376 mSplitterAgenda->setMinimizeDirection ( KDGanttMinimizeSplitter::Up );
403 topLayout->addWidget( mSplitterAgenda ); 377 topLayout->addWidget( mSplitterAgenda );
@@ -405,9 +379,7 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
405 mAllDayFrame->setFocusPolicy(NoFocus); 379 mAllDayFrame->setFocusPolicy(NoFocus);
406 QWidget *agendaFrame = new QWidget(mSplitterAgenda); 380 QWidget *agendaFrame = new QWidget(mSplitterAgenda);
407 agendaFrame->setFocusPolicy(NoFocus); 381 agendaFrame->setFocusPolicy(NoFocus);
408 382
409#endif
410
411 // Create all-day agenda widget 383 // Create all-day agenda widget
412 mDummyAllDayLeft = new QVBox( mAllDayFrame ); 384 mDummyAllDayLeft = new QVBox( mAllDayFrame );
413 385
@@ -433,28 +405,34 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
433 mAllDayAgendaPopup,SLOT(showIncidencePopup(Incidence *))); 405 mAllDayAgendaPopup,SLOT(showIncidencePopup(Incidence *)));
434 406
435 // Create agenda frame 407 // Create agenda frame
436 QGridLayout *agendaLayout = new QGridLayout(agendaFrame,3,3); 408 QGridLayout *agendaLayout = new QGridLayout(agendaFrame,4,3);
437 // QHBox *agendaFrame = new QHBox(splitterAgenda); 409 // QHBox *agendaFrame = new QHBox(splitterAgenda);
438 410
439 // create event indicator bars 411 // create event indicator bars
440 mEventIndicatorTop = new EventIndicator(EventIndicator::Top,agendaFrame); 412 mEventIndicatorTop = new EventIndicator(EventIndicator::Top,agendaFrame);
441 agendaLayout->addWidget(mEventIndicatorTop,0,1); 413 agendaLayout->addWidget(mEventIndicatorTop,0,1);
414
415 mDayLabelsFrame = new QHBox(agendaFrame);
416 //topLayout->addWidget(mDayLabelsFrame);
417 mDayLabels = new QFrame (mDayLabelsFrame);
418 mLayoutDayLabels = new QHBoxLayout(mDayLabels);
419 agendaLayout->addMultiCellWidget(mDayLabelsFrame ,1,1,0,2);
442 mEventIndicatorTop->setPaintWidget( mSplitterAgenda ); 420 mEventIndicatorTop->setPaintWidget( mSplitterAgenda );
443 mEventIndicatorBottom = new EventIndicator(EventIndicator::Bottom, 421 mEventIndicatorBottom = new EventIndicator(EventIndicator::Bottom,
444 agendaFrame); 422 agendaFrame);
445 agendaLayout->addWidget(mEventIndicatorBottom,2,1); 423 agendaLayout->addWidget(mEventIndicatorBottom,3,1);
446 QWidget *dummyAgendaRight = new QWidget(agendaFrame); 424 QWidget *dummyAgendaRight = new QWidget(agendaFrame);
447 agendaLayout->addWidget(dummyAgendaRight,0,2); 425 agendaLayout->addWidget(dummyAgendaRight,0,2);
448 426
449 // Create time labels 427 // Create time labels
450 mTimeLabels = new TimeLabels(24,agendaFrame); 428 mTimeLabels = new TimeLabels(24,agendaFrame);
451 agendaLayout->addWidget(mTimeLabels,1,0); 429 agendaLayout->addWidget(mTimeLabels,2,0);
452 connect(mTimeLabels,SIGNAL( scaleChanged()), 430 connect(mTimeLabels,SIGNAL( scaleChanged()),
453 this,SLOT(updateConfig())); 431 this,SLOT(updateConfig()));
454 432
455 // Create agenda 433 // Create agenda
456 mAgenda = new KOAgenda(1,96,KOPrefs::instance()->mHourSize,agendaFrame); 434 mAgenda = new KOAgenda(1,96,KOPrefs::instance()->mHourSize,agendaFrame);
457 agendaLayout->addMultiCellWidget(mAgenda,1,1,1,2); 435 agendaLayout->addMultiCellWidget(mAgenda,2,2,1,2);
458 agendaLayout->setColStretch(1,1); 436 agendaLayout->setColStretch(1,1);
459 mAgenda->setFocusPolicy(NoFocus); 437 mAgenda->setFocusPolicy(NoFocus);
460 // Create event context menu for agenda 438 // Create event context menu for agenda