| -rw-r--r-- | kaddressbook/kabcore.cpp | 6 | ||||
| -rw-r--r-- | kaddressbook/kabcore.h | 1 | ||||
| -rw-r--r-- | libkdepim/externalapphandler.cpp | 6 | ||||
| -rw-r--r-- | libkdepim/externalapphandler.h | 1 | ||||
| -rw-r--r-- | pwmanager/pwmanager/pwminit.cpp | 10 |
5 files changed, 24 insertions, 0 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 4964a6c..d1dcb6e 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -291,12 +291,13 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const SLOT( sendMail( const QString& ) ) ); connect( ExternalAppHandler::instance(), SIGNAL (requestForNameEmailUidList(const QString&, const QString&)),this, SLOT(requestForNameEmailUidList(const QString&, const QString&))); connect( ExternalAppHandler::instance(), SIGNAL (requestForDetails(const QString&, const QString&, const QString&, const QString&, const QString&)),this, SLOT(requestForDetails(const QString&, const QString&, const QString&, const QString&, const QString&))); connect( ExternalAppHandler::instance(), SIGNAL (requestForBirthdayList(const QString&, const QString&)),this, SLOT(requestForBirthdayList(const QString&, const QString&))); + connect( ExternalAppHandler::instance(), SIGNAL (nextView()),this, SLOT(setDetailsToggle())); #ifndef KAB_EMBEDDED connect( mViewManager, SIGNAL( urlDropped( const KURL& ) ), mXXPortManager, SLOT( importVCard( const KURL& ) ) ); @@ -1283,12 +1284,17 @@ void KABCore::setJumpButtonBarVisible( bool visible ) void KABCore::setDetailsToState() { setDetailsVisible( mActionDetails->isChecked() ); } +void KABCore::setDetailsToggle() +{ + mActionDetails->setChecked( !mActionDetails->isChecked() ); + setDetailsToState(); +} void KABCore::setDetailsVisible( bool visible ) { if (visible && mDetails->isHidden()) diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index a288505..6831ec9 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h @@ -143,12 +143,13 @@ class KABCore : public QWidget, public KSyncInterface #endif //KAB_EMBEDDED public slots: #ifdef KAB_EMBEDDED void createAboutData(); #endif //KAB_EMBEDDED + void setDetailsToggle(); void showLicence(); void faq(); void whatsnew() ; void synchowto() ; void writeToPhone(); diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp index 9085673..9f12152 100644 --- a/libkdepim/externalapphandler.cpp +++ b/libkdepim/externalapphandler.cpp @@ -1113,12 +1113,18 @@ void ExternalAppHandler::passParameters(QCopEnvelope* e, const QString& paramete /************************************************************************** * **************************************************************************/ void ExternalAppHandler::appMessage( const QCString& cmsg, const QByteArray& data ) { + + if ( cmsg == "nextView()" ) { + emit nextView(); + return; + } + bool res = mNameEmailUidListFromKAPITransfer->appMessage( cmsg, data ); if (!res) res = mBirthdayListFromKAPITransfer->appMessage( cmsg, data ); if (!res) res = mDisplayDetails->appMessage( cmsg, data ); diff --git a/libkdepim/externalapphandler.h b/libkdepim/externalapphandler.h index 6f5d345..52a64e1 100644 --- a/libkdepim/externalapphandler.h +++ b/libkdepim/externalapphandler.h @@ -230,12 +230,13 @@ class ExternalAppHandler : public QObject public slots: void appMessage( const QCString& msg, const QByteArray& data ); signals: + void nextView(); // Emmitted when the target app receives a request from the source app void requestForNameEmailUidList(const QString& sourceChannel, const QString& uid); // Emitted when the source app recieves a list of name/email pairs (=addresses) from another target app. Usually Ka/Pi // The first parameter is a uniqueid. It can be used to identify the event void receivedNameEmailUidListEvent(const QString& uid, const QStringList& nameList, const QStringList& emailList, const QStringList& uidList); diff --git a/pwmanager/pwmanager/pwminit.cpp b/pwmanager/pwmanager/pwminit.cpp index fbd17a7..68f3637 100644 --- a/pwmanager/pwmanager/pwminit.cpp +++ b/pwmanager/pwmanager/pwminit.cpp @@ -182,12 +182,21 @@ void PwMInit::initializeApp() } runStatus = running; } void PwMInit::shutdownApp(int exitStatus) { + + + PwM * iii; + while ( iii = _mainWndList.first() ) { + disconnect(iii, SIGNAL(closed(PwM *)), + this, SLOT(mainWndClosed(PwM *))); + mainWndClosed((iii)); + } + printDebug(string("PwMInit::shutdownApp(") + tostr(exitStatus) + ") called."); PWM_ASSERT((runStatus == running) || (runStatus == init)); runStatus = shutdown; QApplication::exit(exitStatus); /* The destructor of PwMInit is called when control @@ -421,12 +430,13 @@ again: #else // find the closed window in the "mainWndList" and delete it. QValueList<PwM *>::Iterator i = _mainWndList.begin(), end = _mainWndList.end(); #endif while (i != end) { + //qDebug("iii %x end %x wnd %x", (*i), (*end), wnd); if (*i == wnd) { #ifndef PWM_EMBEDDED _mainWndList.erase(i); #else _mainWndList.remove(i); #endif |