-rw-r--r-- | korganizer/komonthview.cpp | 226 |
1 files changed, 161 insertions, 65 deletions
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 050bfb9..38cfda7 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp | |||
@@ -196,2 +196,3 @@ MonthViewItem::MonthViewItem( Incidence *incidence, QDate qd, const QString & s) | |||
196 | { | 196 | { |
197 | mblockRepaint = true; | ||
197 | setText( s ); | 198 | setText( s ); |
@@ -204,2 +205,15 @@ MonthViewItem::MonthViewItem( Incidence *incidence, QDate qd, const QString & s) | |||
204 | mInfo = false; | 205 | mInfo = false; |
206 | //qDebug("NEWWWWWWWWWWWWW "); | ||
207 | } | ||
208 | void MonthViewItem::recycle( Incidence *incidence, QDate qd, const QString & s) | ||
209 | { | ||
210 | setText( s ); | ||
211 | mMultiday = 0; | ||
212 | mIncidence = incidence; | ||
213 | mDate = qd; | ||
214 | mRecur = false; | ||
215 | mAlarm = false; | ||
216 | mReply = false; | ||
217 | mInfo = false; | ||
218 | //qDebug("recucleeeeeeeeeeeeeeeee "); | ||
205 | } | 219 | } |
@@ -208,2 +222,7 @@ void MonthViewItem::paint(QPainter *p) | |||
208 | { | 222 | { |
223 | if ( mblockRepaint ) { | ||
224 | //qDebug("block "); | ||
225 | return; | ||
226 | } | ||
227 | //qDebug("NON block "); | ||
209 | #if QT_VERSION >= 0x030000 | 228 | #if QT_VERSION >= 0x030000 |
@@ -355,3 +374,3 @@ int MonthViewItem::width(const QListBox *lb) const | |||
355 | MonthViewCell::MonthViewCell( KOMonthView *parent,QWidget* par ) | 374 | MonthViewCell::MonthViewCell( KOMonthView *parent,QWidget* par ) |
356 | : QWidget( par ), | 375 | : KNoScrollListBox( par ), |
357 | mMonthView( parent ) | 376 | mMonthView( parent ) |
@@ -359,4 +378,5 @@ MonthViewCell::MonthViewCell( KOMonthView *parent,QWidget* par ) | |||
359 | 378 | ||
379 | mCurrentAvailItem = 0; | ||
360 | //QVBoxLayout *topLayout = new QVBoxLayout( this ); | 380 | //QVBoxLayout *topLayout = new QVBoxLayout( this ); |
361 | 381 | currentPalette = 0; | |
362 | // mLabel = new QLabel( this );QPushButton | 382 | // mLabel = new QLabel( this );QPushButton |
@@ -368,6 +388,6 @@ MonthViewCell::MonthViewCell( KOMonthView *parent,QWidget* par ) | |||
368 | mLabel->setFocusPolicy(NoFocus); | 388 | mLabel->setFocusPolicy(NoFocus); |
369 | mItemList = new KNoScrollListBox( this ); | 389 | //mItemList = new KNoScrollListBox( this ); |
370 | mItemList->setMinimumSize( 10, 10 ); | 390 | setMinimumSize( 10, 10 ); |
371 | mItemList->setFrameStyle( QFrame::Panel | QFrame::Plain ); | 391 | setFrameStyle( QFrame::Panel | QFrame::Plain ); |
372 | mItemList->setLineWidth( 1 ); | 392 | setLineWidth( 1 ); |
373 | //topLayout->addWidget( mItemList ); | 393 | //topLayout->addWidget( mItemList ); |
@@ -382,12 +402,12 @@ MonthViewCell::MonthViewCell( KOMonthView *parent,QWidget* par ) | |||
382 | connect( mLabel, SIGNAL( clicked( )), SLOT( showDay() )); | 402 | connect( mLabel, SIGNAL( clicked( )), SLOT( showDay() )); |
383 | connect( mItemList, SIGNAL( doubleClicked( QListBoxItem *) ), | 403 | connect( this , SIGNAL( doubleClicked( QListBoxItem *) ), |
384 | SLOT( defaultAction( QListBoxItem * ) ) ); | 404 | SLOT( defaultAction( QListBoxItem * ) ) ); |
385 | connect( mItemList, SIGNAL( rightButtonPressed( QListBoxItem *, | 405 | connect( this, SIGNAL( rightButtonPressed( QListBoxItem *, |
386 | const QPoint &) ), | 406 | const QPoint &) ), |
387 | SLOT( contextMenu( QListBoxItem * ) ) ); | 407 | SLOT( contextMenu( QListBoxItem * ) ) ); |
388 | connect( mItemList, SIGNAL( highlighted( QListBoxItem *) ), | 408 | connect( this, SIGNAL( highlighted( QListBoxItem *) ), |
389 | SLOT( selection( QListBoxItem * ) ) ); | 409 | SLOT( selection( QListBoxItem * ) ) ); |
390 | connect( mItemList, SIGNAL( clicked( QListBoxItem * ) ), | 410 | connect( this, SIGNAL( clicked( QListBoxItem * ) ), |
391 | SLOT( cellClicked( QListBoxItem * ) ) ); | 411 | SLOT( cellClicked( QListBoxItem * ) ) ); |
392 | connect( mItemList, SIGNAL( clicked( QListBoxItem * ) ), | 412 | connect( this, SIGNAL( clicked( QListBoxItem * ) ), |
393 | SLOT( selection( QListBoxItem * ) ) ); | 413 | SLOT( selection( QListBoxItem * ) ) ); |
@@ -424,13 +444,24 @@ void MonthViewCell::setMyPalette() | |||
424 | { | 444 | { |
425 | 445 | ||
426 | if ( mHoliday) { | 446 | if ( mHoliday) { |
447 | if ( currentPalette == 1 ) return; | ||
427 | mLabel->setPalette( QPalette ( mHolidayPalette.color( QPalette::Normal,QColorGroup::Base),mHolidayPalette.color(QPalette::Normal,QColorGroup::Base ) )); | 448 | mLabel->setPalette( QPalette ( mHolidayPalette.color( QPalette::Normal,QColorGroup::Base),mHolidayPalette.color(QPalette::Normal,QColorGroup::Base ) )); |
428 | mItemList->setPalette( mHolidayPalette ); | 449 | setPalette( mHolidayPalette ); |
450 | //mLabel->setPalette( mHolidayPalette ); | ||
451 | currentPalette = 1; | ||
452 | |||
429 | } else { | 453 | } else { |
430 | if ( mPrimary ) { | 454 | if ( mPrimary ) { |
455 | if ( currentPalette == 2 ) return; | ||
431 | mLabel->setPalette( QPalette ( mPrimaryPalette.color( QPalette::Normal,QColorGroup::Base),mPrimaryPalette.color(QPalette::Normal,QColorGroup::Base ) )); | 456 | mLabel->setPalette( QPalette ( mPrimaryPalette.color( QPalette::Normal,QColorGroup::Base),mPrimaryPalette.color(QPalette::Normal,QColorGroup::Base ) )); |
432 | mItemList->setPalette( mPrimaryPalette ); | 457 | //mLabel->setPalette( mPrimaryPalette ); |
458 | setPalette( mPrimaryPalette ); | ||
459 | currentPalette = 2; | ||
460 | |||
433 | } else { | 461 | } else { |
434 | mItemList->setPalette( mNonPrimaryPalette ); | 462 | if ( currentPalette == 3 ) return; |
435 | mLabel->setPalette( QPalette ( mNonPrimaryPalette.color( QPalette::Normal,QColorGroup::Base),mNonPrimaryPalette.color(QPalette::Normal,QColorGroup::Base ) )); | 463 | setPalette( mNonPrimaryPalette ); |
464 | mLabel->setPalette( QPalette ( mNonPrimaryPalette.color( QPalette::Normal,QColorGroup::Base),mNonPrimaryPalette.color(QPalette::Normal,QColorGroup::Base ) )); | ||
465 | //mLabel->setPalette( mNonPrimaryPalette );; | ||
466 | currentPalette = 3; | ||
436 | } | 467 | } |
@@ -473,8 +504,2 @@ void MonthViewCell::setHoliday( const QString &holiday ) | |||
473 | } | 504 | } |
474 | void MonthViewCell::keyPressEvent ( QKeyEvent * e ) | ||
475 | { | ||
476 | |||
477 | e->ignore(); | ||
478 | |||
479 | } | ||
480 | 505 | ||
@@ -483,6 +508,10 @@ void MonthViewCell::startUpdateCell() | |||
483 | 508 | ||
484 | mItemList->setFocusPolicy(NoFocus); | 509 | setFocusPolicy(NoFocus); |
485 | if ( !mMonthView->isUpdatePossible() ) | 510 | if ( !mMonthView->isUpdatePossible() ) |
486 | return; | 511 | return; |
487 | 512 | MonthViewItem *mitem = (MonthViewItem*) firstItem (); | |
513 | while ( mitem ) { | ||
514 | mitem->setBlockRepaint( true ); | ||
515 | mitem = (MonthViewItem *)mitem->next(); | ||
516 | } | ||
488 | /* | 517 | /* |
@@ -496,7 +525,8 @@ void MonthViewCell::startUpdateCell() | |||
496 | if ( mDate == QDate::currentDate() ) { | 525 | if ( mDate == QDate::currentDate() ) { |
497 | mItemList->setLineWidth( 3 ); | 526 | setLineWidth( 3 ); |
498 | } else { | 527 | } else { |
499 | mItemList->setLineWidth( 1 ); | 528 | setLineWidth( 1 ); |
500 | } | 529 | } |
501 | mItemList->clear(); | 530 | mCurrentAvailItem = (MonthViewItem*) firstItem (); |
531 | //clear(); | ||
502 | 532 | ||
@@ -507,2 +537,3 @@ void MonthViewCell::startUpdateCell() | |||
507 | //qApp->processEvents(); | 537 | //qApp->processEvents(); |
538 | #if 0 | ||
508 | if ( !mHolidayString.isEmpty() ) { | 539 | if ( !mHolidayString.isEmpty() ) { |
@@ -510,5 +541,6 @@ void MonthViewCell::startUpdateCell() | |||
510 | item->setPalette( mHolidayPalette ); | 541 | item->setPalette( mHolidayPalette ); |
511 | mItemList->insertItem( item ); | 542 | insertItem( item ); |
512 | mToolTip.append ( mHolidayString ); | 543 | mToolTip.append ( mHolidayString ); |
513 | } | 544 | } |
545 | #endif | ||
514 | } | 546 | } |
@@ -518,3 +550,4 @@ void MonthViewCell::insertEvent(Event *event) | |||
518 | QString mToolTipText; | 550 | QString mToolTipText; |
519 | mItemList->setFocusPolicy(WheelFocus); | 551 | bool insertNewItem = false; |
552 | setFocusPolicy(WheelFocus); | ||
520 | if ( !(event->doesRecur() == Recurrence::rNone) ) { | 553 | if ( !(event->doesRecur() == Recurrence::rNone) ) { |
@@ -530,3 +563,3 @@ void MonthViewCell::insertEvent(Event *event) | |||
530 | if ( mDate.dayOfWeek() == 7 ) | 563 | if ( mDate.dayOfWeek() == 7 ) |
531 | mItemList->setLineWidth( 3 ); | 564 | setLineWidth( 3 ); |
532 | } | 565 | } |
@@ -575,4 +608,18 @@ void MonthViewCell::insertEvent(Event *event) | |||
575 | } | 608 | } |
576 | 609 | MonthViewItem *item ; | |
577 | MonthViewItem *item = new MonthViewItem( event, mDate, text ); | 610 | if ( mCurrentAvailItem ) { |
611 | item = mCurrentAvailItem; | ||
612 | mCurrentAvailItem = (MonthViewItem*) item->next(); | ||
613 | item->recycle( event, mDate, text ); | ||
614 | } else { | ||
615 | if ( mAvailItemList.count() ) { | ||
616 | item = mAvailItemList.first(); | ||
617 | mAvailItemList.remove( item ); | ||
618 | item->recycle( event, mDate, text ); | ||
619 | insertNewItem = true; | ||
620 | } else { | ||
621 | insertNewItem = true; | ||
622 | item = new MonthViewItem( event, mDate, text ); | ||
623 | } | ||
624 | } | ||
578 | QPalette pal; | 625 | QPalette pal; |
@@ -616,3 +663,4 @@ void MonthViewCell::insertEvent(Event *event) | |||
616 | item->setMultiDay( multiday ); | 663 | item->setMultiDay( multiday ); |
617 | mItemList->insertItem( item ); | 664 | if ( insertNewItem) |
665 | insertItem( item ); | ||
618 | mToolTip.append( mToolTipText ); | 666 | mToolTip.append( mToolTipText ); |
@@ -621,3 +669,4 @@ void MonthViewCell::insertTodo(Todo *todo) | |||
621 | { | 669 | { |
622 | mItemList->setFocusPolicy(WheelFocus); | 670 | bool insertNewItem = false; |
671 | setFocusPolicy(WheelFocus); | ||
623 | QString text; | 672 | QString text; |
@@ -630,4 +679,19 @@ void MonthViewCell::insertTodo(Todo *todo) | |||
630 | text += todo->summary(); | 679 | text += todo->summary(); |
631 | 680 | MonthViewItem *item ; | |
632 | MonthViewItem *item = new MonthViewItem( todo, mDate, text ); | 681 | if ( mCurrentAvailItem ) { |
682 | item = mCurrentAvailItem; | ||
683 | mCurrentAvailItem = (MonthViewItem*) item->next(); | ||
684 | item->recycle( todo, mDate, text ); | ||
685 | } else { | ||
686 | if ( mAvailItemList.count() ) { | ||
687 | item = mAvailItemList.first(); | ||
688 | mAvailItemList.remove( item ); | ||
689 | item->recycle( todo, mDate, text ); | ||
690 | insertNewItem = true; | ||
691 | } else { | ||
692 | insertNewItem = true; | ||
693 | item = new MonthViewItem( todo, mDate, text ); | ||
694 | } | ||
695 | } | ||
696 | //MonthViewItem *item = new MonthViewItem( todo, mDate, text ); | ||
633 | //item->setPalette( mStandardPalette ); | 697 | //item->setPalette( mStandardPalette ); |
@@ -660,7 +724,25 @@ void MonthViewCell::insertTodo(Todo *todo) | |||
660 | item->setMoreInfo( todo->description().length() > 0 ); | 724 | item->setMoreInfo( todo->description().length() > 0 ); |
661 | mItemList->insertItem( item ); | 725 | if ( insertNewItem) |
726 | insertItem( item ); | ||
662 | mToolTip.append( text ); | 727 | mToolTip.append( text ); |
663 | } | 728 | } |
729 | void MonthViewCell::repaintfinishUpdateCell() | ||
730 | { | ||
731 | MonthViewItem *mitem = (MonthViewItem*) firstItem (); | ||
732 | while ( mitem ) { | ||
733 | mitem->setBlockRepaint( false ); | ||
734 | updateItem ( mitem ); | ||
735 | mitem = (MonthViewItem *)mitem->next(); | ||
736 | } | ||
737 | } | ||
664 | void MonthViewCell::finishUpdateCell() | 738 | void MonthViewCell::finishUpdateCell() |
665 | { | 739 | { |
740 | while ( mCurrentAvailItem ) { | ||
741 | MonthViewItem *item = mCurrentAvailItem; | ||
742 | mCurrentAvailItem = (MonthViewItem *)item->next(); | ||
743 | mAvailItemList.append( item ); | ||
744 | takeItem ( item ); | ||
745 | } | ||
746 | |||
747 | |||
666 | #ifdef DESKTOP_VERSION | 748 | #ifdef DESKTOP_VERSION |
@@ -671,3 +753,3 @@ void MonthViewCell::finishUpdateCell() | |||
671 | #endif | 753 | #endif |
672 | mItemList->sort(); | 754 | sort(); |
673 | //setMyPalette(); | 755 | //setMyPalette(); |
@@ -748,15 +830,22 @@ void MonthViewCell::enableScrollBars( bool enabled ) | |||
748 | if ( enabled ) { | 830 | if ( enabled ) { |
749 | //mItemList->setVScrollBarMode(QScrollView::Auto); | 831 | |
750 | mItemList->setHScrollBarMode(QScrollView::Auto); | 832 | QListBoxItem *fi = firstItem (); |
751 | QListBoxItem *fi = mItemList->firstItem (); | ||
752 | if (fi ) { | 833 | if (fi ) { |
753 | int hei = mItemList->numRows () * fi->height(mItemList); | 834 | int ihei = fi->height( this ); |
754 | if ( hei < height() - mItemList->horizontalScrollBar()->height () ) | 835 | int hei = numRows () * ihei; |
755 | mItemList->setVScrollBarMode(QScrollView::AlwaysOff); | 836 | if ( hei < height() - horizontalScrollBar()->height () ) |
837 | setVScrollBarMode(QScrollView::AlwaysOff); | ||
756 | else | 838 | else |
757 | mItemList->setVScrollBarMode(QScrollView::Auto); | 839 | setVScrollBarMode(QScrollView::Auto); |
840 | if ( ihei *3 > height() ) | ||
841 | setHScrollBarMode(QScrollView::AlwaysOff); | ||
842 | else | ||
843 | setHScrollBarMode(QScrollView::Auto); | ||
844 | } else { | ||
845 | setVScrollBarMode(QScrollView::Auto); | ||
846 | setHScrollBarMode(QScrollView::Auto); | ||
758 | } | 847 | } |
759 | } else { | 848 | } else { |
760 | mItemList->setVScrollBarMode(QScrollView::AlwaysOff); | 849 | setVScrollBarMode(QScrollView::AlwaysOff); |
761 | mItemList->setHScrollBarMode(QScrollView::AlwaysOff); | 850 | setHScrollBarMode(QScrollView::AlwaysOff); |
762 | } | 851 | } |
@@ -766,11 +855,11 @@ Incidence *MonthViewCell::selectedIncidence() | |||
766 | { | 855 | { |
767 | int index = mItemList->currentItem(); | 856 | int index = currentItem(); |
768 | if ( index < 0 ) return 0; | 857 | if ( index < 0 ) return 0; |
769 | 858 | ||
770 | MonthViewItem *item = | 859 | MonthViewItem *mitem = |
771 | static_cast<MonthViewItem *>( mItemList->item( index ) ); | 860 | static_cast<MonthViewItem *>( item( index ) ); |
772 | 861 | ||
773 | if ( !item ) return 0; | 862 | if ( !mitem ) return 0; |
774 | 863 | ||
775 | return item->incidence(); | 864 | return mitem->incidence(); |
776 | } | 865 | } |
@@ -780,11 +869,11 @@ QDate MonthViewCell::selectedIncidenceDate() | |||
780 | QDate qd; | 869 | QDate qd; |
781 | int index = mItemList->currentItem(); | 870 | int index = currentItem(); |
782 | if ( index < 0 ) return qd; | 871 | if ( index < 0 ) return qd; |
783 | 872 | ||
784 | MonthViewItem *item = | 873 | MonthViewItem *mitem = |
785 | static_cast<MonthViewItem *>( mItemList->item( index ) ); | 874 | static_cast<MonthViewItem *>( item( index ) ); |
786 | 875 | ||
787 | if ( !item ) return qd; | 876 | if ( !mitem ) return qd; |
788 | 877 | ||
789 | return item->incidenceDate(); | 878 | return mitem->incidenceDate(); |
790 | } | 879 | } |
@@ -793,3 +882,3 @@ void MonthViewCell::deselect() | |||
793 | { | 882 | { |
794 | mItemList->clearSelection(); | 883 | clearSelection(); |
795 | enableScrollBars( false ); | 884 | enableScrollBars( false ); |
@@ -808,12 +897,14 @@ void MonthViewCell::resizeEvent ( QResizeEvent * e ) | |||
808 | deselect(); | 897 | deselect(); |
809 | int size = height() - mLabel->height() - 2; | 898 | int size = height() - mLabel->height() - lineWidth()-1; |
899 | //qDebug("LW %d ", lineWidth()); | ||
810 | if ( size > 0 ) | 900 | if ( size > 0 ) |
811 | mItemList->verticalScrollBar()->setMaximumHeight( size ); | 901 | verticalScrollBar()->setMaximumHeight( size ); |
812 | size = width() - mLabel->width() -2; | 902 | size = width() - mLabel->width() -lineWidth()-1; |
813 | if ( size > 0 ) | 903 | if ( size > 0 ) |
814 | mItemList->horizontalScrollBar()->setMaximumWidth( size ); | 904 | horizontalScrollBar()->setMaximumWidth( size ); |
815 | mLabel->move( width()-mItemList->lineWidth() - mLabel->width(), height()-mItemList->lineWidth() - mLabel->height() ); | 905 | mLabel->move( width()-lineWidth() - mLabel->width(), height()-lineWidth() - mLabel->height() ); |
816 | //mLabel->setMaximumWidth( width() - mItemList->lineWidth()*2); | 906 | //mLabel->setMaximumWidth( width() - mItemList->lineWidth()*2); |
817 | mItemList->resize ( width(), height () ); | 907 | // mItemList->resize ( width(), height () ); |
818 | 908 | if ( e ) | |
909 | KNoScrollListBox::resizeEvent ( e ); | ||
819 | } | 910 | } |
@@ -1262,2 +1353,3 @@ void KOMonthView::updateView() | |||
1262 | return; | 1353 | return; |
1354 | //qDebug("UUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU "); | ||
1263 | //QTime ti; | 1355 | //QTime ti; |
@@ -1358,2 +1450,6 @@ void KOMonthView::updateView() | |||
1358 | processSelectionChange(); | 1450 | processSelectionChange(); |
1451 | qApp->processEvents(); | ||
1452 | for( i = 0; i < timeSpan+1; ++i ) { | ||
1453 | (*cells)[i]->repaintfinishUpdateCell(); | ||
1454 | } | ||
1359 | (*cells)[0]->setFocus(); | 1455 | (*cells)[0]->setFocus(); |