author | zautrix <zautrix> | 2004-10-27 22:35:41 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-27 22:35:41 (UTC) |
commit | 5afbc6ae0908ce12fd5abb1c4eadf9c61a01503c (patch) (unidiff) | |
tree | 914ce70d7e5a1afcd2da0c2fda34b959d65d0462 | |
parent | 9c88346fc757fd1dc54b3fca151a2a610159d8cf (diff) | |
download | kdepimpi-5afbc6ae0908ce12fd5abb1c4eadf9c61a01503c.zip kdepimpi-5afbc6ae0908ce12fd5abb1c4eadf9c61a01503c.tar.gz kdepimpi-5afbc6ae0908ce12fd5abb1c4eadf9c61a01503c.tar.bz2 |
pwm close fix
-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 | |||
@@ -289,16 +289,17 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const | |||
289 | 289 | ||
290 | connect( mDetails, SIGNAL( sendEmail( const QString& ) ), | 290 | connect( mDetails, SIGNAL( sendEmail( const QString& ) ), |
291 | SLOT( sendMail( const QString& ) ) ); | 291 | SLOT( sendMail( const QString& ) ) ); |
292 | 292 | ||
293 | 293 | ||
294 | connect( ExternalAppHandler::instance(), SIGNAL (requestForNameEmailUidList(const QString&, const QString&)),this, SLOT(requestForNameEmailUidList(const QString&, const QString&))); | 294 | connect( ExternalAppHandler::instance(), SIGNAL (requestForNameEmailUidList(const QString&, const QString&)),this, SLOT(requestForNameEmailUidList(const QString&, const QString&))); |
295 | 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&))); | 295 | 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&))); |
296 | connect( ExternalAppHandler::instance(), SIGNAL (requestForBirthdayList(const QString&, const QString&)),this, SLOT(requestForBirthdayList(const QString&, const QString&))); | 296 | connect( ExternalAppHandler::instance(), SIGNAL (requestForBirthdayList(const QString&, const QString&)),this, SLOT(requestForBirthdayList(const QString&, const QString&))); |
297 | connect( ExternalAppHandler::instance(), SIGNAL (nextView()),this, SLOT(setDetailsToggle())); | ||
297 | 298 | ||
298 | 299 | ||
299 | #ifndef KAB_EMBEDDED | 300 | #ifndef KAB_EMBEDDED |
300 | connect( mViewManager, SIGNAL( urlDropped( const KURL& ) ), | 301 | connect( mViewManager, SIGNAL( urlDropped( const KURL& ) ), |
301 | mXXPortManager, SLOT( importVCard( const KURL& ) ) ); | 302 | mXXPortManager, SLOT( importVCard( const KURL& ) ) ); |
302 | 303 | ||
303 | connect( mDetails, SIGNAL( browse( const QString& ) ), | 304 | connect( mDetails, SIGNAL( browse( const QString& ) ), |
304 | SLOT( browse( const QString& ) ) ); | 305 | SLOT( browse( const QString& ) ) ); |
@@ -1281,16 +1282,21 @@ void KABCore::setJumpButtonBarVisible( bool visible ) | |||
1281 | } | 1282 | } |
1282 | } | 1283 | } |
1283 | 1284 | ||
1284 | 1285 | ||
1285 | void KABCore::setDetailsToState() | 1286 | void KABCore::setDetailsToState() |
1286 | { | 1287 | { |
1287 | setDetailsVisible( mActionDetails->isChecked() ); | 1288 | setDetailsVisible( mActionDetails->isChecked() ); |
1288 | } | 1289 | } |
1290 | void KABCore::setDetailsToggle() | ||
1291 | { | ||
1292 | mActionDetails->setChecked( !mActionDetails->isChecked() ); | ||
1293 | setDetailsToState(); | ||
1294 | } | ||
1289 | 1295 | ||
1290 | 1296 | ||
1291 | 1297 | ||
1292 | void KABCore::setDetailsVisible( bool visible ) | 1298 | void KABCore::setDetailsVisible( bool visible ) |
1293 | { | 1299 | { |
1294 | if (visible && mDetails->isHidden()) | 1300 | if (visible && mDetails->isHidden()) |
1295 | { | 1301 | { |
1296 | KABC::Addressee::List addrList = mViewManager->selectedAddressees(); | 1302 | KABC::Addressee::List addrList = mViewManager->selectedAddressees(); |
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index a288505..6831ec9 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h | |||
@@ -141,16 +141,17 @@ class KABCore : public QWidget, public KSyncInterface | |||
141 | inline QPopupMenu* getImportMenu() { return ImportMenu;} | 141 | inline QPopupMenu* getImportMenu() { return ImportMenu;} |
142 | inline QPopupMenu* getExportMenu() { return ExportMenu;} | 142 | inline QPopupMenu* getExportMenu() { return ExportMenu;} |
143 | #endif //KAB_EMBEDDED | 143 | #endif //KAB_EMBEDDED |
144 | 144 | ||
145 | public slots: | 145 | public slots: |
146 | #ifdef KAB_EMBEDDED | 146 | #ifdef KAB_EMBEDDED |
147 | void createAboutData(); | 147 | void createAboutData(); |
148 | #endif //KAB_EMBEDDED | 148 | #endif //KAB_EMBEDDED |
149 | void setDetailsToggle(); | ||
149 | 150 | ||
150 | void showLicence(); | 151 | void showLicence(); |
151 | void faq(); | 152 | void faq(); |
152 | void whatsnew() ; | 153 | void whatsnew() ; |
153 | void synchowto() ; | 154 | void synchowto() ; |
154 | void writeToPhone(); | 155 | void writeToPhone(); |
155 | 156 | ||
156 | /** | 157 | /** |
diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp index 9085673..9f12152 100644 --- a/libkdepim/externalapphandler.cpp +++ b/libkdepim/externalapphandler.cpp | |||
@@ -1111,16 +1111,22 @@ void ExternalAppHandler::passParameters(QCopEnvelope* e, const QString& paramete | |||
1111 | 1111 | ||
1112 | 1112 | ||
1113 | /************************************************************************** | 1113 | /************************************************************************** |
1114 | * | 1114 | * |
1115 | **************************************************************************/ | 1115 | **************************************************************************/ |
1116 | 1116 | ||
1117 | void ExternalAppHandler::appMessage( const QCString& cmsg, const QByteArray& data ) | 1117 | void ExternalAppHandler::appMessage( const QCString& cmsg, const QByteArray& data ) |
1118 | { | 1118 | { |
1119 | |||
1120 | if ( cmsg == "nextView()" ) { | ||
1121 | emit nextView(); | ||
1122 | return; | ||
1123 | } | ||
1124 | |||
1119 | bool res = mNameEmailUidListFromKAPITransfer->appMessage( cmsg, data ); | 1125 | bool res = mNameEmailUidListFromKAPITransfer->appMessage( cmsg, data ); |
1120 | if (!res) | 1126 | if (!res) |
1121 | res = mBirthdayListFromKAPITransfer->appMessage( cmsg, data ); | 1127 | res = mBirthdayListFromKAPITransfer->appMessage( cmsg, data ); |
1122 | 1128 | ||
1123 | if (!res) | 1129 | if (!res) |
1124 | res = mDisplayDetails->appMessage( cmsg, data ); | 1130 | res = mDisplayDetails->appMessage( cmsg, data ); |
1125 | 1131 | ||
1126 | // if (!res) | 1132 | // if (!res) |
diff --git a/libkdepim/externalapphandler.h b/libkdepim/externalapphandler.h index 6f5d345..52a64e1 100644 --- a/libkdepim/externalapphandler.h +++ b/libkdepim/externalapphandler.h | |||
@@ -228,16 +228,17 @@ class ExternalAppHandler : public QObject | |||
228 | QList<DefaultAppItem> getAvailableDefaultItems(Types); | 228 | QList<DefaultAppItem> getAvailableDefaultItems(Types); |
229 | DefaultAppItem* getDefaultItem(Types, int); | 229 | DefaultAppItem* getDefaultItem(Types, int); |
230 | 230 | ||
231 | public slots: | 231 | public slots: |
232 | void appMessage( const QCString& msg, const QByteArray& data ); | 232 | void appMessage( const QCString& msg, const QByteArray& data ); |
233 | 233 | ||
234 | 234 | ||
235 | signals: | 235 | signals: |
236 | void nextView(); | ||
236 | // Emmitted when the target app receives a request from the source app | 237 | // Emmitted when the target app receives a request from the source app |
237 | void requestForNameEmailUidList(const QString& sourceChannel, const QString& uid); | 238 | void requestForNameEmailUidList(const QString& sourceChannel, const QString& uid); |
238 | 239 | ||
239 | // Emitted when the source app recieves a list of name/email pairs (=addresses) from another target app. Usually Ka/Pi | 240 | // Emitted when the source app recieves a list of name/email pairs (=addresses) from another target app. Usually Ka/Pi |
240 | // The first parameter is a uniqueid. It can be used to identify the event | 241 | // The first parameter is a uniqueid. It can be used to identify the event |
241 | void receivedNameEmailUidListEvent(const QString& uid, const QStringList& nameList, const QStringList& emailList, const QStringList& uidList); | 242 | void receivedNameEmailUidListEvent(const QString& uid, const QStringList& nameList, const QStringList& emailList, const QStringList& uidList); |
242 | 243 | ||
243 | void requestFindByEmail(const QString& sourceChannel, const QString& uid, const QString& email); | 244 | void requestFindByEmail(const QString& sourceChannel, const QString& uid, const QString& email); |
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 | |||
@@ -180,16 +180,25 @@ void PwMInit::initializeApp() | |||
180 | 0, | 180 | 0, |
181 | savedCmd.minimized); | 181 | savedCmd.minimized); |
182 | } | 182 | } |
183 | runStatus = running; | 183 | runStatus = running; |
184 | } | 184 | } |
185 | 185 | ||
186 | void PwMInit::shutdownApp(int exitStatus) | 186 | void PwMInit::shutdownApp(int exitStatus) |
187 | { | 187 | { |
188 | |||
189 | |||
190 | PwM * iii; | ||
191 | while ( iii = _mainWndList.first() ) { | ||
192 | disconnect(iii, SIGNAL(closed(PwM *)), | ||
193 | this, SLOT(mainWndClosed(PwM *))); | ||
194 | mainWndClosed((iii)); | ||
195 | } | ||
196 | |||
188 | printDebug(string("PwMInit::shutdownApp(") | 197 | printDebug(string("PwMInit::shutdownApp(") |
189 | + tostr(exitStatus) + ") called."); | 198 | + tostr(exitStatus) + ") called."); |
190 | PWM_ASSERT((runStatus == running) || (runStatus == init)); | 199 | PWM_ASSERT((runStatus == running) || (runStatus == init)); |
191 | runStatus = shutdown; | 200 | runStatus = shutdown; |
192 | QApplication::exit(exitStatus); | 201 | QApplication::exit(exitStatus); |
193 | /* The destructor of PwMInit is called when control | 202 | /* The destructor of PwMInit is called when control |
194 | * leaves main() | 203 | * leaves main() |
195 | */ | 204 | */ |
@@ -419,16 +428,17 @@ again: | |||
419 | QValueList<PwM *>::iterator i = _mainWndList.begin(), | 428 | QValueList<PwM *>::iterator i = _mainWndList.begin(), |
420 | end = _mainWndList.end(); | 429 | end = _mainWndList.end(); |
421 | #else | 430 | #else |
422 | // find the closed window in the "mainWndList" and delete it. | 431 | // find the closed window in the "mainWndList" and delete it. |
423 | QValueList<PwM *>::Iterator i = _mainWndList.begin(), | 432 | QValueList<PwM *>::Iterator i = _mainWndList.begin(), |
424 | end = _mainWndList.end(); | 433 | end = _mainWndList.end(); |
425 | #endif | 434 | #endif |
426 | while (i != end) { | 435 | while (i != end) { |
436 | //qDebug("iii %x end %x wnd %x", (*i), (*end), wnd); | ||
427 | if (*i == wnd) { | 437 | if (*i == wnd) { |
428 | #ifndef PWM_EMBEDDED | 438 | #ifndef PWM_EMBEDDED |
429 | _mainWndList.erase(i); | 439 | _mainWndList.erase(i); |
430 | #else | 440 | #else |
431 | _mainWndList.remove(i); | 441 | _mainWndList.remove(i); |
432 | #endif | 442 | #endif |
433 | 443 | ||
434 | if ( app->mainWidget() == wnd ) { | 444 | if ( app->mainWidget() == wnd ) { |