author | groucho <groucho> | 2003-04-13 10:29:05 (UTC) |
---|---|---|
committer | groucho <groucho> | 2003-04-13 10:29:05 (UTC) |
commit | 8cc217bed9c122a7c7448e2cd59bfde330dfcfad (patch) (unidiff) | |
tree | f802c03bbddf54ecc541ce23bdc43da0fc8b390b /noncore/net/mailit | |
parent | 64d6b3e723b9b2fc3b1f3eea6da6344c5f26ce1e (diff) | |
download | opie-8cc217bed9c122a7c7448e2cd59bfde330dfcfad.zip opie-8cc217bed9c122a7c7448e2cd59bfde330dfcfad.tar.gz opie-8cc217bed9c122a7c7448e2cd59bfde330dfcfad.tar.bz2 |
- Uses mime types for attachment reading
- Addresses are read from ocontactacess
-rw-r--r-- | noncore/net/mailit/addatt.cpp | 34 | ||||
-rw-r--r-- | noncore/net/mailit/addatt.h | 8 | ||||
-rw-r--r-- | noncore/net/mailit/addresslist.cpp | 20 | ||||
-rw-r--r-- | noncore/net/mailit/emailclient.cpp | 2 | ||||
-rw-r--r-- | noncore/net/mailit/mailitwindow.cpp | 4 | ||||
-rw-r--r-- | noncore/net/mailit/viewatt.cpp | 15 | ||||
-rw-r--r-- | noncore/net/mailit/writemail.cpp | 5 |
7 files changed, 55 insertions, 33 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 | |||
@@ -19,4 +19,5 @@ | |||
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include <qlayout.h> | 20 | #include <qlayout.h> |
21 | #include <qhbox.h> | ||
21 | #include <qdir.h> | 22 | #include <qdir.h> |
22 | #include <qstringlist.h> | 23 | #include <qstringlist.h> |
@@ -58,10 +59,10 @@ AddAtt::AddAtt(QWidget *parent, const char *name, WFlags f) | |||
58 | setCaption("Adding attatchments"); | 59 | setCaption("Adding attatchments"); |
59 | 60 | ||
60 | QGridLayout *top = new QGridLayout(this, 3,1 ); | 61 | QGridLayout *top = new QGridLayout(this, 1,1 ); |
61 | 62 | ||
62 | 63 | QHBox *buttons=new QHBox(this); | |
63 | /*fileCategoryButton = new QPushButton(this);*/ | 64 | /*fileCategoryButton = new QPushButton(this);*/ |
64 | attatchButton = new QPushButton("Attatch ->", this); | 65 | attatchButton = new QPushButton("Attatch ->", buttons); |
65 | removeButton = new QPushButton("Remove", this); | 66 | removeButton = new QPushButton("Remove", buttons); |
66 | 67 | ||
67 | /*fileCategories = new QPopupMenu(fileCategoryButton); | 68 | /*fileCategories = new QPopupMenu(fileCategoryButton); |
@@ -76,12 +77,11 @@ AddAtt::AddAtt(QWidget *parent, const char *name, WFlags f) | |||
76 | top->addWidget(fileCategoryButton, 0, 0);*/ | 77 | top->addWidget(fileCategoryButton, 0, 0);*/ |
77 | 78 | ||
78 | //ofs=new OFileSelector(this,2,0,"/root/Documents"); | ||
79 | |||
80 | |||
81 | top->addWidget(attatchButton,1,0); | ||
82 | top->addWidget(removeButton,2,0); | ||
83 | 79 | ||
84 | /*connect(fileCategories, SIGNAL(activated(int)), this, | 80 | top->addWidget(buttons,1,0); |
85 | SLOT(fileCategorySelected(int)) );*/ | 81 | //buttons->addWidget(attatchButton,0,0); |
82 | //buttons->addWidget(removeButton,0,1); | ||
83 | |||
84 | //connect(fileCategories, SIGNAL(activated(int)), this, | ||
85 | //SLOT(fileCategorySelected(int)) );*/ | ||
86 | connect(attatchButton, SIGNAL(clicked()), this, | 86 | connect(attatchButton, SIGNAL(clicked()), this, |
87 | SLOT(addAttatchment()) ); | 87 | SLOT(addAttatchment()) ); |
@@ -124,15 +124,9 @@ void AddAtt::clear() | |||
124 | void AddAtt::addAttatchment() | 124 | void AddAtt::addAttatchment() |
125 | { | 125 | { |
126 | QDialog qd(this,tr("Select attachment"),true); | 126 | OFileDialog ofs("Attachments",this,0,0,"/root/Documents"); |
127 | |||
128 | QGridLayout top(&qd,1,1); | ||
129 | |||
130 | OFileSelector ofs(&qd,1,0,"/root/Documents"); | ||
131 | |||
132 | top.addWidget(&ofs,0,0); | ||
133 | 127 | ||
134 | qd.showMaximized(); | 128 | ofs.showMaximized(); |
135 | 129 | ||
136 | if (qd.exec()==QDialog::Accepted) | 130 | if (ofs.exec()==QDialog::Accepted) |
137 | { | 131 | { |
138 | DocLnk* dl=new DocLnk(ofs.selectedDocument()); | 132 | DocLnk* dl=new DocLnk(ofs.selectedDocument()); |
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 | |||
@@ -28,5 +28,5 @@ | |||
28 | #include <qfileinfo.h> | 28 | #include <qfileinfo.h> |
29 | #include <qstringlist.h> | 29 | #include <qstringlist.h> |
30 | #include <opie/ofileselector.h> | 30 | #include <opie/ofiledialog.h> |
31 | #include <qpe/applnk.h> | 31 | #include <qpe/applnk.h> |
32 | 32 | ||
@@ -66,10 +66,10 @@ private: | |||
66 | FileItem* item; | 66 | FileItem* item; |
67 | QListView *attView; | 67 | QListView *attView; |
68 | QPushButton *fileCategoryButton, *attatchButton, *removeButton; | 68 | QPushButton *attatchButton, *removeButton; |
69 | QPopupMenu *fileCategories; | 69 | QPopupMenu *fileCategories; |
70 | bool modified; | 70 | bool modified; |
71 | QFileInfo *fi; | 71 | //QFileInfo *fi; |
72 | 72 | ||
73 | OFileSelector* ofs; | 73 | OFileDialog* ofs; |
74 | }; | 74 | }; |
75 | 75 | ||
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 | |||
@@ -20,4 +20,6 @@ | |||
20 | #include <qfile.h> | 20 | #include <qfile.h> |
21 | #include <qtextstream.h> | 21 | #include <qtextstream.h> |
22 | #include <opie/ocontactaccess.h> | ||
23 | #include <opie/ocontact.h> | ||
22 | 24 | ||
23 | #include "addresslist.h" | 25 | #include "addresslist.h" |
@@ -117,8 +119,20 @@ QList<Contact>* AddressList::getContactList() | |||
117 | void AddressList::read() | 119 | void AddressList::read() |
118 | { | 120 | { |
119 | QFile f(filename); | 121 | OContactAccess::List::Iterator it; |
122 | |||
123 | //QFile f(filename); | ||
120 | QString lineEmail, lineName, email, name; | 124 | QString lineEmail, lineName, email, name; |
125 | OContactAccess m_contactdb("mailit"); | ||
126 | OContactAccess::List m_list = m_contactdb.sorted( true, 0, 0, 0 ); | ||
127 | //OContact* oc; | ||
121 | 128 | ||
122 | if (! f.open(IO_ReadOnly) ) | 129 | for ( it = m_list.begin(); it != m_list.end(); ++it ) |
130 | { | ||
131 | //oc=(OContact*) it; | ||
132 | if ((*it).defaultEmail().length()!=0) | ||
133 | addContact((*it).defaultEmail(),(*it).fullName()); | ||
134 | } | ||
135 | |||
136 | /*if (! f.open(IO_ReadOnly) ) | ||
123 | return; | 137 | return; |
124 | 138 | ||
@@ -135,5 +149,5 @@ void AddressList::read() | |||
135 | addContact(email, name); | 149 | addContact(email, name); |
136 | } | 150 | } |
137 | f.close(); | 151 | f.close();*/ |
138 | } | 152 | } |
139 | 153 | ||
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 | |||
@@ -149,5 +149,5 @@ void EmailClient::init() | |||
149 | getMailButton->addTo(mail); | 149 | getMailButton->addTo(mail); |
150 | 150 | ||
151 | sendMailButton = new QAction(tr("Send mail"), Resource::loadPixmap("mailit/sendmail"), QString::null, 0, this, 0); | 151 | sendMailButton = new QAction(tr("Send mail"), Resource::loadPixmap("mailit/sendqueue"), QString::null, 0, this, 0); |
152 | connect(sendMailButton, SIGNAL(activated()), this, SLOT(sendQuedMail()) ); | 152 | connect(sendMailButton, SIGNAL(activated()), this, SLOT(sendQuedMail()) ); |
153 | sendMailButton->addTo(bar); | 153 | sendMailButton->addTo(bar); |
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 | |||
@@ -28,7 +28,9 @@ MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags fl) | |||
28 | setCentralWidget(views); | 28 | setCentralWidget(views); |
29 | 29 | ||
30 | qWarning("***Starting writeMail"); | ||
30 | emailClient = new EmailClient(views, "client"); | 31 | emailClient = new EmailClient(views, "client"); |
31 | writeMail = new WriteMail(views, "writing"); | 32 | writeMail = new WriteMail(views, "writing"); |
32 | readMail = new ReadMail(views, "reading"); | 33 | readMail = new ReadMail(views, "reading"); |
34 | qWarning("***Finished readMail"); | ||
33 | 35 | ||
34 | views->raiseWidget(emailClient); | 36 | views->raiseWidget(emailClient); |
@@ -58,4 +60,6 @@ MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags fl) | |||
58 | this, SLOT(updateCaption(const QString &)) ); | 60 | this, SLOT(updateCaption(const QString &)) ); |
59 | viewingMail = FALSE; | 61 | viewingMail = FALSE; |
62 | |||
63 | qWarning("***Finished MailitWindow"); | ||
60 | } | 64 | } |
61 | 65 | ||
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 | |||
@@ -21,4 +21,5 @@ | |||
21 | #include "viewatt.h" | 21 | #include "viewatt.h" |
22 | #include <qpe/applnk.h> | 22 | #include <qpe/applnk.h> |
23 | #include <qpe/mimetype.h> | ||
23 | 24 | ||
24 | ViewAtt::ViewAtt(QWidget *parent, const char *name, WFlags f) | 25 | ViewAtt::ViewAtt(QWidget *parent, const char *name, WFlags f) |
@@ -44,4 +45,6 @@ void ViewAtt::update(Email *mailIn, bool inbox) | |||
44 | Enclosure *ePtr; | 45 | Enclosure *ePtr; |
45 | 46 | ||
47 | |||
48 | |||
46 | listView->clear(); | 49 | listView->clear(); |
47 | if (inbox) { | 50 | if (inbox) { |
@@ -61,9 +64,15 @@ void ViewAtt::update(Email *mailIn, bool inbox) | |||
61 | item = new QListViewItem(listView, ePtr->originalName, ePtr->contentType, isInstalled); | 64 | item = new QListViewItem(listView, ePtr->originalName, ePtr->contentType, isInstalled); |
62 | 65 | ||
66 | const QString& mtypeDef=(const QString&) ePtr->contentType+"/"+ePtr->contentAttribute; | ||
67 | |||
68 | MimeType mt(mtypeDef); | ||
69 | |||
70 | item->setPixmap(0, mt.pixmap()); | ||
71 | |||
72 | /* | ||
63 | if (ePtr->contentType == "TEXT") { | 73 | if (ePtr->contentType == "TEXT") { |
64 | actions = new QAction( tr("View"), Resource::loadPixmap("TextEditor"), QString::null, CTRL + Key_C, this, 0); | 74 | actions = new QAction( tr("View"), Resource::loadPixmap("TextEditor"), QString::null, CTRL + Key_C, this, 0); |
65 | actions->addTo(bar); | 75 | actions->addTo(bar); |
66 | item->setPixmap(0, Resource::loadPixmap("txt")); | 76 | } |
67 | } | ||
68 | if (ePtr->contentType == "AUDIO") { | 77 | if (ePtr->contentType == "AUDIO") { |
69 | actions = new QAction( tr("Play"), Resource::loadPixmap("SoundPlayer"), QString::null, CTRL + Key_C, this, 0); | 78 | actions = new QAction( tr("Play"), Resource::loadPixmap("SoundPlayer"), QString::null, CTRL + Key_C, this, 0); |
@@ -75,5 +84,5 @@ void ViewAtt::update(Email *mailIn, bool inbox) | |||
75 | actions->addTo(bar); | 84 | actions->addTo(bar); |
76 | item->setPixmap(0, Resource::loadPixmap("pixmap")); | 85 | item->setPixmap(0, Resource::loadPixmap("pixmap")); |
77 | } | 86 | }*/ |
78 | } | 87 | } |
79 | } | 88 | } |
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 | |||
@@ -46,5 +46,5 @@ void WriteMail::setAddressList(AddressList *list) | |||
46 | QListViewItem *item; | 46 | QListViewItem *item; |
47 | for (cPtr = cListPtr->first(); cPtr != 0; cPtr = cListPtr->next() ) { | 47 | for (cPtr = cListPtr->first(); cPtr != 0; cPtr = cListPtr->next() ) { |
48 | item = new QListViewItem(addressView, cPtr->email, cPtr->name); | 48 | item = new QListViewItem(addressView, cPtr->name, cPtr->email); |
49 | } | 49 | } |
50 | } | 50 | } |
@@ -111,8 +111,9 @@ void WriteMail::init() | |||
111 | emailInput = new QMultiLineEdit( widget, "emailInput" ); | 111 | emailInput = new QMultiLineEdit( widget, "emailInput" ); |
112 | grid->addMultiCellWidget( emailInput, 2, 2, 0, 2); | 112 | grid->addMultiCellWidget( emailInput, 2, 2, 0, 2); |
113 | |||
113 | 114 | ||
114 | addressView = new QListView( widget, "addressView"); | 115 | addressView = new QListView( widget, "addressView"); |
115 | addressView->addColumn("Email"); | ||
116 | addressView->addColumn("Name"); | 116 | addressView->addColumn("Name"); |
117 | addressView->addColumn("EMail"); | ||
117 | addressView->setAllColumnsShowFocus(TRUE); | 118 | addressView->setAllColumnsShowFocus(TRUE); |
118 | addressView->setMultiSelection(TRUE); | 119 | addressView->setMultiSelection(TRUE); |