Diffstat (limited to 'noncore/net/mail/composemail.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/net/mail/composemail.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/noncore/net/mail/composemail.cpp b/noncore/net/mail/composemail.cpp index 988a1d9..fa703c4 100644 --- a/noncore/net/mail/composemail.cpp +++ b/noncore/net/mail/composemail.cpp | |||
@@ -162,49 +162,49 @@ void ComposeMail::slotAdjustColumns() | |||
162 | 162 | ||
163 | void ComposeMail::addAttachment() | 163 | void ComposeMail::addAttachment() |
164 | { | 164 | { |
165 | DocLnk lnk = OFileDialog::getOpenFileName( 1, "/" ); | 165 | DocLnk lnk = OFileDialog::getOpenFileName( 1, "/" ); |
166 | if ( !lnk.name().isEmpty() ) { | 166 | if ( !lnk.name().isEmpty() ) { |
167 | Attachment *att = new Attachment( lnk ); | 167 | Attachment *att = new Attachment( lnk ); |
168 | (void) new AttachViewItem( attList, att ); | 168 | (void) new AttachViewItem( attList, att ); |
169 | } | 169 | } |
170 | } | 170 | } |
171 | 171 | ||
172 | void ComposeMail::removeAttachment() | 172 | void ComposeMail::removeAttachment() |
173 | { | 173 | { |
174 | if ( !attList->currentItem() ) { | 174 | if ( !attList->currentItem() ) { |
175 | QMessageBox::information( this, tr( "Error" ), | 175 | QMessageBox::information( this, tr( "Error" ), |
176 | tr( "<p>Please select a File.</p>" ), | 176 | tr( "<p>Please select a File.</p>" ), |
177 | tr( "Ok" ) ); | 177 | tr( "Ok" ) ); |
178 | } else { | 178 | } else { |
179 | attList->takeItem( attList->currentItem() ); | 179 | attList->takeItem( attList->currentItem() ); |
180 | } | 180 | } |
181 | } | 181 | } |
182 | 182 | ||
183 | void ComposeMail::accept() | 183 | void ComposeMail::accept() |
184 | { | 184 | { |
185 | if ( checkBoxLater->isChecked() ) { | 185 | if ( checkBoxLater->isChecked() ) { |
186 | qDebug( "Send later" ); | 186 | odebug << "Send later" << oendl; |
187 | } | 187 | } |
188 | 188 | ||
189 | #if 0 | 189 | #if 0 |
190 | qDebug( "Sending Mail with " + | 190 | qDebug( "Sending Mail with " + |
191 | smtpAccounts.at( smtpAccountBox->currentItem() )->getAccountName() ); | 191 | smtpAccounts.at( smtpAccountBox->currentItem() )->getAccountName() ); |
192 | #endif | 192 | #endif |
193 | Opie::Core::OSmartPointer<Mail> mail=new Mail; | 193 | Opie::Core::OSmartPointer<Mail> mail=new Mail; |
194 | 194 | ||
195 | SMTPaccount *smtp = smtpAccounts.at( smtpAccountBox->currentItem() ); | 195 | SMTPaccount *smtp = smtpAccounts.at( smtpAccountBox->currentItem() ); |
196 | mail->setMail(fromBox->currentText()); | 196 | mail->setMail(fromBox->currentText()); |
197 | 197 | ||
198 | if ( !toLine->text().isEmpty() ) { | 198 | if ( !toLine->text().isEmpty() ) { |
199 | mail->setTo( toLine->text() ); | 199 | mail->setTo( toLine->text() ); |
200 | } else { | 200 | } else { |
201 | QMessageBox::warning(0,tr("Sending mail"), | 201 | QMessageBox::warning(0,tr("Sending mail"), |
202 | tr("No Receiver spezified" ) ); | 202 | tr("No Receiver spezified" ) ); |
203 | return; | 203 | return; |
204 | } | 204 | } |
205 | mail->setName(senderNameEdit->text()); | 205 | mail->setName(senderNameEdit->text()); |
206 | mail->setCC( ccLine->text() ); | 206 | mail->setCC( ccLine->text() ); |
207 | mail->setBCC( bccLine->text() ); | 207 | mail->setBCC( bccLine->text() ); |
208 | mail->setReply( replyLine->text() ); | 208 | mail->setReply( replyLine->text() ); |
209 | mail->setSubject( subjectLine->text() ); | 209 | mail->setSubject( subjectLine->text() ); |
210 | if (!m_replyid.isEmpty()) { | 210 | if (!m_replyid.isEmpty()) { |
@@ -235,68 +235,68 @@ void ComposeMail::reject() | |||
235 | int yesno = QMessageBox::warning(0,tr("Store message"), | 235 | int yesno = QMessageBox::warning(0,tr("Store message"), |
236 | tr("Store message into drafts?"), | 236 | tr("Store message into drafts?"), |
237 | tr("Yes"), | 237 | tr("Yes"), |
238 | tr("No"),QString::null,0,1); | 238 | tr("No"),QString::null,0,1); |
239 | 239 | ||
240 | if (yesno == 0) { | 240 | if (yesno == 0) { |
241 | Opie::Core::OSmartPointer<Mail> mail=new Mail(); | 241 | Opie::Core::OSmartPointer<Mail> mail=new Mail(); |
242 | mail->setMail(fromBox->currentText()); | 242 | mail->setMail(fromBox->currentText()); |
243 | mail->setTo( toLine->text() ); | 243 | mail->setTo( toLine->text() ); |
244 | mail->setName(senderNameEdit->text()); | 244 | mail->setName(senderNameEdit->text()); |
245 | mail->setCC( ccLine->text() ); | 245 | mail->setCC( ccLine->text() ); |
246 | mail->setBCC( bccLine->text() ); | 246 | mail->setBCC( bccLine->text() ); |
247 | mail->setReply( replyLine->text() ); | 247 | mail->setReply( replyLine->text() ); |
248 | mail->setSubject( subjectLine->text() ); | 248 | mail->setSubject( subjectLine->text() ); |
249 | if (!m_replyid.isEmpty()) { | 249 | if (!m_replyid.isEmpty()) { |
250 | QStringList ids; | 250 | QStringList ids; |
251 | ids.append(m_replyid); | 251 | ids.append(m_replyid); |
252 | mail->setInreply(ids); | 252 | mail->setInreply(ids); |
253 | } | 253 | } |
254 | QString txt = message->text(); | 254 | QString txt = message->text(); |
255 | if ( !sigMultiLine->text().isEmpty() ) { | 255 | if ( !sigMultiLine->text().isEmpty() ) { |
256 | txt.append( "\n--\n" ); | 256 | txt.append( "\n--\n" ); |
257 | txt.append( sigMultiLine->text() ); | 257 | txt.append( sigMultiLine->text() ); |
258 | } | 258 | } |
259 | qDebug(txt); | 259 | odebug << txt << oendl; |
260 | mail->setMessage( txt ); | 260 | mail->setMessage( txt ); |
261 | 261 | ||
262 | /* only use the default drafts folder name! */ | 262 | /* only use the default drafts folder name! */ |
263 | Storemail wrapper(AbstractMail::draftFolder()); | 263 | Storemail wrapper(AbstractMail::draftFolder()); |
264 | wrapper.storeMail(mail); | 264 | wrapper.storeMail(mail); |
265 | 265 | ||
266 | AttachViewItem *it = (AttachViewItem *) attList->firstChild(); | 266 | AttachViewItem *it = (AttachViewItem *) attList->firstChild(); |
267 | /* attachments we will ignore! */ | 267 | /* attachments we will ignore! */ |
268 | if ( it != NULL ) { | 268 | if ( it != NULL ) { |
269 | QMessageBox::warning(0,tr("Store message"), | 269 | QMessageBox::warning(0,tr("Store message"), |
270 | tr("<center>Attachments will not be stored in \"Draft\" folder</center>")); | 270 | tr("<center>Attachments will not be stored in \"Draft\" folder</center>")); |
271 | } | 271 | } |
272 | } | 272 | } |
273 | QDialog::reject(); | 273 | QDialog::reject(); |
274 | } | 274 | } |
275 | 275 | ||
276 | ComposeMail::~ComposeMail() | 276 | ComposeMail::~ComposeMail() |
277 | { | 277 | { |
278 | } | 278 | } |
279 | 279 | ||
280 | void ComposeMail::reEditMail(const RecMailP¤t) | 280 | void ComposeMail::reEditMail(const RecMailP¤t) |
281 | { | 281 | { |
282 | RecMailP data = current; | 282 | RecMailP data = current; |
283 | message->setText(data->Wrapper()->fetchBody(current)->Bodytext()); | 283 | message->setText(data->Wrapper()->fetchBody(current)->Bodytext()); |
284 | subjectLine->setText( data->getSubject()); | 284 | subjectLine->setText( data->getSubject()); |
285 | toLine->setText(data->To().join(",")); | 285 | toLine->setText(data->To().join(",")); |
286 | ccLine->setText(data->CC().join(",")); | 286 | ccLine->setText(data->CC().join(",")); |
287 | bccLine->setText(data->Bcc().join(",")); | 287 | bccLine->setText(data->Bcc().join(",")); |
288 | replyLine->setText(data->Replyto()); | 288 | replyLine->setText(data->Replyto()); |
289 | } | 289 | } |
290 | 290 | ||
291 | AttachViewItem::AttachViewItem( QListView *parent, Attachment *att ) | 291 | AttachViewItem::AttachViewItem( QListView *parent, Attachment *att ) |
292 | : QListViewItem( parent ) | 292 | : QListViewItem( parent ) |
293 | { | 293 | { |
294 | attachment = att; | 294 | attachment = att; |
295 | qDebug( att->getMimeType() ); | 295 | odebug << att->getMimeType() << oendl; |
296 | setPixmap( 0, attachment->getDocLnk().pixmap().isNull() ? | 296 | setPixmap( 0, attachment->getDocLnk().pixmap().isNull() ? |
297 | Resource::loadPixmap( "UnknownDocument-14" ) : | 297 | Resource::loadPixmap( "UnknownDocument-14" ) : |
298 | attachment->getDocLnk().pixmap() ); | 298 | attachment->getDocLnk().pixmap() ); |
299 | setText( 0, att->getName().isEmpty() ? att->getFileName() : att->getName() ); | 299 | setText( 0, att->getName().isEmpty() ? att->getFileName() : att->getName() ); |
300 | setText( 1, QString::number( att->getSize() ) ); | 300 | setText( 1, QString::number( att->getSize() ) ); |
301 | } | 301 | } |
302 | 302 | ||