-rw-r--r-- | core/pim/todo/mainwindow.cpp | 120 |
1 files changed, 102 insertions, 18 deletions
diff --git a/core/pim/todo/mainwindow.cpp b/core/pim/todo/mainwindow.cpp index 5119ae0..6725951 100644 --- a/core/pim/todo/mainwindow.cpp +++ b/core/pim/todo/mainwindow.cpp | |||
@@ -71,6 +71,7 @@ MainWindow::MainWindow( QWidget* parent, | |||
71 | : OPimMainWindow( "Todolist", parent, name, WType_TopLevel | WStyle_ContextHelp ) | 71 | : OPimMainWindow( "Todolist", parent, name, WType_TopLevel | WStyle_ContextHelp ) |
72 | { | 72 | { |
73 | m_syncing = false; | 73 | m_syncing = false; |
74 | m_showing = false; | ||
74 | m_counter = 0; | 75 | m_counter = 0; |
75 | m_tempManager = new TemplateManager(); | 76 | m_tempManager = new TemplateManager(); |
76 | m_tempManager->load(); | 77 | m_tempManager->load(); |
@@ -161,6 +162,7 @@ void MainWindow::initActions() { | |||
161 | a->addTo( m_tool ); | 162 | a->addTo( m_tool ); |
162 | } | 163 | } |
163 | 164 | ||
165 | #if 0 | ||
164 | // Options menu | 166 | // Options menu |
165 | a = new QAction( QWidget::tr("Find"), Resource::loadIconSet( "mag" ), | 167 | a = new QAction( QWidget::tr("Find"), Resource::loadIconSet( "mag" ), |
166 | QString::null, 0, this, 0 ); | 168 | QString::null, 0, this, 0 ); |
@@ -168,7 +170,9 @@ void MainWindow::initActions() { | |||
168 | a->addTo( m_options ); | 170 | a->addTo( m_options ); |
169 | m_findAction = a; | 171 | m_findAction = a; |
170 | 172 | ||
173 | |||
171 | m_options->insertSeparator(); | 174 | m_options->insertSeparator(); |
175 | #endif | ||
172 | 176 | ||
173 | m_completedAction = new QAction( QString::null, QWidget::tr("Show completed tasks"), | 177 | m_completedAction = new QAction( QString::null, QWidget::tr("Show completed tasks"), |
174 | 0, this, 0, TRUE ); | 178 | 0, this, 0, TRUE ); |
@@ -352,6 +356,7 @@ void MainWindow::slotReload() { | |||
352 | } | 356 | } |
353 | void MainWindow::closeEvent( QCloseEvent* e ) { | 357 | void MainWindow::closeEvent( QCloseEvent* e ) { |
354 | if (m_stack->visibleWidget() == currentShow()->widget() ) { | 358 | if (m_stack->visibleWidget() == currentShow()->widget() ) { |
359 | m_showing = false; | ||
355 | raiseCurrentView(); | 360 | raiseCurrentView(); |
356 | e->ignore(); | 361 | e->ignore(); |
357 | return; | 362 | return; |
@@ -409,7 +414,7 @@ void MainWindow::populateTemplates() { | |||
409 | /* | 414 | /* |
410 | * slotNewFromTemplate | 415 | * slotNewFromTemplate |
411 | * We use the edit widget to do | 416 | * We use the edit widget to do |
412 | * the config but we setUid(-1) | 417 | * the config but we setUid(1) |
413 | * to get a new uid | 418 | * to get a new uid |
414 | */ | 419 | */ |
415 | /* | 420 | /* |
@@ -425,12 +430,14 @@ void MainWindow::slotNewFromTemplate( int id ) { | |||
425 | 430 | ||
426 | if ( currentEditor()->accepted() ) { | 431 | if ( currentEditor()->accepted() ) { |
427 | /* assign new todo */ | 432 | /* assign new todo */ |
428 | event.setUid( -1 ); | 433 | event.setUid( 1 ); |
429 | currentView()->addEvent( event ); | 434 | handleAlarms( OTodo(), event ); |
430 | m_todoMgr.add( event ); | 435 | m_todoMgr.add( event ); |
436 | currentView()->addEvent( event ); | ||
431 | 437 | ||
432 | populateCategories(); | 438 | populateCategories(); |
433 | } | 439 | } |
440 | raiseCurrentView(); | ||
434 | } | 441 | } |
435 | void MainWindow::slotNew() { | 442 | void MainWindow::slotNew() { |
436 | create(); | 443 | create(); |
@@ -438,12 +445,12 @@ void MainWindow::slotNew() { | |||
438 | void MainWindow::slotDuplicate() { | 445 | void MainWindow::slotDuplicate() { |
439 | if(m_syncing) { | 446 | if(m_syncing) { |
440 | QMessageBox::warning(this, QWidget::tr("Todo"), | 447 | QMessageBox::warning(this, QWidget::tr("Todo"), |
441 | QWidget::tr("Can not edit data, currently syncing")); | 448 | QWidget::tr("Data can not be edited, currently syncing")); |
442 | return; | 449 | return; |
443 | } | 450 | } |
444 | OTodo ev = m_todoMgr.event( currentView()->current() ); | 451 | OTodo ev = m_todoMgr.event( currentView()->current() ); |
445 | /* let's generate a new uid */ | 452 | /* let's generate a new uid */ |
446 | ev.setUid(-1); | 453 | ev.setUid(1); |
447 | m_todoMgr.add( ev ); | 454 | m_todoMgr.add( ev ); |
448 | 455 | ||
449 | currentView()->addEvent( ev ); | 456 | currentView()->addEvent( ev ); |
@@ -455,22 +462,38 @@ void MainWindow::slotDelete() { | |||
455 | 462 | ||
456 | if(m_syncing) { | 463 | if(m_syncing) { |
457 | QMessageBox::warning(this, QWidget::tr("Todo"), | 464 | QMessageBox::warning(this, QWidget::tr("Todo"), |
458 | QWidget::tr("Can not edit data, currently syncing")); | 465 | QWidget::tr("Data can not be edited, currently syncing")); |
459 | return; | 466 | return; |
460 | } | 467 | } |
461 | QString strName = currentView()->currentRepresentation(); | 468 | QString strName = currentView()->currentRepresentation(); |
462 | if (!QPEMessageBox::confirmDelete(this, QWidget::tr("Todo"), strName ) ) | 469 | if (!QPEMessageBox::confirmDelete(this, QWidget::tr("Todo"), strName ) ) |
463 | return; | 470 | return; |
464 | 471 | ||
465 | handleAlarms( OTodo(), m_todoMgr.event( currentView()->current() ) ); | 472 | handleAlarms( m_todoMgr.event( currentView()->current() ), OTodo() ); |
466 | m_todoMgr.remove( currentView()->current() ); | 473 | m_todoMgr.remove( currentView()->current() ); |
467 | currentView()->removeEvent( currentView()->current() ); | 474 | currentView()->removeEvent( currentView()->current() ); |
468 | raiseCurrentView(); | 475 | raiseCurrentView(); |
469 | } | 476 | } |
477 | void MainWindow::slotDelete(int uid ) { | ||
478 | if( uid == 0 ) return; | ||
479 | if(m_syncing) { | ||
480 | QMessageBox::warning(this, QWidget::tr("Todo"), | ||
481 | QWidget::tr("Data can not be edited, currently syncing")); | ||
482 | return; | ||
483 | } | ||
484 | OTodo to = m_todoMgr.event(uid); | ||
485 | if (!QPEMessageBox::confirmDelete(this, QWidget::tr("Todo"), to.toShortText() ) ) | ||
486 | return; | ||
487 | |||
488 | handleAlarms(to, OTodo() ); | ||
489 | m_todoMgr.remove( to.uid() ); | ||
490 | currentView()->removeEvent( to.uid() ); | ||
491 | raiseCurrentView(); | ||
492 | } | ||
470 | void MainWindow::slotDeleteAll() { | 493 | void MainWindow::slotDeleteAll() { |
471 | if(m_syncing) { | 494 | if(m_syncing) { |
472 | QMessageBox::warning(this, QWidget::tr("Todo"), | 495 | QMessageBox::warning(this, QWidget::tr("Todo"), |
473 | QWidget::tr("Can not edit data, currently syncing")); | 496 | QWidget::tr("Data can not be edited, currently syncing")); |
474 | return; | 497 | return; |
475 | } | 498 | } |
476 | 499 | ||
@@ -486,7 +509,7 @@ void MainWindow::slotDeleteAll() { | |||
486 | void MainWindow::slotDeleteCompleted() { | 509 | void MainWindow::slotDeleteCompleted() { |
487 | if(m_syncing) { | 510 | if(m_syncing) { |
488 | QMessageBox::warning(this, QWidget::tr("Todo"), | 511 | QMessageBox::warning(this, QWidget::tr("Todo"), |
489 | QWidget::tr("Can not edit data, currently syncing")); | 512 | QWidget::tr("Data can not be edited, currently syncing")); |
490 | return; | 513 | return; |
491 | } | 514 | } |
492 | 515 | ||
@@ -566,10 +589,13 @@ void MainWindow::beamDone( Ir* ir) { | |||
566 | } | 589 | } |
567 | void MainWindow::receiveFile( const QString& filename ) { | 590 | void MainWindow::receiveFile( const QString& filename ) { |
568 | OTodoAccessVCal* cal = new OTodoAccessVCal(filename ); | 591 | OTodoAccessVCal* cal = new OTodoAccessVCal(filename ); |
592 | |||
569 | OTodoAccess acc( cal ); | 593 | OTodoAccess acc( cal ); |
570 | acc.load(); | 594 | acc.load(); |
571 | OTodoAccess::List list = acc.allRecords(); | 595 | OTodoAccess::List list = acc.allRecords(); |
572 | 596 | ||
597 | if (list.count()){ | ||
598 | |||
573 | QString message = QWidget::tr("<P>%1 new tasks arrived.<p>Would you like to add them to your Todolist?").arg(list.count() ); | 599 | QString message = QWidget::tr("<P>%1 new tasks arrived.<p>Would you like to add them to your Todolist?").arg(list.count() ); |
574 | 600 | ||
575 | if ( QMessageBox::information(this, QWidget::tr("New Tasks"), | 601 | if ( QMessageBox::information(this, QWidget::tr("New Tasks"), |
@@ -582,6 +608,7 @@ void MainWindow::receiveFile( const QString& filename ) { | |||
582 | currentView()->updateView(); | 608 | currentView()->updateView(); |
583 | } | 609 | } |
584 | } | 610 | } |
611 | } | ||
585 | 612 | ||
586 | void MainWindow::slotFlush() { | 613 | void MainWindow::slotFlush() { |
587 | m_syncing = FALSE; | 614 | m_syncing = FALSE; |
@@ -634,6 +661,13 @@ ViewBase* MainWindow::currentView() { | |||
634 | return m_curView; | 661 | return m_curView; |
635 | } | 662 | } |
636 | void MainWindow::raiseCurrentView() { | 663 | void MainWindow::raiseCurrentView() { |
664 | // due QPE/Application/todolist show(int) | ||
665 | // we might not have the populateCategories slot called once | ||
666 | // we would show the otodo but then imediately switch to the currentView | ||
667 | // if we're initially showing we shouldn't raise the table | ||
668 | // in returnFromView we fix up m_showing | ||
669 | if (m_showing ) return; | ||
670 | |||
637 | m_stack->raiseWidget( m_curView->widget() ); | 671 | m_stack->raiseWidget( m_curView->widget() ); |
638 | } | 672 | } |
639 | void MainWindow::slotShowDue(bool ov) { | 673 | void MainWindow::slotShowDue(bool ov) { |
@@ -642,15 +676,26 @@ void MainWindow::slotShowDue(bool ov) { | |||
642 | raiseCurrentView(); | 676 | raiseCurrentView(); |
643 | } | 677 | } |
644 | void MainWindow::slotShow( int uid ) { | 678 | void MainWindow::slotShow( int uid ) { |
679 | if ( uid == 0 ) return; | ||
645 | qWarning("slotShow"); | 680 | qWarning("slotShow"); |
646 | currentShow()->slotShow( event( uid ) ); | 681 | currentShow()->slotShow( event( uid ) ); |
647 | m_stack->raiseWidget( currentShow()->widget() ); | 682 | m_stack->raiseWidget( currentShow()->widget() ); |
648 | } | 683 | } |
684 | void MainWindow::slotShowNext() { | ||
685 | int l = currentView()->next(); | ||
686 | if (l!=0) | ||
687 | slotShow(l); | ||
688 | } | ||
689 | void MainWindow::slotShowPrev() { | ||
690 | int l = currentView()->prev(); | ||
691 | if (l!=0) | ||
692 | slotShow(l); | ||
693 | } | ||
649 | void MainWindow::slotEdit( int uid ) { | 694 | void MainWindow::slotEdit( int uid ) { |
650 | if (uid == 1 ) return; | 695 | if (uid == 0 ) return; |
651 | if(m_syncing) { | 696 | if(m_syncing) { |
652 | QMessageBox::warning(this, QWidget::tr("Todo"), | 697 | QMessageBox::warning(this, QWidget::tr("Todo"), |
653 | QWidget::tr("Can not edit data, currently syncing")); | 698 | QWidget::tr("Data can't be edited, currently syncing")); |
654 | return; | 699 | return; |
655 | } | 700 | } |
656 | 701 | ||
@@ -660,7 +705,6 @@ void MainWindow::slotEdit( int uid ) { | |||
660 | 705 | ||
661 | /* if completed */ | 706 | /* if completed */ |
662 | if ( currentEditor()->accepted() ) { | 707 | if ( currentEditor()->accepted() ) { |
663 | qWarning("Replacing now" ); | ||
664 | handleAlarms( old_todo, todo ); | 708 | handleAlarms( old_todo, todo ); |
665 | m_todoMgr.update( todo.uid(), todo ); | 709 | m_todoMgr.update( todo.uid(), todo ); |
666 | currentView()->replaceEvent( todo ); | 710 | currentView()->replaceEvent( todo ); |
@@ -718,6 +762,10 @@ void MainWindow::slotComplete( const OTodo& todo ) { | |||
718 | * and update the items duedate to the next | 762 | * and update the items duedate to the next |
719 | * possible recurrance of this item... | 763 | * possible recurrance of this item... |
720 | * the spinned off one will loose the | 764 | * the spinned off one will loose the |
765 | * recurrence. | ||
766 | * We calculate the difference between the old due date and the | ||
767 | * new one and add this diff to start, completed and alarm dates | ||
768 | * -zecke | ||
721 | */ | 769 | */ |
722 | if ( to.hasRecurrence() && to.isCompleted() ) { | 770 | if ( to.hasRecurrence() && to.isCompleted() ) { |
723 | OTodo to2( to ); | 771 | OTodo to2( to ); |
@@ -734,6 +782,8 @@ void MainWindow::slotComplete( const OTodo& todo ) { | |||
734 | */ | 782 | */ |
735 | QDate date; | 783 | QDate date; |
736 | if ( to2.recurrence().nextOcurrence( to2.dueDate().addDays(1), date ) ) { | 784 | if ( to2.recurrence().nextOcurrence( to2.dueDate().addDays(1), date ) ) { |
785 | int dayDiff = to.dueDate().daysTo( date ); | ||
786 | qWarning("day diff is %d", dayDiff ); | ||
737 | QDate inval; | 787 | QDate inval; |
738 | /* generate a new uid for the old record */ | 788 | /* generate a new uid for the old record */ |
739 | to.setUid( 1 ); | 789 | to.setUid( 1 ); |
@@ -747,9 +797,30 @@ void MainWindow::slotComplete( const OTodo& todo ) { | |||
747 | * and complete date | 797 | * and complete date |
748 | */ | 798 | */ |
749 | to2.setDueDate( date ); | 799 | to2.setDueDate( date ); |
750 | to2.setStartDate( inval ); | 800 | rec.setStart( date ); |
801 | to2.setRecurrence( rec ); // could be Monday, TuesDay, Thursday every week | ||
802 | |||
803 | /* move start date */ | ||
804 | if (to2.hasStartDate() ) | ||
805 | to2.setStartDate( to2.startDate().addDays( dayDiff ) ); | ||
806 | |||
807 | /* now the alarms */ | ||
808 | if (to2.hasNotifiers() ) { | ||
809 | OPimNotifyManager::Alarms _als = to2.notifiers().alarms(); | ||
810 | OPimNotifyManager::Alarms als; | ||
811 | |||
812 | /* for every alarm move the day */ | ||
813 | for ( OPimNotifyManager::Alarms::Iterator it = _als.begin(); it != _als.end(); ++it ) { | ||
814 | OPimAlarm al = (*it); | ||
815 | al.setDateTime( al.dateTime().addDays( dayDiff ) ); | ||
816 | als.append( al ); | ||
817 | } | ||
818 | to2.notifiers().setAlarms( als ); | ||
819 | handleAlarms( OTodo(), todo ); | ||
820 | } | ||
751 | to2.setCompletedDate( inval ); | 821 | to2.setCompletedDate( inval ); |
752 | to2.setCompleted( false ); | 822 | to2.setCompleted( false ); |
823 | |||
753 | updateTodo( to2 ); | 824 | updateTodo( to2 ); |
754 | }else | 825 | }else |
755 | updateTodo( to ); | 826 | updateTodo( to ); |
@@ -769,9 +840,10 @@ int MainWindow::create() { | |||
769 | int uid = 0; | 840 | int uid = 0; |
770 | if(m_syncing) { | 841 | if(m_syncing) { |
771 | QMessageBox::warning(this, QWidget::tr("Todo"), | 842 | QMessageBox::warning(this, QWidget::tr("Todo"), |
772 | QWidget::tr("Can not edit data, currently syncing")); | 843 | QWidget::tr("Data can not be edited, currently syncing")); |
773 | return uid; | 844 | return uid; |
774 | } | 845 | } |
846 | m_todoMgr.load(); | ||
775 | 847 | ||
776 | 848 | ||
777 | OTodo todo = currentEditor()->newTodo( currentCatId(), | 849 | OTodo todo = currentEditor()->newTodo( currentCatId(), |
@@ -804,7 +876,11 @@ bool MainWindow::remove( int uid ) { | |||
804 | return m_todoMgr.remove( uid ); | 876 | return m_todoMgr.remove( uid ); |
805 | } | 877 | } |
806 | void MainWindow::beam( int uid) { | 878 | void MainWindow::beam( int uid) { |
879 | if( uid == 0 ) return; | ||
880 | |||
807 | ::unlink( beamfile ); | 881 | ::unlink( beamfile ); |
882 | m_todoMgr.load(); | ||
883 | |||
808 | OTodo todo = event( uid ); | 884 | OTodo todo = event( uid ); |
809 | OTodoAccessVCal* cal = new OTodoAccessVCal(QString::fromLatin1(beamfile) ); | 885 | OTodoAccessVCal* cal = new OTodoAccessVCal(QString::fromLatin1(beamfile) ); |
810 | OTodoAccess acc( cal ); | 886 | OTodoAccess acc( cal ); |
@@ -817,13 +893,19 @@ void MainWindow::beam( int uid) { | |||
817 | ir->send(beamfile, todo.summary(), "text/x-vCalendar" ); | 893 | ir->send(beamfile, todo.summary(), "text/x-vCalendar" ); |
818 | } | 894 | } |
819 | void MainWindow::show( int uid ) { | 895 | void MainWindow::show( int uid ) { |
896 | m_todoMgr.load(); // might not be loaded yet | ||
897 | m_showing = true; | ||
820 | slotShow( uid ); | 898 | slotShow( uid ); |
899 | raise(); | ||
900 | QPEApplication::setKeepRunning(); | ||
821 | } | 901 | } |
822 | void MainWindow::edit( int uid ) { | 902 | void MainWindow::edit( int uid ) { |
903 | m_todoMgr.load(); | ||
823 | slotEdit( uid ); | 904 | slotEdit( uid ); |
824 | } | 905 | } |
825 | void MainWindow::add( const OPimRecord& rec) { | 906 | void MainWindow::add( const OPimRecord& rec) { |
826 | if ( rec.rtti() != OTodo::rtti() ) return; | 907 | if ( rec.rtti() != OTodo::rtti() ) return; |
908 | m_todoMgr.load(); // might not be loaded | ||
827 | 909 | ||
828 | const OTodo& todo = static_cast<const OTodo&>(rec); | 910 | const OTodo& todo = static_cast<const OTodo&>(rec); |
829 | 911 | ||
@@ -837,6 +919,7 @@ void MainWindow::add( const OPimRecord& rec) { | |||
837 | populateCategories(); | 919 | populateCategories(); |
838 | } | 920 | } |
839 | void MainWindow::slotReturnFromView() { | 921 | void MainWindow::slotReturnFromView() { |
922 | m_showing = false; | ||
840 | raiseCurrentView(); | 923 | raiseCurrentView(); |
841 | } | 924 | } |
842 | 925 | ||
@@ -932,7 +1015,7 @@ void MainWindow::doAlarm( const QDateTime& dt, int uid ) { | |||
932 | connect( btnOk, SIGNAL(clicked() ), &dlg, SLOT(accept() ) ); | 1015 | connect( btnOk, SIGNAL(clicked() ), &dlg, SLOT(accept() ) ); |
933 | lay->addWidget( btnOk ); | 1016 | lay->addWidget( btnOk ); |
934 | 1017 | ||
935 | QString text = tr("<h1>Alarm at %0</h1><br>").arg( TimeString::dateString( dt ) ); | 1018 | QString text = tr("<h1>Alarm at %1</h1><br>").arg( TimeString::dateString( dt ) ); |
936 | text += todo.toRichText(); | 1019 | text += todo.toRichText(); |
937 | view->setText( text ); | 1020 | view->setText( text ); |
938 | 1021 | ||
@@ -943,10 +1026,11 @@ void MainWindow::doAlarm( const QDateTime& dt, int uid ) { | |||
943 | killAlarm(); | 1026 | killAlarm(); |
944 | 1027 | ||
945 | if (needToStay) { | 1028 | if (needToStay) { |
946 | showMaximized(); | 1029 | // showMaximized(); |
947 | raise(); | 1030 | // raise(); |
948 | QPEApplication::setKeepRunning(); | 1031 | QPEApplication::setKeepRunning(); |
949 | setActiveWindow(); | 1032 | // setActiveWindow(); |
950 | } | 1033 | } |
951 | 1034 | ||
952 | } | 1035 | } |
1036 | |||