summaryrefslogtreecommitdiff
authorgroucho <groucho>2003-04-13 10:29:05 (UTC)
committer groucho <groucho>2003-04-13 10:29:05 (UTC)
commit8cc217bed9c122a7c7448e2cd59bfde330dfcfad (patch) (side-by-side diff)
treef802c03bbddf54ecc541ce23bdc43da0fc8b390b
parent64d6b3e723b9b2fc3b1f3eea6da6344c5f26ce1e (diff)
downloadopie-8cc217bed9c122a7c7448e2cd59bfde330dfcfad.zip
opie-8cc217bed9c122a7c7448e2cd59bfde330dfcfad.tar.gz
opie-8cc217bed9c122a7c7448e2cd59bfde330dfcfad.tar.bz2
- Uses mime types for attachment reading
- Addresses are read from ocontactacess
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/mailit/addatt.cpp32
-rw-r--r--noncore/net/mailit/addatt.h8
-rw-r--r--noncore/net/mailit/addresslist.cpp20
-rw-r--r--noncore/net/mailit/emailclient.cpp2
-rw-r--r--noncore/net/mailit/mailitwindow.cpp4
-rw-r--r--noncore/net/mailit/viewatt.cpp13
-rw-r--r--noncore/net/mailit/writemail.cpp5
-rw-r--r--noncore/unsupported/mailit/addatt.cpp32
-rw-r--r--noncore/unsupported/mailit/addatt.h8
-rw-r--r--noncore/unsupported/mailit/addresslist.cpp20
-rw-r--r--noncore/unsupported/mailit/emailclient.cpp2
-rw-r--r--noncore/unsupported/mailit/mailitwindow.cpp4
-rw-r--r--noncore/unsupported/mailit/viewatt.cpp13
-rw-r--r--noncore/unsupported/mailit/writemail.cpp5
14 files changed, 106 insertions, 62 deletions
diff --git a/noncore/net/mailit/addatt.cpp b/noncore/net/mailit/addatt.cpp
index f279f52..c8be865 100644
--- a/noncore/net/mailit/addatt.cpp
+++ b/noncore/net/mailit/addatt.cpp
@@ -18,6 +18,7 @@
**
**********************************************************************/
#include <qlayout.h>
+#include <qhbox.h>
#include <qdir.h>
#include <qstringlist.h>
#include "resource.h"
@@ -57,12 +58,12 @@ AddAtt::AddAtt(QWidget *parent, const char *name, WFlags f)
{
setCaption("Adding attatchments");
- QGridLayout *top = new QGridLayout(this, 3,1 );
-
+ QGridLayout *top = new QGridLayout(this, 1,1 );
+ QHBox *buttons=new QHBox(this);
/*fileCategoryButton = new QPushButton(this);*/
- attatchButton = new QPushButton("Attatch ->", this);
- removeButton = new QPushButton("Remove", this);
+ attatchButton = new QPushButton("Attatch ->", buttons);
+ removeButton = new QPushButton("Remove", buttons);
/*fileCategories = new QPopupMenu(fileCategoryButton);
fileCategoryButton->setPopup(fileCategories);
@@ -75,14 +76,13 @@ AddAtt::AddAtt(QWidget *parent, const char *name, WFlags f)
fileCategoryButton->setText("Document");
top->addWidget(fileCategoryButton, 0, 0);*/
- //ofs=new OFileSelector(this,2,0,"/root/Documents");
-
- top->addWidget(attatchButton,1,0);
- top->addWidget(removeButton,2,0);
+ top->addWidget(buttons,1,0);
+ //buttons->addWidget(attatchButton,0,0);
+ //buttons->addWidget(removeButton,0,1);
- /*connect(fileCategories, SIGNAL(activated(int)), this,
- SLOT(fileCategorySelected(int)) );*/
+ //connect(fileCategories, SIGNAL(activated(int)), this,
+ // SLOT(fileCategorySelected(int)) );*/
connect(attatchButton, SIGNAL(clicked()), this,
SLOT(addAttatchment()) );
connect(removeButton, SIGNAL(clicked()), this,
@@ -123,17 +123,11 @@ void AddAtt::clear()
void AddAtt::addAttatchment()
{
- QDialog qd(this,tr("Select attachment"),true);
-
- QGridLayout top(&qd,1,1);
-
- OFileSelector ofs(&qd,1,0,"/root/Documents");
-
- top.addWidget(&ofs,0,0);
+ OFileDialog ofs("Attachments",this,0,0,"/root/Documents");
- qd.showMaximized();
+ ofs.showMaximized();
- if (qd.exec()==QDialog::Accepted)
+ if (ofs.exec()==QDialog::Accepted)
{
DocLnk* dl=new DocLnk(ofs.selectedDocument());
FileItem* fi=new FileItem(attView,dl);
diff --git a/noncore/net/mailit/addatt.h b/noncore/net/mailit/addatt.h
index 73062e2..fcf3279 100644
--- a/noncore/net/mailit/addatt.h
+++ b/noncore/net/mailit/addatt.h
@@ -27,7 +27,7 @@
#include <qstring.h>
#include <qfileinfo.h>
#include <qstringlist.h>
-#include <opie/ofileselector.h>
+#include <opie/ofiledialog.h>
#include <qpe/applnk.h>
class FileItem : public QListViewItem
@@ -65,12 +65,12 @@ public slots:
private:
FileItem* item;
QListView *attView;
- QPushButton *fileCategoryButton, *attatchButton, *removeButton;
+ QPushButton *attatchButton, *removeButton;
QPopupMenu *fileCategories;
bool modified;
- QFileInfo *fi;
+ //QFileInfo *fi;
- OFileSelector* ofs;
+ OFileDialog* ofs;
};
#endif
diff --git a/noncore/net/mailit/addresslist.cpp b/noncore/net/mailit/addresslist.cpp
index 1cf2562..43e3830 100644
--- a/noncore/net/mailit/addresslist.cpp
+++ b/noncore/net/mailit/addresslist.cpp
@@ -19,6 +19,8 @@
**********************************************************************/
#include <qfile.h>
#include <qtextstream.h>
+#include <opie/ocontactaccess.h>
+#include <opie/ocontact.h>
#include "addresslist.h"
@@ -116,10 +118,22 @@ QList<Contact>* AddressList::getContactList()
void AddressList::read()
{
- QFile f(filename);
+ OContactAccess::List::Iterator it;
+
+ //QFile f(filename);
QString lineEmail, lineName, email, name;
+ OContactAccess m_contactdb("mailit");
+ OContactAccess::List m_list = m_contactdb.sorted( true, 0, 0, 0 );
+ //OContact* oc;
+
+ for ( it = m_list.begin(); it != m_list.end(); ++it )
+ {
+ //oc=(OContact*) it;
+ if ((*it).defaultEmail().length()!=0)
+ addContact((*it).defaultEmail(),(*it).fullName());
+ }
- if (! f.open(IO_ReadOnly) )
+ /*if (! f.open(IO_ReadOnly) )
return;
QTextStream stream(&f);
@@ -134,7 +148,7 @@ void AddressList::read()
name = getRightString(lineName);
addContact(email, name);
}
- f.close();
+ f.close();*/
}
QString AddressList::getRightString(QString in)
diff --git a/noncore/net/mailit/emailclient.cpp b/noncore/net/mailit/emailclient.cpp
index 9258aac..2943986 100644
--- a/noncore/net/mailit/emailclient.cpp
+++ b/noncore/net/mailit/emailclient.cpp
@@ -148,7 +148,7 @@ void EmailClient::init()
getMailButton->addTo(bar);
getMailButton->addTo(mail);
- sendMailButton = new QAction(tr("Send mail"), Resource::loadPixmap("mailit/sendmail"), QString::null, 0, this, 0);
+ sendMailButton = new QAction(tr("Send mail"), Resource::loadPixmap("mailit/sendqueue"), QString::null, 0, this, 0);
connect(sendMailButton, SIGNAL(activated()), this, SLOT(sendQuedMail()) );
sendMailButton->addTo(bar);
sendMailButton->addTo(mail);
diff --git a/noncore/net/mailit/mailitwindow.cpp b/noncore/net/mailit/mailitwindow.cpp
index f9b6de2..fd49c1f 100644
--- a/noncore/net/mailit/mailitwindow.cpp
+++ b/noncore/net/mailit/mailitwindow.cpp
@@ -27,9 +27,11 @@ MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags fl)
views = new QWidgetStack(this);
setCentralWidget(views);
+ qWarning("***Starting writeMail");
emailClient = new EmailClient(views, "client");
writeMail = new WriteMail(views, "writing");
readMail = new ReadMail(views, "reading");
+ qWarning("***Finished readMail");
views->raiseWidget(emailClient);
@@ -57,6 +59,8 @@ MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags fl)
connect(emailClient, SIGNAL(newCaption(const QString &)),
this, SLOT(updateCaption(const QString &)) );
viewingMail = FALSE;
+
+ qWarning("***Finished MailitWindow");
}
MailItWindow::~MailItWindow()
diff --git a/noncore/net/mailit/viewatt.cpp b/noncore/net/mailit/viewatt.cpp
index 86f119f..b6f5015 100644
--- a/noncore/net/mailit/viewatt.cpp
+++ b/noncore/net/mailit/viewatt.cpp
@@ -20,6 +20,7 @@
#include "resource.h"
#include "viewatt.h"
#include <qpe/applnk.h>
+#include <qpe/mimetype.h>
ViewAtt::ViewAtt(QWidget *parent, const char *name, WFlags f)
: QMainWindow(parent, name, f)
@@ -43,6 +44,8 @@ void ViewAtt::update(Email *mailIn, bool inbox)
QListViewItem *item;
Enclosure *ePtr;
+
+
listView->clear();
if (inbox) {
bar->clear();
@@ -60,10 +63,16 @@ void ViewAtt::update(Email *mailIn, bool inbox)
isInstalled = "Yes";
item = new QListViewItem(listView, ePtr->originalName, ePtr->contentType, isInstalled);
+ const QString& mtypeDef=(const QString&) ePtr->contentType+"/"+ePtr->contentAttribute;
+
+ MimeType mt(mtypeDef);
+
+ item->setPixmap(0, mt.pixmap());
+
+ /*
if (ePtr->contentType == "TEXT") {
actions = new QAction( tr("View"), Resource::loadPixmap("TextEditor"), QString::null, CTRL + Key_C, this, 0);
actions->addTo(bar);
- item->setPixmap(0, Resource::loadPixmap("txt"));
}
if (ePtr->contentType == "AUDIO") {
actions = new QAction( tr("Play"), Resource::loadPixmap("SoundPlayer"), QString::null, CTRL + Key_C, this, 0);
@@ -74,7 +83,7 @@ void ViewAtt::update(Email *mailIn, bool inbox)
actions = new QAction( tr("Show"), Resource::loadPixmap("pixmap"), QString::null, CTRL + Key_C, this, 0);
actions->addTo(bar);
item->setPixmap(0, Resource::loadPixmap("pixmap"));
- }
+ }*/
}
}
diff --git a/noncore/net/mailit/writemail.cpp b/noncore/net/mailit/writemail.cpp
index 70332a9..a45cfd2 100644
--- a/noncore/net/mailit/writemail.cpp
+++ b/noncore/net/mailit/writemail.cpp
@@ -45,7 +45,7 @@ void WriteMail::setAddressList(AddressList *list)
QList<Contact> *cListPtr = addressList->getContactList();
QListViewItem *item;
for (cPtr = cListPtr->first(); cPtr != 0; cPtr = cListPtr->next() ) {
- item = new QListViewItem(addressView, cPtr->email, cPtr->name);
+ item = new QListViewItem(addressView, cPtr->name, cPtr->email);
}
}
@@ -111,9 +111,10 @@ void WriteMail::init()
emailInput = new QMultiLineEdit( widget, "emailInput" );
grid->addMultiCellWidget( emailInput, 2, 2, 0, 2);
+
addressView = new QListView( widget, "addressView");
- addressView->addColumn("Email");
addressView->addColumn("Name");
+ addressView->addColumn("EMail");
addressView->setAllColumnsShowFocus(TRUE);
addressView->setMultiSelection(TRUE);
addressView->hide();
diff --git a/noncore/unsupported/mailit/addatt.cpp b/noncore/unsupported/mailit/addatt.cpp
index f279f52..c8be865 100644
--- a/noncore/unsupported/mailit/addatt.cpp
+++ b/noncore/unsupported/mailit/addatt.cpp
@@ -18,6 +18,7 @@
**
**********************************************************************/
#include <qlayout.h>
+#include <qhbox.h>
#include <qdir.h>
#include <qstringlist.h>
#include "resource.h"
@@ -57,12 +58,12 @@ AddAtt::AddAtt(QWidget *parent, const char *name, WFlags f)
{
setCaption("Adding attatchments");
- QGridLayout *top = new QGridLayout(this, 3,1 );
-
+ QGridLayout *top = new QGridLayout(this, 1,1 );
+ QHBox *buttons=new QHBox(this);
/*fileCategoryButton = new QPushButton(this);*/
- attatchButton = new QPushButton("Attatch ->", this);
- removeButton = new QPushButton("Remove", this);
+ attatchButton = new QPushButton("Attatch ->", buttons);
+ removeButton = new QPushButton("Remove", buttons);
/*fileCategories = new QPopupMenu(fileCategoryButton);
fileCategoryButton->setPopup(fileCategories);
@@ -75,14 +76,13 @@ AddAtt::AddAtt(QWidget *parent, const char *name, WFlags f)
fileCategoryButton->setText("Document");
top->addWidget(fileCategoryButton, 0, 0);*/
- //ofs=new OFileSelector(this,2,0,"/root/Documents");
-
- top->addWidget(attatchButton,1,0);
- top->addWidget(removeButton,2,0);
+ top->addWidget(buttons,1,0);
+ //buttons->addWidget(attatchButton,0,0);
+ //buttons->addWidget(removeButton,0,1);
- /*connect(fileCategories, SIGNAL(activated(int)), this,
- SLOT(fileCategorySelected(int)) );*/
+ //connect(fileCategories, SIGNAL(activated(int)), this,
+ // SLOT(fileCategorySelected(int)) );*/
connect(attatchButton, SIGNAL(clicked()), this,
SLOT(addAttatchment()) );
connect(removeButton, SIGNAL(clicked()), this,
@@ -123,17 +123,11 @@ void AddAtt::clear()
void AddAtt::addAttatchment()
{
- QDialog qd(this,tr("Select attachment"),true);
-
- QGridLayout top(&qd,1,1);
-
- OFileSelector ofs(&qd,1,0,"/root/Documents");
-
- top.addWidget(&ofs,0,0);
+ OFileDialog ofs("Attachments",this,0,0,"/root/Documents");
- qd.showMaximized();
+ ofs.showMaximized();
- if (qd.exec()==QDialog::Accepted)
+ if (ofs.exec()==QDialog::Accepted)
{
DocLnk* dl=new DocLnk(ofs.selectedDocument());
FileItem* fi=new FileItem(attView,dl);
diff --git a/noncore/unsupported/mailit/addatt.h b/noncore/unsupported/mailit/addatt.h
index 73062e2..fcf3279 100644
--- a/noncore/unsupported/mailit/addatt.h
+++ b/noncore/unsupported/mailit/addatt.h
@@ -27,7 +27,7 @@
#include <qstring.h>
#include <qfileinfo.h>
#include <qstringlist.h>
-#include <opie/ofileselector.h>
+#include <opie/ofiledialog.h>
#include <qpe/applnk.h>
class FileItem : public QListViewItem
@@ -65,12 +65,12 @@ public slots:
private:
FileItem* item;
QListView *attView;
- QPushButton *fileCategoryButton, *attatchButton, *removeButton;
+ QPushButton *attatchButton, *removeButton;
QPopupMenu *fileCategories;
bool modified;
- QFileInfo *fi;
+ //QFileInfo *fi;
- OFileSelector* ofs;
+ OFileDialog* ofs;
};
#endif
diff --git a/noncore/unsupported/mailit/addresslist.cpp b/noncore/unsupported/mailit/addresslist.cpp
index 1cf2562..43e3830 100644
--- a/noncore/unsupported/mailit/addresslist.cpp
+++ b/noncore/unsupported/mailit/addresslist.cpp
@@ -19,6 +19,8 @@
**********************************************************************/
#include <qfile.h>
#include <qtextstream.h>
+#include <opie/ocontactaccess.h>
+#include <opie/ocontact.h>
#include "addresslist.h"
@@ -116,10 +118,22 @@ QList<Contact>* AddressList::getContactList()
void AddressList::read()
{
- QFile f(filename);
+ OContactAccess::List::Iterator it;
+
+ //QFile f(filename);
QString lineEmail, lineName, email, name;
+ OContactAccess m_contactdb("mailit");
+ OContactAccess::List m_list = m_contactdb.sorted( true, 0, 0, 0 );
+ //OContact* oc;
+
+ for ( it = m_list.begin(); it != m_list.end(); ++it )
+ {
+ //oc=(OContact*) it;
+ if ((*it).defaultEmail().length()!=0)
+ addContact((*it).defaultEmail(),(*it).fullName());
+ }
- if (! f.open(IO_ReadOnly) )
+ /*if (! f.open(IO_ReadOnly) )
return;
QTextStream stream(&f);
@@ -134,7 +148,7 @@ void AddressList::read()
name = getRightString(lineName);
addContact(email, name);
}
- f.close();
+ f.close();*/
}
QString AddressList::getRightString(QString in)
diff --git a/noncore/unsupported/mailit/emailclient.cpp b/noncore/unsupported/mailit/emailclient.cpp
index 9258aac..2943986 100644
--- a/noncore/unsupported/mailit/emailclient.cpp
+++ b/noncore/unsupported/mailit/emailclient.cpp
@@ -148,7 +148,7 @@ void EmailClient::init()
getMailButton->addTo(bar);
getMailButton->addTo(mail);
- sendMailButton = new QAction(tr("Send mail"), Resource::loadPixmap("mailit/sendmail"), QString::null, 0, this, 0);
+ sendMailButton = new QAction(tr("Send mail"), Resource::loadPixmap("mailit/sendqueue"), QString::null, 0, this, 0);
connect(sendMailButton, SIGNAL(activated()), this, SLOT(sendQuedMail()) );
sendMailButton->addTo(bar);
sendMailButton->addTo(mail);
diff --git a/noncore/unsupported/mailit/mailitwindow.cpp b/noncore/unsupported/mailit/mailitwindow.cpp
index f9b6de2..fd49c1f 100644
--- a/noncore/unsupported/mailit/mailitwindow.cpp
+++ b/noncore/unsupported/mailit/mailitwindow.cpp
@@ -27,9 +27,11 @@ MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags fl)
views = new QWidgetStack(this);
setCentralWidget(views);
+ qWarning("***Starting writeMail");
emailClient = new EmailClient(views, "client");
writeMail = new WriteMail(views, "writing");
readMail = new ReadMail(views, "reading");
+ qWarning("***Finished readMail");
views->raiseWidget(emailClient);
@@ -57,6 +59,8 @@ MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags fl)
connect(emailClient, SIGNAL(newCaption(const QString &)),
this, SLOT(updateCaption(const QString &)) );
viewingMail = FALSE;
+
+ qWarning("***Finished MailitWindow");
}
MailItWindow::~MailItWindow()
diff --git a/noncore/unsupported/mailit/viewatt.cpp b/noncore/unsupported/mailit/viewatt.cpp
index 86f119f..b6f5015 100644
--- a/noncore/unsupported/mailit/viewatt.cpp
+++ b/noncore/unsupported/mailit/viewatt.cpp
@@ -20,6 +20,7 @@
#include "resource.h"
#include "viewatt.h"
#include <qpe/applnk.h>
+#include <qpe/mimetype.h>
ViewAtt::ViewAtt(QWidget *parent, const char *name, WFlags f)
: QMainWindow(parent, name, f)
@@ -43,6 +44,8 @@ void ViewAtt::update(Email *mailIn, bool inbox)
QListViewItem *item;
Enclosure *ePtr;
+
+
listView->clear();
if (inbox) {
bar->clear();
@@ -60,10 +63,16 @@ void ViewAtt::update(Email *mailIn, bool inbox)
isInstalled = "Yes";
item = new QListViewItem(listView, ePtr->originalName, ePtr->contentType, isInstalled);
+ const QString& mtypeDef=(const QString&) ePtr->contentType+"/"+ePtr->contentAttribute;
+
+ MimeType mt(mtypeDef);
+
+ item->setPixmap(0, mt.pixmap());
+
+ /*
if (ePtr->contentType == "TEXT") {
actions = new QAction( tr("View"), Resource::loadPixmap("TextEditor"), QString::null, CTRL + Key_C, this, 0);
actions->addTo(bar);
- item->setPixmap(0, Resource::loadPixmap("txt"));
}
if (ePtr->contentType == "AUDIO") {
actions = new QAction( tr("Play"), Resource::loadPixmap("SoundPlayer"), QString::null, CTRL + Key_C, this, 0);
@@ -74,7 +83,7 @@ void ViewAtt::update(Email *mailIn, bool inbox)
actions = new QAction( tr("Show"), Resource::loadPixmap("pixmap"), QString::null, CTRL + Key_C, this, 0);
actions->addTo(bar);
item->setPixmap(0, Resource::loadPixmap("pixmap"));
- }
+ }*/
}
}
diff --git a/noncore/unsupported/mailit/writemail.cpp b/noncore/unsupported/mailit/writemail.cpp
index 70332a9..a45cfd2 100644
--- a/noncore/unsupported/mailit/writemail.cpp
+++ b/noncore/unsupported/mailit/writemail.cpp
@@ -45,7 +45,7 @@ void WriteMail::setAddressList(AddressList *list)
QList<Contact> *cListPtr = addressList->getContactList();
QListViewItem *item;
for (cPtr = cListPtr->first(); cPtr != 0; cPtr = cListPtr->next() ) {
- item = new QListViewItem(addressView, cPtr->email, cPtr->name);
+ item = new QListViewItem(addressView, cPtr->name, cPtr->email);
}
}
@@ -111,9 +111,10 @@ void WriteMail::init()
emailInput = new QMultiLineEdit( widget, "emailInput" );
grid->addMultiCellWidget( emailInput, 2, 2, 0, 2);
+
addressView = new QListView( widget, "addressView");
- addressView->addColumn("Email");
addressView->addColumn("Name");
+ addressView->addColumn("EMail");
addressView->setAllColumnsShowFocus(TRUE);
addressView->setMultiSelection(TRUE);
addressView->hide();