author | zautrix <zautrix> | 2005-08-23 13:59:59 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-08-23 13:59:59 (UTC) |
commit | 02fa432f183ad2b18380de0e41399efe3b867dba (patch) (unidiff) | |
tree | d13d3941ef4d6abc90790d5b6039a92787ea7987 | |
parent | 72d600e2c3b3405e5f37615a56560811c0cf9a78 (diff) | |
download | kdepimpi-02fa432f183ad2b18380de0e41399efe3b867dba.zip kdepimpi-02fa432f183ad2b18380de0e41399efe3b867dba.tar.gz kdepimpi-02fa432f183ad2b18380de0e41399efe3b867dba.tar.bz2 |
fixx
-rw-r--r-- | bin/kdepim/kaddressbook/germantranslation.txt | 2 | ||||
-rw-r--r-- | kabc/stdaddressbook.cpp | 5 | ||||
-rw-r--r-- | kabc/stdaddressbook.h | 2 | ||||
-rw-r--r-- | kaddressbook/kabcore.cpp | 28 | ||||
-rw-r--r-- | kaddressbook/kabcore.h | 4 | ||||
-rw-r--r-- | kaddressbook/kaddressbookmain.cpp | 4 | ||||
-rw-r--r-- | kaddressbook/mainembedded.cpp | 5 |
7 files changed, 38 insertions, 12 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 | |||
@@ -807,14 +807,14 @@ | |||
807 | { "Sending back file ...","Sende Datei zurück..." }, | 807 | { "Sending back file ...","Sende Datei zurück..." }, |
808 | { "Eeek, there I am ticklish!","Huch, da bin ich kitzlig!" }, | 808 | { "Eeek, there I am ticklish!","Huch, da bin ich kitzlig!" }, |
809 | { "Save using LOCAL storage","Speichere nutze LOCAL Pfad" }, | 809 | { "Save using LOCAL storage","Speichere nutze LOCAL Pfad" }, |
810 | { "...and %1 more\ncontact(s) selected","...und noch %1 Kontakte\n mehr ausgewählt" }, | 810 | { "...and %1 more\ncontact(s) selected","...und noch %1 Kontakte\n mehr ausgewählt" }, |
811 | { "Do you really\nwant to delete the\nsetected contact(s)?\n\n","Möchten Sie wirklich\ndie ausgewählten\nKontakte löschen?\n\n" }, | 811 | { "Do you really\nwant to delete the\nsetected contact(s)?\n\n","Möchten Sie wirklich\ndie ausgewählten\nKontakte löschen?\n\n" }, |
812 | { "%1 contacts\nsuccessfully\nimported.","%1 Kontakte\nerfolgreich\nimportiert." }, | 812 | { "%1 contacts\nsuccessfully\nimported.","%1 Kontakte\nerfolgreich\nimportiert." }, |
813 | { "Import this contact?","Importiere diesen Kontakt?" }, | 813 | { "Import this contact?","Importiere diesen Kontakt?" }, |
814 | { "Import all!","Importiere alle!" }, | 814 | { "Import all!","Importiere alle!" }, |
815 | { "","" }, | 815 | { "Loading addressbook data ... please wait","Lade Adressbuchdaten ... bitte warten" }, |
816 | { "","" }, | 816 | { "","" }, |
817 | { "","" }, | 817 | { "","" }, |
818 | { "","" }, | 818 | { "","" }, |
819 | { "","" }, | 819 | { "","" }, |
820 | { "","" }, \ No newline at end of file | 820 | { "","" }, \ No newline at end of file |
diff --git a/kabc/stdaddressbook.cpp b/kabc/stdaddressbook.cpp index f17f366..a14ae20 100644 --- a/kabc/stdaddressbook.cpp +++ b/kabc/stdaddressbook.cpp | |||
@@ -108,24 +108,25 @@ StdAddressBook *StdAddressBook::self( bool onlyFastResources ) | |||
108 | } | 108 | } |
109 | return mSelf; | 109 | return mSelf; |
110 | } | 110 | } |
111 | 111 | ||
112 | StdAddressBook::StdAddressBook() | 112 | StdAddressBook::StdAddressBook() |
113 | : AddressBook( "kabcrc" ) | 113 | : AddressBook( "kabcrc" ) |
114 | { | 114 | { |
115 | 115 | ||
116 | init( false ); | 116 | //init( false ); |
117 | } | 117 | } |
118 | 118 | ||
119 | StdAddressBook::StdAddressBook( bool onlyFastResources ) | 119 | StdAddressBook::StdAddressBook( bool onlyFastResources ) |
120 | : AddressBook( "kabcrc" ) | 120 | : AddressBook( "kabcrc" ) |
121 | { | 121 | { |
122 | 122 | ||
123 | init( onlyFastResources ); | 123 | if ( onlyFastResources ) |
124 | init( onlyFastResources ); | ||
124 | } | 125 | } |
125 | 126 | ||
126 | StdAddressBook::~StdAddressBook() | 127 | StdAddressBook::~StdAddressBook() |
127 | { | 128 | { |
128 | if ( mAutomaticSave ) | 129 | if ( mAutomaticSave ) |
129 | save(); | 130 | save(); |
130 | } | 131 | } |
131 | 132 | ||
diff --git a/kabc/stdaddressbook.h b/kabc/stdaddressbook.h index 9ec53b0..cf130b3 100644 --- a/kabc/stdaddressbook.h +++ b/kabc/stdaddressbook.h | |||
@@ -129,22 +129,22 @@ class StdAddressBook : public AddressBook | |||
129 | Addressee whoAmI(); | 129 | Addressee whoAmI(); |
130 | 130 | ||
131 | /** | 131 | /** |
132 | Sets the users contact. See @ref whoAmI() for more information. | 132 | Sets the users contact. See @ref whoAmI() for more information. |
133 | 133 | ||
134 | @param uid The uid of the users contact. | 134 | @param uid The uid of the users contact. |
135 | */ | 135 | */ |
136 | void setWhoAmI( const Addressee &addr ); | 136 | void setWhoAmI( const Addressee &addr ); |
137 | void init( bool onlyFastResources ); | ||
137 | 138 | ||
138 | protected: | 139 | protected: |
139 | StdAddressBook(); | 140 | StdAddressBook(); |
140 | StdAddressBook( bool onlyFastResources ); | 141 | StdAddressBook( bool onlyFastResources ); |
141 | 142 | ||
142 | void init( bool onlyFastResources ); | ||
143 | 143 | ||
144 | private: | 144 | private: |
145 | static QString setTempAppDir(); | 145 | static QString setTempAppDir(); |
146 | static StdAddressBook *mSelf; | 146 | static StdAddressBook *mSelf; |
147 | static bool mAutomaticSave; | 147 | static bool mAutomaticSave; |
148 | }; | 148 | }; |
149 | 149 | ||
150 | } | 150 | } |
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index b9830b1..c670b1f 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -398,19 +398,42 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const | |||
398 | setModified( false ); | 398 | setModified( false ); |
399 | mBRdisabled = false; | 399 | mBRdisabled = false; |
400 | #ifndef DESKTOP_VERSION | 400 | #ifndef DESKTOP_VERSION |
401 | infrared = 0; | 401 | infrared = 0; |
402 | #endif | 402 | #endif |
403 | //toggleBeamReceive( ); | 403 | //toggleBeamReceive( ); |
404 | mMainWindow->toolBar()->show(); | 404 | mMainWindow->toolBar()->show(); |
405 | // we have a toolbar repainting error on the Zaurus when starting KA/Pi | 405 | // we have a toolbar repainting error on the Zaurus when starting KA/Pi |
406 | QTimer::singleShot( 10, this , SLOT ( updateToolBar())); | 406 | //QTimer::singleShot( 10, this , SLOT ( updateToolBar())); |
407 | QTimer::singleShot( 100, this, SLOT ( loadDataAfterStart() )); | ||
408 | } | ||
409 | void KABCore::receiveStart( const QCString& cmsg, const QByteArray& data ) | ||
410 | { | ||
411 | qDebug("KO: QCOP start message received: %s ", cmsg.data() ); | ||
412 | mCStringMess = cmsg; | ||
413 | mByteData = data; | ||
407 | } | 414 | } |
408 | 415 | ||
416 | void KABCore::loadDataAfterStart() | ||
417 | { | ||
418 | qDebug("KABCore::loadDataAfterStart() "); | ||
419 | ((StdAddressBook*)mAddressBook)->init( true ); | ||
420 | mViewManager->refreshView(); | ||
421 | |||
422 | #ifndef DESKTOP_VERSION | ||
423 | disconnect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT (receiveStart ( const QCString &, const QByteArray & ))); | ||
424 | |||
425 | QObject::connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); | ||
426 | if ( !mCStringMess.isEmpty() ) | ||
427 | ExternalAppHandler::instance()->appMessage( mCStringMess, mByteData ); | ||
428 | #endif | ||
429 | QTimer::singleShot( 10, this , SLOT ( updateToolBar())); | ||
430 | setCaptionBack(); | ||
431 | } | ||
409 | void KABCore::updateToolBar() | 432 | void KABCore::updateToolBar() |
410 | { | 433 | { |
411 | static int iii = 0; | 434 | static int iii = 0; |
412 | ++iii; | 435 | ++iii; |
413 | mMainWindow->toolBar()->repaintMe(); | 436 | mMainWindow->toolBar()->repaintMe(); |
414 | if ( iii < 4 ) | 437 | if ( iii < 4 ) |
415 | QTimer::singleShot( 100*iii, this , SLOT ( updateToolBar())); | 438 | QTimer::singleShot( 100*iii, this , SLOT ( updateToolBar())); |
416 | } | 439 | } |
@@ -2440,17 +2463,16 @@ void KABCore::removeVoice() | |||
2440 | message(i18n("Removing voice..."), false ); | 2463 | message(i18n("Removing voice..."), false ); |
2441 | KABC::AddressBook::Iterator it; | 2464 | KABC::AddressBook::Iterator it; |
2442 | for ( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { | 2465 | for ( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { |
2443 | if ( (*it).tagged() ) { | 2466 | if ( (*it).tagged() ) { |
2444 | (*it).removeVoice(); | 2467 | (*it).removeVoice(); |
2445 | } | 2468 | } |
2446 | } | 2469 | } |
2447 | message(i18n("Refreshing view...") ); | 2470 | message(i18n("Refreshing view...") ); |
2448 | qApp->processEvents(); | ||
2449 | mViewManager->refreshView( "" ); | 2471 | mViewManager->refreshView( "" ); |
2450 | Addressee add; | 2472 | Addressee add; |
2451 | mDetails->setAddressee( add ); | 2473 | mDetails->setAddressee( add ); |
2452 | message(i18n("Remove voice completed!") ); | 2474 | message(i18n("Remove voice completed!") ); |
2453 | 2475 | ||
2454 | 2476 | ||
2455 | 2477 | ||
2456 | } | 2478 | } |
@@ -2472,17 +2494,16 @@ void KABCore::setFormattedName() | |||
2472 | for ( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { | 2494 | for ( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { |
2473 | if ( (*it).tagged() ) { | 2495 | if ( (*it).tagged() ) { |
2474 | if ( (*it).uid().left( 2 ) == "la" ) | 2496 | if ( (*it).uid().left( 2 ) == "la" ) |
2475 | if ( (*it).uid().left( 19 ) == QString("last-syncAddressee-") ) | 2497 | if ( (*it).uid().left( 19 ) == QString("last-syncAddressee-") ) |
2476 | continue; | 2498 | continue; |
2477 | ++count; | 2499 | ++count; |
2478 | if ( count %10 == 0 ) | 2500 | if ( count %10 == 0 ) |
2479 | message(i18n("Changing contact #%1").arg( count ) ); | 2501 | message(i18n("Changing contact #%1").arg( count ) ); |
2480 | qApp->processEvents(); | ||
2481 | QString fName; | 2502 | QString fName; |
2482 | if ( setpref.simple->isChecked() ) | 2503 | if ( setpref.simple->isChecked() ) |
2483 | fName = NameEditDialog::formattedName( (*it), NameEditDialog::SimpleName ); | 2504 | fName = NameEditDialog::formattedName( (*it), NameEditDialog::SimpleName ); |
2484 | else if ( setpref.full->isChecked() ) | 2505 | else if ( setpref.full->isChecked() ) |
2485 | fName = NameEditDialog::formattedName( (*it), NameEditDialog::FullName ); | 2506 | fName = NameEditDialog::formattedName( (*it), NameEditDialog::FullName ); |
2486 | else if ( setpref.reverse->isChecked() ) | 2507 | else if ( setpref.reverse->isChecked() ) |
2487 | fName = NameEditDialog::formattedName( (*it), NameEditDialog::ReverseName ); | 2508 | fName = NameEditDialog::formattedName( (*it), NameEditDialog::ReverseName ); |
2488 | else | 2509 | else |
@@ -2492,17 +2513,16 @@ void KABCore::setFormattedName() | |||
2492 | fName = (*it).organization(); | 2513 | fName = (*it).organization(); |
2493 | (*it).setFormattedName( fName ); | 2514 | (*it).setFormattedName( fName ); |
2494 | (*it).setChanged( true ); | 2515 | (*it).setChanged( true ); |
2495 | modified = true; | 2516 | modified = true; |
2496 | (*it).setRevision( QDateTime::currentDateTime() ); | 2517 | (*it).setRevision( QDateTime::currentDateTime() ); |
2497 | } | 2518 | } |
2498 | } | 2519 | } |
2499 | message(i18n("Refreshing view...") ); | 2520 | message(i18n("Refreshing view...") ); |
2500 | qApp->processEvents(); | ||
2501 | if ( modified ) | 2521 | if ( modified ) |
2502 | setModified( true ); | 2522 | setModified( true ); |
2503 | Addressee add; | 2523 | Addressee add; |
2504 | mDetails->setAddressee( add ); | 2524 | mDetails->setAddressee( add ); |
2505 | if ( count == 0 ) | 2525 | if ( count == 0 ) |
2506 | message(i18n("No contact changed!") ); | 2526 | message(i18n("No contact changed!") ); |
2507 | else | 2527 | else |
2508 | message(i18n("%1 contacts changed!").arg( count ) ); | 2528 | message(i18n("%1 contacts changed!").arg( count ) ); |
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index ceeeda7..42b7709 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h | |||
@@ -349,28 +349,30 @@ class KABCore : public QWidget, public KSyncInterface | |||
349 | void requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid); | 349 | void requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid); |
350 | void requestForBirthdayList(const QString& sourceChannel, const QString& sessionuid); | 350 | void requestForBirthdayList(const QString& sourceChannel, const QString& sessionuid); |
351 | 351 | ||
352 | 352 | ||
353 | signals: | 353 | signals: |
354 | void contactSelected( const QString &name ); | 354 | void contactSelected( const QString &name ); |
355 | void contactSelected( const QPixmap &pixmap ); | 355 | void contactSelected( const QPixmap &pixmap ); |
356 | public slots: | 356 | public slots: |
357 | void loadDataAfterStart(); | ||
357 | void recieve(QString cmsg ); | 358 | void recieve(QString cmsg ); |
358 | void getFile( bool success ); | 359 | void getFile( bool success ); |
359 | void syncFileRequest(); | 360 | void syncFileRequest(); |
360 | void setDetailsVisible( bool visible ); | 361 | void setDetailsVisible( bool visible ); |
361 | void setDetailsToState(); | 362 | void setDetailsToState(); |
362 | 363 | ||
363 | void saveSettings(); | 364 | void saveSettings(); |
364 | 365 | ||
365 | private slots: | 366 | private slots: |
366 | void updateToolBar(); | 367 | void updateToolBar(); |
367 | void updateMainWindow(); | 368 | void updateMainWindow(); |
368 | void receive( const QCString& cmsg, const QByteArray& data ); | 369 | void receive( const QCString& cmsg, const QByteArray& data ); |
370 | void receiveStart( const QCString& cmsg, const QByteArray& data ); | ||
369 | void toggleBeamReceive( ); | 371 | void toggleBeamReceive( ); |
370 | void disableBR(bool); | 372 | void disableBR(bool); |
371 | void setJumpButtonBarVisible( bool visible ); | 373 | void setJumpButtonBarVisible( bool visible ); |
372 | void setJumpButtonBar( bool visible ); | 374 | void setJumpButtonBar( bool visible ); |
373 | void setCaptionBack(); | 375 | void setCaptionBack(); |
374 | void resizeAndCallContactdialog(); | 376 | void resizeAndCallContactdialog(); |
375 | void callContactdialog(); | 377 | void callContactdialog(); |
376 | void doRingSync(); | 378 | void doRingSync(); |
@@ -387,16 +389,18 @@ class KABCore : public QWidget, public KSyncInterface | |||
387 | void configureResources(); | 389 | void configureResources(); |
388 | #endif //KAB_EMBEDDED | 390 | #endif //KAB_EMBEDDED |
389 | 391 | ||
390 | void slotEditorDestroyed( const QString &uid ); | 392 | void slotEditorDestroyed( const QString &uid ); |
391 | void configurationChanged(); | 393 | void configurationChanged(); |
392 | void addressBookChanged(); | 394 | void addressBookChanged(); |
393 | 395 | ||
394 | private: | 396 | private: |
397 | QCString mCStringMess; | ||
398 | QByteArray mByteData; | ||
395 | QString mEmailSourceChannel; | 399 | QString mEmailSourceChannel; |
396 | QString mEmailSourceUID; | 400 | QString mEmailSourceUID; |
397 | void resizeEvent(QResizeEvent* e ); | 401 | void resizeEvent(QResizeEvent* e ); |
398 | bool mBRdisabled; | 402 | bool mBRdisabled; |
399 | #ifndef DESKTOP_VERSION | 403 | #ifndef DESKTOP_VERSION |
400 | QCopChannel* infrared; | 404 | QCopChannel* infrared; |
401 | #endif | 405 | #endif |
402 | QTimer *mMessageTimer; | 406 | QTimer *mMessageTimer; |
diff --git a/kaddressbook/kaddressbookmain.cpp b/kaddressbook/kaddressbookmain.cpp index 519dc92..8fe3ee0 100644 --- a/kaddressbook/kaddressbookmain.cpp +++ b/kaddressbook/kaddressbookmain.cpp | |||
@@ -78,18 +78,20 @@ KAddressBookMain::KAddressBookMain() : DCOPObject( "KAddressBookIface" ), KMainW | |||
78 | #ifndef KAB_EMBEDDED | 78 | #ifndef KAB_EMBEDDED |
79 | setStandardToolBarMenuEnabled(true); | 79 | setStandardToolBarMenuEnabled(true); |
80 | 80 | ||
81 | createGUI( "kaddressbookui.rc", false ); | 81 | createGUI( "kaddressbookui.rc", false ); |
82 | 82 | ||
83 | 83 | ||
84 | #endif //KAB_EMBEDDED | 84 | #endif //KAB_EMBEDDED |
85 | setAutoSaveSettings(); | 85 | setAutoSaveSettings(); |
86 | qApp->processEvents(); | ||
87 | mCore->restoreSettings(); | 86 | mCore->restoreSettings(); |
87 | #ifndef DESKTOP_VERSION | ||
88 | QObject::connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), mCore, SLOT (receiveStart ( const QCString &, const QByteArray & ))); | ||
89 | #endif | ||
88 | } | 90 | } |
89 | 91 | ||
90 | KAddressBookMain::~KAddressBookMain() | 92 | KAddressBookMain::~KAddressBookMain() |
91 | { | 93 | { |
92 | // mCore->saveSettings(); | 94 | // mCore->saveSettings(); |
93 | } | 95 | } |
94 | 96 | ||
95 | void KAddressBookMain::showMinimized () | 97 | void KAddressBookMain::showMinimized () |
diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp index 93ba53c..2f3531d 100644 --- a/kaddressbook/mainembedded.cpp +++ b/kaddressbook/mainembedded.cpp | |||
@@ -74,28 +74,27 @@ int main( int argc, char **argv ) | |||
74 | 74 | ||
75 | #endif | 75 | #endif |
76 | KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kaddressbook"))); | 76 | KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kaddressbook"))); |
77 | // init language | 77 | // init language |
78 | KPimGlobalPrefs::instance()->setGlobalConfig(); | 78 | KPimGlobalPrefs::instance()->setGlobalConfig(); |
79 | QApplication::setFont( KPimGlobalPrefs::instance()->mApplicationFont ); | 79 | QApplication::setFont( KPimGlobalPrefs::instance()->mApplicationFont ); |
80 | KAddressBookMain m ; | 80 | KAddressBookMain m ; |
81 | //US MainWindow m; | 81 | //US MainWindow m; |
82 | #ifndef DESKTOP_VERSION | 82 | |
83 | QObject::connect(&a, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); | ||
84 | #endif | ||
85 | 83 | ||
86 | 84 | ||
87 | #ifndef DESKTOP_VERSION | 85 | #ifndef DESKTOP_VERSION |
88 | a.showMainWidget( &m ); | 86 | a.showMainWidget( &m ); |
89 | 87 | ||
90 | #else | 88 | #else |
91 | a.setMainWidget( &m ); | 89 | a.setMainWidget( &m ); |
92 | m.show(); | 90 | m.show(); |
93 | #endif | 91 | #endif |
92 | m.setCaption(i18n("Loading addressbook data ... please wait" )); | ||
94 | a.exec(); | 93 | a.exec(); |
95 | #ifdef DESKTOP_VERSION | 94 | #ifdef DESKTOP_VERSION |
96 | KConfig *config = KABPrefs::instance()->getConfig(); | 95 | KConfig *config = KABPrefs::instance()->getConfig(); |
97 | config->setGroup("WidgetLayout"); | 96 | config->setGroup("WidgetLayout"); |
98 | QStringList list ;//= config->readListEntry("MainLayout"); | 97 | QStringList list ;//= config->readListEntry("MainLayout"); |
99 | int x,y,w,h; | 98 | int x,y,w,h; |
100 | QWidget* wid; | 99 | QWidget* wid; |
101 | wid = &m; | 100 | wid = &m; |