| -rw-r--r-- | korganizer/koagendaview.cpp | 11 |
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 @@ -618,17 +618,17 @@ void KOAgendaView::slotDaylabelClicked() emit showDateView( 6, firstDate ); else if ( cap != "last" ) { if ( mSelectedDates.count() == 1) emit showDateView( 9, firstDate.addDays( cap.toInt()-1 ) ); else emit showDateView( 3, firstDate.addDays( cap.toInt()-1 ) ); } else - showDateView( 10, firstDate.addDays(1 ) ); + showDateView( 10, firstDate.addDays(1) ); } QPushButton* KOAgendaView::getNewDaylabel() { QPushButton * dayLabel = new QPushButton(mDayLabels); dayLabel->setFlat( true ); connect( dayLabel, SIGNAL( clicked() ), this, SLOT ( slotDaylabelClicked() ) ); @@ -657,40 +657,41 @@ void KOAgendaView::createDayLabels() int maxWid = mUpcomingWidth - mTimeLabels->width()- mAgenda->verticalScrollBar()->width() - 2; mDayLabelsFrame->setMaximumWidth( mUpcomingWidth ); if ( maxWid < 0 ) maxWid = 20; QFont dlf = KOPrefs::instance()->mTimeLabelsFont; QFontMetrics fm ( dlf ); int selCount = mSelectedDates.count(); - QString dayTest = "Mon 20"; + QString dayTest = "Won 20"; + //QString dayTest = "Mon 20"; int wid = fm.width( dayTest ); //maxWid -= ( selCount * 3 ); //working for QLabels maxWid -= ( selCount * 5 ); //working for QPushButton if ( maxWid < 0 ) maxWid = 20; int needWid = wid * selCount; //qDebug("++++++++Needed : %d MaxWidth: %d", needWid, maxWid ); //if ( needWid > maxWid ) // qDebug("DAYLABELS TOOOOOOO BIG "); while ( needWid > maxWid ) { dayTest = dayTest.left( dayTest.length() - 1 ); - wid = fm.width( dayTest ); + wid = fm.width( dayTest )+1; needWid = wid * selCount; } int maxLen = dayTest.length(); int fontPoint = dlf.pointSize(); if ( maxLen < 2 ) { int fontPoint = dlf.pointSize(); while ( fontPoint > 4 ) { --fontPoint; dlf.setPointSize( fontPoint ); QFontMetrics f( dlf ); - wid = f.width( "20" )+2; + wid = f.width( "30" )+3; needWid = wid * selCount; if ( needWid < maxWid ) break; } maxLen = 2; } //qDebug("Max len %d ", dayTest.length() ); @@ -992,18 +993,16 @@ void KOAgendaView::updateEventDates(KOAgendaItem *item, int type) if ( item->cellYBottom() > 0 ) endDt.setTime(mAgenda->gyToTime(item->cellYBottom()+1)); else endDt.setTime((static_cast<Todo*>(item->incidence()))->dtDue().time()); endDt.setDate(startDate); } } } - - qDebug("to888"); if ( item->incidence()->type() == "Event" ) { item->incidence()->setDtStart(startDt); (static_cast<Event*>(item->incidence()))->setDtEnd(endDt); } else if ( item->incidence()->type() == "Todo" ) { (static_cast<Todo*>(item->incidence()))->setDtDue(endDt); } //qDebug("KOAgendaView::updateEventDates stsart %s end %s ", startDt.toString().latin1(), endDt.toString().latin1() ); item->incidence()->setRevision(item->incidence()->revision()+1); |