summaryrefslogtreecommitdiff
Unidiff
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
@@ -6,20 +6,22 @@
6#include <qaction.h> 6#include <qaction.h>
7#include <qtimer.h> 7#include <qtimer.h>
8#include <qlabel.h> 8#include <qlabel.h>
9#include <qapplication.h> 9#include <qapplication.h>
10 10
11#include <qpe/resource.h> 11#include <qpe/resource.h>
12#include <qpe/config.h> 12#include <qpe/config.h>
13 13
14#include <opie/ofiledialog.h>
15//#include "attachdiag.h"
16
14#include "addresspicker.h" 17#include "addresspicker.h"
15#include "listviewplus.h" 18#include "listviewplus.h"
16#include "smtphandler.h" 19#include "smtphandler.h"
17#include "attachdiag.h"
18#include "composer.h" 20#include "composer.h"
19#include "rename.h" 21#include "rename.h"
20 22
21AttachViewItem::AttachViewItem(QListView *parent, Attachment &attachment) 23AttachViewItem::AttachViewItem(QListView *parent, Attachment &attachment)
22 : QListViewItem(parent), _attachment(attachment) 24 : QListViewItem(parent), _attachment(attachment)
23{ 25{
24 setPixmap(0, _attachment.docLnk().pixmap().isNull() ? Resource::loadPixmap("UnknownDocument-14") : _attachment.docLnk().pixmap()); 26 setPixmap(0, _attachment.docLnk().pixmap().isNull() ? Resource::loadPixmap("UnknownDocument-14") : _attachment.docLnk().pixmap());
25 setText(0, _attachment.newName().isEmpty() ? _attachment.fileName() : _attachment.newName()); 27 setText(0, _attachment.newName().isEmpty() ? _attachment.fileName() : _attachment.newName());
@@ -389,17 +391,18 @@ void Composer::slotOpenAddressPicker()
389 } else { 391 } else {
390 bcc->setText(bcc->text() + ", " + AddressPicker::getNames()); 392 bcc->setText(bcc->text() + ", " + AddressPicker::getNames());
391 } 393 }
392 } 394 }
393} 395}
394 396
395void Composer::slotAddAttach() 397void Composer::slotAddAttach()
396{ 398{
397 DocLnk lnk = AttachDiag::getFile(this); 399 DocLnk lnk = OFileDialog::getOpenFileName( 1,"/");
400 //DocLnk lnk = AttachDiag::getFile(this);
398 if (lnk.name().isEmpty()) return; 401 if (lnk.name().isEmpty()) return;
399 402
400 Attachment attachment; 403 Attachment attachment;
401 attachment.setFileName(lnk.file()); 404 attachment.setFileName(lnk.file());
402 attachment.setNewName(lnk.name()); 405 attachment.setNewName(lnk.name());
403 attachment.setDocLnk(lnk); 406 attachment.setDocLnk(lnk);
404 407
405 (void) new AttachViewItem(attachView, attachment); 408 (void) new AttachViewItem(attachView, attachment);
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
@@ -36,11 +36,11 @@ SOURCES = accounteditor.cpp \
36 viewmailbase.cpp 36 viewmailbase.cpp
37 INTERFACES = accounteditorbase.ui \ 37 INTERFACES = accounteditorbase.ui \
38 addresspickerbase.ui \ 38 addresspickerbase.ui \
39 configdiagbase.ui \ 39 configdiagbase.ui \
40 opendiagbase.ui \ 40 opendiagbase.ui \
41 renamebase.ui \ 41 renamebase.ui \
42 searchdiagbase.ui 42 searchdiagbase.ui
43 INCLUDEPATH += $(OPIEDIR)/include libmail 43 INCLUDEPATH += $(OPIEDIR)/include libmail
44 LIBS += -lmail -lqpe 44 LIBS += -lmail -lqpe -lopie
45 TARGET = mail 45 TARGET = mail
46 DESTDIR = $(OPIEDIR)/bin 46 DESTDIR = $(OPIEDIR)/bin