author | zautrix <zautrix> | 2005-07-06 14:24:16 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-07-06 14:24:16 (UTC) |
commit | 2e8199c8aa82c018d24d67c299a09b2aa6a786f1 (patch) (side-by-side diff) | |
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 @@ -2662,16 +2662,25 @@ void CalendarView::clearAllViews() if ( sd ) { KOListView* kol = sd->listview(); if ( kol ) kol->clearList(); } } void CalendarView::updateView() { + static bool clearallviews = false; + if ( KOPrefs::instance()->mGlobalUpdateDisabled ) { + if ( clearallviews ) { + clearAllViews(); + clearallviews = false; + } + return; + } + clearallviews = true; DateList tmpList = mNavigator->selectedDates(); if ( KOPrefs::instance()->mHideNonStartedTodos ) mTodoList->updateView(); // We assume that the navigator only selects consecutive days. updateView( tmpList.first(), tmpList.last() ); } @@ -4406,16 +4415,21 @@ void CalendarView::editIncidence(Incidence *incidence) v.act( incidence, this ); } } void CalendarView::deleteIncidence(Incidence *incidence) { //qDebug(" CalendarView::deleteIncidence "); + if ( incidence == 0 ) { + updateView(); + emit updateSearchDialog(); + return; + } if ( incidence ) { DeleteIncidenceVisitor v; v.act( incidence, this ); } } void CalendarView::lookForOutgoingMessages() diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index 25e599d..5690bdb 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp @@ -860,29 +860,31 @@ void KOListView::deleteAll() lay.addWidget( &bar); int w = 220; int h = 50; int dw = QApplication::desktop()->width(); int dh = QApplication::desktop()->height(); dia.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); //dia.resize( 240,50 ); dia.show(); - + KOPrefs::instance()->mGlobalUpdateDisabled = true; while ( incidence ) { bar.setProgress( delCounter ); mess = mess.sprintf( i18n("Deleting item %d ..."), ++delCounter ); dia.setCaption( mess ); qApp->processEvents(); toDelete = (incidence); incidence = delSel.next(); emit deleteIncidenceSignal(toDelete ); if ( dia.result() != 0 ) break; } + KOPrefs::instance()->mGlobalUpdateDisabled = false; + emit deleteIncidenceSignal( 0 ); mess = mess.sprintf( i18n("%d items remaining in list."), count() ); topLevelWidget ()->setCaption( mess ); p->mConfirm = confirm; } } } diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index 138028d..a63297e 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp @@ -48,16 +48,17 @@ #include "mainwindow.h" KOPrefs *KOPrefs::mInstance = 0; static KStaticDeleter<KOPrefs> insd; KOPrefs::KOPrefs() : KPimPrefs("korganizerrc") { + mGlobalUpdateDisabled = false; mCategoryColors.setAutoDelete(true); fillMailDefaults(); mDefaultCategoryColor = QColor(175,210,255);//196,196,196); QColor defaultHolidayColor = QColor(255,0,0); QColor defaultHighlightColor = QColor(129,112,255);//64,64,255); QColor defaultAgendaBgColor = QColor(239,241,169);//128,128,128); QColor defaultWorkingHoursColor = QColor(170,223,150);//160,160,160); QColor defaultTodoDueTodayColor = QColor(255,220,100); diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h index 0779e27..392360d 100644 --- a/korganizer/koprefs.h +++ b/korganizer/koprefs.h @@ -340,16 +340,17 @@ class KOPrefs : public KPimPrefs bool mEVshowChanged; bool mWTshowDetails; bool mWTshowCreated; bool mWTshowChanged; int mCurrentDisplayedView; QPtrList<KopiCalendarFile> mCalendars; int mNextAvailableCalendar; + bool mGlobalUpdateDisabled; private: QDict<QColor> mCategoryColors; QArray<KopiCalendarFile*> mDefCalColors; QColor mDefaultCategoryColor; QFont mDefaultTimeBarFont; QFont mDefaultViewFont; diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp index 2e32ac2..9cfdc35 100644 --- a/korganizer/searchdialog.cpp +++ b/korganizer/searchdialog.cpp @@ -249,16 +249,20 @@ void SearchDialog::setFocusToList() listView->resetFocus(); } void SearchDialog::accept() { doSearch(); } void SearchDialog::updateList() { + if ( KOPrefs::instance()->mGlobalUpdateDisabled ) { + listView->clear(); + return; + } //listView->updateList(); if ( isVisible() ) { updateView(); //qDebug("SearchDialog::updated "); } else { listView->clear(); //qDebug("SearchDialog::cleared "); |