42 files changed, 1626 insertions, 791 deletions

diff --git a/noncore/net/mailit/emailclient.cpp b/noncore/net/mailit/emailclient.cpp
index 90664bb..8359acf 100644
--- a/noncore/net/mailit/emailclient.cpp
+++ b/noncore/net/mailit/emailclient.cpp
@@ -21,1022 +21,1022 @@
 #include <qmessagebox.h>
 #include <qvbox.h>
 #include <qfile.h>
 #include <qcheckbox.h>
 #include <qmenubar.h>
 #include <qaction.h>
 #include <qwhatsthis.h>
 #include <qpe/resource.h>
 #include "emailclient.h"
 #include "writemail.h"
 
 QCollection::Item AccountList::newItem(QCollection::Item d)
 {
   return dupl( (MailAccount *) d);
 }
 
 MailAccount* AccountList::dupl(MailAccount *in)
 {
   ac = new MailAccount(*in);
   return ac;
 }
 
 EmailClient::EmailClient( QWidget* parent,  const char* name, WFlags fl )
   : QMainWindow( parent, name, fl )
-{ 
+{
   emailHandler = new EmailHandler();
   addressList = new AddressList();
-  
+
   sending = FALSE;
   receiving = FALSE;
   previewingMail = FALSE;
   mailIdCount = 1;
   accountIdCount = 1;
   allAccounts = FALSE;
-  
+
   init();
-  
- 
-  
+
+
+
   connect(emailHandler, SIGNAL(mailSent()), this, SLOT(mailSent()) );
-  
+
   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()) );
 
   connect(emailHandler, SIGNAL(mailArrived(const Email &, bool)), this,
       SLOT(mailArrived(const Email &, bool)) );
   connect(emailHandler, SIGNAL(mailTransfered(int)), this,
       SLOT(allMailArrived(int)) );
-  
+
   mailconf = new Config("mailit");
   //In case Synchronize is not defined in settings.txt
 
   readSettings();
-  
+
   updateAccounts();
-      
+
   lineShift = "\n";
   readMail();
   lineShift = "\r\n";
-  
+
   mailboxView->setCurrentTab(0);  //ensure that inbox has focus
-  
+
   /*channel = new QCopChannel( "QPE/Application/mailit", this );
   connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
         this, SLOT(receive(const QCString&, const QByteArray&)) );*/
 
 }
 
 
 EmailClient::~EmailClient()
 {
   //needs to be moved from destructor to closewindow event
   saveMail(getPath(FALSE) + "inbox.txt", inboxView);
   //does not currently work.  Defining outbox in the same
   //format as inbox is not a good solution as they have
   //different properties
   saveMail(getPath(FALSE) + "outbox.txt", outboxView);
   saveSettings();
-  
+
   mailconf->write();
   delete mailconf;
-  
+
 }
 
 void EmailClient::init()
 {
   initStatusBar(this);
-   
+
   setToolBarsMovable(FALSE);
-  
+
   bar = new QToolBar(this);
   QWhatsThis::add(bar,tr("Main operation toolbar"));
   bar->setHorizontalStretchable( TRUE );
 
   mb = new QMenuBar( bar );
 
   QPopupMenu *mail = new QPopupMenu(mb);
   mb->insertItem( tr( "&Mail" ), mail);
 
   QPopupMenu *configure = new QPopupMenu(mb);
   mb->insertItem( tr( "Accounts" ), configure);
-  
+
   selectAccountMenu = new QPopupMenu(mb);
   editAccountMenu = new QPopupMenu(mb);
   deleteAccountMenu = new QPopupMenu(mb);
 
   mail->insertItem(tr("Get Mail in"), selectAccountMenu);
   configure->insertItem(tr("Edit account"), editAccountMenu);
   configure->insertItem(tr("Delete account"), deleteAccountMenu);
 
   bar = new QToolBar(this);
 
   getMailButton = new QToolButton(Resource::loadPixmap("mailit/getmail"),tr("getMail"),tr("select account"), this,SLOT(getAllNewMail()),bar);
   QWhatsThis::add(getMailButton,tr("Click to download mail via all available accounts.\n Press and hold to select the desired account."));
 
   getMailButton->setPopup(selectAccountMenu);
-      
+
   sendMailButton = new QAction(tr("Send mail"), Resource::loadPixmap("mailit/sendqueue"), QString::null, 0, this, 0);
   connect(sendMailButton, SIGNAL(activated()), this, SLOT(sendQuedMail()) );
   sendMailButton->addTo(bar);
   sendMailButton->addTo(mail);
   sendMailButton->setWhatsThis("Send mail queued in the outbox");
-    
+
   composeButton = new QAction(tr("Compose"), Resource::loadPixmap("new"), QString::null, 0, this, 0);
   connect(composeButton, SIGNAL(activated()), this, SLOT(compose()) );
   composeButton->addTo(bar);
   composeButton->addTo(mail);
   composeButton->setWhatsThis("Compose a new mail");
-  
+
   cancelButton = new QAction(tr("Cancel transfer"), Resource::loadPixmap("close"), QString::null, 0, this, 0);
   connect(cancelButton, SIGNAL(activated()), this, SLOT(cancel()) );
   cancelButton->addTo(mail);
   cancelButton->addTo(bar);
   cancelButton->setEnabled(FALSE);
   cancelButton->setWhatsThis("Stop the currently active mail transfer");
-  
-  
+
+
   deleteButton = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ), QString::null, 0, this, 0 );
   connect( deleteButton, SIGNAL( activated() ), this, SLOT( deleteItem() ) );
   deleteButton->addTo(bar);
   deleteButton->setWhatsThis("Remove the currently selected eMail(s)");
-  
+
   mailboxView = new OTabWidget( this, "mailboxView" );
 
   QWidget* widget = new QWidget( mailboxView, "widget" );
   grid_2 = new QGridLayout( widget );
 //  grid_2->setSpacing(6);
 //  grid_2->setMargin( 11 );
 
   inboxView = new QListView( widget, "inboxView" );
   inboxView->addColumn( tr( "From" ) );
   inboxView->addColumn( tr( "Subject" ) );
   inboxView->addColumn( tr( "Date" ) );
   inboxView->setMinimumSize( QSize( 0, 0 ) );
   inboxView->setAllColumnsShowFocus(TRUE);
   QWhatsThis::add(inboxView,QWidget::tr("This is the inbox view.\n"
   "It keeps the fetched mail which can be \n"
   "viewed by double clicking the entry.\n"
   "blue attachment icon shows whether this \n"
   "mailhas attachments.\n"));
 
   grid_2->addWidget( inboxView, 2, 0 );
   mailboxView->addTab( widget, "mailit/inbox", tr( "Inbox" ) );
 
   QWidget* widget_2 = new QWidget( mailboxView, "widget_2" );
   grid_3 = new QGridLayout( widget_2 );
 //  grid_3->setSpacing(6);
 //  grid_3->setMargin( 11 );
 
   outboxView = new QListView( widget_2, "outboxView" );
   outboxView->addColumn( tr( "To" ) );
   outboxView->addColumn( tr( "Subject" ) );
   outboxView->setAllColumnsShowFocus(TRUE);
 
   QWhatsThis::add(outboxView,QWidget::tr("This is the outbox view.\n"
   "It keeps the queued mails to send which can be \n"
   "reviewed by double clicking the entry."));
   grid_3->addWidget( outboxView, 0, 0 );
   mailboxView->addTab( widget_2,"mailit/outbox", tr( "Outbox" ) );
-  
+
   setCentralWidget(mailboxView);
-  
+
 }
 
 void EmailClient::initStatusBar(QWidget* parent)
 {
   statusBar = new QStatusBar(parent);
   statusBar->setSizeGripEnabled(FALSE);
-  
+
   status1Label = new QLabel( tr("Idle"), statusBar);
   status2Label = new QLabel("", statusBar);
   connect(emailHandler, SIGNAL(updatePopStatus(const QString &)),
     status2Label, SLOT(setText(const QString &)) );
   connect(emailHandler, SIGNAL(updateSmtpStatus(const QString &)),
     status2Label, SLOT(setText(const QString &)) );
-  
+
   progressBar = new QProgressBar(statusBar);
 
   connect(emailHandler, SIGNAL(mailboxSize(int)),
     this, SLOT(setTotalSize(int)) );
   connect(emailHandler, SIGNAL(currentMailSize(int)),
     this, SLOT(setMailSize(int)) );
   connect(emailHandler, SIGNAL(downloadedSize(int)),
     this, SLOT(setDownloadedSize(int)) );
 
   statusBar->addWidget(status1Label);
   statusBar->addWidget(progressBar);
   statusBar->addWidget(status2Label);
 
 }
 
 void EmailClient::compose()
 {
   emit composeRequested();
 }
 
 void EmailClient::cancel()
 {
   emailHandler->cancel();
 }
 
 AddressList* EmailClient::getAdrListRef()
 {
   return addressList;
 }
 
 //this needs to be rewritten to syncronize with outboxView
 void EmailClient::enqueMail(const Email &mail)
 {
  if (accountList.count() == 0) {
     QMessageBox::warning(qApp->activeWindow(),
       tr("No account selected"), tr("You must create an account"), "OK\n");
     return;
   }
-   
+
   if (accountList.count() > 0) {
     currentAccount = accountList.first();
     qWarning("using account " + currentAccount->name);
   }
-  
+
   Email addMail = mail;
   addMail.from = currentAccount->name;
   addMail.fromMail = currentAccount->emailAddress;
   addMail.rawMail.prepend("From: \"" + addMail.from + "\" <" + addMail.fromMail + ">\n");
   item = new EmailListItem(outboxView, addMail, false);
-  
+
   mailboxView->setCurrentTab(1);
-  
+
 }
 
 void EmailClient::sendQuedMail()
 {
   int count = 0;
 
   if (accountList.count() == 0) {
-    QMessageBox::warning(qApp->activeWindow(), "No account selected", "You must create an account", "OK\n");
+    QMessageBox::warning(qApp->activeWindow(), tr("No account selected"), tr("You must create an account"), "OK\n");
     return;
   }
   //traverse listview, find messages to send
   if (! sending) {
     item = (EmailListItem *) outboxView->firstChild();
     if (item != NULL) {
       while (item != NULL) {
         quedMessages.append(item->getMail());
         item = (EmailListItem *) item->nextSibling();
         count++;
       }
       setMailAccount();
       emailHandler->sendMail(&quedMessages);
       sending = TRUE;
       sendMailButton->setEnabled(FALSE);
       cancelButton->setEnabled(TRUE);
     } else {
       qWarning("sendQuedMail(): no messages to send");
     }
   }
 }
 
 void EmailClient::setMailAccount()
 {
   emailHandler->setAccount(*currentAccount);
 }
 
 void EmailClient::mailSent()
 {
   sending = FALSE;
   sendMailButton->setEnabled(TRUE);
-  
+
   quedMessages.clear();
   outboxView->clear();    //should be moved to an sentBox
 }
 
 void EmailClient::getNewMail() {
-  
+
   if (accountList.count() == 0) {
-    QMessageBox::warning(qApp->activeWindow(),"No account selected",
-      "You must create an account", "OK\n");
+    QMessageBox::warning(qApp->activeWindow(),tr("No account selected"),
+      tr("You must create an account"), "OK\n");
     return;
   }
-  
+
   setMailAccount();
-  
+
   receiving = TRUE;
   previewingMail = TRUE;
   getMailButton->setEnabled(FALSE);
   cancelButton->setEnabled(TRUE);
   selectAccountMenu->setEnabled(FALSE);
-  
+
   status1Label->setText(currentAccount->accountName + " headers");
   progressBar->reset();
-    
+
   //get any previous mails not downloaded and add to queue
   /*mailDownloadList.clear();
   Email *mailPtr;
   item = (EmailListItem *) inboxView->firstChild();
   while (item != NULL) {
     mailPtr = item->getMail();
     if ( (!mailPtr->downloaded) && (mailPtr->fromAccountId == currentAccount->id) ) {
       mailDownloadList.sizeInsert(mailPtr->serverId, mailPtr->size);
     }
     item = (EmailListItem *) item->nextSibling();
   }*/
-  
+
   emailHandler->getMailHeaders();
-  
+
 }
 
 void EmailClient::getAllNewMail()
 {
   allAccounts = TRUE;
   currentAccount = accountList.first();
-  getNewMail();  
+  getNewMail();
 }
 
 void EmailClient::mailArrived(const Email &mail, bool fromDisk)
 {
   Enclosure *ePtr;
   Email newMail;
   int thisMailId;
   emailHandler->parse( mail.rawMail, lineShift, &newMail);
   mailconf->setGroup(newMail.id);
-  
-  if (fromDisk) 
+
+  if (fromDisk)
   {
-    
+
     newMail.downloaded = mailconf->readBoolEntry("downloaded");
     newMail.size = mailconf->readNumEntry("size");
     newMail.serverId = mailconf->readNumEntry("serverid");
     newMail.fromAccountId = mailconf->readNumEntry("fromaccountid");
-  } 
-  else 
+  }
+  else
   {  //mail arrived from server
-  
+
     newMail.serverId = mail.serverId;
     newMail.size = mail.size;
     newMail.downloaded = mail.downloaded;
-    
+
     newMail.fromAccountId = emailHandler->getAccount()->id;
     mailconf->writeEntry("fromaccountid", newMail.fromAccountId);
   }
-  
+
   //add if read or not
   newMail.read = mailconf->readBoolEntry("mailread");
-    
+
   //check if new mail
   if ( (thisMailId = mailconf->readNumEntry("internalmailid", -1)) == -1) {
     thisMailId = mailIdCount;
     mailIdCount++;
-    
+
     //set server count, so that if the user aborts, the new
     //header is not reloaded
     if ((currentAccount)&&(currentAccount->synchronize))
       currentAccount->lastServerMailCount++;
-    
+
     mailconf->writeEntry("internalmailid", thisMailId);
     mailconf->writeEntry("downloaded", newMail.downloaded);
     mailconf->writeEntry("size", (int) newMail.size);
     mailconf->writeEntry("serverid", newMail.serverId);
-    
+
     //addressList->addContact(newMail.fromMail, newMail.from);
   }
-  
+
   mailconf->writeEntry("downloaded", newMail.downloaded);
-  
+
   QString stringMailId;
   stringMailId.setNum(thisMailId);
   //see if any attatchments needs to be stored
-  
+
   for ( ePtr=newMail.files.first(); ePtr != 0; ePtr=newMail.files.next() ) {
     QString stringId;
     stringId.setNum(ePtr->id);
-    
+
     int id = mailconf->readNumEntry("enclosureid_" + stringId);
     if (id != ePtr->id) {     //new entry
       mailconf->writeEntry("enclosureid_" + stringId, ePtr->id);
       mailconf->writeEntry("name_" + stringId, ePtr->originalName);
       mailconf->writeEntry("contenttype_" + stringId, ePtr->contentType);
       mailconf->writeEntry("contentattribute_" + stringId, ePtr->contentAttribute);
       mailconf->writeEntry("saved_" + stringId, ePtr->saved);
       mailconf->writeEntry("installed_" + stringId, FALSE);
-      
+
             ePtr->name = stringMailId + "_" + stringId;
             ePtr->path = getPath(TRUE);
             if (emailHandler->getEnclosure(ePtr)) { //file saved
         ePtr->saved = TRUE;
         mailconf->writeEntry("saved_" + stringId, ePtr->saved);
         mailconf->writeEntry("filename_" + stringId, ePtr->name);
         mailconf->writeEntry("path_" + stringId, ePtr->path);
             } else {
               ePtr->saved = FALSE;
         mailconf->writeEntry("saved_" + stringId, ePtr->saved);
             }
     } else {
       ePtr->saved = mailconf->readBoolEntry("saved_" + stringId);
       ePtr->installed = mailconf->readBoolEntry("installed_" + stringId);
       if (ePtr->saved) {
         ePtr->name = mailconf->readEntry("filename_" + stringId);
         ePtr->path = mailconf->readEntry("path_" + stringId);
-      }   
+      }
     }
   }
 
   bool found=false;
-  
-  if (!fromDisk) 
+
+  if (!fromDisk)
   {
-    
+
     Email *mailPtr;
     item = (EmailListItem *) inboxView->firstChild();
-    while ((item != NULL)&&(!found)) 
+    while ((item != NULL)&&(!found))
     {
       mailPtr = item->getMail();
       if (mailPtr->id == newMail.id) {
         item->setMail(newMail);
         emit mailUpdated(item->getMail());
         found = true;
       }
       item = (EmailListItem *) item->nextSibling();
     }
   }
   if ((!found)||(fromDisk)) {
      item = new EmailListItem(inboxView, newMail, TRUE);
   }
 //        if (item->getMail()->files.count()>0)
 //        {
 //        item->setPixmap(0, Resource::loadPixmap("mailit/attach"));
-//        }  
+//        }
     /*if (!newMail.downloaded)
       mailDownloadList.sizeInsert(newMail.serverId, newMail.size);*/
-  
+
   mailboxView->setCurrentTab(0);
-  
+
 }
 
 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();
       return;
     } else {
       allAccounts = FALSE;
       receiving = FALSE;
       getMailButton->setEnabled(TRUE);
       cancelButton->setEnabled(FALSE);
       selectAccountMenu->setEnabled(TRUE);
       status1Label->setText("Idle");
-  
+
       progressBar->reset();
       return;
     }
   //}
-  
+
   // all headers downloaded from server, start downloading remaining mails
   previewingMail = FALSE;
   status1Label->setText(currentAccount->accountName);
   progressBar->reset();
 
-   
+
   mailboxView->setCurrentTab(0);
 }
 
 
 void EmailClient::moveMailFront(Email *mailPtr)
 {
   if ( (receiving) && (mailPtr->fromAccountId == currentAccount->id) ) {
     mailDownloadList.moveFront(mailPtr->serverId, mailPtr->size);
   }
 }
 
 void EmailClient::smtpError(int code, const QString & Msg)
 {
   QString temp;
-  
+
   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");
   }
-  
+
   sending = FALSE;
   sendMailButton->setEnabled(TRUE);
   cancelButton->setEnabled(FALSE);
   quedMessages.clear();
 }
 
 void EmailClient::popError(int code, const QString & Msg)
 {
   QString temp;
-  
+
    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(), tr("Receiving error"), temp, tr("OK\n"));
 
   } else {
     status2Label->setText("Aborted by user");
   }
-  
+
   receiving = FALSE;
   getMailButton->setEnabled(TRUE);
   cancelButton->setEnabled(FALSE);
   selectAccountMenu->setEnabled(TRUE);
 }
 
 void EmailClient::inboxItemSelected()
 {
   //killTimer(timerID);
-  
+
   item = (EmailListItem*) inboxView->selectedItem();
   if (item != NULL) {
     emit viewEmail(inboxView, item->getMail());
   }
 }
 
 void EmailClient::outboxItemSelected()
 {
   //killTimer(timerID);
-  
+
   item = (EmailListItem*) outboxView->selectedItem();
   if (item != NULL) {
     emit viewEmail(outboxView, item->getMail());
   }
 
 }
 
 void EmailClient::readMail()
 {
   Email mail;
   int start, stop;
   QString s, del;
 
   QFile f(getPath(FALSE) + "inbox.txt");
-  
+
   if ( f.open(IO_ReadOnly) ) {    // file opened successfully
     QTextStream t( &f );        // use a text stream
     s = t.read();
     f.close();
-    
+
     start = 0;
     del = "\n.\n";
     while ((uint) start < s.length()) {
       stop = s.find(del, start);
       if (stop == -1)
         stop = s.length() - del.length();
-    
+
       mail.rawMail = s.mid(start, stop + del.length() - start );
       start = stop + del.length();
       mailArrived(mail, TRUE);
     }
   }
-  
+
   QFile fo(getPath(FALSE) + "outbox.txt");
   if ( fo.open(IO_ReadOnly) ) {    // file opened successfully
     QTextStream t( &fo );        // use a text stream
     s = t.read();
     fo.close();
-    
+
     start = 0;
     del = "\n.\n";
     while ((uint) start < s.length()) {
       stop = s.find(del, start);
       if (stop == -1)
         stop = s.length() - del.length();
-    
+
       mail.rawMail = s.mid(start, stop + del.length() - start );
       start = stop + del.length();
       emailHandler->parse(mail.rawMail, lineShift, &mail);
       mail.sent = false;
       mail.received = false;
           enqueMail(mail);
-      
+
     }
   }
 }
 
 void EmailClient::saveMail(const QString &fileName, QListView *view)
 {
   QFile f(fileName);
   Email *mail;
-  
+
   if (! f.open(IO_WriteOnly) ) {
     qWarning("could not open file");
     return;
   }
   item = (EmailListItem *) view->firstChild();
   QTextStream t(&f);
   while (item != NULL) {
     mail = item->getMail();
     t << mail->rawMail;
-    
+
     mailconf->setGroup(mail->id);
     mailconf->writeEntry("mailread", mail->read);
-    
+
     item = (EmailListItem *) item->nextSibling();
   }
   f.close();
 }
 
 //paths for mailit, is settings, inbox, enclosures
 QString EmailClient::getPath(bool enclosurePath)
 {
   QString basePath = "qtmail";
   QString enclosures = "enclosures";
-  
+
   QDir dir = (QString(getenv("HOME")) + "/Applications/" + basePath);
   if ( !dir.exists() )
     dir.mkdir( dir.path() );
-  
+
   if (enclosurePath) {
     dir = (QString(getenv("HOME")) + "/Applications/" + basePath + "/" + enclosures);
-    
+
     if ( !dir.exists() )
       dir.mkdir( dir.path() );
-    
+
     return (dir.path() + "/");
-  
+
   }
   return (dir.path() + "/");
 }
 
 void EmailClient::readSettings()
 {
   int y,acc_count;
-    
+
     mailconf->setGroup("mailitglobal");
     acc_count=mailconf->readNumEntry("Accounts",0);
-    
-    for (int accountPos = 0;accountPos<acc_count ; accountPos++) 
+
+    for (int accountPos = 0;accountPos<acc_count ; accountPos++)
     {
-      mailconf->setGroup("Account_"+QString::number(accountPos+1));    //Account numbers start at 1 ...      
+      mailconf->setGroup("Account_"+QString::number(accountPos+1));    //Account numbers start at 1 ...
       account.accountName = mailconf->readEntry("AccName","");
       account.name = mailconf->readEntry("UserName","");
       account.emailAddress = mailconf->readEntry("Email","");
       account.popUserName = mailconf->readEntry("POPUser","");
       account.popPasswd = mailconf->readEntryCrypt("POPPassword","");
       account.popServer = mailconf->readEntry("POPServer","");
       account.smtpServer = mailconf->readEntry("SMTPServer","");
       account.id = mailconf->readNumEntry("AccountId",0);
       account.syncLimit = mailconf->readNumEntry("HeaderLimit",0);
       account.lastServerMailCount = 0;
       account.synchronize = FALSE;
-    
+
       account.synchronize = (mailconf->readEntry("Synchronize","No")=="Yes");
       if (account.synchronize)
       {
-      mailconf->readNumEntry("LASTSERVERMAILCOUNT",0); 
+      mailconf->readNumEntry("LASTSERVERMAILCOUNT",0);
       }
-      
+
       accountList.append(&account);
     }
-  
+
   mailconf->setGroup("mailitglobal");
-  
-  if ( (y = mailconf->readNumEntry("mailidcount", -1)) != -1) 
+
+  if ( (y = mailconf->readNumEntry("mailidcount", -1)) != -1)
   {
     mailIdCount = y;
   }
-  if ( (y = mailconf->readNumEntry("accountidcount", -1)) != -1) 
+  if ( (y = mailconf->readNumEntry("accountidcount", -1)) != -1)
   {
     accountIdCount = y;
   }
 }
 
 void EmailClient::saveSettings()
 {
   int acc_count=0;
   MailAccount *accountPtr;
 
-    
-  if (!mailconf) 
+
+  if (!mailconf)
   {
     qWarning("could not save settings");
     return;
   }
-  
+
   for (accountPtr = accountList.first(); accountPtr != 0;
-      accountPtr = accountList.next()) 
+      accountPtr = accountList.next())
   {
     mailconf->setGroup("Account_"+QString::number(++acc_count));
     mailconf->writeEntry("AccName",accountPtr->accountName );
     mailconf->writeEntry("UserName",accountPtr->name);
     mailconf->writeEntry("Email",accountPtr->emailAddress);
     mailconf->writeEntry("POPUser",accountPtr->popUserName);
     mailconf->writeEntryCrypt("POPPassword",accountPtr->popPasswd);
     mailconf->writeEntry("POPServer",accountPtr->popServer);
     mailconf->writeEntry("SMTPServer",accountPtr->smtpServer);
     mailconf->writeEntry("AccountId",accountPtr->id);
-    if (accountPtr->synchronize) 
+    if (accountPtr->synchronize)
     {
       mailconf->writeEntry("Synchronize","Yes");
       mailconf->writeEntry("HeaderLimit",accountPtr->syncLimit);
       mailconf->writeEntry("LastServerMailCount",accountPtr->lastServerMailCount);
-    } 
-    else 
+    }
+    else
     {
       mailconf->writeEntry("Synchronize", "No");
     }
   }
