-rw-r--r-- | noncore/unsupported/mail2/attachdiag.cpp | 4 | ||||
-rw-r--r-- | noncore/unsupported/mail2/attachdiag.h | 2 | ||||
-rw-r--r-- | noncore/unsupported/mail2/composer.cpp | 2 | ||||
-rw-r--r-- | noncore/unsupported/mail2/libmail/mailfactory.cpp | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/noncore/unsupported/mail2/attachdiag.cpp b/noncore/unsupported/mail2/attachdiag.cpp index 6e6c3d4..bedf3c4 100644 --- a/noncore/unsupported/mail2/attachdiag.cpp +++ b/noncore/unsupported/mail2/attachdiag.cpp | |||
@@ -52,15 +52,15 @@ AttachDiag::AttachDiag(QWidget* parent = 0, const char* name = 0, bool modal, WF | |||
52 | 52 | ||
53 | void AttachDiag::fileSelected(const DocLnk &file) | 53 | void AttachDiag::fileSelected(const DocLnk &file) |
54 | { | 54 | { |
55 | currentFile = file; | 55 | currentFile = file; |
56 | } | 56 | } |
57 | 57 | ||
58 | DocLnk AttachDiag::getFile() | 58 | DocLnk AttachDiag::getFile(QWidget *parent) |
59 | { | 59 | { |
60 | AttachDiag *attach = new AttachDiag(0, 0, true); | 60 | AttachDiag *attach = new AttachDiag(parent, 0, true); |
61 | attach->showMaximized(); | 61 | attach->showMaximized(); |
62 | attach->show(); | 62 | attach->show(); |
63 | 63 | ||
64 | if (QDialog::Accepted == attach->exec()) { | 64 | if (QDialog::Accepted == attach->exec()) { |
65 | return attach->currentFile; | 65 | return attach->currentFile; |
66 | } | 66 | } |
diff --git a/noncore/unsupported/mail2/attachdiag.h b/noncore/unsupported/mail2/attachdiag.h index c673cfc..bce5b4b 100644 --- a/noncore/unsupported/mail2/attachdiag.h +++ b/noncore/unsupported/mail2/attachdiag.h | |||
@@ -7,13 +7,13 @@ | |||
7 | 7 | ||
8 | class AttachDiag : public QDialog | 8 | class AttachDiag : public QDialog |
9 | { | 9 | { |
10 | Q_OBJECT | 10 | Q_OBJECT |
11 | 11 | ||
12 | public: | 12 | public: |
13 | static DocLnk getFile(); | 13 | static DocLnk getFile(QWidget *parent); |
14 | 14 | ||
15 | protected: | 15 | protected: |
16 | AttachDiag(QWidget *parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0); | 16 | AttachDiag(QWidget *parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0); |
17 | 17 | ||
18 | private slots: | 18 | private slots: |
19 | void fileSelected(const DocLnk &); | 19 | void fileSelected(const DocLnk &); |
diff --git a/noncore/unsupported/mail2/composer.cpp b/noncore/unsupported/mail2/composer.cpp index 57f0779..82ed117 100644 --- a/noncore/unsupported/mail2/composer.cpp +++ b/noncore/unsupported/mail2/composer.cpp | |||
@@ -196,13 +196,13 @@ void Composer::slotOpenAddressPicker() | |||
196 | } | 196 | } |
197 | } | 197 | } |
198 | } | 198 | } |
199 | 199 | ||
200 | void Composer::slotAddAttach() | 200 | void Composer::slotAddAttach() |
201 | { | 201 | { |
202 | DocLnk lnk = AttachDiag::getFile(); | 202 | DocLnk lnk = AttachDiag::getFile(this); |
203 | if (lnk.name().isEmpty()) return; | 203 | if (lnk.name().isEmpty()) return; |
204 | 204 | ||
205 | Attachment attachment; | 205 | Attachment attachment; |
206 | attachment.setFileName(lnk.file()); | 206 | attachment.setFileName(lnk.file()); |
207 | attachment.setNewName(lnk.name()); | 207 | attachment.setNewName(lnk.name()); |
208 | attachment.setDocLnk(&lnk); | 208 | attachment.setDocLnk(&lnk); |
diff --git a/noncore/unsupported/mail2/libmail/mailfactory.cpp b/noncore/unsupported/mail2/libmail/mailfactory.cpp index 427e72c..6602919 100644 --- a/noncore/unsupported/mail2/libmail/mailfactory.cpp +++ b/noncore/unsupported/mail2/libmail/mailfactory.cpp | |||
@@ -98,15 +98,15 @@ MailFactory::MailFactory(SendMail &smail, QWidget *parent) | |||
98 | if (!(*it).description().isEmpty()) | 98 | if (!(*it).description().isEmpty()) |
99 | _body += "Content-Description: " + (*it).description() + "\n"; | 99 | _body += "Content-Description: " + (*it).description() + "\n"; |
100 | 100 | ||
101 | _body += "\n" + MiscFunctions::encodeBase64(file) + "\n"; | 101 | _body += "\n" + MiscFunctions::encodeBase64(file) + "\n"; |
102 | } else { | 102 | } else { |
103 | int ret = QMessageBox::critical(_parent, tr("Error"), tr("<p>Couldn't attach file '%1'. Continue anyway or abort?</p>").arg((*it).fileName()), tr("Continue"), tr("Abort")); | 103 | int ret = QMessageBox::critical(_parent, tr("Error"), tr("<p>Couldn't attach file '%1'. Continue anyway or abort?</p>").arg((*it).fileName()), tr("Continue"), tr("Abort")); |
104 | if (ret == 1) { | 104 | if (ret != 0) { |
105 | it = attachments.end(); | ||
106 | _abort = true; | 105 | _abort = true; |
106 | break; | ||
107 | } | 107 | } |
108 | } | 108 | } |
109 | } | 109 | } |
110 | _body += "\n--" + boundary + "--"; | 110 | _body += "\n--" + boundary + "--"; |
111 | } | 111 | } |
112 | 112 | ||