From 701cd3c2b2b713c12797f5bda24c35d3a7889539 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Tue, 05 Oct 2004 08:32:25 +0000
Subject: warning dialog fixes

---
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index fecc7e2..687943e 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1523,15 +1523,28 @@ bool CalendarView::openCalendar(QString filename, bool merge)
     } else {
         // while failing to load, the calendar object could
         // have become partially populated.  Clear it out.
-        if ( !merge ) mCalendar->close();
+        if ( !merge ) {
+            mCalendar->close();
+            mViewManager->setDocumentId( filename );
+            mDialogManager->setDocumentId( filename );
+            mTodoList->setDocumentId( filename );
+        }
 
-        KMessageBox::error(this,i18n("Couldn't load calendar\n '%1'.").arg(filename));
+        //KMessageBox::error(this,i18n("Couldn't load calendar\n '%1'.").arg(filename));
 
+        QTimer::singleShot ( 1, this, SLOT ( showOpenError() ) ); 
         globalFlagBlockAgenda = 2;
+        mCalendar->reInitAlarmSettings();
+        setSyncEventsReadOnly();
+        updateUnmanagedViews();
         updateView();
     }
     return false;
 }
+void CalendarView::showOpenError()
+{
+   KMessageBox::error(this,i18n("Couldn't load calendar\n."));
+}
 void CalendarView::setLoadedFileVersion(QDateTime dt)
 {
     loadedFileVersion = dt;
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index 355bb84..cd54685 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -172,6 +172,7 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
 
 
   public slots:
+    void showOpenError();
     void watchSavedFile();
     void recheckTimerAlarm();
     void checkNextTimerAlarm();
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 43ee2d7..7b666d1 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -144,7 +144,6 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
     //mView->resize( splash->size() );
     //qDebug("MainView x %d y %d w %d  h %d",  mView->x(),mView-> y(), mView->width(), mView->height ());
     mView->readSettings();
-    bool oldOpened = false;
     bool newFile = false;
     if( !QFile::exists( defaultFileName() ) ) {
         QFileInfo finfo ( defaultFileName() );
@@ -170,8 +169,7 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
     }
 
     QTime neededSaveTime = QDateTime::currentDateTime().time();
-    if ( ! oldOpened )
-        mView->openCalendar( defaultFileName() );
+    mView->openCalendar( defaultFileName() );
     int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() );
     qDebug("KO: Calendar loading time: %d ms",msNeeded );
 
--
cgit v0.9.0.2