summaryrefslogtreecommitdiffabout
path: root/korganizer
authorzautrix <zautrix>2005-03-18 15:12:58 (UTC)
committer zautrix <zautrix>2005-03-18 15:12:58 (UTC)
commitf9f521c487143641b2cf077d04fe1c475001bce2 (patch) (unidiff)
tree4ffac6d14ceb3e5d77f7634f2b2a49fd91a9e77a /korganizer
parent66bc0202d4e2306f7029362fe09d0c7ab0e7cc36 (diff)
downloadkdepimpi-f9f521c487143641b2cf077d04fe1c475001bce2.zip
kdepimpi-f9f521c487143641b2cf077d04fe1c475001bce2.tar.gz
kdepimpi-f9f521c487143641b2cf077d04fe1c475001bce2.tar.bz2
rec fix
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/komonthview.cpp15
1 files changed, 3 insertions, 12 deletions
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index cb69832..004ff50 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -239,1469 +239,1460 @@ void MonthViewItem::paint(QPainter *p)
239 if ( mAlarm ) { 239 if ( mAlarm ) {
240 p->fillRect ( x, y,size,size, Qt::red ); 240 p->fillRect ( x, y,size,size, Qt::red );
241 x += size + 1; 241 x += size + 1;
242 } 242 }
243 if ( mReply ) { 243 if ( mReply ) {
244 p->fillRect ( x, y,size,size, Qt::yellow ); 244 p->fillRect ( x, y,size,size, Qt::yellow );
245 x += size + 1; 245 x += size + 1;
246 } 246 }
247 } 247 }
248 if ( mMultiday ) { 248 if ( mMultiday ) {
249 int yyy = y+(size/2); 249 int yyy = y+(size/2);
250 int sizeM = size+2; 250 int sizeM = size+2;
251 p->setBrush( QBrush::SolidPattern ); 251 p->setBrush( QBrush::SolidPattern );
252 p->drawLine ( x+1, yyy, x +sizeM +sizeM/2-1, yyy ) ; 252 p->drawLine ( x+1, yyy, x +sizeM +sizeM/2-1, yyy ) ;
253 if ( mMultiday == 2 || mMultiday == 3 ) { 253 if ( mMultiday == 2 || mMultiday == 3 ) {
254 QPointArray pa ( 3 ); 254 QPointArray pa ( 3 );
255 pa.setPoint (0, x, yyy ); 255 pa.setPoint (0, x, yyy );
256 pa.setPoint (1, x+sizeM/2, yyy+sizeM/2 ); 256 pa.setPoint (1, x+sizeM/2, yyy+sizeM/2 );
257 pa.setPoint (2, x+sizeM/2, yyy-sizeM/2 ); 257 pa.setPoint (2, x+sizeM/2, yyy-sizeM/2 );
258 p->drawPolygon( pa ); 258 p->drawPolygon( pa );
259 } 259 }
260 if ( mMultiday == 2 || mMultiday == 1 ) { 260 if ( mMultiday == 2 || mMultiday == 1 ) {
261 QPointArray pa ( 3 ); 261 QPointArray pa ( 3 );
262 pa.setPoint (0, x+sizeM +sizeM/2, yyy ); 262 pa.setPoint (0, x+sizeM +sizeM/2, yyy );
263 pa.setPoint (1, x+sizeM, yyy+sizeM/2 ); 263 pa.setPoint (1, x+sizeM, yyy+sizeM/2 );
264 pa.setPoint (2, x+sizeM, yyy-sizeM/2 ); 264 pa.setPoint (2, x+sizeM, yyy-sizeM/2 );
265 p->drawPolygon( pa ); 265 p->drawPolygon( pa );
266 } 266 }
267 if ( mMultiday == 1 ) { 267 if ( mMultiday == 1 ) {
268 // p->fillRect ( x, yyy-sizeM/2+1, sizeM/2, size, QBrush ( QBrush::SolidPattern ) ); 268 // p->fillRect ( x, yyy-sizeM/2+1, sizeM/2, size, QBrush ( QBrush::SolidPattern ) );
269 269
270 p->drawLine ( x+1, yyy-sizeM/2, x+1, yyy+sizeM/2 ); 270 p->drawLine ( x+1, yyy-sizeM/2, x+1, yyy+sizeM/2 );
271 } 271 }
272 if ( mMultiday == 3 ) { 272 if ( mMultiday == 3 ) {
273 // p->fillRect ( x+sizeM, yyy-sizeM/2+1, sizeM/2, size, QBrush ( QBrush::SolidPattern ) ); 273 // p->fillRect ( x+sizeM, yyy-sizeM/2+1, sizeM/2, size, QBrush ( QBrush::SolidPattern ) );
274 p->drawLine ( x+sizeM +sizeM/2-1, yyy-sizeM/2, x+sizeM +sizeM/2-1, yyy+sizeM/2 ); 274 p->drawLine ( x+sizeM +sizeM/2-1, yyy-sizeM/2, x+sizeM +sizeM/2-1, yyy+sizeM/2 );
275 275
276 } 276 }
277 x += sizeM/2 + 1; 277 x += sizeM/2 + 1;
278 x += sizeM + 1; 278 x += sizeM + 1;
279 } 279 }
280 280
281 if ( mIncidence->type() == "Todo" ){ 281 if ( mIncidence->type() == "Todo" ){
282 Todo* td = ( Todo* ) mIncidence; 282 Todo* td = ( Todo* ) mIncidence;
283 if ( td->isCompleted() ) { 283 if ( td->isCompleted() ) {
284 int half = size/2; 284 int half = size/2;
285 p->drawLine ( x, heihei/2, x +half , heihei/2 +half ) ; 285 p->drawLine ( x, heihei/2, x +half , heihei/2 +half ) ;
286 p->drawLine ( x +half , heihei/2 +half , x +half+half +2 , heihei/2 -2 ) ; 286 p->drawLine ( x +half , heihei/2 +half , x +half+half +2 , heihei/2 -2 ) ;
287 x += half+half + 4; 287 x += half+half + 4;
288 288
289 } else { 289 } else {
290 int val = td->percentComplete()/20; 290 int val = td->percentComplete()/20;
291 p->fillRect ( x+1, y-1, val ,size+2,Qt::black ); 291 p->fillRect ( x+1, y-1, val ,size+2,Qt::black );
292 p->drawRect ( x, y-1,7,size+2); 292 p->drawRect ( x, y-1,7,size+2);
293 x += size + 3; 293 x += size + 3;
294 } 294 }
295 } 295 }
296 QFontMetrics fm = p->fontMetrics(); 296 QFontMetrics fm = p->fontMetrics();
297 int yPos; 297 int yPos;
298 int pmheight = size; 298 int pmheight = size;
299 if( pmheight < fm.height() ) 299 if( pmheight < fm.height() )
300 yPos = fm.ascent() + fm.leading()/2; 300 yPos = fm.ascent() + fm.leading()/2;
301 else 301 else
302 yPos = pmheight/2 - fm.height()/2 + fm.ascent(); 302 yPos = pmheight/2 - fm.height()/2 + fm.ascent();
303 p->setPen( palette().color( QPalette::Normal, sel ? \ 303 p->setPen( palette().color( QPalette::Normal, sel ? \
304 QColorGroup::HighlightedText : QColorGroup::Foreground ) ); 304 QColorGroup::HighlightedText : QColorGroup::Foreground ) );
305 p->drawText( x, yPos, text() ); 305 p->drawText( x, yPos, text() );
306 if ( mIncidence->cancelled() ) { 306 if ( mIncidence->cancelled() ) {
307 int wid = fm.width( text() ); 307 int wid = fm.width( text() );
308 p->drawLine( x, heihei/2 ,x+wid, heihei/2 ); 308 p->drawLine( x, heihei/2 ,x+wid, heihei/2 );
309 } 309 }
310 310
311} 311}
312 312
313int MonthViewItem::height(const QListBox *lb) const 313int MonthViewItem::height(const QListBox *lb) const
314{ 314{
315 if ( lb ) 315 if ( lb )
316 return lb->fontMetrics().lineSpacing()+1; 316 return lb->fontMetrics().lineSpacing()+1;
317 return 10; 317 return 10;
318} 318}
319 319
320int MonthViewItem::width(const QListBox *lb) const 320int MonthViewItem::width(const QListBox *lb) const
321{ 321{
322 int size = PIXMAP_SIZE; 322 int size = PIXMAP_SIZE;
323 if ( QApplication::desktop()->width() < 300 ) 323 if ( QApplication::desktop()->width() < 300 )
324 size = 3; 324 size = 3;
325 int x = 1; 325 int x = 1;
326 if ( KOPrefs::instance()->mMonthShowIcons ) { 326 if ( KOPrefs::instance()->mMonthShowIcons ) {
327 if ( mInfo ) { 327 if ( mInfo ) {
328 x += size + 1; 328 x += size + 1;
329 } 329 }
330 if( mRecur ) { 330 if( mRecur ) {
331 x += size+1; 331 x += size+1;
332 } 332 }
333 if( mAlarm ) { 333 if( mAlarm ) {
334 x += size+1; 334 x += size+1;
335 } 335 }
336 if( mReply ) { 336 if( mReply ) {
337 x += size+1; 337 x += size+1;
338 } 338 }
339 } 339 }
340 if( mMultiday ) { 340 if( mMultiday ) {
341 x += size+1+2+size/2; 341 x += size+1+2+size/2;
342 } 342 }
343 343
344 return( x + lb->fontMetrics().width( text() ) + 1 ); 344 return( x + lb->fontMetrics().width( text() ) + 1 );
345} 345}
346 346
347 347
348MonthViewCell::MonthViewCell( KOMonthView *parent,QWidget* par ) 348MonthViewCell::MonthViewCell( KOMonthView *parent,QWidget* par )
349 : QWidget( par ), 349 : QWidget( par ),
350 mMonthView( parent ) 350 mMonthView( parent )
351{ 351{
352 352
353 QVBoxLayout *topLayout = new QVBoxLayout( this ); 353 QVBoxLayout *topLayout = new QVBoxLayout( this );
354 354
355 // mLabel = new QLabel( this );QPushButton 355 // mLabel = new QLabel( this );QPushButton
356 mLabel = new QPushButton( this ); 356 mLabel = new QPushButton( this );
357 //mLabel->setFrameStyle( QFrame::Panel | QFrame::Plain ); 357 //mLabel->setFrameStyle( QFrame::Panel | QFrame::Plain );
358 //mLabel->setLineWidth( 1 ); 358 //mLabel->setLineWidth( 1 );
359 //mLabel->setAlignment( AlignCenter ); 359 //mLabel->setAlignment( AlignCenter );
360 mLabel->setFlat( true ); 360 mLabel->setFlat( true );
361 mLabel->setFocusPolicy(NoFocus); 361 mLabel->setFocusPolicy(NoFocus);
362 mItemList = new KNoScrollListBox( this ); 362 mItemList = new KNoScrollListBox( this );
363 mItemList->setMinimumSize( 10, 10 ); 363 mItemList->setMinimumSize( 10, 10 );
364 mItemList->setFrameStyle( QFrame::Panel | QFrame::Plain ); 364 mItemList->setFrameStyle( QFrame::Panel | QFrame::Plain );
365 mItemList->setLineWidth( 1 ); 365 mItemList->setLineWidth( 1 );
366 topLayout->addWidget( mItemList ); 366 topLayout->addWidget( mItemList );
367 mLabel->raise(); 367 mLabel->raise();
368 // QColor( 0,0,255 ) QColor( 160,1600,255 ) 368 // QColor( 0,0,255 ) QColor( 160,1600,255 )
369 mStandardPalette = palette(); 369 mStandardPalette = palette();
370 mStandardPalette.setColor(QColorGroup::Base, mStandardPalette.color( QPalette::Normal, QColorGroup::Background ) ); 370 mStandardPalette.setColor(QColorGroup::Base, mStandardPalette.color( QPalette::Normal, QColorGroup::Background ) );
371 371
372 enableScrollBars( false ); 372 enableScrollBars( false );
373 updateConfig(); 373 updateConfig();
374 //connect( mLabel, SIGNAL( clicked( )), SLOT( newEvent() )); 374 //connect( mLabel, SIGNAL( clicked( )), SLOT( newEvent() ));
375 connect( mLabel, SIGNAL( clicked( )), SLOT( showDay() )); 375 connect( mLabel, SIGNAL( clicked( )), SLOT( showDay() ));
376 connect( mItemList, SIGNAL( doubleClicked( QListBoxItem *) ), 376 connect( mItemList, SIGNAL( doubleClicked( QListBoxItem *) ),
377 SLOT( defaultAction( QListBoxItem * ) ) ); 377 SLOT( defaultAction( QListBoxItem * ) ) );
378 connect( mItemList, SIGNAL( rightButtonPressed( QListBoxItem *, 378 connect( mItemList, SIGNAL( rightButtonPressed( QListBoxItem *,
379 const QPoint &) ), 379 const QPoint &) ),
380 SLOT( contextMenu( QListBoxItem * ) ) ); 380 SLOT( contextMenu( QListBoxItem * ) ) );
381 connect( mItemList, SIGNAL( highlighted( QListBoxItem *) ), 381 connect( mItemList, SIGNAL( highlighted( QListBoxItem *) ),
382 SLOT( selection( QListBoxItem * ) ) ); 382 SLOT( selection( QListBoxItem * ) ) );
383 connect( mItemList, SIGNAL( clicked( QListBoxItem * ) ), 383 connect( mItemList, SIGNAL( clicked( QListBoxItem * ) ),
384 SLOT( cellClicked( QListBoxItem * ) ) ); 384 SLOT( cellClicked( QListBoxItem * ) ) );
385 connect( mItemList, SIGNAL( clicked( QListBoxItem * ) ), 385 connect( mItemList, SIGNAL( clicked( QListBoxItem * ) ),
386 SLOT( selection( QListBoxItem * ) ) ); 386 SLOT( selection( QListBoxItem * ) ) );
387} 387}
388#ifdef DESKTOP_VERSION 388#ifdef DESKTOP_VERSION
389QToolTipGroup *MonthViewCell::toolTipGroup() 389QToolTipGroup *MonthViewCell::toolTipGroup()
390{ 390{
391 if (!mToolTipGroup) mToolTipGroup = new QToolTipGroup(0); 391 if (!mToolTipGroup) mToolTipGroup = new QToolTipGroup(0);
392 return mToolTipGroup; 392 return mToolTipGroup;
393} 393}
394#endif 394#endif
395 395
396void MonthViewCell::setDate( const QDate &date ) 396void MonthViewCell::setDate( const QDate &date )
397{ 397{
398 // kdDebug() << "MonthViewCell::setDate(): " << date.toString() << endl; 398 // kdDebug() << "MonthViewCell::setDate(): " << date.toString() << endl;
399 mDate = date; 399 mDate = date;
400 400
401 401
402 402
403 //resizeEvent( 0 ); 403 //resizeEvent( 0 );
404} 404}
405 405
406QDate MonthViewCell::date() const 406QDate MonthViewCell::date() const
407{ 407{
408 return mDate; 408 return mDate;
409} 409}
410 410
411void MonthViewCell::setPrimary( bool primary ) 411void MonthViewCell::setPrimary( bool primary )
412{ 412{
413 mPrimary = primary; 413 mPrimary = primary;
414 //setMyPalette(); 414 //setMyPalette();
415} 415}
416void MonthViewCell::setMyPalette() 416void MonthViewCell::setMyPalette()
417{ 417{
418 418
419 if ( mHoliday) { 419 if ( mHoliday) {
420 setPalette( mHolidayPalette ); 420 setPalette( mHolidayPalette );
421 } else { 421 } else {
422 if ( mPrimary ) { 422 if ( mPrimary ) {
423 setPalette( mPrimaryPalette ); 423 setPalette( mPrimaryPalette );
424 } else { 424 } else {
425 setPalette( mNonPrimaryPalette ); 425 setPalette( mNonPrimaryPalette );
426 } 426 }
427 } 427 }
428 QPalette pal = palette(); 428 QPalette pal = palette();
429 429
430 mLabel->setPalette( QPalette ( pal.color( QPalette::Normal,QColorGroup::Base),pal.color(QPalette::Normal,QColorGroup::Base ) )); 430 mLabel->setPalette( QPalette ( pal.color( QPalette::Normal,QColorGroup::Base),pal.color(QPalette::Normal,QColorGroup::Base ) ));
431} 431}
432QPalette MonthViewCell::getPalette () 432QPalette MonthViewCell::getPalette ()
433{ 433{
434 if ( !KOPrefs::instance()->mMonthViewUsesDayColors ) 434 if ( !KOPrefs::instance()->mMonthViewUsesDayColors )
435 return mStandardPalette; 435 return mStandardPalette;
436 if ( mHoliday) { 436 if ( mHoliday) {
437 return mHolidayPalette ; 437 return mHolidayPalette ;
438 } else { 438 } else {
439 if ( mPrimary ) { 439 if ( mPrimary ) {
440 return mPrimaryPalette ; 440 return mPrimaryPalette ;
441 } 441 }
442 } 442 }
443 return mNonPrimaryPalette; 443 return mNonPrimaryPalette;
444} 444}
445bool MonthViewCell::isPrimary() const 445bool MonthViewCell::isPrimary() const
446{ 446{
447 return mPrimary; 447 return mPrimary;
448} 448}
449 449
450void MonthViewCell::setHoliday( bool holiday ) 450void MonthViewCell::setHoliday( bool holiday )
451{ 451{
452 mHoliday = holiday; 452 mHoliday = holiday;
453 //setMyPalette(); 453 //setMyPalette();
454} 454}
455 455
456void MonthViewCell::setHoliday( const QString &holiday ) 456void MonthViewCell::setHoliday( const QString &holiday )
457{ 457{
458 mHolidayString = holiday; 458 mHolidayString = holiday;
459 459
460 if ( !holiday.isEmpty() ) { 460 if ( !holiday.isEmpty() ) {
461 setHoliday( true ); 461 setHoliday( true );
462 } 462 }
463} 463}
464void MonthViewCell::keyPressEvent ( QKeyEvent * e ) 464void MonthViewCell::keyPressEvent ( QKeyEvent * e )
465{ 465{
466 466
467 e->ignore(); 467 e->ignore();
468 468
469} 469}
470 470
471void MonthViewCell::startUpdateCell() 471void MonthViewCell::startUpdateCell()
472{ 472{
473 473
474 mItemList->setFocusPolicy(NoFocus); 474 mItemList->setFocusPolicy(NoFocus);
475 if ( !mMonthView->isUpdatePossible() ) 475 if ( !mMonthView->isUpdatePossible() )
476 return; 476 return;
477 477
478 /* 478 /*
479 if ( !isVisible() ){ 479 if ( !isVisible() ){
480 return; 480 return;
481 } 481 }
482 */ 482 */
483 // qDebug("MonthViewCell::updateCell() "); 483 // qDebug("MonthViewCell::updateCell() ");
484 setPrimary( mDate.month()%2 ); 484 setPrimary( mDate.month()%2 );
485 setHoliday( KOGlobals::self()->calendarSystem()->dayOfWeek(mDate) == KOGlobals::self()->calendarSystem()->weekDayOfPray() || ( mDate.dayOfWeek() == 6 ) && KOPrefs::instance()-> mExcludeSaturdays); 485 setHoliday( KOGlobals::self()->calendarSystem()->dayOfWeek(mDate) == KOGlobals::self()->calendarSystem()->weekDayOfPray() || ( mDate.dayOfWeek() == 6 ) && KOPrefs::instance()-> mExcludeSaturdays);
486 if ( mDate == QDate::currentDate() ) { 486 if ( mDate == QDate::currentDate() ) {
487 mItemList->setLineWidth( 3 ); 487 mItemList->setLineWidth( 3 );
488 } else { 488 } else {
489 mItemList->setLineWidth( 1 ); 489 mItemList->setLineWidth( 1 );
490 } 490 }
491 mItemList->clear(); 491 mItemList->clear();
492 492
493#ifdef DESKTOP_VERSION 493#ifdef DESKTOP_VERSION
494 QToolTip::remove(this); 494 QToolTip::remove(this);
495#endif 495#endif
496 mToolTip.clear(); 496 mToolTip.clear();
497 //qApp->processEvents(); 497 //qApp->processEvents();
498 if ( !mHolidayString.isEmpty() ) { 498 if ( !mHolidayString.isEmpty() ) {
499 MonthViewItem *item = new MonthViewItem( 0, mDate, mHolidayString ); 499 MonthViewItem *item = new MonthViewItem( 0, mDate, mHolidayString );
500 item->setPalette( mHolidayPalette ); 500 item->setPalette( mHolidayPalette );
501 mItemList->insertItem( item ); 501 mItemList->insertItem( item );
502 mToolTip.append ( mHolidayString ); 502 mToolTip.append ( mHolidayString );
503 } 503 }
504} 504}
505 505
506void MonthViewCell::insertEvent(Event *event) 506void MonthViewCell::insertEvent(Event *event)
507{ 507{
508 QString mToolTipText; 508 QString mToolTipText;
509 mItemList->setFocusPolicy(WheelFocus); 509 mItemList->setFocusPolicy(WheelFocus);
510 if ( !(event->doesRecur() == Recurrence::rNone) ) { 510 if ( !(event->doesRecur() == Recurrence::rNone) ) {
511 if ( !KOPrefs::instance()->mMonthDailyRecur && event->doesRecur() == Recurrence::rDaily ) 511 if ( !KOPrefs::instance()->mMonthDailyRecur && event->doesRecur() == Recurrence::rDaily )
512 return; 512 return;
513 else 513 else
514 if ( !KOPrefs::instance()->mMonthWeeklyRecur && event->doesRecur() == Recurrence::rWeekly ) 514 if ( !KOPrefs::instance()->mMonthWeeklyRecur && event->doesRecur() == Recurrence::rWeekly )
515 return; 515 return;
516 } 516 }
517 517
518 if ( event->categories().contains("Holiday") || 518 if ( event->categories().contains("Holiday") ||
519 event->categories().contains(i18n("Holiday"))) { 519 event->categories().contains(i18n("Holiday"))) {
520 setHoliday( true ); 520 setHoliday( true );
521 if ( mDate.dayOfWeek() == 7 ) 521 if ( mDate.dayOfWeek() == 7 )
522 mItemList->setLineWidth( 3 ); 522 mItemList->setLineWidth( 3 );
523 } 523 }
524 QString text; 524 QString text;
525 int multiday = 0;// 1 = start, 2 = midddle, 3 = end day 525 int multiday = 0;// 1 = start, 2 = midddle, 3 = end day
526 if (event->isMultiDay()) { 526 if (event->isMultiDay()) {
527 QString prefix = "<->";multiday = 2; 527 QString prefix = "<->";multiday = 2;
528 QString time; 528 QString time;
529 if ( event->doesRecur() ) { 529 if ( event->doesRecur() ) {
530 if ( event->recursOn( mDate) ) { 530 if ( event->recursOn( mDate) ) {
531 prefix ="->" ;multiday = 1; 531 prefix ="->" ;multiday = 1;
532 } 532 }
533 else { 533 else {
534 int days = event->dtStart().date().daysTo ( event->dtEnd().date() ); 534 int days = event->dtStart().date().daysTo ( event->dtEnd().date() );
535 if ( event->recursOn( mDate.addDays( -days)) ) { 535 if ( event->recursOn( mDate.addDays( -days)) ) {
536 prefix ="<-" ;multiday = 3; 536 prefix ="<-" ;multiday = 3;
537 } 537 }
538 } 538 }
539 539
540 } else { 540 } else {
541 if (mDate == event->dtStart().date()) { 541 if (mDate == event->dtStart().date()) {
542 prefix ="->" ;multiday = 1; 542 prefix ="->" ;multiday = 1;
543 } else if (mDate == event->dtEnd().date()) { 543 } else if (mDate == event->dtEnd().date()) {
544 prefix ="<-" ;multiday = 3; 544 prefix ="<-" ;multiday = 3;
545 } 545 }
546 } 546 }
547 if ( !event->doesFloat() ) { 547 if ( !event->doesFloat() ) {
548 if ( mDate == event->dtStart().date () ) 548 if ( mDate == event->dtStart().date () )
549 time = KGlobal::locale()->formatTime(event->dtStart().time())+" "; 549 time = KGlobal::locale()->formatTime(event->dtStart().time())+" ";
550 else if ( mDate == event->dtEnd().date () ) 550 else if ( mDate == event->dtEnd().date () )
551 time = KGlobal::locale()->formatTime(event->dtEnd().time())+" "; 551 time = KGlobal::locale()->formatTime(event->dtEnd().time())+" ";
552 552
553 } 553 }
554 text = time + event->summary(); 554 text = time + event->summary();
555 mToolTipText += prefix + text; 555 mToolTipText += prefix + text;
556 } else { 556 } else {
557 if (event->doesFloat()) { 557 if (event->doesFloat()) {
558 text = event->summary(); 558 text = event->summary();
559 mToolTipText += text; 559 mToolTipText += text;
560 } 560 }
561 else { 561 else {
562 text = KGlobal::locale()->formatTime(event->dtStart().time()); 562 text = KGlobal::locale()->formatTime(event->dtStart().time());
563 text += " " + event->summary(); 563 text += " " + event->summary();
564 mToolTipText += KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary(); 564 mToolTipText += KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary();
565 } 565 }
566 } 566 }
567 567
568 MonthViewItem *item = new MonthViewItem( event, mDate, text ); 568 MonthViewItem *item = new MonthViewItem( event, mDate, text );
569 QPalette pal; 569 QPalette pal;
570 if (KOPrefs::instance()->mMonthViewUsesCategoryColor) { 570 if (KOPrefs::instance()->mMonthViewUsesCategoryColor) {
571 QStringList categories = event->categories(); 571 QStringList categories = event->categories();
572 QString cat = categories.first(); 572 QString cat = categories.first();
573 if ( KOPrefs::instance()->mMonthViewUsesForegroundColor ) { 573 if ( KOPrefs::instance()->mMonthViewUsesForegroundColor ) {
574 pal = getPalette(); 574 pal = getPalette();
575 if (cat.isEmpty()) { 575 if (cat.isEmpty()) {
576 pal.setColor(QColorGroup::Foreground,KOPrefs::instance()->mEventColor); 576 pal.setColor(QColorGroup::Foreground,KOPrefs::instance()->mEventColor);
577 } else { 577 } else {
578 pal.setColor(QColorGroup::Foreground, *(KOPrefs::instance()->categoryColor(cat))); 578 pal.setColor(QColorGroup::Foreground, *(KOPrefs::instance()->categoryColor(cat)));
579 } 579 }
580 580
581 } else { 581 } else {
582 if (cat.isEmpty()) { 582 if (cat.isEmpty()) {
583 pal = QPalette(KOPrefs::instance()->mEventColor, KOPrefs::instance()->mEventColor); 583 pal = QPalette(KOPrefs::instance()->mEventColor, KOPrefs::instance()->mEventColor);
584 } else { 584 } else {
585 pal = QPalette(*(KOPrefs::instance()->categoryColor(cat)), *(KOPrefs::instance()->categoryColor(cat))); 585 pal = QPalette(*(KOPrefs::instance()->categoryColor(cat)), *(KOPrefs::instance()->categoryColor(cat)));
586 } 586 }
587 } 587 }
588 588
589 } else { 589 } else {
590 pal = mStandardPalette ; 590 pal = mStandardPalette ;
591 } 591 }
592 item->setPalette( pal ); 592 item->setPalette( pal );
593 item->setRecur( event->recurrence()->doesRecur() ); 593 item->setRecur( event->recurrence()->doesRecur() );
594 item->setAlarm( event->isAlarmEnabled() && multiday < 2 ); 594 item->setAlarm( event->isAlarmEnabled() && multiday < 2 );
595 item->setMoreInfo( event->description().length() > 0 ); 595 item->setMoreInfo( event->description().length() > 0 );
596#ifdef DESKTOP_VERSION 596#ifdef DESKTOP_VERSION
597 Attendee *me = event->attendeeByMails(KOPrefs::instance()->mAdditionalMails, 597 Attendee *me = event->attendeeByMails(KOPrefs::instance()->mAdditionalMails,
598 KOPrefs::instance()->email()); 598 KOPrefs::instance()->email());
599 if ( me != 0 ) { 599 if ( me != 0 ) {
600 if ( me->status() == Attendee::NeedsAction && me->RSVP()) 600 if ( me->status() == Attendee::NeedsAction && me->RSVP())
601 item->setReply(true && multiday < 2); 601 item->setReply(true && multiday < 2);
602 else 602 else
603 item->setReply(false); 603 item->setReply(false);
604 } else 604 } else
605 item->setReply(false); 605 item->setReply(false);
606#endif 606#endif
607 item->setMultiDay( multiday ); 607 item->setMultiDay( multiday );
608 mItemList->insertItem( item ); 608 mItemList->insertItem( item );
609 mToolTip.append( mToolTipText ); 609 mToolTip.append( mToolTipText );
610} 610}
611void MonthViewCell::insertTodo(Todo *todo) 611void MonthViewCell::insertTodo(Todo *todo)
612{ 612{
613 mItemList->setFocusPolicy(WheelFocus); 613 mItemList->setFocusPolicy(WheelFocus);
614 QString text; 614 QString text;
615 if (todo->hasDueDate()) { 615 if (todo->hasDueDate()) {
616 if (!todo->doesFloat()) { 616 if (!todo->doesFloat()) {
617 text += KGlobal::locale()->formatTime(todo->dtDue().time()); 617 text += KGlobal::locale()->formatTime(todo->dtDue().time());
618 text += " "; 618 text += " ";
619 } 619 }
620 } 620 }
621 text += todo->summary(); 621 text += todo->summary();
622 622
623 MonthViewItem *item = new MonthViewItem( todo, mDate, text ); 623 MonthViewItem *item = new MonthViewItem( todo, mDate, text );
624 //item->setPalette( mStandardPalette ); 624 //item->setPalette( mStandardPalette );
625 QPalette pal; 625 QPalette pal;
626 if (KOPrefs::instance()->mMonthViewUsesCategoryColor) { 626 if (KOPrefs::instance()->mMonthViewUsesCategoryColor) {
627 QStringList categories = todo->categories(); 627 QStringList categories = todo->categories();
628 QString cat = categories.first(); 628 QString cat = categories.first();
629 if ( KOPrefs::instance()->mMonthViewUsesForegroundColor ) { 629 if ( KOPrefs::instance()->mMonthViewUsesForegroundColor ) {
630 pal = getPalette(); 630 pal = getPalette();
631 if (cat.isEmpty()) { 631 if (cat.isEmpty()) {
632 pal.setColor(QColorGroup::Foreground,KOPrefs::instance()->mEventColor); 632 pal.setColor(QColorGroup::Foreground,KOPrefs::instance()->mEventColor);
633 } else { 633 } else {
634 pal.setColor(QColorGroup::Foreground, *(KOPrefs::instance()->categoryColor(cat))); 634 pal.setColor(QColorGroup::Foreground, *(KOPrefs::instance()->categoryColor(cat)));
635 } 635 }
636 636
637 } else { 637 } else {
638 if (cat.isEmpty()) { 638 if (cat.isEmpty()) {
639 pal = QPalette(KOPrefs::instance()->mEventColor, KOPrefs::instance()->mEventColor); 639 pal = QPalette(KOPrefs::instance()->mEventColor, KOPrefs::instance()->mEventColor);
640 } else { 640 } else {
641 pal = QPalette(*(KOPrefs::instance()->categoryColor(cat)), *(KOPrefs::instance()->categoryColor(cat))); 641 pal = QPalette(*(KOPrefs::instance()->categoryColor(cat)), *(KOPrefs::instance()->categoryColor(cat)));
642 } 642 }
643 } 643 }
644 644
645 } else { 645 } else {
646 pal = mStandardPalette ; 646 pal = mStandardPalette ;
647 } 647 }
648 item->setPalette( pal ); 648 item->setPalette( pal );
649 item->setRecur( todo->recurrence()->doesRecur() ); 649 item->setRecur( todo->recurrence()->doesRecur() );
650 item->setAlarm( todo->isAlarmEnabled() ); 650 item->setAlarm( todo->isAlarmEnabled() );
651 item->setMoreInfo( todo->description().length() > 0 ); 651 item->setMoreInfo( todo->description().length() > 0 );
652 mItemList->insertItem( item ); 652 mItemList->insertItem( item );
653 mToolTip.append( text ); 653 mToolTip.append( text );
654} 654}
655void MonthViewCell::finishUpdateCell() 655void MonthViewCell::finishUpdateCell()
656{ 656{
657#ifdef DESKTOP_VERSION 657#ifdef DESKTOP_VERSION
658 if (mToolTip.count() > 0 ) { 658 if (mToolTip.count() > 0 ) {
659 mToolTip.sort(); 659 mToolTip.sort();
660 QToolTip::add(this,mToolTip.join("\n"),toolTipGroup(),""); 660 QToolTip::add(this,mToolTip.join("\n"),toolTipGroup(),"");
661 } 661 }
662#endif 662#endif
663 mItemList->sort(); 663 mItemList->sort();
664 //setMyPalette(); 664 //setMyPalette();
665 setMyPalette(); 665 setMyPalette();
666 QString text; 666 QString text;
667 bool smallDisplay = QApplication::desktop()->width() < 320 && KOPrefs::instance()->mMonthViewSatSunTog; 667 bool smallDisplay = QApplication::desktop()->width() < 320 && KOPrefs::instance()->mMonthViewSatSunTog;
668 if ( KOPrefs::instance()->mMonthViewWeek || KOGlobals::self()->calendarSystem()->day( mDate ) == 1 || (mDate.dayOfWeek() == 7 && !smallDisplay ) || KOPrefs::instance()->mMonthShowShort) { 668 if ( KOPrefs::instance()->mMonthViewWeek || KOGlobals::self()->calendarSystem()->day( mDate ) == 1 || (mDate.dayOfWeek() == 7 && !smallDisplay ) || KOPrefs::instance()->mMonthShowShort) {
669 text = KOGlobals::self()->calendarSystem()->monthName( mDate, true ) + " "; 669 text = KOGlobals::self()->calendarSystem()->monthName( mDate, true ) + " ";
670 mLabel->resize( mLabelBigSize ); 670 mLabel->resize( mLabelBigSize );
671 text += QString::number( KOGlobals::self()->calendarSystem()->day(mDate) ); 671 text += QString::number( KOGlobals::self()->calendarSystem()->day(mDate) );
672 } else { 672 } else {
673 mLabel->resize( mLabelSize ); 673 mLabel->resize( mLabelSize );
674 text += QString::number( KOGlobals::self()->calendarSystem()->day(mDate) ); 674 text += QString::number( KOGlobals::self()->calendarSystem()->day(mDate) );
675 } 675 }
676 676
677 mLabel->setText( text ); 677 mLabel->setText( text );
678 resizeEvent( 0 ); 678 resizeEvent( 0 );
679} 679}
680void MonthViewCell::updateCell() 680void MonthViewCell::updateCell()
681{ 681{
682 //qDebug("MonthViewCell::updateCell() "); 682 //qDebug("MonthViewCell::updateCell() ");
683 if ( !mMonthView->isUpdatePossible() ) 683 if ( !mMonthView->isUpdatePossible() )
684 return; 684 return;
685 startUpdateCell(); 685 startUpdateCell();
686 //mLabel->setMaximumWidth( width() - mItemList->lineWidth()*2); 686 //mLabel->setMaximumWidth( width() - mItemList->lineWidth()*2);
687 QPtrList<Event> events = mMonthView->calendar()->events( mDate, true ); 687 QPtrList<Event> events = mMonthView->calendar()->events( mDate, true );
688 Event *event; 688 Event *event;
689 for( event = events.first(); event; event = events.next() ) { // for event 689 for( event = events.first(); event; event = events.next() ) { // for event
690 insertEvent(event); 690 insertEvent(event);
691 } 691 }
692 // insert due todos 692 // insert due todos
693 QPtrList<Todo> todos = mMonthView->calendar()->todos( mDate ); 693 QPtrList<Todo> todos = mMonthView->calendar()->todos( mDate );
694 Todo *todo; 694 Todo *todo;
695 for(todo = todos.first(); todo; todo = todos.next()) { 695 for(todo = todos.first(); todo; todo = todos.next()) {
696 insertTodo( todo ); 696 insertTodo( todo );
697 } 697 }
698 finishUpdateCell(); 698 finishUpdateCell();
699 // if ( isVisible()) 699 // if ( isVisible())
700 //qApp->processEvents(); 700 //qApp->processEvents();
701} 701}
702 702
703void MonthViewCell::updateConfig( bool bigFont ) // = false 703void MonthViewCell::updateConfig( bool bigFont ) // = false
704{ 704{
705 705
706 if ( bigFont ) { 706 if ( bigFont ) {
707 QFont fo = KOPrefs::instance()->mMonthViewFont; 707 QFont fo = KOPrefs::instance()->mMonthViewFont;
708 int ps = fo.pointSize() + 2; 708 int ps = fo.pointSize() + 2;
709 if ( ps < 18 ) 709 if ( ps < 18 )
710 ps += 2; 710 ps += 2;
711 fo.setPointSize( ps ); 711 fo.setPointSize( ps );
712 setFont( fo ); 712 setFont( fo );
713 } else 713 } else
714 setFont( KOPrefs::instance()->mMonthViewFont ); 714 setFont( KOPrefs::instance()->mMonthViewFont );
715 715
716 QFontMetrics fm( font() ); 716 QFontMetrics fm( font() );
717 mLabelSize = fm.size( 0, "30" ) + QSize( 4, 2 ); 717 mLabelSize = fm.size( 0, "30" ) + QSize( 4, 2 );
718 mLabelBigSize = fm.size( 0, "Mag 30" ) + QSize( 2, 2 ); 718 mLabelBigSize = fm.size( 0, "Mag 30" ) + QSize( 2, 2 );
719 mHolidayPalette = mStandardPalette; 719 mHolidayPalette = mStandardPalette;
720 mPrimaryPalette = mStandardPalette; 720 mPrimaryPalette = mStandardPalette;
721 mNonPrimaryPalette = mStandardPalette; 721 mNonPrimaryPalette = mStandardPalette;
722 if ( KOPrefs::instance()->mMonthViewUsesDayColors ) { 722 if ( KOPrefs::instance()->mMonthViewUsesDayColors ) {
723 mHolidayPalette.setColor(QColorGroup::Base, KOPrefs::instance()->mMonthViewHolidayColor ); 723 mHolidayPalette.setColor(QColorGroup::Base, KOPrefs::instance()->mMonthViewHolidayColor );
724 mHolidayPalette.setColor(QColorGroup::Background, KOPrefs::instance()->mMonthViewHolidayColor ); 724 mHolidayPalette.setColor(QColorGroup::Background, KOPrefs::instance()->mMonthViewHolidayColor );
725 mHolidayPalette.setColor(QColorGroup::Foreground, KOPrefs::instance()->mMonthViewHolidayColor.dark()); 725 mHolidayPalette.setColor(QColorGroup::Foreground, KOPrefs::instance()->mMonthViewHolidayColor.dark());
726 mPrimaryPalette.setColor(QColorGroup::Foreground,KOPrefs::instance()->mMonthViewOddColor.dark()); 726 mPrimaryPalette.setColor(QColorGroup::Foreground,KOPrefs::instance()->mMonthViewOddColor.dark());
727 mPrimaryPalette.setColor(QColorGroup::Base,KOPrefs::instance()->mMonthViewOddColor); 727 mPrimaryPalette.setColor(QColorGroup::Base,KOPrefs::instance()->mMonthViewOddColor);
728 mPrimaryPalette.setColor(QColorGroup::Background,KOPrefs::instance()->mMonthViewOddColor); 728 mPrimaryPalette.setColor(QColorGroup::Background,KOPrefs::instance()->mMonthViewOddColor);
729 mNonPrimaryPalette.setColor(QColorGroup::Foreground,KOPrefs::instance()->mMonthViewEvenColor.dark()); 729 mNonPrimaryPalette.setColor(QColorGroup::Foreground,KOPrefs::instance()->mMonthViewEvenColor.dark());
730 mNonPrimaryPalette.setColor(QColorGroup::Base,KOPrefs::instance()->mMonthViewEvenColor); 730 mNonPrimaryPalette.setColor(QColorGroup::Base,KOPrefs::instance()->mMonthViewEvenColor);
731 mNonPrimaryPalette.setColor(QColorGroup::Background,KOPrefs::instance()->mMonthViewEvenColor); 731 mNonPrimaryPalette.setColor(QColorGroup::Background,KOPrefs::instance()->mMonthViewEvenColor);
732 } 732 }
733 //updateCell(); 733 //updateCell();
734} 734}
735 735
736void MonthViewCell::enableScrollBars( bool enabled ) 736void MonthViewCell::enableScrollBars( bool enabled )
737{ 737{
738 if ( enabled ) { 738 if ( enabled ) {
739 mItemList->setVScrollBarMode(QScrollView::Auto); 739 mItemList->setVScrollBarMode(QScrollView::Auto);
740 mItemList->setHScrollBarMode(QScrollView::Auto); 740 mItemList->setHScrollBarMode(QScrollView::Auto);
741 } else { 741 } else {
742 mItemList->setVScrollBarMode(QScrollView::AlwaysOff); 742 mItemList->setVScrollBarMode(QScrollView::AlwaysOff);
743 mItemList->setHScrollBarMode(QScrollView::AlwaysOff); 743 mItemList->setHScrollBarMode(QScrollView::AlwaysOff);
744 } 744 }
745} 745}
746 746
747Incidence *MonthViewCell::selectedIncidence() 747Incidence *MonthViewCell::selectedIncidence()
748{ 748{
749 int index = mItemList->currentItem(); 749 int index = mItemList->currentItem();
750 if ( index < 0 ) return 0; 750 if ( index < 0 ) return 0;
751 751
752 MonthViewItem *item = 752 MonthViewItem *item =
753 static_cast<MonthViewItem *>( mItemList->item( index ) ); 753 static_cast<MonthViewItem *>( mItemList->item( index ) );
754 754
755 if ( !item ) return 0; 755 if ( !item ) return 0;
756 756
757 return item->incidence(); 757 return item->incidence();
758} 758}
759 759
760QDate MonthViewCell::selectedIncidenceDate() 760QDate MonthViewCell::selectedIncidenceDate()
761{ 761{
762 QDate qd; 762 QDate qd;
763 int index = mItemList->currentItem(); 763 int index = mItemList->currentItem();
764 if ( index < 0 ) return qd; 764 if ( index < 0 ) return qd;
765 765
766 MonthViewItem *item = 766 MonthViewItem *item =
767 static_cast<MonthViewItem *>( mItemList->item( index ) ); 767 static_cast<MonthViewItem *>( mItemList->item( index ) );
768 768
769 if ( !item ) return qd; 769 if ( !item ) return qd;
770 770
771 return item->incidenceDate(); 771 return item->incidenceDate();
772} 772}
773 773
774void MonthViewCell::deselect() 774void MonthViewCell::deselect()
775{ 775{
776 mItemList->clearSelection(); 776 mItemList->clearSelection();
777 enableScrollBars( false ); 777 enableScrollBars( false );
778 // updateCell(); 778 // updateCell();
779} 779}
780void MonthViewCell::select() 780void MonthViewCell::select()
781{ 781{
782 ;// updateCell(); 782 ;// updateCell();
783} 783}
784 784
785void MonthViewCell::resizeEvent ( QResizeEvent * ) 785void MonthViewCell::resizeEvent ( QResizeEvent * )
786{ 786{
787 if ( !mMonthView->isUpdatePossible() ) 787 if ( !mMonthView->isUpdatePossible() )
788 return; 788 return;
789 789
790 int size = height() - mLabel->height() - 2; 790 int size = height() - mLabel->height() - 2;
791 if ( size > 0 ) 791 if ( size > 0 )
792 mItemList->verticalScrollBar()->setMaximumHeight( size ); 792 mItemList->verticalScrollBar()->setMaximumHeight( size );
793 size = width() - mLabel->width() -2; 793 size = width() - mLabel->width() -2;
794 if ( size > 0 ) 794 if ( size > 0 )
795 mItemList->horizontalScrollBar()->setMaximumWidth( size ); 795 mItemList->horizontalScrollBar()->setMaximumWidth( size );
796 mLabel->move( width()-mItemList->lineWidth() - mLabel->width(), height()-mItemList->lineWidth() - mLabel->height() ); 796 mLabel->move( width()-mItemList->lineWidth() - mLabel->width(), height()-mItemList->lineWidth() - mLabel->height() );
797 //mLabel->setMaximumWidth( width() - mItemList->lineWidth()*2); 797 //mLabel->setMaximumWidth( width() - mItemList->lineWidth()*2);
798} 798}
799 799
800void MonthViewCell::defaultAction( QListBoxItem *item ) 800void MonthViewCell::defaultAction( QListBoxItem *item )
801{ 801{
802 if ( !item ) return; 802 if ( !item ) return;
803 803
804 MonthViewItem *eventItem = static_cast<MonthViewItem *>( item ); 804 MonthViewItem *eventItem = static_cast<MonthViewItem *>( item );
805 Incidence *incidence = eventItem->incidence(); 805 Incidence *incidence = eventItem->incidence();
806 if ( incidence ) mMonthView->defaultAction( incidence ); 806 if ( incidence ) mMonthView->defaultAction( incidence );
807} 807}
808void MonthViewCell::showDay() 808void MonthViewCell::showDay()
809{ 809{
810 emit showDaySignal( date() ); 810 emit showDaySignal( date() );
811} 811}
812void MonthViewCell::newEvent() 812void MonthViewCell::newEvent()
813{ 813{
814 QDateTime dt( date(), QTime( KOPrefs::instance()->mStartTime, 0 ) ); 814 QDateTime dt( date(), QTime( KOPrefs::instance()->mStartTime, 0 ) );
815 emit newEventSignal( dt ); 815 emit newEventSignal( dt );
816} 816}
817void MonthViewCell::cellClicked( QListBoxItem *item ) 817void MonthViewCell::cellClicked( QListBoxItem *item )
818{ 818{
819 static QListBoxItem * lastClicked = 0; 819 static QListBoxItem * lastClicked = 0;
820 if ( item == 0 ) { 820 if ( item == 0 ) {
821 QDateTime dt( date(), QTime( KOPrefs::instance()->mStartTime, 0 ) ); 821 QDateTime dt( date(), QTime( KOPrefs::instance()->mStartTime, 0 ) );
822 emit newEventSignal( dt ); 822 emit newEventSignal( dt );
823 return; 823 return;
824 } 824 }
825 /* 825 /*
826 if ( lastClicked ) 826 if ( lastClicked )
827 if ( ! item ) { 827 if ( ! item ) {
828 if ( lastClicked->listBox() != item->listBox() ) 828 if ( lastClicked->listBox() != item->listBox() )
829 lastClicked->listBox()->clearSelection(); 829 lastClicked->listBox()->clearSelection();
830 } 830 }
831 */ 831 */
832 832
833 mMonthView->setSelectedCell( this ); 833 mMonthView->setSelectedCell( this );
834 if( KOPrefs::instance()->mEnableMonthScroll || KOPrefs::instance()->mMonthViewWeek ) enableScrollBars( true ); 834 if( KOPrefs::instance()->mEnableMonthScroll || KOPrefs::instance()->mMonthViewWeek ) enableScrollBars( true );
835 select(); 835 select();
836} 836}
837 837
838void MonthViewCell::contextMenu( QListBoxItem *item ) 838void MonthViewCell::contextMenu( QListBoxItem *item )
839{ 839{
840 if ( !item ) return; 840 if ( !item ) return;
841 841
842 MonthViewItem *eventItem = static_cast<MonthViewItem *>( item ); 842 MonthViewItem *eventItem = static_cast<MonthViewItem *>( item );
843 Incidence *incidence = eventItem->incidence(); 843 Incidence *incidence = eventItem->incidence();
844 if ( incidence ) mMonthView->showContextMenu( incidence ); 844 if ( incidence ) mMonthView->showContextMenu( incidence );
845} 845}
846 846
847void MonthViewCell::selection( QListBoxItem *item ) 847void MonthViewCell::selection( QListBoxItem *item )
848{ 848{
849 if ( !item ) return; 849 if ( !item ) return;
850 850
851 mMonthView->setSelectedCell( this ); 851 mMonthView->setSelectedCell( this );
852} 852}
853 853
854 854
855// ******************************************************************************* 855// *******************************************************************************
856// ******************************************************************************* 856// *******************************************************************************
857// ******************************************************************************* 857// *******************************************************************************
858 858
859 859
860KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name) 860KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
861 : KOEventView( calendar, parent, name ), 861 : KOEventView( calendar, parent, name ),
862 mDaysPerWeek( 7 ), mNumWeeks( 6 ), mNumCells( mDaysPerWeek * mNumWeeks ), 862 mDaysPerWeek( 7 ), mNumWeeks( 6 ), mNumCells( mDaysPerWeek * mNumWeeks ),
863 mWidthLongDayLabel( 0 ), mSelectedCell( 0 ) 863 mWidthLongDayLabel( 0 ), mSelectedCell( 0 )
864{ 864{
865 mShortDayLabelsM = false; 865 mShortDayLabelsM = false;
866 mShortDayLabelsW = false; 866 mShortDayLabelsW = false;
867 skipResize = false; 867 skipResize = false;
868 clPending = true; 868 clPending = true;
869 mNavigatorBar = new NavigatorBar( QDate::currentDate(), this, "useBigPixmaps" ); 869 mNavigatorBar = new NavigatorBar( QDate::currentDate(), this, "useBigPixmaps" );
870 mWidStack = new QWidgetStack( this ); 870 mWidStack = new QWidgetStack( this );
871 QVBoxLayout* hb = new QVBoxLayout( this ); 871 QVBoxLayout* hb = new QVBoxLayout( this );
872 mMonthView = new QWidget( mWidStack ); 872 mMonthView = new QWidget( mWidStack );
873 mWeekView = new QWidget( mWidStack ); 873 mWeekView = new QWidget( mWidStack );
874#if QT_VERSION >= 0x030000 874#if QT_VERSION >= 0x030000
875 mWidStack->addWidget(mMonthView ); 875 mWidStack->addWidget(mMonthView );
876 mWidStack->addWidget(mWeekView ); 876 mWidStack->addWidget(mWeekView );
877#else 877#else
878 mWidStack->addWidget( mMonthView, 1 ); 878 mWidStack->addWidget( mMonthView, 1 );
879 mWidStack->addWidget( mWeekView , 1 ); 879 mWidStack->addWidget( mWeekView , 1 );
880#endif 880#endif
881 hb->addWidget( mNavigatorBar ); 881 hb->addWidget( mNavigatorBar );
882 hb->addWidget( mWidStack ); 882 hb->addWidget( mWidStack );
883 mWeekStartsMonday = KGlobal::locale()->weekStartsMonday(); 883 mWeekStartsMonday = KGlobal::locale()->weekStartsMonday();
884 mShowWeekView = KOPrefs::instance()->mMonthViewWeek; 884 mShowWeekView = KOPrefs::instance()->mMonthViewWeek;
885 if ( mShowWeekView ) 885 if ( mShowWeekView )
886 mWeekStartsMonday = true; 886 mWeekStartsMonday = true;
887 updatePossible = false; 887 updatePossible = false;
888 //updatePossible = true; 888 //updatePossible = true;
889 mCells.setAutoDelete( true ); 889 mCells.setAutoDelete( true );
890 mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ; 890 mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ;
891 mDayLabels.resize( mDaysPerWeek ); 891 mDayLabels.resize( mDaysPerWeek );
892 mDayLabelsW.resize( mDaysPerWeek ); 892 mDayLabelsW.resize( mDaysPerWeek );
893 QFont bfont = font(); 893 QFont bfont = font();
894 if ( QApplication::desktop()->width() < 650 ) { 894 if ( QApplication::desktop()->width() < 650 ) {
895 bfont.setPointSize( bfont.pointSize() - 2 ); 895 bfont.setPointSize( bfont.pointSize() - 2 );
896 } 896 }
897 bfont.setBold( true ); 897 bfont.setBold( true );
898 int i; 898 int i;
899 899
900 for( i = 0; i < mDaysPerWeek; i++ ) { 900 for( i = 0; i < mDaysPerWeek; i++ ) {
901 QLabel *label = new QLabel( mMonthView ); 901 QLabel *label = new QLabel( mMonthView );
902 label->setFont(bfont); 902 label->setFont(bfont);
903 label->setFrameStyle(QFrame::Panel|QFrame::Raised); 903 label->setFrameStyle(QFrame::Panel|QFrame::Raised);
904 label->setLineWidth(1); 904 label->setLineWidth(1);
905 label->setAlignment(AlignCenter); 905 label->setAlignment(AlignCenter);
906 mDayLabels.insert( i, label ); 906 mDayLabels.insert( i, label );
907 label = new QLabel( mWeekView ); 907 label = new QLabel( mWeekView );
908 label->setFont(bfont); 908 label->setFont(bfont);
909 label->setFrameStyle(QFrame::Panel|QFrame::Raised); 909 label->setFrameStyle(QFrame::Panel|QFrame::Raised);
910 label->setLineWidth(1); 910 label->setLineWidth(1);
911 label->setAlignment(AlignCenter); 911 label->setAlignment(AlignCenter);
912 mDayLabelsW.insert( i, label ); 912 mDayLabelsW.insert( i, label );
913 } 913 }
914 914
915 bfont.setBold( false ); 915 bfont.setBold( false );
916 mWeekLabels.resize( mNumWeeks+1 ); 916 mWeekLabels.resize( mNumWeeks+1 );
917 mWeekLabelsW.resize( 2 ); 917 mWeekLabelsW.resize( 2 );
918 for( i = 0; i < mNumWeeks+1; i++ ) { 918 for( i = 0; i < mNumWeeks+1; i++ ) {
919 KOWeekButton *label = new KOWeekButton( mMonthView ); 919 KOWeekButton *label = new KOWeekButton( mMonthView );
920 label->setFocusPolicy(NoFocus); 920 label->setFocusPolicy(NoFocus);
921 label->setFont(bfont); 921 label->setFont(bfont);
922 connect( label, SIGNAL( selectWeekNum ( int )),this, SLOT( selectInternalWeekNum ( int )) ); 922 connect( label, SIGNAL( selectWeekNum ( int )),this, SLOT( selectInternalWeekNum ( int )) );
923 label->setFlat(true); 923 label->setFlat(true);
924 QWhatsThis::add(label,i18n("Click on the week number to\nshow week zoomed")); 924 QWhatsThis::add(label,i18n("Click on the week number to\nshow week zoomed"));
925 //label->setFrameStyle(QFrame::Panel|QFrame::Raised); 925 //label->setFrameStyle(QFrame::Panel|QFrame::Raised);
926 //label->setLineWidth(1); 926 //label->setLineWidth(1);
927 //label->setAlignment(AlignCenter); 927 //label->setAlignment(AlignCenter);
928 mWeekLabels.insert( i, label ); 928 mWeekLabels.insert( i, label );
929 } 929 }
930 mWeekLabels[mNumWeeks]->setText( i18n("W")); 930 mWeekLabels[mNumWeeks]->setText( i18n("W"));
931 QWhatsThis::add(mWeekLabels[mNumWeeks],i18n("Click on this to\nselect week number")); 931 QWhatsThis::add(mWeekLabels[mNumWeeks],i18n("Click on this to\nselect week number"));
932 932
933 for( i = 0; i < 1+1; i++ ) { 933 for( i = 0; i < 1+1; i++ ) {
934 KOWeekButton *label = new KOWeekButton( mWeekView ); 934 KOWeekButton *label = new KOWeekButton( mWeekView );
935 label->setFocusPolicy(NoFocus); 935 label->setFocusPolicy(NoFocus);
936 label->setFont(bfont); 936 label->setFont(bfont);
937 connect( label, SIGNAL( selectWeekNum ( int )),this, SLOT( selectInternalWeekNum ( int )) ); 937 connect( label, SIGNAL( selectWeekNum ( int )),this, SLOT( selectInternalWeekNum ( int )) );
938 label->setFlat(true); 938 label->setFlat(true);
939 QWhatsThis::add(label,i18n("Click on the week number to\nshow week zoomed")); 939 QWhatsThis::add(label,i18n("Click on the week number to\nshow week zoomed"));
940 //label->setFrameStyle(QFrame::Panel|QFrame::Raised); 940 //label->setFrameStyle(QFrame::Panel|QFrame::Raised);
941 //label->setLineWidth(1); 941 //label->setLineWidth(1);
942 //label->setAlignment(AlignCenter); 942 //label->setAlignment(AlignCenter);
943 mWeekLabelsW.insert( i, label ); 943 mWeekLabelsW.insert( i, label );
944 } 944 }
945 mWeekLabelsW[1]->setText( i18n("W")); 945 mWeekLabelsW[1]->setText( i18n("W"));
946 946
947 947
948 int row, col; 948 int row, col;
949 mCells.resize( mNumCells ); 949 mCells.resize( mNumCells );
950 for( row = 0; row < mNumWeeks; ++row ) { 950 for( row = 0; row < mNumWeeks; ++row ) {
951 for( col = 0; col < mDaysPerWeek; ++col ) { 951 for( col = 0; col < mDaysPerWeek; ++col ) {
952 MonthViewCell *cell = new MonthViewCell( this, mMonthView ); 952 MonthViewCell *cell = new MonthViewCell( this, mMonthView );
953 mCells.insert( row * mDaysPerWeek + col, cell ); 953 mCells.insert( row * mDaysPerWeek + col, cell );
954 954
955 connect( cell, SIGNAL( defaultAction( Incidence * ) ), 955 connect( cell, SIGNAL( defaultAction( Incidence * ) ),
956 SLOT( defaultAction( Incidence * ) ) ); 956 SLOT( defaultAction( Incidence * ) ) );
957 connect( cell, SIGNAL( newEventSignal( QDateTime ) ), 957 connect( cell, SIGNAL( newEventSignal( QDateTime ) ),
958 SIGNAL( newEventSignal( QDateTime ) ) ); 958 SIGNAL( newEventSignal( QDateTime ) ) );
959 connect( cell, SIGNAL( showDaySignal( QDate ) ), 959 connect( cell, SIGNAL( showDaySignal( QDate ) ),
960 SIGNAL( showDaySignal( QDate ) ) ); 960 SIGNAL( showDaySignal( QDate ) ) );
961 } 961 }
962 } 962 }
963 mCellsW.resize( mDaysPerWeek ); 963 mCellsW.resize( mDaysPerWeek );
964 for( col = 0; col < mDaysPerWeek; ++col ) { 964 for( col = 0; col < mDaysPerWeek; ++col ) {
965 MonthViewCell *cell = new MonthViewCell( this, mWeekView ); 965 MonthViewCell *cell = new MonthViewCell( this, mWeekView );
966 mCellsW.insert( col, cell ); 966 mCellsW.insert( col, cell );
967 967
968 connect( cell, SIGNAL( defaultAction( Incidence * ) ), 968 connect( cell, SIGNAL( defaultAction( Incidence * ) ),
969 SLOT( defaultAction( Incidence * ) ) ); 969 SLOT( defaultAction( Incidence * ) ) );
970 connect( cell, SIGNAL( newEventSignal( QDateTime ) ), 970 connect( cell, SIGNAL( newEventSignal( QDateTime ) ),
971 SIGNAL( newEventSignal( QDateTime ) ) ); 971 SIGNAL( newEventSignal( QDateTime ) ) );
972 connect( cell, SIGNAL( showDaySignal( QDate ) ), 972 connect( cell, SIGNAL( showDaySignal( QDate ) ),
973 SIGNAL( showDaySignal( QDate ) ) ); 973 SIGNAL( showDaySignal( QDate ) ) );
974 cell->updateConfig(KOPrefs::instance()->mMonthViewUsesBigFont ); 974 cell->updateConfig(KOPrefs::instance()->mMonthViewUsesBigFont );
975 } 975 }
976 976
977 //connect( mWeekLabels[mNumWeeks], SIGNAL( clicked() ), SLOT( switchView() ) ); 977 //connect( mWeekLabels[mNumWeeks], SIGNAL( clicked() ), SLOT( switchView() ) );
978 mContextMenu = eventPopup(); 978 mContextMenu = eventPopup();
979 // updateConfig(); //useless here... 979 // updateConfig(); //useless here...
980 // ... but we need mWidthLongDayLabel computed 980 // ... but we need mWidthLongDayLabel computed
981 QFontMetrics fontmetric(mDayLabels[0]->font()); 981 QFontMetrics fontmetric(mDayLabels[0]->font());
982 mWidthLongDayLabel = 0; 982 mWidthLongDayLabel = 0;
983 for (int i = 0; i < 7; i++) { 983 for (int i = 0; i < 7; i++) {
984 int width = fontmetric.width(KOGlobals::self()->calendarSystem()->weekDayName(i+1)); 984 int width = fontmetric.width(KOGlobals::self()->calendarSystem()->weekDayName(i+1));
985 if ( width > mWidthLongDayLabel ) mWidthLongDayLabel = width; 985 if ( width > mWidthLongDayLabel ) mWidthLongDayLabel = width;
986 } 986 }
987 987
988 //mWeekLabels[mNumWeeks]->setText( i18n("W")); 988 //mWeekLabels[mNumWeeks]->setText( i18n("W"));
989 989
990#if 0 990#if 0
991 if ( mShowWeekView ) 991 if ( mShowWeekView )
992 mWidStack->raiseWidget( mWeekView ); 992 mWidStack->raiseWidget( mWeekView );
993 else 993 else
994 mWidStack->raiseWidget( mMonthView ); 994 mWidStack->raiseWidget( mMonthView );
995#endif 995#endif
996 996
997 emit incidenceSelected( 0 ); 997 emit incidenceSelected( 0 );
998#ifndef DESKTOP_VERSION 998#ifndef DESKTOP_VERSION
999 resize( QApplication::desktop()->size() ); 999 resize( QApplication::desktop()->size() );
1000#else 1000#else
1001 resize(640, 480 ); 1001 resize(640, 480 );
1002 updatePossible = true; 1002 updatePossible = true;
1003#endif 1003#endif
1004 computeLayout(); 1004 computeLayout();
1005 1005
1006 if ( mShowWeekView ) 1006 if ( mShowWeekView )
1007 mWidStack->raiseWidget( mWeekView ); 1007 mWidStack->raiseWidget( mWeekView );
1008 else 1008 else
1009 mWidStack->raiseWidget( mMonthView ); 1009 mWidStack->raiseWidget( mMonthView );
1010} 1010}
1011 1011
1012KOMonthView::~KOMonthView() 1012KOMonthView::~KOMonthView()
1013{ 1013{
1014 delete mContextMenu; 1014 delete mContextMenu;
1015} 1015}
1016 1016
1017void KOMonthView::selectInternalWeekNum ( int n ) 1017void KOMonthView::selectInternalWeekNum ( int n )
1018{ 1018{
1019 switchView(); 1019 switchView();
1020 if ( !KOPrefs::instance()->mMonthViewWeek ) 1020 if ( !KOPrefs::instance()->mMonthViewWeek )
1021 emit selectMonth (); 1021 emit selectMonth ();
1022 else 1022 else
1023 emit selectWeekNum ( n ); 1023 emit selectWeekNum ( n );
1024} 1024}
1025 1025
1026int KOMonthView::currentWeek() 1026int KOMonthView::currentWeek()
1027{ 1027{
1028 if ( mShowWeekView ) 1028 if ( mShowWeekView )
1029 return mWeekLabelsW[0]->getWeekNum(); 1029 return mWeekLabelsW[0]->getWeekNum();
1030 return mWeekLabels[0]->getWeekNum(); 1030 return mWeekLabels[0]->getWeekNum();
1031} 1031}
1032void KOMonthView::switchView() 1032void KOMonthView::switchView()
1033{ 1033{
1034 if ( selectedCell( ) ) 1034 if ( selectedCell( ) )
1035 selectedCell()->deselect(); 1035 selectedCell()->deselect();
1036 mShowWeekView = !mShowWeekView; 1036 mShowWeekView = !mShowWeekView;
1037 KOPrefs::instance()->mMonthViewWeek = mShowWeekView; 1037 KOPrefs::instance()->mMonthViewWeek = mShowWeekView;
1038 if ( clPending ) { 1038 if ( clPending ) {
1039 computeLayout(); 1039 computeLayout();
1040 updateConfig(); 1040 updateConfig();
1041 } 1041 }
1042 if ( mShowWeekView ) 1042 if ( mShowWeekView )
1043 mWidStack->raiseWidget( mWeekView ); 1043 mWidStack->raiseWidget( mWeekView );
1044 else 1044 else
1045 mWidStack->raiseWidget( mMonthView ); 1045 mWidStack->raiseWidget( mMonthView );
1046 clPending = false; 1046 clPending = false;
1047} 1047}
1048 1048
1049int KOMonthView::maxDatesHint() 1049int KOMonthView::maxDatesHint()
1050{ 1050{
1051 return mNumCells; 1051 return mNumCells;
1052} 1052}
1053 1053
1054int KOMonthView::currentDateCount() 1054int KOMonthView::currentDateCount()
1055{ 1055{
1056 return mNumCells; 1056 return mNumCells;
1057} 1057}
1058 1058
1059QPtrList<Incidence> KOMonthView::selectedIncidences() 1059QPtrList<Incidence> KOMonthView::selectedIncidences()
1060{ 1060{
1061 QPtrList<Incidence> selected; 1061 QPtrList<Incidence> selected;
1062 1062
1063 if ( mSelectedCell ) { 1063 if ( mSelectedCell ) {
1064 Incidence *incidence = mSelectedCell->selectedIncidence(); 1064 Incidence *incidence = mSelectedCell->selectedIncidence();
1065 if ( incidence ) selected.append( incidence ); 1065 if ( incidence ) selected.append( incidence );
1066 } 1066 }
1067 1067
1068 return selected; 1068 return selected;
1069} 1069}
1070 1070
1071DateList KOMonthView::selectedDates() 1071DateList KOMonthView::selectedDates()
1072{ 1072{
1073 DateList selected; 1073 DateList selected;
1074 1074
1075 if ( mSelectedCell ) { 1075 if ( mSelectedCell ) {
1076 QDate qd = mSelectedCell->selectedIncidenceDate(); 1076 QDate qd = mSelectedCell->selectedIncidenceDate();
1077 if ( qd.isValid() ) selected.append( qd ); 1077 if ( qd.isValid() ) selected.append( qd );
1078 } 1078 }
1079 1079
1080 return selected; 1080 return selected;
1081} 1081}
1082 1082
1083void KOMonthView::printPreview(CalPrinter *calPrinter, const QDate &fd, 1083void KOMonthView::printPreview(CalPrinter *calPrinter, const QDate &fd,
1084 const QDate &td) 1084 const QDate &td)
1085{ 1085{
1086#ifndef KORG_NOPRINTER 1086#ifndef KORG_NOPRINTER
1087 calPrinter->preview(CalPrinter::Month, fd, td); 1087 calPrinter->preview(CalPrinter::Month, fd, td);
1088#endif 1088#endif
1089} 1089}
1090 1090
1091void KOMonthView::updateConfig() 1091void KOMonthView::updateConfig()
1092{ 1092{
1093 1093
1094 mWeekStartsMonday = KGlobal::locale()->weekStartsMonday(); 1094 mWeekStartsMonday = KGlobal::locale()->weekStartsMonday();
1095 1095
1096 if ( mShowWeekView ) { 1096 if ( mShowWeekView ) {
1097 mWeekStartsMonday = true; 1097 mWeekStartsMonday = true;
1098 } 1098 }
1099 QFontMetrics fontmetric(mDayLabels[0]->font()); 1099 QFontMetrics fontmetric(mDayLabels[0]->font());
1100 mWidthLongDayLabel = 0; 1100 mWidthLongDayLabel = 0;
1101 1101
1102 for (int i = 0; i < 7; i++) { 1102 for (int i = 0; i < 7; i++) {
1103 int width = fontmetric.width(KOGlobals::self()->calendarSystem()->weekDayName(i+1)); 1103 int width = fontmetric.width(KOGlobals::self()->calendarSystem()->weekDayName(i+1));
1104 if ( width > mWidthLongDayLabel ) mWidthLongDayLabel = width; 1104 if ( width > mWidthLongDayLabel ) mWidthLongDayLabel = width;
1105 } 1105 }
1106 bool temp = mShowSatSunComp ; 1106 bool temp = mShowSatSunComp ;
1107 mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ; 1107 mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ;
1108 if ( ! mShowWeekView ) { 1108 if ( ! mShowWeekView ) {
1109 if ( temp != KOPrefs::instance()->mMonthViewSatSunTog ) 1109 if ( temp != KOPrefs::instance()->mMonthViewSatSunTog )
1110 computeLayout(); 1110 computeLayout();
1111 } 1111 }
1112 updateDayLabels(); 1112 updateDayLabels();
1113 //qDebug("KOMonthView::updateConfig() %d %d %d ",height(), mDayLabels[0]->sizeHint().height() ,mNumWeeks); 1113 //qDebug("KOMonthView::updateConfig() %d %d %d ",height(), mDayLabels[0]->sizeHint().height() ,mNumWeeks);
1114 //int cellHeight = (height() - mDayLabels[0]->sizeHint().height()) /mNumWeeks; 1114 //int cellHeight = (height() - mDayLabels[0]->sizeHint().height()) /mNumWeeks;
1115 //resizeEvent( 0 ); 1115 //resizeEvent( 0 );
1116 for (uint i = 0; i < mCells.count(); ++i) { 1116 for (uint i = 0; i < mCells.count(); ++i) {
1117 mCells[i]->updateConfig(); 1117 mCells[i]->updateConfig();
1118 } 1118 }
1119 1119
1120 for (uint i = 0; i < mCellsW.count(); ++i) { 1120 for (uint i = 0; i < mCellsW.count(); ++i) {
1121 mCellsW[i]->updateConfig(KOPrefs::instance()->mMonthViewUsesBigFont); 1121 mCellsW[i]->updateConfig(KOPrefs::instance()->mMonthViewUsesBigFont);
1122 } 1122 }
1123#ifdef DESKTOP_VERSION 1123#ifdef DESKTOP_VERSION
1124 MonthViewCell::toolTipGroup()->setEnabled(KOPrefs::instance()->mEnableToolTips); 1124 MonthViewCell::toolTipGroup()->setEnabled(KOPrefs::instance()->mEnableToolTips);
1125#endif 1125#endif
1126 updateView(); 1126 updateView();
1127} 1127}
1128 1128
1129void KOMonthView::updateDayLabels() 1129void KOMonthView::updateDayLabels()
1130{ 1130{
1131 1131
1132 QPtrVector<QLabel> *mDayLabelsT; 1132 QPtrVector<QLabel> *mDayLabelsT;
1133 1133
1134 mDayLabelsT = &mDayLabelsW; 1134 mDayLabelsT = &mDayLabelsW;
1135 for (int i = 0; i < 7; i++) { 1135 for (int i = 0; i < 7; i++) {
1136 if (mWeekStartsMonday) { 1136 if (mWeekStartsMonday) {
1137 bool show = mShortDayLabelsW; 1137 bool show = mShortDayLabelsW;
1138 if ( i > 4 && mShowSatSunComp && mWidthLongDayLabel > (*mDayLabelsT)[i]->width() ) 1138 if ( i > 4 && mShowSatSunComp && mWidthLongDayLabel > (*mDayLabelsT)[i]->width() )
1139 show = true; 1139 show = true;
1140 (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i+1,show)); 1140 (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i+1,show));
1141 } else { 1141 } else {
1142 if (i==0) (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabelsW)); 1142 if (i==0) (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabelsW));
1143 else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabelsW)); 1143 else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabelsW));
1144 1144
1145 } 1145 }
1146 } 1146 }
1147 mDayLabelsT = &mDayLabels; 1147 mDayLabelsT = &mDayLabels;
1148 for (int i = 0; i < 7; i++) { 1148 for (int i = 0; i < 7; i++) {
1149 if (mWeekStartsMonday) { 1149 if (mWeekStartsMonday) {
1150 bool show = mShortDayLabelsM; 1150 bool show = mShortDayLabelsM;
1151 if ( i > 4 && mShowSatSunComp && mWidthLongDayLabel > (*mDayLabelsT)[i]->width() ) 1151 if ( i > 4 && mShowSatSunComp && mWidthLongDayLabel > (*mDayLabelsT)[i]->width() )
1152 show = true; 1152 show = true;
1153 (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i+1,show)); 1153 (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i+1,show));
1154 } else { 1154 } else {
1155 if (i==0) (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabelsM)); 1155 if (i==0) (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabelsM));
1156 else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabelsM)); 1156 else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabelsM));
1157 1157
1158 } 1158 }
1159 } 1159 }
1160 1160
1161} 1161}
1162 1162
1163void KOMonthView::showDates(const QDate &start, const QDate &) 1163void KOMonthView::showDates(const QDate &start, const QDate &)
1164{ 1164{
1165 // kdDebug() << "KOMonthView::showDates(): " << start.toString() << endl; 1165 // kdDebug() << "KOMonthView::showDates(): " << start.toString() << endl;
1166 1166
1167 QPtrVector<MonthViewCell> *cells; 1167 QPtrVector<MonthViewCell> *cells;
1168 QPtrVector<QLabel> *dayLabels; 1168 QPtrVector<QLabel> *dayLabels;
1169 QPtrVector<KOWeekButton> *weekLabels; 1169 QPtrVector<KOWeekButton> *weekLabels;
1170 int weekNum = 6; 1170 int weekNum = 6;
1171 if ( mShowWeekView ) { 1171 if ( mShowWeekView ) {
1172 weekNum = 1; 1172 weekNum = 1;
1173 cells = &mCellsW; 1173 cells = &mCellsW;
1174 dayLabels = &mDayLabelsW; 1174 dayLabels = &mDayLabelsW;
1175 weekLabels = &mWeekLabelsW; 1175 weekLabels = &mWeekLabelsW;
1176 } else { 1176 } else {
1177 cells = &mCells; 1177 cells = &mCells;
1178 dayLabels = &mDayLabels; 1178 dayLabels = &mDayLabels;
1179 weekLabels = &mWeekLabels; 1179 weekLabels = &mWeekLabels;
1180 } 1180 }
1181 1181
1182 mStartDate = start; 1182 mStartDate = start;
1183 1183
1184 int startWeekDay = mWeekStartsMonday ? 1 : 7; 1184 int startWeekDay = mWeekStartsMonday ? 1 : 7;
1185 1185
1186 while( KOGlobals::self()->calendarSystem()->dayOfWeek(mStartDate) != startWeekDay ) { 1186 while( KOGlobals::self()->calendarSystem()->dayOfWeek(mStartDate) != startWeekDay ) {
1187 mStartDate = mStartDate.addDays( -1 ); 1187 mStartDate = mStartDate.addDays( -1 );
1188 } 1188 }
1189 1189
1190 bool primary = false; 1190 bool primary = false;
1191 uint i; 1191 uint i;
1192 for( i = 0; i < (*cells).size(); ++i ) { 1192 for( i = 0; i < (*cells).size(); ++i ) {
1193 QDate date = mStartDate.addDays( i ); 1193 QDate date = mStartDate.addDays( i );
1194 (*cells)[i]->setDate( date ); 1194 (*cells)[i]->setDate( date );
1195 1195
1196#ifndef KORG_NOPLUGINS 1196#ifndef KORG_NOPLUGINS
1197 // add holiday, if present 1197 // add holiday, if present
1198 QString hstring(KOCore::self()->holiday(date)); 1198 QString hstring(KOCore::self()->holiday(date));
1199 (*cells)[i]->setHoliday( hstring ); 1199 (*cells)[i]->setHoliday( hstring );
1200#endif 1200#endif
1201 1201
1202 } 1202 }
1203 QDate date = mStartDate.addDays( mWeekStartsMonday ? 3 : 4 ); 1203 QDate date = mStartDate.addDays( mWeekStartsMonday ? 3 : 4 );
1204 for( i = 0; i < weekNum; ++i ) { 1204 for( i = 0; i < weekNum; ++i ) {
1205 int wno; 1205 int wno;
1206 // remember, according to ISO 8601, the first week of the year is the 1206 // remember, according to ISO 8601, the first week of the year is the
1207 // first week that contains a thursday. Thus we must subtract off 4, 1207 // first week that contains a thursday. Thus we must subtract off 4,
1208 // not just 1. 1208 // not just 1.
1209 int dayOfYear = date.dayOfYear(); 1209 int dayOfYear = date.dayOfYear();
1210 if (dayOfYear % 7 != 0) 1210 if (dayOfYear % 7 != 0)
1211 wno = dayOfYear / 7 + 1; 1211 wno = dayOfYear / 7 + 1;
1212 else 1212 else
1213 wno =dayOfYear / 7; 1213 wno =dayOfYear / 7;
1214 (*weekLabels)[i]->setWeekNum( wno ); 1214 (*weekLabels)[i]->setWeekNum( wno );
1215 date = date.addDays( 7 ); 1215 date = date.addDays( 7 );
1216 } 1216 }
1217 updateView(); 1217 updateView();
1218} 1218}
1219 1219
1220void KOMonthView::showEvents(QPtrList<Event>) 1220void KOMonthView::showEvents(QPtrList<Event>)
1221{ 1221{
1222 qDebug("KOMonthView::selectEvents is not implemented yet. "); 1222 qDebug("KOMonthView::selectEvents is not implemented yet. ");
1223} 1223}
1224 1224
1225void KOMonthView::changeEventDisplay(Event *, int) 1225void KOMonthView::changeEventDisplay(Event *, int)
1226{ 1226{
1227 // this should be re-written to be much more efficient, but this 1227 // this should be re-written to be much more efficient, but this
1228 // quick-and-dirty-hack gets the job done for right now. 1228 // quick-and-dirty-hack gets the job done for right now.
1229 updateView(); 1229 updateView();
1230} 1230}
1231 1231
1232void KOMonthView::updateView() 1232void KOMonthView::updateView()
1233{ 1233{
1234 1234
1235 if ( !updatePossible ) 1235 if ( !updatePossible )
1236 return; 1236 return;
1237 //QTime ti; 1237 //QTime ti;
1238 //ti.start(); 1238 //ti.start();
1239 clearSelection(); 1239 clearSelection();
1240 QPtrVector<MonthViewCell> *cells; 1240 QPtrVector<MonthViewCell> *cells;
1241 if ( mShowWeekView ) { 1241 if ( mShowWeekView ) {
1242 cells = &mCellsW; 1242 cells = &mCellsW;
1243 } else { 1243 } else {
1244 cells = &mCells; 1244 cells = &mCells;
1245 } 1245 }
1246#if 1 1246#if 1
1247 int i; 1247 int i;
1248 int timeSpan = (*cells).size()-1; 1248 int timeSpan = (*cells).size()-1;
1249 if ( KOPrefs::instance()->mMonthViewWeek ) 1249 if ( KOPrefs::instance()->mMonthViewWeek )
1250 timeSpan = 6; 1250 timeSpan = 6;
1251 for( i = 0; i < timeSpan + 1; ++i ) { 1251 for( i = 0; i < timeSpan + 1; ++i ) {
1252 (*cells)[i]->startUpdateCell(); 1252 (*cells)[i]->startUpdateCell();
1253 } 1253 }
1254 1254
1255 QPtrList<Event> events = calendar()->events(); 1255 QPtrList<Event> events = calendar()->events();
1256 Event *event; 1256 Event *event;
1257 QDateTime dt; 1257 QDateTime dt;
1258 bool ok; 1258 bool ok;
1259 QDate endDate = mStartDate.addDays( timeSpan ); 1259 QDate endDate = mStartDate.addDays( timeSpan );
1260 for( event = events.first(); event; event = events.next() ) { // for event 1260 for( event = events.first(); event; event = events.next() ) { // for event
1261 if ( event->doesRecur() ) { 1261 if ( event->doesRecur() ) {
1262 bool last; 1262 bool last;
1263 qDebug("********************************************** ");
1264 qDebug("Event summary: %s ", event->summary().latin1());
1265 QDateTime incidenceStart = event->recurrence()->getPreviousDateTime( QDateTime( mStartDate ) , &last ); 1263 QDateTime incidenceStart = event->recurrence()->getPreviousDateTime( QDateTime( mStartDate ) , &last );
1266 QDateTime incidenceEnd; 1264 QDateTime incidenceEnd;
1267 int eventlen = event->dtStart().date().daysTo ( event->dtEnd().date() ); 1265 int eventlen = event->dtStart().date().daysTo ( event->dtEnd().date() );
1268 qDebug("eventlen %d ", eventlen);
1269 bool invalid = false; 1266 bool invalid = false;
1270 while( true ) { 1267 while( true ) {
1271 if ( incidenceStart.isValid() ) { 1268 if ( incidenceStart.isValid() ) {
1272 incidenceEnd = incidenceStart.addDays( eventlen ); 1269 incidenceEnd = incidenceStart.addDays( eventlen );
1273 int st = incidenceStart.date().daysTo( endDate ); 1270 int st = incidenceStart.date().daysTo( endDate );
1274 if ( st >= 0 ) { // start before timeend 1271 if ( st >= 0 ) { // start before timeend
1275 int end = mStartDate.daysTo( incidenceEnd.date() ); 1272 int end = mStartDate.daysTo( incidenceEnd.date() );
1276 if ( end >= 0 ) { // end after timestart --- got one! 1273 if ( end >= 0 ) { // end after timestart --- got one!
1277 //normalize 1274 //normalize
1278 st = timeSpan - st; 1275 st = timeSpan - st;
1279 if ( st < 0 ) st = 0; 1276 if ( st < 0 ) st = 0;
1280 if ( end > timeSpan ) end = timeSpan; 1277 if ( end > timeSpan ) end = timeSpan;
1281 int iii; 1278 int iii;
1282 //qDebug("found %s %d %d ",event->summary().latin1(), st, end ); 1279 //qDebug("found %s %d %d ",event->summary().latin1(), st, end );
1283 for ( iii = st;iii<= end;++iii) 1280 for ( iii = st;iii<= end;++iii)
1284 (*cells)[iii]->insertEvent( event ); 1281 (*cells)[iii]->insertEvent( event );
1285 } 1282 }
1286 } 1283 }
1287 } else { 1284 } else {
1288 if ( invalid ) 1285 if ( invalid )
1289 break; 1286 break;
1290 invalid = true; 1287 invalid = true;
1291 qDebug("invalid %s", event->summary().latin1()); 1288 //qDebug("invalid %s", event->summary().latin1());
1292 incidenceStart = QDateTime( mStartDate ).addSecs( -2 );; 1289 incidenceStart = QDateTime( mStartDate ).addSecs( -2 );;
1293 } 1290 }
1294 if ( last ) 1291 if ( last )
1295 break; 1292 break;
1296 bool ok; 1293 bool ok;
1297 qDebug("TRY next occurence %s ", incidenceStart.toString().latin1());
1298 incidenceStart = event->getNextOccurence( incidenceStart.addSecs( 1 ) ,&ok ); 1294 incidenceStart = event->getNextOccurence( incidenceStart.addSecs( 1 ) ,&ok );
1299 if ( ! ok ) { 1295 if ( ! ok )
1300 qDebug("NOT OK ");
1301 break; 1296 break;
1302 } 1297 if ( incidenceStart.date() > endDate )
1303 if ( incidenceStart.date() > endDate ) {
1304 qDebug("incidenceStart.date() > endDate ");
1305 break; 1298 break;
1306 }
1307 qDebug("next occurence %s ", incidenceStart.toString().latin1());
1308 } 1299 }
1309 } else { // no recur 1300 } else { // no recur
1310 int st = event->dtStart().date().daysTo( endDate ); 1301 int st = event->dtStart().date().daysTo( endDate );
1311 if ( st >= 0 ) { // start before timeend 1302 if ( st >= 0 ) { // start before timeend
1312 int end = mStartDate.daysTo( event->dtEnd().date() ); 1303 int end = mStartDate.daysTo( event->dtEnd().date() );
1313 if ( end >= 0 ) { // end after timestart --- got one! 1304 if ( end >= 0 ) { // end after timestart --- got one!
1314 //normalize 1305 //normalize
1315 st = timeSpan - st; 1306 st = timeSpan - st;
1316 if ( st < 0 ) st = 0; 1307 if ( st < 0 ) st = 0;
1317 if ( end > timeSpan ) end = timeSpan; 1308 if ( end > timeSpan ) end = timeSpan;
1318 int iii; 1309 int iii;
1319 for ( iii = st;iii<= end;++iii) 1310 for ( iii = st;iii<= end;++iii)
1320 (*cells)[iii]->insertEvent( event ); 1311 (*cells)[iii]->insertEvent( event );
1321 } 1312 }
1322 } 1313 }
1323 } 1314 }
1324 } 1315 }
1325 // insert due todos 1316 // insert due todos
1326 QPtrList<Todo> todos = calendar()->todos( ); 1317 QPtrList<Todo> todos = calendar()->todos( );
1327 Todo *todo; 1318 Todo *todo;
1328 for(todo = todos.first(); todo; todo = todos.next()) { 1319 for(todo = todos.first(); todo; todo = todos.next()) {
1329 //insertTodo( todo ); 1320 //insertTodo( todo );
1330 if ( todo->hasDueDate() ) { 1321 if ( todo->hasDueDate() ) {
1331 int day = mStartDate.daysTo( todo->dtDue().date() ); 1322 int day = mStartDate.daysTo( todo->dtDue().date() );
1332 if ( day >= 0 && day < timeSpan + 1) { 1323 if ( day >= 0 && day < timeSpan + 1) {
1333 (*cells)[day]->insertTodo( todo ); 1324 (*cells)[day]->insertTodo( todo );
1334 } 1325 }
1335 } 1326 }
1336 } 1327 }
1337 1328
1338 for( i = 0; i < timeSpan+1; ++i ) { 1329 for( i = 0; i < timeSpan+1; ++i ) {
1339 (*cells)[i]->finishUpdateCell(); 1330 (*cells)[i]->finishUpdateCell();
1340 } 1331 }
1341 processSelectionChange(); 1332 processSelectionChange();
1342 (*cells)[0]->setFocus(); 1333 (*cells)[0]->setFocus();
1343 1334
1344 1335
1345#else 1336#else
1346 // old code 1337 // old code
1347 //qDebug("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ "); 1338 //qDebug("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ");
1348 int i; 1339 int i;
1349 for( i = 0; i < (*cells).count(); ++i ) { 1340 for( i = 0; i < (*cells).count(); ++i ) {
1350 (*cells)[i]->updateCell(); 1341 (*cells)[i]->updateCell();
1351 } 1342 }
1352 1343
1353 //qDebug("KOMonthView::updateView() "); 1344 //qDebug("KOMonthView::updateView() ");
1354 processSelectionChange(); 1345 processSelectionChange();
1355 // qDebug("---------------------------------------------------------------------+ "); 1346 // qDebug("---------------------------------------------------------------------+ ");
1356 (*cells)[0]->setFocus(); 1347 (*cells)[0]->setFocus();
1357#endif 1348#endif
1358 1349
1359 //qDebug("update time %d ", ti.elapsed()); 1350 //qDebug("update time %d ", ti.elapsed());
1360} 1351}
1361 1352
1362void KOMonthView::resizeEvent(QResizeEvent * e) 1353void KOMonthView::resizeEvent(QResizeEvent * e)
1363{ 1354{
1364 //qDebug("KOMonthView::resizeEvent %d %d -- %d %d ", e->size().width(), e->size().height(), e->oldSize().width(), e->oldSize().height()); 1355 //qDebug("KOMonthView::resizeEvent %d %d -- %d %d ", e->size().width(), e->size().height(), e->oldSize().width(), e->oldSize().height());
1365 computeLayout(); 1356 computeLayout();
1366 clPending = true; 1357 clPending = true;
1367 if ( mShowWeekView ) 1358 if ( mShowWeekView )
1368 mCellsW[0]->setFocus(); 1359 mCellsW[0]->setFocus();
1369 else 1360 else
1370 mCells[0]->setFocus(); 1361 mCells[0]->setFocus();
1371} 1362}
1372void KOMonthView::computeLayoutWeek() 1363void KOMonthView::computeLayoutWeek()
1373{ 1364{
1374 static int lastWid = 0; 1365 static int lastWid = 0;
1375 static int lastHei = 0; 1366 static int lastHei = 0;
1376 int daysToShow; 1367 int daysToShow;
1377 bool combinedSatSun = false; 1368 bool combinedSatSun = false;
1378 if (mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ) { 1369 if (mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ) {
1379 daysToShow = 6; 1370 daysToShow = 6;
1380 combinedSatSun = true; 1371 combinedSatSun = true;
1381 } 1372 }
1382 int tWid = topLevelWidget()->size().width(); 1373 int tWid = topLevelWidget()->size().width();
1383 int tHei = topLevelWidget()->size().height(); 1374 int tHei = topLevelWidget()->size().height();
1384 1375
1385 int wid = width();//e 1376 int wid = width();//e
1386 int hei = height()-1-mNavigatorBar->height(); 1377 int hei = height()-1-mNavigatorBar->height();
1387 1378
1388 if ( ((wid *3)/2) < tWid && (( hei *3) /2) < tHei ) 1379 if ( ((wid *3)/2) < tWid && (( hei *3) /2) < tHei )
1389 return; 1380 return;
1390 1381
1391 if ( lastWid == width() && lastHei == height() ) 1382 if ( lastWid == width() && lastHei == height() )
1392 return; 1383 return;
1393 lastWid = width(); 1384 lastWid = width();
1394 lastHei = height(); 1385 lastHei = height();
1395 1386
1396 1387
1397 if ( wid < hei ) 1388 if ( wid < hei )
1398 daysToShow = 2; 1389 daysToShow = 2;
1399 else 1390 else
1400 daysToShow = 3; 1391 daysToShow = 3;
1401 mShowSatSunComp = true; 1392 mShowSatSunComp = true;
1402 combinedSatSun = true; 1393 combinedSatSun = true;
1403 1394
1404 //qDebug("KOMonthView::computeLayout() WWW ------------------------------------ "); 1395 //qDebug("KOMonthView::computeLayout() WWW ------------------------------------ ");
1405 QFontMetrics fm ( mWeekLabels[0]->font() ); 1396 QFontMetrics fm ( mWeekLabels[0]->font() );
1406 int weeklabelwid = fm.width( "888" ); 1397 int weeklabelwid = fm.width( "888" );
1407 wid -= weeklabelwid; 1398 wid -= weeklabelwid;
1408 1399
1409 int colWid = wid / daysToShow; 1400 int colWid = wid / daysToShow;
1410 int lastCol = wid - ( colWid*6 ); 1401 int lastCol = wid - ( colWid*6 );
1411 int dayLabelHei = mDayLabelsW[0]->sizeHint().height(); 1402 int dayLabelHei = mDayLabelsW[0]->sizeHint().height();
1412 int cellHei = (hei - (5- daysToShow )*dayLabelHei) /(5- daysToShow ); 1403 int cellHei = (hei - (5- daysToShow )*dayLabelHei) /(5- daysToShow );
1413 int colModulo = wid % daysToShow; 1404 int colModulo = wid % daysToShow;
1414 int rowModulo = (hei- (5- daysToShow )*dayLabelHei) % daysToShow-1; 1405 int rowModulo = (hei- (5- daysToShow )*dayLabelHei) % daysToShow-1;
1415 //qDebug("rowmod %d ", rowModulo); 1406 //qDebug("rowmod %d ", rowModulo);
1416 int i; 1407 int i;
1417 int x,y,w,h; 1408 int x,y,w,h;
1418 x= 0; 1409 x= 0;
1419 y= 0; 1410 y= 0;
1420 w = colWid; 1411 w = colWid;
1421 h = dayLabelHei ; 1412 h = dayLabelHei ;
1422 for ( i = 0; i < 7; i++) { 1413 for ( i = 0; i < 7; i++) {
1423 if ( i && !( i % daysToShow) && i < 6) { 1414 if ( i && !( i % daysToShow) && i < 6) {
1424 y += hei/(5-daysToShow); 1415 y += hei/(5-daysToShow);
1425 x = 0; 1416 x = 0;
1426 w = colWid; 1417 w = colWid;
1427 } 1418 }
1428 if ( ((i) % daysToShow) >= daysToShow-colModulo ) { 1419 if ( ((i) % daysToShow) >= daysToShow-colModulo ) {
1429 ++w; 1420 ++w;
1430 } 1421 }
1431 if ( i >= 5 ) { 1422 if ( i >= 5 ) {
1432 mDayLabelsW[i]->setGeometry( x+weeklabelwid,y,w/2+w%2,h); 1423 mDayLabelsW[i]->setGeometry( x+weeklabelwid,y,w/2+w%2,h);
1433 x -= (w/2 ); 1424 x -= (w/2 );
1434 } 1425 }
1435 else 1426 else
1436 mDayLabelsW[i]->setGeometry( x+weeklabelwid,y,w,h); 1427 mDayLabelsW[i]->setGeometry( x+weeklabelwid,y,w,h);
1437 x += w; 1428 x += w;
1438 } 1429 }
1439 x= 0; 1430 x= 0;
1440 y= dayLabelHei; 1431 y= dayLabelHei;
1441 w = colWid; 1432 w = colWid;
1442 h = cellHei; 1433 h = cellHei;
1443 for ( i = 0; i < mCellsW.count(); ++i) { 1434 for ( i = 0; i < mCellsW.count(); ++i) {
1444 if ( i > 6 ) { 1435 if ( i > 6 ) {
1445 mCellsW[i]->hide(); 1436 mCellsW[i]->hide();
1446 continue; 1437 continue;
1447 } 1438 }
1448 1439
1449 w = colWid; 1440 w = colWid;
1450 if ( ((i) % daysToShow) >= daysToShow-colModulo ) { 1441 if ( ((i) % daysToShow) >= daysToShow-colModulo ) {
1451 ++w; 1442 ++w;
1452 } 1443 }
1453 if ( i == (daysToShow-1-rowModulo)*7) 1444 if ( i == (daysToShow-1-rowModulo)*7)
1454 ++h; 1445 ++h;
1455 1446
1456 if ( i >= 5 ) { 1447 if ( i >= 5 ) {
1457 if ( i ==5 ) { 1448 if ( i ==5 ) {
1458 mCellsW[i]->setGeometry ( x+weeklabelwid,y,w,h/2 ); 1449 mCellsW[i]->setGeometry ( x+weeklabelwid,y,w,h/2 );
1459 x -= w ;y += h/2; 1450 x -= w ;y += h/2;
1460 } else { 1451 } else {
1461 if ( ((i-1) % daysToShow) >= daysToShow-colModulo ) { 1452 if ( ((i-1) % daysToShow) >= daysToShow-colModulo ) {
1462 ++w; 1453 ++w;
1463 } 1454 }
1464 mCellsW[i]->setGeometry ( x+weeklabelwid,y,w,h-h/2 ); 1455 mCellsW[i]->setGeometry ( x+weeklabelwid,y,w,h-h/2 );
1465 y -= h/2; 1456 y -= h/2;
1466 } 1457 }
1467 } else 1458 } else
1468 mCellsW[i]->setGeometry ( x+weeklabelwid,y,w,h ); 1459 mCellsW[i]->setGeometry ( x+weeklabelwid,y,w,h );
1469 1460
1470 1461
1471 x += w; 1462 x += w;
1472 if ( x + w/2 > wid ) { 1463 if ( x + w/2 > wid ) {
1473 x = 0; 1464 x = 0;
1474 y += h+dayLabelHei ; 1465 y += h+dayLabelHei ;
1475 } 1466 }
1476 } 1467 }
1477 y= dayLabelHei; 1468 y= dayLabelHei;
1478 h = cellHei ; 1469 h = cellHei ;
1479 mWeekLabelsW[0]->setGeometry( 0,y,weeklabelwid,hei-dayLabelHei); 1470 mWeekLabelsW[0]->setGeometry( 0,y,weeklabelwid,hei-dayLabelHei);
1480 mWeekLabelsW[1]->setGeometry( 0,0,weeklabelwid,dayLabelHei); 1471 mWeekLabelsW[1]->setGeometry( 0,0,weeklabelwid,dayLabelHei);
1481 // qDebug("RRRRRRRRRRRRR %d %d old %d %d", e->size().width(),e->size().height() , e->oldSize().width(),e->oldSize().height()); 1472 // qDebug("RRRRRRRRRRRRR %d %d old %d %d", e->size().width(),e->size().height() , e->oldSize().width(),e->oldSize().height());
1482 //qDebug("parent %d %d ", topLevelWidget()->size().width(), topLevelWidget()->size().height()); 1473 //qDebug("parent %d %d ", topLevelWidget()->size().width(), topLevelWidget()->size().height());
1483 mShortDayLabelsW = mDayLabelsW[0]->width()-2 < mWidthLongDayLabel ; 1474 mShortDayLabelsW = mDayLabelsW[0]->width()-2 < mWidthLongDayLabel ;
1484 updateDayLabels(); 1475 updateDayLabels();
1485 //bool forceUpdate = !updatePossible; 1476 //bool forceUpdate = !updatePossible;
1486 updatePossible = true; 1477 updatePossible = true;
1487 //mWeekLabels[mNumWeeks]->setText( i18n("M")); 1478 //mWeekLabels[mNumWeeks]->setText( i18n("M"));
1488 //if ( forceUpdate ) 1479 //if ( forceUpdate )
1489 // updateView(); 1480 // updateView();
1490} 1481}
1491void KOMonthView::computeLayout() 1482void KOMonthView::computeLayout()
1492{ 1483{
1493 1484
1494 1485
1495 static int lastWid = 0; 1486 static int lastWid = 0;
1496 static int lastHei = 0; 1487 static int lastHei = 0;
1497 1488
1498 if ( mShowWeekView ){ 1489 if ( mShowWeekView ){
1499 computeLayoutWeek(); 1490 computeLayoutWeek();
1500 return; 1491 return;
1501 } 1492 }
1502 int daysToShow = 7; 1493 int daysToShow = 7;
1503 bool combinedSatSun = false; 1494 bool combinedSatSun = false;
1504 if (mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ) { 1495 if (mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ) {
1505 daysToShow = 6; 1496 daysToShow = 6;
1506 combinedSatSun = true; 1497 combinedSatSun = true;
1507 } 1498 }
1508 int tWid = topLevelWidget()->size().width(); 1499 int tWid = topLevelWidget()->size().width();
1509 int tHei = topLevelWidget()->size().height(); 1500 int tHei = topLevelWidget()->size().height();
1510 1501
1511 int wid = width();//e 1502 int wid = width();//e
1512 int hei = height()-1-mNavigatorBar->height(); 1503 int hei = height()-1-mNavigatorBar->height();
1513 1504
1514 if ( ((wid *3)/2) < tWid && (( hei *3) /2) < tHei ) { 1505 if ( ((wid *3)/2) < tWid && (( hei *3) /2) < tHei ) {
1515 return; 1506 return;
1516 } 1507 }
1517 if ( lastWid == width() && lastHei == height() ){ 1508 if ( lastWid == width() && lastHei == height() ){
1518 return; 1509 return;
1519 } 1510 }
1520 1511
1521 lastWid = width(); 1512 lastWid = width();
1522 lastHei = height(); 1513 lastHei = height();
1523 //qDebug("KOMonthView::computeLayout() MMM ------------------------------------ "); 1514 //qDebug("KOMonthView::computeLayout() MMM ------------------------------------ ");
1524 QFontMetrics fm ( mWeekLabels[0]->font() ); 1515 QFontMetrics fm ( mWeekLabels[0]->font() );
1525 int weeklabelwid = fm.width( "888" ); 1516 int weeklabelwid = fm.width( "888" );
1526 wid -= weeklabelwid; 1517 wid -= weeklabelwid;
1527 1518
1528 int colWid = wid / daysToShow; 1519 int colWid = wid / daysToShow;
1529 int lastCol = wid - ( colWid*6 ); 1520 int lastCol = wid - ( colWid*6 );
1530 int dayLabelHei = mDayLabels[0]->sizeHint().height(); 1521 int dayLabelHei = mDayLabels[0]->sizeHint().height();
1531 int cellHei = (hei - dayLabelHei) /6; 1522 int cellHei = (hei - dayLabelHei) /6;
1532 int colModulo = wid % daysToShow; 1523 int colModulo = wid % daysToShow;
1533 int rowModulo = (hei- dayLabelHei) % 6; 1524 int rowModulo = (hei- dayLabelHei) % 6;
1534 //qDebug("rowmod %d ", rowModulo); 1525 //qDebug("rowmod %d ", rowModulo);
1535 int i; 1526 int i;
1536 int x,y,w,h; 1527 int x,y,w,h;
1537 x= 0; 1528 x= 0;
1538 y= 0; 1529 y= 0;
1539 w = colWid; 1530 w = colWid;
1540 h = dayLabelHei ; 1531 h = dayLabelHei ;
1541 for ( i = 0; i < 7; i++) { 1532 for ( i = 0; i < 7; i++) {
1542 if ( i == daysToShow-colModulo ) 1533 if ( i == daysToShow-colModulo )
1543 ++w; 1534 ++w;
1544 if ( combinedSatSun ) { 1535 if ( combinedSatSun ) {
1545 if ( i >= daysToShow-1 ) { 1536 if ( i >= daysToShow-1 ) {
1546 mDayLabels[i]->setGeometry( x+weeklabelwid,y,w/2,h); 1537 mDayLabels[i]->setGeometry( x+weeklabelwid,y,w/2,h);
1547 x -= w/2 ; 1538 x -= w/2 ;
1548 } 1539 }
1549 else 1540 else
1550 mDayLabels[i]->setGeometry( x+weeklabelwid,y,w,h); 1541 mDayLabels[i]->setGeometry( x+weeklabelwid,y,w,h);
1551 } else 1542 } else
1552 mDayLabels[i]->setGeometry( x+weeklabelwid,y,w,h); 1543 mDayLabels[i]->setGeometry( x+weeklabelwid,y,w,h);
1553 x += w; 1544 x += w;
1554 } 1545 }
1555 x= 0; 1546 x= 0;
1556 y= dayLabelHei; 1547 y= dayLabelHei;
1557 w = colWid; 1548 w = colWid;
1558 h = cellHei ; 1549 h = cellHei ;
1559 for ( i = 0; i < mCells.count(); ++i) { 1550 for ( i = 0; i < mCells.count(); ++i) {
1560 //qDebug("iii %d ", i); 1551 //qDebug("iii %d ", i);
1561 w = colWid; 1552 w = colWid;
1562 if ( ((i) % 7) >= 7-colModulo ) { 1553 if ( ((i) % 7) >= 7-colModulo ) {
1563 ++w; 1554 ++w;
1564 } 1555 }
1565 if ( i == (6-rowModulo)*7) 1556 if ( i == (6-rowModulo)*7)
1566 ++h; 1557 ++h;
1567 if ( combinedSatSun ) { 1558 if ( combinedSatSun ) {
1568 if ( (i)%7 >= daysToShow-1 ) { 1559 if ( (i)%7 >= daysToShow-1 ) {
1569 if ( (i)%7 == daysToShow-1 ) { 1560 if ( (i)%7 == daysToShow-1 ) {
1570 mCells[i]->setGeometry ( x+weeklabelwid,y,w,h/2 ); 1561 mCells[i]->setGeometry ( x+weeklabelwid,y,w,h/2 );
1571 x -= w ;y += h/2; 1562 x -= w ;y += h/2;
1572 } else { 1563 } else {
1573 mCells[i]->setGeometry ( x+weeklabelwid,y,w,h-h/2 ); 1564 mCells[i]->setGeometry ( x+weeklabelwid,y,w,h-h/2 );
1574 y -= h/2; 1565 y -= h/2;
1575 } 1566 }
1576 } else 1567 } else
1577 mCells[i]->setGeometry ( x+weeklabelwid,y,w,h ); 1568 mCells[i]->setGeometry ( x+weeklabelwid,y,w,h );
1578 1569
1579 } 1570 }
1580 else 1571 else
1581 mCells[i]->setGeometry ( x+weeklabelwid,y,w,h ); 1572 mCells[i]->setGeometry ( x+weeklabelwid,y,w,h );
1582 x += w; 1573 x += w;
1583 if ( x + w/2 > wid ) { 1574 if ( x + w/2 > wid ) {
1584 x = 0; 1575 x = 0;
1585 y += h; 1576 y += h;
1586 } 1577 }
1587 } 1578 }
1588 y= dayLabelHei; 1579 y= dayLabelHei;
1589 h = cellHei ; 1580 h = cellHei ;
1590 for ( i = 0; i < 6; i++) { 1581 for ( i = 0; i < 6; i++) {
1591 if ( i == (6-rowModulo)) 1582 if ( i == (6-rowModulo))
1592 ++h; 1583 ++h;
1593 mWeekLabels[i]->setGeometry( 0,y,weeklabelwid,h); 1584 mWeekLabels[i]->setGeometry( 0,y,weeklabelwid,h);
1594 y += h; 1585 y += h;
1595 } 1586 }
1596 mWeekLabels[6]->setGeometry( 0,0,weeklabelwid,dayLabelHei); 1587 mWeekLabels[6]->setGeometry( 0,0,weeklabelwid,dayLabelHei);
1597 // qDebug("RRRRRRRRRRRRR %d %d old %d %d", e->size().width(),e->size().height() , e->oldSize().width(),e->oldSize().height()); 1588 // qDebug("RRRRRRRRRRRRR %d %d old %d %d", e->size().width(),e->size().height() , e->oldSize().width(),e->oldSize().height());
1598 //qDebug("parent %d %d ", topLevelWidget()->size().width(), topLevelWidget()->size().height()); 1589 //qDebug("parent %d %d ", topLevelWidget()->size().width(), topLevelWidget()->size().height());
1599 mShortDayLabelsM = mDayLabels[0]->width()-2 < mWidthLongDayLabel ; 1590 mShortDayLabelsM = mDayLabels[0]->width()-2 < mWidthLongDayLabel ;
1600 updateDayLabels(); 1591 updateDayLabels();
1601 //bool forceUpdate = !updatePossible; 1592 //bool forceUpdate = !updatePossible;
1602 updatePossible = true; 1593 updatePossible = true;
1603 //mWeekLabels[mNumWeeks]->setText( i18n("W")); 1594 //mWeekLabels[mNumWeeks]->setText( i18n("W"));
1604} 1595}
1605 1596
1606void KOMonthView::showContextMenu( Incidence *incidence ) 1597void KOMonthView::showContextMenu( Incidence *incidence )
1607{ 1598{
1608 mContextMenu->showIncidencePopup(incidence); 1599 mContextMenu->showIncidencePopup(incidence);
1609 /* 1600 /*
1610 if( incidence && incidence->type() == "Event" ) { 1601 if( incidence && incidence->type() == "Event" ) {
1611 Event *event = static_cast<Event *>(incidence); 1602 Event *event = static_cast<Event *>(incidence);
1612 mContextMenu->showEventPopup(event); 1603 mContextMenu->showEventPopup(event);
1613 } else { 1604 } else {
1614 kdDebug() << "MonthView::showContextMenu(): cast failed." << endl; 1605 kdDebug() << "MonthView::showContextMenu(): cast failed." << endl;
1615 } 1606 }
1616 */ 1607 */
1617} 1608}
1618MonthViewCell * KOMonthView::selectedCell( ) 1609MonthViewCell * KOMonthView::selectedCell( )
1619{ 1610{
1620 return mSelectedCell; 1611 return mSelectedCell;
1621} 1612}
1622void KOMonthView::setSelectedCell( MonthViewCell *cell ) 1613void KOMonthView::setSelectedCell( MonthViewCell *cell )
1623{ 1614{
1624 //qDebug("KOMonthView::setSelectedCell "); 1615 //qDebug("KOMonthView::setSelectedCell ");
1625 if ( mSelectedCell && mSelectedCell != cell ) { 1616 if ( mSelectedCell && mSelectedCell != cell ) {
1626 MonthViewCell * mvc = mSelectedCell; 1617 MonthViewCell * mvc = mSelectedCell;
1627 mSelectedCell = cell; 1618 mSelectedCell = cell;
1628 mvc->deselect(); 1619 mvc->deselect();
1629 } else 1620 } else
1630 mSelectedCell = cell; 1621 mSelectedCell = cell;
1631 // if ( mSelectedCell ) 1622 // if ( mSelectedCell )
1632 // mSelectedCell->select(); 1623 // mSelectedCell->select();
1633 if ( !mSelectedCell ) 1624 if ( !mSelectedCell )
1634 emit incidenceSelected( 0 ); 1625 emit incidenceSelected( 0 );
1635 else 1626 else
1636 emit incidenceSelected( mSelectedCell->selectedIncidence() ); 1627 emit incidenceSelected( mSelectedCell->selectedIncidence() );
1637} 1628}
1638 1629
1639void KOMonthView::processSelectionChange() 1630void KOMonthView::processSelectionChange()
1640{ 1631{
1641 QPtrList<Incidence> incidences = selectedIncidences(); 1632 QPtrList<Incidence> incidences = selectedIncidences();
1642 if (incidences.count() > 0) { 1633 if (incidences.count() > 0) {
1643 emit incidenceSelected( incidences.first() ); 1634 emit incidenceSelected( incidences.first() );
1644 } else { 1635 } else {
1645 emit incidenceSelected( 0 ); 1636 emit incidenceSelected( 0 );
1646 clearSelection(); 1637 clearSelection();
1647 } 1638 }
1648} 1639}
1649 1640
1650void KOMonthView::clearSelection() 1641void KOMonthView::clearSelection()
1651{ 1642{
1652 if ( mSelectedCell ) { 1643 if ( mSelectedCell ) {
1653 mSelectedCell->deselect(); 1644 mSelectedCell->deselect();
1654 mSelectedCell = 0; 1645 mSelectedCell = 0;
1655 } 1646 }
1656} 1647}
1657void KOMonthView::keyPressEvent ( QKeyEvent * e ) 1648void KOMonthView::keyPressEvent ( QKeyEvent * e )
1658{ 1649{
1659 //qDebug("KOMonthView::keyPressEvent "); 1650 //qDebug("KOMonthView::keyPressEvent ");
1660 switch(e->key()) { 1651 switch(e->key()) {
1661 case Key_Up: 1652 case Key_Up:
1662 { 1653 {
1663 if ( mShowWeekView ) { 1654 if ( mShowWeekView ) {
1664 mCellsW[0]->setFocus(); 1655 mCellsW[0]->setFocus();
1665 emit selectWeekNum ( currentWeek() - 1 ); 1656 emit selectWeekNum ( currentWeek() - 1 );
1666 } 1657 }
1667 else { 1658 else {
1668 mCells[0]->setFocus(); 1659 mCells[0]->setFocus();
1669 emit prevMonth(); 1660 emit prevMonth();
1670 } 1661 }
1671 } 1662 }
1672 e->accept(); 1663 e->accept();
1673 break; 1664 break;
1674 case Key_Down: 1665 case Key_Down:
1675 { 1666 {
1676 if ( mShowWeekView ) { 1667 if ( mShowWeekView ) {
1677 mCellsW[0]->setFocus(); 1668 mCellsW[0]->setFocus();
1678 emit selectWeekNum ( currentWeek() +1); 1669 emit selectWeekNum ( currentWeek() +1);
1679 } 1670 }
1680 else { 1671 else {
1681 mCells[0]->setFocus(); 1672 mCells[0]->setFocus();
1682 emit nextMonth(); 1673 emit nextMonth();
1683 } 1674 }
1684 1675
1685 } 1676 }
1686 e->accept(); 1677 e->accept();
1687 break; 1678 break;
1688 case Key_Return: 1679 case Key_Return:
1689 case Key_Enter: 1680 case Key_Enter:
1690 { 1681 {
1691 selectInternalWeekNum ( currentWeek() ); 1682 selectInternalWeekNum ( currentWeek() );
1692 } 1683 }
1693 e->accept(); 1684 e->accept();
1694 break; 1685 break;
1695 case Key_D: 1686 case Key_D:
1696 if ( mSelectedCell ) { 1687 if ( mSelectedCell ) {
1697 mSelectedCell->showDay(); 1688 mSelectedCell->showDay();
1698 e->accept(); 1689 e->accept();
1699 } else { 1690 } else {
1700 e->ignore(); 1691 e->ignore();
1701 } 1692 }
1702 break; 1693 break;
1703 default: 1694 default:
1704 e->ignore(); 1695 e->ignore();
1705 break; 1696 break;
1706 } 1697 }
1707} 1698}