-  
+
   mailconf->setGroup("mailitglobal");
   mailconf->writeEntry("Accounts",acc_count);
   mailconf->writeEntry("mailidcount", mailIdCount);
   mailconf->writeEntry("accountidcount", accountIdCount);
 }
 
 void EmailClient::selectAccount(int id)
 {
   if (accountList.count() > 0) {
     currentAccount = accountList.at(id);
     emit newCaption("Mailit - " + currentAccount->accountName);
     getNewMail();
   } else {
-    emit newCaption("Mailit ! No account defined");
+    emit newCaption( tr("Mailit ! No account defined") );
   }
 }
 
 void EmailClient::editAccount(int id)
 {
   MailAccount *newAccount;
-    
+
   editAccountView = new EditAccount(this, "account", TRUE);
   if (id == newAccountId) {   //new account
     newAccount = new MailAccount;
     editAccountView->setAccount(newAccount);
   } else {
     newAccount = accountList.at(id);
     editAccountView->setAccount(newAccount, FALSE);
   }
-  
+
   editAccountView->showMaximized();
   editAccountView->exec();
-  
+
   if (editAccountView->result() == QDialog::Accepted) {
     if (id == newAccountId) {
       newAccount->id = accountIdCount;
       accountIdCount++;
       accountList.append(newAccount);
       updateAccounts();
     } else {
       updateAccounts();
     }
   }
-  
+
   delete editAccountView;
 }
 
 void EmailClient::deleteAccount(int id)
 {
   MailAccount *newAccount;
   QString message;
-  
+
   newAccount = accountList.at(id);
-  message = "Delete account:\n" + newAccount->accountName;
+  message = tr("Delete account:\n") + newAccount->accountName;
   switch( QMessageBox::warning( this, "Mailit", message,
       "Yes", "No", 0, 0, 1 ) ) {
-    
+
     case 0: accountList.remove(id);
         updateAccounts();
         break;
     case 1:
         break;
   }
 }
 
 void EmailClient::updateAccounts()
 {
   MailAccount *accountPtr;
-  
+
   //rebuild menus, clear all first
   editAccountMenu->clear();
   selectAccountMenu->clear();
   deleteAccountMenu->clear();
 
-  newAccountId = editAccountMenu->insertItem("New", this,
+  newAccountId = editAccountMenu->insertItem( tr("New"), this,
       SLOT(editAccount(int)) );
   editAccountMenu->insertSeparator();
-  
+
   idCount = 0;
   for (accountPtr = accountList.first(); accountPtr != 0;
       accountPtr = accountList.next()) {
-    
+
     editAccountMenu->insertItem(accountPtr->accountName,
       this, SLOT(editAccount(int)), 0, idCount);
      selectAccountMenu->insertItem(accountPtr->accountName,
       this, SLOT(selectAccount(int)), 0, idCount);
     deleteAccountMenu->insertItem(accountPtr->accountName,
       this, SLOT(deleteAccount(int)), 0, idCount);
     idCount++;
   }
 }
 
 void EmailClient::deleteMail(EmailListItem *mailItem, bool &inbox)
 {
   Email *mPtr;
   Enclosure *ePtr;
-  
-  if (inbox) 
+
+  if (inbox)
   {
     mPtr = mailItem->getMail();
-    
+
     //if mail is in queue for download, remove it from
     //queue if possible
     if ( (receiving) && (mPtr->fromAccountId == currentAccount->id) ) {
       if ( !mPtr->downloaded )
         mailDownloadList.remove(mPtr->serverId, mPtr->size);
     }
-    
+
     mailconf->setGroup(mPtr->id);
     mailconf->clearGroup();
-    
+
     //delete any temporary attatchemnts storing
     for ( ePtr=mPtr->files.first(); ePtr != 0; ePtr=mPtr->files.next() ) {
       if (ePtr->saved) {
         QFile::remove( (ePtr->path + ePtr->name) );
       }
     }
     inboxView->takeItem(mailItem);
-  } 
-  else 
+  }
+  else
   {
     outboxView->takeItem(mailItem);
   }
 }
 
 void EmailClient::setMailSize(int size)
 {
         progressBar->reset();
         progressBar->setTotalSteps(size);
 }
 
 void EmailClient::setTotalSize(int /*size*/)
 {
-  
+
 }
 
 void EmailClient::setDownloadedSize(int size)
 {
         int total = progressBar->totalSteps();
 
         if (size < total) {
     progressBar->setProgress(size);
         } else {
           progressBar->setProgress(total);
         }
 }
 
 void EmailClient::deleteItem()
 {
   bool inbox=mailboxView->currentTab()==0;
   QListView* box;
-  
+
   EmailListItem* eli;
   //  int pos;
-    
+
   inbox ? box=inboxView : box=outboxView;
-  
+
   eli=(EmailListItem*)box->selectedItem();
-  
+
   if (eli)
   {
     box->setSelected(eli->itemBelow(),true);  //select the previous item
-    
+
     deleteMail(eli,(bool&)inbox);   //remove mail entry
   }
 }
 
 void EmailClient::inboxItemPressed()
 {
 //  timerID=startTimer(500);
 }
 
 void EmailClient::inboxItemReleased()
 {
   //  killTimer(timerID);
 }
 
 /*void EmailClient::timerEvent(QTimerEvent *e)
 {
   //killTimer(timerID);
-  
-  
+
+
   QPopupMenu *action = new QPopupMenu(this);
-  
+
   int reply=0;
-  
+
   action->insertItem(tr( "Reply To" ),this,SLOT(reply()));
   action->insertItem( tr( "Reply All" ),this,SLOT(replyAll()));
   action->insertItem( tr( "Forward" ), this,SLOT(forward()));
   action->insertItem( tr( "Remove Mail" ), this,SLOT(remove()));
- 
+
   action->exec(QCursor::pos());
-  
+
   if (action) delete action;
-   
+
 }*/
 
 Email* EmailClient::getCurrentMail()
 {
   EmailListItem *eli=(EmailListItem* ) (inboxView->selectedItem());
   if (eli!=NULL)
     return eli->getMail();
   else
     return NULL;
 }
-  
+
 void EmailClient::download(Email* mail)
 {
   MailAccount* acc=0;
-  
+
   tempMailDownloadList.clear();
   tempMailDownloadList.sizeInsert(mail->serverId, mail->size);
-  
+
   acc=accountList.at(mail->fromAccountId-1);
   if (acc)
-  { 
+  {
     emailHandler->setAccount(*acc);
     emailHandler->getMailByList(&tempMailDownloadList);
   }
-  else 
+  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*/)
 {
   /*if (msg=="getMail()")
   {
     //QDialog qd(qApp->activeWindow(),"Getting mail",true);
     QVBoxLayout *vbProg = new QVBoxLayout( &qd );
-  
+
     initStatusBar(&qd);
-    
+
     if (statusBar==0)
     {
       qDebug("No Bar ...");
       //statusBar=new ProgressBar(&qd);
     }
     statusBar->show();
     vbProg->addWidget(statusBar);
     qd.showMaximized();
     qd.show();
     emit getAllNewMail();
     //qd.exec();
   }
   else if (msg=="compose()")
-  { 
+  {
     QDialog qd(qApp->activeWindow(),"Getting mail",true);
-    
+
     WriteMail wm(&qd,"write new mail");
     QVBoxLayout vbProg( &qd );
-    
+
     wm.showMaximized();
     vbProg.addWidget(&wm);
-    
+
     qd.showMaximized();
-    
+
     emit composeRequested();
     qd.exec();
-    
+
     QMessageBox::warning(qApp->activeWindow(),tr("Info"), tr("Info"), "OK\n");
   }
-    
+
   else if (msg=="dialog()")
   {
       QMessageBox::warning(qApp->activeWindow(),tr("Info"), tr("Info"), "OK\n");
   }*/
 }
diff --git a/noncore/net/mailit/emaillistitem.cpp b/noncore/net/mailit/emaillistitem.cpp
index fc9f766..a25f93a 100644
--- a/noncore/net/mailit/emaillistitem.cpp
+++ b/noncore/net/mailit/emaillistitem.cpp
@@ -4,96 +4,155 @@
 ** This file is part of Qt Palmtop Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** 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 <qstring.h>
 #include <qpe/resource.h>
 #include "emaillistitem.h"
 
 EmailListItem::EmailListItem(QListView *parent, Email mailIn, bool inbox)
     : QListViewItem(parent)
 {
   QString temp;
-  
+
   mail = mailIn;
-  
+
   if (inbox) {
     setText(0, mail.from);
   } else {
     QStringList::Iterator it = mail.recipients.begin();
     temp = *it;
     if (mail.recipients.count() > 1)
       temp += "...";
     setText(0, temp);
   }
   setText(1, mail.subject);
-  setText(2,mail.date);
-  
+  // setText(2,mail.date);
+  setText(2,dateFromULCString(mail.date));
+
   if (mailIn.files.count()>0)
   {
     setPixmap(0, Resource::loadPixmap("mailit/attach"));
   }
-  
+
   selected = FALSE;
 }
 
 Email* EmailListItem::getMail()
 {
   return &mail;
 }
 
 void EmailListItem::setMail(Email newMail)
 {
   mail = newMail;
   repaint();
 }
 
 void EmailListItem::setItemSelected(bool enable)
 {
   selected = enable;
   setSelected(enable);
   repaint();
 }
 
 bool EmailListItem::isItemSelected()
 {
   return selected;
 }
 
 void EmailListItem::paintCell( QPainter *p, const QColorGroup &cg,
         int column, int width, int alignment )
 {
 
   QColorGroup _cg( cg );
   QColor c = _cg.text();
 
   if ( (! mail.read) && (mail.received) )
     _cg.setColor( QColorGroup::Text, Qt::blue);
   if (!mail.downloaded)
     _cg.setColor( QColorGroup::Text, Qt::red);
-  
+
 /*  if (selected) {
     _cg.setColor(QColorGroup::Base, Qt::blue);
     _cg.setColor(QColorGroup::Text, Qt::yellow);
     if (isSelected()) {
       _cg.setColor(QColorGroup::HighlightedText, Qt::yellow);
     } else {
       _cg.setColor(QColorGroup::Highlight, Qt::blue);
     }
   }
-*/    
+*/
     QListViewItem::paintCell( p, _cg, column, width, alignment );
 
     _cg.setColor( QColorGroup::Text, c );
 }
+
+/*
+ * Converts an E-Mail date (ULC) RFC 2822 conform to a QDateTime.
+ * Returning a QString with formatting of "YYYY-MM-DD HH:MM:SS"
+ * (zodiac: This method was tested with more than 300 inbox mails,
+ * it didn't slow down the loading of mail-it.)
+ */
+QString EmailListItem::dateFromULCString( QString ulcDate )
+{
+        QString sTemp, sTime;
+        int iPos, iDay, iMon=1, iYear;
+
+        iPos=ulcDate.find(',');
+        if (iPos) { // it has a day-of-week
+                ulcDate=ulcDate.remove(0,++iPos); //.stripWhiteSpace();
+        }
+
+        QStringList dateEntries = QStringList::split(" ",ulcDate,FALSE);
+        QStringList::Iterator iter = dateEntries.begin();
+
+        // Get day as DD
+        iDay = (*iter++).toInt();
+
+        // Get month as string Mmm
+        sTemp = (*iter++);
+        if (sTemp =="Jan") {iMon=1;} else
+        if (sTemp =="Feb") {iMon=2;} else
+        if (sTemp =="Mar") {iMon=3;} else
+        if (sTemp =="Apr") {iMon=4;} else
+        if (sTemp =="May") {iMon=5;} else
+        if (sTemp =="Jun") {iMon=6;} else
+        if (sTemp =="Jul") {iMon=7;} else
+        if (sTemp =="Aug") {iMon=8;} else
+        if (sTemp =="Sep") {iMon=9;} else
+        if (sTemp =="Oct") {iMon=10;} else
+        if (sTemp =="Nov") {iMon=11;} else
+        if (sTemp =="Dec") {iMon=12;}
+
+        // Get year as YYYY or YY
+        iYear = (*iter++).toInt();
+
+        QDate date = QDate(iYear, iMon, iDay);
+
+        // Convert timestring into a QTime
+        QStringList timeEntries = QStringList::split(":",(*iter++),FALSE);
+        QStringList::Iterator iterTime = timeEntries.begin();
+        iYear=(*iterTime++).toInt(); // var reuse.. *cough*
+        iMon=(*iterTime++).toInt();
+        iDay=(*iterTime++).toInt();
+        QTime time = QTime(iYear,iMon,iDay);
+
+        return QString::number(date.year())+"-"
+                +QString::number(date.month()).rightJustify(2,'0')+"-"
+                +QString::number(date.day()).rightJustify(2,'0')+" "
+                +time.toString();
+}
+
+
diff --git a/noncore/net/mailit/emaillistitem.h b/noncore/net/mailit/emaillistitem.h
index 642932c..129a774 100644
--- a/noncore/net/mailit/emaillistitem.h
+++ b/noncore/net/mailit/emaillistitem.h
@@ -11,34 +11,35 @@
 ** 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.
 **
 **********************************************************************/
 #ifndef EMAILLISTITEM_H
 #define EMAILLISTITEM_H
 
 #include <qlistview.h>
 #include "emailhandler.h"
 
 class EmailListItem: public QListViewItem
 {
 public:
         EmailListItem(QListView *parent, Email mailIn, bool inbox);
         Email* getMail();
         void setMail(Email newMail);
         void setItemSelected(bool enable);
         bool isItemSelected();
         bool itemSelected();
-        
+
 protected:
         void paintCell( QPainter *p, const QColorGroup &cg,
                         int column, int width, int alignment );
 private:
         Email mail;
         bool selected;
+        QString dateFromULCString( QString ulc );
 };
 
 #endif
diff --git a/noncore/net/mailit/mailit.pro b/noncore/net/mailit/mailit.pro
index 5e9a83a..0224886 100644
--- a/noncore/net/mailit/mailit.pro
+++ b/noncore/net/mailit/mailit.pro
@@ -1,63 +1,59 @@
-TEMPLATE  = app
 TARGET = mailit
-CONFIG    = qt warn_on release
+CONFIG    = qt warn_on release quick-app
 HEADERS   = emailclient.h \
       emailhandler.h \
       emaillistitem.h \
       mailitwindow.h \
       md5.h \
       popclient.h \
       readmail.h \
       smtpclient.h \
       writemail.h \
       textparser.h \
       viewatt.h \
       addatt.h \
       editaccount.h \
       maillist.h \
       addresslist.h
 SOURCES   = emailclient.cpp \
       emailhandler.cpp \
       emaillistitem.cpp \
       mailitwindow.cpp \
       main.cpp \
       md5.c \
       popclient.cpp \
       readmail.cpp \
       smtpclient.cpp \
       writemail.cpp \
       textparser.cpp \
       viewatt.cpp \
       addatt.cpp \
       editaccount.cpp \
       maillist.cpp \
       addresslist.cpp
 
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include 
 LIBS            += -lqpe -lopie
 # -lssl
-MOC_DIR=qpeobj
-OBJECTS_DIR=qpeobj
-DESTDIR=$(OPIEDIR)/bin
 
 TRANSLATIONS = ../../../i18n/de/mailit.ts \
          ../../../i18n/nl/mailit.ts \
          ../../../i18n/da/mailit.ts \
          ../../../i18n/xx/mailit.ts \
          ../../../i18n/it/mailit.ts \
          ../../../i18n/en/mailit.ts \
          ../../../i18n/es/mailit.ts \
          ../../../i18n/fr/mailit.ts \
          ../../../i18n/hu/mailit.ts \
          ../../../i18n/ja/mailit.ts \
          ../../../i18n/ko/mailit.ts \
          ../../../i18n/no/mailit.ts \
          ../../../i18n/pl/mailit.ts \
          ../../../i18n/pt/mailit.ts \
          ../../../i18n/pt_BR/mailit.ts \
          ../../../i18n/sl/mailit.ts \
          ../../../i18n/zh_CN/mailit.ts \
          ../../../i18n/zh_TW/mailit.ts
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/net/mailit/mailitwindow.h b/noncore/net/mailit/mailitwindow.h
index e818d32..11e56b9 100644
--- a/noncore/net/mailit/mailitwindow.h
+++ b/noncore/net/mailit/mailitwindow.h
@@ -12,48 +12,49 @@
 ** 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.
 **
 **********************************************************************/
 #ifndef MailItWindow_H
 #define MailItWindow_H
 
 #include <qmainwindow.h>
 #include <qwidgetstack.h>
 #include <qevent.h>
 //#include <qlayout.h>
 #include "emailclient.h"
 #include "writemail.h"
 #include "readmail.h"
 #include "addresslist.h"
 
 class MailItWindow: public QMainWindow
 {
         Q_OBJECT
 public:
+        static QString appName() { return QString::fromLatin1("mailit"); }
         MailItWindow(QWidget *parent = 0, const char *name = 0, WFlags fl = 0);
         ~MailItWindow();
 
 signals:
 public slots:
         void compose();
         void composeReply(Email &, bool&);
                 void composeForward(Email &);
         void showEmailClient();
         void viewMail(QListView *, Email *mail);
         void updateMailView(Email *mail);
         void closeEvent(QCloseEvent *e);
         void updateCaption(const QString &);
         void setDocument(const QString &);
         /*void reply(Email&);
         void replyAll(Email&);
         void forward(Email&);
         void remove(Email&);*/
         
 private:
         EmailClient *emailClient;
         WriteMail *writeMail;
         ReadMail *readMail;
         QWidgetStack *views;
diff --git a/noncore/net/mailit/main.cpp b/noncore/net/mailit/main.cpp
index 3a3e1fc..71f8877 100644
--- a/noncore/net/mailit/main.cpp
+++ b/noncore/net/mailit/main.cpp
@@ -1,29 +1,25 @@
 /**********************************************************************
 ** Copyright (C) 2001 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qt Palmtop Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** 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 <qpe/qpeapplication.h>
 #include "mailitwindow.h"
 
-int main(int argc, char* argv[])
-{
-    QPEApplication a( argc, argv );
-    MailItWindow mw(0, 0);
-    a.showMainDocumentWidget(&mw);
-    return a.exec();
-}
+#include <opie/oapplicationfactory.h>
+
+OPIE_EXPORT_APP( OApplicationFactory<MailItWindow> )
\ No newline at end of file
diff --git a/noncore/net/opieftp/main.cpp b/noncore/net/opieftp/main.cpp
index 4f5a7d4..0217e41 100644
--- a/noncore/net/opieftp/main.cpp
+++ b/noncore/net/opieftp/main.cpp
@@ -1,27 +1,16 @@
 
 /***************************************************************************
                           main.cpp  -  description
                              -------------------
     begin                : March 10, 2002
     copyright            : (C) 2002 by llornkcor
     email                : ljp@llornkcor.com
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  ***************************************************************************/
-#include <qpe/qpeapplication.h>
-
-
-
+#include <opie/oapplicationfactory.h>
 #include "opieftp.h"
 
-int main(int argc, char *argv[])
-{
-    QPEApplication a(argc, argv);
-
-    OpieFtp opieftp;
-    a.showMainWidget( &opieftp);
-    return a.exec();
-}
-
+OPIE_EXPORT_APP( OApplicationFactory<OpieFtp> )
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp
index 269449e..ee7d32f 100644
--- a/noncore/net/opieftp/opieftp.cpp
+++ b/noncore/net/opieftp/opieftp.cpp
@@ -36,73 +36,73 @@ extern "C" {
 #include <qtabwidget.h>
 #include <qlayout.h>
 #include <qmessagebox.h>
 #include <qlineedit.h>
 #include <qlistbox.h>
 
 #include <unistd.h>
 #include <stdlib.h>
 
 
 QProgressBar *ProgressBar;
 static netbuf *conn=NULL;
 
 static int log_progress(netbuf *, int xfered, void *)
 {
 //    int fsz = *(int *)arg;
 //    int pct = (xfered * 100) / fsz;
 //      printf("%3d%%\r", pct);
 //      fflush(stdout);
     ProgressBar->setProgress(xfered);
     qApp->processEvents();
     return 1;
 }
 
-OpieFtp::OpieFtp( )
-        : QMainWindow( )
+OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl)
+        : QMainWindow( parent,  name, fl )
 {
     setCaption( tr( "OpieFtp" ) );
     fuckeduphack=FALSE;
     QGridLayout *layout = new QGridLayout( this );
     layout->setSpacing( 2);
     layout->setMargin( 2);
 
     connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
 
     QPEMenuBar *menuBar = new QPEMenuBar(this);
 //     QPEToolBar *menuBar = new QPEToolBar(this);
 //     menuBar->setHorizontalStretchable( TRUE );
 
     QWMatrix matrix;
     QPixmap pix(Resource::loadPixmap( "UnknownDocument" ));
     matrix.scale( .4, .4);
     unknownXpm =  pix.xForm(matrix);
 
     connectionMenu  = new QPopupMenu( this );
     localMenu  = new QPopupMenu( this );
     remoteMenu  = new QPopupMenu( this );
     tabMenu = new QPopupMenu( this );
-    
+
     layout->addMultiCellWidget( menuBar, 0, 0, 0, 2 );
 
     menuBar->insertItem( tr( "Connection" ), connectionMenu);
 //      menuBar->insertItem( tr( "Local" ), localMenu);
 //      menuBar->insertItem( tr( "Remote" ), remoteMenu);
     menuBar->insertItem( tr( "View" ), tabMenu);
 
     tabMenu->insertItem( tr( "Local" ), localMenu);
     tabMenu->insertItem( tr( "Remote" ), remoteMenu);
 
     connectionMenu->insertItem( tr( "New" ), this,  SLOT( newConnection() ));
     connectionMenu->insertItem( tr( "Connect" ), this,  SLOT( connector() ));
     connectionMenu->insertItem( tr( "Disconnect" ), this,  SLOT( disConnector() ));
 
     localMenu->insertItem( tr( "Show Hidden Files" ), this,  SLOT( showHidden() ));
     localMenu->insertSeparator();
     localMenu->insertItem( tr( "Upload" ), this, SLOT( localUpload() ));
     localMenu->insertItem( tr( "Make Directory" ), this, SLOT( localMakDir() ));
     localMenu->insertItem( tr( "Rename" ), this, SLOT( localRename() ));
     localMenu->insertSeparator();
     localMenu->insertItem( tr( "Delete" ), this, SLOT( localDelete() ));
     localMenu->setCheckable(TRUE);
 
     remoteMenu->insertItem( tr( "Download" ), this, SLOT( remoteDownload() ));
@@ -248,137 +248,137 @@ OpieFtp::OpieFtp( )
     connect(ServerComboBox,SIGNAL(textChanged(const QString &)),this,
             SLOT(serverComboEdited(const QString & ) ));
 
     QLabel *TextLabel5 = new QLabel( tab_3, "TextLabel5" );
     TextLabel5->setText( tr( "Remote path" ) );
     tabLayout_3->addMultiCellWidget( TextLabel5, 2, 2, 2, 3 );
 
 
     remotePath = new QLineEdit( "/", tab_3, "remotePath" );
     tabLayout_3->addMultiCellWidget( remotePath, 3, 3, 2, 3 );
     TextLabel4 = new QLabel( tab_3, "TextLabel4" );
     TextLabel4->setText( tr( "Port" ) );
     tabLayout_3->addMultiCellWidget( TextLabel4, 4, 4, 0, 1 );
 
     PortSpinBox = new QSpinBox( tab_3, "PortSpinBox" );
     PortSpinBox->setButtonSymbols( QSpinBox::UpDownArrows );
     PortSpinBox->setMaxValue(32786);
     tabLayout_3->addMultiCellWidget( PortSpinBox, 4, 4, 1, 1);
 
     serverListView = new QListBox( tab_3, "ServerListView" );
     tabLayout_3->addMultiCellWidget( serverListView , 5, 5, 0, 5);
 
     connect( serverListView, SIGNAL( highlighted( const QString &)),
              this,SLOT( serverListClicked( const QString &) ) );
-  
-    connectServerBtn = new QPushButton( "Connect", tab_3 , "ConnectButton" );
+
+    connectServerBtn = new QPushButton( tr("Connect"), tab_3 , "ConnectButton" );
     tabLayout_3->addMultiCellWidget( connectServerBtn, 6, 6, 0, 1);
     connectServerBtn->setToggleButton(TRUE);
     connect(connectServerBtn,SIGNAL( toggled( bool)),SLOT( connectorBtnToggled(bool) ));
 
-    newServerButton= new QPushButton( "Add", tab_3 , "NewServerButton" );
+    newServerButton= new QPushButton( tr("Add"), tab_3 , "NewServerButton" );
     tabLayout_3->addMultiCellWidget( newServerButton, 6, 6, 2, 2);
     connect( newServerButton,SIGNAL( clicked()),SLOT( NewServer() ));
 
     QPushButton *deleteServerBtn;
-    deleteServerBtn = new QPushButton( "Delete", tab_3 , "OpenButton" );
+    deleteServerBtn = new QPushButton( tr("Delete"), tab_3 , "OpenButton" );
     tabLayout_3->addMultiCellWidget( deleteServerBtn, 6, 6, 3, 3);
 
     connect(deleteServerBtn,SIGNAL(clicked()),SLOT(deleteServer()));
 
 
     QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding );
     tabLayout_3->addItem( spacer, 5, 0 );
 
     TabWidget->insertTab( tab_3, tr( "Config" ) );
 
     connect(TabWidget,SIGNAL(currentChanged(QWidget *)),
             this,SLOT(tabChanged(QWidget*)));
 
     currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
     currentDir.setPath( QDir::currentDirPath());
 //      currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
 
     currentPathCombo = new QComboBox( FALSE, this, "currentPathCombo" );
     layout->addMultiCellWidget( currentPathCombo, 3, 3, 0, 4);
    currentPathCombo ->setFixedWidth(220);
     currentPathCombo->setEditable(TRUE);
     currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
 
     connect( currentPathCombo, SIGNAL( activated( const QString & ) ),
               this, SLOT(  currentPathComboActivated( const QString & ) ) );
 
     connect( currentPathCombo->lineEdit(),SIGNAL(returnPressed()),
              this,SLOT(currentPathComboChanged()));
 
     ProgressBar = new QProgressBar( this, "ProgressBar" );
     layout->addMultiCellWidget( ProgressBar, 4, 4, 0, 4);
     ProgressBar->setMaximumHeight(10);
     filterStr="*";
     b=FALSE;
     populateLocalView();
     readConfig();
 
 //    ServerComboBox->setCurrentItem(currentServerConfig);
-    
+
     TabWidget->setCurrentPage(2);
 }
 
 OpieFtp::~OpieFtp()
 {
 }
 
 void OpieFtp::cleanUp()
 {
     if(conn)
         FtpQuit(conn);
     QString sfile=QDir::homeDirPath();
     if(sfile.right(1) != "/")
         sfile+="/._temp";
     else
         sfile+="._temp";
     QFile file( sfile);
     if(file.exists())
         file.remove();
     Config cfg("opieftp");
     cfg.setGroup("Server");
     cfg.writeEntry("currentServer", currentServerConfig);
 
     exit(0);
 }
 
 void OpieFtp::tabChanged(QWidget *)
 {
     if (TabWidget->currentPageIndex() == 0) {
         currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
         tabMenu->setItemChecked(tabMenu->idAt(0),TRUE);
         tabMenu->setItemChecked(tabMenu->idAt(1),FALSE);
         tabMenu->setItemChecked(tabMenu->idAt(2),FALSE);
         if(cdUpButton->isHidden())
             cdUpButton->show();
         if(homeButton->isHidden())
             homeButton->show();
-            
+
     }
     if (TabWidget->currentPageIndex() == 1) {
         currentPathCombo->lineEdit()->setText( currentRemoteDir );
         tabMenu->setItemChecked(tabMenu->idAt(1),TRUE);
         tabMenu->setItemChecked(tabMenu->idAt(0),FALSE);
         tabMenu->setItemChecked(tabMenu->idAt(2),FALSE);
         if(cdUpButton->isHidden())
             cdUpButton->show();
         homeButton->hide();
 
     }
     if (TabWidget->currentPageIndex() == 2) {
         tabMenu->setItemChecked(tabMenu->idAt(2),TRUE);
         tabMenu->setItemChecked(tabMenu->idAt(0),FALSE);
         tabMenu->setItemChecked(tabMenu->idAt(1),FALSE);
         cdUpButton->hide();
         homeButton->hide();
     }
 }
 
 void OpieFtp::newConnection()
 {
    UsernameComboBox->lineEdit()->setText("");
    PasswordEdit->setText( "" );
@@ -428,49 +428,49 @@ void OpieFtp::connector()
         connectServerBtn->setOn(FALSE);
         connectServerBtn->setText( tr("Connect"));
         return;
     }
 
     FtpInit();
 
     TabWidget->setCurrentPage(1);
     QString ftp_host = ServerComboBox->currentText();
     QString ftp_user = UsernameComboBox->currentText();
     QString ftp_pass = PasswordEdit->text();
     QString port=PortSpinBox->cleanText();
     port.stripWhiteSpace();
 
     Config cfg("opieftp");
     cfg.setGroup("Server");
 //    int current=cfg.readNumEntry("currentServer", 1);
 
 //      if(ftp_host!= cfg.readEntry(QString::number( current)))
 //         currentServerConfig=-1;
 //      cfg.setGroup(QString::number(current));
 //      if( ftp_user != cfg.readEntry("Username"))
 //         currentServerConfig=-1;
 //      if(ftp_pass != cfg.readEntry(cfg.readEntry("Username")))
-//         currentServerConfig=-1;    
+//         currentServerConfig=-1;
 
 
     if(ftp_host.find("ftp://",0, TRUE) != -1 )
         ftp_host=ftp_host.right(ftp_host.length()-6);
     ftp_host+=":"+port;
 
     if (!FtpConnect( ftp_host.latin1(), &conn)) {
         QMessageBox::message(tr("Note"),tr("Unable to connect to\n")+ftp_host);
         connectServerBtn->setOn(FALSE);
         connectServerBtn->setText( tr("Connect"));
         return ;
     }
 
     if (!FtpLogin( ftp_user.latin1(), ftp_pass.latin1(),conn )) {
         QString msg;
         msg.sprintf(tr("Unable to log in\n")+"%s",FtpLastResponse(conn));
         msg.replace(QRegExp(":"),"\n");
         QMessageBox::message(tr("Note"),msg);
         if(conn)
             FtpQuit(conn);
         connectServerBtn->setOn(FALSE);
         connectServerBtn->setText( tr("Connect"));
         return ;
     }
@@ -572,49 +572,49 @@ void OpieFtp::remoteDownload()
             QString temp;
             temp.sprintf( remoteFile+" "+" %dkb", fsz);
 
             ProgressBar->setTotalSteps(fsz);
             FtpOptions(FTPLIB_CALLBACK, (long) log_progress, conn);
             FtpOptions(FTPLIB_IDLETIME, (long) 1000, conn);
             FtpOptions(FTPLIB_CALLBACKARG, (long) &fsz, conn);
             FtpOptions(FTPLIB_CALLBACKBYTES, (long) fsz/10, conn);
             qDebug("Get: %s, %s",localFile.latin1(),remoteFile.latin1());
 
             if(!FtpGet( localFile.latin1(), remoteFile.latin1(),FTPLIB_IMAGE, conn ) ) {
                 QString msg;
                 msg.sprintf(tr("Unable to download \n")+"%s",FtpLastResponse(conn));
                 msg.replace(QRegExp(":"),"\n");
                 QMessageBox::message(tr("Note"),msg);
             }
             ProgressBar->reset();
             nullifyCallBack();
         it.current()->setSelected(FALSE);
         }
     }
     for ( ; it.current(); ++it ) {
         Remote_View->clearSelection();
     }
