Diffstat (limited to 'noncore/unsupported/mail2/attachdiag.cpp') (more/less context) (show 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 | |||
@@ -5,2 +5,3 @@ | |||
5 | 5 | ||
6 | #include <qpe/applnk.h> | ||
6 | #include <qpe/fileselector.h> | 7 | #include <qpe/fileselector.h> |
@@ -21,7 +22,7 @@ AttachDiag::AttachDiag(QWidget* parent = 0, const char* name = 0, bool modal, WF | |||
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 | ||
@@ -39,3 +40,2 @@ AttachDiag::AttachDiag(QWidget* parent = 0, const char* name = 0, bool modal, WF | |||
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())); |
@@ -43,8 +43,5 @@ AttachDiag::AttachDiag(QWidget* parent = 0, const char* name = 0, bool modal, WF | |||
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 | } |
@@ -52,5 +49,5 @@ AttachDiag::AttachDiag(QWidget* parent = 0, const char* name = 0, bool modal, WF | |||
52 | 49 | ||
53 | void AttachDiag::fileSelected(const DocLnk &file) | 50 | DocLnk AttachDiag::selectedFile() |
54 | { | 51 | { |
55 | currentFile = file; | 52 | return *_fileSelector->selected(); |
56 | } | 53 | } |
@@ -64,3 +61,3 @@ DocLnk AttachDiag::getFile(QWidget *parent) | |||
64 | if (QDialog::Accepted == attach.exec()) { | 61 | if (QDialog::Accepted == attach.exec()) { |
65 | return attach.currentFile; | 62 | return attach.selectedFile(); |
66 | } | 63 | } |