-rw-r--r-- | noncore/unsupported/mailit/addatt.cpp | 34 | ||||
-rw-r--r-- | noncore/unsupported/mailit/addatt.h | 8 | ||||
-rw-r--r-- | noncore/unsupported/mailit/addresslist.cpp | 20 | ||||
-rw-r--r-- | noncore/unsupported/mailit/emailclient.cpp | 2 | ||||
-rw-r--r-- | noncore/unsupported/mailit/mailitwindow.cpp | 4 | ||||
-rw-r--r-- | noncore/unsupported/mailit/viewatt.cpp | 15 | ||||
-rw-r--r-- | noncore/unsupported/mailit/writemail.cpp | 5 |
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 | |||
@@ -9,24 +9,25 @@ | |||
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
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> |
23 | #include "resource.h" | 24 | #include "resource.h" |
24 | #include "addatt.h" | 25 | #include "addatt.h" |
25 | 26 | ||
26 | FileItem::FileItem(QListView *parent, DocLnk* dl) | 27 | FileItem::FileItem(QListView *parent, DocLnk* dl) |
27 | : QListViewItem(parent) | 28 | : QListViewItem(parent) |
28 | { | 29 | { |
29 | /*file = fileInfo; | 30 | /*file = fileInfo; |
30 | type = fileType;*/ | 31 | type = fileType;*/ |
31 | 32 | ||
32 | doclnk=dl; | 33 | doclnk=dl; |
@@ -48,50 +49,49 @@ FileItem::FileItem(QListView *parent, DocLnk* dl) | |||
48 | 49 | ||
49 | FileItem::~FileItem() | 50 | FileItem::~FileItem() |
50 | { | 51 | { |
51 | if (doclnk!=NULL) delete doclnk; | 52 | if (doclnk!=NULL) delete doclnk; |
52 | doclnk=NULL; | 53 | doclnk=NULL; |
53 | } | 54 | } |
54 | 55 | ||
55 | AddAtt::AddAtt(QWidget *parent, const char *name, WFlags f) | 56 | AddAtt::AddAtt(QWidget *parent, const char *name, WFlags f) |
56 | : QDialog(parent, name, f) | 57 | : QDialog(parent, name, f) |
57 | { | 58 | { |
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); |
68 | fileCategoryButton->setPopup(fileCategories); | 69 | fileCategoryButton->setPopup(fileCategories); |
69 | fileCategories->insertItem("Document"); | 70 | fileCategories->insertItem("Document"); |
70 | fileCategories->insertItem("Picture"); | 71 | fileCategories->insertItem("Picture"); |
71 | fileCategories->insertItem("Sound"); | 72 | fileCategories->insertItem("Sound"); |
72 | fileCategories->insertItem("Movie"); | 73 | fileCategories->insertItem("Movie"); |
73 | fileCategories->insertItem("File"); | 74 | fileCategories->insertItem("File"); |
74 | 75 | ||
75 | fileCategoryButton->setText("Document"); | 76 | fileCategoryButton->setText("Document"); |
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()) ); |
88 | connect(removeButton, SIGNAL(clicked()), this, | 88 | connect(removeButton, SIGNAL(clicked()), this, |
89 | SLOT(removeAttatchment()) ); | 89 | SLOT(removeAttatchment()) ); |
90 | 90 | ||
91 | /*listView = new QListView(this, "AttView"); | 91 | /*listView = new QListView(this, "AttView"); |
92 | listView->addColumn("Documents");* | 92 | listView->addColumn("Documents");* |
93 | connect(listView, SIGNAL(doubleClicked(QListViewItem *)), this, | 93 | connect(listView, SIGNAL(doubleClicked(QListViewItem *)), this, |
94 | SLOT(addAttatchment()) );*/ | 94 | SLOT(addAttatchment()) );*/ |
95 | 95 | ||
96 | 96 | ||
97 | attView = new QListView(this, "Selected"); | 97 | attView = new QListView(this, "Selected"); |
@@ -114,35 +114,29 @@ void AddAtt::clear() | |||
114 | //getFiles(); | 114 | //getFiles(); |
115 | modified = FALSE; | 115 | modified = FALSE; |
116 | } | 116 | } |
117 | 117 | ||
118 | /*void AddAtt::fileCategorySelected(int id) | 118 | /*void AddAtt::fileCategorySelected(int id) |
119 | { | 119 | { |
120 | fileCategoryButton->setText(fileCategories->text(id)); | 120 | fileCategoryButton->setText(fileCategories->text(id)); |
121 | getFiles(); | 121 | getFiles(); |
122 | }*/ | 122 | }*/ |
123 | 123 | ||
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()); |
139 | FileItem* fi=new FileItem(attView,dl); | 133 | FileItem* fi=new FileItem(attView,dl); |
140 | fi->setPixmap(0,dl->pixmap()); | 134 | fi->setPixmap(0,dl->pixmap()); |
141 | fi->setText(1,dl->type()); | 135 | fi->setText(1,dl->type()); |
142 | attView->insertItem(fi); | 136 | attView->insertItem(fi); |
143 | modified = TRUE; | 137 | modified = TRUE; |
144 | } | 138 | } |
145 | } | 139 | } |
146 | 140 | ||
147 | void AddAtt::removeAttatchment() | 141 | void AddAtt::removeAttatchment() |
148 | { | 142 | { |
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 | |||
@@ -18,25 +18,25 @@ | |||
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef ADDATT_H | 20 | #ifndef ADDATT_H |
21 | #define ADDATT_H | 21 | #define ADDATT_H |
22 | 22 | ||
23 | #include <qdialog.h> | 23 | #include <qdialog.h> |
24 | #include <qlistview.h> | 24 | #include <qlistview.h> |
25 | #include <qpushbutton.h> | 25 | #include <qpushbutton.h> |
26 | #include <qpopupmenu.h> | 26 | #include <qpopupmenu.h> |
27 | #include <qstring.h> | 27 | #include <qstring.h> |
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 | ||
33 | class FileItem : public QListViewItem | 33 | class FileItem : public QListViewItem |
34 | { | 34 | { |
35 | public: | 35 | public: |
36 | //FileItem(QListView *parent, QFileInfo fileInfo, QString fileType); | 36 | //FileItem(QListView *parent, QFileInfo fileInfo, QString fileType); |
37 | FileItem(QListView*, DocLnk*); | 37 | FileItem(QListView*, DocLnk*); |
38 | ~FileItem(); | 38 | ~FileItem(); |
39 | DocLnk* getDocLnk() {return doclnk;} | 39 | DocLnk* getDocLnk() {return doclnk;} |
40 | 40 | ||
41 | 41 | ||
42 | private: | 42 | private: |
@@ -56,21 +56,21 @@ public: | |||
56 | 56 | ||
57 | 57 | ||
58 | public slots: | 58 | public slots: |
59 | //void fileCategorySelected(int); | 59 | //void fileCategorySelected(int); |
60 | void addAttatchment(); | 60 | void addAttatchment(); |
61 | void removeAttatchment(); | 61 | void removeAttatchment(); |
62 | void reject(); | 62 | void reject(); |
63 | void accept(); | 63 | void accept(); |
64 | 64 | ||
65 | private: | 65 | 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 | ||
76 | #endif | 76 | #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 | |||
@@ -10,24 +10,26 @@ | |||
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
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" |
24 | 26 | ||
25 | AddressList::AddressList(QString file) | 27 | AddressList::AddressList(QString file) |
26 | { | 28 | { |
27 | addresses.setAutoDelete(TRUE); | 29 | addresses.setAutoDelete(TRUE); |
28 | filename = file; | 30 | filename = file; |
29 | read(); | 31 | read(); |
30 | dirty = FALSE; | 32 | dirty = FALSE; |
31 | } | 33 | } |
32 | 34 | ||
33 | AddressList::~AddressList() | 35 | AddressList::~AddressList() |
@@ -107,43 +109,55 @@ int AddressList::getNameRef(QString name) | |||
107 | pos++; | 109 | pos++; |
108 | } | 110 | } |
109 | return -1; | 111 | return -1; |
110 | } | 112 | } |
111 | 113 | ||
112 | QList<Contact>* AddressList::getContactList() | 114 | QList<Contact>* AddressList::getContactList() |
113 | { | 115 | { |
114 | return &addresses; | 116 | return &addresses; |
115 | } | 117 | } |
116 | 118 | ||
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 | ||
125 | QTextStream stream(&f); | 139 | QTextStream stream(&f); |
126 | 140 | ||
127 | while (! stream.atEnd() ) { | 141 | while (! stream.atEnd() ) { |
128 | lineEmail = stream.readLine(); | 142 | lineEmail = stream.readLine(); |
129 | if (! stream.atEnd() ) | 143 | if (! stream.atEnd() ) |
130 | lineName = stream.readLine(); | 144 | lineName = stream.readLine(); |
131 | else return; | 145 | else return; |
132 | 146 | ||
133 | email = getRightString(lineEmail); | 147 | email = getRightString(lineEmail); |
134 | name = getRightString(lineName); | 148 | name = getRightString(lineName); |
135 | addContact(email, name); | 149 | addContact(email, name); |
136 | } | 150 | } |
137 | f.close(); | 151 | f.close();*/ |
138 | } | 152 | } |
139 | 153 | ||
140 | QString AddressList::getRightString(QString in) | 154 | QString AddressList::getRightString(QString in) |
141 | { | 155 | { |
142 | QString out = ""; | 156 | QString out = ""; |
143 | 157 | ||
144 | int pos = in.find('='); | 158 | int pos = in.find('='); |
145 | if (pos != -1) { | 159 | if (pos != -1) { |
146 | out = in.mid(pos+1).stripWhiteSpace(); | 160 | out = in.mid(pos+1).stripWhiteSpace(); |
147 | } | 161 | } |
148 | return out; | 162 | return out; |
149 | } | 163 | } |
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 | |||
@@ -139,25 +139,25 @@ void EmailClient::init() | |||
139 | 139 | ||
140 | mail->insertItem(tr("Get Mail in"), selectAccountMenu); | 140 | mail->insertItem(tr("Get Mail in"), selectAccountMenu); |
141 | configure->insertItem(tr("Edit account"), editAccountMenu); | 141 | configure->insertItem(tr("Edit account"), editAccountMenu); |
142 | configure->insertItem(tr("Delete account"), deleteAccountMenu); | 142 | configure->insertItem(tr("Delete account"), deleteAccountMenu); |
143 | 143 | ||
144 | bar = new QToolBar(this); | 144 | bar = new QToolBar(this); |
145 | 145 | ||
146 | getMailButton = new QAction(tr("Get all mail"), Resource::loadPixmap("mailit/getmail"), QString::null, 0, this, 0); | 146 | getMailButton = new QAction(tr("Get all mail"), Resource::loadPixmap("mailit/getmail"), QString::null, 0, this, 0); |
147 | connect(getMailButton, SIGNAL(activated()), this, SLOT(getAllNewMail()) ); | 147 | connect(getMailButton, SIGNAL(activated()), this, SLOT(getAllNewMail()) ); |
148 | getMailButton->addTo(bar); | 148 | getMailButton->addTo(bar); |
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); |
154 | sendMailButton->addTo(mail); | 154 | sendMailButton->addTo(mail); |
155 | 155 | ||
156 | composeButton = new QAction(tr("Compose"), Resource::loadPixmap("new"), QString::null, 0, this, 0); | 156 | composeButton = new QAction(tr("Compose"), Resource::loadPixmap("new"), QString::null, 0, this, 0); |
157 | connect(composeButton, SIGNAL(activated()), this, SLOT(compose()) ); | 157 | connect(composeButton, SIGNAL(activated()), this, SLOT(compose()) ); |
158 | composeButton->addTo(bar); | 158 | composeButton->addTo(bar); |
159 | composeButton->addTo(mail); | 159 | composeButton->addTo(mail); |
160 | 160 | ||
161 | cancelButton = new QAction(tr("Cancel transfer"), Resource::loadPixmap("close"), QString::null, 0, this, 0); | 161 | cancelButton = new QAction(tr("Cancel transfer"), Resource::loadPixmap("close"), QString::null, 0, this, 0); |
162 | connect(cancelButton, SIGNAL(activated()), this, SLOT(cancel()) ); | 162 | connect(cancelButton, SIGNAL(activated()), this, SLOT(cancel()) ); |
163 | cancelButton->addTo(mail); | 163 | cancelButton->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 | |||
@@ -18,27 +18,29 @@ | |||
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include "mailitwindow.h" | 20 | #include "mailitwindow.h" |
21 | 21 | ||
22 | MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags fl) | 22 | MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags fl) |
23 | : QMainWindow(parent, name, fl) | 23 | : QMainWindow(parent, name, fl) |
24 | { | 24 | { |
25 | currentCaption = "Mailit"; | 25 | currentCaption = "Mailit"; |
26 | setCaption(tr(currentCaption)); | 26 | setCaption(tr(currentCaption)); |
27 | views = new QWidgetStack(this); | 27 | views = new QWidgetStack(this); |
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); |
35 | 37 | ||
36 | connect(emailClient, SIGNAL(composeRequested()), | 38 | connect(emailClient, SIGNAL(composeRequested()), |
37 | this, SLOT(compose()) ); | 39 | this, SLOT(compose()) ); |
38 | connect(emailClient, SIGNAL(viewEmail(QListView *, Email *)), this, | 40 | connect(emailClient, SIGNAL(viewEmail(QListView *, Email *)), this, |
39 | SLOT(viewMail(QListView *, Email *)) ); | 41 | SLOT(viewMail(QListView *, Email *)) ); |
40 | connect(emailClient, SIGNAL(mailUpdated(Email *)), this, | 42 | connect(emailClient, SIGNAL(mailUpdated(Email *)), this, |
41 | SLOT(updateMailView(Email *)) ); | 43 | SLOT(updateMailView(Email *)) ); |
42 | 44 | ||
43 | connect(writeMail, SIGNAL(cancelMail()), this, SLOT(showEmailClient()) ); | 45 | connect(writeMail, SIGNAL(cancelMail()), this, SLOT(showEmailClient()) ); |
44 | connect(writeMail, SIGNAL(sendMailRequested(const Email &)), this, | 46 | connect(writeMail, SIGNAL(sendMailRequested(const Email &)), this, |
@@ -48,24 +50,26 @@ MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags fl) | |||
48 | 50 | ||
49 | connect(readMail, SIGNAL(cancelView()), this, SLOT(showEmailClient()) ); | 51 | connect(readMail, SIGNAL(cancelView()), this, SLOT(showEmailClient()) ); |
50 | connect(readMail, SIGNAL(replyRequested(Email &)), this, | 52 | connect(readMail, SIGNAL(replyRequested(Email &)), this, |
51 | SLOT(composeReply(Email &)) ); | 53 | SLOT(composeReply(Email &)) ); |
52 | connect(readMail, SIGNAL(removeItem(EmailListItem *, bool &)), emailClient, | 54 | connect(readMail, SIGNAL(removeItem(EmailListItem *, bool &)), emailClient, |
53 | SLOT(deleteMail(EmailListItem *, bool &)) ); | 55 | SLOT(deleteMail(EmailListItem *, bool &)) ); |
54 | connect(readMail, SIGNAL(viewingMail(Email *)), emailClient, | 56 | connect(readMail, SIGNAL(viewingMail(Email *)), emailClient, |
55 | SLOT(moveMailFront(Email *)) ); | 57 | SLOT(moveMailFront(Email *)) ); |
56 | 58 | ||
57 | connect(emailClient, SIGNAL(newCaption(const QString &)), | 59 | connect(emailClient, SIGNAL(newCaption(const QString &)), |
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 | ||
62 | MailItWindow::~MailItWindow() | 66 | MailItWindow::~MailItWindow() |
63 | { | 67 | { |
64 | } | 68 | } |
65 | 69 | ||
66 | void MailItWindow::closeEvent(QCloseEvent *e) | 70 | void MailItWindow::closeEvent(QCloseEvent *e) |
67 | { | 71 | { |
68 | if (views->visibleWidget() == emailClient) { | 72 | if (views->visibleWidget() == emailClient) { |
69 | e->accept(); | 73 | e->accept(); |
70 | } else { | 74 | } else { |
71 | showEmailClient(); | 75 | showEmailClient(); |
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 | |||
@@ -11,79 +11,88 @@ | |||
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include "resource.h" | 20 | #include "resource.h" |
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) |
25 | : QMainWindow(parent, name, f) | 26 | : QMainWindow(parent, name, f) |
26 | { | 27 | { |
27 | setCaption("Exploring attatchments"); | 28 | setCaption("Exploring attatchments"); |
28 | 29 | ||
29 | setToolBarsMovable( FALSE ); | 30 | setToolBarsMovable( FALSE ); |
30 | bar = new QToolBar(this); | 31 | bar = new QToolBar(this); |
31 | installButton = new QAction( tr( "Install" ), Resource::loadPixmap( "exec" ), QString::null, CTRL + Key_C, this, 0 ); | 32 | installButton = new QAction( tr( "Install" ), Resource::loadPixmap( "exec" ), QString::null, CTRL + Key_C, this, 0 ); |
32 | connect(installButton, SIGNAL(activated()), this, SLOT(install()) ); | 33 | connect(installButton, SIGNAL(activated()), this, SLOT(install()) ); |
33 | 34 | ||
34 | listView = new QListView(this, "AttView"); | 35 | listView = new QListView(this, "AttView"); |
35 | listView->addColumn( "Attatchment" ); | 36 | listView->addColumn( "Attatchment" ); |
36 | listView->addColumn( "Type" ); | 37 | listView->addColumn( "Type" ); |
37 | listView->addColumn( "Installed" ); | 38 | listView->addColumn( "Installed" ); |
38 | setCentralWidget(listView); | 39 | setCentralWidget(listView); |
39 | } | 40 | } |
40 | 41 | ||
41 | void ViewAtt::update(Email *mailIn, bool inbox) | 42 | void ViewAtt::update(Email *mailIn, bool inbox) |
42 | { | 43 | { |
43 | QListViewItem *item; | 44 | QListViewItem *item; |
44 | Enclosure *ePtr; | 45 | Enclosure *ePtr; |
45 | 46 | ||
47 | |||
48 | |||
46 | listView->clear(); | 49 | listView->clear(); |
47 | if (inbox) { | 50 | if (inbox) { |
48 | bar->clear(); | 51 | bar->clear(); |
49 | installButton->addTo( bar ); | 52 | installButton->addTo( bar ); |
50 | bar->show(); | 53 | bar->show(); |
51 | } else { | 54 | } else { |
52 | bar->hide(); | 55 | bar->hide(); |
53 | } | 56 | } |
54 | 57 | ||
55 | mail = mailIn; | 58 | mail = mailIn; |
56 | for ( ePtr=mail->files.first(); ePtr != 0; ePtr=mail->files.next() ) { | 59 | for ( ePtr=mail->files.first(); ePtr != 0; ePtr=mail->files.next() ) { |
57 | 60 | ||
58 | QString isInstalled = "No"; | 61 | QString isInstalled = "No"; |
59 | if (ePtr->installed) | 62 | if (ePtr->installed) |
60 | isInstalled = "Yes"; | 63 | isInstalled = "Yes"; |
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); |
70 | actions->addTo(bar); | 79 | actions->addTo(bar); |
71 | item->setPixmap(0, Resource::loadPixmap("play")); | 80 | item->setPixmap(0, Resource::loadPixmap("play")); |
72 | } | 81 | } |
73 | if (ePtr->contentType == "IMAGE") { | 82 | if (ePtr->contentType == "IMAGE") { |
74 | actions = new QAction( tr("Show"), Resource::loadPixmap("pixmap"), QString::null, CTRL + Key_C, this, 0); | 83 | actions = new QAction( tr("Show"), Resource::loadPixmap("pixmap"), QString::null, CTRL + Key_C, this, 0); |
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 | } |
80 | 89 | ||
81 | void ViewAtt::install() | 90 | void ViewAtt::install() |
82 | { | 91 | { |
83 | Enclosure *ePtr, *selPtr; | 92 | Enclosure *ePtr, *selPtr; |
84 | QListViewItem *item; | 93 | QListViewItem *item; |
85 | QString filename; | 94 | QString filename; |
86 | DocLnk d; | 95 | DocLnk d; |
87 | 96 | ||
88 | item = listView->selectedItem(); | 97 | item = listView->selectedItem(); |
89 | if (item != NULL) { | 98 | if (item != NULL) { |
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 | |||
@@ -36,25 +36,25 @@ WriteMail::~WriteMail() | |||
36 | } | 36 | } |
37 | 37 | ||
38 | void WriteMail::setAddressList(AddressList *list) | 38 | void WriteMail::setAddressList(AddressList *list) |
39 | { | 39 | { |
40 | Contact *cPtr; | 40 | Contact *cPtr; |
41 | 41 | ||
42 | addressList = list; | 42 | addressList = list; |
43 | 43 | ||
44 | addressView->clear(); | 44 | addressView->clear(); |
45 | QList<Contact> *cListPtr = addressList->getContactList(); | 45 | QList<Contact> *cListPtr = addressList->getContactList(); |
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 | } |
51 | 51 | ||
52 | void WriteMail::init() | 52 | void WriteMail::init() |
53 | { | 53 | { |
54 | setToolBarsMovable(FALSE); | 54 | setToolBarsMovable(FALSE); |
55 | 55 | ||
56 | bar = new QToolBar(this); | 56 | bar = new QToolBar(this); |
57 | bar->setHorizontalStretchable( TRUE ); | 57 | bar->setHorizontalStretchable( TRUE ); |
58 | 58 | ||
59 | menu = new QMenuBar( bar ); | 59 | menu = new QMenuBar( bar ); |
60 | 60 | ||
@@ -101,28 +101,29 @@ void WriteMail::init() | |||
101 | 101 | ||
102 | toInput = new QLineEdit( widget, "toInput" ); | 102 | toInput = new QLineEdit( widget, "toInput" ); |
103 | grid->addWidget( toInput, 0, 1 ); | 103 | grid->addWidget( toInput, 0, 1 ); |
104 | 104 | ||
105 | addressButton = new QToolButton( widget, "addressButton" ); | 105 | addressButton = new QToolButton( widget, "addressButton" ); |
106 | addressButton->setPixmap( Resource::loadPixmap("AddressBook") ); | 106 | addressButton->setPixmap( Resource::loadPixmap("AddressBook") ); |
107 | addressButton->setToggleButton(TRUE); | 107 | addressButton->setToggleButton(TRUE); |
108 | grid->addWidget( addressButton, 0, 2 ); | 108 | grid->addWidget( addressButton, 0, 2 ); |
109 | connect(addressButton, SIGNAL(clicked()), this, SLOT(getAddress()) ); | 109 | connect(addressButton, SIGNAL(clicked()), this, SLOT(getAddress()) ); |
110 | 110 | ||
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); |
119 | addressView->hide(); | 120 | addressView->hide(); |
120 | grid->addMultiCellWidget( addressView, 3, 3, 0, 2); | 121 | grid->addMultiCellWidget( addressView, 3, 3, 0, 2); |
121 | 122 | ||
122 | okButton = new QToolButton(bar, "ok"); | 123 | okButton = new QToolButton(bar, "ok"); |
123 | okButton->setPixmap( Resource::loadPixmap("enter") ); | 124 | okButton->setPixmap( Resource::loadPixmap("enter") ); |
124 | okButton->hide(); | 125 | okButton->hide(); |
125 | connect(okButton, SIGNAL(clicked()), this, SLOT(addRecipients()) ); | 126 | connect(okButton, SIGNAL(clicked()), this, SLOT(addRecipients()) ); |
126 | 127 | ||
127 | setCentralWidget(widget); | 128 | setCentralWidget(widget); |
128 | } | 129 | } |