-    Remote_View->setFocus();    
+    Remote_View->setFocus();
     TabWidget->setCurrentPage(0);
     populateLocalView();
 //    QCopEnvelope ( "QPE/System", "notBusy()" );
 }
 
 bool OpieFtp::remoteDirList(const QString &dir)
 {
     QString tmp = QDir::homeDirPath();
     if(tmp.right(1) != "/")
         tmp+="/._temp";
     else
         tmp+="._temp";
 //    qDebug("Listing remote dir "+tmp);
 //    QCopEnvelope ( "QPE/System", "busy()" );
     if (!FtpDir( tmp.latin1(), dir.latin1(), conn) ) {
         QString msg;
         msg.sprintf(tr("Unable to list the directory\n")+dir+"\n%s",FtpLastResponse(conn) );
         msg.replace(QRegExp(":"),"\n");
         QMessageBox::message(tr("Note"),msg);
         return false;
     }
     populateRemoteView() ;
 //    QCopEnvelope ( "QPE/System", "notBusy()" );
     return true;
@@ -648,49 +648,49 @@ void OpieFtp::populateLocalView()
     QFileInfoListIterator it(*list);
     QFileInfo *fi;
     while ( (fi=it.current()) ) {
         if (fi->isSymLink() ){
             QString symLink=fi->readLink();
 //         qDebug("Symlink detected "+symLink);
             QFileInfo sym( symLink);
             fileS.sprintf( "%10i", sym.size() );
             fileL.sprintf( "%s ->  %s",  fi->fileName().data(),sym.absFilePath().data() );
             fileDate = sym.lastModified().toString();
         } else {
 //        qDebug("Not a dir: "+currentDir.canonicalPath()+fileL);
             fileS.sprintf( "%10i", fi->size() );
             fileL.sprintf( "%s",fi->fileName().data() );
             fileDate= fi->lastModified().toString();
             if( QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+fileL)).exists() ) {
                 fileL+="/";
                 isDir=TRUE;
 //     qDebug( fileL);
             }
         }
         if(fileL !="./" && fi->exists()) {
             item = new QListViewItem( Local_View,fileL, fileDate, fileS );
             QPixmap pm;
-         
+
             if(isDir || fileL.find("/",0,TRUE) != -1) {
                 if( !QDir( fi->filePath() ).isReadable())
                     pm = Resource::loadPixmap( "lockedfolder" );
                 else
                     pm= Resource::loadPixmap( "folder" );
                 item->setPixmap( 0,pm );
             } else {
                 if( !fi->isReadable() )
                     pm = Resource::loadPixmap( "locked" );
                 else {
                     MimeType mt(fi->filePath());
                     pm=mt.pixmap(); //sets the correct pixmap for mimetype
                     if(pm.isNull())
                         pm =  unknownXpm;
                 }
             }
             if(  fileL.find("->",0,TRUE) != -1) {
                   // overlay link image
                 pm= Resource::loadPixmap( "folder" );
                 QPixmap lnk = Resource::loadPixmap( "opie/symlink" );
                 QPainter painter( &pm );
                 painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk );
                 pm.setMask( pm.createHeuristicMask( FALSE ) );
             }
@@ -708,49 +708,49 @@ bool OpieFtp::populateRemoteView( )
 {
 //    qDebug("populate remoteview");
     QString sfile=QDir::homeDirPath();
     if(sfile.right(1) != "/")
         sfile+="/._temp";
     else
         sfile+="._temp";
     QFile file( sfile);
     Remote_View->clear();
     QString s, File_Name;
     QListViewItem *itemDir=NULL, *itemFile=NULL;
     QRegExp monthRe(" [JFMASOND][eapuecoe][brynlgptvc] [ 0-9][0-9] [ 0-9][0-9][:0-9][0-9][0-9] ");
     QString fileL, fileS, fileDate;
     if ( file.open(IO_ReadOnly)) {
         QTextStream t( &file );   // use a text stream
         while ( !t.eof()) {
             s = t.readLine();
 
             if(s.find("total",0,TRUE) == 0)
                continue;
 
            int len, month = monthRe.match(s, 0, &len);
            fileDate = s.mid(month + 1, len - 2);       // minus spaces
            fileL = s.right(s.length() - month - len);
-            if(s.left(1) == "d") 
+            if(s.left(1) == "d")
                 fileL = fileL+"/";
             fileS = s.mid(month - 8, 8);  // FIXME
             fileS = fileS.stripWhiteSpace();
 
            if(s.left(1) == "d" || fileL.find("/",0,TRUE) != -1) {
                QListViewItem * item = new QListViewItem( Remote_View, fileL, fileDate, fileS,"d");
                item->setPixmap( 0, Resource::loadPixmap( "folder" ));
 //                      if(itemDir)
                      item->moveItem(itemDir);
                  itemDir=item;
            } else {
                QListViewItem * item = new QListViewItem( Remote_View, fileL, fileDate, fileS,"f");
                item->setPixmap( 0, Resource::loadPixmap( "fileopen" ));
 //                      if(itemFile)
                      item->moveItem(itemDir);
                      item->moveItem(itemFile);
                  itemFile=item;
            }
         }
         QListViewItem * item1 = new QListViewItem( Remote_View, "../");
         item1->setPixmap( 0, Resource::loadPixmap( "folder" ));
         file.close();
         if( file.exists())
             file. remove();
@@ -794,92 +794,92 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem)
                     currentRemoteDir = oldRemoteCurrentDir;
                     strItem="";
 //                     qDebug("RemoteCurrentDir1 "+oldRemoteCurrentDir);
                 }
             } else if(strItem.find("/",0,TRUE) != -1) { // this is a directory
                 if( !remoteChDir( (const QString &)currentRemoteDir + strItem)) {
                     currentRemoteDir = oldRemoteCurrentDir;
                     strItem="";
 //                     qDebug("RemoteCurrentDir1 "+oldRemoteCurrentDir);
 
                 } else {
                     currentRemoteDir = currentRemoteDir+strItem;
                 }
             } else {
 //                QCopEnvelope ( "QPE/System", "notBusy()" );
                 return;
             }
         }
         remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
         if(currentRemoteDir.right(1) !="/")
             currentRemoteDir +="/";
         currentPathCombo->lineEdit()->setText( currentRemoteDir);
         fillRemoteCombo( (const QString &)currentRemoteDir);
 //        QCopEnvelope ( "QPE/System", "notBusy()" );
-    Remote_View->ensureItemVisible(Remote_View->firstChild());    
-        
+    Remote_View->ensureItemVisible(Remote_View->firstChild());
+
     }
 }
 
 void OpieFtp::localListClicked(QListViewItem *selectedItem)
 {
     if(selectedItem!= NULL) {
-    
+
     QString strItem=selectedItem->text(0);
         QString strSize=selectedItem->text(1);
         strSize=strSize.stripWhiteSpace();
         if(strItem.find("@",0,TRUE) !=-1 || strItem.find("->",0,TRUE) !=-1 ) { //if symlink
               // is symlink
             QString strItem2 = strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4);
             if(QDir(strItem2).exists() ) {
                 currentDir.cd(strItem2, TRUE);
                 populateLocalView();
             }
         } else { // not a symlink
             if(strItem.find(". .",0,TRUE) && strItem.find("/",0,TRUE)!=-1 ) {
-                
+
                 if(QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem)).exists() ) {
                     strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem);
                     currentDir.cd(strItem,FALSE);
                     populateLocalView();
                 } else {
                     currentDir.cdUp();
                     populateLocalView();
                 }
                 if(QDir(strItem).exists()){
                     currentDir.cd(strItem, TRUE);
                     populateLocalView();
                 }
             } else {
                 strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem);
                 if( QFile::exists(strItem ) ) {
                       //  qDebug("upload "+strItem);
                     return;
                 }
             } //end not symlink
             chdir(strItem.latin1());
         }
-    Local_View->ensureItemVisible(Local_View->firstChild());    
+    Local_View->ensureItemVisible(Local_View->firstChild());
     }
 }
 
 void OpieFtp::doLocalCd()
 {
     localListClicked( Local_View->currentItem());
 }
 
 void OpieFtp:: doRemoteCd()
 {
     remoteListClicked( Remote_View->currentItem());
 
 }
 
 void OpieFtp::showHidden()
 {
     if (!b) {
     currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
     localMenu->setItemChecked(localMenu->idAt(0),TRUE);
 //    currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
     b=TRUE;
 
     }  else {
     currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
@@ -951,82 +951,82 @@ void OpieFtp::showLocalMenu(QListViewItem * item)
     m->exec( QCursor::pos() );
     delete m;
 }
 
 void OpieFtp::localMakDir()
 {
     InputDialog *fileDlg;
     fileDlg = new InputDialog(this,tr("Make Directory"),TRUE, 0);
     fileDlg->exec();
     if( fileDlg->result() == 1 ) {
        QString  filename = fileDlg->LineEdit1->text();
        currentDir.mkdir( currentDir.canonicalPath()+"/"+filename);
     }
     populateLocalView();
 }
 
 void OpieFtp::localDelete()
 {
     QList<QListViewItem> * getSelectedItems( QListView * Local_View );
     QListViewItemIterator it( Local_View );
     for ( ; it.current(); ++it ) {
         if ( it.current()->isSelected() ) {
             QString f = it.current()->text(0);
             it.current()->setSelected(FALSE);
-            
+
 //    QString f = Local_View->currentItem()->text(0);
             if(QDir(f).exists() ) {
                 switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+f+
                                               tr(" ?\nIt must be empty"),tr("Yes"),tr("No"),0,0,1) ) {
                   case 0: {
                       f=currentDir.canonicalPath()+"/"+f;
                       QString cmd="rmdir "+f;
                       system( cmd.latin1());
                   }
                       break;
                   case 1:
                         // exit
                       break;
                 };
 
             } else {
                 switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+f
                                               +" ?",tr("Yes"),tr("No"),0,0,1) ) {
                   case 0: {
                       f=currentDir.canonicalPath()+"/"+f;
                       QString cmd="rm "+f;
                       system( cmd.latin1());
                   }
                       break;
-                  case 1: 
+                  case 1:
                         // exit
                       break;
                 };
             }
         }
     }
     populateLocalView();
