summaryrefslogtreecommitdiff
authortille <tille>2002-06-19 12:41:33 (UTC)
committer tille <tille>2002-06-19 12:41:33 (UTC)
commit2bcd7302e4e156ad5f389b23c01a690917abee01 (patch) (side-by-side diff)
tree25770523cbb36e7152f8a3a4c1650afab6fc45da
parentb55f69a46fd27ce26235029f702c0f3942fde68c (diff)
downloadopie-2bcd7302e4e156ad5f389b23c01a690917abee01.zip
opie-2bcd7302e4e156ad5f389b23c01a690917abee01.tar.gz
opie-2bcd7302e4e156ad5f389b23c01a690917abee01.tar.bz2
added ofiledialog for attachments, but did not yet remove attachdiag
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/unsupported/mail2/composer.cpp7
-rw-r--r--noncore/unsupported/mail2/mail.pro2
2 files changed, 6 insertions, 3 deletions
diff --git a/noncore/unsupported/mail2/composer.cpp b/noncore/unsupported/mail2/composer.cpp
index 72a7242..03dacae 100644
--- a/noncore/unsupported/mail2/composer.cpp
+++ b/noncore/unsupported/mail2/composer.cpp
@@ -2,28 +2,30 @@
#include <qmessagebox.h>
#include <qpopupmenu.h>
#include <qcombobox.h>
#include <qlineedit.h>
#include <qaction.h>
#include <qtimer.h>
#include <qlabel.h>
#include <qapplication.h>
#include <qpe/resource.h>
#include <qpe/config.h>
+#include <opie/ofiledialog.h>
+//#include "attachdiag.h"
+
#include "addresspicker.h"
#include "listviewplus.h"
#include "smtphandler.h"
-#include "attachdiag.h"
#include "composer.h"
#include "rename.h"
AttachViewItem::AttachViewItem(QListView *parent, Attachment &attachment)
: QListViewItem(parent), _attachment(attachment)
{
setPixmap(0, _attachment.docLnk().pixmap().isNull() ? Resource::loadPixmap("UnknownDocument-14") : _attachment.docLnk().pixmap());
setText(0, _attachment.newName().isEmpty() ? _attachment.fileName() : _attachment.newName());
setText(1, _attachment.description());
}
Composer::Composer(QWidget *parent, const char *name, WFlags fl, bool sendQueue)
@@ -385,25 +387,26 @@ void Composer::slotOpenAddressPicker()
}
} else if (to->isHidden() && cc->isHidden() && !bcc->isHidden()) {
if (bcc->text().isEmpty()) {
bcc->setText(AddressPicker::getNames());
} else {
bcc->setText(bcc->text() + ", " + AddressPicker::getNames());
}
}
}
void Composer::slotAddAttach()
{
- DocLnk lnk = AttachDiag::getFile(this);
+ DocLnk lnk = OFileDialog::getOpenFileName( 1,"/");
+// DocLnk lnk = AttachDiag::getFile(this);
if (lnk.name().isEmpty()) return;
Attachment attachment;
attachment.setFileName(lnk.file());
attachment.setNewName(lnk.name());
attachment.setDocLnk(lnk);
(void) new AttachViewItem(attachView, attachment);
}
void Composer::slotDelAttach()
{
diff --git a/noncore/unsupported/mail2/mail.pro b/noncore/unsupported/mail2/mail.pro
index 76b7996..cd21d4a 100644
--- a/noncore/unsupported/mail2/mail.pro
+++ b/noncore/unsupported/mail2/mail.pro
@@ -32,15 +32,15 @@ SOURCES = accounteditor.cpp \
opendiag.cpp \
rename.cpp \
searchdiag.cpp \
viewmail.cpp \
viewmailbase.cpp
INTERFACES = accounteditorbase.ui \
addresspickerbase.ui \
configdiagbase.ui \
opendiagbase.ui \
renamebase.ui \
searchdiagbase.ui
INCLUDEPATH += $(OPIEDIR)/include libmail
-LIBS += -lmail -lqpe
+LIBS += -lmail -lqpe -lopie
TARGET = mail
DESTDIR = $(OPIEDIR)/bin