author | zautrix <zautrix> | 2005-07-06 14:24:16 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-07-06 14:24:16 (UTC) |
commit | 2e8199c8aa82c018d24d67c299a09b2aa6a786f1 (patch) (unidiff) | |
tree | 3883f4d664b632d4107333ca27ff47ef1abdb70a /korganizer | |
parent | feb7b5c7dbc5f9de44993330dee654ad0a38b8d9 (diff) | |
download | kdepimpi-2e8199c8aa82c018d24d67c299a09b2aa6a786f1.zip kdepimpi-2e8199c8aa82c018d24d67c299a09b2aa6a786f1.tar.gz kdepimpi-2e8199c8aa82c018d24d67c299a09b2aa6a786f1.tar.bz2 |
fixxx
-rw-r--r-- | korganizer/calendarview.cpp | 14 | ||||
-rw-r--r-- | korganizer/kolistview.cpp | 4 | ||||
-rw-r--r-- | korganizer/koprefs.cpp | 1 | ||||
-rw-r--r-- | korganizer/koprefs.h | 1 | ||||
-rw-r--r-- | korganizer/searchdialog.cpp | 4 |
5 files changed, 23 insertions, 1 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 4b3f806..558fc55 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -2622,96 +2622,105 @@ void CalendarView::changeIncidenceDisplay(Incidence *which, int action) | |||
2622 | else | 2622 | else |
2623 | mCalendar->checkAlarmForIncidence( which , false ); | 2623 | mCalendar->checkAlarmForIncidence( which , false ); |
2624 | } | 2624 | } |
2625 | 2625 | ||
2626 | // most of the changeEventDisplays() right now just call the view's | 2626 | // most of the changeEventDisplays() right now just call the view's |
2627 | // total update mode, but they SHOULD be recoded to be more refresh-efficient. | 2627 | // total update mode, but they SHOULD be recoded to be more refresh-efficient. |
2628 | void CalendarView::changeEventDisplay(Event *which, int action) | 2628 | void CalendarView::changeEventDisplay(Event *which, int action) |
2629 | { | 2629 | { |
2630 | // kdDebug() << "CalendarView::changeEventDisplay" << endl; | 2630 | // kdDebug() << "CalendarView::changeEventDisplay" << endl; |
2631 | changeIncidenceDisplay((Incidence *)which, action); | 2631 | changeIncidenceDisplay((Incidence *)which, action); |
2632 | mDateNavigator->updateView(); | 2632 | mDateNavigator->updateView(); |
2633 | //mDialogManager->updateSearchDialog(); | 2633 | //mDialogManager->updateSearchDialog(); |
2634 | 2634 | ||
2635 | if (which) { | 2635 | if (which) { |
2636 | // If there is an event view visible update the display | 2636 | // If there is an event view visible update the display |
2637 | mViewManager->currentView()->changeEventDisplay(which,action); | 2637 | mViewManager->currentView()->changeEventDisplay(which,action); |
2638 | // TODO: check, if update needed | 2638 | // TODO: check, if update needed |
2639 | // if (which->getTodoStatus()) { | 2639 | // if (which->getTodoStatus()) { |
2640 | mTodoList->updateView(); | 2640 | mTodoList->updateView(); |
2641 | // } | 2641 | // } |
2642 | } else { | 2642 | } else { |
2643 | mViewManager->currentView()->updateView(); | 2643 | mViewManager->currentView()->updateView(); |
2644 | } | 2644 | } |
2645 | } | 2645 | } |
2646 | 2646 | ||
2647 | 2647 | ||
2648 | void CalendarView::updateTodoViews() | 2648 | void CalendarView::updateTodoViews() |
2649 | { | 2649 | { |
2650 | mTodoList->updateView(); | 2650 | mTodoList->updateView(); |
2651 | mViewManager->currentView()->updateView(); | 2651 | mViewManager->currentView()->updateView(); |
2652 | 2652 | ||
2653 | } | 2653 | } |
2654 | 2654 | ||
2655 | 2655 | ||
2656 | 2656 | ||
2657 | void CalendarView::clearAllViews() | 2657 | void CalendarView::clearAllViews() |
2658 | { | 2658 | { |
2659 | mTodoList->clearList(); | 2659 | mTodoList->clearList(); |
2660 | mViewManager->clearAllViews(); | 2660 | mViewManager->clearAllViews(); |
2661 | SearchDialog * sd = mDialogManager->getSearchDialog(); | 2661 | SearchDialog * sd = mDialogManager->getSearchDialog(); |
2662 | if ( sd ) { | 2662 | if ( sd ) { |
2663 | KOListView* kol = sd->listview(); | 2663 | KOListView* kol = sd->listview(); |
2664 | if ( kol ) | 2664 | if ( kol ) |
2665 | kol->clearList(); | 2665 | kol->clearList(); |
2666 | } | 2666 | } |
2667 | } | 2667 | } |
2668 | void CalendarView::updateView() | 2668 | void CalendarView::updateView() |
2669 | { | 2669 | { |
2670 | static bool clearallviews = false; | ||
2671 | if ( KOPrefs::instance()->mGlobalUpdateDisabled ) { | ||
2672 | if ( clearallviews ) { | ||
2673 | clearAllViews(); | ||
2674 | clearallviews = false; | ||
2675 | } | ||
2676 | return; | ||
2677 | } | ||
2678 | clearallviews = true; | ||
2670 | DateList tmpList = mNavigator->selectedDates(); | 2679 | DateList tmpList = mNavigator->selectedDates(); |
2671 | 2680 | ||
2672 | if ( KOPrefs::instance()->mHideNonStartedTodos ) | 2681 | if ( KOPrefs::instance()->mHideNonStartedTodos ) |
2673 | mTodoList->updateView(); | 2682 | mTodoList->updateView(); |
2674 | // We assume that the navigator only selects consecutive days. | 2683 | // We assume that the navigator only selects consecutive days. |
2675 | updateView( tmpList.first(), tmpList.last() ); | 2684 | updateView( tmpList.first(), tmpList.last() ); |
2676 | } | 2685 | } |
2677 | 2686 | ||
2678 | void CalendarView::updateUnmanagedViews() | 2687 | void CalendarView::updateUnmanagedViews() |
2679 | { | 2688 | { |
2680 | mDateNavigator->updateDayMatrix(); | 2689 | mDateNavigator->updateDayMatrix(); |
2681 | } | 2690 | } |
2682 | 2691 | ||
2683 | int CalendarView::msgItemDelete(const QString name) | 2692 | int CalendarView::msgItemDelete(const QString name) |
2684 | { | 2693 | { |
2685 | return KMessageBox::warningContinueCancel(this,name +"\n\n"+ | 2694 | return KMessageBox::warningContinueCancel(this,name +"\n\n"+ |
2686 | i18n("This item will be\npermanently deleted."), | 2695 | i18n("This item will be\npermanently deleted."), |
2687 | i18n("KO/Pi Confirmation"),i18n("Delete")); | 2696 | i18n("KO/Pi Confirmation"),i18n("Delete")); |
2688 | } | 2697 | } |
2689 | 2698 | ||
2690 | 2699 | ||
2691 | void CalendarView::edit_cut() | 2700 | void CalendarView::edit_cut() |
2692 | { | 2701 | { |
2693 | Event *anEvent=0; | 2702 | Event *anEvent=0; |
2694 | 2703 | ||
2695 | Incidence *incidence = mViewManager->currentView()->selectedIncidences().first(); | 2704 | Incidence *incidence = mViewManager->currentView()->selectedIncidences().first(); |
2696 | 2705 | ||
2697 | if (mViewManager->currentView()->isEventView()) { | 2706 | if (mViewManager->currentView()->isEventView()) { |
2698 | if ( incidence && incidence->typeID() == eventID ) { | 2707 | if ( incidence && incidence->typeID() == eventID ) { |
2699 | anEvent = static_cast<Event *>(incidence); | 2708 | anEvent = static_cast<Event *>(incidence); |
2700 | } | 2709 | } |
2701 | } | 2710 | } |
2702 | 2711 | ||
2703 | if (!anEvent) { | 2712 | if (!anEvent) { |
2704 | KNotifyClient::beep(); | 2713 | KNotifyClient::beep(); |
2705 | return; | 2714 | return; |
2706 | } | 2715 | } |
2707 | DndFactory factory( mCalendar ); | 2716 | DndFactory factory( mCalendar ); |
2708 | factory.cutIncidence(anEvent); | 2717 | factory.cutIncidence(anEvent); |
2709 | changeEventDisplay(anEvent, KOGlobals::EVENTDELETED); | 2718 | changeEventDisplay(anEvent, KOGlobals::EVENTDELETED); |
2710 | } | 2719 | } |
2711 | 2720 | ||
2712 | void CalendarView::edit_copy() | 2721 | void CalendarView::edit_copy() |
2713 | { | 2722 | { |
2714 | Event *anEvent=0; | 2723 | Event *anEvent=0; |
2715 | 2724 | ||
2716 | Incidence *incidence = mViewManager->currentView()->selectedIncidences().first(); | 2725 | Incidence *incidence = mViewManager->currentView()->selectedIncidences().first(); |
2717 | 2726 | ||
@@ -4366,96 +4375,101 @@ void CalendarView::editIncidence() | |||
4366 | if ( incidence ) { | 4375 | if ( incidence ) { |
4367 | EditIncidenceVisitor v; | 4376 | EditIncidenceVisitor v; |
4368 | v.act( incidence, this ); | 4377 | v.act( incidence, this ); |
4369 | } | 4378 | } |
4370 | } | 4379 | } |
4371 | 4380 | ||
4372 | void CalendarView::deleteIncidence() | 4381 | void CalendarView::deleteIncidence() |
4373 | { | 4382 | { |
4374 | Incidence *incidence = currentSelection(); | 4383 | Incidence *incidence = currentSelection(); |
4375 | if ( !incidence ) incidence = mTodoList->selectedIncidences().first(); | 4384 | if ( !incidence ) incidence = mTodoList->selectedIncidences().first(); |
4376 | if ( incidence ) { | 4385 | if ( incidence ) { |
4377 | deleteIncidence(incidence); | 4386 | deleteIncidence(incidence); |
4378 | } | 4387 | } |
4379 | } | 4388 | } |
4380 | void CalendarView::showIncidence(QString uid) | 4389 | void CalendarView::showIncidence(QString uid) |
4381 | { | 4390 | { |
4382 | Incidence *inc = mCalendar->incidence( uid ); | 4391 | Incidence *inc = mCalendar->incidence( uid ); |
4383 | if ( inc ) | 4392 | if ( inc ) |
4384 | showIncidence( inc ); | 4393 | showIncidence( inc ); |
4385 | } | 4394 | } |
4386 | void CalendarView::showIncidence(Incidence *incidence) | 4395 | void CalendarView::showIncidence(Incidence *incidence) |
4387 | { | 4396 | { |
4388 | mViewerCallerIsSearchDialog = false; | 4397 | mViewerCallerIsSearchDialog = false; |
4389 | //qDebug("%x %x ",sender (), mDialogManager->getSearchDialog() ); | 4398 | //qDebug("%x %x ",sender (), mDialogManager->getSearchDialog() ); |
4390 | if ( sender() && mDialogManager->getSearchDialog() ) { | 4399 | if ( sender() && mDialogManager->getSearchDialog() ) { |
4391 | if ( sender () == mDialogManager->getSearchDialog()->listview() ) { | 4400 | if ( sender () == mDialogManager->getSearchDialog()->listview() ) { |
4392 | mViewerCallerIsSearchDialog = true; | 4401 | mViewerCallerIsSearchDialog = true; |
4393 | } | 4402 | } |
4394 | } | 4403 | } |
4395 | if ( incidence ) { | 4404 | if ( incidence ) { |
4396 | ShowIncidenceVisitor v; | 4405 | ShowIncidenceVisitor v; |
4397 | v.act( incidence, this ); | 4406 | v.act( incidence, this ); |
4398 | } | 4407 | } |
4399 | } | 4408 | } |
4400 | 4409 | ||
4401 | void CalendarView::editIncidence(Incidence *incidence) | 4410 | void CalendarView::editIncidence(Incidence *incidence) |
4402 | { | 4411 | { |
4403 | if ( incidence ) { | 4412 | if ( incidence ) { |
4404 | 4413 | ||
4405 | EditIncidenceVisitor v; | 4414 | EditIncidenceVisitor v; |
4406 | v.act( incidence, this ); | 4415 | v.act( incidence, this ); |
4407 | 4416 | ||
4408 | } | 4417 | } |
4409 | } | 4418 | } |
4410 | 4419 | ||
4411 | void CalendarView::deleteIncidence(Incidence *incidence) | 4420 | void CalendarView::deleteIncidence(Incidence *incidence) |
4412 | { | 4421 | { |
4413 | //qDebug(" CalendarView::deleteIncidence "); | 4422 | //qDebug(" CalendarView::deleteIncidence "); |
4423 | if ( incidence == 0 ) { | ||
4424 | updateView(); | ||
4425 | emit updateSearchDialog(); | ||
4426 | return; | ||
4427 | } | ||
4414 | if ( incidence ) { | 4428 | if ( incidence ) { |
4415 | DeleteIncidenceVisitor v; | 4429 | DeleteIncidenceVisitor v; |
4416 | v.act( incidence, this ); | 4430 | v.act( incidence, this ); |
4417 | } | 4431 | } |
4418 | } | 4432 | } |
4419 | 4433 | ||
4420 | 4434 | ||
4421 | void CalendarView::lookForOutgoingMessages() | 4435 | void CalendarView::lookForOutgoingMessages() |
4422 | { | 4436 | { |
4423 | OutgoingDialog *ogd = mDialogManager->outgoingDialog(); | 4437 | OutgoingDialog *ogd = mDialogManager->outgoingDialog(); |
4424 | ogd->loadMessages(); | 4438 | ogd->loadMessages(); |
4425 | } | 4439 | } |
4426 | 4440 | ||
4427 | void CalendarView::lookForIncomingMessages() | 4441 | void CalendarView::lookForIncomingMessages() |
4428 | { | 4442 | { |
4429 | IncomingDialog *icd = mDialogManager->incomingDialog(); | 4443 | IncomingDialog *icd = mDialogManager->incomingDialog(); |
4430 | icd->retrieve(); | 4444 | icd->retrieve(); |
4431 | } | 4445 | } |
4432 | 4446 | ||
4433 | bool CalendarView::removeCompletedSubTodos( Todo* t ) | 4447 | bool CalendarView::removeCompletedSubTodos( Todo* t ) |
4434 | { | 4448 | { |
4435 | bool deleteTodo = true; | 4449 | bool deleteTodo = true; |
4436 | QPtrList<Incidence> subTodos; | 4450 | QPtrList<Incidence> subTodos; |
4437 | Incidence *aTodo; | 4451 | Incidence *aTodo; |
4438 | subTodos = t->relations(); | 4452 | subTodos = t->relations(); |
4439 | for (aTodo = subTodos.first(); aTodo; aTodo = subTodos.next()) { | 4453 | for (aTodo = subTodos.first(); aTodo; aTodo = subTodos.next()) { |
4440 | if (! removeCompletedSubTodos( (Todo*) aTodo )) | 4454 | if (! removeCompletedSubTodos( (Todo*) aTodo )) |
4441 | deleteTodo = false; | 4455 | deleteTodo = false; |
4442 | } | 4456 | } |
4443 | if ( deleteTodo ) { | 4457 | if ( deleteTodo ) { |
4444 | if ( t->isCompleted() && !t->doesRecur()) { | 4458 | if ( t->isCompleted() && !t->doesRecur()) { |
4445 | checkExternalId( t ); | 4459 | checkExternalId( t ); |
4446 | mCalendar->deleteTodo( t ); | 4460 | mCalendar->deleteTodo( t ); |
4447 | changeTodoDisplay( t,KOGlobals::EVENTDELETED ); | 4461 | changeTodoDisplay( t,KOGlobals::EVENTDELETED ); |
4448 | } | 4462 | } |
4449 | else | 4463 | else |
4450 | deleteTodo = false; | 4464 | deleteTodo = false; |
4451 | } | 4465 | } |
4452 | return deleteTodo; | 4466 | return deleteTodo; |
4453 | 4467 | ||
4454 | } | 4468 | } |
4455 | void CalendarView::purgeCompleted() | 4469 | void CalendarView::purgeCompleted() |
4456 | { | 4470 | { |
4457 | int result = KMessageBox::warningContinueCancel(this, | 4471 | int result = KMessageBox::warningContinueCancel(this, |
4458 | i18n("Delete all completed todos?\n(Completed recurring todos\nwill not be deleted!)"),i18n("Purge Todos"),i18n("Purge")); | 4472 | i18n("Delete all completed todos?\n(Completed recurring todos\nwill not be deleted!)"),i18n("Purge Todos"),i18n("Purge")); |
4459 | 4473 | ||
4460 | if (result == KMessageBox::Continue) { | 4474 | if (result == KMessageBox::Continue) { |
4461 | 4475 | ||
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index 25e599d..5690bdb 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp | |||
@@ -820,109 +820,111 @@ void KOListView::hideAll() | |||
820 | QPtrList<QListViewItem> delSel ; | 820 | QPtrList<QListViewItem> delSel ; |
821 | QListViewItem *item = mListView->firstChild (); | 821 | QListViewItem *item = mListView->firstChild (); |
822 | while ( item ) { | 822 | while ( item ) { |
823 | if ( item->isSelected() ) { | 823 | if ( item->isSelected() ) { |
824 | delSel.append(item); | 824 | delSel.append(item); |
825 | } | 825 | } |
826 | item = item->nextSibling(); | 826 | item = item->nextSibling(); |
827 | } | 827 | } |
828 | item = delSel.first() ; | 828 | item = delSel.first() ; |
829 | while ( item ) { | 829 | while ( item ) { |
830 | QListViewItem * del = item; | 830 | QListViewItem * del = item; |
831 | item = delSel.next(); | 831 | item = delSel.next(); |
832 | delete del; | 832 | delete del; |
833 | } | 833 | } |
834 | } | 834 | } |
835 | void KOListView::printList() | 835 | void KOListView::printList() |
836 | { | 836 | { |
837 | mListView->printList(); | 837 | mListView->printList(); |
838 | } | 838 | } |
839 | void KOListView::deleteAll() | 839 | void KOListView::deleteAll() |
840 | { | 840 | { |
841 | QPtrList<Incidence> delSel = getSelectedIncidences(); // all inc allowed;; | 841 | QPtrList<Incidence> delSel = getSelectedIncidences(); // all inc allowed;; |
842 | if ( delSel.count() ) { | 842 | if ( delSel.count() ) { |
843 | int icount = delSel.count(); | 843 | int icount = delSel.count(); |
844 | Incidence *incidence = delSel.first(); | 844 | Incidence *incidence = delSel.first(); |
845 | Incidence *toDelete; | 845 | Incidence *toDelete; |
846 | KOPrefs *p = KOPrefs::instance(); | 846 | KOPrefs *p = KOPrefs::instance(); |
847 | bool confirm = p->mConfirm; | 847 | bool confirm = p->mConfirm; |
848 | QString mess; | 848 | QString mess; |
849 | mess = mess.sprintf( i18n("You have %d item(s) selected.\n"), icount ); | 849 | mess = mess.sprintf( i18n("You have %d item(s) selected.\n"), icount ); |
850 | if ( KMessageBox::Continue == KMessageBox::warningContinueCancel(this, mess + i18n("All selected items will be\npermanently deleted.\n(Deleting items will take\nsome time on a PDA)\n"), i18n("KO/Pi Confirmation"),i18n("Delete")) ) { | 850 | if ( KMessageBox::Continue == KMessageBox::warningContinueCancel(this, mess + i18n("All selected items will be\npermanently deleted.\n(Deleting items will take\nsome time on a PDA)\n"), i18n("KO/Pi Confirmation"),i18n("Delete")) ) { |
851 | p->mConfirm = false; | 851 | p->mConfirm = false; |
852 | int delCounter = 0; | 852 | int delCounter = 0; |
853 | QDialog dia ( this, "p-dialog", true ); | 853 | QDialog dia ( this, "p-dialog", true ); |
854 | QLabel lab (i18n("Close dialog to abort deletion!"), &dia ); | 854 | QLabel lab (i18n("Close dialog to abort deletion!"), &dia ); |
855 | QVBoxLayout lay( &dia ); | 855 | QVBoxLayout lay( &dia ); |
856 | lay.setMargin(7); | 856 | lay.setMargin(7); |
857 | lay.setSpacing(7); | 857 | lay.setSpacing(7); |
858 | lay.addWidget( &lab); | 858 | lay.addWidget( &lab); |
859 | QProgressBar bar( icount, &dia ); | 859 | QProgressBar bar( icount, &dia ); |
860 | lay.addWidget( &bar); | 860 | lay.addWidget( &bar); |
861 | int w = 220; | 861 | int w = 220; |
862 | int h = 50; | 862 | int h = 50; |
863 | int dw = QApplication::desktop()->width(); | 863 | int dw = QApplication::desktop()->width(); |
864 | int dh = QApplication::desktop()->height(); | 864 | int dh = QApplication::desktop()->height(); |
865 | dia.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); | 865 | dia.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); |
866 | //dia.resize( 240,50 ); | 866 | //dia.resize( 240,50 ); |
867 | dia.show(); | 867 | dia.show(); |
868 | 868 | KOPrefs::instance()->mGlobalUpdateDisabled = true; | |
869 | while ( incidence ) { | 869 | while ( incidence ) { |
870 | bar.setProgress( delCounter ); | 870 | bar.setProgress( delCounter ); |
871 | mess = mess.sprintf( i18n("Deleting item %d ..."), ++delCounter ); | 871 | mess = mess.sprintf( i18n("Deleting item %d ..."), ++delCounter ); |
872 | dia.setCaption( mess ); | 872 | dia.setCaption( mess ); |
873 | qApp->processEvents(); | 873 | qApp->processEvents(); |
874 | toDelete = (incidence); | 874 | toDelete = (incidence); |
875 | incidence = delSel.next(); | 875 | incidence = delSel.next(); |
876 | emit deleteIncidenceSignal(toDelete ); | 876 | emit deleteIncidenceSignal(toDelete ); |
877 | if ( dia.result() != 0 ) | 877 | if ( dia.result() != 0 ) |
878 | break; | 878 | break; |
879 | 879 | ||
880 | } | 880 | } |
881 | KOPrefs::instance()->mGlobalUpdateDisabled = false; | ||
882 | emit deleteIncidenceSignal( 0 ); | ||
881 | mess = mess.sprintf( i18n("%d items remaining in list."), count() ); | 883 | mess = mess.sprintf( i18n("%d items remaining in list."), count() ); |
882 | topLevelWidget ()->setCaption( mess ); | 884 | topLevelWidget ()->setCaption( mess ); |
883 | p->mConfirm = confirm; | 885 | p->mConfirm = confirm; |
884 | } | 886 | } |
885 | } | 887 | } |
886 | 888 | ||
887 | 889 | ||
888 | } | 890 | } |
889 | int KOListView::maxDatesHint() | 891 | int KOListView::maxDatesHint() |
890 | { | 892 | { |
891 | return 0; | 893 | return 0; |
892 | } | 894 | } |
893 | 895 | ||
894 | int KOListView::currentDateCount() | 896 | int KOListView::currentDateCount() |
895 | { | 897 | { |
896 | return 0; | 898 | return 0; |
897 | } | 899 | } |
898 | 900 | ||
899 | QPtrList<Incidence> KOListView::selectedIncidences() | 901 | QPtrList<Incidence> KOListView::selectedIncidences() |
900 | { | 902 | { |
901 | QPtrList<Incidence> eventList; | 903 | QPtrList<Incidence> eventList; |
902 | QListViewItem *item = mListView->firstChild (); | 904 | QListViewItem *item = mListView->firstChild (); |
903 | while ( item ) { | 905 | while ( item ) { |
904 | if ( item->isSelected() ) { | 906 | if ( item->isSelected() ) { |
905 | eventList.append(((KOListViewItem *)item)->data()); | 907 | eventList.append(((KOListViewItem *)item)->data()); |
906 | } | 908 | } |
907 | 909 | ||
908 | item = item->nextSibling(); | 910 | item = item->nextSibling(); |
909 | } | 911 | } |
910 | 912 | ||
911 | // // QListViewItem *item = mListView->selectedItem(); | 913 | // // QListViewItem *item = mListView->selectedItem(); |
912 | //if (item) eventList.append(((KOListViewItem *)item)->data()); | 914 | //if (item) eventList.append(((KOListViewItem *)item)->data()); |
913 | 915 | ||
914 | return eventList; | 916 | return eventList; |
915 | } | 917 | } |
916 | 918 | ||
917 | DateList KOListView::selectedDates() | 919 | DateList KOListView::selectedDates() |
918 | { | 920 | { |
919 | DateList eventList; | 921 | DateList eventList; |
920 | return eventList; | 922 | return eventList; |
921 | } | 923 | } |
922 | 924 | ||
923 | void KOListView::showDates(bool show) | 925 | void KOListView::showDates(bool show) |
924 | { | 926 | { |
925 | // Shouldn't we set it to a value greater 0? When showDates is called with | 927 | // Shouldn't we set it to a value greater 0? When showDates is called with |
926 | // show == true at first, then the columnwidths are set to zero. | 928 | // show == true at first, then the columnwidths are set to zero. |
927 | static int oldColWidth1 = 0; | 929 | static int oldColWidth1 = 0; |
928 | static int oldColWidth3 = 0; | 930 | static int oldColWidth3 = 0; |
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index 138028d..a63297e 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp | |||
@@ -8,96 +8,97 @@ | |||
8 | (at your option) any later version. | 8 | (at your option) any later version. |
9 | 9 | ||
10 | This program is distributed in the hope that it will be useful, | 10 | This program is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include <time.h> | 24 | #include <time.h> |
25 | #ifndef _WIN32_ | 25 | #ifndef _WIN32_ |
26 | #include <unistd.h> | 26 | #include <unistd.h> |
27 | #endif | 27 | #endif |
28 | #include <qdir.h> | 28 | #include <qdir.h> |
29 | #include <qtextstream.h> | 29 | #include <qtextstream.h> |
30 | #include <qtextcodec.h> | 30 | #include <qtextcodec.h> |
31 | #include <qstring.h> | 31 | #include <qstring.h> |
32 | #include <qregexp.h> | 32 | #include <qregexp.h> |
33 | #include <qfont.h> | 33 | #include <qfont.h> |
34 | #include <qcolor.h> | 34 | #include <qcolor.h> |
35 | #include <qstringlist.h> | 35 | #include <qstringlist.h> |
36 | #include <stdlib.h> | 36 | #include <stdlib.h> |
37 | 37 | ||
38 | #include <kglobal.h> | 38 | #include <kglobal.h> |
39 | #include <kglobalsettings.h> | 39 | #include <kglobalsettings.h> |
40 | #include <kconfig.h> | 40 | #include <kconfig.h> |
41 | #include <klocale.h> | 41 | #include <klocale.h> |
42 | #include <kdebug.h> | 42 | #include <kdebug.h> |
43 | #include <kemailsettings.h> | 43 | #include <kemailsettings.h> |
44 | #include <kstaticdeleter.h> | 44 | #include <kstaticdeleter.h> |
45 | #include <libkdepim/kpimglobalprefs.h> | 45 | #include <libkdepim/kpimglobalprefs.h> |
46 | 46 | ||
47 | #include "koprefs.h" | 47 | #include "koprefs.h" |
48 | #include "mainwindow.h" | 48 | #include "mainwindow.h" |
49 | 49 | ||
50 | KOPrefs *KOPrefs::mInstance = 0; | 50 | KOPrefs *KOPrefs::mInstance = 0; |
51 | static KStaticDeleter<KOPrefs> insd; | 51 | static KStaticDeleter<KOPrefs> insd; |
52 | 52 | ||
53 | KOPrefs::KOPrefs() : | 53 | KOPrefs::KOPrefs() : |
54 | KPimPrefs("korganizerrc") | 54 | KPimPrefs("korganizerrc") |
55 | { | 55 | { |
56 | mGlobalUpdateDisabled = false; | ||
56 | mCategoryColors.setAutoDelete(true); | 57 | mCategoryColors.setAutoDelete(true); |
57 | fillMailDefaults(); | 58 | fillMailDefaults(); |
58 | mDefaultCategoryColor = QColor(175,210,255);//196,196,196); | 59 | mDefaultCategoryColor = QColor(175,210,255);//196,196,196); |
59 | QColor defaultHolidayColor = QColor(255,0,0); | 60 | QColor defaultHolidayColor = QColor(255,0,0); |
60 | QColor defaultHighlightColor = QColor(129,112,255);//64,64,255); | 61 | QColor defaultHighlightColor = QColor(129,112,255);//64,64,255); |
61 | QColor defaultAgendaBgColor = QColor(239,241,169);//128,128,128); | 62 | QColor defaultAgendaBgColor = QColor(239,241,169);//128,128,128); |
62 | QColor defaultWorkingHoursColor = QColor(170,223,150);//160,160,160); | 63 | QColor defaultWorkingHoursColor = QColor(170,223,150);//160,160,160); |
63 | QColor defaultTodoDueTodayColor = QColor(255,220,100); | 64 | QColor defaultTodoDueTodayColor = QColor(255,220,100); |
64 | QColor defaultTodoOverdueColor = QColor(255,153,125); | 65 | QColor defaultTodoOverdueColor = QColor(255,153,125); |
65 | QColor defaultTodoRunColor = QColor(99,194,30); | 66 | QColor defaultTodoRunColor = QColor(99,194,30); |
66 | KPrefs::setCurrentGroup("General"); | 67 | KPrefs::setCurrentGroup("General"); |
67 | addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false); | 68 | addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false); |
68 | addItemBool("ShowIconNewTodo",&mShowIconNewTodo,true); | 69 | addItemBool("ShowIconNewTodo",&mShowIconNewTodo,true); |
69 | addItemBool("ShowIconNewEvent",&mShowIconNewEvent,true); | 70 | addItemBool("ShowIconNewEvent",&mShowIconNewEvent,true); |
70 | addItemBool("ShowIconSearch",&mShowIconSearch,true); | 71 | addItemBool("ShowIconSearch",&mShowIconSearch,true); |
71 | addItemBool("ShowIconList",&mShowIconList,true); | 72 | addItemBool("ShowIconList",&mShowIconList,true); |
72 | addItemBool("ShowIconDay1",&mShowIconDay1,true); | 73 | addItemBool("ShowIconDay1",&mShowIconDay1,true); |
73 | addItemBool("ShowIconDay5",&mShowIconDay5,true); | 74 | addItemBool("ShowIconDay5",&mShowIconDay5,true); |
74 | addItemBool("ShowIconDay6",&mShowIconDay6,true); | 75 | addItemBool("ShowIconDay6",&mShowIconDay6,true); |
75 | addItemBool("ShowIconDay7",&mShowIconDay7,true); | 76 | addItemBool("ShowIconDay7",&mShowIconDay7,true); |
76 | addItemBool("ShowIconMonth",&mShowIconMonth,true); | 77 | addItemBool("ShowIconMonth",&mShowIconMonth,true); |
77 | addItemBool("ShowIconTodoview",&mShowIconTodoview,true); | 78 | addItemBool("ShowIconTodoview",&mShowIconTodoview,true); |
78 | addItemBool("ShowIconBackFast",&mShowIconBackFast,true); | 79 | addItemBool("ShowIconBackFast",&mShowIconBackFast,true); |
79 | addItemBool("ShowIconBack",&mShowIconBack,true); | 80 | addItemBool("ShowIconBack",&mShowIconBack,true); |
80 | addItemBool("ShowIconToday",&mShowIconToday,true); | 81 | addItemBool("ShowIconToday",&mShowIconToday,true); |
81 | addItemBool("ShowIconForward",&mShowIconForward,true); | 82 | addItemBool("ShowIconForward",&mShowIconForward,true); |
82 | addItemBool("ShowIconForwardFast",&mShowIconForwardFast,true); | 83 | addItemBool("ShowIconForwardFast",&mShowIconForwardFast,true); |
83 | addItemBool("ShowIconWhatsThis",&mShowIconWhatsThis,true); | 84 | addItemBool("ShowIconWhatsThis",&mShowIconWhatsThis,true); |
84 | addItemBool("ShowIconWeekNum",&mShowIconWeekNum,true); | 85 | addItemBool("ShowIconWeekNum",&mShowIconWeekNum,true); |
85 | addItemBool("ShowIconNextDays",&mShowIconNextDays,true); | 86 | addItemBool("ShowIconNextDays",&mShowIconNextDays,true); |
86 | addItemBool("ShowIconNext",&mShowIconNext,true); | 87 | addItemBool("ShowIconNext",&mShowIconNext,true); |
87 | addItemBool("ShowIconJournal",&mShowIconJournal,true); | 88 | addItemBool("ShowIconJournal",&mShowIconJournal,true); |
88 | addItemBool("ShowIconStretch",&mShowIconStretch,true); | 89 | addItemBool("ShowIconStretch",&mShowIconStretch,true); |
89 | addItemBool("ShowIconFilter",&mShowIconFilter,false); | 90 | addItemBool("ShowIconFilter",&mShowIconFilter,false); |
90 | addItemBool("ShowIconOnetoolbar",&mShowIconOnetoolbar,true); | 91 | addItemBool("ShowIconOnetoolbar",&mShowIconOnetoolbar,true); |
91 | 92 | ||
92 | bool addIcons = false; | 93 | bool addIcons = false; |
93 | #ifdef DESKTOP_VERSION | 94 | #ifdef DESKTOP_VERSION |
94 | addIcons = true; | 95 | addIcons = true; |
95 | #endif | 96 | #endif |
96 | addItemBool("ShowIconNavigator",&mShowIconNavigator,addIcons); | 97 | addItemBool("ShowIconNavigator",&mShowIconNavigator,addIcons); |
97 | addItemBool("ShowIconAllday",&mShowIconAllday,addIcons); | 98 | addItemBool("ShowIconAllday",&mShowIconAllday,addIcons); |
98 | addItemBool("ShowIconFilterview",&mShowIconFilterview,addIcons); | 99 | addItemBool("ShowIconFilterview",&mShowIconFilterview,addIcons); |
99 | addItemBool("ShowIconToggleFull",&mShowIconToggleFull,addIcons); | 100 | addItemBool("ShowIconToggleFull",&mShowIconToggleFull,addIcons); |
100 | 101 | ||
101 | addItemInt("LastLoadedLanguage",&mOldLanguage,0); | 102 | addItemInt("LastLoadedLanguage",&mOldLanguage,0); |
102 | 103 | ||
103 | addItemBool("AskForQuit",&mAskForQuit,false); | 104 | addItemBool("AskForQuit",&mAskForQuit,false); |
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h index 0779e27..392360d 100644 --- a/korganizer/koprefs.h +++ b/korganizer/koprefs.h | |||
@@ -300,63 +300,64 @@ class KOPrefs : public KPimPrefs | |||
300 | bool mCenterOnCurrentTime; | 300 | bool mCenterOnCurrentTime; |
301 | bool mSetTimeToDayStartAt; | 301 | bool mSetTimeToDayStartAt; |
302 | bool mHighlightCurrentDay; | 302 | bool mHighlightCurrentDay; |
303 | bool mUseHighlightLightColor; | 303 | bool mUseHighlightLightColor; |
304 | bool mListViewMonthTimespan; | 304 | bool mListViewMonthTimespan; |
305 | bool mWNViewShowsParents; | 305 | bool mWNViewShowsParents; |
306 | bool mWNViewShowsPast; | 306 | bool mWNViewShowsPast; |
307 | bool mWNViewShowLocation; | 307 | bool mWNViewShowLocation; |
308 | bool mTodoViewShowsPercentage; | 308 | bool mTodoViewShowsPercentage; |
309 | bool mTodoViewUsesCatColors; | 309 | bool mTodoViewUsesCatColors; |
310 | bool mMonthViewUsesBigFont; | 310 | bool mMonthViewUsesBigFont; |
311 | bool mTodoViewUsesSmallFont; | 311 | bool mTodoViewUsesSmallFont; |
312 | bool mTodoViewUsesForegroundColor; | 312 | bool mTodoViewUsesForegroundColor; |
313 | bool mMonthViewUsesForegroundColor; | 313 | bool mMonthViewUsesForegroundColor; |
314 | 314 | ||
315 | bool mHightlightDateTimeEdit; | 315 | bool mHightlightDateTimeEdit; |
316 | bool mShortDateInViewer; | 316 | bool mShortDateInViewer; |
317 | 317 | ||
318 | bool mShowDateNavigator; | 318 | bool mShowDateNavigator; |
319 | 319 | ||
320 | QStringList mLocationDefaults; | 320 | QStringList mLocationDefaults; |
321 | QStringList mEventSummaryUser; | 321 | QStringList mEventSummaryUser; |
322 | QStringList mTodoSummaryUser; | 322 | QStringList mTodoSummaryUser; |
323 | QStringList mJournalSummaryUser; | 323 | QStringList mJournalSummaryUser; |
324 | 324 | ||
325 | bool mUseInternalAlarmNotification; | 325 | bool mUseInternalAlarmNotification; |
326 | int mAlarmPlayBeeps; | 326 | int mAlarmPlayBeeps; |
327 | int mAlarmSuspendTime; | 327 | int mAlarmSuspendTime; |
328 | int mAlarmSuspendCount; | 328 | int mAlarmSuspendCount; |
329 | int mAlarmBeepInterval; | 329 | int mAlarmBeepInterval; |
330 | int mOldLanguage; | 330 | int mOldLanguage; |
331 | int mOldLoadedLanguage; | 331 | int mOldLoadedLanguage; |
332 | 332 | ||
333 | 333 | ||
334 | QString mActiveSyncPort; | 334 | QString mActiveSyncPort; |
335 | QString mActiveSyncIP; | 335 | QString mActiveSyncIP; |
336 | 336 | ||
337 | // settings for eventviewer | 337 | // settings for eventviewer |
338 | bool mEVshowDetails; | 338 | bool mEVshowDetails; |
339 | bool mEVshowCreated; | 339 | bool mEVshowCreated; |
340 | bool mEVshowChanged; | 340 | bool mEVshowChanged; |
341 | bool mWTshowDetails; | 341 | bool mWTshowDetails; |
342 | bool mWTshowCreated; | 342 | bool mWTshowCreated; |
343 | bool mWTshowChanged; | 343 | bool mWTshowChanged; |
344 | 344 | ||
345 | int mCurrentDisplayedView; | 345 | int mCurrentDisplayedView; |
346 | QPtrList<KopiCalendarFile> mCalendars; | 346 | QPtrList<KopiCalendarFile> mCalendars; |
347 | int mNextAvailableCalendar; | 347 | int mNextAvailableCalendar; |
348 | bool mGlobalUpdateDisabled; | ||
348 | 349 | ||
349 | private: | 350 | private: |
350 | QDict<QColor> mCategoryColors; | 351 | QDict<QColor> mCategoryColors; |
351 | QArray<KopiCalendarFile*> mDefCalColors; | 352 | QArray<KopiCalendarFile*> mDefCalColors; |
352 | QColor mDefaultCategoryColor; | 353 | QColor mDefaultCategoryColor; |
353 | 354 | ||
354 | QFont mDefaultTimeBarFont; | 355 | QFont mDefaultTimeBarFont; |
355 | QFont mDefaultViewFont; | 356 | QFont mDefaultViewFont; |
356 | QFont mDefaultMonthViewFont; | 357 | QFont mDefaultMonthViewFont; |
357 | 358 | ||
358 | QString mName; | 359 | QString mName; |
359 | QString mEmail; | 360 | QString mEmail; |
360 | }; | 361 | }; |
361 | 362 | ||
362 | #endif | 363 | #endif |
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp index 2e32ac2..9cfdc35 100644 --- a/korganizer/searchdialog.cpp +++ b/korganizer/searchdialog.cpp | |||
@@ -209,96 +209,100 @@ void SearchDialog::raiseAndSelect() | |||
209 | if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW ) { | 209 | if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW ) { |
210 | newState = VIEW_J_VIEW; | 210 | newState = VIEW_J_VIEW; |
211 | } | 211 | } |
212 | else if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW ) { | 212 | else if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW ) { |
213 | newState = VIEW_T_VIEW; | 213 | newState = VIEW_T_VIEW; |
214 | } | 214 | } |
215 | else { | 215 | else { |
216 | newState = VIEW_A_VIEW; | 216 | newState = VIEW_A_VIEW; |
217 | } | 217 | } |
218 | if ( newState != currentState ) { | 218 | if ( newState != currentState ) { |
219 | if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW ) { | 219 | if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW ) { |
220 | if ( ! mSearchJournal->isChecked() ) { | 220 | if ( ! mSearchJournal->isChecked() ) { |
221 | mSearchJournal->setChecked( true ); | 221 | mSearchJournal->setChecked( true ); |
222 | mSearchTodo->setChecked( false ); | 222 | mSearchTodo->setChecked( false ); |
223 | mSearchEvent->setChecked( false ); | 223 | mSearchEvent->setChecked( false ); |
224 | mSummaryCheck->setChecked( true ); | 224 | mSummaryCheck->setChecked( true ); |
225 | mDescriptionCheck->setChecked( true ); | 225 | mDescriptionCheck->setChecked( true ); |
226 | 226 | ||
227 | } | 227 | } |
228 | } | 228 | } |
229 | else if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW ) { | 229 | else if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW ) { |
230 | if ( ! mSearchTodo->isChecked() ) { | 230 | if ( ! mSearchTodo->isChecked() ) { |
231 | mSearchTodo->setChecked( true ); | 231 | mSearchTodo->setChecked( true ); |
232 | mSearchJournal->setChecked( false ); | 232 | mSearchJournal->setChecked( false ); |
233 | mSearchEvent->setChecked( false ); | 233 | mSearchEvent->setChecked( false ); |
234 | } | 234 | } |
235 | } | 235 | } |
236 | else { | 236 | else { |
237 | if ( ! mSearchEvent->isChecked() ) { | 237 | if ( ! mSearchEvent->isChecked() ) { |
238 | mSearchEvent->setChecked( true ); | 238 | mSearchEvent->setChecked( true ); |
239 | mSearchJournal->setChecked( false ); | 239 | mSearchJournal->setChecked( false ); |
240 | mSearchTodo->setChecked( false ); | 240 | mSearchTodo->setChecked( false ); |
241 | } | 241 | } |
242 | } | 242 | } |
243 | } | 243 | } |
244 | currentState = newState; | 244 | currentState = newState; |
245 | raise(); | 245 | raise(); |
246 | } | 246 | } |
247 | void SearchDialog::setFocusToList() | 247 | void SearchDialog::setFocusToList() |
248 | { | 248 | { |
249 | listView->resetFocus(); | 249 | listView->resetFocus(); |
250 | } | 250 | } |
251 | void SearchDialog::accept() | 251 | void SearchDialog::accept() |
252 | { | 252 | { |
253 | doSearch(); | 253 | doSearch(); |
254 | } | 254 | } |
255 | void SearchDialog::updateList() | 255 | void SearchDialog::updateList() |
256 | { | 256 | { |
257 | if ( KOPrefs::instance()->mGlobalUpdateDisabled ) { | ||
258 | listView->clear(); | ||
259 | return; | ||
260 | } | ||
257 | //listView->updateList(); | 261 | //listView->updateList(); |
258 | if ( isVisible() ) { | 262 | if ( isVisible() ) { |
259 | updateView(); | 263 | updateView(); |
260 | //qDebug("SearchDialog::updated "); | 264 | //qDebug("SearchDialog::updated "); |
261 | } | 265 | } |
262 | else { | 266 | else { |
263 | listView->clear(); | 267 | listView->clear(); |
264 | //qDebug("SearchDialog::cleared "); | 268 | //qDebug("SearchDialog::cleared "); |
265 | 269 | ||
266 | } | 270 | } |
267 | } | 271 | } |
268 | void SearchDialog::searchTextChanged( const QString &_text ) | 272 | void SearchDialog::searchTextChanged( const QString &_text ) |
269 | { | 273 | { |
270 | #if 0 | 274 | #if 0 |
271 | enableButton( KDialogBase::User1, !_text.isEmpty() ); | 275 | enableButton( KDialogBase::User1, !_text.isEmpty() ); |
272 | #endif | 276 | #endif |
273 | } | 277 | } |
274 | 278 | ||
275 | void SearchDialog::doSearch() | 279 | void SearchDialog::doSearch() |
276 | { | 280 | { |
277 | QRegExp re; | 281 | QRegExp re; |
278 | re.setWildcard(true); // most people understand these better. | 282 | re.setWildcard(true); // most people understand these better. |
279 | re.setCaseSensitive(false); | 283 | re.setCaseSensitive(false); |
280 | QString st = searchEdit->text(); | 284 | QString st = searchEdit->text(); |
281 | if ( st.right(1) != "*") | 285 | if ( st.right(1) != "*") |
282 | st += "*"; | 286 | st += "*"; |
283 | re.setPattern(st); | 287 | re.setPattern(st); |
284 | if (!mSearchEvent->isChecked() && !mSearchTodo->isChecked() && !mSearchJournal->isChecked() ) { | 288 | if (!mSearchEvent->isChecked() && !mSearchTodo->isChecked() && !mSearchJournal->isChecked() ) { |
285 | KMessageBox::sorry(this, | 289 | KMessageBox::sorry(this, |
286 | i18n("Please select at least one\nof the types to search for:\n\nEvents\nTodos\nJournals")); | 290 | i18n("Please select at least one\nof the types to search for:\n\nEvents\nTodos\nJournals")); |
287 | return; | 291 | return; |
288 | } | 292 | } |
289 | if (!re.isValid() ) { | 293 | if (!re.isValid() ) { |
290 | KMessageBox::sorry(this, | 294 | KMessageBox::sorry(this, |
291 | i18n("Invalid search expression,\ncannot perform " | 295 | i18n("Invalid search expression,\ncannot perform " |
292 | "the search.\nPlease enter a search expression\n" | 296 | "the search.\nPlease enter a search expression\n" |
293 | "using the wildcard characters\n '*' and '?'" | 297 | "using the wildcard characters\n '*' and '?'" |
294 | "where needed.")); | 298 | "where needed.")); |
295 | return; | 299 | return; |
296 | } | 300 | } |
297 | search(re); | 301 | search(re); |
298 | listView->setStartDate( mStartDate->date() ); | 302 | listView->setStartDate( mStartDate->date() ); |
299 | listView->showEvents(mMatchedEvents); | 303 | listView->showEvents(mMatchedEvents); |
300 | listView->addTodos(mMatchedTodos); | 304 | listView->addTodos(mMatchedTodos); |
301 | listView->addJournals(mMatchedJournals); | 305 | listView->addJournals(mMatchedJournals); |
302 | if (mMatchedEvents.count() + mMatchedJournals.count() + mMatchedTodos.count() == 0) { | 306 | if (mMatchedEvents.count() + mMatchedJournals.count() + mMatchedTodos.count() == 0) { |
303 | setCaption(i18n("No items found. Use '*' and '?' where needed.")); | 307 | setCaption(i18n("No items found. Use '*' and '?' where needed.")); |
304 | } else { | 308 | } else { |