author | waspe <waspe> | 2003-11-03 18:29:32 (UTC) |
---|---|---|
committer | waspe <waspe> | 2003-11-03 18:29:32 (UTC) |
commit | 3a7d9b9ed8f9cf9c7e3d02f9239f327b2b652b0c (patch) (unidiff) | |
tree | 96119aac19a49850a221d34f3152fa12b0a86a46 /core/pim/datebook/datebookweek.cpp | |
parent | 87a9d6badcf518ffd14559ef886ff7729b63b73b (diff) | |
download | opie-3a7d9b9ed8f9cf9c7e3d02f9239f327b2b652b0c.zip opie-3a7d9b9ed8f9cf9c7e3d02f9239f327b2b652b0c.tar.gz opie-3a7d9b9ed8f9cf9c7e3d02f9239f327b2b652b0c.tar.bz2 |
remove merge conflict
Diffstat (limited to 'core/pim/datebook/datebookweek.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/datebook/datebookweek.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/core/pim/datebook/datebookweek.cpp b/core/pim/datebook/datebookweek.cpp index dad1c3f..8435132 100644 --- a/core/pim/datebook/datebookweek.cpp +++ b/core/pim/datebook/datebookweek.cpp | |||
@@ -304,28 +304,40 @@ void DateBookWeekView::drawContents( QPainter *p, int cx, int cy, int cw, int ch | |||
304 | DateBookWeekItem *i = it.current(); | 304 | DateBookWeekItem *i = it.current(); |
305 | if ( i->geometry().intersects( ur ) ) { | 305 | if ( i->geometry().intersects( ur ) ) { |
306 | p->setBrush( i->color() ); | 306 | p->setBrush( i->color() ); |
307 | p->drawRect( i->geometry() ); | 307 | p->drawRect( i->geometry() ); |
308 | } | 308 | } |
309 | } | 309 | } |
310 | } | 310 | } |
311 | 311 | ||
312 | void DateBookWeekView::resizeEvent( QResizeEvent *e ) | 312 | void DateBookWeekView::resizeEvent( QResizeEvent *e ) |
313 | { | 313 | { |
314 | const int hourWidth = 20; | 314 | const int hourWidth = 20; |
315 | QScrollView::resizeEvent( e ); | 315 | QScrollView::resizeEvent( e ); |
316 | |||
317 | #warning check the geometry i have choosen BRANCH_1_0 (waspe) | ||
318 | |||
319 | //HEAD | ||
320 | /* | ||
316 | int avail = visibleWidth(); | 321 | int avail = visibleWidth(); |
317 | header->setGeometry( leftMargin()+frameWidth()+frameRect().left() , frameWidth(), | 322 | header->setGeometry( leftMargin()+frameWidth()+frameRect().left() , frameWidth(), |
318 | visibleWidth(), header->sizeHint().height() ); | 323 | visibleWidth(), header->sizeHint().height() ); |
319 | setMargins( 0, header->sizeHint().height(), 0, 0 ); | 324 | setMargins( 0, header->sizeHint().height(), 0, 0 ); |
325 | */ | ||
326 | //BRANCH_1_0 | ||
327 | int avail = width()-qApp->style().scrollBarExtent().width()-1; | ||
328 | header->setGeometry( 0, 0, avail, header->sizeHint().height() ); | ||
329 | setMargins( 0, header->height(), 0, 0 ); | ||
330 | |||
331 | |||
320 | header->resizeSection( 0, hourWidth ); | 332 | header->resizeSection( 0, hourWidth ); |
321 | int sw = (avail - hourWidth) / 7; | 333 | int sw = (avail - hourWidth) / 7; |
322 | for ( int i = 1; i < 7; i++ ) | 334 | for ( int i = 1; i < 7; i++ ) |
323 | header->resizeSection( i, sw ); | 335 | header->resizeSection( i, sw ); |
324 | header->resizeSection( 7, avail - hourWidth - sw*6 ); | 336 | header->resizeSection( 7, avail - hourWidth - sw*6 ); |
325 | } | 337 | } |
326 | 338 | ||
327 | void DateBookWeekView::setStartOfWeek( bool bStartOnMonday ) | 339 | void DateBookWeekView::setStartOfWeek( bool bStartOnMonday ) |
328 | { | 340 | { |
329 | bOnMonday = bStartOnMonday; | 341 | bOnMonday = bStartOnMonday; |
330 | initNames(); | 342 | initNames(); |
331 | } | 343 | } |
@@ -365,25 +377,25 @@ DateBookWeek::DateBookWeek( bool ap, bool startOnMonday, DateBookDB *newDB, | |||
365 | } | 377 | } |
366 | 378 | ||
367 | void DateBookWeek::keyPressEvent(QKeyEvent *e) | 379 | void DateBookWeek::keyPressEvent(QKeyEvent *e) |
368 | { | 380 | { |
369 | switch(e->key()) { | 381 | switch(e->key()) { |
370 | case Key_Up: | 382 | case Key_Up: |
371 | view->scrollBy(0, -20); | 383 | view->scrollBy(0, -20); |
372 | break; | 384 | break; |
373 | case Key_Down: | 385 | case Key_Down: |
374 | view->scrollBy(0, 20); | 386 | view->scrollBy(0, 20); |
375 | break; | 387 | break; |
376 | case Key_Left: | 388 | case Key_Left: |
377 | setDate(date().addDays(-7)); | 389 | setDate(date().addDays(-7)); |
378 | break; | 390 | break; |
379 | case Key_Right: | 391 | case Key_Right: |
380 | setDate(date().addDays(7)); | 392 | setDate(date().addDays(7)); |
381 | break; | 393 | break; |
382 | default: | 394 | default: |
383 | e->ignore(); | 395 | e->ignore(); |
384 | } | 396 | } |
385 | } | 397 | } |
386 | 398 | ||
387 | void DateBookWeek::showDay( int day ) | 399 | void DateBookWeek::showDay( int day ) |
388 | { | 400 | { |
389 | QDate d=bdate; | 401 | QDate d=bdate; |