author | zautrix <zautrix> | 2005-03-19 12:41:09 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-19 12:41:09 (UTC) |
commit | 0aa5a7dce6ac1224395f7cb3fae488ba566f0e38 (patch) (side-by-side diff) | |
tree | b0950df228b2d9d2486977f7906ce4f0d9284cba | |
parent | ea9e00a1f70e9c3c855707213b51c6b6d43c330c (diff) | |
download | kdepimpi-0aa5a7dce6ac1224395f7cb3fae488ba566f0e38.zip kdepimpi-0aa5a7dce6ac1224395f7cb3fae488ba566f0e38.tar.gz kdepimpi-0aa5a7dce6ac1224395f7cb3fae488ba566f0e38.tar.bz2 |
agenda fixes
-rw-r--r-- | korganizer/koagendaview.cpp | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index d7ea4d4..e029fdb 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp @@ -258,50 +258,47 @@ void TimeLabels::paintEvent(QPaintEvent*) EventIndicator::EventIndicator(Location loc,QWidget *parent,const char *name) : QFrame(parent,name) { mColumns = 1; mTopBox = 0; mLocation = loc; mTopLayout = 0; mPaintWidget = 0; mXOffset = 0; if (mLocation == Top) mPixmap = SmallIcon("1uparrow"); else mPixmap = SmallIcon("1downarrow"); mEnabled.resize(mColumns); - if (mLocation == Top) - setMaximumHeight(0); - else setMinimumHeight(mPixmap.height()); } EventIndicator::~EventIndicator() { } void EventIndicator::drawContents(QPainter *p) { // kdDebug() << "======== top: " << contentsRect().top() << " bottom " << // contentsRect().bottom() << " left " << contentsRect().left() << " right " << contentsRect().right() << endl; KDGanttSplitterHandle* han = 0; if ( mPaintWidget ) han = mPaintWidget->firstHandle(); if ( ! han ) { int i; for(i=0;i<mColumns;++i) { if (mEnabled[i]) { int cellWidth = contentsRect().right()/mColumns; int xOffset = KOGlobals::self()->reverseLayout() ? - (mColumns - 1 - i)*cellWidth + cellWidth/2 -mPixmap.width()/2 : - i*cellWidth + cellWidth/2 -mPixmap.width()/2; - p->drawPixmap(QPoint(xOffset,0),mPixmap); + (mColumns - 1 - i)*cellWidth + (cellWidth -mPixmap.width())/2 : + i*cellWidth + (cellWidth -mPixmap.width()) /2; + p->drawPixmap(QPoint(1+xOffset,0),mPixmap); } } } else { han->repaint(); //mPaintWidget->setBackgroundColor( red ); QPainter pa( han ); int i; bool setColor = false; for(i=0;i<mColumns;++i) { if (mEnabled[i]) { setColor = true; @@ -319,24 +316,26 @@ void EventIndicator::drawContents(QPainter *p) pa.end(); } } void EventIndicator::setXOffset( int x ) { mXOffset = x; } void EventIndicator::setPaintWidget( KDGanttMinimizeSplitter * w ) { mPaintWidget = w; + setMaximumHeight(0); + setMinimumHeight(0); } void EventIndicator::changeColumns(int columns) { mColumns = columns; mEnabled.resize(mColumns); update(); } void EventIndicator::enableColumn(int column, bool enable) { mEnabled[column] = enable; @@ -401,37 +400,40 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) : // Create event context menu for all day agenda mAllDayAgendaPopup = eventPopup(); connect(mAllDayAgenda,SIGNAL(showIncidencePopupSignal(Incidence *)), mAllDayAgendaPopup,SLOT(showIncidencePopup(Incidence *))); // Create agenda frame 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); - +#ifndef DESKTOP_VERSION + // FIX + mEventIndicatorTop->setPaintWidget( mSplitterAgenda ); +#endif 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 ); + agendaLayout->addMultiCellWidget(mDayLabelsFrame ,0,0,0,2); + agendaLayout->addWidget(mEventIndicatorTop,1,1); + mEventIndicatorBottom = new EventIndicator(EventIndicator::Bottom, agendaFrame); agendaLayout->addWidget(mEventIndicatorBottom,3,1); QWidget *dummyAgendaRight = new QWidget(agendaFrame); - agendaLayout->addWidget(dummyAgendaRight,0,2); + agendaLayout->addWidget(dummyAgendaRight,1,2); // Create time labels mTimeLabels = new TimeLabels(24,agendaFrame); 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,2,2,1,2); agendaLayout->setColStretch(1,1); mAgenda->setFocusPolicy(NoFocus); |