1 files changed, 23 insertions, 15 deletions

diff --git a/noncore/net/mailit/writemail.cpp b/noncore/net/mailit/writemail.cpp
index a9dcb02..0336c83 100644
--- a/noncore/net/mailit/writemail.cpp
+++ b/noncore/net/mailit/writemail.cpp
@@ -9,34 +9,35 @@
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include <qmessagebox.h>
+#include <qwhatsthis.h>
 #include "writemail.h"
 #include <qpe/resource.h>
 
 WriteMail::WriteMail( QWidget* parent,  const char* name, WFlags fl )
         : QMainWindow( parent, name, fl )
 {
         showingAddressList = FALSE;
         init();
         
-        addAtt = new AddAtt(0, "Add Attatchments");
+        addAtt = new AddAtt(0, "Add Attachments");
 }
 
 WriteMail::~WriteMail()
 {
         delete addAtt;
 }
 
 void WriteMail::setAddressList(AddressList *list)
 {
         Contact *cPtr;
         
         addressList = list;
@@ -55,104 +56,111 @@ void WriteMail::init()
         
         bar = new QToolBar(this);
         bar->setHorizontalStretchable( TRUE );
 
         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);
-        attatchButton = new QAction(tr("Attatchment"), Resource::loadPixmap("mailit/attach"), QString::null, 0, this, 0);
-        attatchButton->addTo(bar);
-        attatchButton->addTo(addMenu);
-        connect( attatchButton, SIGNAL( activated() ), this, SLOT( attatchFile() ) );
+        attachButton = new QAction(tr("Attachment"), Resource::loadPixmap("mailit/attach"), QString::null, 0, this, 0);
+        attachButton->addTo(bar);
+        attachButton->addTo(addMenu);
+        connect( attachButton, SIGNAL( activated() ), this, SLOT( attachFile() ) );
+        attachButton->setWhatsThis(tr("Click here to attach files to your mail"));
         
         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 );
 
         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 );
 
         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"));
 
         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"));
         
         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(recipientsBox,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("Chose 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);
 }
 
 void WriteMail::reject()
 {
         emit cancelMail();
 }
 
 // need to insert date
 void WriteMail::accept()
 {
-        QStringList attatchedFiles, attatchmentsType;
+        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"));
@@ -187,31 +195,31 @@ void WriteMail::accept()
         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";
         
-        attatchedFiles = addAtt->returnAttatchedFiles();
-        attatchmentsType = addAtt->returnFileTypes();
+        attachedFiles = addAtt->returnattachedFiles();
+        attachmentsType = addAtt->returnFileTypes();
 
-        QStringList::Iterator itType = attatchmentsType.begin();
+        QStringList::Iterator itType = attachmentsType.begin();
         
         Enclosure e;
-        for ( QStringList::Iterator it = attatchedFiles.begin(); it != attatchedFiles.end(); ++it ) {
+        for ( QStringList::Iterator it = attachedFiles.begin(); it != attachedFiles.end(); ++it ) {
                 e.id = idCount;
                 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";
@@ -227,45 +235,45 @@ void WriteMail::getAddress()
         if (showingAddressList) {
                 emailInput->hide();
                 addressView->show();
                 okButton->show();
                 
         } else {
                 addressView->hide();
                 okButton->hide();
                 emailInput->show();
         }
 }
 
-void WriteMail::attatchFile()
+void WriteMail::attachFile()
 {
         addAtt->showMaximized();
 }
 
 void WriteMail::reply(Email replyMail, bool replyAll)
 {
         int pos;
         
         mail = replyMail;
         mail.files.clear();
         
         toInput->setText(mail.fromMail);
         //replyAll ? ccInput->setText(mail.c)
         
         addRecipients(replyAll);
         
         subjectInput->setText(tr("Re: ") + mail.subject);
         
         pos = 0;
-        mail.body.insert(pos, ">>");
+        mail.body.insert(pos, ">");
         while (pos != -1) {
                 pos = mail.body.find('\n', pos);
                 if (pos != -1)
                         mail.body.insert(++pos, ">>");
         }
         
         emailInput->setText(mail.body);
 }
 
 void WriteMail::forward(Email forwMail)
 {
         int pos=0;