-rw-r--r-- | kmicromail/opiemail.cpp | 33 |
1 files changed, 32 insertions, 1 deletions
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp index f56711d..e159b73 100644 --- a/kmicromail/opiemail.cpp +++ b/kmicromail/opiemail.cpp @@ -48,2 +48,3 @@ OpieMail::OpieMail( QWidget *parent, const char *name ) { + mCurrentComposer = 0; settings = new Settings(); @@ -52,3 +53,4 @@ OpieMail::OpieMail( QWidget *parent, const char *name ) folderView->populate( settings->getAccounts() ); - + connect(ExternalAppHandler::instance(), SIGNAL(receivedNameEmailUidListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&)), + this, SLOT(insertAttendees(const QString&, const QStringList&, const QStringList&, const QStringList&))); } @@ -140,3 +142,5 @@ void OpieMail::slotwriteMail2(const QString& namemail ) #endif + mCurrentComposer = &compose; compose.exec(); + mCurrentComposer = 0; raise(); @@ -163,3 +167,6 @@ void OpieMail::slotwriteMail(const QString&name,const QString&email) #endif + + mCurrentComposer = &compose; compose.exec(); + mCurrentComposer = 0; raise(); @@ -302,2 +309,4 @@ void OpieMail::replyMail() composer.setCharset( body->getCharset() ); + + mCurrentComposer = &composer; if ( QDialog::Accepted == KApplication::execDialog( &composer ) ) @@ -306,2 +315,3 @@ void OpieMail::replyMail() } + mCurrentComposer = 0; delete settings; @@ -639,3 +649,24 @@ void OpieMail::reEditMail() #endif + mCurrentComposer = &compose; compose.exec(); + mCurrentComposer = 0; +} + +void OpieMail::insertAttendees(const QString& uid,const QStringList& nameList,const QStringList& emailList,const QStringList& uidList) +{ + + if ( mCurrentComposer ) { + mCurrentComposer->insertAttendees(uid,nameList,emailList,uidList); + } else { + ComposeMail compose( settings, this, 0, true ); + compose.slotAdjustColumns(); +#ifndef DESKTOP_VERSION + compose.showMaximized(); +#endif + mCurrentComposer = &compose; + mCurrentComposer->insertAttendees(uid,nameList,emailList,uidList); + compose.exec(); + mCurrentComposer = 0; + raise(); + } } |