6 files changed, 62 insertions, 23 deletions

diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index fcfa282..fbd262c 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1556,5 +1556,5 @@
 { "Check NonAllday with NonAllday","Prüfe NichtGanzTag mit NichtGanzTag" },
 { "Conflict detection","Konflikterkennung" },
-{ "","" },
+{ "Loading calendar files ... please wait","Lade Kalenderdateien ... bitte warten" },
 { "","" },
 { "","" },
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index e3b62de..9928b48 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2392,6 +2392,6 @@ bool CalendarView::openCalendar(QString filename, bool merge)
         mCalendar->reInitAlarmSettings();
         setSyncEventsReadOnly();
-        updateUnmanagedViews();
-        updateView();
+        //updateUnmanagedViews();
+        //updateView();
         if (  filename != MainWindow::defaultFileName() ) {
             saveCalendar( MainWindow::defaultFileName() );
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 17248dc..07bfdbf 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -505,4 +505,9 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
   KOrg::BaseView(calendar,parent,name)
 { 
+
+    mCurItem = 0;
+    mCurItemRootParent = 0;
+    mCurItemParent = 0;
+    mCurItemAbove = 0; 
     mActiveItem = 0;
     mCategoryPopupMenu = 0;
diff --git a/korganizer/main.cpp b/korganizer/main.cpp
index c9d1345..6339370 100644
--- a/korganizer/main.cpp
+++ b/korganizer/main.cpp
@@ -90,5 +90,5 @@ int main( int argc, char **argv )
 #ifndef DESKTOP_VERSION
      
-      QObject::connect( &a, SIGNAL (appMessage ( const QCString &, const QByteArray & )),&m, SLOT(recieve(  const QCString&, const QByteArray& )));
+      QObject::connect( &a, SIGNAL (appMessage ( const QCString &, const QByteArray & )),&m, SLOT(receiveStart(  const QCString&, const QByteArray& )));
       a.showMainWidget(&m );
 #else
@@ -96,5 +96,5 @@ int main( int argc, char **argv )
       m.show();
       //m.resize( 800, 600 );
-      QObject::connect(&a, SIGNAL(lastWindowClosed()), &a, SLOT(quit()));
+      //QObject::connect(&a, SIGNAL(lastWindowClosed()), &a, SLOT(quit()));
 #endif
       if ( argc > 1 ) {
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 9ae393d..8c72d89 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -347,17 +347,12 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
     }
 
-    QTime neededSaveTime = QDateTime::currentDateTime().time();
-    mView->loadCalendars();
-    int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() );
-    qDebug("KO: Calendar loading time: %d ms",msNeeded );
+    //QTime neededSaveTime = QDateTime::currentDateTime().time();
+    //mView->loadCalendars();
+    //int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() );
+    //qDebug("KO: Calendar loading time: %d ms",msNeeded );
 
     if ( KPimGlobalPrefs::instance()->mPreferredLanguage != KOPrefs::instance()->mOldLoadedLanguage ) {
         KOPrefs::instance()->setAllDefaults();
     }
-    processIncidenceSelection( 0 );
-    connect( mView, SIGNAL( incidenceSelected( Incidence * ) ),
-             SLOT( processIncidenceSelection( Incidence * ) ) );
-    connect( mView, SIGNAL( modifiedChanged( bool ) ),
-             SLOT( slotModifiedChanged( bool ) ) );
 
 
@@ -365,7 +360,4 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
              SLOT( disableBR(bool) ) );
     connect( &mSaveTimer, SIGNAL( timeout() ), SLOT( save() ) );
-    mView->setModified( false );
-    mBlockAtStartup = false;
-    mView->setModified( false );
     setCentralWidget( mView );
     globalFlagBlockStartup = 0;
@@ -380,5 +372,4 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
     
     connect(mSyncManager , SIGNAL( save() ), this, SLOT( save() ) );
-    connect(mView , SIGNAL( save() ), this, SLOT( save() ) );
     connect(mView , SIGNAL( saveStopTimer() ), this, SLOT( saveStopTimer() ) );
     connect(mSyncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) );
@@ -399,7 +390,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
 
   //US listen for result adressed from Ka/Pi
-#ifndef DESKTOP_VERSION
-  connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
-#endif
+
 #ifndef DESKTOP_VERSION
     infrared = 0;
@@ -412,5 +401,6 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
     //toggleBeamReceive();
 
-    QTimer::singleShot( 1000, mView, SLOT ( checkFiles() ));
+    setCaption(i18n("Loading calendar files ... please wait" ));
+    QTimer::singleShot( 10, this, SLOT ( loadDataAfterStart() ));
 }
 MainWindow::~MainWindow()
@@ -427,4 +417,36 @@ MainWindow::~MainWindow()
 
 }
+
+void  MainWindow::loadDataAfterStart()
+{
+    
+    qDebug("KO: Start loading files..." );
+    QTime neededSaveTime = QDateTime::currentDateTime().time();
+    mView->loadCalendars();
+    int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() );
+    qDebug("KO: Calendar loading time: %d ms",msNeeded );
+    //QTimer::singleShot( 1000, mView, SLOT ( checkFiles() ));
+    mView->setModified( false );
+    mBlockAtStartup = false;
+    mView->setModified( false );
+    connect(mView , SIGNAL( save() ), this, SLOT( save() ) );
+    processIncidenceSelection( 0 );
+    connect( mView, SIGNAL( incidenceSelected( Incidence * ) ),
+             SLOT( processIncidenceSelection( Incidence * ) ) );
+    connect( mView, SIGNAL( modifiedChanged( bool ) ),
+             SLOT( slotModifiedChanged( bool ) ) );
+
+#ifndef DESKTOP_VERSION
+    connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
+    connect( qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT(recieve(  const QCString&, const QByteArray& )));
+    disconnect( qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT(receiveStart(  const QCString&, const QByteArray& )));
+    if ( !mCStringMess.isEmpty() ) 
+        recieve( mCStringMess, mByteData );
+#endif
+
+
+    QTimer::singleShot( 1000, mView, SLOT ( checkFiles() ));
+}
+
 void MainWindow::slotResetFocus()
 {
@@ -541,5 +563,10 @@ void MainWindow::closeEvent( QCloseEvent* ce )
 
 }
-
+void MainWindow::receiveStart( const QCString& cmsg, const QByteArray& data )
+{
+    qDebug("KO: QCOP start message received: %s ", cmsg.data()  );
+    mCStringMess = cmsg;
+    mByteData = data;
+}
 void MainWindow::recieve( const QCString& cmsg, const QByteArray& data )
 {
@@ -2517,4 +2544,5 @@ void MainWindow::importFile( QString  fn, bool quick )
             setCaption(i18n("Error importing file"));
         }
+        mView->updateView();
     }
 }
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index 7d3d492..fdcf7c4 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -51,5 +51,7 @@ class MainWindow : public QMainWindow
      void configureAgenda( int );
     void recieve( const QCString& msg, const QByteArray& data );
+    void receiveStart( const QCString& msg, const QByteArray& data );
  protected slots: 
+    void loadDataAfterStart();
     void calHint(); 
     void startMultiSync();
@@ -117,4 +119,8 @@ class MainWindow : public QMainWindow
     
   private:
+
+    QCString mCStringMess;
+    QByteArray mByteData;
+
     //void setMenuBar( QMenuBar * );
     bool mBRdisabled;