-rw-r--r-- | kmicromail/opiemail.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp index f68467c..197f7ec 100644 --- a/kmicromail/opiemail.cpp +++ b/kmicromail/opiemail.cpp | |||
@@ -134,24 +134,25 @@ void OpieMail::slotwriteMail2(const QString& namemail ) | |||
134 | compose.setTo( to.left(sub+1) ); | 134 | compose.setTo( to.left(sub+1) ); |
135 | compose.setSubject( to.mid(sub+2) ); | 135 | compose.setSubject( to.mid(sub+2) ); |
136 | } else | 136 | } else |
137 | compose.setTo( to ); | 137 | compose.setTo( to ); |
138 | } | 138 | } |
139 | compose.slotAdjustColumns(); | 139 | compose.slotAdjustColumns(); |
140 | #ifndef DESKTOP_VERSION | 140 | #ifndef DESKTOP_VERSION |
141 | compose.showMaximized(); | 141 | compose.showMaximized(); |
142 | #endif | 142 | #endif |
143 | mCurrentComposer = &compose; | 143 | mCurrentComposer = &compose; |
144 | compose.exec(); | 144 | compose.exec(); |
145 | mCurrentComposer = 0; | 145 | mCurrentComposer = 0; |
146 | folderView->refreshOutgoing(); | ||
146 | raise(); | 147 | raise(); |
147 | //qDebug("retttich "); | 148 | //qDebug("retttich "); |
148 | } | 149 | } |
149 | void OpieMail::slotwriteMail(const QString&name,const QString&email) | 150 | void OpieMail::slotwriteMail(const QString&name,const QString&email) |
150 | { | 151 | { |
151 | // qDebug("OpieMail::slotwriteMail "); | 152 | // qDebug("OpieMail::slotwriteMail "); |
152 | ComposeMail compose( settings, this, 0, true ); | 153 | ComposeMail compose( settings, this, 0, true ); |
153 | if (!email.isEmpty()) | 154 | if (!email.isEmpty()) |
154 | { | 155 | { |
155 | if (!name.isEmpty()) | 156 | if (!name.isEmpty()) |
156 | { | 157 | { |
157 | compose.setTo("\"" + name + "\"" + " " + "<"+ email + ">"); | 158 | compose.setTo("\"" + name + "\"" + " " + "<"+ email + ">"); |
@@ -160,24 +161,25 @@ void OpieMail::slotwriteMail(const QString&name,const QString&email) | |||
160 | { | 161 | { |
161 | compose.setTo(email); | 162 | compose.setTo(email); |
162 | } | 163 | } |
163 | } | 164 | } |
164 | compose.slotAdjustColumns(); | 165 | compose.slotAdjustColumns(); |
165 | #ifndef DESKTOP_VERSION | 166 | #ifndef DESKTOP_VERSION |
166 | compose.showMaximized(); | 167 | compose.showMaximized(); |
167 | #endif | 168 | #endif |
168 | 169 | ||
169 | mCurrentComposer = &compose; | 170 | mCurrentComposer = &compose; |
170 | compose.exec(); | 171 | compose.exec(); |
171 | mCurrentComposer = 0; | 172 | mCurrentComposer = 0; |
173 | folderView->refreshOutgoing(); | ||
172 | raise(); | 174 | raise(); |
173 | } | 175 | } |
174 | 176 | ||
175 | void OpieMail::slotComposeMail() | 177 | void OpieMail::slotComposeMail() |
176 | { | 178 | { |
177 | if ( mPendingEmail == QString::null && mPendingName == QString::null) | 179 | if ( mPendingEmail == QString::null && mPendingName == QString::null) |
178 | slotwriteMail2( QString () ); | 180 | slotwriteMail2( QString () ); |
179 | else { | 181 | else { |
180 | if ( mPendingEmail == QString::null ) | 182 | if ( mPendingEmail == QString::null ) |
181 | slotwriteMail2( mPendingName ); | 183 | slotwriteMail2( mPendingName ); |
182 | else | 184 | else |
183 | slotwriteMail( mPendingName, mPendingEmail ); | 185 | slotwriteMail( mPendingName, mPendingEmail ); |
@@ -305,24 +307,25 @@ void OpieMail::replyMail() | |||
305 | } | 307 | } |
306 | composer.setSubject( prefix + mail->getSubject()); | 308 | composer.setSubject( prefix + mail->getSubject()); |
307 | composer.setMessage( rtext ); | 309 | composer.setMessage( rtext ); |
308 | composer.setInReplyTo( mail->Msgid()); | 310 | composer.setInReplyTo( mail->Msgid()); |
309 | composer.setCharset( body->getCharset() ); | 311 | composer.setCharset( body->getCharset() ); |
310 | 312 | ||
311 | mCurrentComposer = &composer; | 313 | mCurrentComposer = &composer; |
312 | if ( QDialog::Accepted == KApplication::execDialog( &composer ) ) | 314 | if ( QDialog::Accepted == KApplication::execDialog( &composer ) ) |
313 | { | 315 | { |
314 | mail->Wrapper()->answeredMail(mail); | 316 | mail->Wrapper()->answeredMail(mail); |
315 | } | 317 | } |
316 | mCurrentComposer = 0; | 318 | mCurrentComposer = 0; |
319 | folderView->refreshOutgoing(); | ||
317 | delete settings; | 320 | delete settings; |
318 | 321 | ||
319 | } | 322 | } |
320 | void OpieMail::closeViewMail(ViewMail * vm) | 323 | void OpieMail::closeViewMail(ViewMail * vm) |
321 | { | 324 | { |
322 | vm->hide(); | 325 | vm->hide(); |
323 | } | 326 | } |
324 | 327 | ||
325 | void OpieMail::slotDownloadMail( ) | 328 | void OpieMail::slotDownloadMail( ) |
326 | { | 329 | { |
327 | QListViewItem*item = mailView->currentItem(); | 330 | QListViewItem*item = mailView->currentItem(); |
328 | if (!item ) { | 331 | if (!item ) { |
@@ -640,33 +643,35 @@ void OpieMail::reEditMail() | |||
640 | if (!mailView->currentItem()) return; | 643 | if (!mailView->currentItem()) return; |
641 | 644 | ||
642 | ComposeMail compose( settings, this, 0, true ); | 645 | ComposeMail compose( settings, this, 0, true ); |
643 | compose.reEditMail(((MailListViewItem*)mailView->currentItem() )->data()); | 646 | compose.reEditMail(((MailListViewItem*)mailView->currentItem() )->data()); |
644 | compose.slotAdjustColumns(); | 647 | compose.slotAdjustColumns(); |
645 | #ifndef DESKTOP_VERSION | 648 | #ifndef DESKTOP_VERSION |
646 | compose.showMaximized(); | 649 | compose.showMaximized(); |
647 | #else | 650 | #else |
648 | compose.resize(640,480); | 651 | compose.resize(640,480); |
649 | #endif | 652 | #endif |
650 | mCurrentComposer = &compose; | 653 | mCurrentComposer = &compose; |
651 | compose.exec(); | 654 | compose.exec(); |
655 | folderView->refreshOutgoing(); | ||
652 | mCurrentComposer = 0; | 656 | mCurrentComposer = 0; |
653 | } | 657 | } |
654 | 658 | ||
655 | void OpieMail::insertAttendees(const QString& uid,const QStringList& nameList,const QStringList& emailList,const QStringList& uidList) | 659 | void OpieMail::insertAttendees(const QString& uid,const QStringList& nameList,const QStringList& emailList,const QStringList& uidList) |
656 | { | 660 | { |
657 | 661 | ||
658 | if ( mCurrentComposer ) { | 662 | if ( mCurrentComposer ) { |
659 | mCurrentComposer->insertAttendees(uid,nameList,emailList,uidList); | 663 | mCurrentComposer->insertAttendees(uid,nameList,emailList,uidList); |
660 | } else { | 664 | } else { |
661 | ComposeMail compose( settings, this, 0, true ); | 665 | ComposeMail compose( settings, this, 0, true ); |
662 | compose.slotAdjustColumns(); | 666 | compose.slotAdjustColumns(); |
663 | #ifndef DESKTOP_VERSION | 667 | #ifndef DESKTOP_VERSION |
664 | compose.showMaximized(); | 668 | compose.showMaximized(); |
665 | #endif | 669 | #endif |
666 | mCurrentComposer = &compose; | 670 | mCurrentComposer = &compose; |
667 | mCurrentComposer->insertAttendees(uid,nameList,emailList,uidList); | 671 | mCurrentComposer->insertAttendees(uid,nameList,emailList,uidList); |
668 | compose.exec(); | 672 | compose.exec(); |
669 | mCurrentComposer = 0; | 673 | mCurrentComposer = 0; |
674 | folderView->refreshOutgoing(); | ||
670 | raise(); | 675 | raise(); |
671 | } | 676 | } |
672 | } | 677 | } |