Diffstat (limited to 'noncore/net/mailit/emailclient.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/net/mailit/emailclient.cpp | 71 |
1 files changed, 38 insertions, 33 deletions
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 @@ -58,12 +58,12 @@ 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()) ); @@ -479,9 +479,9 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk) mailboxView->setCurrentTab(0); } -void EmailClient::allMailArrived(int count) +void EmailClient::allMailArrived(int /*count*/) { // not previewing means all mailtransfer has been done /*if (!previewingMail) {*/ if ( (allAccounts) && ( (currentAccount = accountList.next()) !=0 ) ) { @@ -517,21 +517,23 @@ void EmailClient::moveMailFront(Email *mailPtr) mailDownloadList.moveFront(mailPtr->serverId, mailPtr->size); } } -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"); } else { @@ -543,26 +545,29 @@ void EmailClient::smtpError(int code) cancelButton->setEnabled(FALSE); 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"); } @@ -897,9 +902,9 @@ void EmailClient::setMailSize(int size) progressBar->reset(); progressBar->setTotalSteps(size); } -void EmailClient::setTotalSize(int size) +void EmailClient::setTotalSize(int /*size*/) { } @@ -919,9 +924,9 @@ void EmailClient::deleteItem() bool inbox=mailboxView->currentTab()==0; QListView* box; EmailListItem* eli; - int pos; + // int pos; inbox ? box=inboxView : box=outboxView; eli=(EmailListItem*)box->selectedItem(); @@ -945,9 +950,9 @@ void EmailClient::inboxItemReleased() } /*void EmailClient::timerEvent(QTimerEvent *e) { - /*killTimer(timerID); + //killTimer(timerID); QPopupMenu *action = new QPopupMenu(this); @@ -990,13 +995,13 @@ void EmailClient::download(Email* mail) QMessageBox::warning(qApp->activeWindow(), 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); |