-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 | |||
@@ -34,38 +34,38 @@ AttachDiag::AttachDiag(QWidget* parent = 0, const char* name = 0, bool modal, WF | |||
34 | QPushButton *cancelButton = new QPushButton(this); | 34 | QPushButton *cancelButton = new QPushButton(this); |
35 | cancelButton->setText(tr("Cancel")); | 35 | cancelButton->setText(tr("Cancel")); |
36 | cancelButton->setIconSet(Resource::loadPixmap("editdelete")); | 36 | cancelButton->setIconSet(Resource::loadPixmap("editdelete")); |
37 | 37 | ||
38 | layout->addWidget(cancelButton, 1, 1); | 38 | layout->addWidget(cancelButton, 1, 1); |
39 | 39 | ||
40 | connect(fileSelector, SIGNAL(fileSelected(const DocLnk &)), SLOT(fileSelected(const DocLnk &))); | 40 | connect(fileSelector, SIGNAL(fileSelected(const DocLnk &)), SLOT(fileSelected(const DocLnk &))); |
41 | connect(attachButton, SIGNAL(clicked()), SLOT(accept())); | 41 | connect(attachButton, SIGNAL(clicked()), SLOT(accept())); |
42 | connect(cancelButton, SIGNAL(clicked()), SLOT(close())); | 42 | connect(cancelButton, SIGNAL(clicked()), SLOT(close())); |
43 | 43 | ||
44 | if (fileSelector->selected() != NULL) | 44 | if (fileSelector->selected() != NULL) |
45 | currentFile = *fileSelector->selected(); | 45 | currentFile = *fileSelector->selected(); |
46 | 46 | ||
47 | if (fileSelector->fileCount() == 0) { | 47 | if (fileSelector->fileCount() == 0) { |
48 | attachButton->setEnabled(false); | 48 | attachButton->setEnabled(false); |
49 | fileSelector->setEnabled(false); | 49 | fileSelector->setEnabled(false); |
50 | } | 50 | } |
51 | } | 51 | } |
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 | } |
67 | 67 | ||
68 | return DocLnk(); | 68 | return DocLnk(); |
69 | } | 69 | } |
70 | 70 | ||
71 | 71 | ||
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 | |||
@@ -1,27 +1,27 @@ | |||
1 | #ifndef ATTACHDIAG_H | 1 | #ifndef ATTACHDIAG_H |
2 | #define ATTACHDIAG_H | 2 | #define ATTACHDIAG_H |
3 | 3 | ||
4 | #include <qdialog.h> | 4 | #include <qdialog.h> |
5 | 5 | ||
6 | #include <qpe/applnk.h> | 6 | #include <qpe/applnk.h> |
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 &); |
20 | 20 | ||
21 | private: | 21 | private: |
22 | DocLnk currentFile; | 22 | DocLnk currentFile; |
23 | 23 | ||
24 | }; | 24 | }; |
25 | 25 | ||
26 | #endif | 26 | #endif |
27 | 27 | ||
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 | |||
@@ -178,41 +178,41 @@ void Composer::slotOpenAddressPicker() | |||
178 | { | 178 | { |
179 | if (!to->isHidden() && cc->isHidden() && bcc->isHidden()) { | 179 | if (!to->isHidden() && cc->isHidden() && bcc->isHidden()) { |
180 | if (to->text().isEmpty()) { | 180 | if (to->text().isEmpty()) { |
181 | to->setText(AddressPicker::getNames()); | 181 | to->setText(AddressPicker::getNames()); |
182 | } else { | 182 | } else { |
183 | to->setText(to->text() + ", " + AddressPicker::getNames()); | 183 | to->setText(to->text() + ", " + AddressPicker::getNames()); |
184 | } | 184 | } |
185 | } else if (to->isHidden() && !cc->isHidden() && bcc->isHidden()) { | 185 | } else if (to->isHidden() && !cc->isHidden() && bcc->isHidden()) { |
186 | if (cc->text().isEmpty()) { | 186 | if (cc->text().isEmpty()) { |
187 | cc->setText(AddressPicker::getNames()); | 187 | cc->setText(AddressPicker::getNames()); |
188 | } else { | 188 | } else { |
189 | cc->setText(cc->text() + ", " + AddressPicker::getNames()); | 189 | cc->setText(cc->text() + ", " + AddressPicker::getNames()); |
190 | } | 190 | } |
191 | } else if (to->isHidden() && cc->isHidden() && !bcc->isHidden()) { | 191 | } else if (to->isHidden() && cc->isHidden() && !bcc->isHidden()) { |
192 | if (bcc->text().isEmpty()) { | 192 | if (bcc->text().isEmpty()) { |
193 | bcc->setText(AddressPicker::getNames()); | 193 | bcc->setText(AddressPicker::getNames()); |
194 | } else { | 194 | } else { |
195 | bcc->setText(bcc->text() + ", " + AddressPicker::getNames()); | 195 | bcc->setText(bcc->text() + ", " + AddressPicker::getNames()); |
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); |
209 | 209 | ||
210 | (void) new AttachViewItem(attachView, attachment); | 210 | (void) new AttachViewItem(attachView, attachment); |
211 | } | 211 | } |
212 | 212 | ||
213 | void Composer::slotDelAttach() | 213 | void Composer::slotDelAttach() |
214 | { | 214 | { |
215 | if (attachView->currentItem() == NULL) return; | 215 | if (attachView->currentItem() == NULL) return; |
216 | attachView->takeItem(attachView->currentItem()); | 216 | attachView->takeItem(attachView->currentItem()); |
217 | } | 217 | } |
218 | 218 | ||
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 | |||
@@ -80,51 +80,51 @@ MailFactory::MailFactory(SendMail &smail, QWidget *parent) | |||
80 | QValueList<Attachment> attachments = _smail.attachments(); | 80 | QValueList<Attachment> attachments = _smail.attachments(); |
81 | QValueList<Attachment>::Iterator it; | 81 | QValueList<Attachment>::Iterator it; |
82 | for (it = attachments.begin(); it != attachments.end(); it++) { | 82 | for (it = attachments.begin(); it != attachments.end(); it++) { |
83 | QFile f((*it).fileName()); | 83 | QFile f((*it).fileName()); |
84 | if (f.open(IO_ReadOnly)) { | 84 | if (f.open(IO_ReadOnly)) { |
85 | QTextStream t(&f); | 85 | QTextStream t(&f); |
86 | QString file; | 86 | QString file; |
87 | while (!t.atEnd()) file += t.readLine() + "\n"; | 87 | while (!t.atEnd()) file += t.readLine() + "\n"; |
88 | f.close(); | 88 | f.close(); |
89 | QString mimetype = (new MimeType(*(*it).docLnk()))->id(); | 89 | QString mimetype = (new MimeType(*(*it).docLnk()))->id(); |
90 | 90 | ||
91 | _body += "\n--" + boundary + "\n"; | 91 | _body += "\n--" + boundary + "\n"; |
92 | _body += "Content-Type: " + mimetype + "; name=\"" + (*it).newName() + "\"\n"; | 92 | _body += "Content-Type: " + mimetype + "; name=\"" + (*it).newName() + "\"\n"; |
93 | 93 | ||
94 | // TODO: Decide which content transfer encoding is best. B64 for binary, QP for text. | 94 | // TODO: Decide which content transfer encoding is best. B64 for binary, QP for text. |
95 | _body += "Content-Transfer-Encoding: base64\n"; | 95 | _body += "Content-Transfer-Encoding: base64\n"; |
96 | 96 | ||
97 | _body += "Content-Disposition: attachment; filename=\"" + (*it).newName() + "\"\n"; | 97 | _body += "Content-Disposition: attachment; filename=\"" + (*it).newName() + "\"\n"; |
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 | ||
113 | if (_abort) { | 113 | if (_abort) { |
114 | _body = QString(0); | 114 | _body = QString(0); |
115 | _header = QString(0); | 115 | _header = QString(0); |
116 | } | 116 | } |
117 | } | 117 | } |
118 | 118 | ||
119 | // Unfinished GPG code. | 119 | // Unfinished GPG code. |
120 | /* | 120 | /* |
121 | void MailFactory::openPgpEncrypt(const QString &text, QString &header, QString &body) | 121 | void MailFactory::openPgpEncrypt(const QString &text, QString &header, QString &body) |
122 | { | 122 | { |
123 | QString boundary = MiscFunctions::uniqueString(); | 123 | QString boundary = MiscFunctions::uniqueString(); |
124 | 124 | ||
125 | header += "Content-Type: multipart/encrypted; boundary=\"" + boundary + "\"; protocol=\"application/pgp-encrypted\"\n"; | 125 | header += "Content-Type: multipart/encrypted; boundary=\"" + boundary + "\"; protocol=\"application/pgp-encrypted\"\n"; |
126 | 126 | ||
127 | body += "--" + boundary + "\n"; | 127 | body += "--" + boundary + "\n"; |
128 | body += "Content-Type: application/pgp-encrypted\n\n"; | 128 | body += "Content-Type: application/pgp-encrypted\n\n"; |
129 | body += "Version: 1\n\n"; | 129 | body += "Version: 1\n\n"; |
130 | body += "--" + boundary + "\n"; | 130 | body += "--" + boundary + "\n"; |