summaryrefslogtreecommitdiffabout
path: root/korganizer
Unidiff
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koagendaview.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 8c27c43..d3db89a 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -623,7 +623,7 @@ void KOAgendaView::slotDaylabelClicked()
623 emit showDateView( 3, firstDate.addDays( cap.toInt()-1 ) ); 623 emit showDateView( 3, firstDate.addDays( cap.toInt()-1 ) );
624 } 624 }
625 else 625 else
626 showDateView( 10, firstDate.addDays(1 ) ); 626 showDateView( 10, firstDate.addDays(1) );
627} 627}
628 628
629QPushButton* KOAgendaView::getNewDaylabel() 629QPushButton* KOAgendaView::getNewDaylabel()
@@ -662,7 +662,8 @@ void KOAgendaView::createDayLabels()
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
@@ -674,7 +675,7 @@ void KOAgendaView::createDayLabels()
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();
@@ -685,7 +686,7 @@ void KOAgendaView::createDayLabels()
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;
@@ -997,8 +998,6 @@ void KOAgendaView::updateEventDates(KOAgendaItem *item, int type)
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);