summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-04-05 10:34:37 (UTC)
committer zautrix <zautrix>2005-04-05 10:34:37 (UTC)
commit854e1b46d7895bf4860d914abb5f1e954dfbfe6a (patch) (unidiff)
tree0636047ee54238f5d2b864bb0b0419e65311c91b
parent141c73d9ee02cff6fc2a56289bd8c85bbf60df02 (diff)
downloadkdepimpi-854e1b46d7895bf4860d914abb5f1e954dfbfe6a.zip
kdepimpi-854e1b46d7895bf4860d914abb5f1e954dfbfe6a.tar.gz
kdepimpi-854e1b46d7895bf4860d914abb5f1e954dfbfe6a.tar.bz2
fix
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/komonthview.cpp3
-rw-r--r--libkcal/incidence.cpp1
2 files changed, 2 insertions, 2 deletions
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 425496a..6d6ae8a 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -390,13 +390,13 @@ void MonthViewItem::paint(QPainter *p)
390 yPos = pmheight/2 - fm.height()/2 + fm.ascent(); 390 yPos = pmheight/2 - fm.height()/2 + fm.ascent();
391 p->setPen( palette().color( QPalette::Normal, sel ? \ 391 p->setPen( palette().color( QPalette::Normal, sel ? \
392 QColorGroup::HighlightedText : QColorGroup::Foreground ) ); 392 QColorGroup::HighlightedText : QColorGroup::Foreground ) );
393 p->drawText( x, yPos, text() ); 393 p->drawText( x, yPos, text() );
394 if ( mIncidence->cancelled() ) { 394 if ( mIncidence->cancelled() ) {
395 int wid = fm.width( text() ); 395 int wid = fm.width( text() );
396 p->drawLine( x, heihei/2-1 ,x+wid, heihei/2-1 ); 396 p->drawLine( x, heihei/2 ,x+wid, heihei/2 );
397 } 397 }
398 398
399} 399}
400 400
401int MonthViewItem::height(const QListBox *lb) const 401int MonthViewItem::height(const QListBox *lb) const
402{ 402{
@@ -405,13 +405,12 @@ int MonthViewItem::height(const QListBox *lb) const
405 ret = lb->fontMetrics().lineSpacing()+1; 405 ret = lb->fontMetrics().lineSpacing()+1;
406 return ret; 406 return ret;
407} 407}
408 408
409int MonthViewItem::width(const QListBox *lb) const 409int MonthViewItem::width(const QListBox *lb) const
410{ 410{
411
412 if( KOPrefs::instance()->mEnableMonthScroll || isWeekItem ) { 411 if( KOPrefs::instance()->mEnableMonthScroll || isWeekItem ) {
413 int size = PIXMAP_SIZE; 412 int size = PIXMAP_SIZE;
414 if ( QApplication::desktop()->width() < 300 ) 413 if ( QApplication::desktop()->width() < 300 )
415 size = 3; 414 size = 3;
416 int x = 1; 415 int x = 1;
417 if ( KOPrefs::instance()->mMonthShowIcons ) { 416 if ( KOPrefs::instance()->mMonthShowIcons ) {
diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp
index 9a36939..a312ba5 100644
--- a/libkcal/incidence.cpp
+++ b/libkcal/incidence.cpp
@@ -245,12 +245,13 @@ Incidence* Incidence::recreateCloneException( QDate d )
245 int len = dtStart().secsTo( ((Todo*)this)->dtDue()); 245 int len = dtStart().secsTo( ((Todo*)this)->dtDue());
246 QTime tim = ((Todo*)this)->dtDue().time(); 246 QTime tim = ((Todo*)this)->dtDue().time();
247 ((Todo*)newInc)->setDtDue( QDateTime(d, tim) ); 247 ((Todo*)newInc)->setDtDue( QDateTime(d, tim) );
248 ((Todo*)newInc)->setDtStart( ((Todo*)newInc)->dtDue().addSecs( -len ) ); 248 ((Todo*)newInc)->setDtStart( ((Todo*)newInc)->dtDue().addSecs( -len ) );
249 ((Todo*)this)->setRecurDates(); 249 ((Todo*)this)->setRecurDates();
250 } 250 }
251 newInc->setExDates( DateList () );
251 } 252 }
252 return newInc; 253 return newInc;
253} 254}
254 255
255void Incidence::recreate() 256void Incidence::recreate()
256{ 257{