Diffstat (limited to 'noncore/unsupported/mail2/attachdiag.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/unsupported/mail2/attachdiag.cpp | 23 |
1 files changed, 10 insertions, 13 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 | |||
@@ -1,11 +1,12 @@ | |||
1 | #include <qmessagebox.h> | 1 | #include <qmessagebox.h> |
2 | #include <qpushbutton.h> | 2 | #include <qpushbutton.h> |
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 | ||
9 | #include <stdlib.h> | 10 | #include <stdlib.h> |
10 | 11 | ||
11 | #include "attachdiag.h" | 12 | #include "attachdiag.h" |
@@ -16,17 +17,17 @@ AttachDiag::AttachDiag(QWidget* parent = 0, const char* name = 0, bool modal, WF | |||
16 | setCaption(tr("Attach File")); | 17 | setCaption(tr("Attach File")); |
17 | 18 | ||
18 | QGridLayout *layout = new QGridLayout(this); | 19 | QGridLayout *layout = new QGridLayout(this); |
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")); |
30 | attachButton->setIconSet(Resource::loadPixmap("enter")); | 31 | attachButton->setIconSet(Resource::loadPixmap("enter")); |
31 | 32 | ||
32 | layout->addWidget(attachButton, 1, 0); | 33 | layout->addWidget(attachButton, 1, 0); |
@@ -34,38 +35,34 @@ AttachDiag::AttachDiag(QWidget* parent = 0, const char* name = 0, bool modal, WF | |||
34 | QPushButton *cancelButton = new QPushButton(this); | 35 | QPushButton *cancelButton = new QPushButton(this); |
35 | cancelButton->setText(tr("Cancel")); | 36 | cancelButton->setText(tr("Cancel")); |
36 | cancelButton->setIconSet(Resource::loadPixmap("editdelete")); | 37 | cancelButton->setIconSet(Resource::loadPixmap("editdelete")); |
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 | ||
53 | void AttachDiag::fileSelected(const DocLnk &file) | 50 | DocLnk AttachDiag::selectedFile() |
54 | { | 51 | { |
55 | currentFile = file; | 52 | return *_fileSelector->selected(); |
56 | } | 53 | } |
57 | 54 | ||
58 | DocLnk AttachDiag::getFile(QWidget *parent) | 55 | DocLnk AttachDiag::getFile(QWidget *parent) |
59 | { | 56 | { |
60 | AttachDiag attach(parent, 0, true); | 57 | AttachDiag attach(parent, 0, true); |
61 | attach.showMaximized(); | 58 | attach.showMaximized(); |
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(); |
69 | } | 66 | } |
70 | 67 | ||
71 | 68 | ||