author | leseb <leseb> | 2002-06-17 20:52:48 (UTC) |
---|---|---|
committer | leseb <leseb> | 2002-06-17 20:52:48 (UTC) |
commit | b177eb4a659c674d1bc3ab82d6d980aade7c0959 (patch) (side-by-side diff) | |
tree | 4ba2aee9db13423e37ae0a8051d80c010f815666 /noncore/unsupported/mail2/attachdiag.cpp | |
parent | 7ba6590093fb86fe4bf64839d3a517dd396853a3 (diff) | |
download | opie-b177eb4a659c674d1bc3ab82d6d980aade7c0959.zip opie-b177eb4a659c674d1bc3ab82d6d980aade7c0959.tar.gz opie-b177eb4a659c674d1bc3ab82d6d980aade7c0959.tar.bz2 |
Fix some bugs when dealing with attachments
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 @@ #include <qmessagebox.h> #include <qpushbutton.h> #include <qlistbox.h> #include <qlayout.h> +#include <qpe/applnk.h> #include <qpe/fileselector.h> #include <qpe/resource.h> #include <stdlib.h> #include "attachdiag.h" @@ -16,17 +17,17 @@ AttachDiag::AttachDiag(QWidget* parent = 0, const char* name = 0, bool modal, WF setCaption(tr("Attach File")); QGridLayout *layout = new QGridLayout(this); layout->setSpacing(3); layout->setMargin(4); - FileSelector *fileSelector = new FileSelector("*", this, "FileSelector"); - fileSelector->setCloseVisible(false); - fileSelector->setNewVisible(false); + _fileSelector = new FileSelector("*", this, "FileSelector"); + _fileSelector->setCloseVisible(false); + _fileSelector->setNewVisible(false); - layout->addMultiCellWidget(fileSelector, 0, 0, 0, 1); + layout->addMultiCellWidget(_fileSelector, 0, 0, 0, 1); QPushButton *attachButton = new QPushButton(this); attachButton->setText(tr("Ok")); attachButton->setIconSet(Resource::loadPixmap("enter")); layout->addWidget(attachButton, 1, 0); @@ -34,38 +35,34 @@ AttachDiag::AttachDiag(QWidget* parent = 0, const char* name = 0, bool modal, WF QPushButton *cancelButton = new QPushButton(this); cancelButton->setText(tr("Cancel")); cancelButton->setIconSet(Resource::loadPixmap("editdelete")); layout->addWidget(cancelButton, 1, 1); - connect(fileSelector, SIGNAL(fileSelected(const DocLnk &)), SLOT(fileSelected(const DocLnk &))); connect(attachButton, SIGNAL(clicked()), SLOT(accept())); connect(cancelButton, SIGNAL(clicked()), SLOT(close())); - if (fileSelector->selected() != NULL) - currentFile = *fileSelector->selected(); - - if (fileSelector->fileCount() == 0) { + if (_fileSelector->fileCount() == 0) { attachButton->setEnabled(false); - fileSelector->setEnabled(false); + _fileSelector->setEnabled(false); } } -void AttachDiag::fileSelected(const DocLnk &file) +DocLnk AttachDiag::selectedFile() { - currentFile = file; + return *_fileSelector->selected(); } DocLnk AttachDiag::getFile(QWidget *parent) { AttachDiag attach(parent, 0, true); attach.showMaximized(); attach.show(); if (QDialog::Accepted == attach.exec()) { - return attach.currentFile; + return attach.selectedFile(); } return DocLnk(); } |