Diffstat (limited to 'noncore/net/mail/composemail.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/mail/composemail.cpp | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/noncore/net/mail/composemail.cpp b/noncore/net/mail/composemail.cpp index b9c9cbc..445cc5e 100644 --- a/noncore/net/mail/composemail.cpp +++ b/noncore/net/mail/composemail.cpp | |||
@@ -167,117 +167,116 @@ void ComposeMail::addAttachment() | |||
167 | } | 167 | } |
168 | } | 168 | } |
169 | 169 | ||
170 | void ComposeMail::removeAttachment() | 170 | void ComposeMail::removeAttachment() |
171 | { | 171 | { |
172 | if ( !attList->currentItem() ) { | 172 | if ( !attList->currentItem() ) { |
173 | QMessageBox::information( this, tr( "Error" ), | 173 | QMessageBox::information( this, tr( "Error" ), |
174 | tr( "<p>Please select a File.</p>" ), | 174 | tr( "<p>Please select a File.</p>" ), |
175 | tr( "Ok" ) ); | 175 | tr( "Ok" ) ); |
176 | } else { | 176 | } else { |
177 | attList->takeItem( attList->currentItem() ); | 177 | attList->takeItem( attList->currentItem() ); |
178 | } | 178 | } |
179 | } | 179 | } |
180 | 180 | ||
181 | void ComposeMail::accept() | 181 | void ComposeMail::accept() |
182 | { | 182 | { |
183 | if ( checkBoxLater->isChecked() ) { | 183 | if ( checkBoxLater->isChecked() ) { |
184 | qDebug( "Send later" ); | 184 | qDebug( "Send later" ); |
185 | } | 185 | } |
186 | 186 | ||
187 | #if 0 | 187 | #if 0 |
188 | qDebug( "Sending Mail with " + | 188 | qDebug( "Sending Mail with " + |
189 | smtpAccounts.at( smtpAccountBox->currentItem() )->getAccountName() ); | 189 | smtpAccounts.at( smtpAccountBox->currentItem() )->getAccountName() ); |
190 | #endif | 190 | #endif |
191 | Mail mail; | 191 | Opie::osmart_pointer<Mail> mail=new Mail; |
192 | 192 | ||
193 | SMTPaccount *smtp = smtpAccounts.at( smtpAccountBox->currentItem() ); | 193 | SMTPaccount *smtp = smtpAccounts.at( smtpAccountBox->currentItem() ); |
194 | mail.setMail(fromBox->currentText()); | 194 | mail->setMail(fromBox->currentText()); |
195 | 195 | ||
196 | if ( !toLine->text().isEmpty() ) { | 196 | if ( !toLine->text().isEmpty() ) { |
197 | mail.setTo( toLine->text() ); | 197 | mail->setTo( toLine->text() ); |
198 | } else { | 198 | } else { |
199 | QMessageBox::warning(0,tr("Sending mail"), | 199 | QMessageBox::warning(0,tr("Sending mail"), |
200 | tr("No Receiver spezified" ) ); | 200 | tr("No Receiver spezified" ) ); |
201 | return; | 201 | return; |
202 | } | 202 | } |
203 | mail.setName(senderNameEdit->text()); | 203 | mail->setName(senderNameEdit->text()); |
204 | mail.setCC( ccLine->text() ); | 204 | mail->setCC( ccLine->text() ); |
205 | mail.setBCC( bccLine->text() ); | 205 | mail->setBCC( bccLine->text() ); |
206 | mail.setReply( replyLine->text() ); | 206 | mail->setReply( replyLine->text() ); |
207 | mail.setSubject( subjectLine->text() ); | 207 | mail->setSubject( subjectLine->text() ); |
208 | if (!m_replyid.isEmpty()) { | 208 | if (!m_replyid.isEmpty()) { |
209 | QStringList ids; | 209 | QStringList ids; |
210 | ids.append(m_replyid); | 210 | ids.append(m_replyid); |
211 | mail.setInreply(ids); | 211 | mail->setInreply(ids); |
212 | } | 212 | } |
213 | QString txt = message->text(); | 213 | QString txt = message->text(); |
214 | if ( !sigMultiLine->text().isEmpty() ) { | 214 | if ( !sigMultiLine->text().isEmpty() ) { |
215 | txt.append( "\n--\n" ); | 215 | txt.append( "\n--\n" ); |
216 | txt.append( sigMultiLine->text() ); | 216 | txt.append( sigMultiLine->text() ); |
217 | } | 217 | } |
218 | qDebug(txt); | 218 | mail->setMessage( txt ); |
219 | mail.setMessage( txt ); | ||
220 | AttachViewItem *it = (AttachViewItem *) attList->firstChild(); | 219 | AttachViewItem *it = (AttachViewItem *) attList->firstChild(); |
221 | while ( it != NULL ) { | 220 | while ( it != NULL ) { |
222 | mail.addAttachment( it->getAttachment() ); | 221 | mail->addAttachment( it->getAttachment() ); |
223 | it = (AttachViewItem *) it->nextSibling(); | 222 | it = (AttachViewItem *) it->nextSibling(); |
224 | } | 223 | } |
225 | 224 | ||
226 | SMTPwrapper wrapper( smtp ); | 225 | SMTPwrapper wrapper( smtp ); |
227 | wrapper.sendMail( mail,checkBoxLater->isChecked() ); | 226 | wrapper.sendMail( mail,checkBoxLater->isChecked() ); |
228 | 227 | ||
229 | QDialog::accept(); | 228 | QDialog::accept(); |
230 | } | 229 | } |
231 | 230 | ||
232 | void ComposeMail::reject() | 231 | void ComposeMail::reject() |
233 | { | 232 | { |
234 | int yesno = QMessageBox::warning(0,tr("Store message"), | 233 | int yesno = QMessageBox::warning(0,tr("Store message"), |
235 | tr("Store message into drafts?"), | 234 | tr("Store message into drafts?"), |
236 | tr("Yes"), | 235 | tr("Yes"), |
237 | tr("No"),QString::null,0,1); | 236 | tr("No"),QString::null,0,1); |
238 | 237 | ||
239 | if (yesno == 0) { | 238 | if (yesno == 0) { |
240 | Mail mail; | 239 | Opie::osmart_pointer<Mail> mail=new Mail(); |
241 | mail.setMail(fromBox->currentText()); | 240 | mail->setMail(fromBox->currentText()); |
242 | mail.setTo( toLine->text() ); | 241 | mail->setTo( toLine->text() ); |
243 | mail.setName(senderNameEdit->text()); | 242 | mail->setName(senderNameEdit->text()); |
244 | mail.setCC( ccLine->text() ); | 243 | mail->setCC( ccLine->text() ); |
245 | mail.setBCC( bccLine->text() ); | 244 | mail->setBCC( bccLine->text() ); |
246 | mail.setReply( replyLine->text() ); | 245 | mail->setReply( replyLine->text() ); |
247 | mail.setSubject( subjectLine->text() ); | 246 | mail->setSubject( subjectLine->text() ); |
248 | if (!m_replyid.isEmpty()) { | 247 | if (!m_replyid.isEmpty()) { |
249 | QStringList ids; | 248 | QStringList ids; |
250 | ids.append(m_replyid); | 249 | ids.append(m_replyid); |
251 | mail.setInreply(ids); | 250 | mail->setInreply(ids); |
252 | } | 251 | } |
253 | QString txt = message->text(); | 252 | QString txt = message->text(); |
254 | if ( !sigMultiLine->text().isEmpty() ) { | 253 | if ( !sigMultiLine->text().isEmpty() ) { |
255 | txt.append( "\n--\n" ); | 254 | txt.append( "\n--\n" ); |
256 | txt.append( sigMultiLine->text() ); | 255 | txt.append( sigMultiLine->text() ); |
257 | } | 256 | } |
258 | qDebug(txt); | 257 | qDebug(txt); |
259 | mail.setMessage( txt ); | 258 | mail->setMessage( txt ); |
260 | 259 | ||
261 | /* only use the default drafts folder name! */ | 260 | /* only use the default drafts folder name! */ |
262 | Storemail wrapper(AbstractMail::draftFolder()); | 261 | Storemail wrapper(AbstractMail::draftFolder()); |
263 | wrapper.storeMail(mail); | 262 | wrapper.storeMail(mail); |
264 | 263 | ||
265 | AttachViewItem *it = (AttachViewItem *) attList->firstChild(); | 264 | AttachViewItem *it = (AttachViewItem *) attList->firstChild(); |
266 | /* attachments we will ignore! */ | 265 | /* attachments we will ignore! */ |
267 | if ( it != NULL ) { | 266 | if ( it != NULL ) { |
268 | QMessageBox::warning(0,tr("Store message"), | 267 | QMessageBox::warning(0,tr("Store message"), |
269 | tr("<center>Attachments will not be stored in \"Draft\" folder</center>")); | 268 | tr("<center>Attachments will not be stored in \"Draft\" folder</center>")); |
270 | } | 269 | } |
271 | } | 270 | } |
272 | QDialog::reject(); | 271 | QDialog::reject(); |
273 | } | 272 | } |
274 | 273 | ||
275 | ComposeMail::~ComposeMail() | 274 | ComposeMail::~ComposeMail() |
276 | { | 275 | { |
277 | } | 276 | } |
278 | 277 | ||
279 | void ComposeMail::reEditMail(const RecMail¤t) | 278 | void ComposeMail::reEditMail(const RecMail¤t) |
280 | { | 279 | { |
281 | RecMail data = current; | 280 | RecMail data = current; |
282 | message->setText(data.Wrapper()->fetchBody(current).Bodytext()); | 281 | message->setText(data.Wrapper()->fetchBody(current).Bodytext()); |
283 | subjectLine->setText( data.getSubject()); | 282 | subjectLine->setText( data.getSubject()); |