mrege noncore/net/*

42 files changed, 982 insertions, 147 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
@@ -272,25 +272,25 @@ void EmailClient::enqueMail(const Email &mail)
   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();
@@ -312,26 +312,26 @@ void EmailClient::setMailAccount()
 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");
@@ -776,25 +776,25 @@ void EmailClient::saveSettings()
   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 {
@@ -816,46 +816,46 @@ void EmailClient::editAccount(int id)
     }
   }
   
   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,
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
@@ -29,25 +29,26 @@ EmailListItem::EmailListItem(QListView *parent, Email mailIn, bool inbox)
   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;
@@ -88,12 +89,70 @@ void EmailListItem::paintCell( QPainter *p, const QColorGroup &cg,
     _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
@@ -30,15 +30,16 @@ public:
 	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,15 +1,14 @@
-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 \
@@ -28,27 +27,24 @@ SOURCES   = emailclient.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 \
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
@@ -24,24 +24,25 @@
 #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);
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
@@ -11,19 +11,15 @@
 ** 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
@@ -48,26 +48,26 @@ 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 );
@@ -261,35 +261,35 @@ OpieFtp::OpieFtp( )
 
     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*)));
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
@@ -38,27 +38,28 @@ 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;
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,18 +1,16 @@
-TEMPLATE  = app
-CONFIG    += qt warn_on release
+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 \
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
@@ -26,24 +26,25 @@
 #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;
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
 
 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
@@ -11,24 +11,25 @@
  *   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>
@@ -50,24 +51,26 @@
 #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() ) );
+
+    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 ) ),
@@ -236,24 +239,38 @@ void BlueBase::applyConfigChanges() {
     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;
 
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
@@ -32,30 +32,33 @@ 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;
@@ -80,18 +83,19 @@ namespace OpieTooth {
 	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
@@ -2,53 +2,53 @@
 <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>
-        <property stdset="1">
-            <name>margin</name>
-            <number>0</number>
-        </property>
-        <property stdset="1">
-            <name>spacing</name>
-            <number>0</number>
-        </property>
         <widget>
             <class>QTabWidget</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>Status</cstring>
             </property>
+        <property stdset="1">
+            <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>QWidget</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>tab</cstring>
                 </property>
@@ -194,102 +194,138 @@
                 <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>2</number>
+                    <number>11</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
-                        <number>2</number>
+                    <number>6</number>
+                </property>
+                <widget>
+                    <class>QGroupBox</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>GroupBox1</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>title</name>
+                        <string>Bluetooh Basic Config</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>QLayoutWidget</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>Layout2</cstring>
+                                <cstring>Layout7</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>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>QLineEdit</class>
+                                            <class>QLabel</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>deviceNameLine</cstring>
+                                                <cstring>passkeyLabel</cstring>
+                                            </property>
+                                            <property stdset="1">
+                                                <name>text</name>
+                                                <string>Default Passkey</string>
                                 </property>
                             </widget>
-                        </hbox>
+                                    </vbox>
                     </widget>
                     <widget>
                         <class>QLayoutWidget</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>Layout3</cstring>
+                                        <cstring>Layout5</cstring>
                         </property>
-                        <hbox>
+                                    <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>
+                                            <class>QLineEdit</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>passkeyLabel</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>text</name>
-                                    <string>Default Passkey</string>
+                                                <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>margin</name>
                                 <number>0</number>
@@ -349,24 +385,37 @@
                         <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>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>margin</name>
@@ -381,15 +430,14 @@
                         <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>
 </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
@@ -10,29 +10,16 @@
  */
 /***************************************************************************
  *                                                                         *
  *   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,39 +1,39 @@
-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
+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 \
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,51 +1,55 @@
 
 #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() ) );
 
 };
 
 
@@ -65,21 +69,28 @@ void RfcCommPopup::slotConnect() {
 
     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,24 +1,24 @@
 
 #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
@@ -9,21 +9,16 @@ 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
@@ -8,25 +8,25 @@ 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");
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
@@ -27,25 +27,26 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #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
@@ -272,25 +272,25 @@ void EmailClient::enqueMail(const Email &mail)
   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();
@@ -312,26 +312,26 @@ void EmailClient::setMailAccount()
 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");
@@ -776,25 +776,25 @@ void EmailClient::saveSettings()
   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 {
@@ -816,46 +816,46 @@ void EmailClient::editAccount(int id)
     }
   }
   
   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,
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
@@ -29,25 +29,26 @@ EmailListItem::EmailListItem(QListView *parent, Email mailIn, bool inbox)
   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;
@@ -88,12 +89,70 @@ void EmailListItem::paintCell( QPainter *p, const QColorGroup &cg,
     _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
@@ -30,15 +30,16 @@ public:
 	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,15 +1,14 @@
-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 \
@@ -28,27 +27,24 @@ SOURCES   = emailclient.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 \
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
@@ -24,24 +24,25 @@
 #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);
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
@@ -11,19 +11,15 @@
 ** 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