-    
+
 }
 
 void OpieFtp::remoteMakDir()
 {
     InputDialog *fileDlg;
     fileDlg = new InputDialog(this,tr("Make Directory"),TRUE, 0);
     fileDlg->exec();
     if( fileDlg->result() == 1 ) {
        QString  filename = fileDlg->LineEdit1->text();//+".playlist";
        QString tmp=currentRemoteDir+filename;
 //       QCopEnvelope ( "QPE/System", "busy()" );
        if(FtpMkdir( tmp.latin1(), conn) == 0) {
            QString msg;
            msg.sprintf(tr("Unable to make directory\n")+"%s",FtpLastResponse(conn));
            msg.replace(QRegExp(":"),"\n");
            QMessageBox::message(tr("Note"),msg);
        }
 //       QCopEnvelope ( "QPE/System", "notBusy()" );
     remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
     }
 }
 
 void OpieFtp::remoteDelete()
 {
@@ -1180,52 +1180,52 @@ void OpieFtp::currentPathComboChanged()
     }
 }
 
 void OpieFtp::switchToLocalTab()
 {
     TabWidget->setCurrentPage(0);
 }
 
 void OpieFtp::switchToRemoteTab()
 {
     TabWidget->setCurrentPage(1);
 }
 
 void OpieFtp::switchToConfigTab()
 {
     TabWidget->setCurrentPage(2);
 }
 
 void OpieFtp::readConfig()
 {
     fillCombos();
     Config cfg("opieftp");
     cfg.setGroup("Server");
     currentServerConfig = cfg.readNumEntry("currentServer", -1);
-    
+
 //    qDebug("Reading %d", currentServerConfig);
     serverComboSelected( currentServerConfig-1);
-    
+
 }
 
 void OpieFtp::writeConfig()
 {
     qDebug("write config");
     Config cfg("opieftp");
     cfg.setGroup("Server");
 
     QString username, remoteServerStr, remotePathStr, password, port, temp;
 
     int numberOfEntries = cfg.readNumEntry("numberOfEntries",0);
 
     if( currentServerConfig == -1) {
 
         for (int i = 1; i <= numberOfEntries; i++) {
         temp.setNum(i);
         cfg.setGroup("Server");
         QString tempStr = cfg.readEntry( temp,"");
     }
 
         temp.setNum( numberOfEntries + 1);
         cfg.setGroup("Server");
 
         remoteServerStr = cfg.readEntry( temp,"");
@@ -1233,49 +1233,49 @@ void OpieFtp::writeConfig()
         int divider = remoteServerStr.length() - remoteServerStr.find(":",0,TRUE);
         remoteServerStr = remoteServerStr.left(remoteServerStr.length()-divider);
 
         temp.setNum(numberOfEntries+1);
         cfg.setGroup("Server");
 
         cfg.writeEntry( temp, ServerComboBox->currentText() +":"+PortSpinBox->cleanText() );
         cfg.writeEntry("currentServer", numberOfEntries+1);
 
         currentServerConfig = numberOfEntries+1;
         qDebug("setting currentserverconfig to %d",        currentServerConfig);
 
         cfg.setGroup(temp);
         if(!newServerName.isEmpty())
             cfg.writeEntry("ServerName", newServerName);
 
         cfg.writeEntry("RemotePath", remotePath->text());
 
         cfg.writeEntry("Username", UsernameComboBox->currentText());
 
         cfg.writeEntryCrypt( UsernameComboBox->currentText(), PasswordEdit->text());
         cfg.setGroup("Server");
 
         cfg.writeEntry("numberOfEntries", QString::number(numberOfEntries + 1 ));
-        
+
     }
 }
 
 void OpieFtp::clearCombos() {
     qDebug("clearing");
     ServerComboBox->clear();
     UsernameComboBox->clear();
     PasswordEdit->clear();
     serverListView->clear();
 }
 
 
 void OpieFtp::fillCombos()
 {
     clearCombos();
 
     Config cfg("opieftp");
     cfg.setGroup("Server");
     QString username, remoteServerStr, remotePathStr, password, port, temp;
     int numberOfEntries = cfg.readNumEntry("numberOfEntries",0);
 
     for (int i = 1; i <= numberOfEntries; i++) {
         temp.setNum(i);
         qDebug(temp);
@@ -1305,81 +1305,81 @@ void OpieFtp::fillCombos()
 
 
 void OpieFtp::serverComboSelected(int index)
 {
     currentServerConfig = index+1;
     qDebug("server combo selected %d", index+1);
     QString username, remoteServerStr, remotePathStr, password, port, temp;
 //    remoteServerStr = ServerComboBox->text(index);
 
     Config cfg("opieftp");
     cfg.setGroup("Server");
 //    int numberOfEntries = cfg.readNumEntry("numberOfEntries",0);
 
     temp.setNum(index+1);
     remoteServerStr = cfg.readEntry( temp,"");
 
     qDebug("Group" +temp);
     cfg.setGroup(temp);
 //    qDebug(temp);
     int divider = remoteServerStr.length() - remoteServerStr.find(":",0,TRUE);
     port = remoteServerStr.right( divider - 1);
     bool ok;
     int portInt = port.toInt(&ok,10);
     if( portInt == 0) portInt = 21;
-    
+
     ServerComboBox->lineEdit()->setText(remoteServerStr.left( remoteServerStr.find(":",0,TRUE)));
-    
+
     PortSpinBox->setValue( portInt);
 
     remotePath->setText(cfg.readEntry("RemotePath", "/"));
 
     username =  cfg.readEntry("Username", "anonymous");
     UsernameComboBox->lineEdit()->setText(username);
     qDebug(username);
 //    qDebug("Password is "+cfg.readEntryCrypt(username, "me@opieftp.org"));
     PasswordEdit->setText(cfg.readEntryCrypt(username, "me@opieftp.org"));
 //   UsernameComboBox
 //        PasswordEdit
-     
+
     cfg.setGroup("Server");
     temp.sprintf("%d",currentServerConfig);
     cfg.writeEntry("currentServer", temp);
 
    fuckeduphack = TRUE;
    serverListView->setCurrentItem( index);
    fuckeduphack=FALSE;
    qDebug("server list set selected %d",index);
     update();
 }
 
 void OpieFtp::deleteServer()
 {
     QString username, remoteServerStr, remotePathStr, password, port, temp, servername;
     remoteServerStr = ServerComboBox->currentText( );
     username = UsernameComboBox->currentText();
     servername=serverListView->currentText();
-    
+
     Config cfg("opieftp");
     cfg.setGroup("Server");
     QString tempname;
     int numberOfEntries = cfg.readNumEntry("numberOfEntries",0);
 
     for (int i = 1; i <= numberOfEntries; i++) {
         temp.setNum(i);
 //        cfg.setGroup("Server");
         cfg.setGroup(QString::number(i));
         tempname=cfg.readEntry( "ServerName","");
 
         if( tempname.find( servername,0,TRUE)  != -1 ) {
 //             servername.find( cfg.readEntry("ServerName"))  != -1 &&
 //             remoteServerStr.find( cfg.readEntry("RemotePath")) != -1 &&
 //             username.find( cfg.readEntry("Username")) != -1) {
 
             serverListView->removeItem(i);
 
             qDebug("OK DELETE "+tempname);
             cfg.removeEntry(QString::number(i));
             for ( ; i <= numberOfEntries; i++) {
                 cfg.setGroup("Server");
                 cfg.writeEntry("Server", QString::number(numberOfEntries + 1 ));
 
@@ -1472,44 +1472,44 @@ void OpieFtp::homeButtonPushed() {
 void OpieFtp::doAbout() {
     QMessageBox::message("OpieFtp","Opie ftp client is copyright 2002 by\n"
                          "L.J.Potter<llornkcor@handhelds.org>\n"
                          "and uses ftplib copyright 1996-2000\n"
                          "by Thomas Pfau, pfau@cnj.digex.net\n\n"
                          "and is licensed by the GPL");
 }
 
 void OpieFtp::NewServer() {
     InputDialog *fileDlg;
     fileDlg = new InputDialog(this,tr("New Server name"),TRUE, 0);
     fileDlg->exec();
     Config cfg("opieftp");
     if( fileDlg->result() == 1 ) {
       newServerName = fileDlg->LineEdit1->text();
       for(int i=1;i<serverListView->count();i++) {
           cfg.setGroup( QString::number(i));
           if(cfg.readEntry("ServerName").find(newServerName,0,TRUE) != -1) {
               QMessageBox::message(tr("OpieFtp"),tr("Sorry name already taken"));
               return;
           }
       }
       currentServerConfig =-1;
       writeConfig();
-      serverListView->insertItem( newServerName );    
+      serverListView->insertItem( newServerName );
       serverListView->setCurrentItem( serverListView->count());
     }
 }
 
 void OpieFtp::serverListClicked( const QString &item) {
     if(item.isEmpty()) return;
     Config cfg("opieftp");
     qDebug("highltined "+item);
     int numberOfEntries = cfg.readNumEntry("numberOfEntries",0);
         for (int i = 1; i <= numberOfEntries; i++) {
             cfg.setGroup(QString::number(i));
               if(cfg.readEntry( "ServerName").find(item) != -1 && !fuckeduphack)
                   serverComboSelected(i-1);
     }
 }
 
 void OpieFtp::timerOut() {
 
 }
diff --git a/noncore/net/opieftp/opieftp.h b/noncore/net/opieftp/opieftp.h
index 9d5d211..7bd615a 100644
--- a/noncore/net/opieftp/opieftp.h
+++ b/noncore/net/opieftp/opieftp.h
@@ -26,51 +26,52 @@ class QGridLayout;
 class QComboBox;
 class QListView;
 class QListViewItem;
 class QLabel;
 class QProgressBar;
 class QSpinBox;
 class QTabWidget;
 class QWidget;
 class QPEToolBar;
 class QPEMenuBar;
 class QPopupMenu;
 class QFile;
 class QLineEdit;
 class QPushButton;
 class QToolButton;
 class QStringList;
 class QListBox;
 class QTimer;
 
 class OpieFtp : public QMainWindow
 {
     Q_OBJECT
 
 public:
-    OpieFtp(  );
+    OpieFtp( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~OpieFtp();
 
+    static QString appName() { return QString::fromLatin1("opieftp"); }
     QTabWidget *TabWidget;
     QWidget *tab, *tab_2, *tab_3;
     QListView *Local_View, *Remote_View;
     QListBox *serverListView;
 
     QComboBox *UsernameComboBox, *ServerComboBox, *currentPathCombo;
     QLineEdit *PasswordEdit, *remotePath;
     QLabel *TextLabel2, *TextLabel1, *TextLabel3, *TextLabel4;;
     QSpinBox* PortSpinBox;
     QPopupMenu *connectionMenu, *localMenu, *remoteMenu, *tabMenu, *aboutMenu;
     QDir currentDir;
     QString currentRemoteDir;
     QString filterStr;
     QListViewItem * item;
     QPushButton *connectServerBtn, *newServerButton;//
     QToolButton  *cdUpButton, *homeButton, *docButton;
     bool b;
     int currentServerConfig;
 protected slots:
     void timerOut();
     void upDir();
     void homeButtonPushed();
     void docButtonPushed();
     void doAbout(); 
diff --git a/noncore/net/opieftp/opieftp.pro b/noncore/net/opieftp/opieftp.pro
index ac16819..185c341 100644
--- a/noncore/net/opieftp/opieftp.pro
+++ b/noncore/net/opieftp/opieftp.pro
@@ -1,30 +1,28 @@
-TEMPLATE  = app
-CONFIG    += qt warn_on release
-HEADERS   = opieftp.h inputDialog.h 
+CONFIG    += qt warn_on release quick-app
+HEADERS   = opieftp.h inputDialog.h
 SOURCES   = opieftp.cpp inputDialog.cpp main.cpp
 TARGET    = opieftp
-DESTDIR   = $(OPIEDIR)/bin
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe -lftplib
 
 TRANSLATIONS = ../../../i18n/de/opieftp.ts \
          ../../../i18n/nl/opieftp.ts \
          ../../../i18n/da/opieftp.ts \
          ../../../i18n/xx/opieftp.ts \
          ../../../i18n/en/opieftp.ts \
          ../../../i18n/es/opieftp.ts \
          ../../../i18n/fr/opieftp.ts \
          ../../../i18n/hu/opieftp.ts \
          ../../../i18n/ja/opieftp.ts \
          ../../../i18n/ko/opieftp.ts \
          ../../../i18n/no/opieftp.ts \
          ../../../i18n/pl/opieftp.ts \
          ../../../i18n/pt/opieftp.ts \
          ../../../i18n/pt_BR/opieftp.ts \
          ../../../i18n/sl/opieftp.ts \
          ../../../i18n/zh_CN/opieftp.ts \
          ../../../i18n/zh_TW/opieftp.ts
 
 
 
diff --git a/noncore/net/opieirc/.cvsignore b/noncore/net/opieirc/.cvsignore
index 39391f4..d5423d6 100644
--- a/noncore/net/opieirc/.cvsignore
+++ b/noncore/net/opieirc/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
 Makefile.in
 moc_*.cpp
+.moc
\ No newline at end of file
diff --git a/noncore/net/opieirc/main.cpp b/noncore/net/opieirc/main.cpp
index 43e63af..39acfcc 100644
--- a/noncore/net/opieirc/main.cpp
+++ b/noncore/net/opieirc/main.cpp
@@ -1,10 +1,7 @@
 #include <qpe/qpeapplication.h>
 #include "mainwindow.h"
 
-int main(int argc, char **argv) {
-    QPEApplication a(argc, argv);
-    MainWindow mw;
-    a.showMainWidget(&mw);
-    return a.exec();
-}
+#include <opie/oapplicationfactory.h>
 
+
+OPIE_EXPORT_APP( OApplicationFactory<MainWindow> )
diff --git a/noncore/net/opieirc/mainwindow.h b/noncore/net/opieirc/mainwindow.h
index bd1a9ce..0f60855 100644
--- a/noncore/net/opieirc/mainwindow.h
+++ b/noncore/net/opieirc/mainwindow.h
@@ -14,39 +14,40 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 */
 
 #ifndef __MAINWINDOW_H
 #define __MAINWINDOW_H
 
 #include <qmainwindow.h>
 #include <qaction.h>
 #include <qlist.h>
 #include "mainwindow.h"
 #include "ircmisc.h"
 #include "irctab.h"
 
 class MainWindow : public QMainWindow {
     Q_OBJECT
 public:
     MainWindow(QWidget *parent = 0, const char *name = 0, WFlags f = 0);
 //    IRCTabWidget getTabWidget();
     void addTab(IRCTab *tab);
     void killTab(IRCTab *tab);
+    static QString appName() { return QString::fromLatin1("opieirc"); }
 signals:
     void updateScroll();
 protected slots:
     void newConnection();
     void settings();
     void selected(QWidget *);
     void changeEvent(IRCTab *);
 protected:
     void loadSettings();
 protected:
     IRCTabWidget *m_tabWidget;
     QList<IRCTab> m_tabs;
 };
 
 #endif /* __MAINWINDOW_H */
diff --git a/noncore/net/opieirc/opieirc.pro b/noncore/net/opieirc/opieirc.pro
index 8b09e18..537f810 100644
--- a/noncore/net/opieirc/opieirc.pro
+++ b/noncore/net/opieirc/opieirc.pro
@@ -1,28 +1,25 @@
-        TEMPLATE= app
-        CONFIG  = qt warn_on release
-        DESTDIR         = $(OPIEDIR)/bin
+        CONFIG  = qt warn_on release quick-app
         HEADERS         = ircchannel.h ircconnection.h \
               ircmessage.h \
               ircmessageparser.h ircoutput.h \
               ircperson.h ircserver.h ircsession.h \
               mainwindow.h irctab.h ircservertab.h \
               ircchanneltab.h ircchannellist.h \
               ircserverlist.h ircservereditor.h \
               ircquerytab.h ircsettings.h ircmisc.h
         SOURCES         = ircchannel.cpp ircconnection.cpp \
               ircmessage.cpp \
               ircmessageparser.cpp ircoutput.cpp \
               ircperson.cpp ircserver.cpp \
               ircsession.cpp main.cpp mainwindow.cpp \
               irctab.cpp ircservertab.cpp \
               ircchanneltab.cpp ircchannellist.cpp \
               ircserverlist.cpp ircservereditor.cpp \
               ircquerytab.cpp ircsettings.cpp ircmisc.cpp
 INCLUDEPATH += $(OPIEDIR)/include
         DEPENDPATH+= $(OPIEDIR)/include
 LIBS        += -lqpe -lopie
-TARGET       = opieirc
-
 
+        TARGET= opieirc
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/net/opietooth/blue-pin/blue-pin.pro b/noncore/net/opietooth/blue-pin/blue-pin.pro
index 102a937..fbf9dbe 100644
--- a/noncore/net/opietooth/blue-pin/blue-pin.pro
+++ b/noncore/net/opietooth/blue-pin/blue-pin.pro
@@ -1,34 +1,30 @@
-TEMPLATE        = app
-#CONFIG         = qt warn_on debug
-CONFIG          = qt warn_on release
+CONFIG          = qt warn_on release quick-app
 HEADERS         = pindlg.h 
 SOURCES         = main.cc pindlg.cc
 INCLUDEPATH     += $(OPIEDIR)/include
 INCLUDEPATH    += $(OPIEDIR)/noncore/opietooth/lib
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe 
 INTERFACES      = pindlgbase.ui
-        DESTDIR         = $(OPIEDIR)/bin
-TARGET          = bluepin
+        TARGET  = bluepin
 
 TRANSLATIONS = ../../../../i18n/de/bluepin.ts \
          ../../../../i18n/nl/bluepin.ts \
          ../../../../i18n/da/bluepin.ts \
          ../../../../i18n/xx/bluepin.ts \
          ../../../../i18n/en/bluepin.ts \
          ../../../../i18n/es/bluepin.ts \
          ../../../../i18n/fr/bluepin.ts \
          ../../../../i18n/hu/bluepin.ts \
          ../../../../i18n/ja/bluepin.ts \
          ../../../../i18n/ko/bluepin.ts \
          ../../../../i18n/no/bluepin.ts \
          ../../../../i18n/pl/bluepin.ts \
          ../../../../i18n/pt/bluepin.ts \
          ../../../../i18n/pt_BR/bluepin.ts \
          ../../../../i18n/sl/bluepin.ts \
          ../../../../i18n/zh_CN/bluepin.ts \
          ../../../../i18n/zh_TW/bluepin.ts
 
 
-
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/net/opietooth/manager/.cvsignore b/noncore/net/opietooth/manager/.cvsignore
index 3fb67fe..19c03a7 100644
--- a/noncore/net/opietooth/manager/.cvsignore
+++ b/noncore/net/opietooth/manager/.cvsignore
@@ -1,9 +1,13 @@
 Makefile
 Makefile.in
 bluetoothbase.cpp
 bluetoothbase.h
 devicedialog.cpp
 devicedialog.h
 moc_*
 scandialog.cpp
 scandialog.h
+rfcommassigndialogbase.cpp
+rfcommassigndialogbase.h
+rfcommdialogitembase.cpp
+rfcommdialogitembase.h
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index 54808fa..2e68984 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -1,86 +1,89 @@
 /*
  * bluebase.cpp *
  * ---------------------
  *
  * copyright   : (c) 2002 by Maximilian Reiß
  * email       : max.reiss@gmx.de
  *
  */
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #include "bluebase.h"
 #include "scandialog.h"
 #include "hciconfwrapper.h"
 #include "devicehandler.h"
 #include "btconnectionitem.h"
+#include "rfcommassigndialogimpl.h"
 
 #include <remotedevice.h>
 #include <services.h>
 
 #include <stdlib.h>
 
 #include <qframe.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qvariant.h>
 #include <qimage.h>
 #include <qpixmap.h>
 #include <qtabwidget.h>
 #include <qscrollview.h>
 #include <qvbox.h>
 #include <qmessagebox.h>
 #include <qcheckbox.h>
 #include <qlineedit.h>
 #include <qlistview.h>
 #include <qdir.h>
 #include <qpopupmenu.h>
 #include <qtimer.h>
 #include <qlist.h>
 
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 
 
 using namespace OpieTooth;
 
 BlueBase::BlueBase( QWidget* parent,  const char* name, WFlags fl )
     : BluetoothBase( parent, name, fl ) {
 
     m_localDevice = new Manager( "hci0" );
 
     connect( PushButton2,  SIGNAL( clicked() ), this, SLOT(startScan() ) );
     connect( configApplyButton, SIGNAL(clicked() ), this, SLOT(applyConfigChanges() ) );
-    // not good since lib is async
+
+    connect( rfcommBindButton,  SIGNAL( clicked() ),  this,  SLOT( rfcommDialog() ) );
+// not good since lib is async
     //       connect( ListView2, SIGNAL( expanded ( QListViewItem* ) ),
     //                  this, SLOT( addServicesToDevice( QListViewItem * ) ) );
     connect( ListView2, SIGNAL( clicked( QListViewItem* )),
              this, SLOT( startServiceActionClicked( QListViewItem* ) ) );
     connect( ListView2, SIGNAL( rightButtonClicked( QListViewItem *, const QPoint &, int ) ),
              this,  SLOT(startServiceActionHold( QListViewItem *, const QPoint &, int) ) );
     connect( m_localDevice , SIGNAL( foundServices( const QString& , Services::ValueList ) ),
              this, SLOT( addServicesToDevice( const QString& , Services::ValueList ) ) );
     connect( m_localDevice, SIGNAL( available( const QString&, bool ) ),
              this, SLOT( deviceActive( const QString& , bool ) ) );
     connect( m_localDevice, SIGNAL( connections( ConnectionState::ValueList ) ),
              this, SLOT( addConnectedDevices( ConnectionState::ValueList ) ) );
     connect( m_localDevice, SIGNAL( signalStrength( const QString&, const QString& ) ),
                  this, SLOT( addSignalStrength( const QString&, const QString& ) ) );
 
 
     // let hold be rightButtonClicked()
     QPEApplication::setStylusOperation( ListView2->viewport(), QPEApplication::RightOnHold);
     QPEApplication::setStylusOperation( ListView4->viewport(), QPEApplication::RightOnHold);
 
     //Load all icons needed
     m_offPix = Resource::loadPixmap( "opietooth/notconnected" );
     m_onPix = Resource::loadPixmap( "opietooth/connected" );
     m_findPix = Resource::loadPixmap( "opietooth/find" );
@@ -201,71 +204,85 @@ void BlueBase::writeSavedDevices() {
 
 /**
  * Set up the gui
  */
 void BlueBase::initGui() {
     StatusLabel->setText( status() ); // maybe move it to getStatus()
     cryptCheckBox->setChecked( m_useEncryption );
     authCheckBox->setChecked( m_enableAuthentification );
     pagescanCheckBox->setChecked( m_enablePagescan );
     inquiryscanCheckBox->setChecked( m_enableInquiryscan );
     deviceNameLine->setText( m_deviceName );
     passkeyLine->setText( m_defaultPasskey );
     // set info tab
     setInfo();
 }
 
 
 /**
  * Get the status informations and returns it
  * @return QString the status informations gathered
  */
 QString BlueBase::status()const{
     QString infoString = tr( "<b>Device name : </b> Ipaq" );
     infoString += QString( "<br><b>" + tr( "MAC adress: " ) +"</b> No idea" );
-    infoString += QString( "<br><b>" + tr( "Class" ) + "</b> PDA" );
+    infoString += QString(  "<br><b>" + tr( "Class" ) + "</b> PDA" );
 
     return (infoString);
 }
 
 
 /**
  * Read the current values from the gui and invoke writeConfig()
  */
 void BlueBase::applyConfigChanges() {
     m_deviceName =  deviceNameLine->text();
     m_defaultPasskey = passkeyLine->text();
     m_useEncryption = cryptCheckBox->isChecked();
     m_enableAuthentification = authCheckBox->isChecked();
     m_enablePagescan = pagescanCheckBox->isChecked();
     m_enableInquiryscan = inquiryscanCheckBox->isChecked();
 
     writeConfig();
 
     QMessageBox::information( this, tr("Test") , tr("Changes were applied.") );
 }
 
 /**
+ * Launch Rfcomm Bind dialog
+ *
+ */
+void BlueBase::rfcommDialog() {
+    RfcommAssignDialog rfcommAssign ( this, "RfcommAssignDialog", true, WStyle_ContextHelp  );
+
+    rfcommAssign.showMaximized();
+
+    if ( rfcommAssign.exec() == QDialog::Accepted )  {
+        rfcommAssign.saveConfig();
+    }
+}
+
+/**
  * Add fresh found devices from scan dialog to the listing
  *
  */
 void BlueBase::addSearchedDevices( const QValueList<RemoteDevice> &newDevices ) {
     BTDeviceItem * deviceItem;
     QValueList<RemoteDevice>::ConstIterator it;
 
     for( it = newDevices.begin(); it != newDevices.end() ; ++it ) {
 
         if (find( (*it)  )) // is already inserted
             continue;
 
         deviceItem = new BTDeviceItem( ListView2 , (*it) );
         deviceItem->setPixmap( 1, m_findPix );
         deviceItem->setExpandable ( true );
 
         // look if device is avail. atm, async
         deviceActive( (*it) );
 
         // ggf auch hier?
         addServicesToDevice( deviceItem );
     }
 }
 
diff --git a/noncore/net/opietooth/manager/bluebase.h b/noncore/net/opietooth/manager/bluebase.h
index 743062c..a8ab3db 100644
--- a/noncore/net/opietooth/manager/bluebase.h
+++ b/noncore/net/opietooth/manager/bluebase.h
@@ -19,79 +19,83 @@
 #include "bticonloader.h"
 
 #include <remotedevice.h>
 #include <manager.h>
 
 class QVBox;
 class QHBoxLayout;
 class QGridLayout;
 class QFrame;
 class QLabel;
 class QPushButton;
 class QTabWidget;
 class QCheckBox;
 class BTConnectionItem;
 
 
 namespace OpieTooth {
 
     class BlueBase : public BluetoothBase {
         Q_OBJECT
 
     public:
         BlueBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
         ~BlueBase();
+        
+               static QString appName() { return QString::fromLatin1("bluetooth-manager"); }
 
     protected:
 
 
     private slots:
         void startScan();
-
+    
+    
     private:
         bool find( const RemoteDevice& device );
         void readConfig();
         void writeConfig();
         void readSavedDevices();
         void writeSavedDevices();
         void writeToHciConfig();
         QString status()const;
         void initGui();
         void setInfo();
 
         PopupHelper m_popHelper;
         Manager *m_localDevice;
         QMap<QString,BTDeviceItem*> m_deviceList;
 
         void deviceActive( const RemoteDevice &device );
 
         QString m_deviceName;
         QString m_defaultPasskey;
         bool m_useEncryption;
         bool m_enableAuthentification;
         bool m_enablePagescan;
         bool m_enableInquiryscan;
 
         QPixmap m_offPix;
         QPixmap m_onPix;
         QPixmap m_findPix;
 
         BTIconLoader *m_iconLoader;
 
         private slots:
         void addSearchedDevices( const QValueList<RemoteDevice> &newDevices );
         void addServicesToDevice( BTDeviceItem *item );
         void addServicesToDevice( const QString& device, Services::ValueList );
         void addConnectedDevices();
         void addConnectedDevices( ConnectionState::ValueList );
         void startServiceActionClicked( QListViewItem *item );
         void startServiceActionHold( QListViewItem *, const QPoint &, int );
         void deviceActive( const QString& mac, bool connected  );
         void applyConfigChanges();
         void addSignalStrength();
         void addSignalStrength( const QString& mac, const QString& strengh );
+        void rfcommDialog();
 
     };
 
 }
 
 #endif
diff --git a/noncore/net/opietooth/manager/bluetoothbase.ui b/noncore/net/opietooth/manager/bluetoothbase.ui
index 9ff970f..bb906a1 100644
--- a/noncore/net/opietooth/manager/bluetoothbase.ui
+++ b/noncore/net/opietooth/manager/bluetoothbase.ui
@@ -1,395 +1,443 @@
 <!DOCTYPE UI><UI>
 <class>BluetoothBase</class>
 <widget>
     <class>QWidget</class>
     <property stdset="1">
         <name>name</name>
         <cstring>BluetoothBase</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>224</width>
-            <height>320</height>
+            <width>258</width>
+            <height>407</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>Form1</string>
     </property>
     <property>
         <name>layoutMargin</name>
     </property>
     <property>
         <name>layoutSpacing</name>
     </property>
-    <vbox>
+    <widget>
+        <class>QTabWidget</class>
         <property stdset="1">
-            <name>margin</name>
-            <number>0</number>
+            <name>name</name>
+            <cstring>Status</cstring>
         </property>
         <property stdset="1">
-            <name>spacing</name>
-            <number>0</number>
+            <name>geometry</name>
+            <rect>
+                <x>1</x>
+                <y>1</y>
+                <width>245</width>
+                <height>289</height>
+            </rect>
+        </property>
+        <property>
+            <name>layoutMargin</name>
+        </property>
+        <property>
+            <name>layoutSpacing</name>
         </property>
         <widget>
-            <class>QTabWidget</class>
+            <class>QWidget</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>Status</cstring>
-            </property>
-            <property>
-                <name>layoutMargin</name>
-            </property>
-            <property>
-                <name>layoutSpacing</name>
+                <cstring>tab</cstring>
             </property>
-            <widget>
-                <class>QWidget</class>
+            <attribute>
+                <name>title</name>
+                <string>Devices</string>
+            </attribute>
+            <vbox>
                 <property stdset="1">
-                    <name>name</name>
-                    <cstring>tab</cstring>
+                    <name>margin</name>
+                    <number>2</number>
                 </property>
-                <attribute>
-                    <name>title</name>
-                    <string>Devices</string>
-                </attribute>
-                <vbox>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>2</number>
+                </property>
+                <widget>
+                    <class>QListView</class>
+                    <column>
+                        <property>
+                            <name>text</name>
+                            <string>Device Name</string>
+                        </property>
+                        <property>
+                            <name>clickable</name>
+                            <bool>true</bool>
+                        </property>
+                        <property>
+                            <name>resizeable</name>
+                            <bool>true</bool>
+                        </property>
+                    </column>
+                    <column>
+                        <property>
+                            <name>text</name>
+                            <string>Online</string>
+                        </property>
+                        <property>
+                            <name>clickable</name>
+                            <bool>true</bool>
+                        </property>
+                        <property>
+                            <name>resizeable</name>
+                            <bool>true</bool>
+                        </property>
+                    </column>
                     <property stdset="1">
-                        <name>margin</name>
-                        <number>2</number>
+                        <name>name</name>
+                        <cstring>ListView2</cstring>
                     </property>
+                </widget>
+                <widget>
+                    <class>QPushButton</class>
                     <property stdset="1">
-                        <name>spacing</name>
-                        <number>2</number>
+                        <name>name</name>
+                        <cstring>PushButton2</cstring>
                     </property>
-                    <widget>
-                        <class>QListView</class>
-                        <column>
-                            <property>
-                                <name>text</name>
-                                <string>Device Name</string>
-                            </property>
-                            <property>
-                                <name>clickable</name>
-                                <bool>true</bool>
-                            </property>
-                            <property>
-                                <name>resizeable</name>
-                                <bool>true</bool>
-                            </property>
-                        </column>
-                        <column>
-                            <property>
-                                <name>text</name>
-                                <string>Online</string>
-                            </property>
-                            <property>
-                                <name>clickable</name>
-                                <bool>true</bool>
-                            </property>
-                            <property>
-                                <name>resizeable</name>
-                                <bool>true</bool>
-                            </property>
-                        </column>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>ListView2</cstring>
+                    <property stdset="1">
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>0</hsizetype>
+                            <vsizetype>0</vsizetype>
+                        </sizepolicy>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Scan for Devices</string>
+                    </property>
+                </widget>
+            </vbox>
+        </widget>
+        <widget>
+            <class>QWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>tab</cstring>
+            </property>
+            <attribute>
+                <name>title</name>
+                <string>Connections</string>
+            </attribute>
+            <vbox>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>2</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>2</number>
+                </property>
+                <widget>
+                    <class>QListView</class>
+                    <column>
+                        <property>
+                            <name>text</name>
+                            <string>Device Name</string>
                         </property>
-                    </widget>
-                    <widget>
-                        <class>QPushButton</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>PushButton2</cstring>
+                        <property>
+                            <name>clickable</name>
+                            <bool>true</bool>
                         </property>
-                        <property stdset="1">
-                            <name>sizePolicy</name>
-                            <sizepolicy>
-                                <hsizetype>0</hsizetype>
-                                <vsizetype>0</vsizetype>
-                            </sizepolicy>
+                        <property>
+                            <name>resizeable</name>
+                            <bool>true</bool>
                         </property>
-                        <property stdset="1">
+                    </column>
+                    <column>
+                        <property>
                             <name>text</name>
-                            <string>Scan for Devices</string>
+                            <string>Connection type</string>
                         </property>
-                    </widget>
-                </vbox>
-            </widget>
-            <widget>
-                <class>QWidget</class>
-                <property stdset="1">
-                    <name>name</name>
-                    <cstring>tab</cstring>
-                </property>
-                <attribute>
-                    <name>title</name>
-                    <string>Connections</string>
-                </attribute>
-                <vbox>
-                    <property stdset="1">
-                        <name>margin</name>
-                        <number>2</number>
-                    </property>
+                        <property>
+                            <name>clickable</name>
+                            <bool>true</bool>
+                        </property>
+                        <property>
+                            <name>resizeable</name>
+                            <bool>true</bool>
+                        </property>
+                    </column>
+                    <column>
+                        <property>
+                            <name>text</name>
+                            <string>Signal</string>
+                        </property>
+                        <property>
+                            <name>clickable</name>
+                            <bool>true</bool>
+                        </property>
+                        <property>
+                            <name>resizeable</name>
+                            <bool>true</bool>
+                        </property>
+                    </column>
                     <property stdset="1">
-                        <name>spacing</name>
-                        <number>2</number>
+                        <name>name</name>
+                        <cstring>ListView4</cstring>
                     </property>
-                    <widget>
-                        <class>QListView</class>
-                        <column>
-                            <property>
-                                <name>text</name>
-                                <string>Device Name</string>
-                            </property>
-                            <property>
-                                <name>clickable</name>
-                                <bool>true</bool>
-                            </property>
-                            <property>
-                                <name>resizeable</name>
-                                <bool>true</bool>
-                            </property>
-                        </column>
-                        <column>
-                            <property>
-                                <name>text</name>
-                                <string>Connection type</string>
-                            </property>
-                            <property>
-                                <name>clickable</name>
-                                <bool>true</bool>
-                            </property>
-                            <property>
-                                <name>resizeable</name>
-                                <bool>true</bool>
-                            </property>
-                        </column>
-                        <column>
-                            <property>
-                                <name>text</name>
-                                <string>Signal</string>
-                            </property>
-                            <property>
-                                <name>clickable</name>
-                                <bool>true</bool>
-                            </property>
-                            <property>
-                                <name>resizeable</name>
-                                <bool>true</bool>
-                            </property>
-                        </column>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>ListView4</cstring>
-                        </property>
-                    </widget>
-                </vbox>
-            </widget>
-            <widget>
-                <class>QWidget</class>
+                </widget>
+            </vbox>
+        </widget>
+        <widget>
+            <class>QWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>tab</cstring>
+            </property>
+            <attribute>
+                <name>title</name>
+                <string>Config</string>
+            </attribute>
+            <vbox>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>11</number>
+                </property>
                 <property stdset="1">
-                    <name>name</name>
-                    <cstring>tab</cstring>
+                    <name>spacing</name>
+                    <number>6</number>
                 </property>
-                <attribute>
-                    <name>title</name>
-                    <string>Config</string>
-                </attribute>
-                <vbox>
+                <widget>
+                    <class>QGroupBox</class>
                     <property stdset="1">
-                        <name>margin</name>
-                        <number>2</number>
+                        <name>name</name>
+                        <cstring>GroupBox1</cstring>
                     </property>
                     <property stdset="1">
-                        <name>spacing</name>
-                        <number>2</number>
+                        <name>title</name>
+                        <string>Bluetooh Basic Config</string>
                     </property>
-                    <widget>
-                        <class>QLayoutWidget</class>
+                    <vbox>
                         <property stdset="1">
-                            <name>name</name>
-                            <cstring>Layout2</cstring>
+                            <name>margin</name>
+                            <number>11</number>
                         </property>
-                        <hbox>
-                            <property stdset="1">
-                                <name>margin</name>
-                                <number>0</number>
-                            </property>
-                            <property stdset="1">
-                                <name>spacing</name>
-                                <number>6</number>
-                            </property>
-                            <widget>
-                                <class>QLabel</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>deviceNameLabel</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>text</name>
-                                    <string>Device Name</string>
-                                </property>
-                            </widget>
-                            <widget>
-                                <class>QLineEdit</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>deviceNameLine</cstring>
-                                </property>
-                            </widget>
-                        </hbox>
-                    </widget>
-                    <widget>
-                        <class>QLayoutWidget</class>
                         <property stdset="1">
-                            <name>name</name>
-                            <cstring>Layout3</cstring>
+                            <name>spacing</name>
+                            <number>6</number>
                         </property>
-                        <hbox>
-                            <property stdset="1">
-                                <name>margin</name>
-                                <number>0</number>
-                            </property>
+                        <widget>
+                            <class>QLayoutWidget</class>
                             <property stdset="1">
-                                <name>spacing</name>
-                                <number>6</number>
+                                <name>name</name>
+                                <cstring>Layout7</cstring>
                             </property>
-                            <widget>
-                                <class>QLabel</class>
+                            <hbox>
                                 <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>passkeyLabel</cstring>
+                                    <name>margin</name>
+                                    <number>0</number>
                                 </property>
                                 <property stdset="1">
-                                    <name>text</name>
-                                    <string>Default Passkey</string>
+                                    <name>spacing</name>
+                                    <number>6</number>
                                 </property>
-                            </widget>
-                            <widget>
-                                <class>QLineEdit</class>
+                                <widget>
+                                    <class>QLayoutWidget</class>
+                                    <property stdset="1">
+                                        <name>name</name>
+                                        <cstring>Layout6</cstring>
+                                    </property>
+                                    <vbox>
+                                        <property stdset="1">
+                                            <name>margin</name>
+                                            <number>0</number>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>spacing</name>
+                                            <number>6</number>
+                                        </property>
+                                        <widget>
+                                            <class>QLabel</class>
+                                            <property stdset="1">
+                                                <name>name</name>
+                                                <cstring>deviceNameLabel</cstring>
+                                            </property>
+                                            <property stdset="1">
+                                                <name>text</name>
+                                                <string>Device Name</string>
+                                            </property>
+                                        </widget>
+                                        <widget>
+                                            <class>QLabel</class>
+                                            <property stdset="1">
+                                                <name>name</name>
+                                                <cstring>passkeyLabel</cstring>
+                                            </property>
+                                            <property stdset="1">
+                                                <name>text</name>
+                                                <string>Default Passkey</string>
+                                            </property>
+                                        </widget>
+                                    </vbox>
+                                </widget>
+                                <widget>
+                                    <class>QLayoutWidget</class>
+                                    <property stdset="1">
+                                        <name>name</name>
+                                        <cstring>Layout5</cstring>
+                                    </property>
+                                    <vbox>
+                                        <property stdset="1">
+                                            <name>margin</name>
+                                            <number>0</number>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>spacing</name>
+                                            <number>6</number>
+                                        </property>
+                                        <widget>
+                                            <class>QLineEdit</class>
+                                            <property stdset="1">
+                                                <name>name</name>
+                                                <cstring>deviceNameLine</cstring>
+                                            </property>
+                                        </widget>
+                                        <widget>
+                                            <class>QLineEdit</class>
+                                            <property stdset="1">
+                                                <name>name</name>
+                                                <cstring>passkeyLine</cstring>
+                                            </property>
+                                            <property stdset="1">
+                                                <name>echoMode</name>
+                                                <enum>Password</enum>
+                                            </property>
+                                        </widget>
+                                    </vbox>
+                                </widget>
+                            </hbox>
+                        </widget>
+                        <widget>
+                            <class>QLayoutWidget</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>Layout5</cstring>
+                            </property>
+                            <vbox>
                                 <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>passkeyLine</cstring>
+                                    <name>margin</name>
+                                    <number>0</number>
                                 </property>
                                 <property stdset="1">
-                                    <name>echoMode</name>
-                                    <enum>Password</enum>
+                                    <name>spacing</name>
+                                    <number>6</number>
                                 </property>
-                            </widget>
-                        </hbox>
-                    </widget>
-                    <widget>
-                        <class>QLayoutWidget</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>Layout5</cstring>
-                        </property>
-                        <vbox>
+                                <widget>
+                                    <class>QCheckBox</class>
+                                    <property stdset="1">
+                                        <name>name</name>
+                                        <cstring>authCheckBox</cstring>
+                                    </property>
+                                    <property stdset="1">
+                                        <name>text</name>
+                                        <string>enable authentification</string>
+                                    </property>
+                                </widget>
+                                <widget>
+                                    <class>QCheckBox</class>
+                                    <property stdset="1">
+                                        <name>name</name>
+                                        <cstring>cryptCheckBox</cstring>
+                                    </property>
+                                    <property stdset="1">
+                                        <name>text</name>
+                                        <string>enable encryption</string>
+                                    </property>
+                                </widget>
+                                <widget>
+                                    <class>QCheckBox</class>
+                                    <property stdset="1">
+                                        <name>name</name>
+                                        <cstring>pagescanCheckBox</cstring>
+                                    </property>
+                                    <property stdset="1">
+                                        <name>text</name>
+                                        <string>Enable Page scan</string>
+                                    </property>
+                                </widget>
+                                <widget>
+                                    <class>QCheckBox</class>
+                                    <property stdset="1">
+                                        <name>name</name>
+                                        <cstring>inquiryscanCheckBox</cstring>
+                                    </property>
+                                    <property stdset="1">
+                                        <name>text</name>
+                                        <string>Enable Inquiry scan</string>
+                                    </property>
+                                </widget>
+                            </vbox>
+                        </widget>
+                        <widget>
+                            <class>QPushButton</class>
                             <property stdset="1">
-                                <name>margin</name>
-                                <number>0</number>
+                                <name>name</name>
+                                <cstring>configApplyButton</cstring>
                             </property>
                             <property stdset="1">
-                                <name>spacing</name>
-                                <number>6</number>
+                                <name>text</name>
+                                <string>Apply</string>
                             </property>
-                            <widget>
-                                <class>QCheckBox</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>authCheckBox</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>text</name>
-                                    <string>enable authentification</string>
-                                </property>
-                            </widget>
-                            <widget>
-                                <class>QCheckBox</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>cryptCheckBox</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>text</name>
-                                    <string>enable encryption</string>
-                                </property>
-                            </widget>
-                            <widget>
-                                <class>QCheckBox</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>pagescanCheckBox</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>text</name>
-                                    <string>Enable Page scan</string>
-                                </property>
-                            </widget>
-                            <widget>
-                                <class>QCheckBox</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>inquiryscanCheckBox</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>text</name>
-                                    <string>Enable Inquiry scan</string>
-                                </property>
-                            </widget>
-                        </vbox>
-                    </widget>
-                    <widget>
-                        <class>QPushButton</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>configApplyButton</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>Apply</string>
-                        </property>
-                    </widget>
-                </vbox>
-            </widget>
-            <widget>
-                <class>QWidget</class>
+                        </widget>
+                    </vbox>
+                </widget>
+                <widget>
+                    <class>QPushButton</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>rfcommBindButton</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Rfcomm Bind Table</string>
+                    </property>
+                </widget>
+            </vbox>
+        </widget>
+        <widget>
+            <class>QWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>tab</cstring>
+            </property>
+            <attribute>
+                <name>title</name>
+                <string>Status</string>
+            </attribute>
+            <vbox>
                 <property stdset="1">
-                    <name>name</name>
-                    <cstring>tab</cstring>
+                    <name>margin</name>
+                    <number>2</number>
                 </property>
-                <attribute>
-                    <name>title</name>
-                    <string>Status</string>
-                </attribute>
-                <vbox>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>2</number>
+                </property>
+                <widget>
+                    <class>QLabel</class>
                     <property stdset="1">
-                        <name>margin</name>
-                        <number>2</number>
+                        <name>name</name>
+                        <cstring>StatusLabel</cstring>
                     </property>
                     <property stdset="1">
-                        <name>spacing</name>
-                        <number>2</number>
+                        <name>text</name>
+                        <string>Status Label</string>
                     </property>
-                    <widget>
-                        <class>QLabel</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>StatusLabel</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>Status Label</string>
-                        </property>
-                    </widget>
-                </vbox>
-            </widget>
+                </widget>
+            </vbox>
         </widget>
-    </vbox>
+    </widget>
 </widget>
 </UI>
diff --git a/noncore/net/opietooth/manager/main.cpp b/noncore/net/opietooth/manager/main.cpp
index a86e36d..82aeebd 100644
--- a/noncore/net/opietooth/manager/main.cpp
+++ b/noncore/net/opietooth/manager/main.cpp
@@ -1,38 +1,25 @@
 /*
  * main.cpp
  *
  * ---------------------
  *
  * begin       : Sun 10 17:20:00 CEST 2002
  * copyright   : (c) 2002 by Maximilian Reiß
  * email       : max.reiss@gmx.de
  *
  */
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #include "bluebase.h"
 #include <qpe/qpeapplication.h>
+#include <opie/oapplicationfactory.h>
 
-
-QPEApplication *BluetoothApp;
-
-int main( int argc, char ** argv ) {
-    QPEApplication a(argc, argv);
-    BluetoothApp=&a;
-
-    OpieTooth::BlueBase t;
-
-    // t.setCaption( OpieTooth::BlueBase::tr("Bluetooth Manager") );
-    a.showMainWidget(&t);
-
-    return a.exec();
-}
-
+OPIE_EXPORT_APP( OApplicationFactory<OpieTooth::BlueBase> )
 
diff --git a/noncore/net/opietooth/manager/manager.pro b/noncore/net/opietooth/manager/manager.pro
index 9841740..6ff4ebb 100644
--- a/noncore/net/opietooth/manager/manager.pro
+++ b/noncore/net/opietooth/manager/manager.pro
@@ -1,50 +1,50 @@
-TEMPLATE        = app
-CONFIG          = qt warn_on debug
-#CONFIG          = qt warn_on release
+CONFIG          = qt warn_on release quick-app
 HEADERS         = btconnectionitem.h btdeviceitem.h \
                   btserviceitem.h stdpopups.h \ 
                   popuphelper.h bluebase.h \ 
                   scandialog.h btlistitem.h \ 
                   hciconfwrapper.h bticonloader.h \
                   pppdialog.h obexdialog.h \
+                rfcommassigndialogimpl.h rfcommassigndialogitem.h \
                   devicehandler.h rfcpopup.h obexpopup.h \
-                  rfcommhelper.h panpopup.h dunpopup.h
+                  rfcommhelper.h panpopup.h dunpopup.h rfcommconfhandler.h
                   
 SOURCES         = btconnectionitem.cpp btdeviceitem.cpp \ 
                   btserviceitem.cpp stdpopups.cpp \
                   popuphelper.cpp main.cpp \
                   bluebase.cpp scandialog.cpp \ 
                   btlistitem.cpp hciconfwrapper.cpp \ 
                   bticonloader.cpp pppdialog.cpp \
+                rfcommassigndialogimpl.cpp rfcommassigndialogitem.cpp \
                   obexdialog.cpp devicehandler.cpp \
                   rfcpopup.cpp obexpopup.cpp \
-                  rfcommhelper.cpp panpopup.cpp dunpopup.cpp
+                  rfcommhelper.cpp panpopup.cpp dunpopup.cpp rfcommconfhandler.cpp
 INCLUDEPATH     += $(OPIEDIR)/include
 INCLUDEPATH     += $(OPIEDIR)/noncore/net/opietooth/lib
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe -lopietooth -lopie
-INTERFACES      = bluetoothbase.ui  devicedialog.ui  
-DESTDIR         = $(OPIEDIR)/bin
-TARGET          = bluetooth-manager
+INTERFACES      = bluetoothbase.ui  devicedialog.ui rfcommassigndialogbase.ui rfcommdialogitembase.ui
+
+        TARGET          = bluetooth-manager
 
 TRANSLATIONS = ../../../../i18n/de/bluetooth-manager.ts \
          ../../../../i18n/nl/bluetooth-manager.ts \
          ../../../../i18n/da/bluetooth-manager.ts \
          ../../../../i18n/xx/bluetooth-manager.ts \
          ../../../../i18n/en/bluetooth-manager.ts \
          ../../../../i18n/es/bluetooth-manager.ts \
          ../../../../i18n/fr/bluetooth-manager.ts \
          ../../../../i18n/hu/bluetooth-manager.ts \
          ../../../../i18n/ja/bluetooth-manager.ts \
          ../../../../i18n/ko/bluetooth-manager.ts \
          ../../../../i18n/no/bluetooth-manager.ts \
          ../../../../i18n/pl/bluetooth-manager.ts \
          ../../../../i18n/pt/bluetooth-manager.ts \
          ../../../../i18n/pt_BR/bluetooth-manager.ts \
          ../../../../i18n/sl/bluetooth-manager.ts \
          ../../../../i18n/zh_CN/bluetooth-manager.ts \
          ../../../../i18n/zh_TW/bluetooth-manager.ts
 
 
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/net/opietooth/manager/rfcommassigndialogbase.ui b/noncore/net/opietooth/manager/rfcommassigndialogbase.ui
new file mode 100644
index 0000000..aefa698
--- a/dev/null
+++ b/noncore/net/opietooth/manager/rfcommassigndialogbase.ui
@@ -0,0 +1,44 @@
+<!DOCTYPE UI><UI>
+<class>RfcommAssignDialogBase</class>
+<widget>
+    <class>QDialog</class>
+    <property stdset="1">
+        <name>name</name>
+        <cstring>RfcommAssignDialogBase</cstring>
+    </property>
+    <property stdset="1">
+        <name>geometry</name>
+        <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>444</width>
+            <height>343</height>
+        </rect>
+    </property>
+    <property stdset="1">
+        <name>caption</name>
+        <string>Rfcomm Bind</string>
+    </property>
+    <vbox>
+        <property stdset="1">
+            <name>margin</name>
+            <number>11</number>
+        </property>
+        <property stdset="1">
+            <name>spacing</name>
+            <number>6</number>
+        </property>
+        <widget>
+            <class>QLabel</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>TextLabel1</cstring>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>Bind device to a interface</string>
+            </property>
+        </widget>
+    </vbox>
+</widget>
+</UI>
diff --git a/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp b/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp
new file mode 100644
index 0000000..b5cc074
--- a/dev/null
+++ b/noncore/net/opietooth/manager/rfcommassigndialogimpl.cpp
@@ -0,0 +1,120 @@
+
+#include "rfcommassigndialogimpl.h"
+#include "rfcommassigndialogitem.h"
+#include "rfcommconfhandler.h"
+
+#include <qpe/config.h>
+
+#include <qlayout.h>
+
+using namespace OpieTooth;
+
+// TODO: write only the file in bluebase?
+// muss rfcommd dann neu gestartet werden
+// sollte rfcomm bind all nicht eh default config sein ( polled das? - d.h. sobald nen gerät in der nähe ist bindet es?
+
+
+RfcommAssignDialog::RfcommAssignDialog( QWidget* parent,  const char* name, bool modal, WFlags fl )
+    : RfcommAssignDialogBase( parent, name, modal, fl ) {
+
+    m_range = 5;
+
+    m_scrollView = new QScrollView( this );
+    m_scrollView->setResizePolicy( QScrollView::AutoOneFit );
+    m_scrollView->setHScrollBarMode( QScrollView::AlwaysOff );
+
+    RfcommAssignDialogBaseLayout->addWidget( m_scrollView );
+
+    m_box = new QVBox( m_scrollView->viewport() );
+    m_scrollView->addChild( m_box );
+
+    confHandler = new RfCommConfHandler( "/etc/bluetooth/rfcomm.conf" );
+
+    loadConfig();
+}
+
+RfcommAssignDialog::~RfcommAssignDialog()  {
+    if ( confHandler )  {
+        delete confHandler;
+    }
+}
+
+
+void RfcommAssignDialog::newDevice( const QString & mac )  {
+
+    for ( int i = 0 ; i < m_range; i++ )  {
+
+        QMap<QString, RfCommConfObject*>::Iterator it;
+        it = confHandler->foundEntries().find( QString("%1").arg( i ) );
+        // make sure that rfcommX is not assigned yet
+        if (  it == confHandler->foundEntries().end() )  {
+            QDialog dialog( this,  "newdevice", true, WStyle_ContextHelp );
+            dialog.showMaximized();
+            RfcommDialogItem *newDev = new RfcommDialogItem( &dialog );
+            newDev->setIdent( i );
+            newDev->setMac( mac );
+
+            if ( dialog.exec() == QDialog::Accepted )  {
+                RfcommDialogItem *rfcomm = new RfcommDialogItem( m_box );
+                m_itemList.insert( i , rfcomm );
+                rfcomm->setIdent( i );
+                rfcomm->setMac( mac );
+                rfcomm->setChannel( newDev->channel() );
+                rfcomm->setComment( newDev->comment() );
+                qDebug( "New device set up" );
+            }
+        }
+    }
+}
+
+void RfcommAssignDialog::loadConfig()  {
+
+    //Config cfg( "bluetoothmanager-rfcommbind" );
+
+    for ( int i = 0 ; i < m_range; i++ )  {
+        // cfg.setGroup( QString("%1").arg( i ) );
+        RfcommDialogItem *rfcomm = new RfcommDialogItem( m_box );
+        m_itemList.insert( i , rfcomm );
+        rfcomm->setIdent( i );
+        QMap<QString, RfCommConfObject*>::Iterator it;
+        it = confHandler->foundEntries().find( QString("%1").arg( i ) );
+        if ( it != confHandler->foundEntries().end() )  {
+            qDebug( "Found key in foundEntries() " );
+            rfcomm->setMac( it.data()->mac() );
+            rfcomm->setChannel( it.data()->channel() );
+            rfcomm->setComment( it.data()->comment() );
+        }
+          /* Use rfcomm.conf directly for now
+           * rfcomm->setMac( cfg.readEntry( "mac",  "" ) );
+           * rfcomm->setChannel( cfg.readNumEntry( "channel", 1 ) );
+           * rfcomm->setComment( cfg.readEntry( "comment", "" ) );
+           */
+    }
+}
+
+
+void RfcommAssignDialog::saveConfig()  {
+
+    //Config cfg( "bluetoothmanager-rfcommbind" );
+
+    QMap< int, RfcommDialogItem*>::Iterator it;
+
+    QMap< QString, RfCommConfObject*> outMap;
+
+    for( it = m_itemList.begin(); it != m_itemList.end(); ++it )  {
+
+        //cfg.setGroup( QString("%1").arg( it.key() ) );
+        RfcommDialogItem *rfcomm = it.data();
+
+
+        outMap.insert( QString( "%1").arg( it.key() ), new RfCommConfObject( it.key(), rfcomm->mac(), rfcomm->channel(),  rfcomm->comment() ) );
+
+
+        //cfg.writeEntry( "mac",  rfcomm->mac() );
+        //cfg.writeEntry( "channel", rfcomm->channel() );
+        //cfg.writeEntry( "comment", rfcomm->comment() );
+    }
+
+    confHandler->save( outMap );
+
+}
diff --git a/noncore/net/opietooth/manager/rfcommassigndialogimpl.h b/noncore/net/opietooth/manager/rfcommassigndialogimpl.h
new file mode 100644
index 0000000..9983632
--- a/dev/null
+++ b/noncore/net/opietooth/manager/rfcommassigndialogimpl.h
@@ -0,0 +1,39 @@
+#ifndef RFCOMMASSIGN
+#define RFCOMMASSIGN
+
+#include "rfcommassigndialogbase.h"
+#include "rfcommassigndialogitem.h"
+#include "rfcommconfhandler.h"
+
+#include <qscrollview.h>
+#include <qmap.h>
+#include <qvbox.h>
+
+namespace OpieTooth {
+
+    class RfcommAssignDialog: public RfcommAssignDialogBase {
+
+        Q_OBJECT
+            
+    public:
+        
+        RfcommAssignDialog( QWidget* parent = 0, const char* name = 0,bool modal = 0, WFlags fl = 0 ); 
+        ~RfcommAssignDialog();
+        
+        void loadConfig();
+        void saveConfig();
+
+        void newDevice( const QString & mac );
+
+    private:
+        QScrollView *m_scrollView;
+        // how many rfcomm devices are possible
+        int m_range;
+        QMap< int, RfcommDialogItem* > m_itemList;
+        QVBox *m_box;
+        RfCommConfHandler *confHandler;
+};
+
+}
+
+#endif
diff --git a/noncore/net/opietooth/manager/rfcommassigndialogitem.cpp b/noncore/net/opietooth/manager/rfcommassigndialogitem.cpp
new file mode 100644
index 0000000..1e7130f
--- a/dev/null
+++ b/noncore/net/opietooth/manager/rfcommassigndialogitem.cpp
@@ -0,0 +1,54 @@
+
+#include "rfcommassigndialogitem.h"
+
+#include <qlineedit.h>
+#include <qcombobox.h>
+#include <qlabel.h>
+#include <qgroupbox.h>
+
+using namespace OpieTooth;
+
+
+RfcommDialogItem::RfcommDialogItem( QWidget* parent,  const char* name, WFlags fl )
+    : RfcommDialogItemBase( parent, name, fl ) {
+
+}
+
+RfcommDialogItem::~RfcommDialogItem()  {
+}
+
+
+int RfcommDialogItem::ident()  {
+    return m_ident;
+}
+
+QString RfcommDialogItem::mac()  {
+    return m_macAddress->text();
+}
+
+int RfcommDialogItem::channel()  {
+    return m_channelDropdown->currentItem();
+}
+
+QString RfcommDialogItem::comment()  {
+    return m_commentLine->text();
+}
+
+void RfcommDialogItem::setIdent( int ident )  {
+    m_ident = ident;
+    m_identLabel->setTitle( QString( "rfcomm%1").arg( ident ) );
+}
+
+void RfcommDialogItem::setMac( const QString &mac )  {
+    m_macAddress->setText( mac );
+}
+
+void RfcommDialogItem::setChannel( int channel )  {
+    m_channelDropdown->setCurrentItem( channel );
+}
+
+void RfcommDialogItem::setComment( const QString &comment ) {
+    m_commentLine->setText( comment );
+}
+
+
diff --git a/noncore/net/opietooth/manager/rfcommassigndialogitem.h b/noncore/net/opietooth/manager/rfcommassigndialogitem.h
new file mode 100644
index 0000000..34a794f
--- a/dev/null
+++ b/noncore/net/opietooth/manager/rfcommassigndialogitem.h
@@ -0,0 +1,40 @@
+#ifndef RFCOMMDIALOGITEM
+#define RFCOMMDIALOGITEM
+
+#include "rfcommdialogitembase.h"
+
+#include <qwidget.h>
+
+namespace OpieTooth {
+
+    class RfcommDialogItem : public RfcommDialogItemBase {
+        
+        Q_OBJECT
+
+    public:
+        RfcommDialogItem( QWidget* parent = 0,  const char* name = 0, WFlags fl = 0 );
+        ~RfcommDialogItem();
+        
+        // number if the rfcomm device
+        int ident();
+        // devices mac address
+        QString mac();
+                int channel();
+        QString comment();
+
+        void setIdent( int ident );
+        void setMac( const QString& mac  );
+        void setChannel( int channel );
+        void setComment( const QString& comment );
+
+    private:
+
+
+        int m_ident;
+   
+};
+
+
+}
+
+#endif
diff --git a/noncore/net/opietooth/manager/rfcommconfhandler.cpp b/noncore/net/opietooth/manager/rfcommconfhandler.cpp
new file mode 100644
index 0000000..20453e8
--- a/dev/null
+++ b/noncore/net/opietooth/manager/rfcommconfhandler.cpp
@@ -0,0 +1,114 @@
+
+#include <qtextstream.h>
+
+#include "rfcommconfhandler.h"
+
+
+using namespace OpieTooth;
+
+// move to lib
+
+
+RfCommConfObject::RfCommConfObject( int number, QString mac, int channel, QString comment ) {
+    m_number = number;
+    m_mac = mac;
+    m_channel = channel;
+    m_comment = comment;
+    // m_foundEntries = 0;
+}
+
+void RfCommConfObject::setNumber( int number )  {
+    m_number = number;
+}
+
+void RfCommConfObject::setMac( QString mac )  {
+    m_mac = mac;
+}
+
+void RfCommConfObject::setChannel( int channel )  {
+    m_channel = channel;
+}
+
+void RfCommConfObject::setComment( QString comment )  {
+    m_comment = comment;
+}
+
+
+RfCommConfObject::~RfCommConfObject()  {
+}
+
+
+RfCommConfHandler::RfCommConfHandler( const QString & filename ) {
+
+    m_filename = filename;
+    load();
+}
+
+RfCommConfHandler::~RfCommConfHandler() {
+
+}
+
+void RfCommConfHandler::save( QMap<QString, RfCommConfObject*> devices )  {
+
+    QFile rfCommConf( "/tmp/test" );
+    QTextStream outStream( &rfCommConf );
+    if (  rfCommConf.open( IO_WriteOnly ) )  {
+
+        QMap<QString,  RfCommConfObject*>::Iterator it;
+        for( it = devices.begin(); it != devices.end(); ++it )  {
+            outStream << "rfcomm" + QString("%1").arg( it.data()->number() ) + " {\n";
+            outStream << "  device " + it.data()->mac() + ";\n";
+            outStream << "  channel " + QString( "%1" ).arg( it.data()->channel() ) + ";\n";
+            outStream << "  comment \"" + it.data()->comment() + "\";\n";
+            outStream << "}\n\n";
+        }
+
+        rfCommConf.close();
+    }
+}
+
+
+QMap<QString, RfCommConfObject*> RfCommConfHandler::foundEntries()  {
+    return m_foundEntries;
+}
+
+void RfCommConfHandler::load()  {
+
+    QFile rfCommConf( m_filename );
+    if ( rfCommConf.open( IO_ReadOnly ) )  {
+
+        QStringList list;
+        QTextStream inStream( &rfCommConf );
+        list = QStringList::split( "\n", inStream.read() );
+
+        QString number;
+        QString mac;
+        QString channel;
+        QString comment;
+
+        for ( QStringList::Iterator line=list.begin(); line != list.end(); line++ )  {
+
+            QString tmpLine = ( *line ).stripWhiteSpace();
+
+            if ( tmpLine.startsWith("rfcomm") )  {
+                QString number = tmpLine.mid( 6,1 );
+                qDebug( tmpLine );
+                qDebug( "TEST " + number );
+            } else if ( tmpLine.startsWith( "}" ) ) {
+                m_foundEntries.insert( number, new RfCommConfObject( number.toInt(), mac, channel.toInt(),  comment ) );
+            } else if ( tmpLine.startsWith( "device" ) )  {
+                mac = tmpLine.mid( 7, 17 );
+                qDebug( "mac" + mac );
+            } else if ( tmpLine.startsWith( "channel" ) ) {
+                channel = tmpLine.mid( 8, 1 );
+                qDebug ( "Channel :" + channel );
+            } else if ( tmpLine.startsWith( "comment" ) ) {
+                comment = tmpLine.mid( 9, tmpLine.find( ';' ) - 9 - 1 );
+                qDebug( "Comment: " + comment );
+            }
+        }
+        rfCommConf.close();
+    }
+    save( m_foundEntries );
+    qDebug( QString( "ENTries: %1").arg( m_foundEntries.count() ) );
+}
diff --git a/noncore/net/opietooth/manager/rfcommconfhandler.h b/noncore/net/opietooth/manager/rfcommconfhandler.h
new file mode 100644
index 0000000..e13c833
--- a/dev/null
+++ b/noncore/net/opietooth/manager/rfcommconfhandler.h
@@ -0,0 +1,54 @@
+#ifndef RFCOMMCONFHANDLER
+#define RFCOMMCONFHANDLER
+
+#include <qstring.h>
+#include <qfile.h>
+#include <qobject.h>
+#include <qmap.h>
+
+namespace OpieTooth {
+
+    class RfCommConfObject {
+        
+    public:
+        RfCommConfObject( int number, QString mac, int channel, QString comment );
+        ~RfCommConfObject();
+        
+        void setNumber( int number );
+        int number() { return m_number; };
+        void setMac( QString mac );
+        QString mac() { return m_mac; };
+        void setChannel( int channel );
+        int channel() { return m_channel; };
+        void setComment( QString comment );
+        QString comment() { return m_comment; };
+
+
+    private:
+        int m_number;
+        QString m_mac;
+        int m_channel;
+        QString m_comment;
+        
+    };
+    
+    class RfCommConfHandler  {
+        
+    public:
+        RfCommConfHandler( const QString & filename );
+        ~RfCommConfHandler();
+
+        void save( QMap<QString, RfCommConfObject*> devices );
+        
+        QMap<QString, RfCommConfObject*> foundEntries();
+        
+    private:
+        void load();
+
+        QString m_filename;
+        QMap<QString, RfCommConfObject*> m_foundEntries;
+    };
+
+}
+
+#endif
diff --git a/noncore/net/opietooth/manager/rfcommdialogitembase.ui b/noncore/net/opietooth/manager/rfcommdialogitembase.ui
new file mode 100644
index 0000000..dafca52
--- a/dev/null
+++ b/noncore/net/opietooth/manager/rfcommdialogitembase.ui
@@ -0,0 +1,216 @@
+<!DOCTYPE UI><UI>
+<class>RfcommDialogItemBase</class>
+<widget>
+    <class>QWidget</class>
+    <property stdset="1">
+        <name>name</name>
+        <cstring>RfcommDialogItemBase</cstring>
+    </property>
+    <property stdset="1">
+        <name>geometry</name>
+        <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>345</width>
+            <height>95</height>
+        </rect>
+    </property>
+    <property stdset="1">
+        <name>caption</name>
+        <string>Form2</string>
+    </property>
+    <property>
+        <name>layoutMargin</name>
+    </property>
+    <property>
+        <name>layoutSpacing</name>
+    </property>
+    <vbox>
+        <property stdset="1">
+            <name>margin</name>
+            <number>0</number>
+        </property>
+        <property stdset="1">
+            <name>spacing</name>
+            <number>0</number>
+        </property>
+        <widget>
+            <class>QGroupBox</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>m_identLabel</cstring>
+            </property>
+            <property>
+                <name>layoutMargin</name>
+            </property>
+            <property>
+                <name>layoutSpacing</name>
+            </property>
+            <grid>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>5</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>5</number>
+                </property>
+                <widget row="0"  column="0" >
+                    <class>QLayoutWidget</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>Layout3</cstring>
+                    </property>
+                    <hbox>
+                        <property stdset="1">
+                            <name>margin</name>
+                            <number>0</number>
+                        </property>
+                        <property stdset="1">
+                            <name>spacing</name>
+                            <number>6</number>
+                        </property>
+                        <widget>
+                            <class>QLabel</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>TextLabel4</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>text</name>
+                                <string>Mac</string>
+                            </property>
+                        </widget>
+                        <widget>
+                            <class>QLineEdit</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>m_macAddress</cstring>
+                            </property>
+                        </widget>
+                        <widget>
+                            <class>QLabel</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>TextLabel5</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>text</name>
+                                <string>Channel</string>
+                            </property>
+                        </widget>
+                        <widget>
+                            <class>QComboBox</class>
+                            <item>
+                                <property>
+                                    <name>text</name>
+                                    <string>0</string>
+                                </property>
+                            </item>
+                            <item>
+                                <property>
+                                    <name>text</name>
+                                    <string>1</string>
+                                </property>
+                            </item>
+                            <item>
+                                <property>
+                                    <name>text</name>
+                                    <string>2</string>
+                                </property>
+                            </item>
+                            <item>
+                                <property>
+                                    <name>text</name>
+                                    <string>3</string>
+                                </property>
+                            </item>
+                            <item>
+                                <property>
+                                    <name>text</name>
+                                    <string>4</string>
+                                </property>
+                            </item>
+                            <item>
+                                <property>
+                                    <name>text</name>
+                                    <string>5</string>
+                                </property>
+                            </item>
+                            <item>
+                                <property>
+                                    <name>text</name>
+                                    <string>6</string>
+                                </property>
+                            </item>
+                            <item>
+                                <property>
+                                    <name>text</name>
+                                    <string>7</string>
+                                </property>
+                            </item>
+                            <item>
+                                <property>
+                                    <name>text</name>
+                                    <string>8</string>
+                                </property>
+                            </item>
+                            <item>
+                                <property>
+                                    <name>text</name>
+                                    <string>9</string>
+                                </property>
+                            </item>
+                            <item>
+                                <property>
+                                    <name>text</name>
+                                    <string>10</string>
+                                </property>
+                            </item>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>m_channelDropdown</cstring>
+                            </property>
+                        </widget>
+                    </hbox>
+                </widget>
+                <widget row="1"  column="0" >
+                    <class>QLayoutWidget</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>Layout4</cstring>
+                    </property>
+                    <hbox>
+                        <property stdset="1">
+                            <name>margin</name>
+                            <number>0</number>
+                        </property>
+                        <property stdset="1">
+                            <name>spacing</name>
+                            <number>6</number>
+                        </property>
+                        <widget>
+                            <class>QLabel</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>TextLabel3</cstring>
+                            </property>
+                            <property stdset="1">
+                                <name>text</name>
+                                <string>Comment:</string>
+                            </property>
+                        </widget>
+                        <widget>
+                            <class>QLineEdit</class>
+                            <property stdset="1">
+                                <name>name</name>
+                                <cstring>m_commentLine</cstring>
+                            </property>
+                        </widget>
+                    </hbox>
+                </widget>
+            </grid>
+        </widget>
+    </vbox>
+</widget>
+</UI>
diff --git a/noncore/net/opietooth/manager/rfcpopup.cpp b/noncore/net/opietooth/manager/rfcpopup.cpp
index cc87b6c..d95f14b 100644
--- a/noncore/net/opietooth/manager/rfcpopup.cpp
+++ b/noncore/net/opietooth/manager/rfcpopup.cpp
@@ -1,85 +1,96 @@
 
 #include <qtimer.h>
 
 #include "pppdialog.h"
 #include "rfcpopup.h"
+#include "rfcommassigndialogimpl.h"
 
 using namespace OpieTooth;
 
 /*
  * c'tor init the QAction
  */
-RfcCommPopup::RfcCommPopup()
+RfcCommPopup::RfcCommPopup( OpieTooth::BTDeviceItem* item  )
     : QPopupMenu()  {
     qWarning("RfcCommPopup c'tor");
 
     QAction* a;
 
+
+    m_item = item;
+
     /* connect action */
     a = new QAction(  ); // so it's get deleted
     a->setText("Connect");
     a->addTo( this );
     connect( a,  SIGNAL( activated() ),
              this, SLOT( slotConnect() ) );
 
 
     /* disconnect action */
     a = new QAction(  );
     a->setText("Disconnect");
     a->addTo( this );
     connect( a, SIGNAL( activated() ) ,
             this, SLOT( slotDisconnect() ) );
 
 
     /* foo action */
     a = new QAction(  );
-    a->setText("Foo");
+    a->setText("Bind table");
     a->addTo( this );
     connect( a, SIGNAL( activated() ),
-            this, SLOT( slotFoo() ) );
+            this, SLOT( slotBind() ) );
 
 
     /* bar action */
     a = new QAction(  );
     a->setText( "Bar" );
     a->addTo( this );
     connect( a, SIGNAL( activated() ),
             this, SLOT( slotBar() ) );
 
 };
 
 
 RfcCommPopup::~RfcCommPopup() {
 /*  delete m_con;
     delete m_dis;
     delete m_foo;
     delete m_bar; */
 }
 
 
 void RfcCommPopup::slotConnect() {
 
     qWarning("connect");
 
 
 
     PPPDialog pppDialog;
     pppDialog.showMaximized();
     pppDialog.exec();
 }
 
 
 void RfcCommPopup::slotDisconnect() {
     qWarning("slot disconnected");
 }
 
 
-void RfcCommPopup::slotFoo() {
-    qWarning("slotFoo");
+void RfcCommPopup::slotBind() {
+    RfcommAssignDialog rfcommAssign ( this, "RfcommAssignDialog", true, WStyle_ContextHelp  );
+
+    rfcommAssign.showMaximized();
+    rfcommAssign.newDevice( m_item->mac() );
+
+    if ( rfcommAssign.exec() == QDialog::Accepted )  {
+        rfcommAssign.saveConfig();
+    }
 }
 
 
 void RfcCommPopup::slotBar() {
     qWarning("slotBar");
 };
 
diff --git a/noncore/net/opietooth/manager/rfcpopup.h b/noncore/net/opietooth/manager/rfcpopup.h
index c388f65..74b9117 100644
--- a/noncore/net/opietooth/manager/rfcpopup.h
+++ b/noncore/net/opietooth/manager/rfcpopup.h
@@ -1,36 +1,39 @@
 #ifndef RFCPOPUP_H
 #define RFCPOPUP_H
 
 #include <qpopupmenu.h>
 #include <qaction.h>
 
+#include "btdeviceitem.h"
+
 namespace OpieTooth {
     /**
      * A simple reference implementation for
      * the popup helper factory.
      * This class derives from QPopupMenu and uses
      * plugged QActions to do all the nasty in it's
      * slots. After the work is done everything must
      * be deleted.
      */
     class RfcCommPopup : public QPopupMenu {
         Q_OBJECT
     public:
-        RfcCommPopup();
+        RfcCommPopup( OpieTooth::BTDeviceItem* );
         ~RfcCommPopup();
 
 
     private:
         QAction* m_con;
         QAction* m_dis;
-        QAction* m_foo;
+        QAction* m_bind;
         QAction* m_bar;
+        OpieTooth::BTDeviceItem *m_item;
     private slots:
         void slotConnect();
         void slotDisconnect();
-        void slotFoo();
+        void slotBind();
         void slotBar();
     };
 };
 
 #endif
diff --git a/noncore/net/opietooth/manager/stdpopups.cpp b/noncore/net/opietooth/manager/stdpopups.cpp
index 38b8ee7..e1f8396 100644
--- a/noncore/net/opietooth/manager/stdpopups.cpp
+++ b/noncore/net/opietooth/manager/stdpopups.cpp
@@ -1,26 +1,26 @@
 
 #include "rfcpopup.h"
 #include "obexpopup.h"
 #include "panpopup.h"
 #include "dunpopup.h"
 
 #include "stdpopups.h"
 
 extern "C" {
 
     QPopupMenu* newRfcComPopup( const OpieTooth::Services& service,  OpieTooth::BTDeviceItem* item ) {
-        return new OpieTooth::RfcCommPopup(/* servive,  item*/ ); // fix spellin RfComm vs. RfcComm and paramaters
+        return new OpieTooth::RfcCommPopup(/* servive,*/  item ); // fix spellin RfComm vs. RfcComm and paramaters
         //return 0l;
     }
     QPopupMenu* newObexPushPopup( const OpieTooth::Services&,  OpieTooth::BTDeviceItem* ) {
         return  new OpieTooth::ObexPopup();
     }
     QPopupMenu* newPanPopup( const OpieTooth::Services& service,  OpieTooth::BTDeviceItem* item ) {
         return new OpieTooth::PanPopup( item );
     }
 
     QPopupMenu* newDunPopup( const OpieTooth::Services& service,  OpieTooth::BTDeviceItem* item ) {
         return new OpieTooth::DunPopup( item );
     }
 }
 
diff --git a/noncore/net/ubrowser/main.cpp b/noncore/net/ubrowser/main.cpp
index e4a873d..0488cfd 100644
--- a/noncore/net/ubrowser/main.cpp
+++ b/noncore/net/ubrowser/main.cpp
@@ -1,29 +1,24 @@
 /*
 Opie-uBrowser.  a very small web browser, using on QTextBrowser for html display/parsing
 Copyright (C) 2002 Thomas Stephens
 
 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public
 License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later
 version.
 
 This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
 implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
 Public License for more details.
 
 You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
 Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
 #include <qpe/qpeapplication.h>
 
 #include "mainview.h"
 
-int main( int argc, char **argv )
-{
-        QPEApplication a( argc, argv );
-        MainView w;
-
-        //a.setMainWidget( &w );
-        a.showMainDocumentWidget( &w );
-         return a.exec();
-}
+#include <opie/oapplicationfactory.h>
+
+OPIE_EXPORT_APP( OApplicationFactory<MainView> )
+
diff --git a/noncore/net/ubrowser/mainview.cpp b/noncore/net/ubrowser/mainview.cpp
index 9302f05..0d3f171 100644
--- a/noncore/net/ubrowser/mainview.cpp
+++ b/noncore/net/ubrowser/mainview.cpp
@@ -1,44 +1,44 @@
 /*
 Opie-uBrowser.  a very small web browser, using on QTextBrowser for html display/parsing
 Copyright (C) 2002 Thomas Stephens
 
 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public
 License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later
 version.
 
 This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
 implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
 Public License for more details.
 
 You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
 Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
 
 #include "mainview.h"
 
-MainView::MainView(QWidget *parent, const char *name) : QMainWindow(parent, name)
+MainView::MainView(QWidget *parent, const char *name, WFlags fl) : QMainWindow(parent, name, fl)
 {
         setIcon( Resource::loadPixmap( "remote" ) );
         setCaption(tr("uBrowser"));
         
         setToolBarsMovable( false );
 
         QPEToolBar *toolbar = new QPEToolBar(this, "toolbar");
         back = new QToolButton(Resource::loadPixmap("ubrowser/back"), 0, 0, 0, 0, toolbar, "back");
         forward = new QToolButton(Resource::loadPixmap("ubrowser/forward"), 0, 0, 0, 0, toolbar, "forward");
         home = new QToolButton(Resource::loadPixmap("ubrowser/home"), 0, 0, 0, 0, toolbar, "home");
         location = new QComboBox(true, toolbar, "location");
         go = new QToolButton(Resource::loadPixmap("ubrowser/go"), 0, 0, 0, 0, toolbar, "go");
 
         toolbar->setStretchableWidget(location);
         toolbar->setHorizontalStretchable(true);
         location->setAutoCompletion( true );
 
         addToolBar(toolbar);
 
         browser = new QTextBrowser(this, "browser");
         setCentralWidget(browser);
 
 //make the button take you to the location
         connect(go, SIGNAL(clicked()), this, SLOT(goClicked()) );
diff --git a/noncore/net/ubrowser/mainview.h b/noncore/net/ubrowser/mainview.h
index 20e2c70..cc63729 100644
--- a/noncore/net/ubrowser/mainview.h
+++ b/noncore/net/ubrowser/mainview.h
@@ -15,38 +15,39 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
 #include <qpe/resource.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/applnk.h>
 
 #include <qapplication.h>
 #include <qmainwindow.h>
 #include <qwidget.h>
 #include <qtextbrowser.h>
 #include <qtoolbutton.h>
 #include <qcombobox.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qdir.h>
 
 #include <stdio.h>
 
 #include "httpfactory.h"
 
 class MainView : public QMainWindow
 {
         Q_OBJECT
 public:
-        MainView(QWidget *parent=0, const char *name=0);
+        static QString appName() { return QString::fromLatin1("ubrowser"); }
+        MainView(QWidget *parent=0, const char *name=0, WFlags fl = 0);
 public slots:
         void goClicked();
         void textChanged();
         void setDocument( const QString& applnk_filename );
 private:
         QToolButton *back;
         QToolButton *forward;
         QToolButton *home;
         QToolButton *go;
         QComboBox *location;
         QTextBrowser *browser;
         HttpFactory *http;
 };
diff --git a/noncore/net/ubrowser/ubrowser.pro b/noncore/net/ubrowser/ubrowser.pro
index a6943dd..ed00047 100644
--- a/noncore/net/ubrowser/ubrowser.pro
+++ b/noncore/net/ubrowser/ubrowser.pro
@@ -1,13 +1,11 @@
-        TEMPLATE=app
-        CONFIG  +=qt warn_on release
-        DESTDIR         =../../../bin
+        CONFIG  +=qt warn_on release quick-app
         HEADERS         = mainview.h httpfactory.h
         SOURCES         = main.cpp mainview.cpp httpfactory.cpp
         INCLUDEPATH+=../../../include
         DEPENDPATH+=../../../include
         LIBS    += -lqpe
 TARGET          = ubrowser
 
 
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/unsupported/mailit/emailclient.cpp b/noncore/unsupported/mailit/emailclient.cpp
index 90664bb..8359acf 100644
--- a/noncore/unsupported/mailit/emailclient.cpp
+++ b/noncore/unsupported/mailit/emailclient.cpp
@@ -21,1022 +21,1022 @@
 #include <qmessagebox.h>
 #include <qvbox.h>
 #include <qfile.h>
 #include <qcheckbox.h>
 #include <qmenubar.h>
 #include <qaction.h>
 #include <qwhatsthis.h>
 #include <qpe/resource.h>
 #include "emailclient.h"
 #include "writemail.h"
 
 QCollection::Item AccountList::newItem(QCollection::Item d)
 {
   return dupl( (MailAccount *) d);
 }
 
 MailAccount* AccountList::dupl(MailAccount *in)
 {
   ac = new MailAccount(*in);
   return ac;
 }
 
 EmailClient::EmailClient( QWidget* parent,  const char* name, WFlags fl )
   : QMainWindow( parent, name, fl )
-{ 
+{
   emailHandler = new EmailHandler();
   addressList = new AddressList();
-  
+
   sending = FALSE;
   receiving = FALSE;
   previewingMail = FALSE;
   mailIdCount = 1;
   accountIdCount = 1;
   allAccounts = FALSE;
-  
+
   init();
-  
- 
-  
+
+
+
   connect(emailHandler, SIGNAL(mailSent()), this, SLOT(mailSent()) );
-  
+
   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()) );
 
   connect(emailHandler, SIGNAL(mailArrived(const Email &, bool)), this,
       SLOT(mailArrived(const Email &, bool)) );
   connect(emailHandler, SIGNAL(mailTransfered(int)), this,
       SLOT(allMailArrived(int)) );
-  
+
   mailconf = new Config("mailit");
   //In case Synchronize is not defined in settings.txt
 
   readSettings();
-  
+
   updateAccounts();
-      
+
   lineShift = "\n";
   readMail();
   lineShift = "\r\n";
-  
+
   mailboxView->setCurrentTab(0);  //ensure that inbox has focus
-  
+
   /*channel = new QCopChannel( "QPE/Application/mailit", this );
   connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
         this, SLOT(receive(const QCString&, const QByteArray&)) );*/
 
 }
 
 
 EmailClient::~EmailClient()
 {
   //needs to be moved from destructor to closewindow event
   saveMail(getPath(FALSE) + "inbox.txt", inboxView);
   //does not currently work.  Defining outbox in the same
   //format as inbox is not a good solution as they have
   //different properties
   saveMail(getPath(FALSE) + "outbox.txt", outboxView);
   saveSettings();
-  
+
   mailconf->write();
   delete mailconf;
-  
+
 }
 
 void EmailClient::init()
 {
   initStatusBar(this);
-   
+
   setToolBarsMovable(FALSE);
-  
+
   bar = new QToolBar(this);
   QWhatsThis::add(bar,tr("Main operation toolbar"));
   bar->setHorizontalStretchable( TRUE );
 
   mb = new QMenuBar( bar );
 
   QPopupMenu *mail = new QPopupMenu(mb);
   mb->insertItem( tr( "&Mail" ), mail);
 
   QPopupMenu *configure = new QPopupMenu(mb);
   mb->insertItem( tr( "Accounts" ), configure);
-  
+
   selectAccountMenu = new QPopupMenu(mb);
   editAccountMenu = new QPopupMenu(mb);
   deleteAccountMenu = new QPopupMenu(mb);
 
   mail->insertItem(tr("Get Mail in"), selectAccountMenu);
   configure->insertItem(tr("Edit account"), editAccountMenu);
   configure->insertItem(tr("Delete account"), deleteAccountMenu);
 
   bar = new QToolBar(this);
 
   getMailButton = new QToolButton(Resource::loadPixmap("mailit/getmail"),tr("getMail"),tr("select account"), this,SLOT(getAllNewMail()),bar);
   QWhatsThis::add(getMailButton,tr("Click to download mail via all available accounts.\n Press and hold to select the desired account."));
 
   getMailButton->setPopup(selectAccountMenu);
-      
+
   sendMailButton = new QAction(tr("Send mail"), Resource::loadPixmap("mailit/sendqueue"), QString::null, 0, this, 0);
   connect(sendMailButton, SIGNAL(activated()), this, SLOT(sendQuedMail()) );
   sendMailButton->addTo(bar);
   sendMailButton->addTo(mail);
   sendMailButton->setWhatsThis("Send mail queued in the outbox");
-    
+
   composeButton = new QAction(tr("Compose"), Resource::loadPixmap("new"), QString::null, 0, this, 0);
   connect(composeButton, SIGNAL(activated()), this, SLOT(compose()) );
   composeButton->addTo(bar);
   composeButton->addTo(mail);
   composeButton->setWhatsThis("Compose a new mail");
-  
+
   cancelButton = new QAction(tr("Cancel transfer"), Resource::loadPixmap("close"), QString::null, 0, this, 0);
   connect(cancelButton, SIGNAL(activated()), this, SLOT(cancel()) );
   cancelButton->addTo(mail);
   cancelButton->addTo(bar);
   cancelButton->setEnabled(FALSE);
   cancelButton->setWhatsThis("Stop the currently active mail transfer");
-  
-  
+
+
   deleteButton = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ), QString::null, 0, this, 0 );
   connect( deleteButton, SIGNAL( activated() ), this, SLOT( deleteItem() ) );
   deleteButton->addTo(bar);
   deleteButton->setWhatsThis("Remove the currently selected eMail(s)");
-  
+
   mailboxView = new OTabWidget( this, "mailboxView" );
 
   QWidget* widget = new QWidget( mailboxView, "widget" );
   grid_2 = new QGridLayout( widget );
 //  grid_2->setSpacing(6);
 //  grid_2->setMargin( 11 );
 
   inboxView = new QListView( widget, "inboxView" );
   inboxView->addColumn( tr( "From" ) );
   inboxView->addColumn( tr( "Subject" ) );
   inboxView->addColumn( tr( "Date" ) );
   inboxView->setMinimumSize( QSize( 0, 0 ) );
   inboxView->setAllColumnsShowFocus(TRUE);
   QWhatsThis::add(inboxView,QWidget::tr("This is the inbox view.\n"
   "It keeps the fetched mail which can be \n"
   "viewed by double clicking the entry.\n"
   "blue attachment icon shows whether this \n"
   "mailhas attachments.\n"));
 
   grid_2->addWidget( inboxView, 2, 0 );
   mailboxView->addTab( widget, "mailit/inbox", tr( "Inbox" ) );
 
   QWidget* widget_2 = new QWidget( mailboxView, "widget_2" );
   grid_3 = new QGridLayout( widget_2 );
 //  grid_3->setSpacing(6);
 //  grid_3->setMargin( 11 );
 
   outboxView = new QListView( widget_2, "outboxView" );
   outboxView->addColumn( tr( "To" ) );
   outboxView->addColumn( tr( "Subject" ) );
   outboxView->setAllColumnsShowFocus(TRUE);
 
   QWhatsThis::add(outboxView,QWidget::tr("This is the outbox view.\n"
   "It keeps the queued mails to send which can be \n"
   "reviewed by double clicking the entry."));
   grid_3->addWidget( outboxView, 0, 0 );
   mailboxView->addTab( widget_2,"mailit/outbox", tr( "Outbox" ) );
-  
+
   setCentralWidget(mailboxView);
-  
+
 }
 
 void EmailClient::initStatusBar(QWidget* parent)
 {
   statusBar = new QStatusBar(parent);
   statusBar->setSizeGripEnabled(FALSE);
-  
+
   status1Label = new QLabel( tr("Idle"), statusBar);
   status2Label = new QLabel("", statusBar);
   connect(emailHandler, SIGNAL(updatePopStatus(const QString &)),
     status2Label, SLOT(setText(const QString &)) );
   connect(emailHandler, SIGNAL(updateSmtpStatus(const QString &)),
     status2Label, SLOT(setText(const QString &)) );
-  
+
   progressBar = new QProgressBar(statusBar);
 
   connect(emailHandler, SIGNAL(mailboxSize(int)),
     this, SLOT(setTotalSize(int)) );
   connect(emailHandler, SIGNAL(currentMailSize(int)),
     this, SLOT(setMailSize(int)) );
   connect(emailHandler, SIGNAL(downloadedSize(int)),
     this, SLOT(setDownloadedSize(int)) );
 
   statusBar->addWidget(status1Label);
   statusBar->addWidget(progressBar);
   statusBar->addWidget(status2Label);
 
 }
 
 void EmailClient::compose()
 {
   emit composeRequested();
 }
 
 void EmailClient::cancel()
 {
   emailHandler->cancel();
 }
 
 AddressList* EmailClient::getAdrListRef()
 {
   return addressList;
 }
 
 //this needs to be rewritten to syncronize with outboxView
 void EmailClient::enqueMail(const Email &mail)
 {
  if (accountList.count() == 0) {
     QMessageBox::warning(qApp->activeWindow(),
       tr("No account selected"), tr("You must create an account"), "OK\n");
     return;
   }
-   
+
   if (accountList.count() > 0) {
     currentAccount = accountList.first();
     qWarning("using account " + currentAccount->name);
   }
-  
+
   Email addMail = mail;
   addMail.from = currentAccount->name;
   addMail.fromMail = currentAccount->emailAddress;
   addMail.rawMail.prepend("From: \"" + addMail.from + "\" <" + addMail.fromMail + ">\n");
   item = new EmailListItem(outboxView, addMail, false);
-  
+
   mailboxView->setCurrentTab(1);
-  
+
 }
 
 void EmailClient::sendQuedMail()
 {
   int count = 0;
 
   if (accountList.count() == 0) {
-    QMessageBox::warning(qApp->activeWindow(), "No account selected", "You must create an account", "OK\n");
+    QMessageBox::warning(qApp->activeWindow(), tr("No account selected"), tr("You must create an account"), "OK\n");
     return;
   }
   //traverse listview, find messages to send
   if (! sending) {
     item = (EmailListItem *) outboxView->firstChild();
     if (item != NULL) {
       while (item != NULL) {
         quedMessages.append(item->getMail());
         item = (EmailListItem *) item->nextSibling();
         count++;
       }
       setMailAccount();
       emailHandler->sendMail(&quedMessages);
       sending = TRUE;
       sendMailButton->setEnabled(FALSE);
       cancelButton->setEnabled(TRUE);
     } else {
       qWarning("sendQuedMail(): no messages to send");
     }
   }
 }
 
 void EmailClient::setMailAccount()
 {
   emailHandler->setAccount(*currentAccount);
 }
 
 void EmailClient::mailSent()
 {
   sending = FALSE;
   sendMailButton->setEnabled(TRUE);
-  
+
   quedMessages.clear();
   outboxView->clear();    //should be moved to an sentBox
 }
 
 void EmailClient::getNewMail() {
-  
+
   if (accountList.count() == 0) {
-    QMessageBox::warning(qApp->activeWindow(),"No account selected",
-      "You must create an account", "OK\n");
+    QMessageBox::warning(qApp->activeWindow(),tr("No account selected"),
+      tr("You must create an account"), "OK\n");
     return;
   }
-  
+
   setMailAccount();
-  
+
   receiving = TRUE;
   previewingMail = TRUE;
   getMailButton->setEnabled(FALSE);
   cancelButton->setEnabled(TRUE);
   selectAccountMenu->setEnabled(FALSE);
-  
+
   status1Label->setText(currentAccount->accountName + " headers");
   progressBar->reset();
-    
+
   //get any previous mails not downloaded and add to queue
   /*mailDownloadList.clear();
   Email *mailPtr;
   item = (EmailListItem *) inboxView->firstChild();
   while (item != NULL) {
     mailPtr = item->getMail();
     if ( (!mailPtr->downloaded) && (mailPtr->fromAccountId == currentAccount->id) ) {
       mailDownloadList.sizeInsert(mailPtr->serverId, mailPtr->size);
     }
     item = (EmailListItem *) item->nextSibling();
   }*/
-  
+
   emailHandler->getMailHeaders();
-  
+
 }
 
 void EmailClient::getAllNewMail()
 {
   allAccounts = TRUE;
   currentAccount = accountList.first();
-  getNewMail();  
+  getNewMail();
 }
 
 void EmailClient::mailArrived(const Email &mail, bool fromDisk)
 {
   Enclosure *ePtr;
   Email newMail;
   int thisMailId;
   emailHandler->parse( mail.rawMail, lineShift, &newMail);
   mailconf->setGroup(newMail.id);
-  
-  if (fromDisk) 
+
+  if (fromDisk)
   {
-    
+
     newMail.downloaded = mailconf->readBoolEntry("downloaded");
     newMail.size = mailconf->readNumEntry("size");
     newMail.serverId = mailconf->readNumEntry("serverid");
     newMail.fromAccountId = mailconf->readNumEntry("fromaccountid");
-  } 
-  else 
+  }
+  else
   {  //mail arrived from server
-  
+
     newMail.serverId = mail.serverId;
     newMail.size = mail.size;
     newMail.downloaded = mail.downloaded;
-    
+
     newMail.fromAccountId = emailHandler->getAccount()->id;
     mailconf->writeEntry("fromaccountid", newMail.fromAccountId);
   }
-  
+
   //add if read or not
   newMail.read = mailconf->readBoolEntry("mailread");
-    
+
   //check if new mail
   if ( (thisMailId = mailconf->readNumEntry("internalmailid", -1)) == -1) {
     thisMailId = mailIdCount;
     mailIdCount++;
-    
+
     //set server count, so that if the user aborts, the new
     //header is not reloaded
     if ((currentAccount)&&(currentAccount->synchronize))
       currentAccount->lastServerMailCount++;
-    
+
     mailconf->writeEntry("internalmailid", thisMailId);
     mailconf->writeEntry("downloaded", newMail.downloaded);
     mailconf->writeEntry("size", (int) newMail.size);
     mailconf->writeEntry("serverid", newMail.serverId);
-    
+
     //addressList->addContact(newMail.fromMail, newMail.from);
   }
-  
+
   mailconf->writeEntry("downloaded", newMail.downloaded);
-  
+
   QString stringMailId;
   stringMailId.setNum(thisMailId);
   //see if any attatchments needs to be stored
-  
+
   for ( ePtr=newMail.files.first(); ePtr != 0; ePtr=newMail.files.next() ) {
     QString stringId;
     stringId.setNum(ePtr->id);
-    
+
     int id = mailconf->readNumEntry("enclosureid_" + stringId);
     if (id != ePtr->id) {     //new entry
       mailconf->writeEntry("enclosureid_" + stringId, ePtr->id);
       mailconf->writeEntry("name_" + stringId, ePtr->originalName);
       mailconf->writeEntry("contenttype_" + stringId, ePtr->contentType);
       mailconf->writeEntry("contentattribute_" + stringId, ePtr->contentAttribute);
       mailconf->writeEntry("saved_" + stringId, ePtr->saved);
       mailconf->writeEntry("installed_" + stringId, FALSE);
-      
+
             ePtr->name = stringMailId + "_" + stringId;
             ePtr->path = getPath(TRUE);
             if (emailHandler->getEnclosure(ePtr)) { //file saved
         ePtr->saved = TRUE;
         mailconf->writeEntry("saved_" + stringId, ePtr->saved);
         mailconf->writeEntry("filename_" + stringId, ePtr->name);
         mailconf->writeEntry("path_" + stringId, ePtr->path);
             } else {
               ePtr->saved = FALSE;
         mailconf->writeEntry("saved_" + stringId, ePtr->saved);
             }
     } else {
       ePtr->saved = mailconf->readBoolEntry("saved_" + stringId);
       ePtr->installed = mailconf->readBoolEntry("installed_" + stringId);
       if (ePtr->saved) {
         ePtr->name = mailconf->readEntry("filename_" + stringId);
         ePtr->path = mailconf->readEntry("path_" + stringId);
-      }   
+      }
     }
   }
 
   bool found=false;
-  
-  if (!fromDisk) 
+
+  if (!fromDisk)
   {
-    
+
     Email *mailPtr;
     item = (EmailListItem *) inboxView->firstChild();
-    while ((item != NULL)&&(!found)) 
+    while ((item != NULL)&&(!found))
     {
       mailPtr = item->getMail();
       if (mailPtr->id == newMail.id) {
         item->setMail(newMail);
         emit mailUpdated(item->getMail());
         found = true;
       }
       item = (EmailListItem *) item->nextSibling();
     }
   }
   if ((!found)||(fromDisk)) {
      item = new EmailListItem(inboxView, newMail, TRUE);
   }
 //        if (item->getMail()->files.count()>0)
 //        {
 //        item->setPixmap(0, Resource::loadPixmap("mailit/attach"));
-//        }  
+//        }
     /*if (!newMail.downloaded)
       mailDownloadList.sizeInsert(newMail.serverId, newMail.size);*/
-  
+
   mailboxView->setCurrentTab(0);
-  
+
 }
 
 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();
       return;
     } else {
       allAccounts = FALSE;
       receiving = FALSE;
       getMailButton->setEnabled(TRUE);
       cancelButton->setEnabled(FALSE);
       selectAccountMenu->setEnabled(TRUE);
       status1Label->setText("Idle");
-  
+
       progressBar->reset();
       return;
     }
   //}
-  
+
   // all headers downloaded from server, start downloading remaining mails
   previewingMail = FALSE;
   status1Label->setText(currentAccount->accountName);
   progressBar->reset();
 
-   
+
   mailboxView->setCurrentTab(0);
 }
 
 
 void EmailClient::moveMailFront(Email *mailPtr)
 {
   if ( (receiving) && (mailPtr->fromAccountId == currentAccount->id) ) {
     mailDownloadList.moveFront(mailPtr->serverId, mailPtr->size);
   }
 }
 
 void EmailClient::smtpError(int code, const QString & Msg)
 {
   QString temp;
-  
+
   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");
   }
-  
+
   sending = FALSE;
   sendMailButton->setEnabled(TRUE);
   cancelButton->setEnabled(FALSE);
   quedMessages.clear();
 }
 
 void EmailClient::popError(int code, const QString & Msg)
 {
   QString temp;
-  
+
    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(), tr("Receiving error"), temp, tr("OK\n"));
 
   } else {
     status2Label->setText("Aborted by user");
   }
-  
+
   receiving = FALSE;
   getMailButton->setEnabled(TRUE);
   cancelButton->setEnabled(FALSE);
   selectAccountMenu->setEnabled(TRUE);
 }
 
 void EmailClient::inboxItemSelected()
 {
   //killTimer(timerID);
-  
+
   item = (EmailListItem*) inboxView->selectedItem();
   if (item != NULL) {
     emit viewEmail(inboxView, item->getMail());
   }
 }
 
 void EmailClient::outboxItemSelected()
 {
   //killTimer(timerID);
-  
+
   item = (EmailListItem*) outboxView->selectedItem();
   if (item != NULL) {
     emit viewEmail(outboxView, item->getMail());
   }
 
 }
 
 void EmailClient::readMail()
 {
   Email mail;
   int start, stop;
   QString s, del;
 
   QFile f(getPath(FALSE) + "inbox.txt");
-  
+
   if ( f.open(IO_ReadOnly) ) {    // file opened successfully
     QTextStream t( &f );        // use a text stream
     s = t.read();
     f.close();
-    
+
     start = 0;
     del = "\n.\n";
     while ((uint) start < s.length()) {
       stop = s.find(del, start);
       if (stop == -1)
         stop = s.length() - del.length();
-    
+
       mail.rawMail = s.mid(start, stop + del.length() - start );
       start = stop + del.length();
       mailArrived(mail, TRUE);
     }
   }
-  
+
   QFile fo(getPath(FALSE) + "outbox.txt");
   if ( fo.open(IO_ReadOnly) ) {    // file opened successfully
     QTextStream t( &fo );        // use a text stream
     s = t.read();
     fo.close();
-    
+
     start = 0;
     del = "\n.\n";
     while ((uint) start < s.length()) {
       stop = s.find(del, start);
       if (stop == -1)
         stop = s.length() - del.length();
-    
+
       mail.rawMail = s.mid(start, stop + del.length() - start );
       start = stop + del.length();
       emailHandler->parse(mail.rawMail, lineShift, &mail);
       mail.sent = false;
       mail.received = false;
           enqueMail(mail);
-      
+
     }
   }
 }
 
 void EmailClient::saveMail(const QString &fileName, QListView *view)
 {
   QFile f(fileName);
   Email *mail;
-  
+
   if (! f.open(IO_WriteOnly) ) {
     qWarning("could not open file");
     return;
   }
   item = (EmailListItem *) view->firstChild();
   QTextStream t(&f);
   while (item != NULL) {
     mail = item->getMail();
     t << mail->rawMail;
-    
+
     mailconf->setGroup(mail->id);
     mailconf->writeEntry("mailread", mail->read);
-    
+
     item = (EmailListItem *) item->nextSibling();
   }
   f.close();
 }
 
 //paths for mailit, is settings, inbox, enclosures
 QString EmailClient::getPath(bool enclosurePath)
 {
   QString basePath = "qtmail";
   QString enclosures = "enclosures";
-  
+
   QDir dir = (QString(getenv("HOME")) + "/Applications/" + basePath);
   if ( !dir.exists() )
     dir.mkdir( dir.path() );
-  
+
   if (enclosurePath) {
     dir = (QString(getenv("HOME")) + "/Applications/" + basePath + "/" + enclosures);
-    
+
     if ( !dir.exists() )
       dir.mkdir( dir.path() );
-    
+
     return (dir.path() + "/");
-  
+
   }
   return (dir.path() + "/");
 }
 
 void EmailClient::readSettings()
 {
   int y,acc_count;
-    
+
     mailconf->setGroup("mailitglobal");
     acc_count=mailconf->readNumEntry("Accounts",0);
-    
-    for (int accountPos = 0;accountPos<acc_count ; accountPos++) 
+
+    for (int accountPos = 0;accountPos<acc_count ; accountPos++)
     {
-      mailconf->setGroup("Account_"+QString::number(accountPos+1));    //Account numbers start at 1 ...      
+      mailconf->setGroup("Account_"+QString::number(accountPos+1));    //Account numbers start at 1 ...
       account.accountName = mailconf->readEntry("AccName","");
       account.name = mailconf->readEntry("UserName","");
       account.emailAddress = mailconf->readEntry("Email","");
       account.popUserName = mailconf->readEntry("POPUser","");
       account.popPasswd = mailconf->readEntryCrypt("POPPassword","");
       account.popServer = mailconf->readEntry("POPServer","");
       account.smtpServer = mailconf->readEntry("SMTPServer","");
       account.id = mailconf->readNumEntry("AccountId",0);
       account.syncLimit = mailconf->readNumEntry("HeaderLimit",0);
       account.lastServerMailCount = 0;
       account.synchronize = FALSE;
-    
+
       account.synchronize = (mailconf->readEntry("Synchronize","No")=="Yes");
       if (account.synchronize)
       {
-      mailconf->readNumEntry("LASTSERVERMAILCOUNT",0); 
+      mailconf->readNumEntry("LASTSERVERMAILCOUNT",0);
       }
-      
+
       accountList.append(&account);
     }
-  
+
   mailconf->setGroup("mailitglobal");
-  
-  if ( (y = mailconf->readNumEntry("mailidcount", -1)) != -1) 
+
+  if ( (y = mailconf->readNumEntry("mailidcount", -1)) != -1)
   {
     mailIdCount = y;
   }
-  if ( (y = mailconf->readNumEntry("accountidcount", -1)) != -1) 
+  if ( (y = mailconf->readNumEntry("accountidcount", -1)) != -1)
   {
     accountIdCount = y;
   }
 }
 
 void EmailClient::saveSettings()
 {
   int acc_count=0;
   MailAccount *accountPtr;
 
-    
-  if (!mailconf) 
+
+  if (!mailconf)
   {
     qWarning("could not save settings");
     return;
   }
-  
+
   for (accountPtr = accountList.first(); accountPtr != 0;
-      accountPtr = accountList.next()) 
+      accountPtr = accountList.next())
   {
     mailconf->setGroup("Account_"+QString::number(++acc_count));
     mailconf->writeEntry("AccName",accountPtr->accountName );
     mailconf->writeEntry("UserName",accountPtr->name);
     mailconf->writeEntry("Email",accountPtr->emailAddress);
     mailconf->writeEntry("POPUser",accountPtr->popUserName);
     mailconf->writeEntryCrypt("POPPassword",accountPtr->popPasswd);
     mailconf->writeEntry("POPServer",accountPtr->popServer);
     mailconf->writeEntry("SMTPServer",accountPtr->smtpServer);
     mailconf->writeEntry("AccountId",accountPtr->id);
-    if (accountPtr->synchronize) 
+    if (accountPtr->synchronize)
     {
       mailconf->writeEntry("Synchronize","Yes");
       mailconf->writeEntry("HeaderLimit",accountPtr->syncLimit);
       mailconf->writeEntry("LastServerMailCount",accountPtr->lastServerMailCount);
-    } 
-    else 
+    }
+    else
     {
       mailconf->writeEntry("Synchronize", "No");
     }
   }
