28 files changed, 200 insertions, 162 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 @@ -53,13 +53,13 @@ FileItem::~FileItem() doclnk=NULL; } 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 ); QHBox *buttons=new QHBox(this); /*fileCategoryButton = new QPushButton(this);*/ attachButton = new QPushButton(tr("attach..."), buttons); @@ -119,13 +119,13 @@ void AddAtt::clear() { fileCategoryButton->setText(fileCategories->text(id)); getFiles(); }*/ void AddAtt::addattachment() -{ +{ // ### FIXME wrong use -zecke OFileDialog ofs("Attachments",this,0,0,"/root/Documents"); ofs.showMaximized(); if (ofs.exec()==QDialog::Accepted) { 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 @@ -56,16 +56,16 @@ EmailClient::EmailClient( QWidget* parent, const char* name, WFlags fl ) init(); 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()) ); connect(inboxView, SIGNAL(pressed(QListViewItem *)), this, SLOT(inboxItemPressed()) ); connect(inboxView, SIGNAL(clicked(QListViewItem *)), this, SLOT(inboxItemReleased()) ); @@ -477,13 +477,13 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk) mailDownloadList.sizeInsert(newMail.serverId, newMail.size);*/ 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 ) ) { emit newCaption("Mailit - " + currentAccount->accountName); getNewMail(); @@ -515,25 +515,27 @@ void EmailClient::moveMailFront(Email *mailPtr) { if ( (receiving) && (mailPtr->fromAccountId == currentAccount->id) ) { 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 { status2Label->setText("Aborted by user"); } @@ -541,30 +543,33 @@ void EmailClient::smtpError(int code) sending = FALSE; sendMailButton->setEnabled(TRUE); 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"); } receiving = FALSE; getMailButton->setEnabled(TRUE); @@ -895,13 +900,13 @@ void EmailClient::deleteMail(EmailListItem *mailItem, bool &inbox) void EmailClient::setMailSize(int size) { progressBar->reset(); progressBar->setTotalSteps(size); } -void EmailClient::setTotalSize(int size) +void EmailClient::setTotalSize(int /*size*/) { } void EmailClient::setDownloadedSize(int size) { @@ -917,13 +922,13 @@ void EmailClient::setDownloadedSize(int size) 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(); if (eli) @@ -943,13 +948,13 @@ void EmailClient::inboxItemReleased() { // killTimer(timerID); } /*void EmailClient::timerEvent(QTimerEvent *e) { - /*killTimer(timerID); + //killTimer(timerID); QPopupMenu *action = new QPopupMenu(this); int reply=0; @@ -988,17 +993,17 @@ void EmailClient::download(Email* mail) } else 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); if (statusBar==0) { 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 @@ -95,14 +95,14 @@ public slots: void setMailAccount(); void sendQuedMail(); void mailSent(); 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(); void inboxItemReleased(); void mailArrived(const Email &mail, bool fromDisk); void allMailArrived(int); 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 @@ -41,20 +41,20 @@ EmailHandler::EmailHandler() { qDebug("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, SIGNAL(updatePopStatus(const QString &)) ); connect(popClient, SIGNAL(mailTransfered(int)), this, SIGNAL(mailTransfered(int)) ); 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 @@ -124,14 +124,14 @@ public: int encodeFile(const QString &fileName, QString *toBody); void encode64base(char *src, QString *dest, int len); void cancel(); 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 &); void mailTransfered(int); void mailboxSize(int); void currentMailSize(int); 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,7 +1,8 @@ TEMPLATE = app +TARGET = mailit CONFIG = qt warn_on release HEADERS = emailclient.h \ emailhandler.h \ emaillistitem.h \ mailitwindow.h \ md5.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 @@ -18,16 +18,16 @@ ** **********************************************************************/ #include <qwhatsthis.h> #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); QWhatsThis::add(views,tr("Central view area")); emailClient = new EmailClient(views, "client"); writeMail = new WriteMail(views, "writing"); 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 @@ -71,13 +71,13 @@ void MailList::sizeInsert(int serverId, uint size) 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; @@ -97,13 +97,13 @@ void MailList::moveFront(int serverId, uint size) 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; @@ -122,10 +122,10 @@ bool MailList::remove(int serverId, uint size) 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); } 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 @@ -60,13 +60,13 @@ void PopClient::newConnection(const QString &target, int port) status = Init; socket->connectToHost(target, port); receiving = TRUE; //selected = FALSE; - emit updateStatus("DNS lookup"); + emit updateStatus(tr("DNS lookup")); } void PopClient::setAccount(const QString &popUser, const QString &popPasswd) { popUserName = popUser; popPassword = popPasswd; @@ -100,14 +100,18 @@ void PopClient::connectionEstablished() { emit updateStatus(tr("Connection established")); } 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; } void PopClient::incomingData() { @@ -164,13 +168,13 @@ void PopClient::incomingData() } //ask for number of messages case Stat: { 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 case Mcnt: { if (response[0] == '+') { temp = response.replace(0, 4, ""); @@ -192,13 +196,13 @@ void PopClient::incomingData() if (ptr != 0) { newMessages++; //to ensure no early jumpout messageCount = *ptr; } else newMessages = 0; } - } else errorHandling(ErrUnknownResponse); + } else errorHandlingWithMsg(ErrUnknownResponse, response); } //Read message number x, count upwards to messageCount case List: { if (messageCount <= newMessages) { *stream << "LIST " << messageCount << "\r\n"; status = Size; @@ -231,13 +235,13 @@ void PopClient::incomingData() mailSize = temp.toInt(); emit currentMailSize(mailSize); status = Retr; } else { //qWarning(response); - errorHandling(ErrUnknownResponse); + errorHandlingWithMsg(ErrUnknownResponse, response); } } } //Read message number x, count upwards to messageCount case Retr: { if (status != Quit) { @@ -256,13 +260,13 @@ void PopClient::incomingData() if (response[0] == '+') { message = ""; status = Read; 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 //message, and go back to read new message case Read: { if (status != Quit) { //because of idiotic switch 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 @@ -41,21 +41,22 @@ public: void removeSynchronize(); void headersOnly(bool headers, int limit); void setSelectedMails(MailList *list); 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); void currentMailSize(int); void downloadedSize(int); public slots: void errorHandling(int); + void errorHandlingWithMsg(int, const QString & ); protected slots: void connectionEstablished(); void incomingData(); private: 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 @@ -70,13 +70,18 @@ void SmtpClient::connectionEstablished() emit updateStatus(tr("Connection established")); } 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; } void SmtpClient::incomingData() @@ -84,68 +89,70 @@ void SmtpClient::incomingData() QString response; if (!socket->canReadLine()) 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') { 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: { if (response[0] == '2') { it++; if ( it != mailPtr->to.end() ) { *stream << "RCPT TO: <" << *it << ">\r\n"; break; } 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: { if (response[0] == '3') { *stream << mailPtr->body << "\r\n.\r\n"; mailPtr = mailList.next(); if (mailPtr != NULL) { status = From; } else { status = Quit; } - } else errorHandling(ErrUnknownResponse); + } else errorHandlingWithMsg(ErrUnknownResponse,response); break; } case Quit: { if (response[0] == '2') { *stream << "QUIT\r\n"; status = Done; @@ -153,11 +160,11 @@ void SmtpClient::incomingData() temp.setNum(mailList.count()); emit updateStatus(tr("Sent ") + temp + tr(" messages")); emit mailSent(); 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 @@ -44,18 +44,19 @@ public: SmtpClient(); ~SmtpClient(); void newConnection(const QString &target, int port); 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(); void incomingData(); private: 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 @@ -23,24 +23,24 @@ #include <qpe/applnk.h> #include <qpe/mimetype.h> 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); installButton = new QAction( tr( "Install" ), Resource::loadPixmap( "exec" ), QString::null, CTRL + Key_C, this, 0 ); connect(installButton, SIGNAL(activated()), this, SLOT(install()) ); 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")); } void ViewAtt::update(Email *mailIn, bool inbox) { @@ -58,15 +58,15 @@ void ViewAtt::update(Email *mailIn, bool inbox) bar->hide(); } 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; MimeType mt(mtypeDef); @@ -113,9 +113,9 @@ void ViewAtt::install() d.setName(selPtr->originalName); d.setFile(selPtr->path + selPtr->name); 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 @@ -115,21 +115,21 @@ void WriteMail::init() 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")); + 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")); addressView = new QListView( widget, "addressView"); - addressView->addColumn("Name"); - addressView->addColumn("EMail"); + 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")); @@ -280,21 +280,21 @@ void WriteMail::reply(Email replyMail, bool replyAll) //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(++pos, ">"); } mail.body.insert(0,citation); emailInput->setText(mail.body); } void WriteMail::forward(Email forwMail) { - int pos=0; + // int pos=0; QString fwdBody=tr("======forwarded message from "); fwdBody.append(forwMail.fromMail); fwdBody.append(tr(" starts======\n\n")); mail=forwMail; 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 @@ -53,13 +53,13 @@ FileItem::~FileItem() doclnk=NULL; } 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 ); QHBox *buttons=new QHBox(this); /*fileCategoryButton = new QPushButton(this);*/ attachButton = new QPushButton(tr("attach..."), buttons); @@ -119,13 +119,13 @@ void AddAtt::clear() { fileCategoryButton->setText(fileCategories->text(id)); getFiles(); }*/ void AddAtt::addattachment() -{ +{ // ### FIXME wrong use -zecke OFileDialog ofs("Attachments",this,0,0,"/root/Documents"); ofs.showMaximized(); if (ofs.exec()==QDialog::Accepted) { 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 @@ -56,16 +56,16 @@ EmailClient::EmailClient( QWidget* parent, const char* name, WFlags fl ) init(); 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()) ); connect(inboxView, SIGNAL(pressed(QListViewItem *)), this, SLOT(inboxItemPressed()) ); connect(inboxView, SIGNAL(clicked(QListViewItem *)), this, SLOT(inboxItemReleased()) ); @@ -477,13 +477,13 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk) mailDownloadList.sizeInsert(newMail.serverId, newMail.size);*/ 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 ) ) { emit newCaption("Mailit - " + currentAccount->accountName); getNewMail(); @@ -515,25 +515,27 @@ void EmailClient::moveMailFront(Email *mailPtr) { if ( (receiving) && (mailPtr->fromAccountId == currentAccount->id) ) { 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 { status2Label->setText("Aborted by user"); } @@ -541,30 +543,33 @@ void EmailClient::smtpError(int code) sending = FALSE; sendMailButton->setEnabled(TRUE); 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"); } receiving = FALSE; getMailButton->setEnabled(TRUE); @@ -895,13 +900,13 @@ void EmailClient::deleteMail(EmailListItem *mailItem, bool &inbox) void EmailClient::setMailSize(int size) { progressBar->reset(); progressBar->setTotalSteps(size); } -void EmailClient::setTotalSize(int size) +void EmailClient::setTotalSize(int /*size*/) { } void EmailClient::setDownloadedSize(int size) { @@ -917,13 +922,13 @@ void EmailClient::setDownloadedSize(int size) 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(); if (eli) @@ -943,13 +948,13 @@ void EmailClient::inboxItemReleased() { // killTimer(timerID); } /*void EmailClient::timerEvent(QTimerEvent *e) { - /*killTimer(timerID); + //killTimer(timerID); QPopupMenu *action = new QPopupMenu(this); int reply=0; @@ -988,17 +993,17 @@ void EmailClient::download(Email* mail) } else 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); if (statusBar==0) { 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 @@ -95,14 +95,14 @@ public slots: void setMailAccount(); void sendQuedMail(); void mailSent(); 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(); void inboxItemReleased(); void mailArrived(const Email &mail, bool fromDisk); void allMailArrived(int); 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 @@ -41,20 +41,20 @@ EmailHandler::EmailHandler() { qDebug("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, SIGNAL(updatePopStatus(const QString &)) ); connect(popClient, SIGNAL(mailTransfered(int)), this, SIGNAL(mailTransfered(int)) ); 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 @@ -124,14 +124,14 @@ public: int encodeFile(const QString &fileName, QString *toBody); void encode64base(char *src, QString *dest, int len); void cancel(); 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 &); void mailTransfered(int); void mailboxSize(int); void currentMailSize(int); 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,7 +1,8 @@ TEMPLATE = app +TARGET = mailit CONFIG = qt warn_on release HEADERS = emailclient.h \ emailhandler.h \ emaillistitem.h \ mailitwindow.h \ md5.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 @@ -18,16 +18,16 @@ ** **********************************************************************/ #include <qwhatsthis.h> #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); QWhatsThis::add(views,tr("Central view area")); emailClient = new EmailClient(views, "client"); writeMail = new WriteMail(views, "writing"); 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 @@ -71,13 +71,13 @@ void MailList::sizeInsert(int serverId, uint size) 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; @@ -97,13 +97,13 @@ void MailList::moveFront(int serverId, uint size) 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; @@ -122,10 +122,10 @@ bool MailList::remove(int serverId, uint size) 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); } 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 @@ -60,13 +60,13 @@ void PopClient::newConnection(const QString &target, int port) status = Init; socket->connectToHost(target, port); receiving = TRUE; //selected = FALSE; - emit updateStatus("DNS lookup"); + emit updateStatus(tr("DNS lookup")); } void PopClient::setAccount(const QString &popUser, const QString &popPasswd) { popUserName = popUser; popPassword = popPasswd; @@ -100,14 +100,18 @@ void PopClient::connectionEstablished() { emit updateStatus(tr("Connection established")); } 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; } void PopClient::incomingData() { @@ -164,13 +168,13 @@ void PopClient::incomingData() } //ask for number of messages case Stat: { 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 case Mcnt: { if (response[0] == '+') { temp = response.replace(0, 4, ""); @@ -192,13 +196,13 @@ void PopClient::incomingData() if (ptr != 0) { newMessages++; //to ensure no early jumpout messageCount = *ptr; } else newMessages = 0; } - } else errorHandling(ErrUnknownResponse); + } else errorHandlingWithMsg(ErrUnknownResponse, response); } //Read message number x, count upwards to messageCount case List: { if (messageCount <= newMessages) { *stream << "LIST " << messageCount << "\r\n"; status = Size; @@ -231,13 +235,13 @@ void PopClient::incomingData() mailSize = temp.toInt(); emit currentMailSize(mailSize); status = Retr; } else { //qWarning(response); - errorHandling(ErrUnknownResponse); + errorHandlingWithMsg(ErrUnknownResponse, response); } } } //Read message number x, count upwards to messageCount case Retr: { if (status != Quit) { @@ -256,13 +260,13 @@ void PopClient::incomingData() if (response[0] == '+') { message = ""; status = Read; 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 //message, and go back to read new message case Read: { if (status != Quit) { //because of idiotic switch 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 @@ -41,21 +41,22 @@ public: void removeSynchronize(); void headersOnly(bool headers, int limit); void setSelectedMails(MailList *list); 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); void currentMailSize(int); void downloadedSize(int); public slots: void errorHandling(int); + void errorHandlingWithMsg(int, const QString & ); protected slots: void connectionEstablished(); void incomingData(); private: 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 @@ -70,13 +70,18 @@ void SmtpClient::connectionEstablished() emit updateStatus(tr("Connection established")); } 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; } void SmtpClient::incomingData() @@ -84,68 +89,70 @@ void SmtpClient::incomingData() QString response; if (!socket->canReadLine()) 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') { 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: { if (response[0] == '2') { it++; if ( it != mailPtr->to.end() ) { *stream << "RCPT TO: <" << *it << ">\r\n"; break; } 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: { if (response[0] == '3') { *stream << mailPtr->body << "\r\n.\r\n"; mailPtr = mailList.next(); if (mailPtr != NULL) { status = From; } else { status = Quit; } - } else errorHandling(ErrUnknownResponse); + } else errorHandlingWithMsg(ErrUnknownResponse,response); break; } case Quit: { if (response[0] == '2') { *stream << "QUIT\r\n"; status = Done; @@ -153,11 +160,11 @@ void SmtpClient::incomingData() temp.setNum(mailList.count()); emit updateStatus(tr("Sent ") + temp + tr(" messages")); emit mailSent(); 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 @@ -44,18 +44,19 @@ public: SmtpClient(); ~SmtpClient(); void newConnection(const QString &target, int port); 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(); void incomingData(); private: 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 @@ -23,24 +23,24 @@ #include <qpe/applnk.h> #include <qpe/mimetype.h> 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); installButton = new QAction( tr( "Install" ), Resource::loadPixmap( "exec" ), QString::null, CTRL + Key_C, this, 0 ); connect(installButton, SIGNAL(activated()), this, SLOT(install()) ); 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")); } void ViewAtt::update(Email *mailIn, bool inbox) { @@ -58,15 +58,15 @@ void ViewAtt::update(Email *mailIn, bool inbox) bar->hide(); } 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; MimeType mt(mtypeDef); @@ -113,9 +113,9 @@ void ViewAtt::install() d.setName(selPtr->originalName); d.setFile(selPtr->path + selPtr->name); 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 @@ -115,21 +115,21 @@ void WriteMail::init() 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")); + 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")); addressView = new QListView( widget, "addressView"); - addressView->addColumn("Name"); - addressView->addColumn("EMail"); + 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")); @@ -280,21 +280,21 @@ void WriteMail::reply(Email replyMail, bool replyAll) //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(++pos, ">"); } mail.body.insert(0,citation); emailInput->setText(mail.body); } void WriteMail::forward(Email forwMail) { - int pos=0; + // int pos=0; QString fwdBody=tr("======forwarded message from "); fwdBody.append(forwMail.fromMail); fwdBody.append(tr(" starts======\n\n")); mail=forwMail; |