-rw-r--r-- | korganizer/calendarview.cpp | 6 | ||||
-rw-r--r-- | korganizer/kotodoview.cpp | 24 | ||||
-rw-r--r-- | korganizer/kotodoviewitem.cpp | 66 |
3 files changed, 76 insertions, 20 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 7044e90..f9685e9 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -362,17 +362,17 @@ CalendarView::CalendarView( Calendar *calendar, | |||
362 | mEventEditor = 0; | 362 | mEventEditor = 0; |
363 | mTodoEditor = 0; | 363 | mTodoEditor = 0; |
364 | init(); | 364 | init(); |
365 | } | 365 | } |
366 | 366 | ||
367 | void CalendarView::init() | 367 | void CalendarView::init() |
368 | { | 368 | { |
369 | mNextAlarmDateTime = QDateTime::currentDateTime(); | 369 | mNextAlarmDateTime = QDateTime::currentDateTime(); |
370 | setFocusPolicy ( NoFocus ); | 370 | //setFocusPolicy ( NoFocus ); |
371 | mViewerCallerIsSearchDialog = false; | 371 | mViewerCallerIsSearchDialog = false; |
372 | mBlockShowDates = false; | 372 | mBlockShowDates = false; |
373 | 373 | ||
374 | mDatePickerMode = 0; | 374 | mDatePickerMode = 0; |
375 | mCurrentSyncDevice = ""; | 375 | mCurrentSyncDevice = ""; |
376 | mViewManager = new KOViewManager( this ); | 376 | mViewManager = new KOViewManager( this ); |
377 | mDialogManager = new KODialogManager( this ); | 377 | mDialogManager = new KODialogManager( this ); |
378 | mEventViewerDialog = 0; | 378 | mEventViewerDialog = 0; |
@@ -4682,18 +4682,18 @@ void CalendarView::purgeCompleted() | |||
4682 | 4682 | ||
4683 | void CalendarView::slotCalendarChanged() | 4683 | void CalendarView::slotCalendarChanged() |
4684 | { | 4684 | { |
4685 | ; | 4685 | ; |
4686 | } | 4686 | } |
4687 | 4687 | ||
4688 | void CalendarView::keyPressEvent ( QKeyEvent *e) | 4688 | void CalendarView::keyPressEvent ( QKeyEvent *e) |
4689 | { | 4689 | { |
4690 | //qDebug(" alendarView::keyPressEvent "); | 4690 | //qDebug("CalendarView::keyPressEvent "); |
4691 | e->ignore(); | 4691 | e->ignore(); |
4692 | } | 4692 | } |
4693 | 4693 | ||
4694 | 4694 | ||
4695 | bool CalendarView::sync(KSyncManager* manager, QString filename, int mode) | 4695 | bool CalendarView::sync(KSyncManager* manager, QString filename, int mode) |
4696 | { | 4696 | { |
4697 | 4697 | ||
4698 | if ( manager != mSyncManager) | 4698 | if ( manager != mSyncManager) |
4699 | qDebug("KO: Internal error-1. SyncManager mismatch "); | 4699 | qDebug("KO: Internal error-1. SyncManager mismatch "); |
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index add1819..94f35e6 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp | |||
@@ -427,24 +427,26 @@ void KOTodoListView::keyPressEvent ( QKeyEvent * e ) | |||
427 | if ( cn ) { | 427 | if ( cn ) { |
428 | setCurrentItem ( cn ); | 428 | setCurrentItem ( cn ); |
429 | ensureItemVisible ( cn ); | 429 | ensureItemVisible ( cn ); |
430 | } | 430 | } |
431 | 431 | ||
432 | } | 432 | } |
433 | } | 433 | } |
434 | 434 | ||
435 | e->accept(); | ||
435 | return; | 436 | return; |
436 | } | 437 | } |
437 | 438 | ||
438 | if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton || mName != "todolistsmall" ) { | 439 | if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton || mName != "todolistsmall" ) { |
439 | switch ( e->key() ) { | 440 | switch ( e->key() ) { |
440 | case Qt::Key_Down: | 441 | case Qt::Key_Down: |
441 | case Qt::Key_Up: | 442 | case Qt::Key_Up: |
442 | QListView::keyPressEvent ( e ); | 443 | QListView::keyPressEvent ( e ); |
444 | e->accept(); | ||
443 | break; | 445 | break; |
444 | case Qt::Key_Left: | 446 | case Qt::Key_Left: |
445 | case Qt::Key_Right: | 447 | case Qt::Key_Right: |
446 | QListView::keyPressEvent ( e ); | 448 | QListView::keyPressEvent ( e ); |
447 | e->accept(); | 449 | e->accept(); |
448 | return; | 450 | return; |
449 | break; | 451 | break; |
450 | default: | 452 | default: |
@@ -509,40 +511,41 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) : | |||
509 | mName = QString ( name ); | 511 | mName = QString ( name ); |
510 | mBlockUpdate = false; | 512 | mBlockUpdate = false; |
511 | mQuickBar = new QWidget( this ); | 513 | mQuickBar = new QWidget( this ); |
512 | topLayout->addWidget(mQuickBar); | 514 | topLayout->addWidget(mQuickBar); |
513 | 515 | ||
514 | mQuickAdd = new KOQuickTodo(mQuickBar); | 516 | mQuickAdd = new KOQuickTodo(mQuickBar); |
515 | QBoxLayout *quickLayout = new QHBoxLayout(mQuickBar); | 517 | QBoxLayout *quickLayout = new QHBoxLayout(mQuickBar); |
516 | quickLayout->addWidget( mQuickAdd ); | 518 | quickLayout->addWidget( mQuickAdd ); |
519 | mNewSubBut = new QPushButton( "sub",mQuickBar ); | ||
520 | QPushButton * s_done = new QPushButton( "D",mQuickBar ); | ||
521 | QPushButton * s_run = new QPushButton( "R",mQuickBar ); | ||
522 | QPushButton * allopen = new QPushButton( "O",mQuickBar ); | ||
523 | QPushButton * allclose = new QPushButton( "C",mQuickBar ); | ||
517 | QPushButton * flat = new QPushButton( "F",mQuickBar ); | 524 | QPushButton * flat = new QPushButton( "F",mQuickBar ); |
525 | |||
518 | int fixwid = flat->sizeHint().height(); | 526 | int fixwid = flat->sizeHint().height(); |
519 | if ( QApplication::desktop()->width() >= 800 ) | 527 | if ( QApplication::desktop()->width() >= 800 ) |
520 | fixwid *= 2; | 528 | fixwid *= 2; |
521 | flat->setFixedWidth( fixwid ); | 529 | flat->setFixedWidth( fixwid ); |
522 | connect ( flat, SIGNAL ( clicked()), SLOT ( setAllFlat())); | 530 | connect ( flat, SIGNAL ( clicked()), SLOT ( setAllFlat())); |
523 | QPushButton * allopen = new QPushButton( "O",mQuickBar ); | ||
524 | allopen->setFixedWidth( fixwid ); | 531 | allopen->setFixedWidth( fixwid ); |
525 | connect ( allopen, SIGNAL ( clicked()), SLOT ( setAllOpen())); | 532 | connect ( allopen, SIGNAL ( clicked()), SLOT ( setAllOpen())); |
526 | QPushButton * allclose = new QPushButton( "C",mQuickBar ); | ||
527 | allclose->setFixedWidth( fixwid ); | 533 | allclose->setFixedWidth( fixwid ); |
528 | connect ( allclose, SIGNAL ( clicked()), SLOT ( setAllClose())); | 534 | connect ( allclose, SIGNAL ( clicked()), SLOT ( setAllClose())); |
529 | QPushButton * s_done = new QPushButton( "D",mQuickBar ); | ||
530 | s_done->setPixmap( SmallIcon("greenhook16")); | 535 | s_done->setPixmap( SmallIcon("greenhook16")); |
531 | s_done->setFixedWidth( fixwid ); | 536 | s_done->setFixedWidth( fixwid ); |
532 | s_done->setFixedHeight( flat->sizeHint().height() ); | 537 | s_done->setFixedHeight( flat->sizeHint().height() ); |
533 | connect ( s_done, SIGNAL ( clicked()), SLOT ( toggleCompleted())); | 538 | connect ( s_done, SIGNAL ( clicked()), SLOT ( toggleCompleted())); |
534 | QPushButton * s_run = new QPushButton( "R",mQuickBar ); | ||
535 | s_run->setPixmap( SmallIcon("ko16old")); | 539 | s_run->setPixmap( SmallIcon("ko16old")); |
536 | s_run->setFixedWidth( fixwid ); | 540 | s_run->setFixedWidth( fixwid ); |
537 | s_run->setFixedHeight( flat->sizeHint().height() ); | 541 | s_run->setFixedHeight( flat->sizeHint().height() ); |
538 | connect ( s_run, SIGNAL ( clicked()), SLOT ( toggleRunning())); | 542 | connect ( s_run, SIGNAL ( clicked()), SLOT ( toggleRunning())); |
539 | 543 | ||
540 | mNewSubBut = new QPushButton( "sub",mQuickBar ); | ||
541 | mNewSubBut->setFixedWidth( fixwid*3/2 ); | 544 | mNewSubBut->setFixedWidth( fixwid*3/2 ); |
542 | connect ( mNewSubBut, SIGNAL ( clicked()), SLOT ( newSubTodo())); | 545 | connect ( mNewSubBut, SIGNAL ( clicked()), SLOT ( newSubTodo())); |
543 | mNewSubBut->setEnabled( false ); | 546 | mNewSubBut->setEnabled( false ); |
544 | quickLayout->addWidget( mNewSubBut ); | 547 | quickLayout->addWidget( mNewSubBut ); |
545 | quickLayout->addWidget( s_done ); | 548 | quickLayout->addWidget( s_done ); |
546 | quickLayout->addWidget( s_run ); | 549 | quickLayout->addWidget( s_run ); |
547 | 550 | ||
548 | quickLayout->addWidget( allopen ); | 551 | quickLayout->addWidget( allopen ); |
@@ -570,30 +573,33 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) : | |||
570 | mTodoListView->addColumn(i18n("Due Time")); | 573 | mTodoListView->addColumn(i18n("Due Time")); |
571 | mTodoListView->setColumnAlignment(4,AlignHCenter); | 574 | mTodoListView->setColumnAlignment(4,AlignHCenter); |
572 | 575 | ||
573 | mTodoListView->addColumn(i18n("Start Date")); | 576 | mTodoListView->addColumn(i18n("Start Date")); |
574 | mTodoListView->setColumnAlignment(5,AlignLeft); | 577 | mTodoListView->setColumnAlignment(5,AlignLeft); |
575 | mTodoListView->addColumn(i18n("Start Time")); | 578 | mTodoListView->addColumn(i18n("Start Time")); |
576 | mTodoListView->setColumnAlignment(6,AlignHCenter); | 579 | mTodoListView->setColumnAlignment(6,AlignHCenter); |
577 | 580 | ||
578 | mTodoListView->addColumn(i18n("Cancelled")); | 581 | //mTodoListView->addColumn(i18n("Cancelled")); |
579 | mTodoListView->addColumn(i18n("Categories")); | 582 | mTodoListView->addColumn(i18n("Categories")); |
580 | mTodoListView->addColumn(i18n("Calendar")); | 583 | mTodoListView->addColumn(i18n("Calendar")); |
584 | mTodoListView->addColumn(i18n("Last Modified")); | ||
585 | mTodoListView->addColumn(i18n("Created")); | ||
586 | mTodoListView->addColumn(i18n("Last Modified Sub")); | ||
581 | #if 0 | 587 | #if 0 |
582 | mTodoListView->addColumn(i18n("Sort Id")); | 588 | mTodoListView->addColumn(i18n("Sort Id")); |
583 | mTodoListView->setColumnAlignment(4,AlignHCenter); | 589 | mTodoListView->setColumnAlignment(4,AlignHCenter); |
584 | #endif | 590 | #endif |
585 | 591 | ||
586 | mTodoListView->setMinimumHeight( 60 ); | 592 | mTodoListView->setMinimumHeight( 60 ); |
587 | mTodoListView->setItemsRenameable( true ); | 593 | mTodoListView->setItemsRenameable( true ); |
588 | mTodoListView->setRenameable( 0 ); | 594 | mTodoListView->setRenameable( 0 ); |
589 | mTodoListView->setColumnWidth( 0, 120 ); | 595 | mTodoListView->setColumnWidth( 0, 120 ); |
590 | int iii = 0; | 596 | int iii = 0; |
591 | for ( iii = 0; iii< 10 ; ++iii ) | 597 | for ( iii = 0; iii< 12 ; ++iii ) |
592 | mTodoListView->setColumnWidthMode( iii, QListView::Manual ); | 598 | mTodoListView->setColumnWidthMode( iii, QListView::Manual ); |
593 | 599 | ||
594 | 600 | ||
595 | mKOTodoViewWhatsThis = new KOTodoViewWhatsThis(mTodoListView->viewport(),this); | 601 | mKOTodoViewWhatsThis = new KOTodoViewWhatsThis(mTodoListView->viewport(),this); |
596 | 602 | ||
597 | mPriorityPopupMenu = new QPopupMenu(this); | 603 | mPriorityPopupMenu = new QPopupMenu(this); |
598 | for (int i = 1; i <= 5; i++) { | 604 | for (int i = 1; i <= 5; i++) { |
599 | QString label = QString ("%1").arg (i); | 605 | QString label = QString ("%1").arg (i); |
@@ -1598,25 +1604,25 @@ void KOTodoView::addQuickTodoPar( Todo * parentTodo) | |||
1598 | todoModified (todo, KOGlobals::EVENTADDED ); | 1604 | todoModified (todo, KOGlobals::EVENTADDED ); |
1599 | updateView(); | 1605 | updateView(); |
1600 | 1606 | ||
1601 | } | 1607 | } |
1602 | void KOTodoView::keyPressEvent ( QKeyEvent * e ) | 1608 | void KOTodoView::keyPressEvent ( QKeyEvent * e ) |
1603 | { | 1609 | { |
1604 | // e->ignore(); | 1610 | // e->ignore(); |
1605 | //return; | 1611 | //return; |
1606 | //qDebug("KOTodoView::keyPressEvent "); | ||
1607 | if ( !isVisible() ) { | 1612 | if ( !isVisible() ) { |
1608 | e->ignore(); | 1613 | e->ignore(); |
1609 | return; | 1614 | return; |
1610 | } | 1615 | } |
1611 | switch ( e->key() ) { | 1616 | switch ( e->key() ) { |
1612 | case Qt::Key_Down: | 1617 | case Qt::Key_Down: |
1613 | case Qt::Key_Up: | 1618 | case Qt::Key_Up: |
1614 | QWidget::keyPressEvent ( e ); | 1619 | // KOrg::BaseView::keyPressEvent ( e ); |
1620 | e->ignore(); | ||
1615 | break; | 1621 | break; |
1616 | 1622 | ||
1617 | case Qt::Key_Q: | 1623 | case Qt::Key_Q: |
1618 | 1624 | ||
1619 | 1625 | ||
1620 | if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton ) { | 1626 | if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton ) { |
1621 | e->ignore(); | 1627 | e->ignore(); |
1622 | break; | 1628 | break; |
diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp index 0cf6e4c..bdef94c 100644 --- a/korganizer/kotodoviewitem.cpp +++ b/korganizer/kotodoviewitem.cpp | |||
@@ -148,20 +148,36 @@ void KOTodoViewItem::construct() | |||
148 | 148 | ||
149 | } | 149 | } |
150 | } | 150 | } |
151 | setText(5,keyd); | 151 | setText(5,keyd); |
152 | setText(6,keyt); | 152 | setText(6,keyt); |
153 | setSortKey(5,skeyd); | 153 | setSortKey(5,skeyd); |
154 | setSortKey(6,skeyt); | 154 | setSortKey(6,skeyt); |
155 | 155 | ||
156 | setText(7,mTodo->cancelled() ? i18n("Yes") : i18n("No")); | 156 | //setText(7,mTodo->cancelled() ? i18n("Yes") : i18n("No")); |
157 | setText(8,mTodo->categoriesStr()); | 157 | setText(7,mTodo->categoriesStr()); |
158 | setText(9,KOPrefs::instance()->calName( mTodo->calID())); | 158 | setText(8,KOPrefs::instance()->calName( mTodo->calID())); |
159 | 159 | setText(9, KGlobal::locale()->formatDateTime( mTodo->lastModified(), true, true )); | |
160 | setText(10, KGlobal::locale()->formatDateTime( mTodo->created(), true, true )); | ||
161 | setText(11, KGlobal::locale()->formatDateTime( mTodo->lastModifiedSub(), true, true )); | ||
162 | QString key; | ||
163 | QDate d = mTodo->lastModified().date(); | ||
164 | QTime t = mTodo->lastModified().time(); | ||
165 | key.sprintf("%04d%02d%02d%02d%02d%02d",d.year(),d.month(),d.day(),t.hour(),t.minute(),t.second() ); | ||
166 | setSortKey(9,key); | ||
167 | d = mTodo->created().date(); | ||
168 | t = mTodo->created().time(); | ||
169 | key.sprintf("%04d%02d%02d%02d%02d%02d",d.year(),d.month(),d.day(),t.hour(),t.minute(),t.second() ); | ||
170 | setSortKey(10,key); | ||
171 | d = mTodo->lastModifiedSub().date(); | ||
172 | t = mTodo->lastModifiedSub().time(); | ||
173 | key.sprintf("%04d%02d%02d%02d%02d%02d",d.year(),d.month(),d.day(),t.hour(),t.minute(),t.second() ); | ||
174 | setSortKey(11,key); | ||
175 | |||
160 | #if 0 | 176 | #if 0 |
161 | // Find sort id in description. It's the text behind the last '#' character | 177 | // Find sort id in description. It's the text behind the last '#' character |
162 | // found in the description. White spaces are removed from beginning and end | 178 | // found in the description. White spaces are removed from beginning and end |
163 | // of sort id. | 179 | // of sort id. |
164 | int pos = mTodo->description().findRev('#'); | 180 | int pos = mTodo->description().findRev('#'); |
165 | if (pos < 0) { | 181 | if (pos < 0) { |
166 | setText(6,""); | 182 | setText(6,""); |
167 | } else { | 183 | } else { |
@@ -312,22 +328,54 @@ void KOTodoViewItem::stateChange(bool state) | |||
312 | } | 328 | } |
313 | mTodoView->modified(true); | 329 | mTodoView->modified(true); |
314 | setMyPixmap(); | 330 | setMyPixmap(); |
315 | mTodoView->setTodoModified( mTodo ); | 331 | mTodoView->setTodoModified( mTodo ); |
316 | } | 332 | } |
317 | 333 | ||
318 | bool KOTodoViewItem::isAlternate() | 334 | bool KOTodoViewItem::isAlternate() |
319 | { | 335 | { |
320 | 336 | #if 0 | |
337 | //if ( m_known ) return m_odd; | ||
338 | //qDebug("test "); | ||
339 | KOTodoViewItem *item = static_cast<KOTodoViewItem *>(itemAbove()); | ||
340 | if ( item ) { | ||
341 | m_known = item->m_known; | ||
342 | if ( m_known ) { | ||
343 | m_odd = !item->m_odd ; | ||
344 | return m_odd; | ||
345 | } | ||
346 | } else { | ||
347 | item = static_cast<KOTodoViewItem *>(itemBelow()); | ||
348 | if ( item ) { | ||
349 | m_known = item->m_known; | ||
350 | if ( m_known ) { | ||
351 | m_odd = !item->m_odd ; | ||
352 | return m_odd; | ||
353 | } | ||
354 | } | ||
355 | } | ||
321 | KOTodoListView *lv = static_cast<KOTodoListView *>(listView()); | 356 | KOTodoListView *lv = static_cast<KOTodoListView *>(listView()); |
322 | if (lv && lv->alternateBackground().isValid()) | 357 | item = static_cast<KOTodoViewItem *>(lv->firstChild()); |
358 | bool previous = true; | ||
359 | qDebug("WHILE "); | ||
360 | while ( item ) { | ||
361 | item->m_odd = !previous; | ||
362 | item->m_known = true; | ||
363 | previous = !previous; | ||
364 | item = static_cast<KOTodoViewItem *>(item->itemBelow()); | ||
365 | } | ||
366 | return m_odd; | ||
367 | |||
368 | #else | ||
369 | |||
370 | //KOTodoListView *lv = static_cast<KOTodoListView *>(listView()); | ||
371 | //if (lv && lv->alternateBackground().isValid()) | ||
323 | { | 372 | { |
324 | KOTodoViewItem *above = 0; | 373 | KOTodoViewItem *above = static_cast<KOTodoViewItem *>(itemAbove()); |
325 | above = static_cast<KOTodoViewItem *>(itemAbove()); | ||
326 | m_known = above ? above->m_known : true; | 374 | m_known = above ? above->m_known : true; |
327 | if (m_known) | 375 | if (m_known) |
328 | { | 376 | { |
329 | m_odd = above ? !above->m_odd : false; | 377 | m_odd = above ? !above->m_odd : false; |
330 | } | 378 | } |
331 | else | 379 | else |
332 | { | 380 | { |
333 | KOTodoViewItem *item; | 381 | KOTodoViewItem *item; |
@@ -336,29 +384,31 @@ bool KOTodoViewItem::isAlternate() | |||
336 | { | 384 | { |
337 | item = static_cast<KOTodoViewItem *>(QListViewItem::parent()); | 385 | item = static_cast<KOTodoViewItem *>(QListViewItem::parent()); |
338 | if (item) | 386 | if (item) |
339 | previous = item->m_odd; | 387 | previous = item->m_odd; |
340 | item = static_cast<KOTodoViewItem *>(QListViewItem::parent()->firstChild()); | 388 | item = static_cast<KOTodoViewItem *>(QListViewItem::parent()->firstChild()); |
341 | } | 389 | } |
342 | else | 390 | else |
343 | { | 391 | { |
392 | KOTodoListView *lv = static_cast<KOTodoListView *>(listView()); | ||
344 | item = static_cast<KOTodoViewItem *>(lv->firstChild()); | 393 | item = static_cast<KOTodoViewItem *>(lv->firstChild()); |
345 | } | 394 | } |
346 | 395 | ||
347 | while(item) | 396 | while(item) |
348 | { | 397 | { |
349 | item->m_odd = previous = !previous; | 398 | item->m_odd = previous = !previous; |
350 | item->m_known = true; | 399 | item->m_known = true; |
351 | item = static_cast<KOTodoViewItem *>(item->nextSibling()); | 400 | item = static_cast<KOTodoViewItem *>(item->nextSibling()); |
352 | } | 401 | } |
353 | } | 402 | } |
354 | return m_odd; | 403 | return m_odd; |
355 | } | 404 | } |
356 | return false; | 405 | return false; |
406 | #endif | ||
357 | } | 407 | } |
358 | 408 | ||
359 | void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int alignment) | 409 | void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int alignment) |
360 | { | 410 | { |
361 | QColorGroup _cg = cg; | 411 | QColorGroup _cg = cg; |
362 | QColorGroup::ColorRole role; | 412 | QColorGroup::ColorRole role; |
363 | if ( KOPrefs::instance()->mTodoViewUsesForegroundColor && !mTodo->isRunning()) | 413 | if ( KOPrefs::instance()->mTodoViewUsesForegroundColor && !mTodo->isRunning()) |
364 | role = QColorGroup::Text; | 414 | role = QColorGroup::Text; |