summaryrefslogtreecommitdiffabout
path: root/korganizer
Unidiff
Diffstat (limited to 'korganizer') (more/less context) (show whitespace changes)
-rw-r--r--korganizer/koagendaview.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 8c27c43..d3db89a 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -641,72 +641,73 @@ QPushButton* KOAgendaView::getNewDaylabel()
641} 641}
642 642
643void KOAgendaView::createDayLabels() 643void KOAgendaView::createDayLabels()
644{ 644{
645 645
646 if ( mBlockUpdating || globalFlagBlockLabel == 1) { 646 if ( mBlockUpdating || globalFlagBlockLabel == 1) {
647 // qDebug(" KOAgendaView::createDayLabels() blocked "); 647 // qDebug(" KOAgendaView::createDayLabels() blocked ");
648 return; 648 return;
649 649
650 } 650 }
651 int newHight; 651 int newHight;
652 652
653 // ### Before deleting and recreating we could check if mSelectedDates changed... 653 // ### Before deleting and recreating we could check if mSelectedDates changed...
654 // It would remove some flickering and gain speed (since this is called by 654 // It would remove some flickering and gain speed (since this is called by
655 // each updateView() call) 655 // each updateView() call)
656 656
657 int maxWid = mUpcomingWidth - mTimeLabels->width()- mAgenda->verticalScrollBar()->width() - 2; 657 int maxWid = mUpcomingWidth - mTimeLabels->width()- mAgenda->verticalScrollBar()->width() - 2;
658 mDayLabelsFrame->setMaximumWidth( mUpcomingWidth ); 658 mDayLabelsFrame->setMaximumWidth( mUpcomingWidth );
659 if ( maxWid < 0 ) 659 if ( maxWid < 0 )
660 maxWid = 20; 660 maxWid = 20;
661 661
662 QFont dlf = KOPrefs::instance()->mTimeLabelsFont; 662 QFont dlf = KOPrefs::instance()->mTimeLabelsFont;
663 QFontMetrics fm ( dlf ); 663 QFontMetrics fm ( dlf );
664 int selCount = mSelectedDates.count(); 664 int selCount = mSelectedDates.count();
665 QString dayTest = "Mon 20"; 665 QString dayTest = "Won 20";
666 //QString dayTest = "Mon 20";
666 int wid = fm.width( dayTest ); 667 int wid = fm.width( dayTest );
667 //maxWid -= ( selCount * 3 ); //working for QLabels 668 //maxWid -= ( selCount * 3 ); //working for QLabels
668 maxWid -= ( selCount * 5 ); //working for QPushButton 669 maxWid -= ( selCount * 5 ); //working for QPushButton
669 if ( maxWid < 0 ) 670 if ( maxWid < 0 )
670 maxWid = 20; 671 maxWid = 20;
671 int needWid = wid * selCount; 672 int needWid = wid * selCount;
672 //qDebug("++++++++Needed : %d MaxWidth: %d", needWid, maxWid ); 673 //qDebug("++++++++Needed : %d MaxWidth: %d", needWid, maxWid );
673 //if ( needWid > maxWid ) 674 //if ( needWid > maxWid )
674 // qDebug("DAYLABELS TOOOOOOO BIG "); 675 // qDebug("DAYLABELS TOOOOOOO BIG ");
675 while ( needWid > maxWid ) { 676 while ( needWid > maxWid ) {
676 dayTest = dayTest.left( dayTest.length() - 1 ); 677 dayTest = dayTest.left( dayTest.length() - 1 );
677 wid = fm.width( dayTest ); 678 wid = fm.width( dayTest )+1;
678 needWid = wid * selCount; 679 needWid = wid * selCount;
679 } 680 }
680 int maxLen = dayTest.length(); 681 int maxLen = dayTest.length();
681 int fontPoint = dlf.pointSize(); 682 int fontPoint = dlf.pointSize();
682 if ( maxLen < 2 ) { 683 if ( maxLen < 2 ) {
683 int fontPoint = dlf.pointSize(); 684 int fontPoint = dlf.pointSize();
684 while ( fontPoint > 4 ) { 685 while ( fontPoint > 4 ) {
685 --fontPoint; 686 --fontPoint;
686 dlf.setPointSize( fontPoint ); 687 dlf.setPointSize( fontPoint );
687 QFontMetrics f( dlf ); 688 QFontMetrics f( dlf );
688 wid = f.width( "20" )+2; 689 wid = f.width( "30" )+3;
689 needWid = wid * selCount; 690 needWid = wid * selCount;
690 if ( needWid < maxWid ) 691 if ( needWid < maxWid )
691 break; 692 break;
692 } 693 }
693 maxLen = 2; 694 maxLen = 2;
694 } 695 }
695 //qDebug("Max len %d ", dayTest.length() ); 696 //qDebug("Max len %d ", dayTest.length() );
696 697
697 QFontMetrics tempF( dlf ); 698 QFontMetrics tempF( dlf );
698 newHight = tempF.height(); 699 newHight = tempF.height();
699 mDayLabels->setFont( dlf ); 700 mDayLabels->setFont( dlf );
700 // mLayoutDayLabels = new QHBoxLayout(mDayLabels);; 701 // mLayoutDayLabels = new QHBoxLayout(mDayLabels);;
701 // mLayoutDayLabels->addSpacing(mTimeLabels->width()); 702 // mLayoutDayLabels->addSpacing(mTimeLabels->width());
702 //mLayoutDayLabels->addSpacing( 2 ); 703 //mLayoutDayLabels->addSpacing( 2 );
703 // QFont lFont = dlf; 704 // QFont lFont = dlf;
704 bool appendLabels = false; 705 bool appendLabels = false;
705 QPushButton *dayLabel; 706 QPushButton *dayLabel;
706 dayLabel = mDayLabelsList.first(); 707 dayLabel = mDayLabelsList.first();
707 if ( !dayLabel ) { 708 if ( !dayLabel ) {
708 appendLabels = true; 709 appendLabels = true;
709 dayLabel = getNewDaylabel(); 710 dayLabel = getNewDaylabel();
710 } 711 }
711 dayLabel->setFixedWidth( mTimeLabels->width()+2 ); 712 dayLabel->setFixedWidth( mTimeLabels->width()+2 );
712 dayLabel->setFont( dlf ); 713 dayLabel->setFont( dlf );
@@ -976,50 +977,48 @@ void KOAgendaView::updateEventDates(KOAgendaItem *item, int type)
976 endDt.setDate(startDate. 977 endDt.setDate(startDate.
977 addDays(item->lastMultiItem()->cellX() - item->cellX())); 978 addDays(item->lastMultiItem()->cellX() - item->cellX()));
978 } else { 979 } else {
979 endDt.setTime(mAgenda->gyToTime(item->cellYBottom()+1)); 980 endDt.setTime(mAgenda->gyToTime(item->cellYBottom()+1));
980 endDt.setDate(startDate); 981 endDt.setDate(startDate);
981 } 982 }
982 } 983 }
983 } else { 984 } else {
984 // todo 985 // todo
985 qDebug("tooooodoooooo "); 986 qDebug("tooooodoooooo ");
986 if (item->lastMultiItem()) { 987 if (item->lastMultiItem()) {
987 endDt.setTime(mAgenda->gyToTime(item->lastMultiItem()->cellYBottom()+1)); 988 endDt.setTime(mAgenda->gyToTime(item->lastMultiItem()->cellYBottom()+1));
988 endDt.setDate(startDate. 989 endDt.setDate(startDate.
989 addDays(item->lastMultiItem()->cellX() - item->cellX())); 990 addDays(item->lastMultiItem()->cellX() - item->cellX()));
990 } else { 991 } else {
991 //qDebug("tem->cellYBottom() %d",item->cellYBottom() ); 992 //qDebug("tem->cellYBottom() %d",item->cellYBottom() );
992 if ( item->cellYBottom() > 0 ) 993 if ( item->cellYBottom() > 0 )
993 endDt.setTime(mAgenda->gyToTime(item->cellYBottom()+1)); 994 endDt.setTime(mAgenda->gyToTime(item->cellYBottom()+1));
994 else 995 else
995 endDt.setTime((static_cast<Todo*>(item->incidence()))->dtDue().time()); 996 endDt.setTime((static_cast<Todo*>(item->incidence()))->dtDue().time());
996 endDt.setDate(startDate); 997 endDt.setDate(startDate);
997 } 998 }
998 } 999 }
999 } 1000 }
1000
1001 qDebug("to888");
1002 if ( item->incidence()->type() == "Event" ) { 1001 if ( item->incidence()->type() == "Event" ) {
1003 item->incidence()->setDtStart(startDt); 1002 item->incidence()->setDtStart(startDt);
1004 (static_cast<Event*>(item->incidence()))->setDtEnd(endDt); 1003 (static_cast<Event*>(item->incidence()))->setDtEnd(endDt);
1005 } else if ( item->incidence()->type() == "Todo" ) { 1004 } else if ( item->incidence()->type() == "Todo" ) {
1006 (static_cast<Todo*>(item->incidence()))->setDtDue(endDt); 1005 (static_cast<Todo*>(item->incidence()))->setDtDue(endDt);
1007 } 1006 }
1008 //qDebug("KOAgendaView::updateEventDates stsart %s end %s ", startDt.toString().latin1(), endDt.toString().latin1() ); 1007 //qDebug("KOAgendaView::updateEventDates stsart %s end %s ", startDt.toString().latin1(), endDt.toString().latin1() );
1009 item->incidence()->setRevision(item->incidence()->revision()+1); 1008 item->incidence()->setRevision(item->incidence()->revision()+1);
1010 item->setItemDate(startDt.date()); 1009 item->setItemDate(startDt.date());
1011 //item->updateItem(); 1010 //item->updateItem();
1012 if ( item->incidence()->type() == "Todo" ) { 1011 if ( item->incidence()->type() == "Todo" ) {
1013 emit todoMoved((Todo*)item->incidence(), KOGlobals::EVENTEDITED ); 1012 emit todoMoved((Todo*)item->incidence(), KOGlobals::EVENTEDITED );
1014 1013
1015 } 1014 }
1016 else 1015 else
1017 emit incidenceChanged(item->incidence(), KOGlobals::EVENTEDITED); 1016 emit incidenceChanged(item->incidence(), KOGlobals::EVENTEDITED);
1018 item->updateItem(); 1017 item->updateItem();
1019} 1018}
1020 1019
1021void KOAgendaView::showDates( const QDate &start, const QDate &end ) 1020void KOAgendaView::showDates( const QDate &start, const QDate &end )
1022{ 1021{
1023 // kdDebug() << "KOAgendaView::selectDates" << endl; 1022 // kdDebug() << "KOAgendaView::selectDates" << endl;
1024 1023
1025 mSelectedDates.clear(); 1024 mSelectedDates.clear();