summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/mailit/addatt.cpp22
-rw-r--r--noncore/net/mailit/addatt.h8
-rw-r--r--noncore/net/mailit/addresslist.cpp2
-rw-r--r--noncore/net/mailit/emailclient.cpp219
-rw-r--r--noncore/net/mailit/emailhandler.cpp42
-rw-r--r--noncore/net/mailit/emaillistitem.cpp2
-rw-r--r--noncore/net/mailit/mailitwindow.cpp28
-rw-r--r--noncore/net/mailit/popclient.cpp20
-rw-r--r--noncore/net/mailit/readmail.cpp26
-rw-r--r--noncore/net/mailit/readmail.h4
-rw-r--r--noncore/net/mailit/smtpclient.cpp8
-rw-r--r--noncore/net/mailit/textparser.cpp36
-rw-r--r--noncore/net/mailit/viewatt.cpp3
-rw-r--r--noncore/net/mailit/writemail.cpp38
-rw-r--r--noncore/net/mailit/writemail.h4
-rw-r--r--noncore/unsupported/mailit/addatt.cpp22
-rw-r--r--noncore/unsupported/mailit/addatt.h8
-rw-r--r--noncore/unsupported/mailit/addresslist.cpp2
-rw-r--r--noncore/unsupported/mailit/emailclient.cpp219
-rw-r--r--noncore/unsupported/mailit/emailhandler.cpp42
-rw-r--r--noncore/unsupported/mailit/emaillistitem.cpp2
-rw-r--r--noncore/unsupported/mailit/mailitwindow.cpp28
-rw-r--r--noncore/unsupported/mailit/popclient.cpp20
-rw-r--r--noncore/unsupported/mailit/readmail.cpp26
-rw-r--r--noncore/unsupported/mailit/readmail.h4
-rw-r--r--noncore/unsupported/mailit/smtpclient.cpp8
-rw-r--r--noncore/unsupported/mailit/textparser.cpp36
-rw-r--r--noncore/unsupported/mailit/viewatt.cpp3
-rw-r--r--noncore/unsupported/mailit/writemail.cpp38
-rw-r--r--noncore/unsupported/mailit/writemail.h4
30 files changed, 450 insertions, 474 deletions
diff --git a/noncore/net/mailit/addatt.cpp b/noncore/net/mailit/addatt.cpp
index d268f1f..daefac6 100644
--- a/noncore/net/mailit/addatt.cpp
+++ b/noncore/net/mailit/addatt.cpp
@@ -58,3 +58,3 @@ AddAtt::AddAtt(QWidget *parent, const char *name, WFlags f)
{
- setCaption("Adding attatchments");
+ setCaption("Adding attachments");
@@ -64,3 +64,3 @@ AddAtt::AddAtt(QWidget *parent, const char *name, WFlags f)
/*fileCategoryButton = new QPushButton(this);*/
- attatchButton = new QPushButton(tr("Attatch..."), buttons);
+ attachButton = new QPushButton(tr("attach..."), buttons);
removeButton = new QPushButton(tr("Remove"), buttons);
@@ -80,3 +80,3 @@ AddAtt::AddAtt(QWidget *parent, const char *name, WFlags f)
top->addWidget(buttons,1,0);
- //buttons->addWidget(attatchButton,0,0);
+ //buttons->addWidget(attachButton,0,0);
//buttons->addWidget(removeButton,0,1);
@@ -85,6 +85,6 @@ AddAtt::AddAtt(QWidget *parent, const char *name, WFlags f)
// SLOT(fileCategorySelected(int)) );*/
- connect(attatchButton, SIGNAL(clicked()), this,
- SLOT(addAttatchment()) );
+ connect(attachButton, SIGNAL(clicked()), this,
+ SLOT(addattachment()) );
connect(removeButton, SIGNAL(clicked()), this,
- SLOT(removeAttatchment()) );
+ SLOT(removeattachment()) );
@@ -93,3 +93,3 @@ AddAtt::AddAtt(QWidget *parent, const char *name, WFlags f)
connect(listView, SIGNAL(doubleClicked(QListViewItem *)), this,
- SLOT(addAttatchment()) );*/
+ SLOT(addattachment()) );*/
@@ -100,3 +100,3 @@ AddAtt::AddAtt(QWidget *parent, const char *name, WFlags f)
connect(attView, SIGNAL(doubleClicked(QListViewItem *)), this,
- SLOT(removeAttatchment()) );
+ SLOT(removeattachment()) );
@@ -123,3 +123,3 @@ void AddAtt::clear()
-void AddAtt::addAttatchment()
+void AddAtt::addattachment()
{
@@ -140,3 +140,3 @@ void AddAtt::addAttatchment()
-void AddAtt::removeAttatchment()
+void AddAtt::removeattachment()
{
@@ -194,3 +194,3 @@ void AddAtt::getFiles()
-QStringList AddAtt::returnAttatchedFiles()
+QStringList AddAtt::returnattachedFiles()
{
diff --git a/noncore/net/mailit/addatt.h b/noncore/net/mailit/addatt.h
index fcf3279..a365947 100644
--- a/noncore/net/mailit/addatt.h
+++ b/noncore/net/mailit/addatt.h
@@ -51,3 +51,3 @@ public:
AddAtt(QWidget *parent = 0, const char *name = 0, WFlags f = 0);
- QStringList returnAttatchedFiles();
+ QStringList returnattachedFiles();
QStringList returnFileTypes();
@@ -59,4 +59,4 @@ public slots:
//void fileCategorySelected(int);
- void addAttatchment();
- void removeAttatchment();
+ void addattachment();
+ void removeattachment();
void reject();
@@ -67,3 +67,3 @@ private:
QListView *attView;
- QPushButton *attatchButton, *removeButton;
+ QPushButton *attachButton, *removeButton;
QPopupMenu *fileCategories;
diff --git a/noncore/net/mailit/addresslist.cpp b/noncore/net/mailit/addresslist.cpp
index 8d9ab91..7d60ebf 100644
--- a/noncore/net/mailit/addresslist.cpp
+++ b/noncore/net/mailit/addresslist.cpp
@@ -123,3 +123,3 @@ void AddressList::read()
OContactAccess::List m_list = m_contactdb.sorted( true, 0, 0, 0 );
- //OContact* oc;
+ //OContact* oc;(*it).defaultEmail()
diff --git a/noncore/net/mailit/emailclient.cpp b/noncore/net/mailit/emailclient.cpp
index ad1e0b4..23059cf 100644
--- a/noncore/net/mailit/emailclient.cpp
+++ b/noncore/net/mailit/emailclient.cpp
@@ -25,2 +25,3 @@
#include <qaction.h>
+#include <qwhatsthis.h>
#include <qpe/resource.h>
@@ -84,2 +85,3 @@ EmailClient::EmailClient( QWidget* parent, const char* name, WFlags fl )
+ mailboxView->setCurrentTab(0); //ensure that inbox has focus
}
@@ -115,2 +117,3 @@ void EmailClient::init()
progressBar = new QProgressBar(statusBar);
+
connect(emailHandler, SIGNAL(mailboxSize(int)),
@@ -129,2 +132,3 @@ void EmailClient::init()
bar = new QToolBar(this);
+ QWhatsThis::add(bar,tr("Main operation toolbar"));
bar->setHorizontalStretchable( TRUE );
@@ -150,22 +154,6 @@ void EmailClient::init()
getMailButton = new QToolButton(Resource::loadPixmap("mailit/getmail"),tr("getMail"),tr("select account"), this,SLOT(getAllNewMail()),bar);
- //connect(setAccountlButton, SIGNAL(activated()), this, SLOT(setCurrentAccount()) );
- // setAccountButton->addTo(bar);
- //setAccountButton->addTo(mail);
-
- /*idCount = 0;
-
- for (MailAccount* accountPtr = accountList.first(); accountPtr != 0;
- accountPtr = accountList.next()) {
+ QWhatsThis::add(getMailButton,tr("Click to download mail via all available accounts.\n Press and hold to select the desired account."));
- selectAccountMenu->insertItem(accountPtr->accountName,this, SLOT(selectAccount(int)), 0, idCount);
- idCount++;
- }*/
getMailButton->setPopup(selectAccountMenu);
-
- /*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/sendqueue"), QString::null, 0, this, 0);
@@ -174,2 +162,3 @@ void EmailClient::init()
sendMailButton->addTo(mail);
+ sendMailButton->setWhatsThis("Send mail queued in the outbox");
@@ -179,2 +168,3 @@ void EmailClient::init()
composeButton->addTo(mail);
+ composeButton->setWhatsThis("Compose a new mail");
@@ -185,2 +175,4 @@ void EmailClient::init()
cancelButton->setEnabled(FALSE);
+ cancelButton->setWhatsThis("Stop the currently active mail transfer");
+
@@ -189,2 +181,3 @@ void EmailClient::init()
deleteButton->addTo(bar);
+ deleteButton->setWhatsThis("Remove the currently selected eMail(s)");
@@ -203,2 +196,4 @@ void EmailClient::init()
inboxView->setAllColumnsShowFocus(TRUE);
+ QWhatsThis::add(inboxView,QWidget::tr("This is the inbox view.\n It keeps the fetched mail which can be viewed by double clicking the entry.\n"
+ " A blue attachment icon shows whether this mail has attachments."));
@@ -217,2 +212,3 @@ void EmailClient::init()
+ QWhatsThis::add(outboxView,QWidget::tr("This is the oubox view.\n It keeps the queued mails to send which can be reviewed by double clicking the entry."));
grid_3->addWidget( outboxView, 0, 0 );
@@ -222,3 +218,2 @@ void EmailClient::init()
- mailboxView->setCurrentTab(0);
}
@@ -326,3 +321,3 @@ void EmailClient::getNewMail() {
//get any previous mails not downloaded and add to queue
-/* mailDownloadList.clear();
+ mailDownloadList.clear();
Email *mailPtr;
@@ -335,5 +330,6 @@ void EmailClient::getNewMail() {
item = (EmailListItem *) item->nextSibling();
- }*/
+ }
emailHandler->getMailHeaders();
+
}
@@ -353,6 +349,6 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk)
emailHandler->parse(mail.rawMail, lineShift, &newMail);
-
mailconf->setGroup(newMail.id);
- if (fromDisk) {
+ if (fromDisk)
+ {
newMail.downloaded = mailconf->readBoolEntry("downloaded");
@@ -361,3 +357,5 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk)
newMail.fromAccountId = mailconf->readNumEntry("fromaccountid");
- } else { //mail arrived from server
+ }
+ else
+ { //mail arrived from server
newMail.serverId = mail.serverId;
@@ -380,3 +378,3 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk)
//header is not reloaded
- if (currentAccount->synchronize)
+ if ((currentAccount)&&(currentAccount->synchronize))
currentAccount->lastServerMailCount++;
@@ -388,9 +386,11 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk)
- addressList->addContact(newMail.fromMail, newMail.from);
- } else if (!fromDisk) { //body to header arrived
- mailconf->writeEntry("downloaded", TRUE);
+ //addressList->addContact(newMail.fromMail, newMail.from);
}
+
+ mailconf->writeEntry("downloaded", newMail.downloaded);
+
QString stringMailId;
stringMailId.setNum(thisMailId);
- //se if any attatchments needs to be stored
+ //see if any attatchments needs to be stored
+
for ( ePtr=newMail.files.first(); ePtr != 0; ePtr=newMail.files.next() ) {
@@ -428,6 +428,12 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk)
}
- if (!previewingMail && !fromDisk) {
+
+ bool found=false;
+
+ if (!fromDisk)
+ {
+
Email *mailPtr;
item = (EmailListItem *) inboxView->firstChild();
- while (item != NULL) {
+ while ((item != NULL)&&(!found))
+ {
mailPtr = item->getMail();
@@ -436,2 +442,3 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk)
emit mailUpdated(item->getMail());
+ found = true;
}
@@ -439,7 +446,7 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk)
}
- } else {
- item = new EmailListItem(inboxView, newMail, TRUE);
- if (!newMail.downloaded)
- mailDownloadList.sizeInsert(newMail.serverId, newMail.size);
}
+ if ((!found)||(fromDisk)) item = new EmailListItem(inboxView, newMail, TRUE);
+
+ /*if (!newMail.downloaded)
+ mailDownloadList.sizeInsert(newMail.serverId, newMail.size);*/
@@ -452,3 +459,3 @@ void EmailClient::allMailArrived(int count)
// not previewing means all mailtransfer has been done
- if (!previewingMail) {
+ /*if (!previewingMail) {*/
if ( (allAccounts) && ( (currentAccount = accountList.next()) !=0 ) ) {
@@ -468,3 +475,3 @@ void EmailClient::allMailArrived(int count)
}
- }
+ //}
@@ -475,3 +482,3 @@ void EmailClient::allMailArrived(int count)
- emailHandler->getMailByList(&mailDownloadList);
+ //emailHandler->getMailByList(&mailDownloadList);
@@ -543,3 +550,3 @@ void EmailClient::inboxItemSelected()
{
- killTimer(timerID);
+ //killTimer(timerID);
@@ -553,3 +560,3 @@ void EmailClient::outboxItemSelected()
{
- killTimer(timerID);
+ //killTimer(timerID);
@@ -569,4 +576,2 @@ void EmailClient::readMail()
QFile f(getPath(FALSE) + "inbox.txt");
-// QFileInfo fi(f);
- //qDebug( f.name());
@@ -624,3 +629,2 @@ void EmailClient::saveMail(QString fileName, QListView *view)
item = (EmailListItem *) view->firstChild();
- //qDebug (QString("Write : ") );
QTextStream t(&f);
@@ -628,4 +632,2 @@ void EmailClient::saveMail(QString fileName, QListView *view)
mail = item->getMail();
- //qDebug(mail->rawMail);
- //qDebug(mail->recipients.first());
t << mail->rawMail;
@@ -664,62 +666,39 @@ void EmailClient::readSettings()
{
- TextParser *p;
- QString s;
- int pos, accountPos, y;
- QFile f( getPath(FALSE) + "settings.txt");
-
- if ( f.open(IO_ReadOnly) ) { // file opened successfully
- QTextStream t( &f ); // use a text stream
- s = t.read();
- f.close();
-
- p = new TextParser(s, "\n");
-
- accountPos = 0;
- while ( (accountPos = p->find("ACCOUNTSTART",';', accountPos, TRUE)) != -1 ) {
- accountPos++;
- if ( (pos = p->find("ACCOUNTNAME",':', accountPos, TRUE)) != -1 )
- account.accountName = p->getString(& ++pos, 'z', TRUE);
- if ( (pos = p->find("NAME",':', accountPos, TRUE)) != -1)
- account.name = p->getString(& ++pos, 'z', TRUE);
- if ( (pos = p->find("EMAIL",':', accountPos, TRUE)) != -1)
- account.emailAddress = p->getString(& ++pos, 'z', TRUE);
- if ( (pos = p->find("POPUSER",':', accountPos, TRUE)) != -1)
- account.popUserName = p->getString(& ++pos, 'z', TRUE);
- if ( (pos = p->find("POPPASSWORD",':', accountPos, TRUE)) != -1)
- account.popPasswd = p->getString(& ++pos, 'z', TRUE);
- if ( (pos = p->find("POPSERVER",':', accountPos, TRUE)) != -1)
- account.popServer = p->getString(& ++pos, 'z', TRUE);
- if ( (pos = p->find("SMTPSERVER",':', accountPos, TRUE)) != -1)
- account.smtpServer = p->getString(& ++pos, 'z', TRUE);
- if ( (pos = p->find("ACCOUNTID",':', accountPos, TRUE)) != -1) {
- s = p->getString(& ++pos, 'z', TRUE);
- account.id = s.toInt();
- }
+ int y,acc_count, accountPos=0;
+ mailconf->setGroup("mailitglobal");
+ acc_count=mailconf->readNumEntry("Accounts",0);
+
+ for (int accountPos = 0;accountPos<acc_count ; accountPos++)
+ {
+ mailconf->setGroup("Account_"+QString::number(accountPos+1)); //Account numbers start at 1 ...
+ account.accountName = mailconf->readEntry("AccName","");
+ account.name = mailconf->readEntry("UserName","");
+ account.emailAddress = mailconf->readEntry("Email","");
+ account.popUserName = mailconf->readEntry("POPUser","");
+ account.popPasswd = mailconf->readEntryCrypt("POPPassword","");
+ account.popServer = mailconf->readEntry("POPServer","");
+ account.smtpServer = mailconf->readEntry("SMTPServer","");
+ account.id = mailconf->readNumEntry("AccountId",0);
+ account.syncLimit = mailconf->readNumEntry("HeaderLimit",0);
account.lastServerMailCount = 0;
account.synchronize = FALSE;
- if ( (pos = p->find("SYNCHRONIZE",':', accountPos, TRUE)) != -1) {
- if (p->getString(& ++pos, 'z', TRUE).upper() == "YES") {
- account.synchronize = TRUE;
- if ( (pos = p->find("LASTSERVERMAILCOUNT",':', accountPos, TRUE)) != -1) {
- s = p->getString(& ++pos, 'z', TRUE);
- account.lastServerMailCount = s.toInt();
- }
- }
- }
- if ( (pos = p->find("SYNCLIMIT",':', accountPos, TRUE)) != -1) {
- account.syncLimit = p->getString(& ++pos, 'z', TRUE).toInt();
+ account.synchronize = (mailconf->readEntry("Synchronize","No")=="Yes");
+ if (account.synchronize)
+ {
+ mailconf->readNumEntry("LASTSERVERMAILCOUNT",0);
}
-
accountList.append(&account);
}
- delete p;
- }
+
mailconf->setGroup("mailitglobal");
- if ( (y = mailconf->readNumEntry("mailidcount", -1)) != -1) {
+
+ if ( (y = mailconf->readNumEntry("mailidcount", -1)) != -1)
+ {
mailIdCount = y;
}
- if ( (y = mailconf->readNumEntry("accountidcount", -1)) != -1) {
+ if ( (y = mailconf->readNumEntry("accountidcount", -1)) != -1)
+ {
accountIdCount = y;
@@ -730,40 +709,38 @@ void EmailClient::saveSettings()
{
-
- QString temp;
- QFile f( getPath(FALSE) + "settings.txt");
+ int acc_count=0;
MailAccount *accountPtr;
- if (! f.open(IO_WriteOnly) ) {
- qWarning("could not save settings file");
+
+ if (!mailconf)
+ {
+ qWarning("could not save settings");
return;
}
- QTextStream t(&f);
- t << "#Settings for OPIE Mailit program\n";
for (accountPtr = accountList.first(); accountPtr != 0;
- accountPtr = accountList.next()) {
-
- t << "accountStart;\n";
- t << "AccountName: " + accountPtr->accountName + "\n";
- t << "Name: " + accountPtr->name + "\n";
- t << "Email: " + accountPtr->emailAddress + "\n";
- t << "POPUser: " + accountPtr->popUserName + "\n";
- t << "POPPAssword: " + accountPtr->popPasswd + "\n";
- t << "POPServer: " + accountPtr->popServer + "\n";
- t << "SMTPServer: " + accountPtr->smtpServer + "\n";
- t << "AccountId: " << accountPtr->id << "\n";
- if (accountPtr->synchronize) {
- t << "Synchronize: Yes\n";
- t << "LastServerMailCount: ";
- t << accountPtr->lastServerMailCount << "\n";
- } else {
- t << "Synchronize: No\n";
+ accountPtr = accountList.next())
+ {
+ mailconf->setGroup("Account_"+QString::number(++acc_count));
+ mailconf->writeEntry("AccName",accountPtr->accountName );
+ mailconf->writeEntry("UserName",accountPtr->name);
+ mailconf->writeEntry("Email",accountPtr->emailAddress);
+ mailconf->writeEntry("POPUser",accountPtr->popUserName);
+ mailconf->writeEntryCrypt("POPPassword",accountPtr->popPasswd);
+ mailconf->writeEntry("POPServer",accountPtr->popServer);
+ mailconf->writeEntry("SMTPServer",accountPtr->smtpServer);
+ mailconf->writeEntry("AccountId",accountPtr->id);
+ if (accountPtr->synchronize)
+ {
+ mailconf->writeEntry("Synchronize","Yes");
+ mailconf->writeEntry("HeaderLimit",accountPtr->syncLimit);
+ mailconf->writeEntry("LastServerMailCount",accountPtr->lastServerMailCount);
+ }
+ else
+ {
+ mailconf->writeEntry("Synchronize", "No");
}
- t << "SyncLimit: ";
- t << accountPtr->syncLimit << "\n";
- t << "accountEnd;\n";
}
- f.close();
mailconf->setGroup("mailitglobal");
+ mailconf->writeEntry("Accounts",acc_count);
mailconf->writeEntry("mailidcount", mailIdCount);
diff --git a/noncore/net/mailit/emailhandler.cpp b/noncore/net/mailit/emailhandler.cpp
index f6c6d60..b180051 100644
--- a/noncore/net/mailit/emailhandler.cpp
+++ b/noncore/net/mailit/emailhandler.cpp
@@ -106,3 +106,3 @@ void EmailHandler::getMail()
headers = FALSE;
- popClient->headersOnly(headers, 0);
+ //popClient->headersOnly(headers, 0);
popClient->newConnection(mailAccount.popServer, 110);
@@ -113,7 +113,3 @@ void EmailHandler::getMailHeaders()
popClient->setAccount(mailAccount.popUserName, mailAccount.popPasswd);
- if (mailAccount.synchronize) {
- popClient->setSynchronize(mailAccount.lastServerMailCount);
- } else {
- popClient->removeSynchronize();
- }
+ mailAccount.synchronize ? popClient->setSynchronize(mailAccount.lastServerMailCount): popClient->removeSynchronize();
@@ -137,3 +133,3 @@ void EmailHandler::getMailByList(MailList *mailList)
-void EmailHandler::messageArrived(const QString &message, int id, uint size, bool complete)
+void EmailHandler::messageArrived(const QString &message, int id, uint size, bool incomplete)
{
@@ -144,3 +140,3 @@ void EmailHandler::messageArrived(const QString &message, int id, uint size, boo
mail.size = size;
- mail.downloaded = complete;
+ mail.downloaded = incomplete;
@@ -188,2 +184,3 @@ bool EmailHandler::parse(QString in, QString lineShift, Email *mail)
pos++;
+
mail->fromMail = p.getString(&pos, '>', false);
@@ -201,10 +198,29 @@ bool EmailHandler::parse(QString in, QString lineShift, Email *mail)
- //@@@ToDo: Rewrite the parser as To: stops at the first occurence- which is Delivered-To:
- if ((pos = p.find("TO",':', 0, TRUE)) != -1)
+ pos=0;
+
+ //Search for To: after the FROM: attribute to prevent hitting the Delivered-To:
+ while((pos = p.find("TO",':', pos+1, TRUE))!=-1)
+ {
+ QString rec;
+
+ if (p.separatorAt(pos-1)!='-')
{
pos++;
+ mail->recipients.append(p.getString(&pos, '\r', TRUE));
+ }
+ /*else {
+ if ((p.separatorAt(pos) == '<')|| (p.separatorAt(pos) == ' ')) //No name.. nasty
+ pos++;
+ pos++;
+ mail->fromMail = p.getString(&pos, 'z', TRUE);
+ if (mail->fromMail.at(mail->fromMail.length()-1) == '>')
+ mail->fromMail.truncate(mail->fromMail.length() - 1);
+ mail->from=mail->fromMail;
+ }
mail->recipients.append (p.getString(&pos, 'z', TRUE) );
+ }*/
}
+ //
+ //if (pos==-1) mail->recipients.append (tr("undisclosed recipients") );
- //@@@ToDo: Rewrite the parser as To: stops at the first occurence- which is Delivered-To:
if ((pos = p.find("CC",':', 0, TRUE)) != -1)
@@ -215,3 +231,2 @@ bool EmailHandler::parse(QString in, QString lineShift, Email *mail)
-
if ((pos = p.find("SUBJECT",':', 0, TRUE)) != -1) {
@@ -220,5 +235,6 @@ bool EmailHandler::parse(QString in, QString lineShift, Email *mail)
}
+
if ((pos = p.find("DATE",':', 0, TRUE)) != -1) {
pos++;
- mail->date = p.getString(&pos, 'z', true);
+ mail->date = p.getString(&pos, 'z', TRUE);
}
diff --git a/noncore/net/mailit/emaillistitem.cpp b/noncore/net/mailit/emaillistitem.cpp
index a325766..b925a1c 100644
--- a/noncore/net/mailit/emaillistitem.cpp
+++ b/noncore/net/mailit/emaillistitem.cpp
@@ -40,2 +40,3 @@ EmailListItem::EmailListItem(QListView *parent, Email mailIn, bool inbox)
setText(1, mail.subject);
+ setText(2,mail.date);
@@ -45,2 +46,3 @@ EmailListItem::EmailListItem(QListView *parent, Email mailIn, bool inbox)
}
+
selected = FALSE;
diff --git a/noncore/net/mailit/mailitwindow.cpp b/noncore/net/mailit/mailitwindow.cpp
index ef5fc09..7181adf 100644
--- a/noncore/net/mailit/mailitwindow.cpp
+++ b/noncore/net/mailit/mailitwindow.cpp
@@ -19,2 +19,3 @@
**********************************************************************/
+#include <qwhatsthis.h>
#include "mailitwindow.h"
@@ -22,3 +23,3 @@
MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags fl)
- : QMainWindow(parent, name, fl)
+ : QMainWindow(parent, name, WStyle_ContextHelp)
{
@@ -28,3 +29,3 @@ MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags fl)
setCentralWidget(views);
-
+ QWhatsThis::add(views,tr("Central view area"));
emailClient = new EmailClient(views, "client");
@@ -142,24 +143 @@ void MailItWindow::setDocument(const QString &_address)
}
-
-/*void MailItWindow::reply(Email& mail)
-{
- qDebug("####EmailClient: 0 reached");
- composeReply(mail,(bool&)FALSE);
-}
-
-void MailItWindow::replyAll(Email& mail)
-{
- qDebug("####EmailClient: 1 reached");
- composeReply(mail,(bool&)TRUE);
-}
-
-void MailItWindow::forward(Email& mail)
-{
- qDebug("####EmailClient: 2 reached");
-}
-
-void MailItWindow::remove(Email&)
-{
- qDebug("####EmailClient: 3 reached");
- //emit removeItem(eli,(bool&)TRUE);
-} */ \ No newline at end of file
diff --git a/noncore/net/mailit/popclient.cpp b/noncore/net/mailit/popclient.cpp
index f9cc337..67306be 100644
--- a/noncore/net/mailit/popclient.cpp
+++ b/noncore/net/mailit/popclient.cpp
@@ -121,3 +121,2 @@ void PopClient::incomingData()
response = socket->readLine();
- //qDebug(response +" %d", status);
@@ -133,14 +132,4 @@ void PopClient::incomingData()
md5Source = timeStamp + popPassword;
- //qDebug( md5Source);
-// for( int i = 0; i < md5Source.length(); i++) {
-// buff[i] = (QChar)md5Source[i];
-// }
md5_buffer( (char const *)md5Source, md5Source.length(),&md5Digest[0]);
-// md5_buffer(char const *buffer, unsigned int len, char *digest);
-
-// MD5_Init( &ctx);
-// MD5_Update( &ctx, buff, sizeof( buff) );
-// MD5_Final( md5Digest, &ctx);
-// MD5( buff, md5Source.length(), md5Digest);
@@ -166,3 +155,3 @@ void PopClient::incomingData()
}
- //password shhh. don't tell anyone (implement APOP...)
+
case Pass: {
@@ -250,3 +239,4 @@ void PopClient::incomingData()
if (status != Quit) {
- if (!preview || mailSize <= headerLimit) {
+ if (mailSize <= headerLimit)
+ {
*stream << "RETR " << messageCount << "\r\n";
@@ -285,3 +275,5 @@ void PopClient::incomingData()
//complete mail downloaded
- if ( (!preview ) || ((preview) && (mailSize <= headerLimit)) ){
+ //if ( (!preview ) || ((preview) && (mailSize <= headerLimit)) ){
+ if ( mailSize <= headerLimit)
+ {
emit newMessage(message, messageCount-1, mailSize, TRUE);
diff --git a/noncore/net/mailit/readmail.cpp b/noncore/net/mailit/readmail.cpp
index dc98a6f..4eae7f6 100644
--- a/noncore/net/mailit/readmail.cpp
+++ b/noncore/net/mailit/readmail.cpp
@@ -61,2 +61,3 @@ void ReadMail::init()
connect(replyButton, SIGNAL(activated()), this, SLOT(reply()) );
+ replyButton->setWhatsThis(tr("Click here to reply to the selected mail"));
@@ -65,2 +66,3 @@ void ReadMail::init()
connect(forwardButton, SIGNAL(activated()), this, SLOT(forward()) );
+ forwardButton->setWhatsThis(tr("Click here to forward the selected mail"));
@@ -70,2 +72,3 @@ void ReadMail::init()
previousButton->addTo(viewMenu);
+ previousButton->setWhatsThis(tr("Read the previous mail in the list"));
@@ -75,8 +78,10 @@ void ReadMail::init()
nextButton->addTo(viewMenu);
+ previousButton->setWhatsThis(tr("Read the next mail in the list"));
- attatchmentsButton = new QAction( tr( "Attatchments" ), Resource::loadPixmap( "mailit/attach" ), QString::null, 0, this, 0 );
- connect( attatchmentsButton, SIGNAL( activated() ), this,
- SLOT( viewAttatchments() ) );
- attatchmentsButton->addTo(bar);
- attatchmentsButton->addTo(viewMenu);
+ attachmentButton = new QAction( tr( "Attatchments" ), Resource::loadPixmap( "mailit/attach" ), QString::null, 0, this, 0 );
+ connect( attachmentButton, SIGNAL( activated() ), this,
+ SLOT( viewAttachments() ) );
+ attachmentButton->addTo(bar);
+ attachmentButton->addTo(viewMenu);
+ attachmentButton->setWhatsThis(tr("Click here to add attachments to your mail"));
@@ -86,2 +91,6 @@ void ReadMail::init()
plainTextButton->addTo(viewMenu);
+ plainTextButton->setWhatsThis(tr("The mail view has 2 modes:\n"
+ "<LI><B>RichText</B> shows the mail as HTML with reach features (no standard line breaks)</LI>"
+ "<LI><B>Plain</B> shows the mail as standard plain text</LI>"
+ "Click here to switch between those view modes" ));
@@ -91,2 +100,3 @@ void ReadMail::init()
deleteButton->addTo(mailMenu);
+ deleteButton->setWhatsThis(tr("Click here to remove the selected mail"));
@@ -250,4 +260,4 @@ void ReadMail::updateView()
if (mail->files.count() == 0)
- attatchmentsButton->setEnabled(FALSE);
- else attatchmentsButton->setEnabled(TRUE);
+ attachmentButton->setEnabled(FALSE);
+ else attachmentButton->setEnabled(TRUE);
@@ -341,3 +351,3 @@ void ReadMail::shiftText()
-void ReadMail::viewAttatchments()
+void ReadMail::viewAttachments()
{
diff --git a/noncore/net/mailit/readmail.h b/noncore/net/mailit/readmail.h
index 0fe0646..df32c34 100644
--- a/noncore/net/mailit/readmail.h
+++ b/noncore/net/mailit/readmail.h
@@ -59,3 +59,3 @@ public slots:
void shiftText();
- void viewAttatchments();
+ void viewAttachments();
void reply();
@@ -82,3 +82,3 @@ private:
QTextView *emailView;
- QAction *attatchmentsButton;
+ QAction *attachmentButton;
QAction *previousButton;
diff --git a/noncore/net/mailit/smtpclient.cpp b/noncore/net/mailit/smtpclient.cpp
index b2e38e5..8a51a5b 100644
--- a/noncore/net/mailit/smtpclient.cpp
+++ b/noncore/net/mailit/smtpclient.cpp
@@ -89,3 +89,2 @@ void SmtpClient::incomingData()
response = socket->readLine();
- //qDebug(response);
@@ -97,3 +96,2 @@ void SmtpClient::incomingData()
*stream << "HELO there\r\n";
- //qDebug("HELO");
} else errorHandling(ErrUnknownResponse);
@@ -105,3 +103,2 @@ void SmtpClient::incomingData()
status = Recv;
- //qDebug("MAIL FROM: "+mailPtr->from);
} else errorHandling(ErrUnknownResponse);
@@ -115,3 +112,2 @@ void SmtpClient::incomingData()
*stream << "RCPT TO: " << *it << ">\r\n";
- //qDebug("RCPT TO: "+ *it);
status = MRcv;
@@ -125,3 +121,2 @@ void SmtpClient::incomingData()
*stream << "RCPT TO: <" << *it << ">\r\n";
- //qDebug("RCPT TO: "+ *it);
break;
@@ -136,3 +131,2 @@ void SmtpClient::incomingData()
status = Body;
- //qDebug("DATA");
emit updateStatus(tr("Sending: ") + mailPtr->subject);
@@ -150,3 +144,2 @@ void SmtpClient::incomingData()
}
- //qDebug("BODY");
} else errorHandling(ErrUnknownResponse);
@@ -165,3 +158,2 @@ void SmtpClient::incomingData()
socket->close();
- //qDebug("QUIT");
} else errorHandling(ErrUnknownResponse);
diff --git a/noncore/net/mailit/textparser.cpp b/noncore/net/mailit/textparser.cpp
index f082417..3fa5f6e 100644
--- a/noncore/net/mailit/textparser.cpp
+++ b/noncore/net/mailit/textparser.cpp
@@ -64,18 +64,29 @@ int TextParser::find(QString target, QChar sep, int pos, bool upperCase)
{
+
+ t_splitElm parsstr;
+ QString pString;
+
int atLine = 0, atPosElm = 0;
- for (int x = 0; x < totalElmCount; x++) {
- if (x >= pos) {
- if (upperCase) {
- if ((splitDone[atLine].elm[atPosElm].str.upper() == target) &&
- (splitDone[atLine].elm[atPosElm].separator == sep))
- return x;
- } else {
- if ((splitDone[atLine].elm[atPosElm].str == target) &&
- (splitDone[atLine].elm[atPosElm].separator == sep))
- return x;
+ getLineReference(pos,&atLine,&atPosElm);
+
+ for (int x = pos; x < totalElmCount; x++)
+ {
+ parsstr=splitDone[atLine].elm[atPosElm++];
+
+ if (upperCase)
+ {
+ pString=parsstr.str.upper();
+ target=target.upper();
}
+ else
+ {
+ pString=parsstr.str;
}
- atPosElm++;
- if (atPosElm >= splitDone[atLine].elmCount) { //new Line
+ if ((pString == target) && (parsstr.separator == sep))
+ {
+ return x;
+ }
+ if (atPosElm >= splitDone[atLine].elmCount)
+ { //new Line
atLine++;
@@ -84,3 +95,2 @@ int TextParser::find(QString target, QChar sep, int pos, bool upperCase)
}
-
return -1;
diff --git a/noncore/net/mailit/viewatt.cpp b/noncore/net/mailit/viewatt.cpp
index b6f5015..21885c2 100644
--- a/noncore/net/mailit/viewatt.cpp
+++ b/noncore/net/mailit/viewatt.cpp
@@ -21,2 +21,3 @@
#include "viewatt.h"
+#include <qwhatsthis.h>
#include <qpe/applnk.h>
@@ -33,2 +34,3 @@ ViewAtt::ViewAtt(QWidget *parent, const char *name, WFlags f)
connect(installButton, SIGNAL(activated()), this, SLOT(install()) );
+ installButton->setWhatsThis(tr("Click here to install the attachment to your Documents"));
@@ -39,2 +41,3 @@ ViewAtt::ViewAtt(QWidget *parent, const char *name, WFlags f)
setCentralWidget(listView);
+ QWhatsThis::add(listView,QWidget::tr("This is an overview about all attachments in the mail"));
}
diff --git a/noncore/net/mailit/writemail.cpp b/noncore/net/mailit/writemail.cpp
index a9dcb02..0336c83 100644
--- a/noncore/net/mailit/writemail.cpp
+++ b/noncore/net/mailit/writemail.cpp
@@ -20,2 +20,3 @@
#include <qmessagebox.h>
+#include <qwhatsthis.h>
#include "writemail.h"
@@ -29,3 +30,3 @@ WriteMail::WriteMail( QWidget* parent, const char* name, WFlags fl )
- addAtt = new AddAtt(0, "Add Attatchments");
+ addAtt = new AddAtt(0, "Add Attachments");
}
@@ -66,6 +67,7 @@ void WriteMail::init()
bar = new QToolBar(this);
- attatchButton = new QAction(tr("Attatchment"), Resource::loadPixmap("mailit/attach"), QString::null, 0, this, 0);
- attatchButton->addTo(bar);
- attatchButton->addTo(addMenu);
- connect( attatchButton, SIGNAL( activated() ), this, SLOT( attatchFile() ) );
+ attachButton = new QAction(tr("Attachment"), Resource::loadPixmap("mailit/attach"), QString::null, 0, this, 0);
+ attachButton->addTo(bar);
+ attachButton->addTo(addMenu);
+ connect( attachButton, SIGNAL( activated() ), this, SLOT( attachFile() ) );
+ attachButton->setWhatsThis(tr("Click here to attach files to your mail"));
@@ -75,2 +77,3 @@ void WriteMail::init()
connect( confirmButton, SIGNAL( activated() ), this, SLOT( accept() ) );
+ confirmButton->setWhatsThis(tr("This button puts your mail in the send queue"));
@@ -79,2 +82,3 @@ void WriteMail::init()
connect( newButton, SIGNAL( activated() ), this, SLOT( newMail() ) );
+ newButton->setWhatsThis(tr("Click here to create a new mail"));
@@ -90,3 +94,2 @@ void WriteMail::init()
-
subjetLabel = new QLabel( widget, "subjetLabel" );
@@ -102,2 +105,3 @@ void WriteMail::init()
grid->addWidget( subjectInput, 1, 1 );
+ QWhatsThis::add(subjectInput,QWidget::tr("The mail subject should be entered here"));
@@ -105,2 +109,3 @@ void WriteMail::init()
grid->addWidget( toInput, 0, 1 );
+ QWhatsThis::add(recipientsBox,QWidget::tr("Recipients can be entered here"));
@@ -109,3 +114,3 @@ void WriteMail::init()
grid->addWidget( ccInput, 0, 1 );
-
+ QWhatsThis::add(ccInput,QWidget::tr("If you would like to send copies of your mail they can be entered here"));
@@ -116,2 +121,3 @@ void WriteMail::init()
connect(addressButton, SIGNAL(clicked()), this, SLOT(getAddress()) );
+ QWhatsThis::add(addressButton,QWidget::tr("This button opens the address selector with all mail adresses from your OPIE addressbook"));
@@ -119,3 +125,3 @@ void WriteMail::init()
grid->addMultiCellWidget( emailInput, 2, 2, 0, 2);
-
+ QWhatsThis::add(recipientsBox,QWidget::tr("Enter your mail text here"));
@@ -128,2 +134,3 @@ void WriteMail::init()
grid->addMultiCellWidget( addressView, 3, 3, 0, 2);
+ QWhatsThis::add(recipientsBox,QWidget::tr("Chose the recipients from this list"));
@@ -133,2 +140,3 @@ void WriteMail::init()
connect(okButton, SIGNAL(clicked()), this, SLOT(addRecipients()) );
+ QWhatsThis::add(okButton,QWidget::tr("Queue your mail by clicking here"));
@@ -145,3 +153,3 @@ void WriteMail::accept()
{
- QStringList attatchedFiles, attatchmentsType;
+ QStringList attachedFiles, attachmentsType;
int idCount = 0;
@@ -198,9 +206,9 @@ void WriteMail::accept()
- attatchedFiles = addAtt->returnAttatchedFiles();
- attatchmentsType = addAtt->returnFileTypes();
+ attachedFiles = addAtt->returnattachedFiles();
+ attachmentsType = addAtt->returnFileTypes();
- QStringList::Iterator itType = attatchmentsType.begin();
+ QStringList::Iterator itType = attachmentsType.begin();
Enclosure e;
- for ( QStringList::Iterator it = attatchedFiles.begin(); it != attatchedFiles.end(); ++it ) {
+ for ( QStringList::Iterator it = attachedFiles.begin(); it != attachedFiles.end(); ++it ) {
e.id = idCount;
@@ -238,3 +246,3 @@ void WriteMail::getAddress()
-void WriteMail::attatchFile()
+void WriteMail::attachFile()
{
@@ -258,3 +266,3 @@ void WriteMail::reply(Email replyMail, bool replyAll)
pos = 0;
- mail.body.insert(pos, ">>");
+ mail.body.insert(pos, ">");
while (pos != -1) {
diff --git a/noncore/net/mailit/writemail.h b/noncore/net/mailit/writemail.h
index f193b13..921f27e 100644
--- a/noncore/net/mailit/writemail.h
+++ b/noncore/net/mailit/writemail.h
@@ -57,3 +57,3 @@ public slots:
void getAddress();
- void attatchFile();
+ void attachFile();
void addRecipients();
@@ -81,3 +81,3 @@ private:
QWidget *widget;
- QAction *attatchButton;
+ QAction *attachButton;
QAction *confirmButton;
diff --git a/noncore/unsupported/mailit/addatt.cpp b/noncore/unsupported/mailit/addatt.cpp
index d268f1f..daefac6 100644
--- a/noncore/unsupported/mailit/addatt.cpp
+++ b/noncore/unsupported/mailit/addatt.cpp
@@ -58,3 +58,3 @@ AddAtt::AddAtt(QWidget *parent, const char *name, WFlags f)
{
- setCaption("Adding attatchments");
+ setCaption("Adding attachments");
@@ -64,3 +64,3 @@ AddAtt::AddAtt(QWidget *parent, const char *name, WFlags f)
/*fileCategoryButton = new QPushButton(this);*/
- attatchButton = new QPushButton(tr("Attatch..."), buttons);
+ attachButton = new QPushButton(tr("attach..."), buttons);
removeButton = new QPushButton(tr("Remove"), buttons);
@@ -80,3 +80,3 @@ AddAtt::AddAtt(QWidget *parent, const char *name, WFlags f)
top->addWidget(buttons,1,0);
- //buttons->addWidget(attatchButton,0,0);
+ //buttons->addWidget(attachButton,0,0);
//buttons->addWidget(removeButton,0,1);
@@ -85,6 +85,6 @@ AddAtt::AddAtt(QWidget *parent, const char *name, WFlags f)
// SLOT(fileCategorySelected(int)) );*/
- connect(attatchButton, SIGNAL(clicked()), this,
- SLOT(addAttatchment()) );
+ connect(attachButton, SIGNAL(clicked()), this,
+ SLOT(addattachment()) );
connect(removeButton, SIGNAL(clicked()), this,
- SLOT(removeAttatchment()) );
+ SLOT(removeattachment()) );
@@ -93,3 +93,3 @@ AddAtt::AddAtt(QWidget *parent, const char *name, WFlags f)
connect(listView, SIGNAL(doubleClicked(QListViewItem *)), this,
- SLOT(addAttatchment()) );*/
+ SLOT(addattachment()) );*/
@@ -100,3 +100,3 @@ AddAtt::AddAtt(QWidget *parent, const char *name, WFlags f)
connect(attView, SIGNAL(doubleClicked(QListViewItem *)), this,
- SLOT(removeAttatchment()) );
+ SLOT(removeattachment()) );
@@ -123,3 +123,3 @@ void AddAtt::clear()
-void AddAtt::addAttatchment()
+void AddAtt::addattachment()
{
@@ -140,3 +140,3 @@ void AddAtt::addAttatchment()
-void AddAtt::removeAttatchment()
+void AddAtt::removeattachment()
{
@@ -194,3 +194,3 @@ void AddAtt::getFiles()
-QStringList AddAtt::returnAttatchedFiles()
+QStringList AddAtt::returnattachedFiles()
{
diff --git a/noncore/unsupported/mailit/addatt.h b/noncore/unsupported/mailit/addatt.h
index fcf3279..a365947 100644
--- a/noncore/unsupported/mailit/addatt.h
+++ b/noncore/unsupported/mailit/addatt.h
@@ -51,3 +51,3 @@ public:
AddAtt(QWidget *parent = 0, const char *name = 0, WFlags f = 0);
- QStringList returnAttatchedFiles();
+ QStringList returnattachedFiles();
QStringList returnFileTypes();
@@ -59,4 +59,4 @@ public slots:
//void fileCategorySelected(int);
- void addAttatchment();
- void removeAttatchment();
+ void addattachment();
+ void removeattachment();
void reject();
@@ -67,3 +67,3 @@ private:
QListView *attView;
- QPushButton *attatchButton, *removeButton;
+ QPushButton *attachButton, *removeButton;
QPopupMenu *fileCategories;
diff --git a/noncore/unsupported/mailit/addresslist.cpp b/noncore/unsupported/mailit/addresslist.cpp
index 8d9ab91..7d60ebf 100644
--- a/noncore/unsupported/mailit/addresslist.cpp
+++ b/noncore/unsupported/mailit/addresslist.cpp
@@ -123,3 +123,3 @@ void AddressList::read()
OContactAccess::List m_list = m_contactdb.sorted( true, 0, 0, 0 );
- //OContact* oc;
+ //OContact* oc;(*it).defaultEmail()
diff --git a/noncore/unsupported/mailit/emailclient.cpp b/noncore/unsupported/mailit/emailclient.cpp
index ad1e0b4..23059cf 100644
--- a/noncore/unsupported/mailit/emailclient.cpp
+++ b/noncore/unsupported/mailit/emailclient.cpp
@@ -25,2 +25,3 @@
#include <qaction.h>
+#include <qwhatsthis.h>
#include <qpe/resource.h>
@@ -84,2 +85,3 @@ EmailClient::EmailClient( QWidget* parent, const char* name, WFlags fl )
+ mailboxView->setCurrentTab(0); //ensure that inbox has focus
}
@@ -115,2 +117,3 @@ void EmailClient::init()
progressBar = new QProgressBar(statusBar);
+
connect(emailHandler, SIGNAL(mailboxSize(int)),
@@ -129,2 +132,3 @@ void EmailClient::init()
bar = new QToolBar(this);
+ QWhatsThis::add(bar,tr("Main operation toolbar"));
bar->setHorizontalStretchable( TRUE );
@@ -150,22 +154,6 @@ void EmailClient::init()
getMailButton = new QToolButton(Resource::loadPixmap("mailit/getmail"),tr("getMail"),tr("select account"), this,SLOT(getAllNewMail()),bar);
- //connect(setAccountlButton, SIGNAL(activated()), this, SLOT(setCurrentAccount()) );
- // setAccountButton->addTo(bar);
- //setAccountButton->addTo(mail);
-
- /*idCount = 0;
-
- for (MailAccount* accountPtr = accountList.first(); accountPtr != 0;
- accountPtr = accountList.next()) {
+ QWhatsThis::add(getMailButton,tr("Click to download mail via all available accounts.\n Press and hold to select the desired account."));
- selectAccountMenu->insertItem(accountPtr->accountName,this, SLOT(selectAccount(int)), 0, idCount);
- idCount++;
- }*/
getMailButton->setPopup(selectAccountMenu);
-
- /*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/sendqueue"), QString::null, 0, this, 0);
@@ -174,2 +162,3 @@ void EmailClient::init()
sendMailButton->addTo(mail);
+ sendMailButton->setWhatsThis("Send mail queued in the outbox");
@@ -179,2 +168,3 @@ void EmailClient::init()
composeButton->addTo(mail);
+ composeButton->setWhatsThis("Compose a new mail");
@@ -185,2 +175,4 @@ void EmailClient::init()
cancelButton->setEnabled(FALSE);
+ cancelButton->setWhatsThis("Stop the currently active mail transfer");
+
@@ -189,2 +181,3 @@ void EmailClient::init()
deleteButton->addTo(bar);
+ deleteButton->setWhatsThis("Remove the currently selected eMail(s)");
@@ -203,2 +196,4 @@ void EmailClient::init()
inboxView->setAllColumnsShowFocus(TRUE);
+ QWhatsThis::add(inboxView,QWidget::tr("This is the inbox view.\n It keeps the fetched mail which can be viewed by double clicking the entry.\n"
+ " A blue attachment icon shows whether this mail has attachments."));
@@ -217,2 +212,3 @@ void EmailClient::init()
+ QWhatsThis::add(outboxView,QWidget::tr("This is the oubox view.\n It keeps the queued mails to send which can be reviewed by double clicking the entry."));
grid_3->addWidget( outboxView, 0, 0 );
@@ -222,3 +218,2 @@ void EmailClient::init()
- mailboxView->setCurrentTab(0);
}
@@ -326,3 +321,3 @@ void EmailClient::getNewMail() {
//get any previous mails not downloaded and add to queue
-/* mailDownloadList.clear();
+ mailDownloadList.clear();
Email *mailPtr;
@@ -335,5 +330,6 @@ void EmailClient::getNewMail() {
item = (EmailListItem *) item->nextSibling();
- }*/
+ }
emailHandler->getMailHeaders();
+
}
@@ -353,6 +349,6 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk)
emailHandler->parse(mail.rawMail, lineShift, &newMail);
-
mailconf->setGroup(newMail.id);
- if (fromDisk) {
+ if (fromDisk)
+ {
newMail.downloaded = mailconf->readBoolEntry("downloaded");
@@ -361,3 +357,5 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk)
newMail.fromAccountId = mailconf->readNumEntry("fromaccountid");
- } else { //mail arrived from server
+ }
+ else
+ { //mail arrived from server
newMail.serverId = mail.serverId;
@@ -380,3 +378,3 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk)
//header is not reloaded
- if (currentAccount->synchronize)
+ if ((currentAccount)&&(currentAccount->synchronize))
currentAccount->lastServerMailCount++;
@@ -388,9 +386,11 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk)
- addressList->addContact(newMail.fromMail, newMail.from);
- } else if (!fromDisk) { //body to header arrived
- mailconf->writeEntry("downloaded", TRUE);
+ //addressList->addContact(newMail.fromMail, newMail.from);
}
+
+ mailconf->writeEntry("downloaded", newMail.downloaded);
+
QString stringMailId;
stringMailId.setNum(thisMailId);
- //se if any attatchments needs to be stored
+ //see if any attatchments needs to be stored
+
for ( ePtr=newMail.files.first(); ePtr != 0; ePtr=newMail.files.next() ) {
@@ -428,6 +428,12 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk)
}
- if (!previewingMail && !fromDisk) {
+
+ bool found=false;
+
+ if (!fromDisk)
+ {
+
Email *mailPtr;
item = (EmailListItem *) inboxView->firstChild();
- while (item != NULL) {
+ while ((item != NULL)&&(!found))
+ {
mailPtr = item->getMail();
@@ -436,2 +442,3 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk)
emit mailUpdated(item->getMail());
+ found = true;
}
@@ -439,7 +446,7 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk)
}
- } else {
- item = new EmailListItem(inboxView, newMail, TRUE);
- if (!newMail.downloaded)
- mailDownloadList.sizeInsert(newMail.serverId, newMail.size);
}
+ if ((!found)||(fromDisk)) item = new EmailListItem(inboxView, newMail, TRUE);
+
+ /*if (!newMail.downloaded)
+ mailDownloadList.sizeInsert(newMail.serverId, newMail.size);*/
@@ -452,3 +459,3 @@ void EmailClient::allMailArrived(int count)
// not previewing means all mailtransfer has been done
- if (!previewingMail) {
+ /*if (!previewingMail) {*/
if ( (allAccounts) && ( (currentAccount = accountList.next()) !=0 ) ) {
@@ -468,3 +475,3 @@ void EmailClient::allMailArrived(int count)
}
- }
+ //}
@@ -475,3 +482,3 @@ void EmailClient::allMailArrived(int count)
- emailHandler->getMailByList(&mailDownloadList);
+ //emailHandler->getMailByList(&mailDownloadList);
@@ -543,3 +550,3 @@ void EmailClient::inboxItemSelected()
{
- killTimer(timerID);
+ //killTimer(timerID);
@@ -553,3 +560,3 @@ void EmailClient::outboxItemSelected()
{
- killTimer(timerID);
+ //killTimer(timerID);
@@ -569,4 +576,2 @@ void EmailClient::readMail()
QFile f(getPath(FALSE) + "inbox.txt");
-// QFileInfo fi(f);
- //qDebug( f.name());
@@ -624,3 +629,2 @@ void EmailClient::saveMail(QString fileName, QListView *view)
item = (EmailListItem *) view->firstChild();
- //qDebug (QString("Write : ") );
QTextStream t(&f);
@@ -628,4 +632,2 @@ void EmailClient::saveMail(QString fileName, QListView *view)
mail = item->getMail();
- //qDebug(mail->rawMail);
- //qDebug(mail->recipients.first());
t << mail->rawMail;
@@ -664,62 +666,39 @@ void EmailClient::readSettings()
{
- TextParser *p;
- QString s;
- int pos, accountPos, y;
- QFile f( getPath(FALSE) + "settings.txt");
-
- if ( f.open(IO_ReadOnly) ) { // file opened successfully
- QTextStream t( &f ); // use a text stream
- s = t.read();
- f.close();
-
- p = new TextParser(s, "\n");
-
- accountPos = 0;
- while ( (accountPos = p->find("ACCOUNTSTART",';', accountPos, TRUE)) != -1 ) {
- accountPos++;
- if ( (pos = p->find("ACCOUNTNAME",':', accountPos, TRUE)) != -1 )
- account.accountName = p->getString(& ++pos, 'z', TRUE);
- if ( (pos = p->find("NAME",':', accountPos, TRUE)) != -1)
- account.name = p->getString(& ++pos, 'z', TRUE);
- if ( (pos = p->find("EMAIL",':', accountPos, TRUE)) != -1)
- account.emailAddress = p->getString(& ++pos, 'z', TRUE);
- if ( (pos = p->find("POPUSER",':', accountPos, TRUE)) != -1)
- account.popUserName = p->getString(& ++pos, 'z', TRUE);
- if ( (pos = p->find("POPPASSWORD",':', accountPos, TRUE)) != -1)
- account.popPasswd = p->getString(& ++pos, 'z', TRUE);
- if ( (pos = p->find("POPSERVER",':', accountPos, TRUE)) != -1)
- account.popServer = p->getString(& ++pos, 'z', TRUE);
- if ( (pos = p->find("SMTPSERVER",':', accountPos, TRUE)) != -1)
- account.smtpServer = p->getString(& ++pos, 'z', TRUE);
- if ( (pos = p->find("ACCOUNTID",':', accountPos, TRUE)) != -1) {
- s = p->getString(& ++pos, 'z', TRUE);
- account.id = s.toInt();
- }
+ int y,acc_count, accountPos=0;
+ mailconf->setGroup("mailitglobal");
+ acc_count=mailconf->readNumEntry("Accounts",0);
+
+ for (int accountPos = 0;accountPos<acc_count ; accountPos++)
+ {
+ mailconf->setGroup("Account_"+QString::number(accountPos+1)); //Account numbers start at 1 ...
+ account.accountName = mailconf->readEntry("AccName","");
+ account.name = mailconf->readEntry("UserName","");
+ account.emailAddress = mailconf->readEntry("Email","");
+ account.popUserName = mailconf->readEntry("POPUser","");
+ account.popPasswd = mailconf->readEntryCrypt("POPPassword","");
+ account.popServer = mailconf->readEntry("POPServer","");
+ account.smtpServer = mailconf->readEntry("SMTPServer","");
+ account.id = mailconf->readNumEntry("AccountId",0);
+ account.syncLimit = mailconf->readNumEntry("HeaderLimit",0);
account.lastServerMailCount = 0;
account.synchronize = FALSE;
- if ( (pos = p->find("SYNCHRONIZE",':', accountPos, TRUE)) != -1) {
- if (p->getString(& ++pos, 'z', TRUE).upper() == "YES") {
- account.synchronize = TRUE;
- if ( (pos = p->find("LASTSERVERMAILCOUNT",':', accountPos, TRUE)) != -1) {
- s = p->getString(& ++pos, 'z', TRUE);
- account.lastServerMailCount = s.toInt();
- }
- }
- }
- if ( (pos = p->find("SYNCLIMIT",':', accountPos, TRUE)) != -1) {
- account.syncLimit = p->getString(& ++pos, 'z', TRUE).toInt();
+ account.synchronize = (mailconf->readEntry("Synchronize","No")=="Yes");
+ if (account.synchronize)
+ {
+ mailconf->readNumEntry("LASTSERVERMAILCOUNT",0);
}
-
accountList.append(&account);
}
- delete p;
- }
+
mailconf->setGroup("mailitglobal");
- if ( (y = mailconf->readNumEntry("mailidcount", -1)) != -1) {
+
+ if ( (y = mailconf->readNumEntry("mailidcount", -1)) != -1)
+ {
mailIdCount = y;
}
- if ( (y = mailconf->readNumEntry("accountidcount", -1)) != -1) {
+ if ( (y = mailconf->readNumEntry("accountidcount", -1)) != -1)
+ {
accountIdCount = y;
@@ -730,40 +709,38 @@ void EmailClient::saveSettings()
{
-
- QString temp;
- QFile f( getPath(FALSE) + "settings.txt");
+ int acc_count=0;
MailAccount *accountPtr;
- if (! f.open(IO_WriteOnly) ) {
- qWarning("could not save settings file");
+
+ if (!mailconf)
+ {
+ qWarning("could not save settings");
return;
}
- QTextStream t(&f);
- t << "#Settings for OPIE Mailit program\n";
for (accountPtr = accountList.first(); accountPtr != 0;
- accountPtr = accountList.next()) {
-
- t << "accountStart;\n";
- t << "AccountName: " + accountPtr->accountName + "\n";
- t << "Name: " + accountPtr->name + "\n";
- t << "Email: " + accountPtr->emailAddress + "\n";
- t << "POPUser: " + accountPtr->popUserName + "\n";
- t << "POPPAssword: " + accountPtr->popPasswd + "\n";
- t << "POPServer: " + accountPtr->popServer + "\n";
- t << "SMTPServer: " + accountPtr->smtpServer + "\n";
- t << "AccountId: " << accountPtr->id << "\n";
- if (accountPtr->synchronize) {
- t << "Synchronize: Yes\n";
- t << "LastServerMailCount: ";
- t << accountPtr->lastServerMailCount << "\n";
- } else {
- t << "Synchronize: No\n";
+ accountPtr = accountList.next())
+ {
+ mailconf->setGroup("Account_"+QString::number(++acc_count));
+ mailconf->writeEntry("AccName",accountPtr->accountName );
+ mailconf->writeEntry("UserName",accountPtr->name);
+ mailconf->writeEntry("Email",accountPtr->emailAddress);
+ mailconf->writeEntry("POPUser",accountPtr->popUserName);
+ mailconf->writeEntryCrypt("POPPassword",accountPtr->popPasswd);
+ mailconf->writeEntry("POPServer",accountPtr->popServer);
+ mailconf->writeEntry("SMTPServer",accountPtr->smtpServer);
+ mailconf->writeEntry("AccountId",accountPtr->id);
+ if (accountPtr->synchronize)
+ {
+ mailconf->writeEntry("Synchronize","Yes");
+ mailconf->writeEntry("HeaderLimit",accountPtr->syncLimit);
+ mailconf->writeEntry("LastServerMailCount",accountPtr->lastServerMailCount);
+ }
+ else
+ {
+ mailconf->writeEntry("Synchronize", "No");
}
- t << "SyncLimit: ";
- t << accountPtr->syncLimit << "\n";
- t << "accountEnd;\n";
}
- f.close();
mailconf->setGroup("mailitglobal");
+ mailconf->writeEntry("Accounts",acc_count);
mailconf->writeEntry("mailidcount", mailIdCount);
diff --git a/noncore/unsupported/mailit/emailhandler.cpp b/noncore/unsupported/mailit/emailhandler.cpp
index f6c6d60..b180051 100644
--- a/noncore/unsupported/mailit/emailhandler.cpp
+++ b/noncore/unsupported/mailit/emailhandler.cpp
@@ -106,3 +106,3 @@ void EmailHandler::getMail()
headers = FALSE;
- popClient->headersOnly(headers, 0);
+ //popClient->headersOnly(headers, 0);
popClient->newConnection(mailAccount.popServer, 110);
@@ -113,7 +113,3 @@ void EmailHandler::getMailHeaders()
popClient->setAccount(mailAccount.popUserName, mailAccount.popPasswd);
- if (mailAccount.synchronize) {
- popClient->setSynchronize(mailAccount.lastServerMailCount);
- } else {
- popClient->removeSynchronize();
- }
+ mailAccount.synchronize ? popClient->setSynchronize(mailAccount.lastServerMailCount): popClient->removeSynchronize();
@@ -137,3 +133,3 @@ void EmailHandler::getMailByList(MailList *mailList)
-void EmailHandler::messageArrived(const QString &message, int id, uint size, bool complete)
+void EmailHandler::messageArrived(const QString &message, int id, uint size, bool incomplete)
{
@@ -144,3 +140,3 @@ void EmailHandler::messageArrived(const QString &message, int id, uint size, boo
mail.size = size;
- mail.downloaded = complete;
+ mail.downloaded = incomplete;
@@ -188,2 +184,3 @@ bool EmailHandler::parse(QString in, QString lineShift, Email *mail)
pos++;
+
mail->fromMail = p.getString(&pos, '>', false);
@@ -201,10 +198,29 @@ bool EmailHandler::parse(QString in, QString lineShift, Email *mail)
- //@@@ToDo: Rewrite the parser as To: stops at the first occurence- which is Delivered-To:
- if ((pos = p.find("TO",':', 0, TRUE)) != -1)
+ pos=0;
+
+ //Search for To: after the FROM: attribute to prevent hitting the Delivered-To:
+ while((pos = p.find("TO",':', pos+1, TRUE))!=-1)
+ {
+ QString rec;
+
+ if (p.separatorAt(pos-1)!='-')
{
pos++;
+ mail->recipients.append(p.getString(&pos, '\r', TRUE));
+ }
+ /*else {
+ if ((p.separatorAt(pos) == '<')|| (p.separatorAt(pos) == ' ')) //No name.. nasty
+ pos++;
+ pos++;
+ mail->fromMail = p.getString(&pos, 'z', TRUE);
+ if (mail->fromMail.at(mail->fromMail.length()-1) == '>')
+ mail->fromMail.truncate(mail->fromMail.length() - 1);
+ mail->from=mail->fromMail;
+ }
mail->recipients.append (p.getString(&pos, 'z', TRUE) );
+ }*/
}
+ //
+ //if (pos==-1) mail->recipients.append (tr("undisclosed recipients") );
- //@@@ToDo: Rewrite the parser as To: stops at the first occurence- which is Delivered-To:
if ((pos = p.find("CC",':', 0, TRUE)) != -1)
@@ -215,3 +231,2 @@ bool EmailHandler::parse(QString in, QString lineShift, Email *mail)
-
if ((pos = p.find("SUBJECT",':', 0, TRUE)) != -1) {
@@ -220,5 +235,6 @@ bool EmailHandler::parse(QString in, QString lineShift, Email *mail)
}
+
if ((pos = p.find("DATE",':', 0, TRUE)) != -1) {
pos++;
- mail->date = p.getString(&pos, 'z', true);
+ mail->date = p.getString(&pos, 'z', TRUE);
}
diff --git a/noncore/unsupported/mailit/emaillistitem.cpp b/noncore/unsupported/mailit/emaillistitem.cpp
index a325766..b925a1c 100644
--- a/noncore/unsupported/mailit/emaillistitem.cpp
+++ b/noncore/unsupported/mailit/emaillistitem.cpp
@@ -40,2 +40,3 @@ EmailListItem::EmailListItem(QListView *parent, Email mailIn, bool inbox)
setText(1, mail.subject);
+ setText(2,mail.date);
@@ -45,2 +46,3 @@ EmailListItem::EmailListItem(QListView *parent, Email mailIn, bool inbox)
}
+
selected = FALSE;
diff --git a/noncore/unsupported/mailit/mailitwindow.cpp b/noncore/unsupported/mailit/mailitwindow.cpp
index ef5fc09..7181adf 100644
--- a/noncore/unsupported/mailit/mailitwindow.cpp
+++ b/noncore/unsupported/mailit/mailitwindow.cpp
@@ -19,2 +19,3 @@
**********************************************************************/
+#include <qwhatsthis.h>
#include "mailitwindow.h"
@@ -22,3 +23,3 @@
MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags fl)
- : QMainWindow(parent, name, fl)
+ : QMainWindow(parent, name, WStyle_ContextHelp)
{
@@ -28,3 +29,3 @@ MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags fl)
setCentralWidget(views);
-
+ QWhatsThis::add(views,tr("Central view area"));
emailClient = new EmailClient(views, "client");
@@ -142,24 +143 @@ void MailItWindow::setDocument(const QString &_address)
}
-
-/*void MailItWindow::reply(Email& mail)
-{
- qDebug("####EmailClient: 0 reached");
- composeReply(mail,(bool&)FALSE);
-}
-
-void MailItWindow::replyAll(Email& mail)
-{
- qDebug("####EmailClient: 1 reached");
- composeReply(mail,(bool&)TRUE);
-}
-
-void MailItWindow::forward(Email& mail)
-{
- qDebug("####EmailClient: 2 reached");
-}
-
-void MailItWindow::remove(Email&)
-{
- qDebug("####EmailClient: 3 reached");
- //emit removeItem(eli,(bool&)TRUE);
-} */ \ No newline at end of file
diff --git a/noncore/unsupported/mailit/popclient.cpp b/noncore/unsupported/mailit/popclient.cpp
index f9cc337..67306be 100644
--- a/noncore/unsupported/mailit/popclient.cpp
+++ b/noncore/unsupported/mailit/popclient.cpp
@@ -121,3 +121,2 @@ void PopClient::incomingData()
response = socket->readLine();
- //qDebug(response +" %d", status);
@@ -133,14 +132,4 @@ void PopClient::incomingData()
md5Source = timeStamp + popPassword;
- //qDebug( md5Source);
-// for( int i = 0; i < md5Source.length(); i++) {
-// buff[i] = (QChar)md5Source[i];
-// }
md5_buffer( (char const *)md5Source, md5Source.length(),&md5Digest[0]);
-// md5_buffer(char const *buffer, unsigned int len, char *digest);
-
-// MD5_Init( &ctx);
-// MD5_Update( &ctx, buff, sizeof( buff) );
-// MD5_Final( md5Digest, &ctx);
-// MD5( buff, md5Source.length(), md5Digest);
@@ -166,3 +155,3 @@ void PopClient::incomingData()
}
- //password shhh. don't tell anyone (implement APOP...)
+
case Pass: {
@@ -250,3 +239,4 @@ void PopClient::incomingData()
if (status != Quit) {
- if (!preview || mailSize <= headerLimit) {
+ if (mailSize <= headerLimit)
+ {
*stream << "RETR " << messageCount << "\r\n";
@@ -285,3 +275,5 @@ void PopClient::incomingData()
//complete mail downloaded
- if ( (!preview ) || ((preview) && (mailSize <= headerLimit)) ){
+ //if ( (!preview ) || ((preview) && (mailSize <= headerLimit)) ){
+ if ( mailSize <= headerLimit)
+ {
emit newMessage(message, messageCount-1, mailSize, TRUE);
diff --git a/noncore/unsupported/mailit/readmail.cpp b/noncore/unsupported/mailit/readmail.cpp
index dc98a6f..4eae7f6 100644
--- a/noncore/unsupported/mailit/readmail.cpp
+++ b/noncore/unsupported/mailit/readmail.cpp
@@ -61,2 +61,3 @@ void ReadMail::init()
connect(replyButton, SIGNAL(activated()), this, SLOT(reply()) );
+ replyButton->setWhatsThis(tr("Click here to reply to the selected mail"));
@@ -65,2 +66,3 @@ void ReadMail::init()
connect(forwardButton, SIGNAL(activated()), this, SLOT(forward()) );
+ forwardButton->setWhatsThis(tr("Click here to forward the selected mail"));
@@ -70,2 +72,3 @@ void ReadMail::init()
previousButton->addTo(viewMenu);
+ previousButton->setWhatsThis(tr("Read the previous mail in the list"));
@@ -75,8 +78,10 @@ void ReadMail::init()
nextButton->addTo(viewMenu);
+ previousButton->setWhatsThis(tr("Read the next mail in the list"));
- attatchmentsButton = new QAction( tr( "Attatchments" ), Resource::loadPixmap( "mailit/attach" ), QString::null, 0, this, 0 );
- connect( attatchmentsButton, SIGNAL( activated() ), this,
- SLOT( viewAttatchments() ) );
- attatchmentsButton->addTo(bar);
- attatchmentsButton->addTo(viewMenu);
+ attachmentButton = new QAction( tr( "Attatchments" ), Resource::loadPixmap( "mailit/attach" ), QString::null, 0, this, 0 );
+ connect( attachmentButton, SIGNAL( activated() ), this,
+ SLOT( viewAttachments() ) );
+ attachmentButton->addTo(bar);
+ attachmentButton->addTo(viewMenu);
+ attachmentButton->setWhatsThis(tr("Click here to add attachments to your mail"));
@@ -86,2 +91,6 @@ void ReadMail::init()
plainTextButton->addTo(viewMenu);
+ plainTextButton->setWhatsThis(tr("The mail view has 2 modes:\n"
+ "<LI><B>RichText</B> shows the mail as HTML with reach features (no standard line breaks)</LI>"
+ "<LI><B>Plain</B> shows the mail as standard plain text</LI>"
+ "Click here to switch between those view modes" ));
@@ -91,2 +100,3 @@ void ReadMail::init()
deleteButton->addTo(mailMenu);
+ deleteButton->setWhatsThis(tr("Click here to remove the selected mail"));
@@ -250,4 +260,4 @@ void ReadMail::updateView()
if (mail->files.count() == 0)
- attatchmentsButton->setEnabled(FALSE);
- else attatchmentsButton->setEnabled(TRUE);
+ attachmentButton->setEnabled(FALSE);
+ else attachmentButton->setEnabled(TRUE);
@@ -341,3 +351,3 @@ void ReadMail::shiftText()
-void ReadMail::viewAttatchments()
+void ReadMail::viewAttachments()
{
diff --git a/noncore/unsupported/mailit/readmail.h b/noncore/unsupported/mailit/readmail.h
index 0fe0646..df32c34 100644
--- a/noncore/unsupported/mailit/readmail.h
+++ b/noncore/unsupported/mailit/readmail.h
@@ -59,3 +59,3 @@ public slots:
void shiftText();
- void viewAttatchments();
+ void viewAttachments();
void reply();
@@ -82,3 +82,3 @@ private:
QTextView *emailView;
- QAction *attatchmentsButton;
+ QAction *attachmentButton;
QAction *previousButton;
diff --git a/noncore/unsupported/mailit/smtpclient.cpp b/noncore/unsupported/mailit/smtpclient.cpp
index b2e38e5..8a51a5b 100644
--- a/noncore/unsupported/mailit/smtpclient.cpp
+++ b/noncore/unsupported/mailit/smtpclient.cpp
@@ -89,3 +89,2 @@ void SmtpClient::incomingData()
response = socket->readLine();
- //qDebug(response);
@@ -97,3 +96,2 @@ void SmtpClient::incomingData()
*stream << "HELO there\r\n";
- //qDebug("HELO");
} else errorHandling(ErrUnknownResponse);
@@ -105,3 +103,2 @@ void SmtpClient::incomingData()
status = Recv;
- //qDebug("MAIL FROM: "+mailPtr->from);
} else errorHandling(ErrUnknownResponse);
@@ -115,3 +112,2 @@ void SmtpClient::incomingData()
*stream << "RCPT TO: " << *it << ">\r\n";
- //qDebug("RCPT TO: "+ *it);
status = MRcv;
@@ -125,3 +121,2 @@ void SmtpClient::incomingData()
*stream << "RCPT TO: <" << *it << ">\r\n";
- //qDebug("RCPT TO: "+ *it);
break;
@@ -136,3 +131,2 @@ void SmtpClient::incomingData()
status = Body;
- //qDebug("DATA");
emit updateStatus(tr("Sending: ") + mailPtr->subject);
@@ -150,3 +144,2 @@ void SmtpClient::incomingData()
}
- //qDebug("BODY");
} else errorHandling(ErrUnknownResponse);
@@ -165,3 +158,2 @@ void SmtpClient::incomingData()
socket->close();
- //qDebug("QUIT");
} else errorHandling(ErrUnknownResponse);
diff --git a/noncore/unsupported/mailit/textparser.cpp b/noncore/unsupported/mailit/textparser.cpp
index f082417..3fa5f6e 100644
--- a/noncore/unsupported/mailit/textparser.cpp
+++ b/noncore/unsupported/mailit/textparser.cpp
@@ -64,18 +64,29 @@ int TextParser::find(QString target, QChar sep, int pos, bool upperCase)
{
+
+ t_splitElm parsstr;
+ QString pString;
+
int atLine = 0, atPosElm = 0;
- for (int x = 0; x < totalElmCount; x++) {
- if (x >= pos) {
- if (upperCase) {
- if ((splitDone[atLine].elm[atPosElm].str.upper() == target) &&
- (splitDone[atLine].elm[atPosElm].separator == sep))
- return x;
- } else {
- if ((splitDone[atLine].elm[atPosElm].str == target) &&
- (splitDone[atLine].elm[atPosElm].separator == sep))
- return x;
+ getLineReference(pos,&atLine,&atPosElm);
+
+ for (int x = pos; x < totalElmCount; x++)
+ {
+ parsstr=splitDone[atLine].elm[atPosElm++];
+
+ if (upperCase)
+ {
+ pString=parsstr.str.upper();
+ target=target.upper();
}
+ else
+ {
+ pString=parsstr.str;
}
- atPosElm++;
- if (atPosElm >= splitDone[atLine].elmCount) { //new Line
+ if ((pString == target) && (parsstr.separator == sep))
+ {
+ return x;
+ }
+ if (atPosElm >= splitDone[atLine].elmCount)
+ { //new Line
atLine++;
@@ -84,3 +95,2 @@ int TextParser::find(QString target, QChar sep, int pos, bool upperCase)
}
-
return -1;
diff --git a/noncore/unsupported/mailit/viewatt.cpp b/noncore/unsupported/mailit/viewatt.cpp
index b6f5015..21885c2 100644
--- a/noncore/unsupported/mailit/viewatt.cpp
+++ b/noncore/unsupported/mailit/viewatt.cpp
@@ -21,2 +21,3 @@
#include "viewatt.h"
+#include <qwhatsthis.h>
#include <qpe/applnk.h>
@@ -33,2 +34,3 @@ ViewAtt::ViewAtt(QWidget *parent, const char *name, WFlags f)
connect(installButton, SIGNAL(activated()), this, SLOT(install()) );
+ installButton->setWhatsThis(tr("Click here to install the attachment to your Documents"));
@@ -39,2 +41,3 @@ ViewAtt::ViewAtt(QWidget *parent, const char *name, WFlags f)
setCentralWidget(listView);
+ QWhatsThis::add(listView,QWidget::tr("This is an overview about all attachments in the mail"));
}
diff --git a/noncore/unsupported/mailit/writemail.cpp b/noncore/unsupported/mailit/writemail.cpp
index a9dcb02..0336c83 100644
--- a/noncore/unsupported/mailit/writemail.cpp
+++ b/noncore/unsupported/mailit/writemail.cpp
@@ -20,2 +20,3 @@
#include <qmessagebox.h>
+#include <qwhatsthis.h>
#include "writemail.h"
@@ -29,3 +30,3 @@ WriteMail::WriteMail( QWidget* parent, const char* name, WFlags fl )
- addAtt = new AddAtt(0, "Add Attatchments");
+ addAtt = new AddAtt(0, "Add Attachments");
}
@@ -66,6 +67,7 @@ void WriteMail::init()
bar = new QToolBar(this);
- attatchButton = new QAction(tr("Attatchment"), Resource::loadPixmap("mailit/attach"), QString::null, 0, this, 0);
- attatchButton->addTo(bar);
- attatchButton->addTo(addMenu);
- connect( attatchButton, SIGNAL( activated() ), this, SLOT( attatchFile() ) );
+ attachButton = new QAction(tr("Attachment"), Resource::loadPixmap("mailit/attach"), QString::null, 0, this, 0);
+ attachButton->addTo(bar);
+ attachButton->addTo(addMenu);
+ connect( attachButton, SIGNAL( activated() ), this, SLOT( attachFile() ) );
+ attachButton->setWhatsThis(tr("Click here to attach files to your mail"));
@@ -75,2 +77,3 @@ void WriteMail::init()
connect( confirmButton, SIGNAL( activated() ), this, SLOT( accept() ) );
+ confirmButton->setWhatsThis(tr("This button puts your mail in the send queue"));
@@ -79,2 +82,3 @@ void WriteMail::init()
connect( newButton, SIGNAL( activated() ), this, SLOT( newMail() ) );
+ newButton->setWhatsThis(tr("Click here to create a new mail"));
@@ -90,3 +94,2 @@ void WriteMail::init()
-
subjetLabel = new QLabel( widget, "subjetLabel" );
@@ -102,2 +105,3 @@ void WriteMail::init()
grid->addWidget( subjectInput, 1, 1 );
+ QWhatsThis::add(subjectInput,QWidget::tr("The mail subject should be entered here"));
@@ -105,2 +109,3 @@ void WriteMail::init()
grid->addWidget( toInput, 0, 1 );
+ QWhatsThis::add(recipientsBox,QWidget::tr("Recipients can be entered here"));
@@ -109,3 +114,3 @@ void WriteMail::init()
grid->addWidget( ccInput, 0, 1 );
-
+ QWhatsThis::add(ccInput,QWidget::tr("If you would like to send copies of your mail they can be entered here"));
@@ -116,2 +121,3 @@ void WriteMail::init()
connect(addressButton, SIGNAL(clicked()), this, SLOT(getAddress()) );
+ QWhatsThis::add(addressButton,QWidget::tr("This button opens the address selector with all mail adresses from your OPIE addressbook"));
@@ -119,3 +125,3 @@ void WriteMail::init()
grid->addMultiCellWidget( emailInput, 2, 2, 0, 2);
-
+ QWhatsThis::add(recipientsBox,QWidget::tr("Enter your mail text here"));
@@ -128,2 +134,3 @@ void WriteMail::init()
grid->addMultiCellWidget( addressView, 3, 3, 0, 2);
+ QWhatsThis::add(recipientsBox,QWidget::tr("Chose the recipients from this list"));
@@ -133,2 +140,3 @@ void WriteMail::init()
connect(okButton, SIGNAL(clicked()), this, SLOT(addRecipients()) );
+ QWhatsThis::add(okButton,QWidget::tr("Queue your mail by clicking here"));
@@ -145,3 +153,3 @@ void WriteMail::accept()
{
- QStringList attatchedFiles, attatchmentsType;
+ QStringList attachedFiles, attachmentsType;
int idCount = 0;
@@ -198,9 +206,9 @@ void WriteMail::accept()
- attatchedFiles = addAtt->returnAttatchedFiles();
- attatchmentsType = addAtt->returnFileTypes();
+ attachedFiles = addAtt->returnattachedFiles();
+ attachmentsType = addAtt->returnFileTypes();
- QStringList::Iterator itType = attatchmentsType.begin();
+ QStringList::Iterator itType = attachmentsType.begin();
Enclosure e;
- for ( QStringList::Iterator it = attatchedFiles.begin(); it != attatchedFiles.end(); ++it ) {
+ for ( QStringList::Iterator it = attachedFiles.begin(); it != attachedFiles.end(); ++it ) {
e.id = idCount;
@@ -238,3 +246,3 @@ void WriteMail::getAddress()
-void WriteMail::attatchFile()
+void WriteMail::attachFile()
{
@@ -258,3 +266,3 @@ void WriteMail::reply(Email replyMail, bool replyAll)
pos = 0;
- mail.body.insert(pos, ">>");
+ mail.body.insert(pos, ">");
while (pos != -1) {
diff --git a/noncore/unsupported/mailit/writemail.h b/noncore/unsupported/mailit/writemail.h
index f193b13..921f27e 100644
--- a/noncore/unsupported/mailit/writemail.h
+++ b/noncore/unsupported/mailit/writemail.h
@@ -57,3 +57,3 @@ public slots:
void getAddress();
- void attatchFile();
+ void attachFile();
void addRecipients();
@@ -81,3 +81,3 @@ private:
QWidget *widget;
- QAction *attatchButton;
+ QAction *attachButton;
QAction *confirmButton;