-  
+
   mailconf->setGroup("mailitglobal");
   mailconf->writeEntry("Accounts",acc_count);
   mailconf->writeEntry("mailidcount", mailIdCount);
   mailconf->writeEntry("accountidcount", accountIdCount);
 }
 
 void EmailClient::selectAccount(int id)
 {
   if (accountList.count() > 0) {
     currentAccount = accountList.at(id);
     emit newCaption("Mailit - " + currentAccount->accountName);
     getNewMail();
   } else {
-    emit newCaption("Mailit ! No account defined");
+    emit newCaption( tr("Mailit ! No account defined") );
   }
 }
 
 void EmailClient::editAccount(int id)
 {
   MailAccount *newAccount;
-    
+
   editAccountView = new EditAccount(this, "account", TRUE);
   if (id == newAccountId) {   //new account
     newAccount = new MailAccount;
     editAccountView->setAccount(newAccount);
   } else {
     newAccount = accountList.at(id);
     editAccountView->setAccount(newAccount, FALSE);
   }
-  
+
   editAccountView->showMaximized();
   editAccountView->exec();
-  
+
   if (editAccountView->result() == QDialog::Accepted) {
     if (id == newAccountId) {
       newAccount->id = accountIdCount;
       accountIdCount++;
       accountList.append(newAccount);
       updateAccounts();
     } else {
       updateAccounts();
     }
   }
-  
+
   delete editAccountView;
 }
 
 void EmailClient::deleteAccount(int id)
 {
   MailAccount *newAccount;
   QString message;
-  
+
   newAccount = accountList.at(id);
-  message = "Delete account:\n" + newAccount->accountName;
+  message = tr("Delete account:\n") + newAccount->accountName;
   switch( QMessageBox::warning( this, "Mailit", message,
       "Yes", "No", 0, 0, 1 ) ) {
-    
+
     case 0: accountList.remove(id);
         updateAccounts();
         break;
     case 1:
         break;
   }
 }
 
 void EmailClient::updateAccounts()
 {
   MailAccount *accountPtr;
-  
+
   //rebuild menus, clear all first
   editAccountMenu->clear();
   selectAccountMenu->clear();
   deleteAccountMenu->clear();
 
-  newAccountId = editAccountMenu->insertItem("New", this,
+  newAccountId = editAccountMenu->insertItem( tr("New"), this,
       SLOT(editAccount(int)) );
   editAccountMenu->insertSeparator();
-  
+
   idCount = 0;
   for (accountPtr = accountList.first(); accountPtr != 0;
       accountPtr = accountList.next()) {
-    
+
     editAccountMenu->insertItem(accountPtr->accountName,
       this, SLOT(editAccount(int)), 0, idCount);
      selectAccountMenu->insertItem(accountPtr->accountName,
       this, SLOT(selectAccount(int)), 0, idCount);
     deleteAccountMenu->insertItem(accountPtr->accountName,
       this, SLOT(deleteAccount(int)), 0, idCount);
     idCount++;
   }
 }
 
 void EmailClient::deleteMail(EmailListItem *mailItem, bool &inbox)
 {
   Email *mPtr;
   Enclosure *ePtr;
-  
-  if (inbox) 
+
+  if (inbox)
   {
     mPtr = mailItem->getMail();
-    
+
     //if mail is in queue for download, remove it from
     //queue if possible
     if ( (receiving) && (mPtr->fromAccountId == currentAccount->id) ) {
       if ( !mPtr->downloaded )
         mailDownloadList.remove(mPtr->serverId, mPtr->size);
     }
-    
+
     mailconf->setGroup(mPtr->id);
     mailconf->clearGroup();
-    
+
     //delete any temporary attatchemnts storing
     for ( ePtr=mPtr->files.first(); ePtr != 0; ePtr=mPtr->files.next() ) {
       if (ePtr->saved) {
         QFile::remove( (ePtr->path + ePtr->name) );
       }
     }
     inboxView->takeItem(mailItem);
-  } 
-  else 
+  }
+  else
   {
     outboxView->takeItem(mailItem);
   }
 }
 
 void EmailClient::setMailSize(int size)
 {
         progressBar->reset();
         progressBar->setTotalSteps(size);
 }
 
 void EmailClient::setTotalSize(int /*size*/)
 {
-  
+
 }
 
 void EmailClient::setDownloadedSize(int size)
 {
         int total = progressBar->totalSteps();
 
         if (size < total) {
     progressBar->setProgress(size);
         } else {
           progressBar->setProgress(total);
         }
 }
 
 void EmailClient::deleteItem()
 {
   bool inbox=mailboxView->currentTab()==0;
   QListView* box;
-  
+
   EmailListItem* eli;
   //  int pos;
-    
+
   inbox ? box=inboxView : box=outboxView;
-  
+
   eli=(EmailListItem*)box->selectedItem();
-  
+
   if (eli)
   {
     box->setSelected(eli->itemBelow(),true);  //select the previous item
-    
+
     deleteMail(eli,(bool&)inbox);   //remove mail entry
   }
 }
 
 void EmailClient::inboxItemPressed()
 {
 //  timerID=startTimer(500);
 }
 
 void EmailClient::inboxItemReleased()
 {
   //  killTimer(timerID);
 }
 
 /*void EmailClient::timerEvent(QTimerEvent *e)
 {
   //killTimer(timerID);
-  
-  
+
+
   QPopupMenu *action = new QPopupMenu(this);
-  
+
   int reply=0;
-  
+
   action->insertItem(tr( "Reply To" ),this,SLOT(reply()));
   action->insertItem( tr( "Reply All" ),this,SLOT(replyAll()));
   action->insertItem( tr( "Forward" ), this,SLOT(forward()));
   action->insertItem( tr( "Remove Mail" ), this,SLOT(remove()));
- 
+
   action->exec(QCursor::pos());
-  
+
   if (action) delete action;
-   
+
 }*/
 
 Email* EmailClient::getCurrentMail()
 {
   EmailListItem *eli=(EmailListItem* ) (inboxView->selectedItem());
   if (eli!=NULL)
     return eli->getMail();
   else
     return NULL;
 }
