summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-03-19 12:41:09 (UTC)
committer zautrix <zautrix>2005-03-19 12:41:09 (UTC)
commit0aa5a7dce6ac1224395f7cb3fae488ba566f0e38 (patch) (side-by-side diff)
treeb0950df228b2d9d2486977f7906ce4f0d9284cba
parentea9e00a1f70e9c3c855707213b51c6b6d43c330c (diff)
downloadkdepimpi-0aa5a7dce6ac1224395f7cb3fae488ba566f0e38.zip
kdepimpi-0aa5a7dce6ac1224395f7cb3fae488ba566f0e38.tar.gz
kdepimpi-0aa5a7dce6ac1224395f7cb3fae488ba566f0e38.tar.bz2
agenda fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koagendaview.cpp26
1 files changed, 14 insertions, 12 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index d7ea4d4..e029fdb 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -267,10 +267,7 @@ EventIndicator::EventIndicator(Location loc,QWidget *parent,const char *name)
if (mLocation == Top) mPixmap = SmallIcon("1uparrow");
else mPixmap = SmallIcon("1downarrow");
mEnabled.resize(mColumns);
- if (mLocation == Top)
- setMaximumHeight(0);
- else
- setMinimumHeight(mPixmap.height());
+ setMinimumHeight(mPixmap.height());
}
EventIndicator::~EventIndicator()
@@ -290,9 +287,9 @@ void EventIndicator::drawContents(QPainter *p)
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 {
@@ -328,6 +325,8 @@ void EventIndicator::setXOffset( int x )
void EventIndicator::setPaintWidget( KDGanttMinimizeSplitter * w )
{
mPaintWidget = w;
+ setMaximumHeight(0);
+ setMinimumHeight(0);
}
void EventIndicator::changeColumns(int columns)
{
@@ -410,19 +409,22 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
// 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);