-rw-r--r-- | korganizer/koagendaview.cpp | 9 |
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 | |||
@@ -659,36 +659,37 @@ void KOAgendaView::createDayLabels() | |||
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 | } |
@@ -994,14 +995,12 @@ void KOAgendaView::updateEventDates(KOAgendaItem *item, int type) | |||
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 | } |