fixx

7 files changed, 37 insertions, 11 deletions

diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt
index 293aaea..ece26d2 100644
--- a/bin/kdepim/kaddressbook/germantranslation.txt
+++ b/bin/kdepim/kaddressbook/germantranslation.txt
@@ -813,5 +813,5 @@
 { "Import this contact?","Importiere diesen Kontakt?" },

 { "Import all!","Importiere alle!" },

-{ "","" },

+{ "Loading addressbook data ... please wait","Lade Adressbuchdaten ... bitte warten" },

 { "","" },

 { "","" },

diff --git a/kabc/stdaddressbook.cpp b/kabc/stdaddressbook.cpp
index f17f366..a14ae20 100644
--- a/kabc/stdaddressbook.cpp
+++ b/kabc/stdaddressbook.cpp
@@ -114,5 +114,5 @@ StdAddressBook::StdAddressBook()
 {
 
-  init( false );
+    //init( false );
 }
 
@@ -121,4 +121,5 @@ StdAddressBook::StdAddressBook( bool onlyFastResources )
 {
 
+    if ( onlyFastResources )
   init( onlyFastResources );
 }
diff --git a/kabc/stdaddressbook.h b/kabc/stdaddressbook.h
index 9ec53b0..cf130b3 100644
--- a/kabc/stdaddressbook.h
+++ b/kabc/stdaddressbook.h
@@ -135,4 +135,5 @@ class StdAddressBook : public AddressBook
      */
     void setWhoAmI( const Addressee &addr );
+    void init( bool onlyFastResources );
 
   protected:
@@ -140,5 +141,4 @@ class StdAddressBook : public AddressBook
     StdAddressBook( bool onlyFastResources );
 
-    void init( bool onlyFastResources );
 
   private:
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index b9830b1..c670b1f 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -404,7 +404,30 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const
   mMainWindow->toolBar()->show();
   // we have a toolbar repainting error on the Zaurus when starting KA/Pi
-    QTimer::singleShot( 10, this , SLOT ( updateToolBar())); 
+  //QTimer::singleShot( 10, this , SLOT ( updateToolBar())); 
+    QTimer::singleShot( 100, this, SLOT ( loadDataAfterStart() ));
+}
+void KABCore::receiveStart( const QCString& cmsg, const QByteArray& data )
+{
+    qDebug("KO: QCOP start message received: %s ", cmsg.data()  );
+    mCStringMess = cmsg;
+    mByteData = data;
 }
 
+void  KABCore::loadDataAfterStart()
+{
+    qDebug("KABCore::loadDataAfterStart() ");
+    ((StdAddressBook*)mAddressBook)->init( true );
+        mViewManager->refreshView();
+
+#ifndef DESKTOP_VERSION  
+        disconnect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT (receiveStart ( const QCString &, const QByteArray & )));
+        
+      QObject::connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
+      if ( !mCStringMess.isEmpty() ) 
+          ExternalAppHandler::instance()->appMessage( mCStringMess, mByteData );
+#endif
+    QTimer::singleShot( 10, this , SLOT ( updateToolBar())); 
+    setCaptionBack();
+}
 void KABCore::updateToolBar()
 {
@@ -2446,5 +2469,4 @@ void KABCore::removeVoice()
     }
     message(i18n("Refreshing view...") );
-    qApp->processEvents();
     mViewManager->refreshView( "" );
     Addressee add;
@@ -2478,5 +2500,4 @@ void KABCore::setFormattedName()
             if ( count %10 == 0 )
                 message(i18n("Changing contact #%1").arg( count ) );
-            qApp->processEvents();
             QString fName;
             if ( setpref.simple->isChecked() )
@@ -2498,5 +2519,4 @@ void KABCore::setFormattedName()
     }
     message(i18n("Refreshing view...") );
-    qApp->processEvents();
     if ( modified )
         setModified( true );
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index ceeeda7..42b7709 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -355,4 +355,5 @@ class KABCore : public QWidget, public KSyncInterface
     void contactSelected( const QPixmap &pixmap );
   public slots:
+    void loadDataAfterStart();
     void recieve(QString cmsg );
     void getFile( bool success );
@@ -367,4 +368,5 @@ class KABCore : public QWidget, public KSyncInterface
     void updateMainWindow();
     void receive( const QCString& cmsg, const QByteArray& data );
+    void receiveStart( const QCString& cmsg, const QByteArray& data );
     void toggleBeamReceive( );
     void disableBR(bool);
@@ -393,4 +395,6 @@ class KABCore : public QWidget, public KSyncInterface
 
   private:
+    QCString mCStringMess;
+    QByteArray mByteData;
     QString mEmailSourceChannel;
     QString mEmailSourceUID;
diff --git a/kaddressbook/kaddressbookmain.cpp b/kaddressbook/kaddressbookmain.cpp
index 519dc92..8fe3ee0 100644
--- a/kaddressbook/kaddressbookmain.cpp
+++ b/kaddressbook/kaddressbookmain.cpp
@@ -84,6 +84,8 @@ KAddressBookMain::KAddressBookMain() : DCOPObject( "KAddressBookIface" ), KMainW
 #endif //KAB_EMBEDDED
   setAutoSaveSettings();
-  qApp->processEvents();
   mCore->restoreSettings();
+#ifndef DESKTOP_VERSION
+      QObject::connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), mCore, SLOT (receiveStart ( const QCString &, const QByteArray & )));
+#endif
 }
 
diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp
index 93ba53c..2f3531d 100644
--- a/kaddressbook/mainembedded.cpp
+++ b/kaddressbook/mainembedded.cpp
@@ -80,7 +80,5 @@ int main( int argc, char **argv )
        KAddressBookMain m ;
 //US      MainWindow m;
-#ifndef DESKTOP_VERSION
-      QObject::connect(&a, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
-#endif
+
       
       
@@ -92,4 +90,5 @@ int main( int argc, char **argv )
       m.show();
 #endif 
+      m.setCaption(i18n("Loading addressbook data ... please wait" )); 
       a.exec();
 #ifdef DESKTOP_VERSION