fixxx

5 files changed, 24 insertions, 2 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 4b3f806..558fc55 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2668,4 +2668,13 @@ void CalendarView::clearAllViews()
 void CalendarView::updateView()
 {
+    static bool clearallviews = false;
+    if ( KOPrefs::instance()->mGlobalUpdateDisabled ) {
+        if ( clearallviews ) {
+            clearAllViews();
+            clearallviews = false;
+        }
+        return;
+    }
+    clearallviews = true;
     DateList tmpList = mNavigator->selectedDates();
 
@@ -4412,4 +4421,9 @@ void CalendarView::deleteIncidence(Incidence *incidence)
 {
     //qDebug(" CalendarView::deleteIncidence ");
+    if ( incidence == 0 ) {
+        updateView();
+        emit updateSearchDialog();
+        return;
+    }
     if ( incidence ) {
         DeleteIncidenceVisitor v;
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 25e599d..5690bdb 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -866,5 +866,5 @@ void KOListView::deleteAll()
             //dia.resize( 240,50 );
             dia.show();
-            
+            KOPrefs::instance()->mGlobalUpdateDisabled = true;
             while ( incidence ) {
                 bar.setProgress( delCounter );
@@ -879,4 +879,6 @@ void KOListView::deleteAll()
                
             }
+            KOPrefs::instance()->mGlobalUpdateDisabled = false;
+            emit deleteIncidenceSignal( 0 ); 
             mess = mess.sprintf( i18n("%d items remaining in list."), count() );
             topLevelWidget ()->setCaption( mess );
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 138028d..a63297e 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -54,4 +54,5 @@ KOPrefs::KOPrefs() :
   KPimPrefs("korganizerrc")
 {
+    mGlobalUpdateDisabled = false;
   mCategoryColors.setAutoDelete(true);
   fillMailDefaults();
@@ -320,5 +321,5 @@ KOPrefs::KOPrefs() :
   addItemBool("WTshowCreated",&mWTshowCreated,false);
   addItemBool("WTshowChanged",&mWTshowChanged,false);
-  mCalendars.setAutoDelete( true );
+  mCalendars.setAutoDelete( true ); 
 }
 
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index 0779e27..392360d 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -346,4 +346,5 @@ class KOPrefs : public KPimPrefs
     QPtrList<KopiCalendarFile> mCalendars;
     int mNextAvailableCalendar;
+    bool mGlobalUpdateDisabled;
 
   private:
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index 2e32ac2..9cfdc35 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -255,4 +255,8 @@ void SearchDialog::accept()
 void SearchDialog::updateList()
 {
+    if ( KOPrefs::instance()->mGlobalUpdateDisabled ) {
+        listView->clear();
+        return;
+    }
     //listView->updateList();
     if ( isVisible() ) {