From 5afbc6ae0908ce12fd5abb1c4eadf9c61a01503c Mon Sep 17 00:00:00 2001 From: zautrix Date: Wed, 27 Oct 2004 22:35:41 +0000 Subject: pwm close fix --- diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 4964a6c..d1dcb6e 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -294,6 +294,7 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const 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 @@ -1286,6 +1287,11 @@ void KABCore::setDetailsToState() { setDetailsVisible( mActionDetails->isChecked() ); } +void KABCore::setDetailsToggle() +{ + mActionDetails->setChecked( !mActionDetails->isChecked() ); + setDetailsToState(); +} diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index a288505..6831ec9 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h @@ -146,6 +146,7 @@ class KABCore : public QWidget, public KSyncInterface #ifdef KAB_EMBEDDED void createAboutData(); #endif //KAB_EMBEDDED + void setDetailsToggle(); void showLicence(); void faq(); diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp index 9085673..9f12152 100644 --- a/libkdepim/externalapphandler.cpp +++ b/libkdepim/externalapphandler.cpp @@ -1116,6 +1116,12 @@ 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 ); diff --git a/libkdepim/externalapphandler.h b/libkdepim/externalapphandler.h index 6f5d345..52a64e1 100644 --- a/libkdepim/externalapphandler.h +++ b/libkdepim/externalapphandler.h @@ -233,6 +233,7 @@ class ExternalAppHandler : public QObject signals: + void nextView(); // Emmitted when the target app receives a request from the source app void requestForNameEmailUidList(const QString& sourceChannel, const QString& uid); 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 @@ -185,6 +185,15 @@ void PwMInit::initializeApp() 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)); @@ -424,6 +433,7 @@ again: 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); -- cgit v0.9.0.2