summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2003-06-09 01:37:23 (UTC)
committer llornkcor <llornkcor>2003-06-09 01:37:23 (UTC)
commit364e6e65b4c3b4ceec2b1b6688f2ca2b3dce4560 (patch) (side-by-side diff)
tree1be5d3150c2bda4b3a55f9e7d2529d73fe6d72db
parent5ee1c7dff5679454d46e3c5bd5747c60ea63c959 (diff)
downloadopie-364e6e65b4c3b4ceec2b1b6688f2ca2b3dce4560.zip
opie-364e6e65b4c3b4ceec2b1b6688f2ca2b3dce4560.tar.gz
opie-364e6e65b4c3b4ceec2b1b6688f2ca2b3dce4560.tar.bz2
patch from wim delvaux. fix from me
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/mailit/addatt.cpp4
-rw-r--r--noncore/net/mailit/emailclient.cpp73
-rw-r--r--noncore/net/mailit/emailclient.h4
-rw-r--r--noncore/net/mailit/emailhandler.cpp10
-rw-r--r--noncore/net/mailit/emailhandler.h4
-rw-r--r--noncore/net/mailit/mailit.pro1
-rw-r--r--noncore/net/mailit/mailitwindow.cpp4
-rw-r--r--noncore/net/mailit/maillist.cpp160
-rw-r--r--noncore/net/mailit/popclient.cpp16
-rw-r--r--noncore/net/mailit/popclient.h3
-rw-r--r--noncore/net/mailit/smtpclient.cpp35
-rw-r--r--noncore/net/mailit/smtpclient.h3
-rw-r--r--noncore/net/mailit/viewatt.cpp14
-rw-r--r--noncore/net/mailit/writemail.cpp598
-rw-r--r--noncore/unsupported/mailit/addatt.cpp4
-rw-r--r--noncore/unsupported/mailit/emailclient.cpp73
-rw-r--r--noncore/unsupported/mailit/emailclient.h4
-rw-r--r--noncore/unsupported/mailit/emailhandler.cpp10
-rw-r--r--noncore/unsupported/mailit/emailhandler.h4
-rw-r--r--noncore/unsupported/mailit/mailit.pro1
-rw-r--r--noncore/unsupported/mailit/mailitwindow.cpp4
-rw-r--r--noncore/unsupported/mailit/maillist.cpp160
-rw-r--r--noncore/unsupported/mailit/popclient.cpp16
-rw-r--r--noncore/unsupported/mailit/popclient.h3
-rw-r--r--noncore/unsupported/mailit/smtpclient.cpp35
-rw-r--r--noncore/unsupported/mailit/smtpclient.h3
-rw-r--r--noncore/unsupported/mailit/viewatt.cpp14
-rw-r--r--noncore/unsupported/mailit/writemail.cpp598
28 files changed, 948 insertions, 910 deletions
diff --git a/noncore/net/mailit/addatt.cpp b/noncore/net/mailit/addatt.cpp
index daefac6..19ac58f 100644
--- a/noncore/net/mailit/addatt.cpp
+++ b/noncore/net/mailit/addatt.cpp
@@ -56,7 +56,7 @@ FileItem::~FileItem()
AddAtt::AddAtt(QWidget *parent, const char *name, WFlags f)
: QDialog(parent, name, f)
{
- setCaption("Adding attachments");
+ setCaption(tr("Adding attachments") );
QGridLayout *top = new QGridLayout(this, 1,1 );
@@ -122,7 +122,7 @@ void AddAtt::clear()
}*/
void AddAtt::addattachment()
-{
+{ // ### FIXME wrong use -zecke
OFileDialog ofs("Attachments",this,0,0,"/root/Documents");
ofs.showMaximized();
diff --git a/noncore/net/mailit/emailclient.cpp b/noncore/net/mailit/emailclient.cpp
index da1226c..749a4e9 100644
--- a/noncore/net/mailit/emailclient.cpp
+++ b/noncore/net/mailit/emailclient.cpp
@@ -59,10 +59,10 @@ EmailClient::EmailClient( QWidget* parent, const char* name, WFlags fl )
connect(emailHandler, SIGNAL(mailSent()), this, SLOT(mailSent()) );
- connect(emailHandler, SIGNAL(smtpError(int)), this,
- SLOT(smtpError(int)) );
- connect(emailHandler, SIGNAL(popError(int)), this,
- SLOT(popError(int)) );
+ connect(emailHandler, SIGNAL(smtpError(int,const QString &)), this,
+ SLOT(smtpError(int,const QString &)) );
+ connect(emailHandler, SIGNAL(popError(int,const QString &)), this,
+ SLOT(popError(int,const QString &)) );
connect(inboxView, SIGNAL(doubleClicked(QListViewItem *)), this, SLOT(inboxItemSelected()) );
connect(outboxView, SIGNAL(doubleClicked(QListViewItem *)), this, SLOT(outboxItemSelected()) );
@@ -480,7 +480,7 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk)
}
-void EmailClient::allMailArrived(int count)
+void EmailClient::allMailArrived(int /*count*/)
{
// not previewing means all mailtransfer has been done
/*if (!previewingMail) {*/
@@ -518,19 +518,21 @@ void EmailClient::moveMailFront(Email *mailPtr)
}
}
-void EmailClient::smtpError(int code)
+void EmailClient::smtpError(int code, const QString & Msg)
{
QString temp;
- if (code == ErrUnknownResponse)
- temp = "Unknown response from server";
-
- if (code == QSocket::ErrHostNotFound)
- temp = "host not found";
- if (code == QSocket::ErrConnectionRefused)
- temp = "connection refused";
- if (code == QSocket::ErrSocketRead)
- temp = "socket packet error";
+ if (code == ErrUnknownResponse) {
+ temp = tr("<qt>Unknown response from server</qt>");
+ if( ! Msg.isEmpty() )
+ temp += Msg;
+ } else if (code == QSocket::ErrHostNotFound) {
+ temp = tr("<qt>host not found</qt>");
+ } else if (code == QSocket::ErrConnectionRefused) {
+ temp = tr("<qt>connection refused</qt>");
+ } else if (code == QSocket::ErrSocketRead) {
+ temp = tr("<qt>socket packet error</qt>");
+ }
if (code != ErrCancel) {
QMessageBox::warning(qApp->activeWindow(), "Sending error", temp, "OK\n");
@@ -544,24 +546,27 @@ void EmailClient::smtpError(int code)
quedMessages.clear();
}
-void EmailClient::popError(int code)
+void EmailClient::popError(int code, const QString & Msg)
{
QString temp;
- if (code == ErrUnknownResponse)
- temp = "Unknown response from server";
- if (code == ErrLoginFailed)
- temp = "Login failed\nCheck user name and password";
-
- if (code == QSocket::ErrHostNotFound)
- temp = "host not found";
- if (code == QSocket::ErrConnectionRefused)
- temp = "connection refused";
- if (code == QSocket::ErrSocketRead)
- temp = "socket packet error";
-
+ if (code == ErrUnknownResponse) {
+ temp = tr("<qt>Unknown response from server</qt>");
+ if( ! Msg.isEmpty() )
+ temp += Msg;
+ } else if (code == ErrLoginFailed) {
+ temp = tr("<qt>Login failed\nCheck user name and password</qt>");
+ } else if (code == QSocket::ErrHostNotFound) {
+ temp = tr("<qt>host not found</qt>");
+ } else if (code == QSocket::ErrConnectionRefused) {
+ temp = tr("<qt>connection refused</qt>");
+ } else if (code == QSocket::ErrSocketRead) {
+ temp = tr("<qt>socket packet error</qt>");
+ }
+
if (code != ErrCancel) {
- QMessageBox::warning(qApp->activeWindow(), "Receiving error", temp, "OK\n");
+ QMessageBox::warning(qApp->activeWindow(), tr("Receiving error"), temp, tr("OK\n"));
+
} else {
status2Label->setText("Aborted by user");
}
@@ -898,7 +903,7 @@ void EmailClient::setMailSize(int size)
progressBar->setTotalSteps(size);
}
-void EmailClient::setTotalSize(int size)
+void EmailClient::setTotalSize(int /*size*/)
{
}
@@ -920,7 +925,7 @@ void EmailClient::deleteItem()
QListView* box;
EmailListItem* eli;
- int pos;
+ // int pos;
inbox ? box=inboxView : box=outboxView;
@@ -946,7 +951,7 @@ void EmailClient::inboxItemReleased()
/*void EmailClient::timerEvent(QTimerEvent *e)
{
- /*killTimer(timerID);
+ //killTimer(timerID);
QPopupMenu *action = new QPopupMenu(this);
@@ -991,11 +996,11 @@ void EmailClient::download(Email* mail)
tr("No account associated"), tr("There is no active account \nassociated to this mail\n it can not be downloaded"), "Abort\n");
}
-void EmailClient::receive(const QCString& msg, const QByteArray& data)
+void EmailClient::receive(const QCString& /*msg*/, const QByteArray& /*data*/)
{
/*if (msg=="getMail()")
{
- /*QDialog qd(qApp->activeWindow(),"Getting mail",true);
+ //QDialog qd(qApp->activeWindow(),"Getting mail",true);
QVBoxLayout *vbProg = new QVBoxLayout( &qd );
initStatusBar(&qd);
diff --git a/noncore/net/mailit/emailclient.h b/noncore/net/mailit/emailclient.h
index c98cfce..80c6d31 100644
--- a/noncore/net/mailit/emailclient.h
+++ b/noncore/net/mailit/emailclient.h
@@ -98,8 +98,8 @@ public slots:
void deleteItem();
void getNewMail();
void getAllNewMail();
- void smtpError(int code);
- void popError(int code);
+ void smtpError(int code, const QString & Msg );
+ void popError(int code, const QString & Msg);
void inboxItemSelected();
void outboxItemSelected();
void inboxItemPressed();
diff --git a/noncore/net/mailit/emailhandler.cpp b/noncore/net/mailit/emailhandler.cpp
index 39f693d..5b8bda1 100644
--- a/noncore/net/mailit/emailhandler.cpp
+++ b/noncore/net/mailit/emailhandler.cpp
@@ -44,14 +44,14 @@ EmailHandler::EmailHandler()
smtpClient = new SmtpClient();
popClient = new PopClient();
- connect(smtpClient, SIGNAL(errorOccurred(int)), this,
- SIGNAL(smtpError(int)) );
+ connect(smtpClient, SIGNAL(errorOccurred(int, const QString &)), this,
+ SIGNAL(smtpError(int, const QString &)) );
connect(smtpClient, SIGNAL(mailSent()), this, SIGNAL(mailSent()) );
connect(smtpClient, SIGNAL(updateStatus(const QString &)), this,
SIGNAL(updateSmtpStatus(const QString &)) );
- connect(popClient, SIGNAL(errorOccurred(int)), this,
- SIGNAL(popError(int)) );
+ connect(popClient, SIGNAL(errorOccurred(int, const QString &)), this,
+ SIGNAL(popError(int, const QString &)) );
connect(popClient, SIGNAL(newMessage(const QString &, int, uint, bool)),
this, SLOT(messageArrived(const QString &, int, uint, bool)) );
connect(popClient, SIGNAL(updateStatus(const QString &)), this,
@@ -162,7 +162,7 @@ bool EmailHandler::parse(const QString &in, const QString &lineShift, Email *mai
mail->files.setAutoDelete(TRUE);
temp = lineShift + "." + lineShift;
-
+
if (in.right(temp.length()) != temp) {
mail->rawMail += temp;
}
diff --git a/noncore/net/mailit/emailhandler.h b/noncore/net/mailit/emailhandler.h
index e4e7f46..74a8e4c 100644
--- a/noncore/net/mailit/emailhandler.h
+++ b/noncore/net/mailit/emailhandler.h
@@ -127,8 +127,8 @@ public:
signals:
void mailSent();
- void smtpError(int);
- void popError(int);
+ void smtpError(int, const QString & Msg );
+ void popError(int, const QString & Msg );
void mailArrived(const Email &, bool);
void updatePopStatus(const QString &);
void updateSmtpStatus(const QString &);
diff --git a/noncore/net/mailit/mailit.pro b/noncore/net/mailit/mailit.pro
index cfbda36..5e9a83a 100644
--- a/noncore/net/mailit/mailit.pro
+++ b/noncore/net/mailit/mailit.pro
@@ -1,4 +1,5 @@
TEMPLATE = app
+TARGET = mailit
CONFIG = qt warn_on release
HEADERS = emailclient.h \
emailhandler.h \
diff --git a/noncore/net/mailit/mailitwindow.cpp b/noncore/net/mailit/mailitwindow.cpp
index f945a0f..6e298c7 100644
--- a/noncore/net/mailit/mailitwindow.cpp
+++ b/noncore/net/mailit/mailitwindow.cpp
@@ -21,10 +21,10 @@
#include <qmessagebox.h>
#include "mailitwindow.h"
-MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags fl)
+MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags /*fl*/)
: QMainWindow(parent, name, WStyle_ContextHelp)
{
- currentCaption = "Mailit";
+ currentCaption = tr("Mailit");
setCaption(tr(currentCaption));
views = new QWidgetStack(this);
setCentralWidget(views);
diff --git a/noncore/net/mailit/maillist.cpp b/noncore/net/mailit/maillist.cpp
index b5325a9..8c34295 100644
--- a/noncore/net/mailit/maillist.cpp
+++ b/noncore/net/mailit/maillist.cpp
@@ -21,111 +21,111 @@
void MailList::clear()
{
- sortedList.setAutoDelete(TRUE);
- sortedList.clear();
- currentPos = 0;
+ sortedList.setAutoDelete(TRUE);
+ sortedList.clear();
+ currentPos = 0;
}
int MailList::count()
{
- return sortedList.count();
+ return sortedList.count();
}
int* MailList::first()
{
- dList *mPtr;
-
- if (sortedList.count() == 0)
- return NULL;
-
- mPtr = sortedList.at(0);
- currentPos = 1;
- return &(mPtr->serverId);
+ dList *mPtr;
+
+ if (sortedList.count() == 0)
+ return NULL;
+
+ mPtr = sortedList.at(0);
+ currentPos = 1;
+ return &(mPtr->serverId);
}
int* MailList::next()
{
- dList *mPtr;
-
- if ( (currentPos) >= sortedList.count())
- return NULL;
-
- mPtr = sortedList.at(currentPos);
- currentPos++;
- return &(mPtr->serverId);
+ dList *mPtr;
+
+ if ( (currentPos) >= sortedList.count())
+ return NULL;
+
+ mPtr = sortedList.at(currentPos);
+ currentPos++;
+ return &(mPtr->serverId);
}
void MailList::sizeInsert(int serverId, uint size)
{
- dList *tempPtr;
- int x;
-
- dList *newEntry = new dList;
- newEntry->serverId = serverId;
- newEntry->size = size;
-
- for (tempPtr = sortedList.first(); tempPtr != NULL; tempPtr = sortedList.next() ) {
- if (newEntry->size < tempPtr->size) {
- x = sortedList.at();
- sortedList.insert(x, newEntry);
- return;
- }
- }
- sortedList.append(newEntry);
+ dList *tempPtr;
+ int x;
+
+ dList *newEntry = new dList;
+ newEntry->serverId = serverId;
+ newEntry->size = size;
+
+ for (tempPtr = sortedList.first(); tempPtr != NULL; tempPtr = sortedList.next() ) {
+ if (newEntry->size < tempPtr->size) {
+ x = sortedList.at();
+ sortedList.insert(x, newEntry);
+ return;
+ }
+ }
+ sortedList.append(newEntry);
}
-void MailList::moveFront(int serverId, uint size)
+void MailList::moveFront(int serverId, uint/* size*/)
{
- dList *currentPtr;
- uint tempPos;
- QString temp;
-
- tempPos = currentPos;
- if ( tempPos >= sortedList.count() )
- return;
- currentPtr = sortedList.at(tempPos);
- while ( ((tempPos+1) < sortedList.count()) && ( currentPtr->serverId != serverId) ) {
- tempPos++;
- currentPtr = sortedList.at(tempPos);
- }
-
- if ( (currentPtr != NULL) && (currentPtr->serverId == serverId) ) {
- temp.setNum(currentPtr->serverId);
- qWarning("moved to front, message: " + temp);
-
- dList *itemPtr = sortedList.take(tempPos);
- sortedList.insert(currentPos, itemPtr);
- }
+ dList *currentPtr;
+ uint tempPos;
+ QString temp;
+
+ tempPos = currentPos;
+ if ( tempPos >= sortedList.count() )
+ return;
+ currentPtr = sortedList.at(tempPos);
+ while ( ((tempPos+1) < sortedList.count()) && ( currentPtr->serverId != serverId) ) {
+ tempPos++;
+ currentPtr = sortedList.at(tempPos);
+ }
+
+ if ( (currentPtr != NULL) && (currentPtr->serverId == serverId) ) {
+ temp.setNum(currentPtr->serverId);
+ qWarning("moved to front, message: " + temp);
+
+ dList *itemPtr = sortedList.take(tempPos);
+ sortedList.insert(currentPos, itemPtr);
+ }
}
//only works if mail is not already in download
-bool MailList::remove(int serverId, uint size)
+bool MailList::remove(int serverId, uint /*size*/)
{
- dList *currentPtr;
- uint tempPos;
- QString temp;
-
- tempPos = currentPos;
- if ( tempPos >=sortedList.count() )
- return FALSE;
- currentPtr = sortedList.at(tempPos);
- while ( ((tempPos + 1) < sortedList.count()) && ( currentPtr->serverId != serverId) ) {
- tempPos++;
- currentPtr = sortedList.at(tempPos);
- }
-
- if ( (currentPtr != NULL) && (currentPtr->serverId == serverId) ) {
- temp.setNum(currentPtr->serverId);
- qWarning("deleted message: " + temp);
- sortedList.remove(tempPos);
-
- return TRUE;
- }
- return FALSE;
+ dList *currentPtr;
+ uint tempPos;
+ QString temp;
+
+ tempPos = currentPos;
+ if ( tempPos >=sortedList.count() )
+ return FALSE;
+ currentPtr = sortedList.at(tempPos);
+ while ( ((tempPos + 1) < sortedList.count()) && ( currentPtr->serverId != serverId) ) {
+ tempPos++;
+ currentPtr = sortedList.at(tempPos);
+ }
+
+ if ( (currentPtr != NULL) && (currentPtr->serverId == serverId) ) {
+ temp.setNum(currentPtr->serverId);
+ qWarning("deleted message: " + temp);
+ sortedList.remove(tempPos);
+
+ return TRUE;
+ }
+ return FALSE;
}
-void MailList::insert(int pos, int serverId, uint size)
+void MailList::insert(int /*pos*/, int /*serverId*/, uint/* size*/)
{
-// sortedList.insert(pos, mPtr);
+// sortedList.insert(pos, mPtr);
}
diff --git a/noncore/net/mailit/popclient.cpp b/noncore/net/mailit/popclient.cpp
index dc0116d..5da3bcb 100644
--- a/noncore/net/mailit/popclient.cpp
+++ b/noncore/net/mailit/popclient.cpp
@@ -63,7 +63,7 @@ void PopClient::newConnection(const QString &target, int port)
receiving = TRUE;
//selected = FALSE;
- emit updateStatus("DNS lookup");
+ emit updateStatus(tr("DNS lookup"));
}
void PopClient::setAccount(const QString &popUser, const QString &popPasswd)
@@ -103,8 +103,12 @@ void PopClient::connectionEstablished()
void PopClient::errorHandling(int status)
{
+ errorHandlingWithMsg( status, QString::null );
+}
+void PopClient::errorHandlingWithMsg(int status, const QString & Msg )
+{
emit updateStatus(tr("Error Occured"));
- emit errorOccurred(status);
+ emit errorOccurred(status, Msg);
socket->close();
receiving = FALSE;
}
@@ -167,7 +171,7 @@ void PopClient::incomingData()
if (response[0] == '+') {
*stream << "STAT" << "\r\n";
status = Mcnt;
- } else errorHandling(ErrLoginFailed);
+ } else errorHandlingWithMsg(ErrLoginFailed, response);
break;
}
//get count of messages, eg "+OK 4 900.." -> int 4
@@ -195,7 +199,7 @@ void PopClient::incomingData()
} else newMessages = 0;
}
- } else errorHandling(ErrUnknownResponse);
+ } else errorHandlingWithMsg(ErrUnknownResponse, response);
}
//Read message number x, count upwards to messageCount
case List: {
@@ -234,7 +238,7 @@ void PopClient::incomingData()
status = Retr;
} else {
//qWarning(response);
- errorHandling(ErrUnknownResponse);
+ errorHandlingWithMsg(ErrUnknownResponse, response);
}
}
}
@@ -259,7 +263,7 @@ void PopClient::incomingData()
if (!socket->canReadLine()) //sync. problems
break;
response = socket->readLine();
- } else errorHandling(ErrUnknownResponse);
+ } else errorHandlingWithMsg(ErrUnknownResponse, response);
}
}
//add all incoming lines to body. When size is reached, send
diff --git a/noncore/net/mailit/popclient.h b/noncore/net/mailit/popclient.h
index c58bc48..6774ceb 100644
--- a/noncore/net/mailit/popclient.h
+++ b/noncore/net/mailit/popclient.h
@@ -44,7 +44,7 @@ public:
signals:
void newMessage(const QString &, int, uint, bool);
- void errorOccurred(int status);
+ void errorOccurred(int status, const QString & Msg );
void updateStatus(const QString &);
void mailTransfered(int);
void mailboxSize(int);
@@ -53,6 +53,7 @@ signals:
public slots:
void errorHandling(int);
+ void errorHandlingWithMsg(int, const QString & );
protected slots:
void connectionEstablished();
diff --git a/noncore/net/mailit/smtpclient.cpp b/noncore/net/mailit/smtpclient.cpp
index 2916f45..5b5ef52 100644
--- a/noncore/net/mailit/smtpclient.cpp
+++ b/noncore/net/mailit/smtpclient.cpp
@@ -73,7 +73,12 @@ void SmtpClient::connectionEstablished()
void SmtpClient::errorHandling(int status)
{
- emit errorOccurred(status);
+ errorHandlingWithMsg( status, QString::null );
+}
+
+void SmtpClient::errorHandlingWithMsg(int status, const QString & EMsg )
+{
+ emit errorOccurred(status, EMsg );
socket->close();
mailList.clear();
sending = FALSE;
@@ -87,31 +92,32 @@ void SmtpClient::incomingData()
return;
response = socket->readLine();
-
switch(status) {
case Init: {
if (response[0] == '2') {
status = From;
mailPtr = mailList.first();
*stream << "HELO there\r\n";
- } else errorHandling(ErrUnknownResponse);
+ } else errorHandlingWithMsg(ErrUnknownResponse,response);
break;
}
case From: {
if (response[0] == '2') {
- *stream << "MAIL FROM: " << mailPtr->from << "\r\n";
+ qDebug(mailPtr->from);
+ *stream << "MAIL FROM: <" << mailPtr->from << ">\r\n";
status = Recv;
- } else errorHandling(ErrUnknownResponse);
+ } else errorHandlingWithMsg(ErrUnknownResponse, response );
break;
}
case Recv: {
- if (response[0] == '2') {
+ if (response[0] == '2') {
it = mailPtr->to.begin();
- if (it == NULL)
- errorHandling(ErrUnknownResponse);
- *stream << "RCPT TO: " << *it << ">\r\n";
+ if (it == NULL) {
+ errorHandlingWithMsg(ErrUnknownResponse,response);
+ }
+ *stream << "RCPT TO: <" << *it << ">\r\n";
status = MRcv;
- } else errorHandling(ErrUnknownResponse);
+ } else errorHandlingWithMsg(ErrUnknownResponse,response);
break;
}
case MRcv: {
@@ -123,14 +129,15 @@ void SmtpClient::incomingData()
} else {
status = Data;
}
- } else errorHandling(ErrUnknownResponse);
+ } else errorHandlingWithMsg(ErrUnknownResponse,response);
}
case Data: {
if (response[0] == '2') {
*stream << "DATA\r\n";
status = Body;
emit updateStatus(tr("Sending: ") + mailPtr->subject);
- } else errorHandling(ErrUnknownResponse);
+
+ } else errorHandlingWithMsg(ErrUnknownResponse,response);
break;
}
case Body: {
@@ -142,7 +149,7 @@ void SmtpClient::incomingData()
} else {
status = Quit;
}
- } else errorHandling(ErrUnknownResponse);
+ } else errorHandlingWithMsg(ErrUnknownResponse,response);
break;
}
case Quit: {
@@ -156,7 +163,7 @@ void SmtpClient::incomingData()
mailList.clear();
sending = FALSE;
socket->close();
- } else errorHandling(ErrUnknownResponse);
+ } else errorHandlingWithMsg(ErrUnknownResponse,response);
break;
}
}
diff --git a/noncore/net/mailit/smtpclient.h b/noncore/net/mailit/smtpclient.h
index 45c0703..554ba3f 100644
--- a/noncore/net/mailit/smtpclient.h
+++ b/noncore/net/mailit/smtpclient.h
@@ -47,12 +47,13 @@ public:
void addMail(const QString &from, const QString &subject, const QStringList &to, const QString &body);
signals:
- void errorOccurred(int);
+ void errorOccurred(int, const QString & LR );
void updateStatus(const QString &);
void mailSent();
public slots:
void errorHandling(int);
+ void errorHandlingWithMsg(int, const QString & LastResponse );
protected slots:
void connectionEstablished();
diff --git a/noncore/net/mailit/viewatt.cpp b/noncore/net/mailit/viewatt.cpp
index 21885c2..293e137 100644
--- a/noncore/net/mailit/viewatt.cpp
+++ b/noncore/net/mailit/viewatt.cpp
@@ -26,7 +26,7 @@
ViewAtt::ViewAtt(QWidget *parent, const char *name, WFlags f)
: QMainWindow(parent, name, f)
{
- setCaption("Exploring attatchments");
+ setCaption(tr("Exploring attatchments"));
setToolBarsMovable( FALSE );
bar = new QToolBar(this);
@@ -35,9 +35,9 @@ ViewAtt::ViewAtt(QWidget *parent, const char *name, WFlags f)
installButton->setWhatsThis(tr("Click here to install the attachment to your Documents"));
listView = new QListView(this, "AttView");
- listView->addColumn( "Attatchment" );
- listView->addColumn( "Type" );
- listView->addColumn( "Installed" );
+ listView->addColumn( tr("Attatchment") );
+ listView->addColumn( tr("Type") );
+ listView->addColumn( tr("Installed") );
setCentralWidget(listView);
QWhatsThis::add(listView,QWidget::tr("This is an overview about all attachments in the mail"));
}
@@ -61,9 +61,9 @@ void ViewAtt::update(Email *mailIn, bool inbox)
mail = mailIn;
for ( ePtr=mail->files.first(); ePtr != 0; ePtr=mail->files.next() ) {
- QString isInstalled = "No";
+ QString isInstalled = tr("No");
if (ePtr->installed)
- isInstalled = "Yes";
+ isInstalled = tr("Yes");
item = new QListViewItem(listView, ePtr->originalName, ePtr->contentType, isInstalled);
const QString& mtypeDef=(const QString&) ePtr->contentType+"/"+ePtr->contentAttribute;
@@ -116,6 +116,6 @@ void ViewAtt::install()
d.setType(selPtr->contentType + "/" + selPtr->contentAttribute);
d.writeLink();
selPtr->installed = TRUE;
- item->setText(2, "Yes");
+ item->setText(2, tr("Yes"));
}
}
diff --git a/noncore/net/mailit/writemail.cpp b/noncore/net/mailit/writemail.cpp
index 0298cb3..26b9660 100644
--- a/noncore/net/mailit/writemail.cpp
+++ b/noncore/net/mailit/writemail.cpp
@@ -24,367 +24,367 @@
WriteMail::WriteMail( QWidget* parent, const char* name, WFlags fl ):QMainWindow( parent, name, fl )
{
- showingAddressList = FALSE;
- init();
-
- addAtt = new AddAtt(0, "Add Attachments");
+ showingAddressList = FALSE;
+ init();
+
+ addAtt = new AddAtt(0, "Add Attachments");
}
WriteMail::~WriteMail()
{
- delete addAtt;
+ delete addAtt;
}
void WriteMail::setAddressList(AddressList *list)
{
- AContact *cPtr;
-
- addressList = list;
-
- addressView->clear();
- QList<AContact> *cListPtr = addressList->getContactList();
- QListViewItem *item;
- for (cPtr = cListPtr->first(); cPtr != 0; cPtr = cListPtr->next() ) {
- item = new QListViewItem(addressView, cPtr->name, cPtr->email);
- }
+ AContact *cPtr;
+
+ addressList = list;
+
+ addressView->clear();
+ QList<AContact> *cListPtr = addressList->getContactList();
+ QListViewItem *item;
+ for (cPtr = cListPtr->first(); cPtr != 0; cPtr = cListPtr->next() ) {
+ item = new QListViewItem(addressView, cPtr->name, cPtr->email);
+ }
}
void WriteMail::init()
{
- setToolBarsMovable(FALSE);
-
- bar = new QToolBar(this);
- bar->setHorizontalStretchable( TRUE );
+ setToolBarsMovable(FALSE);
+
+ bar = new QToolBar(this);
+ bar->setHorizontalStretchable( TRUE );
- menu = new QMenuBar( bar );
+ menu = new QMenuBar( bar );
- mailMenu = new QPopupMenu(menu);
- menu->insertItem( tr( "&Mail" ), mailMenu);
- addMenu = new QPopupMenu(menu);
- menu->insertItem( tr( "&Add" ), addMenu);
-
- bar = new QToolBar(this);
- 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"));
-
- confirmButton = new QAction(tr("Enque mail"), Resource::loadPixmap("OKButton"), QString::null, 0, this, 0);
- confirmButton->addTo(bar);
- confirmButton->addTo(mailMenu);
- connect( confirmButton, SIGNAL( activated() ), this, SLOT( accept() ) );
- confirmButton->setWhatsThis(tr("This button puts your mail in the send queue"));
-
- newButton = new QAction(tr("New mail"), Resource::loadPixmap("new"), QString::null, 0, this, 0);
- newButton->addTo(mailMenu);
- connect( newButton, SIGNAL( activated() ), this, SLOT( newMail() ) );
- newButton->setWhatsThis(tr("Click here to create a new mail"));
+ mailMenu = new QPopupMenu(menu);
+ menu->insertItem( tr( "&Mail" ), mailMenu);
+ addMenu = new QPopupMenu(menu);
+ menu->insertItem( tr( "&Add" ), addMenu);
+
+ bar = new QToolBar(this);
+ 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"));
+
+ confirmButton = new QAction(tr("Enque mail"), Resource::loadPixmap("OKButton"), QString::null, 0, this, 0);
+ confirmButton->addTo(bar);
+ confirmButton->addTo(mailMenu);
+ connect( confirmButton, SIGNAL( activated() ), this, SLOT( accept() ) );
+ confirmButton->setWhatsThis(tr("This button puts your mail in the send queue"));
+
+ newButton = new QAction(tr("New mail"), Resource::loadPixmap("new"), QString::null, 0, this, 0);
+ newButton->addTo(mailMenu);
+ connect( newButton, SIGNAL( activated() ), this, SLOT( newMail() ) );
+ newButton->setWhatsThis(tr("Click here to create a new mail"));
- widget = new QWidget(this, "widget");
- grid = new QGridLayout( widget );
+ widget = new QWidget(this, "widget");
+ grid = new QGridLayout( widget );
- recipientsBox = new QComboBox( FALSE, widget, "toLabel" );
- recipientsBox->insertItem( tr( "To:" ) );
- recipientsBox->insertItem( tr( "CC:" ) );
- recipientsBox->setCurrentItem(0);
- grid->addWidget( recipientsBox, 0, 0 );
- connect(recipientsBox,SIGNAL(activated(int)),this, SLOT(changeRecipients(int)));
-
- subjetLabel = new QLabel( widget, "subjetLabel" );
- subjetLabel->setText( tr( "Subject:" ) );
+ recipientsBox = new QComboBox( FALSE, widget, "toLabel" );
+ recipientsBox->insertItem( tr( "To:" ) );
+ recipientsBox->insertItem( tr( "CC:" ) );
+ recipientsBox->setCurrentItem(0);
+ grid->addWidget( recipientsBox, 0, 0 );
+ connect(recipientsBox,SIGNAL(activated(int)),this, SLOT(changeRecipients(int)));
+
+ subjetLabel = new QLabel( widget, "subjetLabel" );
+ subjetLabel->setText( tr( "Subject:" ) );
- grid->addWidget( subjetLabel, 1, 0 );
+ grid->addWidget( subjetLabel, 1, 0 );
- ToolButton13_2 = new QToolButton( widget, "ToolButton13_2" );
- ToolButton13_2->setText( tr( "..." ) );
- grid->addWidget( ToolButton13_2, 1, 2 );
+ ToolButton13_2 = new QToolButton( widget, "ToolButton13_2" );
+ ToolButton13_2->setText( tr( "..." ) );
+ grid->addWidget( ToolButton13_2, 1, 2 );
- subjectInput = new QLineEdit( widget, "subjectInput" );
- grid->addWidget( subjectInput, 1, 1 );
- QWhatsThis::add(subjectInput,QWidget::tr("The mail subject should be entered here"));
+ subjectInput = new QLineEdit( widget, "subjectInput" );
+ grid->addWidget( subjectInput, 1, 1 );
+ QWhatsThis::add(subjectInput,QWidget::tr("The mail subject should be entered here"));
- toInput = new QLineEdit( widget, "toInput" );
- grid->addWidget( toInput, 0, 1 );
- QWhatsThis::add(recipientsBox,QWidget::tr("Recipients can be entered here"));
+ toInput = new QLineEdit( widget, "toInput" );
+ grid->addWidget( toInput, 0, 1 );
+ QWhatsThis::add(recipientsBox,QWidget::tr("Recipients can be entered here"));
- ccInput = new QLineEdit( widget, "ccInput" );
- ccInput->hide();
- 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"));
+ ccInput = new QLineEdit( widget, "ccInput" );
+ ccInput->hide();
+ 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"));
- addressButton = new QToolButton( widget, "addressButton" );
- addressButton->setPixmap( Resource::loadPixmap("AddressBook") );
- addressButton->setToggleButton(TRUE);
- grid->addWidget( addressButton, 0, 2 );
- 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"));
+ addressButton = new QToolButton( widget, "addressButton" );
+ addressButton->setPixmap( Resource::loadPixmap("AddressBook") );
+ addressButton->setToggleButton(TRUE);
+ grid->addWidget( addressButton, 0, 2 );
+ 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"));
- emailInput = new QMultiLineEdit( widget, "emailInput" );
- grid->addMultiCellWidget( emailInput, 2, 2, 0, 2);
- QWhatsThis::add(emailInput,QWidget::tr("Enter your mail text here"));
+ emailInput = new QMultiLineEdit( widget, "emailInput" );
+ grid->addMultiCellWidget( emailInput, 2, 2, 0, 2);
+ QWhatsThis::add(emailInput,QWidget::tr("Enter your mail text here"));
- addressView = new QListView( widget, "addressView");
- addressView->addColumn("Name");
- addressView->addColumn("EMail");
- addressView->setAllColumnsShowFocus(TRUE);
- addressView->setMultiSelection(TRUE);
- addressView->hide();
- grid->addMultiCellWidget( addressView, 3, 3, 0, 2);
- QWhatsThis::add(recipientsBox,QWidget::tr("Choose the recipients from this list"));
+ addressView = new QListView( widget, "addressView");
+ addressView->addColumn(tr("Name"));
+ addressView->addColumn(tr("EMail") );
+ addressView->setAllColumnsShowFocus(TRUE);
+ addressView->setMultiSelection(TRUE);
+ addressView->hide();
+ grid->addMultiCellWidget( addressView, 3, 3, 0, 2);
+ QWhatsThis::add(recipientsBox,QWidget::tr("Choose the recipients from this list"));
- okButton = new QToolButton(bar, "ok");
- okButton->setPixmap( Resource::loadPixmap("enter") );
- okButton->hide();
- connect(okButton, SIGNAL(clicked()), this, SLOT(addRecipients()) );
- QWhatsThis::add(okButton,QWidget::tr("Queue your mail by clicking here"));
-
- setCentralWidget(widget);
+ okButton = new QToolButton(bar, "ok");
+ okButton->setPixmap( Resource::loadPixmap("enter") );
+ okButton->hide();
+ connect(okButton, SIGNAL(clicked()), this, SLOT(addRecipients()) );
+ QWhatsThis::add(okButton,QWidget::tr("Queue your mail by clicking here"));
+
+ setCentralWidget(widget);
}
void WriteMail::reject()
{
- emit cancelMail();
+ emit cancelMail();
}
void WriteMail::accept()
{
- QStringList attachedFiles, attachmentsType;
- int idCount = 0;
-
- if (toInput->text() == "")
- {
- QMessageBox::warning(this,tr("No recipient"), tr("Send mail to whom?"), tr("OK\n"));
- return;
- }
-
- if (! getRecipients(false) )
- {
- QMessageBox::warning(this,tr("Incorrect recipient separator"),
- tr("Recipients must be separated by ;\nand be valid emailaddresses"), tr("OK\n"));
- return;
- }
-
- if ((ccInput->text()!="") && (! getRecipients(true) ))
- {
- QMessageBox::warning(this,tr("Incorrect carbon copy separator"),
- tr("CC Recipients must be separated by ;\nand be valid emailaddresses"), tr("OK\n"));
- return;
- }
-
- mail.subject = subjectInput->text();
- mail.body = emailInput->text();
- mail.sent = false;
- mail.received = false;
-
- mail.rawMail = "To: ";
-
- for (QStringList::Iterator it = mail.recipients.begin();
- it != mail.recipients.end(); ++it) {
-
- mail.rawMail += (*it);
- mail.rawMail += ",\n";
- }
-
- mail.rawMail.truncate(mail.rawMail.length()-2);
-
- mail.rawMail += "\nCC: ";
-
- for (QStringList::Iterator it = mail.carbonCopies.begin();
- it != mail.carbonCopies.end(); ++it) {
-
- mail.rawMail += (*it);
- mail.rawMail += ",\n";
- }
+ QStringList attachedFiles, attachmentsType;
+ int idCount = 0;
+
+ if (toInput->text() == "")
+ {
+ QMessageBox::warning(this,tr("No recipient"), tr("Send mail to whom?"), tr("OK\n"));
+ return;
+ }
+
+ if (! getRecipients(false) )
+ {
+ QMessageBox::warning(this,tr("Incorrect recipient separator"),
+ tr("Recipients must be separated by ;\nand be valid emailaddresses"), tr("OK\n"));
+ return;
+ }
+
+ if ((ccInput->text()!="") && (! getRecipients(true) ))
+ {
+ QMessageBox::warning(this,tr("Incorrect carbon copy separator"),
+ tr("CC Recipients must be separated by ;\nand be valid emailaddresses"), tr("OK\n"));
+ return;
+ }
+
+ mail.subject = subjectInput->text();
+ mail.body = emailInput->text();
+ mail.sent = false;
+ mail.received = false;
+
+ mail.rawMail = "To: ";
+
+ for (QStringList::Iterator it = mail.recipients.begin();
+ it != mail.recipients.end(); ++it) {
+
+ mail.rawMail += (*it);
+ mail.rawMail += ",\n";
+ }
+
+ mail.rawMail.truncate(mail.rawMail.length()-2);
+
+ mail.rawMail += "\nCC: ";
+
+ for (QStringList::Iterator it = mail.carbonCopies.begin();
+ it != mail.carbonCopies.end(); ++it) {
+
+ mail.rawMail += (*it);
+ mail.rawMail += ",\n";
+ }
- mail.rawMail += mail.from;
- mail.rawMail += "\nSubject: ";
- mail.rawMail += mail.subject;
- mail.rawMail += "\n\n";
-
- attachedFiles = addAtt->returnattachedFiles();
- attachmentsType = addAtt->returnFileTypes();
+ mail.rawMail += mail.from;
+ mail.rawMail += "\nSubject: ";
+ mail.rawMail += mail.subject;
+ mail.rawMail += "\n\n";
+
+ attachedFiles = addAtt->returnattachedFiles();
+ attachmentsType = addAtt->returnFileTypes();
- QStringList::Iterator itType = attachmentsType.begin();
-
- Enclosure e;
- for ( QStringList::Iterator it = attachedFiles.begin(); it != attachedFiles.end(); ++it ) {
- e.id = idCount;
- e.originalName = (*it).latin1();
- e.contentType = (*itType).latin1();
- e.contentAttribute = (*itType).latin1();
- e.saved = TRUE;
- mail.addEnclosure(&e);
-
- itType++;
- idCount++;
- }
- mail.rawMail += mail.body;
- mail.rawMail += "\n";
- mail.rawMail += ".\n";
- emit sendMailRequested(mail);
- addAtt->clear();
+ QStringList::Iterator itType = attachmentsType.begin();
+
+ Enclosure e;
+ for ( QStringList::Iterator it = attachedFiles.begin(); it != attachedFiles.end(); ++it ) {
+ e.id = idCount;
+ e.originalName = (*it).latin1();
+ e.contentType = (*itType).latin1();
+ e.contentAttribute = (*itType).latin1();
+ e.saved = TRUE;
+ mail.addEnclosure(&e);
+
+ itType++;
+ idCount++;
+ }
+ mail.rawMail += mail.body;
+ mail.rawMail += "\n";
+ mail.rawMail += ".\n";
+ emit sendMailRequested(mail);
+ addAtt->clear();
}
void WriteMail::getAddress()
{
- showingAddressList = !showingAddressList;
-
- if (showingAddressList) {
- emailInput->hide();
- addressView->show();
- okButton->show();
-
- } else {
- addressView->hide();
- okButton->hide();
- emailInput->show();
- }
+ showingAddressList = !showingAddressList;
+
+ if (showingAddressList) {
+ emailInput->hide();
+ addressView->show();
+ okButton->show();
+
+ } else {
+ addressView->hide();
+ okButton->hide();
+ emailInput->show();
+ }
}
void WriteMail::attachFile()
{
- addAtt->showMaximized();
+ addAtt->showMaximized();
}
void WriteMail::reply(Email replyMail, bool replyAll)
{
- int pos;
- QString ccRecipients;
-
- mail = replyMail;
- mail.files.clear();
-
- toInput->setText(mail.fromMail);
-
- if (replyAll)
- {
- for (QStringList::Iterator it = mail.carbonCopies.begin();it != mail.carbonCopies.end(); ++it)
- {
- ccRecipients.append(*it);
- ccRecipients.append(";");
- }
- ccRecipients.truncate(ccRecipients.length()-1); //no ; at the end
- ccInput->setText(ccRecipients);
- }
- else ccInput->clear();
-
- subjectInput->setText(tr("Re: ") + mail.subject);
-
- QString citation=mail.fromMail;
- citation.append(tr(" wrote on "));
- citation.append(mail.date);
- citation.append(":\n");
-
+ int pos;
+ QString ccRecipients;
+
+ mail = replyMail;
+ mail.files.clear();
+
+ toInput->setText(mail.fromMail);
+
+ if (replyAll)
+ {
+ for (QStringList::Iterator it = mail.carbonCopies.begin();it != mail.carbonCopies.end(); ++it)
+ {
+ ccRecipients.append(*it);
+ ccRecipients.append(";");
+ }
+ ccRecipients.truncate(ccRecipients.length()-1); //no ; at the end
+ ccInput->setText(ccRecipients);
+ }
+ else ccInput->clear();
+
+ subjectInput->setText(tr("Re: ") + mail.subject);
+
+ QString citation=mail.fromMail;
+ citation.append(tr(" wrote on "));
+ citation.append(mail.date);
+ citation.append(":\n");
+
- //mail.body.insert(0,tr("On"));
- pos = 0;
- mail.body.insert(pos, ">");
- while (pos != -1) {
- pos = mail.body.find('\n', pos);
- if (pos != -1)
- mail.body.insert(++pos, ">>");
- }
- mail.body.insert(0,citation);
- emailInput->setText(mail.body);
+ //mail.body.insert(0,tr("On"));
+ pos = 0;
+ mail.body.insert(pos, ">");
+ while (pos != -1) {
+ pos = mail.body.find('\n', pos);
+ if (pos != -1)
+ mail.body.insert(++pos, ">");
+ }
+ mail.body.insert(0,citation);
+ emailInput->setText(mail.body);
}
void WriteMail::forward(Email forwMail)
{
- int pos=0;
-
- QString fwdBody=tr("======forwarded message from ");
- fwdBody.append(forwMail.fromMail);
- fwdBody.append(tr(" starts======\n\n"));
-
- mail=forwMail;
- toInput->setText("");
- ccInput->setText("");
- subjectInput->setText(tr("FWD: ") + mail.subject);
-
- fwdBody+=mail.body;
- fwdBody+=QString(tr("======end of forwarded message======\n\n"));
-
- emailInput->setText(fwdBody);
+ // int pos=0;
+
+ QString fwdBody=tr("======forwarded message from ");
+ fwdBody.append(forwMail.fromMail);
+ fwdBody.append(tr(" starts======\n\n"));
+
+ mail=forwMail;
+ toInput->setText("");
+ ccInput->setText("");
+ subjectInput->setText(tr("FWD: ") + mail.subject);
+
+ fwdBody+=mail.body;
+ fwdBody+=QString(tr("======end of forwarded message======\n\n"));
+
+ emailInput->setText(fwdBody);
}
bool WriteMail::getRecipients(bool ccField)
{
- QString str, temp;
- int pos = 0;
-
- if (ccField)
- {
- mail.carbonCopies.clear();
- temp = ccInput->text();
- }
- else
- {
- mail.recipients.clear();
- temp=toInput->text() ;
- }
-
- while ( (pos = temp.find(';')) != -1) {
- str = temp.left(pos).stripWhiteSpace();
- temp = temp.right(temp.length() - (pos + 1));
- if ( str.find('@') == -1)
- return false;
- ccField ? mail.carbonCopies.append(str) : mail.recipients.append(str);
- //addressList->addContact(str, "");
- }
- temp = temp.stripWhiteSpace();
- if ( temp.find('@') == -1)
- return false;
- ccField ? mail.carbonCopies.append(temp) : mail.recipients.append(temp);
- //addressList->addContact(temp, "");
-
- return TRUE;
+ QString str, temp;
+ int pos = 0;
+
+ if (ccField)
+ {
+ mail.carbonCopies.clear();
+ temp = ccInput->text();
+ }
+ else
+ {
+ mail.recipients.clear();
+ temp=toInput->text() ;
+ }
+
+ while ( (pos = temp.find(';')) != -1) {
+ str = temp.left(pos).stripWhiteSpace();
+ temp = temp.right(temp.length() - (pos + 1));
+ if ( str.find('@') == -1)
+ return false;
+ ccField ? mail.carbonCopies.append(str) : mail.recipients.append(str);
+ //addressList->addContact(str, "");
+ }
+ temp = temp.stripWhiteSpace();
+ if ( temp.find('@') == -1)
+ return false;
+ ccField ? mail.carbonCopies.append(temp) : mail.recipients.append(temp);
+ //addressList->addContact(temp, "");
+
+ return TRUE;
}
void WriteMail::addRecipients()
{
- toInput->isVisible() ? addRecipients(false) : addRecipients(true);
-}
+ toInput->isVisible() ? addRecipients(false) : addRecipients(true);
+}
void WriteMail::addRecipients(bool ccField)
{
- QString recipients = "";
-
- mail.recipients.clear();
-
- QListViewItem *item = addressView->firstChild();
- while (item != NULL) {
- if ( item->isSelected() ) {
- if (recipients == "") {
- recipients = item->text(1);
- } else {
- recipients += "; " + item->text(1);
- }
- }
- item = item->nextSibling();
- }
-
- ccField ? ccInput->setText(recipients):toInput->setText(recipients);
-
- addressView->hide();
- okButton->hide();
- emailInput->show();
- addressButton->setOn(FALSE);
- showingAddressList = !showingAddressList;
+ QString recipients = "";
+
+ mail.recipients.clear();
+
+ QListViewItem *item = addressView->firstChild();
+ while (item != NULL) {
+ if ( item->isSelected() ) {
+ if (recipients == "") {
+ recipients = item->text(1);
+ } else {
+ recipients += "; " + item->text(1);
+ }
+ }
+ item = item->nextSibling();
+ }
+
+ ccField ? ccInput->setText(recipients):toInput->setText(recipients);
+
+ addressView->hide();
+ okButton->hide();
+ emailInput->show();
+ addressButton->setOn(FALSE);
+ showingAddressList = !showingAddressList;
}
void WriteMail::changeRecipients(int selection)
{
- if (selection==0)
- {
- toInput->show();
- ccInput->hide();
- }
- else if (selection==1)
- {
- toInput->hide();
- ccInput->show();
- }
+ if (selection==0)
+ {
+ toInput->show();
+ ccInput->hide();
+ }
+ else if (selection==1)
+ {
+ toInput->hide();
+ ccInput->show();
+ }
}
void WriteMail::setRecipient(const QString &recipient)
@@ -394,9 +394,9 @@ void WriteMail::setRecipient(const QString &recipient)
void WriteMail::newMail()
{
- toInput->clear();
- ccInput->clear();
- subjectInput->clear();
- emailInput->clear();
- setAddressList(addressList);
+ toInput->clear();
+ ccInput->clear();
+ subjectInput->clear();
+ emailInput->clear();
+ setAddressList(addressList);
}
diff --git a/noncore/unsupported/mailit/addatt.cpp b/noncore/unsupported/mailit/addatt.cpp
index daefac6..19ac58f 100644
--- a/noncore/unsupported/mailit/addatt.cpp
+++ b/noncore/unsupported/mailit/addatt.cpp
@@ -56,7 +56,7 @@ FileItem::~FileItem()
AddAtt::AddAtt(QWidget *parent, const char *name, WFlags f)
: QDialog(parent, name, f)
{
- setCaption("Adding attachments");
+ setCaption(tr("Adding attachments") );
QGridLayout *top = new QGridLayout(this, 1,1 );
@@ -122,7 +122,7 @@ void AddAtt::clear()
}*/
void AddAtt::addattachment()
-{
+{ // ### FIXME wrong use -zecke
OFileDialog ofs("Attachments",this,0,0,"/root/Documents");
ofs.showMaximized();
diff --git a/noncore/unsupported/mailit/emailclient.cpp b/noncore/unsupported/mailit/emailclient.cpp
index da1226c..749a4e9 100644
--- a/noncore/unsupported/mailit/emailclient.cpp
+++ b/noncore/unsupported/mailit/emailclient.cpp
@@ -59,10 +59,10 @@ EmailClient::EmailClient( QWidget* parent, const char* name, WFlags fl )
connect(emailHandler, SIGNAL(mailSent()), this, SLOT(mailSent()) );
- connect(emailHandler, SIGNAL(smtpError(int)), this,
- SLOT(smtpError(int)) );
- connect(emailHandler, SIGNAL(popError(int)), this,
- SLOT(popError(int)) );
+ connect(emailHandler, SIGNAL(smtpError(int,const QString &)), this,
+ SLOT(smtpError(int,const QString &)) );
+ connect(emailHandler, SIGNAL(popError(int,const QString &)), this,
+ SLOT(popError(int,const QString &)) );
connect(inboxView, SIGNAL(doubleClicked(QListViewItem *)), this, SLOT(inboxItemSelected()) );
connect(outboxView, SIGNAL(doubleClicked(QListViewItem *)), this, SLOT(outboxItemSelected()) );
@@ -480,7 +480,7 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk)
}
-void EmailClient::allMailArrived(int count)
+void EmailClient::allMailArrived(int /*count*/)
{
// not previewing means all mailtransfer has been done
/*if (!previewingMail) {*/
@@ -518,19 +518,21 @@ void EmailClient::moveMailFront(Email *mailPtr)
}
}
-void EmailClient::smtpError(int code)
+void EmailClient::smtpError(int code, const QString & Msg)
{
QString temp;
- if (code == ErrUnknownResponse)
- temp = "Unknown response from server";
-
- if (code == QSocket::ErrHostNotFound)
- temp = "host not found";
- if (code == QSocket::ErrConnectionRefused)
- temp = "connection refused";
- if (code == QSocket::ErrSocketRead)
- temp = "socket packet error";
+ if (code == ErrUnknownResponse) {
+ temp = tr("<qt>Unknown response from server</qt>");
+ if( ! Msg.isEmpty() )
+ temp += Msg;
+ } else if (code == QSocket::ErrHostNotFound) {
+ temp = tr("<qt>host not found</qt>");
+ } else if (code == QSocket::ErrConnectionRefused) {
+ temp = tr("<qt>connection refused</qt>");
+ } else if (code == QSocket::ErrSocketRead) {
+ temp = tr("<qt>socket packet error</qt>");
+ }
if (code != ErrCancel) {
QMessageBox::warning(qApp->activeWindow(), "Sending error", temp, "OK\n");
@@ -544,24 +546,27 @@ void EmailClient::smtpError(int code)
quedMessages.clear();
}
-void EmailClient::popError(int code)
+void EmailClient::popError(int code, const QString & Msg)
{
QString temp;
- if (code == ErrUnknownResponse)
- temp = "Unknown response from server";
- if (code == ErrLoginFailed)
- temp = "Login failed\nCheck user name and password";
-
- if (code == QSocket::ErrHostNotFound)
- temp = "host not found";
- if (code == QSocket::ErrConnectionRefused)
- temp = "connection refused";
- if (code == QSocket::ErrSocketRead)
- temp = "socket packet error";
-
+ if (code == ErrUnknownResponse) {
+ temp = tr("<qt>Unknown response from server</qt>");
+ if( ! Msg.isEmpty() )
+ temp += Msg;
+ } else if (code == ErrLoginFailed) {
+ temp = tr("<qt>Login failed\nCheck user name and password</qt>");
+ } else if (code == QSocket::ErrHostNotFound) {
+ temp = tr("<qt>host not found</qt>");
+ } else if (code == QSocket::ErrConnectionRefused) {
+ temp = tr("<qt>connection refused</qt>");
+ } else if (code == QSocket::ErrSocketRead) {
+ temp = tr("<qt>socket packet error</qt>");
+ }
+
if (code != ErrCancel) {
- QMessageBox::warning(qApp->activeWindow(), "Receiving error", temp, "OK\n");
+ QMessageBox::warning(qApp->activeWindow(), tr("Receiving error"), temp, tr("OK\n"));
+
} else {
status2Label->setText("Aborted by user");
}
@@ -898,7 +903,7 @@ void EmailClient::setMailSize(int size)
progressBar->setTotalSteps(size);
}
-void EmailClient::setTotalSize(int size)
+void EmailClient::setTotalSize(int /*size*/)
{
}
@@ -920,7 +925,7 @@ void EmailClient::deleteItem()
QListView* box;
EmailListItem* eli;
- int pos;
+ // int pos;
inbox ? box=inboxView : box=outboxView;
@@ -946,7 +951,7 @@ void EmailClient::inboxItemReleased()
/*void EmailClient::timerEvent(QTimerEvent *e)
{
- /*killTimer(timerID);
+ //killTimer(timerID);
QPopupMenu *action = new QPopupMenu(this);
@@ -991,11 +996,11 @@ void EmailClient::download(Email* mail)
tr("No account associated"), tr("There is no active account \nassociated to this mail\n it can not be downloaded"), "Abort\n");
}
-void EmailClient::receive(const QCString& msg, const QByteArray& data)
+void EmailClient::receive(const QCString& /*msg*/, const QByteArray& /*data*/)
{
/*if (msg=="getMail()")
{
- /*QDialog qd(qApp->activeWindow(),"Getting mail",true);
+ //QDialog qd(qApp->activeWindow(),"Getting mail",true);
QVBoxLayout *vbProg = new QVBoxLayout( &qd );
initStatusBar(&qd);
diff --git a/noncore/unsupported/mailit/emailclient.h b/noncore/unsupported/mailit/emailclient.h
index c98cfce..80c6d31 100644
--- a/noncore/unsupported/mailit/emailclient.h
+++ b/noncore/unsupported/mailit/emailclient.h
@@ -98,8 +98,8 @@ public slots:
void deleteItem();
void getNewMail();
void getAllNewMail();
- void smtpError(int code);
- void popError(int code);
+ void smtpError(int code, const QString & Msg );
+ void popError(int code, const QString & Msg);
void inboxItemSelected();
void outboxItemSelected();
void inboxItemPressed();
diff --git a/noncore/unsupported/mailit/emailhandler.cpp b/noncore/unsupported/mailit/emailhandler.cpp
index 39f693d..5b8bda1 100644
--- a/noncore/unsupported/mailit/emailhandler.cpp
+++ b/noncore/unsupported/mailit/emailhandler.cpp
@@ -44,14 +44,14 @@ EmailHandler::EmailHandler()
smtpClient = new SmtpClient();
popClient = new PopClient();
- connect(smtpClient, SIGNAL(errorOccurred(int)), this,
- SIGNAL(smtpError(int)) );
+ connect(smtpClient, SIGNAL(errorOccurred(int, const QString &)), this,
+ SIGNAL(smtpError(int, const QString &)) );
connect(smtpClient, SIGNAL(mailSent()), this, SIGNAL(mailSent()) );
connect(smtpClient, SIGNAL(updateStatus(const QString &)), this,
SIGNAL(updateSmtpStatus(const QString &)) );
- connect(popClient, SIGNAL(errorOccurred(int)), this,
- SIGNAL(popError(int)) );
+ connect(popClient, SIGNAL(errorOccurred(int, const QString &)), this,
+ SIGNAL(popError(int, const QString &)) );
connect(popClient, SIGNAL(newMessage(const QString &, int, uint, bool)),
this, SLOT(messageArrived(const QString &, int, uint, bool)) );
connect(popClient, SIGNAL(updateStatus(const QString &)), this,
@@ -162,7 +162,7 @@ bool EmailHandler::parse(const QString &in, const QString &lineShift, Email *mai
mail->files.setAutoDelete(TRUE);
temp = lineShift + "." + lineShift;
-
+
if (in.right(temp.length()) != temp) {
mail->rawMail += temp;
}
diff --git a/noncore/unsupported/mailit/emailhandler.h b/noncore/unsupported/mailit/emailhandler.h
index e4e7f46..74a8e4c 100644
--- a/noncore/unsupported/mailit/emailhandler.h
+++ b/noncore/unsupported/mailit/emailhandler.h
@@ -127,8 +127,8 @@ public:
signals:
void mailSent();
- void smtpError(int);
- void popError(int);
+ void smtpError(int, const QString & Msg );
+ void popError(int, const QString & Msg );
void mailArrived(const Email &, bool);
void updatePopStatus(const QString &);
void updateSmtpStatus(const QString &);
diff --git a/noncore/unsupported/mailit/mailit.pro b/noncore/unsupported/mailit/mailit.pro
index cfbda36..5e9a83a 100644
--- a/noncore/unsupported/mailit/mailit.pro
+++ b/noncore/unsupported/mailit/mailit.pro
@@ -1,4 +1,5 @@
TEMPLATE = app
+TARGET = mailit
CONFIG = qt warn_on release
HEADERS = emailclient.h \
emailhandler.h \
diff --git a/noncore/unsupported/mailit/mailitwindow.cpp b/noncore/unsupported/mailit/mailitwindow.cpp
index f945a0f..6e298c7 100644
--- a/noncore/unsupported/mailit/mailitwindow.cpp
+++ b/noncore/unsupported/mailit/mailitwindow.cpp
@@ -21,10 +21,10 @@
#include <qmessagebox.h>
#include "mailitwindow.h"
-MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags fl)
+MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags /*fl*/)
: QMainWindow(parent, name, WStyle_ContextHelp)
{
- currentCaption = "Mailit";
+ currentCaption = tr("Mailit");
setCaption(tr(currentCaption));
views = new QWidgetStack(this);
setCentralWidget(views);
diff --git a/noncore/unsupported/mailit/maillist.cpp b/noncore/unsupported/mailit/maillist.cpp
index b5325a9..8c34295 100644
--- a/noncore/unsupported/mailit/maillist.cpp
+++ b/noncore/unsupported/mailit/maillist.cpp
@@ -21,111 +21,111 @@
void MailList::clear()
{
- sortedList.setAutoDelete(TRUE);
- sortedList.clear();
- currentPos = 0;
+ sortedList.setAutoDelete(TRUE);
+ sortedList.clear();
+ currentPos = 0;
}
int MailList::count()
{
- return sortedList.count();
+ return sortedList.count();
}
int* MailList::first()
{
- dList *mPtr;
-
- if (sortedList.count() == 0)
- return NULL;
-
- mPtr = sortedList.at(0);
- currentPos = 1;
- return &(mPtr->serverId);
+ dList *mPtr;
+
+ if (sortedList.count() == 0)
+ return NULL;
+
+ mPtr = sortedList.at(0);
+ currentPos = 1;
+ return &(mPtr->serverId);
}
int* MailList::next()
{
- dList *mPtr;
-
- if ( (currentPos) >= sortedList.count())
- return NULL;
-
- mPtr = sortedList.at(currentPos);
- currentPos++;
- return &(mPtr->serverId);
+ dList *mPtr;
+
+ if ( (currentPos) >= sortedList.count())
+ return NULL;
+
+ mPtr = sortedList.at(currentPos);
+ currentPos++;
+ return &(mPtr->serverId);
}
void MailList::sizeInsert(int serverId, uint size)
{
- dList *tempPtr;
- int x;
-
- dList *newEntry = new dList;
- newEntry->serverId = serverId;
- newEntry->size = size;
-
- for (tempPtr = sortedList.first(); tempPtr != NULL; tempPtr = sortedList.next() ) {
- if (newEntry->size < tempPtr->size) {
- x = sortedList.at();
- sortedList.insert(x, newEntry);
- return;
- }
- }
- sortedList.append(newEntry);
+ dList *tempPtr;
+ int x;
+
+ dList *newEntry = new dList;
+ newEntry->serverId = serverId;
+ newEntry->size = size;
+
+ for (tempPtr = sortedList.first(); tempPtr != NULL; tempPtr = sortedList.next() ) {
+ if (newEntry->size < tempPtr->size) {
+ x = sortedList.at();
+ sortedList.insert(x, newEntry);
+ return;
+ }
+ }
+ sortedList.append(newEntry);
}
-void MailList::moveFront(int serverId, uint size)
+void MailList::moveFront(int serverId, uint/* size*/)
{
- dList *currentPtr;
- uint tempPos;
- QString temp;
-
- tempPos = currentPos;
- if ( tempPos >= sortedList.count() )
- return;
- currentPtr = sortedList.at(tempPos);
- while ( ((tempPos+1) < sortedList.count()) && ( currentPtr->serverId != serverId) ) {
- tempPos++;
- currentPtr = sortedList.at(tempPos);
- }
-
- if ( (currentPtr != NULL) && (currentPtr->serverId == serverId) ) {
- temp.setNum(currentPtr->serverId);
- qWarning("moved to front, message: " + temp);
-
- dList *itemPtr = sortedList.take(tempPos);
- sortedList.insert(currentPos, itemPtr);
- }
+ dList *currentPtr;
+ uint tempPos;
+ QString temp;
+
+ tempPos = currentPos;
+ if ( tempPos >= sortedList.count() )
+ return;
+ currentPtr = sortedList.at(tempPos);
+ while ( ((tempPos+1) < sortedList.count()) && ( currentPtr->serverId != serverId) ) {
+ tempPos++;
+ currentPtr = sortedList.at(tempPos);
+ }
+
+ if ( (currentPtr != NULL) && (currentPtr->serverId == serverId) ) {
+ temp.setNum(currentPtr->serverId);
+ qWarning("moved to front, message: " + temp);
+
+ dList *itemPtr = sortedList.take(tempPos);
+ sortedList.insert(currentPos, itemPtr);
+ }
}
//only works if mail is not already in download
-bool MailList::remove(int serverId, uint size)
+bool MailList::remove(int serverId, uint /*size*/)
{
- dList *currentPtr;
- uint tempPos;
- QString temp;
-
- tempPos = currentPos;
- if ( tempPos >=sortedList.count() )
- return FALSE;
- currentPtr = sortedList.at(tempPos);
- while ( ((tempPos + 1) < sortedList.count()) && ( currentPtr->serverId != serverId) ) {
- tempPos++;
- currentPtr = sortedList.at(tempPos);
- }
-
- if ( (currentPtr != NULL) && (currentPtr->serverId == serverId) ) {
- temp.setNum(currentPtr->serverId);
- qWarning("deleted message: " + temp);
- sortedList.remove(tempPos);
-
- return TRUE;
- }
- return FALSE;
+ dList *currentPtr;
+ uint tempPos;
+ QString temp;
+
+ tempPos = currentPos;
+ if ( tempPos >=sortedList.count() )
+ return FALSE;
+ currentPtr = sortedList.at(tempPos);
+ while ( ((tempPos + 1) < sortedList.count()) && ( currentPtr->serverId != serverId) ) {
+ tempPos++;
+ currentPtr = sortedList.at(tempPos);
+ }
+
+ if ( (currentPtr != NULL) && (currentPtr->serverId == serverId) ) {
+ temp.setNum(currentPtr->serverId);
+ qWarning("deleted message: " + temp);
+ sortedList.remove(tempPos);
+
+ return TRUE;
+ }
+ return FALSE;
}
-void MailList::insert(int pos, int serverId, uint size)
+void MailList::insert(int /*pos*/, int /*serverId*/, uint/* size*/)
{
-// sortedList.insert(pos, mPtr);
+// sortedList.insert(pos, mPtr);
}
diff --git a/noncore/unsupported/mailit/popclient.cpp b/noncore/unsupported/mailit/popclient.cpp
index dc0116d..5da3bcb 100644
--- a/noncore/unsupported/mailit/popclient.cpp
+++ b/noncore/unsupported/mailit/popclient.cpp
@@ -63,7 +63,7 @@ void PopClient::newConnection(const QString &target, int port)
receiving = TRUE;
//selected = FALSE;
- emit updateStatus("DNS lookup");
+ emit updateStatus(tr("DNS lookup"));
}
void PopClient::setAccount(const QString &popUser, const QString &popPasswd)
@@ -103,8 +103,12 @@ void PopClient::connectionEstablished()
void PopClient::errorHandling(int status)
{
+ errorHandlingWithMsg( status, QString::null );
+}
+void PopClient::errorHandlingWithMsg(int status, const QString & Msg )
+{
emit updateStatus(tr("Error Occured"));
- emit errorOccurred(status);
+ emit errorOccurred(status, Msg);
socket->close();
receiving = FALSE;
}
@@ -167,7 +171,7 @@ void PopClient::incomingData()
if (response[0] == '+') {
*stream << "STAT" << "\r\n";
status = Mcnt;
- } else errorHandling(ErrLoginFailed);
+ } else errorHandlingWithMsg(ErrLoginFailed, response);
break;
}
//get count of messages, eg "+OK 4 900.." -> int 4
@@ -195,7 +199,7 @@ void PopClient::incomingData()
} else newMessages = 0;
}
- } else errorHandling(ErrUnknownResponse);
+ } else errorHandlingWithMsg(ErrUnknownResponse, response);
}
//Read message number x, count upwards to messageCount
case List: {
@@ -234,7 +238,7 @@ void PopClient::incomingData()
status = Retr;
} else {
//qWarning(response);
- errorHandling(ErrUnknownResponse);
+ errorHandlingWithMsg(ErrUnknownResponse, response);
}
}
}
@@ -259,7 +263,7 @@ void PopClient::incomingData()
if (!socket->canReadLine()) //sync. problems
break;
response = socket->readLine();
- } else errorHandling(ErrUnknownResponse);
+ } else errorHandlingWithMsg(ErrUnknownResponse, response);
}
}
//add all incoming lines to body. When size is reached, send
diff --git a/noncore/unsupported/mailit/popclient.h b/noncore/unsupported/mailit/popclient.h
index c58bc48..6774ceb 100644
--- a/noncore/unsupported/mailit/popclient.h
+++ b/noncore/unsupported/mailit/popclient.h
@@ -44,7 +44,7 @@ public:
signals:
void newMessage(const QString &, int, uint, bool);
- void errorOccurred(int status);
+ void errorOccurred(int status, const QString & Msg );
void updateStatus(const QString &);
void mailTransfered(int);
void mailboxSize(int);
@@ -53,6 +53,7 @@ signals:
public slots:
void errorHandling(int);
+ void errorHandlingWithMsg(int, const QString & );
protected slots:
void connectionEstablished();
diff --git a/noncore/unsupported/mailit/smtpclient.cpp b/noncore/unsupported/mailit/smtpclient.cpp
index 2916f45..5b5ef52 100644
--- a/noncore/unsupported/mailit/smtpclient.cpp
+++ b/noncore/unsupported/mailit/smtpclient.cpp
@@ -73,7 +73,12 @@ void SmtpClient::connectionEstablished()
void SmtpClient::errorHandling(int status)
{
- emit errorOccurred(status);
+ errorHandlingWithMsg( status, QString::null );
+}
+
+void SmtpClient::errorHandlingWithMsg(int status, const QString & EMsg )
+{
+ emit errorOccurred(status, EMsg );
socket->close();
mailList.clear();
sending = FALSE;
@@ -87,31 +92,32 @@ void SmtpClient::incomingData()
return;
response = socket->readLine();
-
switch(status) {
case Init: {
if (response[0] == '2') {
status = From;
mailPtr = mailList.first();
*stream << "HELO there\r\n";
- } else errorHandling(ErrUnknownResponse);
+ } else errorHandlingWithMsg(ErrUnknownResponse,response);
break;
}
case From: {
if (response[0] == '2') {
- *stream << "MAIL FROM: " << mailPtr->from << "\r\n";
+ qDebug(mailPtr->from);
+ *stream << "MAIL FROM: <" << mailPtr->from << ">\r\n";
status = Recv;
- } else errorHandling(ErrUnknownResponse);
+ } else errorHandlingWithMsg(ErrUnknownResponse, response );
break;
}
case Recv: {
- if (response[0] == '2') {
+ if (response[0] == '2') {
it = mailPtr->to.begin();
- if (it == NULL)
- errorHandling(ErrUnknownResponse);
- *stream << "RCPT TO: " << *it << ">\r\n";
+ if (it == NULL) {
+ errorHandlingWithMsg(ErrUnknownResponse,response);
+ }
+ *stream << "RCPT TO: <" << *it << ">\r\n";
status = MRcv;
- } else errorHandling(ErrUnknownResponse);
+ } else errorHandlingWithMsg(ErrUnknownResponse,response);
break;
}
case MRcv: {
@@ -123,14 +129,15 @@ void SmtpClient::incomingData()
} else {
status = Data;
}
- } else errorHandling(ErrUnknownResponse);
+ } else errorHandlingWithMsg(ErrUnknownResponse,response);
}
case Data: {
if (response[0] == '2') {
*stream << "DATA\r\n";
status = Body;
emit updateStatus(tr("Sending: ") + mailPtr->subject);
- } else errorHandling(ErrUnknownResponse);
+
+ } else errorHandlingWithMsg(ErrUnknownResponse,response);
break;
}
case Body: {
@@ -142,7 +149,7 @@ void SmtpClient::incomingData()
} else {
status = Quit;
}
- } else errorHandling(ErrUnknownResponse);
+ } else errorHandlingWithMsg(ErrUnknownResponse,response);
break;
}
case Quit: {
@@ -156,7 +163,7 @@ void SmtpClient::incomingData()
mailList.clear();
sending = FALSE;
socket->close();
- } else errorHandling(ErrUnknownResponse);
+ } else errorHandlingWithMsg(ErrUnknownResponse,response);
break;
}
}
diff --git a/noncore/unsupported/mailit/smtpclient.h b/noncore/unsupported/mailit/smtpclient.h
index 45c0703..554ba3f 100644
--- a/noncore/unsupported/mailit/smtpclient.h
+++ b/noncore/unsupported/mailit/smtpclient.h
@@ -47,12 +47,13 @@ public:
void addMail(const QString &from, const QString &subject, const QStringList &to, const QString &body);
signals:
- void errorOccurred(int);
+ void errorOccurred(int, const QString & LR );
void updateStatus(const QString &);
void mailSent();
public slots:
void errorHandling(int);
+ void errorHandlingWithMsg(int, const QString & LastResponse );
protected slots:
void connectionEstablished();
diff --git a/noncore/unsupported/mailit/viewatt.cpp b/noncore/unsupported/mailit/viewatt.cpp
index 21885c2..293e137 100644
--- a/noncore/unsupported/mailit/viewatt.cpp
+++ b/noncore/unsupported/mailit/viewatt.cpp
@@ -26,7 +26,7 @@
ViewAtt::ViewAtt(QWidget *parent, const char *name, WFlags f)
: QMainWindow(parent, name, f)
{
- setCaption("Exploring attatchments");
+ setCaption(tr("Exploring attatchments"));
setToolBarsMovable( FALSE );
bar = new QToolBar(this);
@@ -35,9 +35,9 @@ ViewAtt::ViewAtt(QWidget *parent, const char *name, WFlags f)
installButton->setWhatsThis(tr("Click here to install the attachment to your Documents"));
listView = new QListView(this, "AttView");
- listView->addColumn( "Attatchment" );
- listView->addColumn( "Type" );
- listView->addColumn( "Installed" );
+ listView->addColumn( tr("Attatchment") );
+ listView->addColumn( tr("Type") );
+ listView->addColumn( tr("Installed") );
setCentralWidget(listView);
QWhatsThis::add(listView,QWidget::tr("This is an overview about all attachments in the mail"));
}
@@ -61,9 +61,9 @@ void ViewAtt::update(Email *mailIn, bool inbox)
mail = mailIn;
for ( ePtr=mail->files.first(); ePtr != 0; ePtr=mail->files.next() ) {
- QString isInstalled = "No";
+ QString isInstalled = tr("No");
if (ePtr->installed)
- isInstalled = "Yes";
+ isInstalled = tr("Yes");
item = new QListViewItem(listView, ePtr->originalName, ePtr->contentType, isInstalled);
const QString& mtypeDef=(const QString&) ePtr->contentType+"/"+ePtr->contentAttribute;
@@ -116,6 +116,6 @@ void ViewAtt::install()
d.setType(selPtr->contentType + "/" + selPtr->contentAttribute);
d.writeLink();
selPtr->installed = TRUE;
- item->setText(2, "Yes");
+ item->setText(2, tr("Yes"));
}
}
diff --git a/noncore/unsupported/mailit/writemail.cpp b/noncore/unsupported/mailit/writemail.cpp
index 0298cb3..26b9660 100644
--- a/noncore/unsupported/mailit/writemail.cpp
+++ b/noncore/unsupported/mailit/writemail.cpp
@@ -24,367 +24,367 @@
WriteMail::WriteMail( QWidget* parent, const char* name, WFlags fl ):QMainWindow( parent, name, fl )
{
- showingAddressList = FALSE;
- init();
-
- addAtt = new AddAtt(0, "Add Attachments");
+ showingAddressList = FALSE;
+ init();
+
+ addAtt = new AddAtt(0, "Add Attachments");
}
WriteMail::~WriteMail()
{
- delete addAtt;
+ delete addAtt;
}
void WriteMail::setAddressList(AddressList *list)
{
- AContact *cPtr;
-
- addressList = list;
-
- addressView->clear();
- QList<AContact> *cListPtr = addressList->getContactList();
- QListViewItem *item;
- for (cPtr = cListPtr->first(); cPtr != 0; cPtr = cListPtr->next() ) {
- item = new QListViewItem(addressView, cPtr->name, cPtr->email);
- }
+ AContact *cPtr;
+
+ addressList = list;
+
+ addressView->clear();
+ QList<AContact> *cListPtr = addressList->getContactList();
+ QListViewItem *item;
+ for (cPtr = cListPtr->first(); cPtr != 0; cPtr = cListPtr->next() ) {
+ item = new QListViewItem(addressView, cPtr->name, cPtr->email);
+ }
}
void WriteMail::init()
{
- setToolBarsMovable(FALSE);
-
- bar = new QToolBar(this);
- bar->setHorizontalStretchable( TRUE );
+ setToolBarsMovable(FALSE);
+
+ bar = new QToolBar(this);
+ bar->setHorizontalStretchable( TRUE );
- menu = new QMenuBar( bar );
+ menu = new QMenuBar( bar );
- mailMenu = new QPopupMenu(menu);
- menu->insertItem( tr( "&Mail" ), mailMenu);
- addMenu = new QPopupMenu(menu);
- menu->insertItem( tr( "&Add" ), addMenu);
-
- bar = new QToolBar(this);
- 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"));
-
- confirmButton = new QAction(tr("Enque mail"), Resource::loadPixmap("OKButton"), QString::null, 0, this, 0);
- confirmButton->addTo(bar);
- confirmButton->addTo(mailMenu);
- connect( confirmButton, SIGNAL( activated() ), this, SLOT( accept() ) );
- confirmButton->setWhatsThis(tr("This button puts your mail in the send queue"));
-
- newButton = new QAction(tr("New mail"), Resource::loadPixmap("new"), QString::null, 0, this, 0);
- newButton->addTo(mailMenu);
- connect( newButton, SIGNAL( activated() ), this, SLOT( newMail() ) );
- newButton->setWhatsThis(tr("Click here to create a new mail"));
+ mailMenu = new QPopupMenu(menu);
+ menu->insertItem( tr( "&Mail" ), mailMenu);
+ addMenu = new QPopupMenu(menu);
+ menu->insertItem( tr( "&Add" ), addMenu);
+
+ bar = new QToolBar(this);
+ 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"));
+
+ confirmButton = new QAction(tr("Enque mail"), Resource::loadPixmap("OKButton"), QString::null, 0, this, 0);
+ confirmButton->addTo(bar);
+ confirmButton->addTo(mailMenu);
+ connect( confirmButton, SIGNAL( activated() ), this, SLOT( accept() ) );
+ confirmButton->setWhatsThis(tr("This button puts your mail in the send queue"));
+
+ newButton = new QAction(tr("New mail"), Resource::loadPixmap("new"), QString::null, 0, this, 0);
+ newButton->addTo(mailMenu);
+ connect( newButton, SIGNAL( activated() ), this, SLOT( newMail() ) );
+ newButton->setWhatsThis(tr("Click here to create a new mail"));
- widget = new QWidget(this, "widget");
- grid = new QGridLayout( widget );
+ widget = new QWidget(this, "widget");
+ grid = new QGridLayout( widget );
- recipientsBox = new QComboBox( FALSE, widget, "toLabel" );
- recipientsBox->insertItem( tr( "To:" ) );
- recipientsBox->insertItem( tr( "CC:" ) );
- recipientsBox->setCurrentItem(0);
- grid->addWidget( recipientsBox, 0, 0 );
- connect(recipientsBox,SIGNAL(activated(int)),this, SLOT(changeRecipients(int)));
-
- subjetLabel = new QLabel( widget, "subjetLabel" );
- subjetLabel->setText( tr( "Subject:" ) );
+ recipientsBox = new QComboBox( FALSE, widget, "toLabel" );
+ recipientsBox->insertItem( tr( "To:" ) );
+ recipientsBox->insertItem( tr( "CC:" ) );
+ recipientsBox->setCurrentItem(0);
+ grid->addWidget( recipientsBox, 0, 0 );
+ connect(recipientsBox,SIGNAL(activated(int)),this, SLOT(changeRecipients(int)));
+
+ subjetLabel = new QLabel( widget, "subjetLabel" );
+ subjetLabel->setText( tr( "Subject:" ) );
- grid->addWidget( subjetLabel, 1, 0 );
+ grid->addWidget( subjetLabel, 1, 0 );
- ToolButton13_2 = new QToolButton( widget, "ToolButton13_2" );
- ToolButton13_2->setText( tr( "..." ) );
- grid->addWidget( ToolButton13_2, 1, 2 );
+ ToolButton13_2 = new QToolButton( widget, "ToolButton13_2" );
+ ToolButton13_2->setText( tr( "..." ) );
+ grid->addWidget( ToolButton13_2, 1, 2 );
- subjectInput = new QLineEdit( widget, "subjectInput" );
- grid->addWidget( subjectInput, 1, 1 );
- QWhatsThis::add(subjectInput,QWidget::tr("The mail subject should be entered here"));
+ subjectInput = new QLineEdit( widget, "subjectInput" );
+ grid->addWidget( subjectInput, 1, 1 );
+ QWhatsThis::add(subjectInput,QWidget::tr("The mail subject should be entered here"));
- toInput = new QLineEdit( widget, "toInput" );
- grid->addWidget( toInput, 0, 1 );
- QWhatsThis::add(recipientsBox,QWidget::tr("Recipients can be entered here"));
+ toInput = new QLineEdit( widget, "toInput" );
+ grid->addWidget( toInput, 0, 1 );
+ QWhatsThis::add(recipientsBox,QWidget::tr("Recipients can be entered here"));
- ccInput = new QLineEdit( widget, "ccInput" );
- ccInput->hide();
- 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"));
+ ccInput = new QLineEdit( widget, "ccInput" );
+ ccInput->hide();
+ 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"));
- addressButton = new QToolButton( widget, "addressButton" );
- addressButton->setPixmap( Resource::loadPixmap("AddressBook") );
- addressButton->setToggleButton(TRUE);
- grid->addWidget( addressButton, 0, 2 );
- 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"));
+ addressButton = new QToolButton( widget, "addressButton" );
+ addressButton->setPixmap( Resource::loadPixmap("AddressBook") );
+ addressButton->setToggleButton(TRUE);
+ grid->addWidget( addressButton, 0, 2 );
+ 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"));
- emailInput = new QMultiLineEdit( widget, "emailInput" );
- grid->addMultiCellWidget( emailInput, 2, 2, 0, 2);
- QWhatsThis::add(emailInput,QWidget::tr("Enter your mail text here"));
+ emailInput = new QMultiLineEdit( widget, "emailInput" );
+ grid->addMultiCellWidget( emailInput, 2, 2, 0, 2);
+ QWhatsThis::add(emailInput,QWidget::tr("Enter your mail text here"));
- addressView = new QListView( widget, "addressView");
- addressView->addColumn("Name");
- addressView->addColumn("EMail");
- addressView->setAllColumnsShowFocus(TRUE);
- addressView->setMultiSelection(TRUE);
- addressView->hide();
- grid->addMultiCellWidget( addressView, 3, 3, 0, 2);
- QWhatsThis::add(recipientsBox,QWidget::tr("Choose the recipients from this list"));
+ addressView = new QListView( widget, "addressView");
+ addressView->addColumn(tr("Name"));
+ addressView->addColumn(tr("EMail") );
+ addressView->setAllColumnsShowFocus(TRUE);
+ addressView->setMultiSelection(TRUE);
+ addressView->hide();
+ grid->addMultiCellWidget( addressView, 3, 3, 0, 2);
+ QWhatsThis::add(recipientsBox,QWidget::tr("Choose the recipients from this list"));
- okButton = new QToolButton(bar, "ok");
- okButton->setPixmap( Resource::loadPixmap("enter") );
- okButton->hide();
- connect(okButton, SIGNAL(clicked()), this, SLOT(addRecipients()) );
- QWhatsThis::add(okButton,QWidget::tr("Queue your mail by clicking here"));
-
- setCentralWidget(widget);
+ okButton = new QToolButton(bar, "ok");
+ okButton->setPixmap( Resource::loadPixmap("enter") );
+ okButton->hide();
+ connect(okButton, SIGNAL(clicked()), this, SLOT(addRecipients()) );
+ QWhatsThis::add(okButton,QWidget::tr("Queue your mail by clicking here"));
+
+ setCentralWidget(widget);
}
void WriteMail::reject()
{
- emit cancelMail();
+ emit cancelMail();
}
void WriteMail::accept()
{
- QStringList attachedFiles, attachmentsType;
- int idCount = 0;
-
- if (toInput->text() == "")
- {
- QMessageBox::warning(this,tr("No recipient"), tr("Send mail to whom?"), tr("OK\n"));
- return;
- }
-
- if (! getRecipients(false) )
- {
- QMessageBox::warning(this,tr("Incorrect recipient separator"),
- tr("Recipients must be separated by ;\nand be valid emailaddresses"), tr("OK\n"));
- return;
- }
-
- if ((ccInput->text()!="") && (! getRecipients(true) ))
- {
- QMessageBox::warning(this,tr("Incorrect carbon copy separator"),
- tr("CC Recipients must be separated by ;\nand be valid emailaddresses"), tr("OK\n"));
- return;
- }
-
- mail.subject = subjectInput->text();
- mail.body = emailInput->text();
- mail.sent = false;
- mail.received = false;
-
- mail.rawMail = "To: ";
-
- for (QStringList::Iterator it = mail.recipients.begin();
- it != mail.recipients.end(); ++it) {
-
- mail.rawMail += (*it);
- mail.rawMail += ",\n";
- }
-
- mail.rawMail.truncate(mail.rawMail.length()-2);
-
- mail.rawMail += "\nCC: ";
-
- for (QStringList::Iterator it = mail.carbonCopies.begin();
- it != mail.carbonCopies.end(); ++it) {
-
- mail.rawMail += (*it);
- mail.rawMail += ",\n";
- }
+ QStringList attachedFiles, attachmentsType;
+ int idCount = 0;
+
+ if (toInput->text() == "")
+ {
+ QMessageBox::warning(this,tr("No recipient"), tr("Send mail to whom?"), tr("OK\n"));
+ return;
+ }
+
+ if (! getRecipients(false) )
+ {
+ QMessageBox::warning(this,tr("Incorrect recipient separator"),
+ tr("Recipients must be separated by ;\nand be valid emailaddresses"), tr("OK\n"));
+ return;
+ }
+
+ if ((ccInput->text()!="") && (! getRecipients(true) ))
+ {
+ QMessageBox::warning(this,tr("Incorrect carbon copy separator"),
+ tr("CC Recipients must be separated by ;\nand be valid emailaddresses"), tr("OK\n"));
+ return;
+ }
+
+ mail.subject = subjectInput->text();
+ mail.body = emailInput->text();
+ mail.sent = false;
+ mail.received = false;
+
+ mail.rawMail = "To: ";
+
+ for (QStringList::Iterator it = mail.recipients.begin();
+ it != mail.recipients.end(); ++it) {
+
+ mail.rawMail += (*it);
+ mail.rawMail += ",\n";
+ }
+
+ mail.rawMail.truncate(mail.rawMail.length()-2);
+
+ mail.rawMail += "\nCC: ";
+
+ for (QStringList::Iterator it = mail.carbonCopies.begin();
+ it != mail.carbonCopies.end(); ++it) {
+
+ mail.rawMail += (*it);
+ mail.rawMail += ",\n";
+ }
- mail.rawMail += mail.from;
- mail.rawMail += "\nSubject: ";
- mail.rawMail += mail.subject;
- mail.rawMail += "\n\n";
-
- attachedFiles = addAtt->returnattachedFiles();
- attachmentsType = addAtt->returnFileTypes();
+ mail.rawMail += mail.from;
+ mail.rawMail += "\nSubject: ";
+ mail.rawMail += mail.subject;
+ mail.rawMail += "\n\n";
+
+ attachedFiles = addAtt->returnattachedFiles();
+ attachmentsType = addAtt->returnFileTypes();
- QStringList::Iterator itType = attachmentsType.begin();
-
- Enclosure e;
- for ( QStringList::Iterator it = attachedFiles.begin(); it != attachedFiles.end(); ++it ) {
- e.id = idCount;
- e.originalName = (*it).latin1();
- e.contentType = (*itType).latin1();
- e.contentAttribute = (*itType).latin1();
- e.saved = TRUE;
- mail.addEnclosure(&e);
-
- itType++;
- idCount++;
- }
- mail.rawMail += mail.body;
- mail.rawMail += "\n";
- mail.rawMail += ".\n";
- emit sendMailRequested(mail);
- addAtt->clear();
+ QStringList::Iterator itType = attachmentsType.begin();
+
+ Enclosure e;
+ for ( QStringList::Iterator it = attachedFiles.begin(); it != attachedFiles.end(); ++it ) {
+ e.id = idCount;
+ e.originalName = (*it).latin1();
+ e.contentType = (*itType).latin1();
+ e.contentAttribute = (*itType).latin1();
+ e.saved = TRUE;
+ mail.addEnclosure(&e);
+
+ itType++;
+ idCount++;
+ }
+ mail.rawMail += mail.body;
+ mail.rawMail += "\n";
+ mail.rawMail += ".\n";
+ emit sendMailRequested(mail);
+ addAtt->clear();
}
void WriteMail::getAddress()
{
- showingAddressList = !showingAddressList;
-
- if (showingAddressList) {
- emailInput->hide();
- addressView->show();
- okButton->show();
-
- } else {
- addressView->hide();
- okButton->hide();
- emailInput->show();
- }
+ showingAddressList = !showingAddressList;
+
+ if (showingAddressList) {
+ emailInput->hide();
+ addressView->show();
+ okButton->show();
+
+ } else {
+ addressView->hide();
+ okButton->hide();
+ emailInput->show();
+ }
}
void WriteMail::attachFile()
{
- addAtt->showMaximized();
+ addAtt->showMaximized();
}
void WriteMail::reply(Email replyMail, bool replyAll)
{
- int pos;
- QString ccRecipients;
-
- mail = replyMail;
- mail.files.clear();
-
- toInput->setText(mail.fromMail);
-
- if (replyAll)
- {
- for (QStringList::Iterator it = mail.carbonCopies.begin();it != mail.carbonCopies.end(); ++it)
- {
- ccRecipients.append(*it);
- ccRecipients.append(";");
- }
- ccRecipients.truncate(ccRecipients.length()-1); //no ; at the end
- ccInput->setText(ccRecipients);
- }
- else ccInput->clear();
-
- subjectInput->setText(tr("Re: ") + mail.subject);
-
- QString citation=mail.fromMail;
- citation.append(tr(" wrote on "));
- citation.append(mail.date);
- citation.append(":\n");
-
+ int pos;
+ QString ccRecipients;
+
+ mail = replyMail;
+ mail.files.clear();
+
+ toInput->setText(mail.fromMail);
+
+ if (replyAll)
+ {
+ for (QStringList::Iterator it = mail.carbonCopies.begin();it != mail.carbonCopies.end(); ++it)
+ {
+ ccRecipients.append(*it);
+ ccRecipients.append(";");
+ }
+ ccRecipients.truncate(ccRecipients.length()-1); //no ; at the end
+ ccInput->setText(ccRecipients);
+ }
+ else ccInput->clear();
+
+ subjectInput->setText(tr("Re: ") + mail.subject);
+
+ QString citation=mail.fromMail;
+ citation.append(tr(" wrote on "));
+ citation.append(mail.date);
+ citation.append(":\n");
+
- //mail.body.insert(0,tr("On"));
- pos = 0;
- mail.body.insert(pos, ">");
- while (pos != -1) {
- pos = mail.body.find('\n', pos);
- if (pos != -1)
- mail.body.insert(++pos, ">>");
- }
- mail.body.insert(0,citation);
- emailInput->setText(mail.body);
+ //mail.body.insert(0,tr("On"));
+ pos = 0;
+ mail.body.insert(pos, ">");
+ while (pos != -1) {
+ pos = mail.body.find('\n', pos);
+ if (pos != -1)
+ mail.body.insert(++pos, ">");
+ }
+ mail.body.insert(0,citation);
+ emailInput->setText(mail.body);
}
void WriteMail::forward(Email forwMail)
{
- int pos=0;
-
- QString fwdBody=tr("======forwarded message from ");
- fwdBody.append(forwMail.fromMail);
- fwdBody.append(tr(" starts======\n\n"));
-
- mail=forwMail;
- toInput->setText("");
- ccInput->setText("");
- subjectInput->setText(tr("FWD: ") + mail.subject);
-
- fwdBody+=mail.body;
- fwdBody+=QString(tr("======end of forwarded message======\n\n"));
-
- emailInput->setText(fwdBody);
+ // int pos=0;
+
+ QString fwdBody=tr("======forwarded message from ");
+ fwdBody.append(forwMail.fromMail);
+ fwdBody.append(tr(" starts======\n\n"));
+
+ mail=forwMail;
+ toInput->setText("");
+ ccInput->setText("");
+ subjectInput->setText(tr("FWD: ") + mail.subject);
+
+ fwdBody+=mail.body;
+ fwdBody+=QString(tr("======end of forwarded message======\n\n"));
+
+ emailInput->setText(fwdBody);
}
bool WriteMail::getRecipients(bool ccField)
{
- QString str, temp;
- int pos = 0;
-
- if (ccField)
- {
- mail.carbonCopies.clear();
- temp = ccInput->text();
- }
- else
- {
- mail.recipients.clear();
- temp=toInput->text() ;
- }
-
- while ( (pos = temp.find(';')) != -1) {
- str = temp.left(pos).stripWhiteSpace();
- temp = temp.right(temp.length() - (pos + 1));
- if ( str.find('@') == -1)
- return false;
- ccField ? mail.carbonCopies.append(str) : mail.recipients.append(str);
- //addressList->addContact(str, "");
- }
- temp = temp.stripWhiteSpace();
- if ( temp.find('@') == -1)
- return false;
- ccField ? mail.carbonCopies.append(temp) : mail.recipients.append(temp);
- //addressList->addContact(temp, "");
-
- return TRUE;
+ QString str, temp;
+ int pos = 0;
+
+ if (ccField)
+ {
+ mail.carbonCopies.clear();
+ temp = ccInput->text();
+ }
+ else
+ {
+ mail.recipients.clear();
+ temp=toInput->text() ;
+ }
+
+ while ( (pos = temp.find(';')) != -1) {
+ str = temp.left(pos).stripWhiteSpace();
+ temp = temp.right(temp.length() - (pos + 1));
+ if ( str.find('@') == -1)
+ return false;
+ ccField ? mail.carbonCopies.append(str) : mail.recipients.append(str);
+ //addressList->addContact(str, "");
+ }
+ temp = temp.stripWhiteSpace();
+ if ( temp.find('@') == -1)
+ return false;
+ ccField ? mail.carbonCopies.append(temp) : mail.recipients.append(temp);
+ //addressList->addContact(temp, "");
+
+ return TRUE;
}
void WriteMail::addRecipients()
{
- toInput->isVisible() ? addRecipients(false) : addRecipients(true);
-}
+ toInput->isVisible() ? addRecipients(false) : addRecipients(true);
+}
void WriteMail::addRecipients(bool ccField)
{
- QString recipients = "";
-
- mail.recipients.clear();
-
- QListViewItem *item = addressView->firstChild();
- while (item != NULL) {
- if ( item->isSelected() ) {
- if (recipients == "") {
- recipients = item->text(1);
- } else {
- recipients += "; " + item->text(1);
- }
- }
- item = item->nextSibling();
- }
-
- ccField ? ccInput->setText(recipients):toInput->setText(recipients);
-
- addressView->hide();
- okButton->hide();
- emailInput->show();
- addressButton->setOn(FALSE);
- showingAddressList = !showingAddressList;
+ QString recipients = "";
+
+ mail.recipients.clear();
+
+ QListViewItem *item = addressView->firstChild();
+ while (item != NULL) {
+ if ( item->isSelected() ) {
+ if (recipients == "") {
+ recipients = item->text(1);
+ } else {
+ recipients += "; " + item->text(1);
+ }
+ }
+ item = item->nextSibling();
+ }
+
+ ccField ? ccInput->setText(recipients):toInput->setText(recipients);
+
+ addressView->hide();
+ okButton->hide();
+ emailInput->show();
+ addressButton->setOn(FALSE);
+ showingAddressList = !showingAddressList;
}
void WriteMail::changeRecipients(int selection)
{
- if (selection==0)
- {
- toInput->show();
- ccInput->hide();
- }
- else if (selection==1)
- {
- toInput->hide();
- ccInput->show();
- }
+ if (selection==0)
+ {
+ toInput->show();
+ ccInput->hide();
+ }
+ else if (selection==1)
+ {
+ toInput->hide();
+ ccInput->show();
+ }
}
void WriteMail::setRecipient(const QString &recipient)
@@ -394,9 +394,9 @@ void WriteMail::setRecipient(const QString &recipient)
void WriteMail::newMail()
{
- toInput->clear();
- ccInput->clear();
- subjectInput->clear();
- emailInput->clear();
- setAddressList(addressList);
+ toInput->clear();
+ ccInput->clear();
+ subjectInput->clear();
+ emailInput->clear();
+ setAddressList(addressList);
}