- Uses mime types for attachment reading

- Addresses are read from ocontactacess

7 files changed, 55 insertions, 33 deletions

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
@@ -15,12 +15,13 @@
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include <qlayout.h>
+#include <qhbox.h>
 #include <qdir.h>
 #include <qstringlist.h>
 #include "resource.h"
 #include "addatt.h"
 
 FileItem::FileItem(QListView *parent, DocLnk* dl)
@@ -54,38 +55,37 @@ FileItem::~FileItem()
 
 AddAtt::AddAtt(QWidget *parent, const char *name, WFlags f)
 	: QDialog(parent, name, 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);
 	fileCategories->insertItem("Document");
 	fileCategories->insertItem("Picture");
 	fileCategories->insertItem("Sound");
 	fileCategories->insertItem("Movie");
 	fileCategories->insertItem("File");
 
 	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);
 
-	/*connect(fileCategories, SIGNAL(activated(int)), this,
-    		SLOT(fileCategorySelected(int)) );*/
+	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(attatchButton, SIGNAL(clicked()), this,
 		SLOT(addAttatchment()) );
 	connect(removeButton, SIGNAL(clicked()), this,
 		SLOT(removeAttatchment()) );
 	
 	/*listView = new QListView(this, "AttView");
@@ -120,23 +120,17 @@ void AddAtt::clear()
 	fileCategoryButton->setText(fileCategories->text(id));
 	getFiles();
 }*/
 
 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);
 		fi->setPixmap(0,dl->pixmap());
 		fi->setText(1,dl->type());
 		attView->insertItem(fi);
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
@@ -24,13 +24,13 @@
 #include <qlistview.h>
 #include <qpushbutton.h>
 #include <qpopupmenu.h>
 #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
 {
 public:
 	//FileItem(QListView *parent, QFileInfo fileInfo, QString fileType);
@@ -62,15 +62,15 @@ public slots:
 	void reject();
 	void accept();
 	
 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
@@ -16,12 +16,14 @@
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include <qfile.h>
 #include <qtextstream.h>
+#include <opie/ocontactaccess.h>
+#include <opie/ocontact.h>
 
 #include "addresslist.h"
 
 AddressList::AddressList(QString file)
 {
 	addresses.setAutoDelete(TRUE);
@@ -113,16 +115,28 @@ QList<Contact>* AddressList::getContactList()
 {
 	return &addresses;
 }
 
 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;
 	
-	if (! f.open(IO_ReadOnly) )
+	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) )
 		return;
 	
 	QTextStream stream(&f);
 	
 	while (! stream.atEnd() ) {
 		lineEmail = stream.readLine();
@@ -131,13 +145,13 @@ void AddressList::read()
 		else return;
 		
 		email = getRightString(lineEmail);
 		name = getRightString(lineName);
 		addContact(email, name);
 	}
-	f.close();
+	f.close();*/
 }
 
 QString AddressList::getRightString(QString in)
 {
 	QString out = "";
 	
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
@@ -145,13 +145,13 @@ void EmailClient::init()
 
   getMailButton = new QAction(tr("Get all mail"), Resource::loadPixmap("mailit/getmail"), QString::null, 0, this, 0);
   connect(getMailButton, SIGNAL(activated()), this, SLOT(getAllNewMail()) );
   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);
     
   composeButton = new QAction(tr("Compose"), Resource::loadPixmap("new"), QString::null, 0, this, 0);
   connect(composeButton, SIGNAL(activated()), this, SLOT(compose()) );
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
@@ -24,15 +24,17 @@ MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags fl)
 {
   currentCaption = "Mailit";
   setCaption(tr(currentCaption));
   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);
                         
   connect(emailClient, SIGNAL(composeRequested()),
     this, SLOT(compose()) );
   connect(emailClient, SIGNAL(viewEmail(QListView *, Email *)), this,
@@ -54,12 +56,14 @@ MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags fl)
   connect(readMail, SIGNAL(viewingMail(Email *)), emailClient,
     SLOT(moveMailFront(Email *)) );
   
   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
@@ -17,12 +17,13 @@
 ** not clear to you.
 **
 **********************************************************************/
 #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)
 {
 	setCaption("Exploring attatchments");
 
@@ -40,12 +41,14 @@ ViewAtt::ViewAtt(QWidget *parent, const char *name, WFlags f)
 
 void ViewAtt::update(Email *mailIn, bool inbox)
 {
 	QListViewItem *item;
 	Enclosure *ePtr;
 	
+
+	
 	listView->clear();
 	if (inbox) {
 		bar->clear();
 		installButton->addTo( bar );
 		bar->show();
 	} else {
@@ -57,27 +60,33 @@ void ViewAtt::update(Email *mailIn, bool inbox)
 		
 		QString isInstalled = "No";
 		if (ePtr->installed)
 			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);
 			actions->addTo(bar);
 			item->setPixmap(0, Resource::loadPixmap("play"));
 		}
 		if (ePtr->contentType == "IMAGE") {
 			actions = new QAction( tr("Show"), Resource::loadPixmap("pixmap"), QString::null, CTRL + Key_C, this, 0);
 			actions->addTo(bar);
 			item->setPixmap(0, Resource::loadPixmap("pixmap"));
-		}
+		}*/
 	}
 }
 
 void ViewAtt::install()
 {
 	Enclosure *ePtr, *selPtr;
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
@@ -42,13 +42,13 @@ void WriteMail::setAddressList(AddressList *list)
 	addressList = list;
 	
 	addressView->clear();
 	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);
 	}
 }
 
 void WriteMail::init()
 {
 	setToolBarsMovable(FALSE);
@@ -107,16 +107,17 @@ void WriteMail::init()
 	addressButton->setToggleButton(TRUE);
 	grid->addWidget( addressButton, 0, 2 );
 	connect(addressButton, SIGNAL(clicked()), this, SLOT(getAddress()) );
 
 	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();
 	grid->addMultiCellWidget( addressView, 3, 3, 0, 2);
 	
 	okButton = new QToolButton(bar, "ok");