-rw-r--r-- | korganizer/koagendaview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index 5a63b35..f811fba 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp | |||
@@ -510,193 +510,193 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) : | |||
510 | SLOT(newTodo(int,int))); | 510 | SLOT(newTodo(int,int))); |
511 | connect(mAgenda,SIGNAL(newEventSignal(int,int,int,int)), | 511 | connect(mAgenda,SIGNAL(newEventSignal(int,int,int,int)), |
512 | SLOT(newEvent(int,int,int,int))); | 512 | SLOT(newEvent(int,int,int,int))); |
513 | connect(mAllDayAgenda,SIGNAL(newEventSignal(int,int)), | 513 | connect(mAllDayAgenda,SIGNAL(newEventSignal(int,int)), |
514 | SLOT(newEventAllDay(int,int))); | 514 | SLOT(newEventAllDay(int,int))); |
515 | connect(mAllDayAgenda,SIGNAL(newTodoSignal(int,int)), | 515 | connect(mAllDayAgenda,SIGNAL(newTodoSignal(int,int)), |
516 | SLOT(newTodoAllDay(int,int))); | 516 | SLOT(newTodoAllDay(int,int))); |
517 | connect(mAllDayAgenda,SIGNAL(newEventSignal(int,int,int,int)), | 517 | connect(mAllDayAgenda,SIGNAL(newEventSignal(int,int,int,int)), |
518 | SLOT(newEventAllDay(int,int))); | 518 | SLOT(newEventAllDay(int,int))); |
519 | connect(mAgenda,SIGNAL(newTimeSpanSignal(int,int,int,int)), | 519 | connect(mAgenda,SIGNAL(newTimeSpanSignal(int,int,int,int)), |
520 | SLOT(newTimeSpanSelected(int,int,int,int))); | 520 | SLOT(newTimeSpanSelected(int,int,int,int))); |
521 | connect(mAllDayAgenda,SIGNAL(newTimeSpanSignal(int,int,int,int)), | 521 | connect(mAllDayAgenda,SIGNAL(newTimeSpanSignal(int,int,int,int)), |
522 | SLOT(newTimeSpanSelectedAllDay(int,int,int,int))); | 522 | SLOT(newTimeSpanSelectedAllDay(int,int,int,int))); |
523 | connect(mAgenda,SIGNAL(newStartSelectSignal()),SLOT(updateView())); | 523 | connect(mAgenda,SIGNAL(newStartSelectSignal()),SLOT(updateView())); |
524 | connect(mAllDayAgenda,SIGNAL(newStartSelectSignal()),SLOT(updateView())); | 524 | connect(mAllDayAgenda,SIGNAL(newStartSelectSignal()),SLOT(updateView())); |
525 | 525 | ||
526 | connect(mAgenda,SIGNAL(editIncidenceSignal(Incidence *)), | 526 | connect(mAgenda,SIGNAL(editIncidenceSignal(Incidence *)), |
527 | SIGNAL(editIncidenceSignal(Incidence *))); | 527 | SIGNAL(editIncidenceSignal(Incidence *))); |
528 | connect(mAllDayAgenda,SIGNAL(editIncidenceSignal(Incidence *)), | 528 | connect(mAllDayAgenda,SIGNAL(editIncidenceSignal(Incidence *)), |
529 | SIGNAL(editIncidenceSignal(Incidence *))); | 529 | SIGNAL(editIncidenceSignal(Incidence *))); |
530 | connect(mAgenda,SIGNAL(showIncidenceSignal(Incidence *)), | 530 | connect(mAgenda,SIGNAL(showIncidenceSignal(Incidence *)), |
531 | SIGNAL(showIncidenceSignal(Incidence *))); | 531 | SIGNAL(showIncidenceSignal(Incidence *))); |
532 | connect(mAllDayAgenda,SIGNAL(showIncidenceSignal(Incidence *)), | 532 | connect(mAllDayAgenda,SIGNAL(showIncidenceSignal(Incidence *)), |
533 | SIGNAL(showIncidenceSignal(Incidence *))); | 533 | SIGNAL(showIncidenceSignal(Incidence *))); |
534 | connect(mAgenda,SIGNAL(deleteIncidenceSignal(Incidence *)), | 534 | connect(mAgenda,SIGNAL(deleteIncidenceSignal(Incidence *)), |
535 | SIGNAL(deleteIncidenceSignal(Incidence *))); | 535 | SIGNAL(deleteIncidenceSignal(Incidence *))); |
536 | connect(mAllDayAgenda,SIGNAL(deleteIncidenceSignal(Incidence *)), | 536 | connect(mAllDayAgenda,SIGNAL(deleteIncidenceSignal(Incidence *)), |
537 | SIGNAL(deleteIncidenceSignal(Incidence *))); | 537 | SIGNAL(deleteIncidenceSignal(Incidence *))); |
538 | 538 | ||
539 | connect(mAgenda,SIGNAL(itemModified(KOAgendaItem *, int )), | 539 | connect(mAgenda,SIGNAL(itemModified(KOAgendaItem *, int )), |
540 | SLOT(updateEventDates(KOAgendaItem *, int ))); | 540 | SLOT(updateEventDates(KOAgendaItem *, int ))); |
541 | connect(mAllDayAgenda,SIGNAL(itemModified(KOAgendaItem *, int )), | 541 | connect(mAllDayAgenda,SIGNAL(itemModified(KOAgendaItem *, int )), |
542 | SLOT(updateEventDates(KOAgendaItem *, int))); | 542 | SLOT(updateEventDates(KOAgendaItem *, int))); |
543 | 543 | ||
544 | // event indicator update | 544 | // event indicator update |
545 | connect(mAgenda,SIGNAL(lowerYChanged(int)), | 545 | connect(mAgenda,SIGNAL(lowerYChanged(int)), |
546 | SLOT(updateEventIndicatorTop(int))); | 546 | SLOT(updateEventIndicatorTop(int))); |
547 | connect(mAgenda,SIGNAL(upperYChanged(int)), | 547 | connect(mAgenda,SIGNAL(upperYChanged(int)), |
548 | SLOT(updateEventIndicatorBottom(int))); | 548 | SLOT(updateEventIndicatorBottom(int))); |
549 | // drag signals | 549 | // drag signals |
550 | /* | 550 | /* |
551 | connect(mAgenda,SIGNAL(startDragSignal(Event *)), | 551 | connect(mAgenda,SIGNAL(startDragSignal(Event *)), |
552 | SLOT(startDrag(Event *))); | 552 | SLOT(startDrag(Event *))); |
553 | connect(mAllDayAgenda,SIGNAL(startDragSignal(Event *)), | 553 | connect(mAllDayAgenda,SIGNAL(startDragSignal(Event *)), |
554 | SLOT(startDrag(Event *))); | 554 | SLOT(startDrag(Event *))); |
555 | */ | 555 | */ |
556 | // synchronize selections | 556 | // synchronize selections |
557 | connect( mAgenda, SIGNAL( incidenceSelected( Incidence * ) ), | 557 | connect( mAgenda, SIGNAL( incidenceSelected( Incidence * ) ), |
558 | mAllDayAgenda, SLOT( deselectItem() ) ); | 558 | mAllDayAgenda, SLOT( deselectItem() ) ); |
559 | connect( mAllDayAgenda, SIGNAL( incidenceSelected( Incidence * ) ), | 559 | connect( mAllDayAgenda, SIGNAL( incidenceSelected( Incidence * ) ), |
560 | mAgenda, SLOT( deselectItem() ) ); | 560 | mAgenda, SLOT( deselectItem() ) ); |
561 | connect( mAgenda, SIGNAL( incidenceSelected( Incidence * ) ), | 561 | connect( mAgenda, SIGNAL( incidenceSelected( Incidence * ) ), |
562 | SIGNAL( incidenceSelected( Incidence * ) ) ); | 562 | SIGNAL( incidenceSelected( Incidence * ) ) ); |
563 | connect( mAllDayAgenda, SIGNAL( incidenceSelected( Incidence * ) ), | 563 | connect( mAllDayAgenda, SIGNAL( incidenceSelected( Incidence * ) ), |
564 | SIGNAL( incidenceSelected( Incidence * ) ) ); | 564 | SIGNAL( incidenceSelected( Incidence * ) ) ); |
565 | connect( mAgenda, SIGNAL( resizedSignal() ), | 565 | connect( mAgenda, SIGNAL( resizedSignal() ), |
566 | SLOT( updateConfig( ) ) ); | 566 | SLOT( updateConfig( ) ) ); |
567 | connect( mAgenda, SIGNAL( addToCalSignal(Incidence *, Incidence *) ), | 567 | connect( mAgenda, SIGNAL( addToCalSignal(Incidence *, Incidence *) ), |
568 | SLOT( addToCalSlot(Incidence *, Incidence * ) ) ); | 568 | SLOT( addToCalSlot(Incidence *, Incidence * ) ) ); |
569 | connect( mAllDayAgenda, SIGNAL( addToCalSignal(Incidence * ,Incidence *) ), | 569 | connect( mAllDayAgenda, SIGNAL( addToCalSignal(Incidence * ,Incidence *) ), |
570 | SLOT( addToCalSlot(Incidence * , Incidence *) ) ); | 570 | SLOT( addToCalSlot(Incidence * , Incidence *) ) ); |
571 | // connect( mAgenda, SIGNAL( cloneIncidenceSignal(Incidence *) ), SIGNAL( cloneIncidenceSignal(Incidence *) ) ); | 571 | // connect( mAgenda, SIGNAL( cloneIncidenceSignal(Incidence *) ), SIGNAL( cloneIncidenceSignal(Incidence *) ) ); |
572 | //connect( mAllDayAgenda, SIGNAL( cloneIncidenceSignal(Incidence *) ), SIGNAL( cloneIncidenceSignal(Incidence *) ) ); | 572 | //connect( mAllDayAgenda, SIGNAL( cloneIncidenceSignal(Incidence *) ), SIGNAL( cloneIncidenceSignal(Incidence *) ) ); |
573 | 573 | ||
574 | connect( mAllDayAgenda, SIGNAL( signalClearSelection() ),mAgenda, SLOT( slotClearSelection()) ); | 574 | connect( mAllDayAgenda, SIGNAL( signalClearSelection() ),mAgenda, SLOT( slotClearSelection()) ); |
575 | connect( mAgenda, SIGNAL( signalClearSelection() ),mAllDayAgenda, SLOT( slotClearSelection()) ); | 575 | connect( mAgenda, SIGNAL( signalClearSelection() ),mAllDayAgenda, SLOT( slotClearSelection()) ); |
576 | 576 | ||
577 | } | 577 | } |
578 | 578 | ||
579 | void KOAgendaView::toggleAllDay() | 579 | void KOAgendaView::toggleAllDay() |
580 | { | 580 | { |
581 | if ( mSplitterAgenda->firstHandle() ) | 581 | if ( mSplitterAgenda->firstHandle() ) |
582 | mSplitterAgenda->firstHandle()->toggle(); | 582 | mSplitterAgenda->firstHandle()->toggle(); |
583 | } | 583 | } |
584 | void KOAgendaView::addToCalSlot(Incidence * inc, Incidence * incOld ) | 584 | void KOAgendaView::addToCalSlot(Incidence * inc, Incidence * incOld ) |
585 | { | 585 | { |
586 | calendar()->addIncidence( inc ); | 586 | calendar()->addIncidence( inc ); |
587 | 587 | ||
588 | if ( incOld ) { | 588 | if ( incOld ) { |
589 | if ( incOld->typeID() == todoID ) | 589 | if ( incOld->typeID() == todoID ) |
590 | emit todoMoved((Todo*)incOld, KOGlobals::EVENTEDITED ); | 590 | emit todoMoved((Todo*)incOld, KOGlobals::EVENTEDITED ); |
591 | else | 591 | else |
592 | emit incidenceChanged(incOld, KOGlobals::EVENTEDITED); | 592 | emit incidenceChanged(incOld, KOGlobals::EVENTEDITED); |
593 | } | 593 | } |
594 | 594 | ||
595 | } | 595 | } |
596 | void KOAgendaView::categoryChanged(Incidence * inc) | 596 | void KOAgendaView::categoryChanged(Incidence * inc) |
597 | { | 597 | { |
598 | mAgenda->categoryChanged( inc ); | 598 | mAgenda->categoryChanged( inc ); |
599 | mAllDayAgenda->categoryChanged( inc ); | 599 | mAllDayAgenda->categoryChanged( inc ); |
600 | } | 600 | } |
601 | KOAgendaView::~KOAgendaView() | 601 | KOAgendaView::~KOAgendaView() |
602 | { | 602 | { |
603 | delete mAllAgendaPopup; | 603 | delete mAllAgendaPopup; |
604 | //delete mAllDayAgendaPopup; | 604 | //delete mAllDayAgendaPopup; |
605 | delete KOAgendaItem::paintPix(); | 605 | delete KOAgendaItem::paintPix(); |
606 | delete KOAgendaItem::paintPixSel(); | 606 | delete KOAgendaItem::paintPixAllday(); |
607 | } | 607 | } |
608 | void KOAgendaView::resizeEvent( QResizeEvent* e ) | 608 | void KOAgendaView::resizeEvent( QResizeEvent* e ) |
609 | { | 609 | { |
610 | //qDebug("KOAgendaView::resizeEvent( QResizeEvent* e ) %d ", e->size().width()); | 610 | //qDebug("KOAgendaView::resizeEvent( QResizeEvent* e ) %d ", e->size().width()); |
611 | bool uc = false; | 611 | bool uc = false; |
612 | int ow = e->oldSize().width(); | 612 | int ow = e->oldSize().width(); |
613 | int oh = e->oldSize().height(); | 613 | int oh = e->oldSize().height(); |
614 | int w = e->size().width(); | 614 | int w = e->size().width(); |
615 | int h = e->size().height(); | 615 | int h = e->size().height(); |
616 | if ( (ow > oh && w< h ) || (ow < oh && w > h ) ) { | 616 | if ( (ow > oh && w< h ) || (ow < oh && w > h ) ) { |
617 | if ( ! mBlockUpdating && !globalFlagBlockStartup && !globalFlagBlockAgenda ) | 617 | if ( ! mBlockUpdating && !globalFlagBlockStartup && !globalFlagBlockAgenda ) |
618 | uc = true; | 618 | uc = true; |
619 | //qDebug("view changed %d %d %d %d ", ow, oh , w , h); | 619 | //qDebug("view changed %d %d %d %d ", ow, oh , w , h); |
620 | } | 620 | } |
621 | mUpcomingWidth = e->size().width() ; | 621 | mUpcomingWidth = e->size().width() ; |
622 | if ( mBlockUpdating || uc ) { | 622 | if ( mBlockUpdating || uc ) { |
623 | mBlockUpdating = false; | 623 | mBlockUpdating = false; |
624 | //mAgenda->setMinimumSize(800 , 600 ); | 624 | //mAgenda->setMinimumSize(800 , 600 ); |
625 | //qDebug("mAgenda->resize+++++++++++++++ "); | 625 | //qDebug("mAgenda->resize+++++++++++++++ "); |
626 | updateConfig(); | 626 | updateConfig(); |
627 | //qDebug("KOAgendaView::Updating now possible "); | 627 | //qDebug("KOAgendaView::Updating now possible "); |
628 | } else | 628 | } else |
629 | createDayLabels(); | 629 | createDayLabels(); |
630 | //qDebug("resizeEvent end "); | 630 | //qDebug("resizeEvent end "); |
631 | 631 | ||
632 | } | 632 | } |
633 | void KOAgendaView::slotDaylabelClicked( int num ) | 633 | void KOAgendaView::slotDaylabelClicked( int num ) |
634 | { | 634 | { |
635 | 635 | ||
636 | QDate firstDate = mSelectedDates.first(); | 636 | QDate firstDate = mSelectedDates.first(); |
637 | if ( num == -1 ) | 637 | if ( num == -1 ) |
638 | emit showDateView( 6, firstDate ); | 638 | emit showDateView( 6, firstDate ); |
639 | else if (num >= 0 ) { | 639 | else if (num >= 0 ) { |
640 | if ( mSelectedDates.count() == 1) | 640 | if ( mSelectedDates.count() == 1) |
641 | emit showDateView( 9, firstDate.addDays( num ) ); | 641 | emit showDateView( 9, firstDate.addDays( num ) ); |
642 | else | 642 | else |
643 | emit showDateView( 3, firstDate.addDays( num ) ); | 643 | emit showDateView( 3, firstDate.addDays( num ) ); |
644 | } | 644 | } |
645 | else | 645 | else |
646 | showDateView( 10, firstDate.addDays(1) ); | 646 | showDateView( 10, firstDate.addDays(1) ); |
647 | } | 647 | } |
648 | 648 | ||
649 | KOAgendaButton* KOAgendaView::getNewDaylabel() | 649 | KOAgendaButton* KOAgendaView::getNewDaylabel() |
650 | { | 650 | { |
651 | 651 | ||
652 | KOAgendaButton * dayLabel = new KOAgendaButton(mDayLabels); | 652 | KOAgendaButton * dayLabel = new KOAgendaButton(mDayLabels); |
653 | connect( dayLabel, SIGNAL( numClicked(int) ), this, SLOT ( slotDaylabelClicked(int) ) ); | 653 | connect( dayLabel, SIGNAL( numClicked(int) ), this, SLOT ( slotDaylabelClicked(int) ) ); |
654 | mDayLabelsList.append( dayLabel ); | 654 | mDayLabelsList.append( dayLabel ); |
655 | mLayoutDayLabels->addWidget(dayLabel); | 655 | mLayoutDayLabels->addWidget(dayLabel); |
656 | return dayLabel ; | 656 | return dayLabel ; |
657 | } | 657 | } |
658 | 658 | ||
659 | void KOAgendaView::createDayLabels() | 659 | void KOAgendaView::createDayLabels() |
660 | { | 660 | { |
661 | 661 | ||
662 | if ( mBlockUpdating || globalFlagBlockLabel == 1) { | 662 | if ( mBlockUpdating || globalFlagBlockLabel == 1) { |
663 | // qDebug(" KOAgendaView::createDayLabels() blocked "); | 663 | // qDebug(" KOAgendaView::createDayLabels() blocked "); |
664 | return; | 664 | return; |
665 | 665 | ||
666 | } | 666 | } |
667 | int newHight; | 667 | int newHight; |
668 | if ( !mSelectedDates.count()) | 668 | if ( !mSelectedDates.count()) |
669 | return; | 669 | return; |
670 | 670 | ||
671 | // ### Before deleting and recreating we could check if mSelectedDates changed... | 671 | // ### Before deleting and recreating we could check if mSelectedDates changed... |
672 | // It would remove some flickering and gain speed (since this is called by | 672 | // It would remove some flickering and gain speed (since this is called by |
673 | // each updateView() call) | 673 | // each updateView() call) |
674 | 674 | ||
675 | int maxWid = mUpcomingWidth - mTimeLabels->width()- mAgenda->verticalScrollBar()->width() - mAgenda->frameWidth()*2; | 675 | int maxWid = mUpcomingWidth - mTimeLabels->width()- mAgenda->verticalScrollBar()->width() - mAgenda->frameWidth()*2; |
676 | mDayLabelsFrame->setMaximumWidth( mUpcomingWidth ); | 676 | mDayLabelsFrame->setMaximumWidth( mUpcomingWidth ); |
677 | if ( maxWid < 20 ) | 677 | if ( maxWid < 20 ) |
678 | maxWid = 20; | 678 | maxWid = 20; |
679 | 679 | ||
680 | QFont dlf = KOPrefs::instance()->mTimeLabelsFont; | 680 | QFont dlf = KOPrefs::instance()->mTimeLabelsFont; |
681 | QFontMetrics fm ( dlf ); | 681 | QFontMetrics fm ( dlf ); |
682 | dlf.setBold( true ); | 682 | dlf.setBold( true ); |
683 | int selCount = mSelectedDates.count(); | 683 | int selCount = mSelectedDates.count(); |
684 | int widModulo = maxWid - (mAgenda->gridSpacingX() * selCount)+1; | 684 | int widModulo = maxWid - (mAgenda->gridSpacingX() * selCount)+1; |
685 | QString dayTest = "Mon 20"; | 685 | QString dayTest = "Mon 20"; |
686 | //QString dayTest = "Mon 20"; | 686 | //QString dayTest = "Mon 20"; |
687 | int wid = fm.width( dayTest ); | 687 | int wid = fm.width( dayTest ); |
688 | //maxWid -= ( selCount * 3 ); //working for QLabels | 688 | //maxWid -= ( selCount * 3 ); //working for QLabels |
689 | if ( QApplication::desktop()->width() <= 320 ) | 689 | if ( QApplication::desktop()->width() <= 320 ) |
690 | maxWid -= ( selCount * 3 ); //working for QPushButton | 690 | maxWid -= ( selCount * 3 ); //working for QPushButton |
691 | else | 691 | else |
692 | maxWid -= ( selCount * 4 ); //working for QPushButton | 692 | maxWid -= ( selCount * 4 ); //working for QPushButton |
693 | if ( maxWid < 0 ) | 693 | if ( maxWid < 0 ) |
694 | maxWid = 20; | 694 | maxWid = 20; |
695 | int needWid = wid * selCount; | 695 | int needWid = wid * selCount; |
696 | //qDebug("++++++++Needed : %d MaxWidth: %d", needWid, maxWid ); | 696 | //qDebug("++++++++Needed : %d MaxWidth: %d", needWid, maxWid ); |
697 | //if ( needWid > maxWid ) | 697 | //if ( needWid > maxWid ) |
698 | // qDebug("DAYLABELS TOOOOOOO BIG "); | 698 | // qDebug("DAYLABELS TOOOOOOO BIG "); |
699 | while ( needWid > maxWid ) { | 699 | while ( needWid > maxWid ) { |
700 | dayTest = dayTest.left( dayTest.length() - 1 ); | 700 | dayTest = dayTest.left( dayTest.length() - 1 ); |
701 | wid = fm.width( dayTest ); | 701 | wid = fm.width( dayTest ); |
702 | needWid = wid * selCount; | 702 | needWid = wid * selCount; |