-  
+
 void EmailClient::download(Email* mail)
 {
   MailAccount* acc=0;
-  
+
   tempMailDownloadList.clear();
   tempMailDownloadList.sizeInsert(mail->serverId, mail->size);
-  
+
   acc=accountList.at(mail->fromAccountId-1);
   if (acc)
-  { 
+  {
     emailHandler->setAccount(*acc);
     emailHandler->getMailByList(&tempMailDownloadList);
   }
-  else 
+  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*/)
 {
   /*if (msg=="getMail()")
   {
     //QDialog qd(qApp->activeWindow(),"Getting mail",true);
     QVBoxLayout *vbProg = new QVBoxLayout( &qd );
-  
+
     initStatusBar(&qd);
-    
+
     if (statusBar==0)
     {
       qDebug("No Bar ...");
       //statusBar=new ProgressBar(&qd);
     }
     statusBar->show();
     vbProg->addWidget(statusBar);
     qd.showMaximized();
     qd.show();
     emit getAllNewMail();
     //qd.exec();
   }
   else if (msg=="compose()")
-  { 
+  {
     QDialog qd(qApp->activeWindow(),"Getting mail",true);
-    
+
     WriteMail wm(&qd,"write new mail");
     QVBoxLayout vbProg( &qd );
-    
+
     wm.showMaximized();
     vbProg.addWidget(&wm);
-    
+
     qd.showMaximized();
-    
+
     emit composeRequested();
     qd.exec();
-    
+
     QMessageBox::warning(qApp->activeWindow(),tr("Info"), tr("Info"), "OK\n");
   }
-    
+
   else if (msg=="dialog()")
   {
       QMessageBox::warning(qApp->activeWindow(),tr("Info"), tr("Info"), "OK\n");
   }*/
 }
diff --git a/noncore/unsupported/mailit/emaillistitem.cpp b/noncore/unsupported/mailit/emaillistitem.cpp
index fc9f766..a25f93a 100644
--- a/noncore/unsupported/mailit/emaillistitem.cpp
+++ b/noncore/unsupported/mailit/emaillistitem.cpp
@@ -4,96 +4,155 @@
 ** This file is part of Qt Palmtop Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** 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 <qstring.h>
 #include <qpe/resource.h>
 #include "emaillistitem.h"
 
 EmailListItem::EmailListItem(QListView *parent, Email mailIn, bool inbox)
     : QListViewItem(parent)
 {
   QString temp;
-  
+
   mail = mailIn;
-  
+
   if (inbox) {
     setText(0, mail.from);
   } else {
     QStringList::Iterator it = mail.recipients.begin();
     temp = *it;
     if (mail.recipients.count() > 1)
       temp += "...";
     setText(0, temp);
   }
   setText(1, mail.subject);
-  setText(2,mail.date);
-  
+  // setText(2,mail.date);
+  setText(2,dateFromULCString(mail.date));
+
   if (mailIn.files.count()>0)
   {
     setPixmap(0, Resource::loadPixmap("mailit/attach"));
   }
-  
+
   selected = FALSE;
 }
 
 Email* EmailListItem::getMail()
 {
   return &mail;
 }
 
 void EmailListItem::setMail(Email newMail)
 {
   mail = newMail;
   repaint();
 }
 
 void EmailListItem::setItemSelected(bool enable)
 {
   selected = enable;
   setSelected(enable);
   repaint();
 }
 
 bool EmailListItem::isItemSelected()
 {
   return selected;
 }
 
 void EmailListItem::paintCell( QPainter *p, const QColorGroup &cg,
         int column, int width, int alignment )
 {
 
   QColorGroup _cg( cg );
   QColor c = _cg.text();
 
   if ( (! mail.read) && (mail.received) )
     _cg.setColor( QColorGroup::Text, Qt::blue);
   if (!mail.downloaded)
     _cg.setColor( QColorGroup::Text, Qt::red);
-  
+
 /*  if (selected) {
     _cg.setColor(QColorGroup::Base, Qt::blue);
     _cg.setColor(QColorGroup::Text, Qt::yellow);
     if (isSelected()) {
       _cg.setColor(QColorGroup::HighlightedText, Qt::yellow);
     } else {
       _cg.setColor(QColorGroup::Highlight, Qt::blue);
     }
   }
-*/    
+*/
     QListViewItem::paintCell( p, _cg, column, width, alignment );
 
     _cg.setColor( QColorGroup::Text, c );
 }
+
+/*
+ * Converts an E-Mail date (ULC) RFC 2822 conform to a QDateTime.
+ * Returning a QString with formatting of "YYYY-MM-DD HH:MM:SS"
+ * (zodiac: This method was tested with more than 300 inbox mails,
+ * it didn't slow down the loading of mail-it.)
+ */
+QString EmailListItem::dateFromULCString( QString ulcDate )
+{
+        QString sTemp, sTime;
+        int iPos, iDay, iMon=1, iYear;
+
+        iPos=ulcDate.find(',');
+        if (iPos) { // it has a day-of-week
+                ulcDate=ulcDate.remove(0,++iPos); //.stripWhiteSpace();
+        }
+
+        QStringList dateEntries = QStringList::split(" ",ulcDate,FALSE);
+        QStringList::Iterator iter = dateEntries.begin();
+
+        // Get day as DD
+        iDay = (*iter++).toInt();
+
+        // Get month as string Mmm
+        sTemp = (*iter++);
+        if (sTemp =="Jan") {iMon=1;} else
+        if (sTemp =="Feb") {iMon=2;} else
+        if (sTemp =="Mar") {iMon=3;} else
+        if (sTemp =="Apr") {iMon=4;} else
+        if (sTemp =="May") {iMon=5;} else
+        if (sTemp =="Jun") {iMon=6;} else
+        if (sTemp =="Jul") {iMon=7;} else
+        if (sTemp =="Aug") {iMon=8;} else
+        if (sTemp =="Sep") {iMon=9;} else
+        if (sTemp =="Oct") {iMon=10;} else
+        if (sTemp =="Nov") {iMon=11;} else
+        if (sTemp =="Dec") {iMon=12;}
+
+        // Get year as YYYY or YY
+        iYear = (*iter++).toInt();
+
+        QDate date = QDate(iYear, iMon, iDay);
+
+        // Convert timestring into a QTime
+        QStringList timeEntries = QStringList::split(":",(*iter++),FALSE);
+        QStringList::Iterator iterTime = timeEntries.begin();
+        iYear=(*iterTime++).toInt(); // var reuse.. *cough*
+        iMon=(*iterTime++).toInt();
+        iDay=(*iterTime++).toInt();
+        QTime time = QTime(iYear,iMon,iDay);
+
+        return QString::number(date.year())+"-"
+                +QString::number(date.month()).rightJustify(2,'0')+"-"
+                +QString::number(date.day()).rightJustify(2,'0')+" "
+                +time.toString();
+}
+
+
diff --git a/noncore/unsupported/mailit/emaillistitem.h b/noncore/unsupported/mailit/emaillistitem.h
index 642932c..129a774 100644
--- a/noncore/unsupported/mailit/emaillistitem.h
+++ b/noncore/unsupported/mailit/emaillistitem.h
@@ -11,34 +11,35 @@
 ** 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.
 **
 **********************************************************************/
 #ifndef EMAILLISTITEM_H
 #define EMAILLISTITEM_H
 
 #include <qlistview.h>
 #include "emailhandler.h"
 
 class EmailListItem: public QListViewItem
 {
 public:
         EmailListItem(QListView *parent, Email mailIn, bool inbox);
         Email* getMail();
         void setMail(Email newMail);
         void setItemSelected(bool enable);
         bool isItemSelected();
         bool itemSelected();
-        
+
 protected:
         void paintCell( QPainter *p, const QColorGroup &cg,
                         int column, int width, int alignment );
 private:
         Email mail;
         bool selected;
+        QString dateFromULCString( QString ulc );
 };
 
 #endif
diff --git a/noncore/unsupported/mailit/mailit.pro b/noncore/unsupported/mailit/mailit.pro
index 5e9a83a..0224886 100644
--- a/noncore/unsupported/mailit/mailit.pro
+++ b/noncore/unsupported/mailit/mailit.pro
@@ -1,63 +1,59 @@
-TEMPLATE  = app
 TARGET = mailit
-CONFIG    = qt warn_on release
+CONFIG    = qt warn_on release quick-app
 HEADERS   = emailclient.h \
       emailhandler.h \
       emaillistitem.h \
       mailitwindow.h \
       md5.h \
       popclient.h \
       readmail.h \
       smtpclient.h \
       writemail.h \
       textparser.h \
       viewatt.h \
       addatt.h \
       editaccount.h \
       maillist.h \
       addresslist.h
 SOURCES   = emailclient.cpp \
       emailhandler.cpp \
       emaillistitem.cpp \
       mailitwindow.cpp \
       main.cpp \
       md5.c \
       popclient.cpp \
       readmail.cpp \
       smtpclient.cpp \
       writemail.cpp \
       textparser.cpp \
       viewatt.cpp \
       addatt.cpp \
       editaccount.cpp \
       maillist.cpp \
       addresslist.cpp
 
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include 
 LIBS            += -lqpe -lopie
 # -lssl
-MOC_DIR=qpeobj
-OBJECTS_DIR=qpeobj
-DESTDIR=$(OPIEDIR)/bin
 
 TRANSLATIONS = ../../../i18n/de/mailit.ts \
          ../../../i18n/nl/mailit.ts \
          ../../../i18n/da/mailit.ts \
          ../../../i18n/xx/mailit.ts \
          ../../../i18n/it/mailit.ts \
          ../../../i18n/en/mailit.ts \
          ../../../i18n/es/mailit.ts \
          ../../../i18n/fr/mailit.ts \
          ../../../i18n/hu/mailit.ts \
          ../../../i18n/ja/mailit.ts \
          ../../../i18n/ko/mailit.ts \
          ../../../i18n/no/mailit.ts \
          ../../../i18n/pl/mailit.ts \
          ../../../i18n/pt/mailit.ts \
          ../../../i18n/pt_BR/mailit.ts \
          ../../../i18n/sl/mailit.ts \
          ../../../i18n/zh_CN/mailit.ts \
          ../../../i18n/zh_TW/mailit.ts
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/unsupported/mailit/mailitwindow.h b/noncore/unsupported/mailit/mailitwindow.h
index e818d32..11e56b9 100644
--- a/noncore/unsupported/mailit/mailitwindow.h
+++ b/noncore/unsupported/mailit/mailitwindow.h
@@ -12,48 +12,49 @@
 ** 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.
 **
 **********************************************************************/
 #ifndef MailItWindow_H
 #define MailItWindow_H
 
 #include <qmainwindow.h>
 #include <qwidgetstack.h>
 #include <qevent.h>
 //#include <qlayout.h>
 #include "emailclient.h"
 #include "writemail.h"
 #include "readmail.h"
 #include "addresslist.h"
 
 class MailItWindow: public QMainWindow
 {
         Q_OBJECT
 public:
+        static QString appName() { return QString::fromLatin1("mailit"); }
         MailItWindow(QWidget *parent = 0, const char *name = 0, WFlags fl = 0);
         ~MailItWindow();
 
 signals:
 public slots:
         void compose();
         void composeReply(Email &, bool&);
                 void composeForward(Email &);
         void showEmailClient();
         void viewMail(QListView *, Email *mail);
         void updateMailView(Email *mail);
         void closeEvent(QCloseEvent *e);
         void updateCaption(const QString &);
         void setDocument(const QString &);
         /*void reply(Email&);
         void replyAll(Email&);
         void forward(Email&);
         void remove(Email&);*/
         
 private:
         EmailClient *emailClient;
         WriteMail *writeMail;
         ReadMail *readMail;
         QWidgetStack *views;
diff --git a/noncore/unsupported/mailit/main.cpp b/noncore/unsupported/mailit/main.cpp
index 3a3e1fc..71f8877 100644
--- a/noncore/unsupported/mailit/main.cpp
+++ b/noncore/unsupported/mailit/main.cpp
@@ -1,29 +1,25 @@
 /**********************************************************************
 ** Copyright (C) 2001 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qt Palmtop Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** 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 <qpe/qpeapplication.h>
 #include "mailitwindow.h"
 
-int main(int argc, char* argv[])
-{
-    QPEApplication a( argc, argv );
-    MailItWindow mw(0, 0);
-    a.showMainDocumentWidget(&mw);
-    return a.exec();
-}
+#include <opie/oapplicationfactory.h>
+
+OPIE_EXPORT_APP( OApplicationFactory<MailItWindow> )
\ No newline at end of file