summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/unsupported/mail2/attachdiag.cpp23
-rw-r--r--noncore/unsupported/mail2/attachdiag.h9
-rw-r--r--noncore/unsupported/mail2/composer.cpp4
-rw-r--r--noncore/unsupported/mail2/libmail/mailfactory.cpp2
-rw-r--r--noncore/unsupported/mail2/libmail/mailfactory.h6
5 files changed, 20 insertions, 24 deletions
diff --git a/noncore/unsupported/mail2/attachdiag.cpp b/noncore/unsupported/mail2/attachdiag.cpp
index 36e1948..446cfe5 100644
--- a/noncore/unsupported/mail2/attachdiag.cpp
+++ b/noncore/unsupported/mail2/attachdiag.cpp
@@ -3,6 +3,7 @@
3#include <qlistbox.h> 3#include <qlistbox.h>
4#include <qlayout.h> 4#include <qlayout.h>
5 5
6#include <qpe/applnk.h>
6#include <qpe/fileselector.h> 7#include <qpe/fileselector.h>
7#include <qpe/resource.h> 8#include <qpe/resource.h>
8 9
@@ -19,11 +20,11 @@ AttachDiag::AttachDiag(QWidget* parent = 0, const char* name = 0, bool modal, WF
19 layout->setSpacing(3); 20 layout->setSpacing(3);
20 layout->setMargin(4); 21 layout->setMargin(4);
21 22
22 FileSelector *fileSelector = new FileSelector("*", this, "FileSelector"); 23 _fileSelector = new FileSelector("*", this, "FileSelector");
23 fileSelector->setCloseVisible(false); 24 _fileSelector->setCloseVisible(false);
24 fileSelector->setNewVisible(false); 25 _fileSelector->setNewVisible(false);
25 26
26 layout->addMultiCellWidget(fileSelector, 0, 0, 0, 1); 27 layout->addMultiCellWidget(_fileSelector, 0, 0, 0, 1);
27 28
28 QPushButton *attachButton = new QPushButton(this); 29 QPushButton *attachButton = new QPushButton(this);
29 attachButton->setText(tr("Ok")); 30 attachButton->setText(tr("Ok"));
@@ -37,22 +38,18 @@ AttachDiag::AttachDiag(QWidget* parent = 0, const char* name = 0, bool modal, WF
37 38
38 layout->addWidget(cancelButton, 1, 1); 39 layout->addWidget(cancelButton, 1, 1);
39 40
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->fileCount() == 0) {
45 currentFile = *fileSelector->selected();
46
47 if (fileSelector->fileCount() == 0) {
48 attachButton->setEnabled(false); 45 attachButton->setEnabled(false);
49 fileSelector->setEnabled(false); 46 _fileSelector->setEnabled(false);
50 } 47 }
51} 48}
52 49
53void AttachDiag::fileSelected(const DocLnk &file) 50DocLnk AttachDiag::selectedFile()
54{ 51{
55 currentFile = file; 52 return *_fileSelector->selected();
56} 53}
57 54
58DocLnk AttachDiag::getFile(QWidget *parent) 55DocLnk AttachDiag::getFile(QWidget *parent)
@@ -62,7 +59,7 @@ DocLnk AttachDiag::getFile(QWidget *parent)
62 attach.show(); 59 attach.show();
63 60
64 if (QDialog::Accepted == attach.exec()) { 61 if (QDialog::Accepted == attach.exec()) {
65 return attach.currentFile; 62 return attach.selectedFile();
66 } 63 }
67 64
68 return DocLnk(); 65 return DocLnk();
diff --git a/noncore/unsupported/mail2/attachdiag.h b/noncore/unsupported/mail2/attachdiag.h
index bce5b4b..88686bc 100644
--- a/noncore/unsupported/mail2/attachdiag.h
+++ b/noncore/unsupported/mail2/attachdiag.h
@@ -3,23 +3,22 @@
3 3
4#include <qdialog.h> 4#include <qdialog.h>
5 5
6#include <qpe/applnk.h> 6class DocLnk;
7class FileSelector;
7 8
8class AttachDiag : public QDialog 9class AttachDiag : public QDialog
9{ 10{
10 Q_OBJECT 11 Q_OBJECT
11 12
12public: 13public:
14 DocLnk selectedFile();
13 static DocLnk getFile(QWidget *parent); 15 static DocLnk getFile(QWidget *parent);
14 16
15protected: 17protected:
16 AttachDiag(QWidget *parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0); 18 AttachDiag(QWidget *parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0);
17 19
18private slots:
19 void fileSelected(const DocLnk &);
20
21private: 20private:
22 DocLnk currentFile; 21 FileSelector *_fileSelector;
23 22
24}; 23};
25 24
diff --git a/noncore/unsupported/mail2/composer.cpp b/noncore/unsupported/mail2/composer.cpp
index 7f65dba..c36d973 100644
--- a/noncore/unsupported/mail2/composer.cpp
+++ b/noncore/unsupported/mail2/composer.cpp
@@ -20,7 +20,7 @@
20AttachViewItem::AttachViewItem(QListView *parent, Attachment &attachment) 20AttachViewItem::AttachViewItem(QListView *parent, Attachment &attachment)
21 : QListViewItem(parent), _attachment(attachment) 21 : QListViewItem(parent), _attachment(attachment)
22{ 22{
23 setPixmap(0, _attachment.docLnk()->pixmap().isNull() ? Resource::loadPixmap("UnknownDocument-14") : _attachment.docLnk()->pixmap()); 23 setPixmap(0, _attachment.docLnk().pixmap().isNull() ? Resource::loadPixmap("UnknownDocument-14") : _attachment.docLnk().pixmap());
24 setText(0, _attachment.newName().isEmpty() ? _attachment.fileName() : _attachment.newName()); 24 setText(0, _attachment.newName().isEmpty() ? _attachment.fileName() : _attachment.newName());
25 setText(1, _attachment.description()); 25 setText(1, _attachment.description());
26} 26}
@@ -231,7 +231,7 @@ void Composer::slotAddAttach()
231 Attachment attachment; 231 Attachment attachment;
232 attachment.setFileName(lnk.file()); 232 attachment.setFileName(lnk.file());
233 attachment.setNewName(lnk.name()); 233 attachment.setNewName(lnk.name());
234 attachment.setDocLnk(&lnk); 234 attachment.setDocLnk(lnk);
235 235
236 (void) new AttachViewItem(attachView, attachment); 236 (void) new AttachViewItem(attachView, attachment);
237} 237}
diff --git a/noncore/unsupported/mail2/libmail/mailfactory.cpp b/noncore/unsupported/mail2/libmail/mailfactory.cpp
index 6602919..e02f80f 100644
--- a/noncore/unsupported/mail2/libmail/mailfactory.cpp
+++ b/noncore/unsupported/mail2/libmail/mailfactory.cpp
@@ -86,7 +86,7 @@ MailFactory::MailFactory(SendMail &smail, QWidget *parent)
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";
diff --git a/noncore/unsupported/mail2/libmail/mailfactory.h b/noncore/unsupported/mail2/libmail/mailfactory.h
index 8f67447..c938c27 100644
--- a/noncore/unsupported/mail2/libmail/mailfactory.h
+++ b/noncore/unsupported/mail2/libmail/mailfactory.h
@@ -13,16 +13,16 @@ public:
13 void setFileName(QString fileName) { _fileName = fileName; } 13 void setFileName(QString fileName) { _fileName = fileName; }
14 void setNewName(QString newName) { _newName = newName; } 14 void setNewName(QString newName) { _newName = newName; }
15 void setDescription(QString description) { _description = description; } 15 void setDescription(QString description) { _description = description; }
16 void setDocLnk(DocLnk *docLnk) { _docLnk = docLnk; } 16 void setDocLnk(DocLnk docLnk) { _docLnk = docLnk; }
17 17
18 QString fileName() { return _fileName; } 18 QString fileName() { return _fileName; }
19 QString newName() { return _newName; } 19 QString newName() { return _newName; }
20 QString description() { return _description; } 20 QString description() { return _description; }
21 DocLnk *docLnk() { return _docLnk; } 21 DocLnk docLnk() { return _docLnk; }
22 22
23protected: 23protected:
24 QString _fileName, _newName, _description; 24 QString _fileName, _newName, _description;
25 DocLnk *_docLnk; 25 DocLnk _docLnk;
26 26
27}; 27};
28 28