Merge from BRANCH_1_0

18 files changed, 723 insertions, 274 deletions

diff --git a/core/apps/.cvsignore b/core/apps/.cvsignore
index faa68ae..6d678c6 100644
--- a/core/apps/.cvsignore
+++ b/core/apps/.cvsignore
@@ -1,2 +1 @@
-binconfig.in
 config.in
diff --git a/core/apps/embeddedkonsole/MyPty.cpp b/core/apps/embeddedkonsole/MyPty.cpp
index 9adc248..7e820ad 100644
--- a/core/apps/embeddedkonsole/MyPty.cpp
+++ b/core/apps/embeddedkonsole/MyPty.cpp
@@ -38,246 +38,247 @@
     As a side effect of using this class, a signal(2) handler is
     installed on SIGCHLD.
 
     \par FIXME
 
     [NOTE: much of the technical stuff below will be replaced by forkpty.]
 
     publish the SIGCHLD signal if not related to an instance.
 
     clearify TEPty::done vs. TEPty::~TEPty semantics.
     check if pty is restartable via run after done.
 
     \par Pseudo terminals
 
     Pseudo terminals are a unique feature of UNIX, and always come in form of
     pairs of devices (/dev/ptyXX and /dev/ttyXX), which are connected to each
     other by the operating system. One may think of them as two serial devices
     linked by a null-modem cable. Being based on devices the number of
     simultanous instances of this class is (globally) limited by the number of
     those device pairs, which is 256.
 
     Another technic are UNIX 98 PTY's. These are supported also, and prefered
     over the (obsolete) predecessor.
 
     There's a sinister ioctl(2), signal(2) and job control stuff
     nessesary to make everything work as it should.
 */
 
 
 #include <qfileinfo.h>
 #include <qapplication.h>
 #include <qsocketnotifier.h>
 #include <qstring.h>
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <signal.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <termios.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/wait.h>
 
 #ifdef HAVE_OPENPTY
 #include <pty.h>
 #endif
 
 #include "MyPty.h"
 
 
 #undef VERBOSE_DEBUG
 
 
 /* -------------------------------------------------------------------------- */
 
 /*!
    Informs the client program about the
    actual size of the window.
 */
 
 void MyPty::setSize(int lines, int columns)
 {
   struct winsize wsize;
   wsize.ws_row = (unsigned short)lines;
   wsize.ws_col = (unsigned short)columns;
   if(fd < 0) return;
   ioctl(fd,TIOCSWINSZ,(char *)&wsize);
 }
 
 
 void MyPty::donePty()
 {
     // This is code from the Qt DumbTerminal example
     int status = 0;
 
     ::close(fd);
 
     if (cpid) {
   kill(cpid, SIGHUP);
   waitpid(cpid, &status, 0);
     }
 
     emit done(status);
 }
 
 
 const char* MyPty::deviceName()
 {
     return ttynam;
 }
 
 
 void MyPty::error()
 {
     // This is code from the Qt DumbTerminal example
     donePty();
 }
 
 
 /*!
     start the client program.
 */
 int MyPty::run(const char* cmd, QStrList &, const char*, int)
 {
       // This is code from the Qt DumbTerminal example
     cpid = fork();
 
     if ( !cpid ) {
   // child - exec shell on tty
   for (int sig = 1; sig < NSIG; sig++) signal(sig,SIG_DFL);
   int ttyfd = open(ttynam, O_RDWR);
   dup2(ttyfd, STDIN_FILENO);
   dup2(ttyfd, STDOUT_FILENO);
   dup2(ttyfd, STDERR_FILENO);
   // should be done with tty, so close it
   close(ttyfd);
   static struct termios ttmode;
   if ( setsid() < 0 )
       perror( "failed to set process group" );
 #if defined (TIOCSCTTY)
   // grabbed from APUE by Stevens
   ioctl(STDIN_FILENO, TIOCSCTTY, 0);
 #endif
   tcgetattr( STDIN_FILENO, &ttmode );
   ttmode.c_cc[VINTR] = 3;
   ttmode.c_cc[VERASE] = 8;
   tcsetattr( STDIN_FILENO, TCSANOW, &ttmode );
-  setenv("TERM","vt100",1);
+  if(strlen(getenv("TERM"))<=0)
+     setenv("TERM","vt100",1);
   setenv("COLORTERM","0",1);
 
   if (getuid() == 0) {
       char msg[] = "WARNING: You are running this shell as root!\n";
       write(ttyfd, msg, sizeof(msg));
   }
 
   QString ccmd = "-"+QFileInfo(cmd).fileName(); //creates a login shell
 
   execl(cmd, ccmd.latin1(), 0);
 
   donePty();
   exit(-1);
     }
 
     // parent - continue as a widget
     QSocketNotifier* sn_r = new QSocketNotifier(fd,QSocketNotifier::Read,this);
     QSocketNotifier* sn_e = new QSocketNotifier(fd,QSocketNotifier::Exception,this);
     connect(sn_r,SIGNAL(activated(int)),this,SLOT(readPty()));
     connect(sn_e,SIGNAL(activated(int)),this,SLOT(error()));
 
     return 0;
 }
 
 int MyPty::openPty()
 {
     // This is code from the Qt DumbTerminal example
     int ptyfd = -1;
 
 #ifdef HAVE_OPENPTY
     int ttyfd;
     if ( openpty(&ptyfd,&ttyfd,ttynam,0,0) )
   ptyfd = -1;
     else
   close(ttyfd); // we open the ttynam ourselves.
 #else
     for (const char* c0 = "pqrstuvwxyzabcde"; ptyfd < 0 && *c0 != 0; c0++) {
   for (const char* c1 = "0123456789abcdef"; ptyfd < 0 && *c1 != 0; c1++) {
       sprintf(ptynam,"/dev/pty%c%c",*c0,*c1);
       sprintf(ttynam,"/dev/tty%c%c",*c0,*c1);
       if ((ptyfd = ::open(ptynam,O_RDWR)) >= 0) {
     if (geteuid() != 0 && !access(ttynam,R_OK|W_OK) == 0) {
         ::close(ptyfd);
         ptyfd = -1;
     }
       }
   }
     }
 #endif
 
     if ( ptyfd < 0 ) {
   qApp->exit(1);
   return -1;
     }
 
     return ptyfd;
 }
 
 /*!
     Create an instance.
 */
 MyPty::MyPty() : cpid(0)
 {
   fd = openPty();
 }
 
 /*!
     Destructor.
     Note that the related client program is not killed
     (yet) when a instance is deleted.
 */
 MyPty::~MyPty()
 {
     donePty();
 }
 
 
 /*! sends len bytes through the line */
 void MyPty::send_bytes(const char* s, int len)
 {
 
 #ifdef VERBOSE_DEBUG
   // verbose debug
   printf("sending bytes:\n");
   for (int i = 0; i < len; i++)
     printf("%c", s[i]);
   printf("\n");
 #endif
 
   ::write(fd, s, len);  
 }
 
 /*! indicates that a block of data is received */
 void MyPty::readPty()
 { 
   char buf[4096];
 
   int len = ::read( fd, buf, 4096 );
 
   if (len == -1)
      donePty();
 
   if (len < 0)
      return;
 
   emit block_in(buf,len);
   
 #ifdef VERBOSE_DEBUG
   // verbose debug
   printf("read bytes:\n");
   for (int i = 0; i < len; i++)
     printf("%c", buf[i]);
   printf("\n");
 #endif
 
 }
 
diff --git a/core/apps/helpbrowser/helpbrowser.cpp b/core/apps/helpbrowser/helpbrowser.cpp
index 48da7c6..531dbff 100644
--- a/core/apps/helpbrowser/helpbrowser.cpp
+++ b/core/apps/helpbrowser/helpbrowser.cpp
@@ -1,228 +1,250 @@
-#/**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+/**********************************************************************
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia 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.
 **
 **********************************************************************/
 
+#define QTOPIA_INTERNAL_LANGLIST
+
 #include "helpbrowser.h"
 
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
+#include <qpe/mimetype.h>
+#include <qpe/applnk.h>
 #include <qpe/global.h>
 
 #include <qstatusbar.h>
 #include <qdragobject.h>
 #include <qpixmap.h>
 #include <qpopupmenu.h>
 #include <qpe/qpemenubar.h>
 #include <qpe/qpetoolbar.h>
+#include <qpe/qcopenvelope_qws.h>
 #include <qtoolbutton.h>
 #include <qiconset.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qstylesheet.h>
 #include <qmessagebox.h>
 #include <qfiledialog.h>
 #include <qevent.h>
 #include <qlineedit.h>
 #include <qobjectlist.h>
 #include <qfileinfo.h>
 #include <qfile.h>
 #include <qdatastream.h>
 #include <qprinter.h>
 #include <qsimplerichtext.h>
 #include <qpaintdevicemetrics.h>
 #include <qaction.h>
 
-#include <ctype.h>
+#include <cctype>
 
+#include "magictextbrowser.h"
 
 HelpBrowser::HelpBrowser( QWidget* parent, const char *name, WFlags f )
     : QMainWindow( parent, name, f ),
       selectedURL()
 {
     init( "index.html" );
 }
 
+
+
 void HelpBrowser::init( const QString& _home )
 {
-    setIcon( Resource::loadPixmap( "help_icon" ) );
+    setIcon( Resource::loadPixmap( "HelpBrowser" ) );
+    setBackgroundMode( PaletteButton );
 
-    browser = new QTextBrowser( this );
+    browser = new MagicTextBrowser( this );
     browser->setFrameStyle( QFrame::Panel | QFrame::Sunken );
     connect( browser, SIGNAL( textChanged() ),
 	     this, SLOT( textChanged() ) );
 
     setCentralWidget( browser );
     setToolBarsMovable( FALSE );
 
     if ( !_home.isEmpty() )
 	browser->setSource( _home );
 
     QPEToolBar* toolbar = new QPEToolBar( this );
     toolbar->setHorizontalStretchable( TRUE );
     QPEMenuBar *menu = new QPEMenuBar( toolbar );
 
     toolbar = new QPEToolBar( this );
     // addToolBar( toolbar, "Toolbar");
 
-    //QPopupMenu* go = new QPopupMenu( this );
+    QPopupMenu* go = new QPopupMenu( this );
     backAction = new QAction( tr( "Backward" ), Resource::loadIconSet( "back" ), QString::null, 0, this, 0 );
     connect( backAction, SIGNAL( activated() ), browser, SLOT( backward() ) );
     connect( browser, SIGNAL( backwardAvailable( bool ) ),
 	     backAction, SLOT( setEnabled( bool ) ) );
-    //backAction->addTo( go );
+    backAction->addTo( go );
     backAction->addTo( toolbar );
     backAction->setEnabled( FALSE );
 
     forwardAction = new QAction( tr( "Forward" ), Resource::loadIconSet( "forward" ), QString::null, 0, this, 0 );
     connect( forwardAction, SIGNAL( activated() ), browser, SLOT( forward() ) );
     connect( browser, SIGNAL( forwardAvailable( bool ) ),
 	     forwardAction, SLOT( setEnabled( bool ) ) );
-    //forwardAction->addTo( go );
+    forwardAction->addTo( go );
     forwardAction->addTo( toolbar );
     forwardAction->setEnabled( FALSE );
 
-    QAction *a = new QAction( tr( "Home" ), Resource::loadPixmap(
-"home" ), QString::null, 0, this, 0 );
+    QAction *a = new QAction( tr( "Home" ), Resource::loadIconSet( "home" ), QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), browser, SLOT( home() ) );
-    //a->addTo( go );
+    a->addTo( go );
     a->addTo( toolbar );
 
     bookm = new QPopupMenu( this );
     bookm->insertItem( tr( "Add Bookmark" ), this, SLOT( addBookmark() ) );
     bookm->insertItem( tr( "Remove from Bookmarks" ), this, SLOT( removeBookmark() ) );
     bookm->insertSeparator();
     connect( bookm, SIGNAL( activated( int ) ),
 	     this, SLOT( bookmChosen( int ) ) );
 
     readBookmarks();
 
-    //menu->insertItem( tr("Go"), go );
+    menu->insertItem( tr("Go"), go );
     menu->insertItem( tr( "Bookmarks" ), bookm );
 
     resize( 240, 300 );
     browser->setFocus();
+    browser->setFrameStyle( QFrame::NoFrame );
+
+#if !defined(QT_NO_COP)
+        QCopChannel *addressChannel = new QCopChannel("QPE/HelpBrowser" , this );
+        connect (addressChannel, SIGNAL( received(const QCString &, const QByteArray &)),
+                 this, SLOT ( appMessage(const QCString &, const QByteArray &) ) );
+#endif
 
     connect( qApp, SIGNAL(appMessage(const QCString&, const QByteArray&)),
 	     this, SLOT(appMessage(const QCString&, const QByteArray&)) );
 }
 
 void HelpBrowser::appMessage(const QCString& msg, const QByteArray& data)
 {
+	qDebug("reached appMessage");
     if ( msg == "showFile(QString)" ) {
 	QDataStream ds(data,IO_ReadOnly);
 	QString fn;
 	ds >> fn;
 	setDocument( fn );
+
+        QPEApplication::setKeepRunning();
+
+	showMaximized();
+	setActiveWindow();
+	raise();
     }
 }
 
 void HelpBrowser::setDocument( const QString &doc )
 {
     if ( !doc.isEmpty() )
 	browser->setSource( doc );
     raise();
 }
 
 
 void HelpBrowser::textChanged()
 {
     if ( browser->documentTitle().isNull() )
 	setCaption( tr("Help Browser") );
     else
 	setCaption( browser->documentTitle() ) ;
 
     selectedURL = caption();
 }
 
 HelpBrowser::~HelpBrowser()
 {
     QStringList bookmarks;
     QMap<int, Bookmark>::Iterator it2 = mBookmarks.begin();
     for ( ; it2 != mBookmarks.end(); ++it2 )
 	bookmarks.append( (*it2).name + "=" + (*it2).file );
 
     QFile f2( Global::applicationFileName("helpbrowser", "bookmarks") );
     if ( f2.open( IO_WriteOnly ) ) {
 	QDataStream s2( &f2 );
 	s2 << bookmarks;
 	f2.close();
     }
 }
 
 void HelpBrowser::pathSelected( const QString &_path )
 {
     browser->setSource( _path );
 }
 
 void HelpBrowser::readBookmarks()
 {
     QString file = Global::applicationFileName("helpbrowser", "bookmarks");
     if ( QFile::exists( file ) ) {
 	QStringList bookmarks;
 	QFile f( file );
 	if ( f.open( IO_ReadOnly ) ) {
 	    QDataStream s( &f );
 	    s >> bookmarks;
 	    f.close();
 	}
 	QStringList::Iterator it = bookmarks.begin();
 	for ( ; it != bookmarks.end(); ++it ) {
 	    Bookmark b;
 	    QString current = *it;
 	    int equal = current.find( "=" );
 	    if ( equal < 1 || equal == (int)current.length() - 1 )
 		continue;
 	    b.name = current.left( equal );
 	    b.file = current.mid( equal + 1 );
 	    mBookmarks[ bookm->insertItem( b.name ) ] = b;
 	}
     }
 }
 
 void HelpBrowser::bookmChosen( int i )
 {
     if ( mBookmarks.contains( i ) )
 	browser->setSource( mBookmarks[ i ].file );
 }
 
 void HelpBrowser::addBookmark()
 {
     Bookmark b;
     b.name = browser->documentTitle();
     b.file = browser->source();
     if (b.name.isEmpty() ) {
 	b.name = b.file.left( b.file.length() - 5 ); // remove .html
     }
     QMap<int, Bookmark>::Iterator it;
     for( it = mBookmarks.begin(); it != mBookmarks.end(); ++it )
 	if ( (*it).file == b.file ) return;
     mBookmarks[ bookm->insertItem( b.name ) ] = b;
 }
 
 void HelpBrowser::removeBookmark()
 {
     QString file = browser->source();
     QMap<int, Bookmark>::Iterator it = mBookmarks.begin();
     for( ; it != mBookmarks.end(); ++it )
 	if ( (*it).file == file ) {
 	    bookm->removeItem( it.key() );
 	    mBookmarks.remove( it );
 		break;
 	}
 }
diff --git a/core/apps/helpbrowser/helpbrowser.h b/core/apps/helpbrowser/helpbrowser.h
index 2f7153a..5f7e6b6 100644
--- a/core/apps/helpbrowser/helpbrowser.h
+++ b/core/apps/helpbrowser/helpbrowser.h
@@ -1,69 +1,69 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia 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.
 **
 **********************************************************************/
 
 #ifndef HELPWINDOW_H
 #define HELPWINDOW_H
 
 #include <qmainwindow.h>
 #include <qtextbrowser.h>
 #include <qstringlist.h>
 #include <qmap.h>
 
 class QPopupMenu;
 class QAction;
 
 class HelpBrowser : public QMainWindow
 {
     Q_OBJECT
 public:
     HelpBrowser( QWidget* parent = 0, const char *name=0, WFlags f=0 );
     ~HelpBrowser();
 
 public slots:
     void setDocument( const QString &doc );
     
 private slots:
     void appMessage(const QCString& msg, const QByteArray& data);
     void textChanged();
 
     void pathSelected( const QString & );
     void bookmChosen( int );
     void addBookmark();
     void removeBookmark();
     
 private:
     void init( const QString & );
     void readBookmarks();
     
     QTextBrowser* browser;
     QAction *backAction;
     QAction *forwardAction;
     QString selectedURL;
     struct Bookmark { 
 	QString name;
 	QString file;
     };
     QMap<int, Bookmark> mBookmarks;
     QMenuBar *menu;
     QPopupMenu *bookm;
 };
 
 #endif
 
diff --git a/core/apps/helpbrowser/helpbrowser.pro b/core/apps/helpbrowser/helpbrowser.pro
index 6bb43bd..3525b7e 100644
--- a/core/apps/helpbrowser/helpbrowser.pro
+++ b/core/apps/helpbrowser/helpbrowser.pro
@@ -1,33 +1,33 @@
 TEMPLATE	= app
 CONFIG		= qt warn_on release
 DESTDIR		= $(OPIEDIR)/bin
-HEADERS		= helpbrowser.h
-SOURCES		= helpbrowser.cpp \
+HEADERS		= helpbrowser.h magictextbrowser.h
+SOURCES		= helpbrowser.cpp magictextbrowser.cpp \
 		  main.cpp
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH	+= $(OPIEDIR)/include
 LIBS            += -lqpe
 INTERFACES	=
 TARGET          = helpbrowser
 TRANSLATIONS = ../../../i18n/de/helpbrowser.ts \
 	 ../../../i18n/nl/helpbrowser.ts \
 	 ../../../i18n/xx/helpbrowser.ts \
 	 ../../../i18n/en/helpbrowser.ts \
 	 ../../../i18n/es/helpbrowser.ts \
 	 ../../../i18n/fr/helpbrowser.ts \
 	 ../../../i18n/hu/helpbrowser.ts \
 	 ../../../i18n/ja/helpbrowser.ts \
 	 ../../../i18n/ko/helpbrowser.ts \
 	 ../../../i18n/no/helpbrowser.ts \
 	 ../../../i18n/pl/helpbrowser.ts \
 	 ../../../i18n/pt/helpbrowser.ts \
 	 ../../../i18n/pt_BR/helpbrowser.ts \
 	 ../../../i18n/sl/helpbrowser.ts \
 	 ../../../i18n/zh_CN/helpbrowser.ts \
 	 ../../../i18n/it/helpbrowser.ts \
 	 ../../../i18n/zh_TW/helpbrowser.ts \
 	 ../../../i18n/da/helpbrowser.ts
 
 
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/core/apps/helpbrowser/magictextbrowser.cpp b/core/apps/helpbrowser/magictextbrowser.cpp
new file mode 100644
index 0000000..8ce0325
--- a/dev/null
+++ b/core/apps/helpbrowser/magictextbrowser.cpp
@@ -0,0 +1,99 @@
+#include <qfile.h>
+#include <qstring.h>
+#include <qdragobject.h>
+#include <qregexp.h>
+
+/* need to get Global::helpPath() */
+#define QTOPIA_INTERNAL_LANGLIST
+
+#include <qtopia/global.h>
+#include <qtopia/mimetype.h>
+#include <qtopia/applnk.h>
+
+#include "magictextbrowser.h"
+
+
+
+MagicTextBrowser::MagicTextBrowser(QWidget* parent) :
+    QTextBrowser(parent){
+}
+
+void MagicTextBrowser::setSource( const QString& source )  {
+    QTextBrowser::setSource(source);
+    if ( magicQpe(source,"applications") || magicQpe(source,"games") || magicQpe(source,"settings") || magicQpe(source, "1Pim") ) // No tr
+        return;
+    if ( magicOpe(source, "applets") || magicOpe(source, "input") )
+        return;
+    // Just those are magic (for now). Could do CGI here,
+    // or in Qtopia's mime source factory.
+}
+
+bool MagicTextBrowser::magicQpe(const QString& source, const QString& name) {
+    if ( name+".html" == source || "help/"+name+".html" == source) {
+        QString fn = mimeSourceFactory()->makeAbsolute( source, context() );
+        const QMimeSource* m = mimeSourceFactory()->data( fn, context() );
+        if ( m ) {
+            QString txt;
+            if ( QTextDrag::decode(m,txt) ) {
+                QRegExp re("<qtopia-"+name+">.*</qtopia-"+name+">");
+                int start,len;
+                if ( (start=re.match(txt,0,&len))>=0 ) {
+                    QString generated = generateQpe(name);
+                    txt.replace(start,len,generated);
+                    setText(txt);
+                    return true;
+                }
+            }
+        }
+    }
+    return false;
+}
+bool MagicTextBrowser::magicOpe( const QString& source, const QString& name ) {
+    if ( name+".html" != source && "help/"+name+".html" != source) return false;
+
+    QString fn = mimeSourceFactory()->makeAbsolute( source, context() );
+    const QMimeSource* m = mimeSourceFactory()->data(fn, context() );
+    if (!m) return false;
+
+    QString txt;
+    if ( !QTextDrag::decode(m, txt ) ) return false;
+
+    QRegExp re("<opie-"+name+">.*</opie-"+name+">");
+    int start,len;
+    if ( (start=re.match(txt,0,&len))>=0 ) {
+        QString generated = generateOpe(name);
+        txt.replace(start,len,generated);
+        setText(txt);
+        return true;
+    }
+    return false;
+}
+QString MagicTextBrowser::generateOpe(const QString& name)const {
+    if ( name == QString::fromLatin1("applets") ) {
+        return QString::fromLatin1("<h3>No Applets found</h3>");
+    }else if ( name == QString::fromLatin1("input") ) {
+        return QString::fromLatin1("<h3>No input methods available</h3>");
+    }else
+         return QString::null;
+}
+
+QString MagicTextBrowser::generateQpe(const QString& name) const {
+    QString dir = MimeType::appsFolderName()+"/"+name[0].upper()+name.mid(1);
+    AppLnkSet lnkset(dir);
+    AppLnk* lnk;
+    QString r;
+    for (QListIterator<AppLnk> it(lnkset.children()); (lnk=it.current()); ++it) {
+        QString name = lnk->name();
+        QString icon = lnk->icon();
+        QString helpFile = lnk->exec()+".html";
+        QStringList helpPath = Global::helpPath();
+        bool helpExists = FALSE;
+        for (QStringList::ConstIterator it=helpPath.begin(); it!=helpPath.end() && !helpExists; ++it)
+            helpExists = QFile::exists( *it + "/" + helpFile );
+
+        if ( helpExists ) {
+            r += "<h3><a href="+helpFile+"><img src="+icon+">"+name+"</a></h3>\n";
+        }
+    }
+    return r;
+}
diff --git a/core/apps/helpbrowser/magictextbrowser.h b/core/apps/helpbrowser/magictextbrowser.h
new file mode 100644
index 0000000..ff91e68
--- a/dev/null
+++ b/core/apps/helpbrowser/magictextbrowser.h
@@ -0,0 +1,42 @@
+/**********************************************************************
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
+** Copyright (C) 2003 zecke
+**
+** This file is part of the Qtopia 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.
+**
+**********************************************************************/
+#ifndef HELP_BROWSER_MAGIC_TEXT_BROWSER_H
+#define HELP_BROWSER_MAGIC_TEXT_BROWSER_H
+
+#include <qtextbrowser.h>
+
+class MagicTextBrowser : public QTextBrowser {
+public:
+    MagicTextBrowser(QWidget* parent);
+
+    void setSource( const QString& source );
+
+    /** honor QPE Attributes */
+    bool magicQpe(const QString& source, const QString& name);
+    /** honor OPIE Attributes */
+    bool magicOpe(const QString& source, const QString& name );
+private:
+
+    QString generateQpe(const QString& name) const;
+    QString generateOpe(const QString& name) const;
+};
+
+#endif
diff --git a/core/apps/helpbrowser/main.cpp b/core/apps/helpbrowser/main.cpp
index 1cb10b7..b1bea56 100644
--- a/core/apps/helpbrowser/main.cpp
+++ b/core/apps/helpbrowser/main.cpp
@@ -1,34 +1,33 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia 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 "helpbrowser.h"
 
-#include <qpe/qpeapplication.h>
+#include <qtopia/qpeapplication.h>
 
 int main( int argc, char ** argv )
 {
     QPEApplication a( argc, argv );
 
     HelpBrowser mw;
-    mw.setCaption( HelpBrowser::tr("HelpBrowser") );
-    a.showMainDocumentWidget( &mw );
+    a.showMainWidget( &mw );
 
     return a.exec();
 }
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index 6f96574..1c95a97 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -444,270 +444,268 @@ void TextEdit::closeEvent(QCloseEvent *) {
               break;
 
               case 2:
               {
                   qApp->quit();
               }
               break;
 
               case -1:
                   break;
             };
       }
     else
         qApp->quit();
 
 }
 
 void TextEdit::cleanUp() {
 
     Config cfg ( "TextEdit" );
     cfg. setGroup ( "Font" );
     QFont f = editor->font();
     cfg.writeEntry ( "Family", f. family ( ));
     cfg.writeEntry ( "Size",   f. pointSize ( ));
     cfg.writeEntry ( "Weight", f. weight ( ));
     cfg.writeEntry ( "Italic", f. italic ( ));
 
     cfg.setGroup ( "View" );
     cfg.writeEntry ( "Wrap", editor->wordWrap() == QMultiLineEdit::WidgetWidth );
     cfg.writeEntry ( "FileView", viewSelection );
 
     cfg.writeEntry ( "PromptExit", promptExit );
     cfg.writeEntry ( "OpenDesktop", openDesktop );
     cfg.writeEntry ( "FilePermissions", filePerms );
     cfg.writeEntry ( "SearchBar", useSearchBar );
     cfg.writeEntry ( "startNew", startWithNew );
 
 }
 
 
 void TextEdit::accept() {
         if( edited1)
             saveAs();
      qApp->quit();
 }
 
 void TextEdit::zoomIn() {
     setFontSize(editor->font().pointSize()+1,false);
 }
 
 void TextEdit::zoomOut() {
     setFontSize(editor->font().pointSize()-1,true);
 }
 
 
 void TextEdit::setFontSize(int sz, bool round_down_not_up) {
     int s=10;
     for (int i=0; i<nfontsizes; i++) {
   if ( fontsize[i] == sz ) {
       s = sz;
       break;
   } else if ( round_down_not_up ) {
       if ( fontsize[i] < sz )
     s = fontsize[i];
   } else {
       if ( fontsize[i] > sz ) {
     s = fontsize[i];
     break;
       }
   }
     }
 
     QFont f = editor->font();
     f.setPointSize(s);
     editor->setFont(f);
 
     zin->setEnabled(s != fontsize[nfontsizes-1]);
     zout->setEnabled(s != fontsize[0]);
 }
 
 void TextEdit::setBold(bool y) {
     QFont f = editor->font();
     f.setBold(y);
     editor->setFont(f);
 }
 
 void TextEdit::setItalic(bool y) {
     QFont f = editor->font();
     f.setItalic(y);
     editor->setFont(f);
 }
 
 void TextEdit::setWordWrap(bool y) {
     bool state = editor->edited();
     QString captionStr = caption();
     bool b1 = edited1;
     bool b2 = edited;
 
     editor->setWordWrap(y ? QMultiLineEdit::WidgetWidth : QMultiLineEdit::NoWrap );
     editor->setEdited( state );
     edited1=b1;
     edited=b2;
     setCaption(captionStr);
 }
 
 void TextEdit::setSearchBar(bool b) {
     useSearchBar=b;
     Config cfg("TextEdit");
     cfg.setGroup("View");
     cfg.writeEntry ( "SearchBar", b );
     searchBarAction->setOn(b);
     if(b)
         searchBar->show();
     else
         searchBar->hide();
     editor->setFocus();
 }
 
 void TextEdit::fileNew() {
 //     if( !bFromDocView  ) {
 //         saveAs();
 //     }
     newFile(DocLnk());
 }
 
 void TextEdit::fileOpen() {
     Config cfg("TextEdit");
     cfg. setGroup ( "View" );
-    QString dir = cfg.readEntry("LastOpenDirectory", QPEApplication::documentDir());
     QMap<QString, QStringList> map;
     map.insert(tr("All"), QStringList() );
     QStringList text;
     text << "text/*";
     map.insert(tr("Text"), text );
     text << "*";
     map.insert(tr("All"), text );
     QString str = OFileDialog::getOpenFileName( 2,
-                                                dir ,
+                                                QString::null ,
                                                 QString::null, map);
     if( !str.isEmpty() && QFile(str).exists() && !QFileInfo(str).isDir() )
     {
-       cfg.writeEntry("LastOpenDirectory",  QFileInfo(str).dirPath(false));
        openFile( str );
     }
     else
         updateCaption();
 }
 
 void TextEdit::doSearchBar() {
     if(!useSearchBar)
         searchBar->hide();
     else
         searchBar->show();
 }
 
 #if 0
 void TextEdit::slotFind() {
     FindDialog frmFind( tr("Text Editor"), this );
     connect( &frmFind, SIGNAL(signalFindClicked(const QString &, bool, bool, int)),
        editor, SLOT(slotDoFind( const QString&,bool,bool)));
 
     //case sensitive, backwards, [category]
 
     connect( editor, SIGNAL(notFound()),
        &frmFind, SLOT(slotNotFound()) );
     connect( editor, SIGNAL(searchWrapped()),
        &frmFind, SLOT(slotWrapAround()) );
 
     frmFind.exec();
 
 
 }
 #endif
 
 void TextEdit::fileRevert() {
     clear();
     fileOpen();
 }
 
 void TextEdit::editCut() {
 #ifndef QT_NO_CLIPBOARD
     editor->cut();
 #endif
 }
 
 void TextEdit::editCopy() {
 #ifndef QT_NO_CLIPBOARD
     editor->copy();
 #endif
 }
 
 void TextEdit::editPaste() {
 #ifndef QT_NO_CLIPBOARD
     editor->paste();
 #endif
 }
 
 void TextEdit::editFind() {
     searchBar->show();
     searchEdit->setFocus();
 }
 
 void TextEdit::findNext() {
     editor->find( searchEdit->text(), false, false );
 
 }
 
 void TextEdit::findClose() {
     searchBar->hide();
 }
 
 void TextEdit::search() {
     editor->find( searchEdit->text(), false, false );
 }
 
 void TextEdit::newFile( const DocLnk &f ) {
     DocLnk nf = f;
     nf.setType("text/plain");
     clear();
     setWState (WState_Reserved1 );
     editor->setFocus();
     doc = new DocLnk(nf);
     currentFileName = "Unnamed";
     qDebug("newFile "+currentFileName);
     updateCaption( currentFileName);
 //    editor->setEdited( false);
 }
 
 void TextEdit::openDotFile( const QString &f ) {
     if(!currentFileName.isEmpty()) {
     currentFileName=f;
 
     qDebug("openFile dotfile " + currentFileName);
     QString txt;
     QFile file(f);
     file.open(IO_ReadWrite);
     QTextStream t(&file);
     while ( !t.atEnd()) {
         txt+=t.readLine()+"\n";
     }
     editor->setText(txt);
     editor->setEdited( false);
     edited1=false;
     edited=false;
 
 
     }
     updateCaption( currentFileName);
 }
 
 void TextEdit::openFile( const QString &f ) {
   qDebug("filename is "+ f);
   QString filer;
   QFileInfo fi( f);
 //    bFromDocView = true;
   if(f.find(".desktop",0,true) != -1 && !openDesktop )
     {
       switch ( QMessageBox::warning(this,tr("Text Editor"),tr("Text Editor has detected<BR>you selected a <B>.desktop</B>file.<BR>Open<B>.desktop</B> file or <B>linked</B> file?"),tr(".desktop File"),tr("Linked Document"),0,1,1) )
         {
         case 0: //desktop
           filer = f;
           break;
         case 1: //linked
           DocLnk sf(f);
           filer = sf.file();
           break;
         };
     }
   else if(fi.baseName().left(1) == "")
     {
@@ -851,303 +849,303 @@ bool TextEdit::saveAs() {
 //     }
 //     if ( !editor->edited() ) {
 //         delete doc;
 //         doc = 0;
 //         return true;
 //     }
 
     QString rt = editor->text();
     qDebug(currentFileName);
 
     if( currentFileName.isEmpty()
         || currentFileName == tr("Unnamed")
         || currentFileName == tr("Text Editor")) {
         qDebug("do silly TT filename thing");
 //        if ( doc && doc->name().isEmpty() ) {
         QString pt = rt.simplifyWhiteSpace();
         int i = pt.find( ' ' );
         QString docname = pt;
         if ( i > 0 )
             docname = pt.left( i );
           // remove "." at the beginning
         while( docname.startsWith( "." ) )
             docname = docname.mid( 1 );
         docname.replace( QRegExp("/"), "_" );
           // cut the length. filenames longer than that
           //don't make sense and something goes wrong when they get too long.
         if ( docname.length() > 40 )
             docname = docname.left(40);
         if ( docname.isEmpty() )
             docname = tr("Unnamed");
         if(doc) doc->setName(docname);
         currentFileName=docname;
 //         }
 //         else
 //             qDebug("hmmmmmm");
     }
 
 
     QMap<QString, QStringList> map;
     map.insert(tr("All"), QStringList() );
     QStringList text;
     text << "text/*";
     map.insert(tr("Text"), text );
     text << "*";
     map.insert(tr("All"), text );
 
     QFileInfo cuFi( currentFileName);
     QString filee = cuFi.fileName();
     QString dire = cuFi.dirPath();
     if(dire==".")
         dire = QPEApplication::documentDir();
     QString str;
     if( !featureAutoSave)
       {
           str = OFileDialog::getSaveFileName( 2,
                                               dire,
                                               filee, map);
       }
     else
         str=currentFileName;
     if(!str.isEmpty()) {
         QString fileNm=str;
 
         qDebug("saving filename "+fileNm);
         QFileInfo fi(fileNm);
         currentFileName=fi.fileName();
         if(doc)
 //        QString file = doc->file();
 //        doc->removeFiles();
             delete doc;
             DocLnk nf;
             nf.setType("text/plain");
             nf.setFile( fileNm);
             doc = new DocLnk(nf);
 //        editor->setText(rt);
             qDebug("Saving file as "+currentFileName);
             doc->setName( currentFileName);
             updateCaption( currentFileName);
 
             FileManager fm;
             if ( !fm.saveFile( *doc, rt ) ) {
                 return false;
             }
 
             if( filePerms ) {
                 filePermissions *filePerm;
                 filePerm = new filePermissions(this,
                                                tr("Permissions"),true,
                                                0,(const QString &)fileNm);
                 filePerm->showMaximized();
                 filePerm->exec();
 
                 if( filePerm)
                     delete  filePerm;
             }
 //        }
         editor->setEdited( false);
         edited1 = false;
         edited = false;
         if(caption().left(1)=="*")
             setCaption(caption().right(caption().length()-1));
 
         return true;
     }
     qDebug("returning false");
     return false;
 } //end saveAs
 
 void TextEdit::clear() {
     delete doc;
     doc = 0;
     editor->clear();
 }
 
 void TextEdit::updateCaption( const QString &name ) {
 
     if ( name.isEmpty() )
         setCaption( tr("Text Editor") );
     else {
         QString s = name;
         if ( s.isNull() )
             s = doc->name();
         if ( s.isEmpty()  ) {
             s = tr( "Unnamed" );
             currentFileName=s;
         }
 //         if(s.left(1) == "/")
 //             s = s.right(s.length()-1);
-        setCaption( s + " - " + tr("Text Editor") );
+        setCaption( tr("%1 - Text Editor").arg( s ) );
     }
 }
 
 void TextEdit::setDocument(const QString& fileref) {
     if(fileref != "Unnamed") {
         currentFileName=fileref;
         qDebug("setDocument");
          QFileInfo fi(currentFileName);
          qDebug("basename:"+fi.baseName()+": current filenmame "+currentFileName);
          if( (fi.baseName().left(1)).isEmpty() ) {
         openDotFile(currentFileName);
 
          } else {
              qDebug("setDoc open");
              bFromDocView = true;
              openFile(fileref);
              editor->setEdited(true);
              edited1=false;
              edited=true;
                //   fromSetDocument=false;
  //    doSearchBar();
         }
     }
     updateCaption( currentFileName);
 }
 
 void TextEdit::changeFont() {
   QDialog *d = new QDialog ( this, "FontDialog", true );
   d-> setCaption ( tr( "Choose font" ));
   QBoxLayout *lay = new QVBoxLayout ( d );
   OFontSelector *ofs = new OFontSelector ( true, d );
   lay-> addWidget ( ofs );
   ofs-> setSelectedFont ( editor-> font ( ));
 
   d-> showMaximized ( );
     if ( d-> exec ( ) == QDialog::Accepted )
       editor-> setFont ( ofs-> selectedFont ( ));
     delete d;
 
 }
 
 void TextEdit::editDelete() {
     switch ( QMessageBox::warning(this,tr("Text Editor"),
                                   tr("Do you really want<BR>to <B>delete</B> "
                                      "the current file\nfrom the disk?<BR>This is "
-                                     "<B>irreversable!!</B>"),
+                                     "<B>irreversable!</B>"),
                                   tr("Yes"),tr("No"),0,0,1) ) {
       case 0:
           if(doc) {
               doc->removeFiles();
               clear();
               setCaption( tr("Text Editor") );
           }
           break;
       case 1:
             // exit
           break;
     };
 }
 
 void TextEdit::changeStartConfig( bool b ) {
     startWithNew=b;
     Config cfg("TextEdit");
     cfg.setGroup("View");
     cfg.writeEntry("startNew",b);
     update();
 }
 
 void TextEdit::editorChanged() {
 //    qDebug("editor changed");
     if( /*editor->edited() &&*/ /*edited && */!edited1) {
         setCaption( "*"+caption());
         edited1=true;
     }
     edited=true;
 }
 
 void TextEdit::receive(const QCString&msg, const QByteArray &) {
     qDebug("QCop "+msg);
   if ( msg == "setDocument(QString)" ) {
       qDebug("bugger all");
 
   }
 
 }
 
 void TextEdit::doAbout() {
     QMessageBox::about(0,tr("Text Edit"),tr("Text Edit is copyright<BR>"
                          "2000 Trolltech AS, and<BR>"
                          "2002 by <B>L. J. Potter <BR>llornkcor@handhelds.org</B><BR>"
                          "and is licensed under the GPL"));
 }
 
 void TextEdit::doPrompt(bool b) {
     promptExit=b;
     Config cfg("TextEdit");
     cfg.setGroup ( "View" );
     cfg.writeEntry ( "PromptExit", b);
 }
 
 void TextEdit::doDesktop(bool b) {
     openDesktop=b;
     Config cfg("TextEdit");
     cfg.setGroup ( "View" );
     cfg.writeEntry ( "OpenDesktop", b);
 }
 
 void TextEdit::doFilePerms(bool b) {
     filePerms=b;
     Config cfg("TextEdit");
     cfg.setGroup ( "View" );
     cfg.writeEntry ( "FilePermissions", b);
 }
 
 void TextEdit::editPasteTimeDate() {
 #ifndef QT_NO_CLIPBOARD
   QClipboard *cb = QApplication::clipboard();
   QDateTime dt = QDateTime::currentDateTime();
   cb->setText( dt.toString());
   editor->paste();
 #endif
 }
 
 int TextEdit::savePrompt()
 {
     switch( QMessageBox::information( 0, (tr("Textedit")),
                                       (tr("Textedit detected\n"
                                           "you have unsaved changes\n"
                                           "Go ahead and save?\n")),
                                       (tr("Save")), (tr("Don't Save")), (tr("&Cancel")), 2, 2 ) )
       {
         case 0:
         {
             return 1;
         }
         break;
 
         case 1:
         {
             return 2;
         }
         break;
 
         case 2:
         {
             return -1;
         }
         break;
       };
 
     return 0;
 }
 
 void TextEdit::timerCrank()
 {
     if(featureAutoSave && edited1)
       {
           if(currentFileName.isEmpty())
             {
                 currentFileName = QDir::homeDirPath()+"/textedit.tmp";
                 saveAs();
             }
           else
             {
 //                qDebug("autosave");
                 save();
             }
           setTimer();
       }
 }
 
 void TextEdit::doTimer(bool b)
 {
     Config cfg("TextEdit");
diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp
index d95a59b..7dcb5f6 100644
--- a/core/opie-login/main.cpp
+++ b/core/opie-login/main.cpp
@@ -1,369 +1,385 @@
 /*
                =.            This file is part of the OPIE Project
              .=l.            Copyright (c)  2002 Robert Griebl <sandman@handhelds.org>
            .>+-=
  _;:,     .>    :=|.         This file is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This file 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 file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #define _GNU_SOURCE
 
 #include <sys/types.h>
 #include <time.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <unistd.h>
 #include <syslog.h>
 #include <sys/wait.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <getopt.h>
 #include <string.h>
 
 #include <qpe/qpeapplication.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpestyle.h>
 #include <qpe/power.h>
 #include <qpe/config.h>
 
 #include <opie/odevice.h>
 
 #include <qwindowsystem_qws.h>
 #include <qwsmouse_qws.h>
 #include <qmessagebox.h>
 #include <qlabel.h>
 #include <qtimer.h>
 #include <qfile.h>
+#include <qtextstream.h>
 
 #include "loginapplication.h"
 #include "loginwindowimpl.h"
 #include "calibrate.h"
 
 using namespace Opie;
 
 int login_main ( int argc, char **argv, pid_t ppid );
 void sigterm ( int sig );
 void sigint ( int sig );
 void exit_closelog ( );
 
 static struct option long_options [] = {
 	{ "autologin", 1, 0, 'a' },
 	{ 0, 0, 0, 0 }
 };
 
 
 int main ( int argc, char **argv )
 {
+    int userExited = 0;
 	pid_t ppid = ::getpid ( );
 
 	if ( ::geteuid ( ) != 0 ) {
 		::fprintf ( stderr, "%s can only be executed by root. (or chmod +s)", argv [0] );
 		return 1;
 	}
 	if ( ::getuid ( ) != 0 ) // qt doesn't really like SUID and
 		::setuid ( 0 );      // messes up things like config files
 
 	char *autolog = 0;
 	int c;
 	while (( c = ::getopt_long ( argc, argv, "a:", long_options, 0 )) != -1 ) {
 		switch ( c ) {
 			case 'a':
 				autolog = optarg;
 				break;
 			default:
 				::fprintf ( stderr, "Usage: %s [-a|--autologin=<user>]\n", argv [0] );
 				return 2;
 		}
 	}
 
 //	struct rlimit rl;
 //	::getrlimit ( RLIMIT_NOFILE, &rl );
 
 //	for ( unsigned int i = 0; i < rl. rlim_cur; i++ )
 //		::close ( i );
 
 	::setpgid ( 0, 0 );
 	::setsid ( );
 
 	::signal ( SIGTERM, sigterm );	
 	::signal ( SIGINT, sigterm );
 
 	::openlog ( "opie-login", LOG_CONS, LOG_AUTHPRIV );
 	::atexit ( exit_closelog );
 
 	while ( true ) {
 		pid_t child = ::fork ( );
 
 		if ( child < 0 ) {
 			::syslog ( LOG_ERR, "Could not fork GUI process\n" );
 			break;
 		}
 		else if ( child > 0 ) {
 			int status = 0;
 			time_t started = ::time ( 0 );
 
 			while ( ::waitpid ( child, &status, 0 ) < 0 ) { }
 
 			LoginApplication::logout ( );
 
 			if (( ::time ( 0 ) - started ) < 3 ) {
 				if ( autolog ) {
 					::syslog ( LOG_ERR, "Respawning too fast -- disabling auto-login\n" );
 					autolog = 0;
 				}
 				else {
 					::syslog ( LOG_ERR, "Respawning too fast -- going down\n" );
 					break;
 				}
 			}
 			int killedbysig = 0;
+            userExited=0;
+            if (WIFEXITED(status)!=0 ) {
+                if (WEXITSTATUS(status)==137)  {
+                    userExited=1;
+                }
+            }
 
 			if ( WIFSIGNALED( status )) {
 				switch ( WTERMSIG( status )) {
-					case SIGINT :
 					case SIGTERM:
+					case SIGINT :
 					case SIGKILL:
 						break;
 
 					default     :
 						killedbysig = WTERMSIG( status );
 						break;
 				}
 			}
 			if ( killedbysig ) {  // qpe was killed by an uncaught signal
 				qApp = 0;
 				
 				::syslog ( LOG_ERR, "Opie was killed by a signal #%d", killedbysig );
 
 				QWSServer::setDesktopBackground ( QImage ( ));
 				QApplication *app = new QApplication ( argc, argv, QApplication::GuiServer );
 				app-> setFont ( QFont ( "Helvetica", 10 ));
 				app-> setStyle ( new QPEStyle ( ));
 
 				const char *sig = ::strsignal ( killedbysig );
 				QLabel *l = new QLabel ( 0, "sig", Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_Tool );
-				l-> setText ( LoginWindowImpl::tr( "OPIE was terminated\nby an uncaught signal\n(%1)\n" ). arg ( sig ));
+				l-> setText ( LoginWindowImpl::tr( "Opie was terminated\nby an uncaught signal\n(%1)\n" ). arg ( sig ));
 				l-> setAlignment ( Qt::AlignCenter );
 				l-> move ( 0, 0 );
 				l-> resize ( app-> desktop ( )-> width ( ), app-> desktop ( )-> height ( ));
 				l-> show ( );
 				QTimer::singleShot ( 3000, app, SLOT( quit ( )));
 				app-> exec ( );
 				delete app;
 				qApp = 0;
 			}
 		}
 		else {
 			if ( !autolog ) {
-				Config cfg ( "opie-login" );
+                QString confFile=QPEApplication::qpeDir() + "/etc/opie-login.conf";
+				Config cfg ( confFile, Config::File );
 				cfg. setGroup ( "General" );
 				QString user = cfg. readEntry ( "AutoLogin" );
 				
 				if ( !user. isEmpty ( ))
 					autolog = ::strdup ( user. latin1 ( ));
 			}
 		
-			if ( autolog ) {
-				LoginApplication::setLoginAs ( autolog );
+			if ( autolog && !userExited ) {
+
+                QWSServer::setDesktopBackground( QImage() );
+                ODevice::inst ( )-> setDisplayStatus ( true );
+                ODevice::inst ( )-> setSoftSuspend ( false );
+                LoginApplication *app = new LoginApplication ( argc, argv, ppid );
+                LoginApplication::setLoginAs ( autolog );
+  
 
 				if ( LoginApplication::changeIdentity ( ))
 					::exit ( LoginApplication::login ( ));
 				else
 					::exit ( 0 );
 			}
-			else 
+			else  {
 				::exit ( login_main ( argc, argv, ppid ));
+            }
 		}
 	}
 	return 0;
 }
 
 void sigterm ( int /*sig*/ )
 {
 	::exit ( 0 );
 }
 
 
 void exit_closelog ( )
 {
 	::closelog ( );
 }
 
 
 class LoginScreenSaver : public QWSScreenSaver
 {
 public:
   LoginScreenSaver ( )
   {
     m_lcd_status = true;
 
     m_backlight_bright = -1;
     m_backlight_forcedoff = false;
 
     // Make sure the LCD is in fact on, (if opie was killed while the LCD is off it would still be off)
     ODevice::inst ( )-> setDisplayStatus ( true );
   }
   void restore()
   {
     if ( !m_lcd_status )     // We must have turned it off
       ODevice::inst ( ) -> setDisplayStatus ( true );
 
     setBacklight ( -3 );
   }
   bool save( int level )
   {
     switch ( level ) {
       case 0:
         if ( backlight() > 1 )
           setBacklight( 1 ); // lowest non-off
         return true;
         break;
       case 1:
         setBacklight( 0 ); // off
         return true;
         break;
       case 2:
         // We're going to suspend the whole machine
         if ( PowerStatusManager::readStatus().acStatus() != PowerStatus::Online ) {
           QWSServer::sendKeyEvent( 0xffff, Qt::Key_F34, FALSE, TRUE, FALSE );
           return true;
         }
         break;
     }
     return false;
   }
 
 private:
 public:
   void setIntervals( int i1 = 30, int i2 = 20, int i3 = 60 )
   {
     int v [4];
 
     v [ 0 ] = QMAX( 1000 * i1, 100 );
     v [ 1 ] = QMAX( 1000 * i2, 100 );
     v [ 2 ] = QMAX( 1000 * i3, 100 );
     v [ 3 ] = 0;
 
     if ( !i1 && !i2 && !i3 )
       QWSServer::setScreenSaverInterval ( 0 );
     else
       QWSServer::setScreenSaverIntervals ( v );
   }
 
   int backlight ( )
   {
     if ( m_backlight_bright == -1 )
       m_backlight_bright = 255;
 
     return m_backlight_bright;
   }
 
   void setBacklight ( int bright )
   {
     if ( bright == -3 ) {
       // Forced on
       m_backlight_forcedoff = false;
       bright = -1;
     }
     if ( m_backlight_forcedoff && bright != -2 )
       return ;
     if ( bright == -2 ) {
       // Toggle between off and on
       bright = m_backlight_bright ? 0 : -1;
       m_backlight_forcedoff = !bright;
     }
 
     m_backlight_bright = bright;
 
     bright = backlight ( );
     ODevice::inst ( ) -> setDisplayBrightness ( bright );
 
     m_backlight_bright = bright;
   }
 
 private:
   bool m_lcd_status;
 
   int m_backlight_bright;
   bool m_backlight_forcedoff;
 };
 
 
 namespace Opie { extern int force_appearance; }  // HACK to get around the force-style setting
 
 
 int login_main ( int argc, char **argv, pid_t ppid )
 {
 	QWSServer::setDesktopBackground( QImage() );
 	LoginApplication *app = new LoginApplication ( argc, argv, ppid );
 
 	Opie::force_appearance = 0;
 
 	app-> setFont ( QFont ( "Helvetica", 10 ));
 	app-> setStyle ( new QPEStyle ( ));
 
 	ODevice::inst ( )-> setSoftSuspend ( true );
 
 	if ( QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) {
 		if ( !QFile::exists ( "/etc/pointercal" )) {
 			// Make sure calibration widget starts on top.
 			Calibrate *cal = new Calibrate;
 			cal-> exec ( );
 			delete cal;
 		}
 	}
 
 	LoginScreenSaver *saver = new LoginScreenSaver;
 
 	saver-> setIntervals ( );
 	QWSServer::setScreenSaver ( saver );
 	saver-> restore ( );
 
 
 	LoginWindowImpl *lw = new LoginWindowImpl ( );
 	app-> setMainWidget ( lw );
 	lw-> setGeometry ( 0, 0, app-> desktop ( )-> width ( ), app-> desktop ( )-> height ( ));
 	lw-> show ( );
 
 	int rc = app-> exec ( );
 
 	ODevice::inst ( )-> setSoftSuspend ( false );
 
 	if ( app-> loginAs ( )) {
 		if ( app-> changeIdentity ( )) {
 			app-> login ( );
 
 			// if login succeeds, it never comes back
 
-			QMessageBox::critical ( 0, LoginWindowImpl::tr( "Failure" ), LoginWindowImpl::tr( "Could not start OPIE." ));
+			QMessageBox::critical ( 0, LoginWindowImpl::tr( "Failure" ), LoginWindowImpl::tr( "Could not start Opie." ));
 			rc = 1;
 		}
 		else {
 			QMessageBox::critical ( 0, LoginWindowImpl::tr( "Failure" ), LoginWindowImpl::tr( "Could not switch to new user identity" ));
 			rc = 2;
 		}
 
 	}
 	return rc;
 }
 
diff --git a/core/opie-login/opie-login.conffiles b/core/opie-login/opie-login.conffiles
new file mode 100644
index 0000000..90645ee
--- a/dev/null
+++ b/core/opie-login/opie-login.conffiles
@@ -0,0 +1 @@
+/opt/QtPalmtop/etc/opie-login.conf
diff --git a/core/opiealarm/Makefile b/core/opiealarm/Makefile
index 0c8467e..255083d 100644
--- a/core/opiealarm/Makefile
+++ b/core/opiealarm/Makefile
@@ -1,26 +1,22 @@
 
 DESTDIR=$(OPIEDIR)/bin
 
 CROSS:=arm-linux-
 CC   :=$(CROSS)gcc
 LD   :=$(CROSS)gcc
 STRIP:=$(CROSS)strip
 
 CFLAGS:=-O2
 LDFLAGS:=
 
 all: $(DESTDIR)/opiealarm
 
 $(DESTDIR)/opiealarm: opiealarm.c
 	$(CC) $(CFLAGS) opiealarm.c -o $(DESTDIR)/opiealarm $(LDFLAGS)
 	$(STRIP) --strip-all $(DESTDIR)/opiealarm
 	chmod u+s $(DESTDIR)/opiealarm
 	chown root $(DESTDIR)/opiealarm 2>/dev/null || echo -e "\nopiealarm must be owned by root to work correctly.\n"
 
 clean:
 	-rm -f *~ core
 
-install:
-	cp $(DESTDIR)/opiealarm $(INSTALL_ROOT)/opt/QtPalmtop/bin
-	chown root $(INSTALL_ROOT)/opt/QtPalmtop/bin/opiealarm
-	chmod u+s  $(INSTALL_ROOT)/opt/QtPalmtop/bin/opiealarm 2>/dev/null || echo -e "\nopiealarm must be owned by root to work correctly.\n"
diff --git a/core/opiealarm/config.in b/core/opiealarm/config.in
index 2be9bd4..f86d01c 100644
--- a/core/opiealarm/config.in
+++ b/core/opiealarm/config.in
@@ -1,4 +1,4 @@
 config OPIEALARM
-  boolean "opie-opiealarm (Alarm daemon, sets RTC with wakeup time on suspend)"
+  boolean "Opiealarm (Alarm daemon, sets RTC with wakeup time on suspend)"
   depends ! TARGET_X86
   default "y"
diff --git a/core/opiealarm/opiealarm.c b/core/opiealarm/opiealarm.c
index 998cabd..90a743f 100644
--- a/core/opiealarm/opiealarm.c
+++ b/core/opiealarm/opiealarm.c
@@ -1,383 +1,384 @@
 /*
  * opiealarm.c
  *
  *  This program is for extracting the event time/date out
  *  of /var/run/resumeat and setting the RTC alarm to that time/date.
  *  It is designed to run via a script just before the iPAQ
  *  is suspended and right after the iPAQ resumes operation.
  * 
  *  written and copyrighted by Robert Griebl <sandman@handhelds.org>
  */
 
 #include <stdio.h>
 #include <linux/rtc.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
 #include <time.h>
 #include <stdlib.h>
 #include <syslog.h>
 #include <signal.h>
 #include <errno.h>
 #include <string.h>
 
 
 #define PIDFILE 	"/var/run/opiealarm.pid"
 #define TIMEFILE    "/var/run/resumeat"
 #define APMFILE		"/proc/apm"
 
 int resume ( int resuspend );
 int suspend ( int fix_rtc );
 int main ( int argc, char **argv );
 int fork_with_pidfile ( void );
 int kill_with_pidfile ( void );
 void remove_pidfile ( void );
 void usage ( void );
 void sig_handler_child ( int sig );
 void sig_handler_parent ( int sig );
 int onac ( void );
 
 static int opiealarm_was_running;
 static pid_t parent_pid = 0;
 
 
 
 void sig_handler_child ( int sig )
 {
 	// child got SIGUSR2 -> cleanup pidfile and exit
 
 	remove_pidfile ( );
 	exit ( 0 );
 }
 
 void sig_handler_parent ( int sig )
 {
 	// parent got SIGUSR1 -> safe to exit now
 
 	parent_pid = 0;	
 	exit ( 0 );
 }
 
 void usage ( void )
 {
 	fprintf ( stderr, "Usage: opiealarm -s [-f] | -r [-a]\n\n" );
 	fprintf ( stderr, "\t-s\tSuspend mode: set RTC alarm\n" );
 	fprintf ( stderr, "\t-f    \tFix RTC, if RTC and system have more than 5sec difference (suspend mode)\n" );
 	fprintf ( stderr, "\t-r\tResume mode: kill running opiealarm\n" );
 	fprintf ( stderr, "\t-a <x>\tResuspend in <x> seconds (resume mode)\n\n" );
 	exit ( 1 );
 }
 
 int fork_with_pidfile ( void )
 {
 	FILE *fp;
 	pid_t pid;
 	
 	pid = fork ( );
 	
 	if ( pid > 0 ) {
 		// We can not just exit now, because the kernel could suspend 
 		// the iPAQ just before the child process sets the RTC.
 		// Solution: just wait for SIGUSR1 - the child process will 
 		// signal this when it thinks it is safe to exit.
 		
 		signal ( SIGUSR1, sig_handler_parent );
 		while ( 1 )
 			sleep ( 1000 );
 		exit ( 0 );
 	}
 	else if ( pid < 0 ) {
 		perror ( "forking failed" );
 		return 0;
 	}	
+	//	sleep( 60 );
 
 	// child process needs to react to SIGUSR2. This is sent when
 	// a new opiealarm process is started.
 
 	signal ( SIGUSR2, sig_handler_child );
 
 	// save pid
 	if (( fp = fopen ( PIDFILE, "w" ))) {
 		fprintf ( fp, "%d", getpid ( ));
 		fclose ( fp );
 
 		// detach
 		close ( 0 );
 		close ( 1 );
 		close ( 2 );
 
 		setpgid ( 0, 0 );
 
 		return 1;
 	}
 	else {
 		perror ( PIDFILE );
 		return 0;
 	}
 }
 
 int kill_with_pidfile ( void )
 {
 	FILE *fp;
 	pid_t pid;
 	int res = 0;
 
 	// terminate a running opiealarm child process
 	// return 1 if we really killed one
 
 	if (( fp = fopen ( PIDFILE, "r" ))) {
 		if ( fscanf ( fp, "%d", &pid ) == 1 )
 			res = ( kill ( pid, SIGUSR2 ) == 0 ) ? 1 : 0;
 		fclose ( fp );
 	}
 	return res;
 }
 
 void remove_pidfile ( void )
 {
 	// child is about to exit - cleanup
 
 	unlink ( PIDFILE );	
 	signal ( SIGUSR2, SIG_DFL );
 }
 
 
 int main ( int argc, char **argv ) 
 {
 	int mode = 0;
 	int ac_resusp = 0;
 	int fix_rtc = 0;
 	int opt;
 
 	while (( opt = getopt ( argc, argv, "a:frs" )) != EOF ) {
 		switch ( opt ) {
 			case 's':
 				mode = 's';
 				break;
 			case 'r':
 				mode = 'r';
 				break;
 			case 'a':
 				ac_resusp = atoi ( optarg );
 				if ( ac_resusp < 30 ) {
 					ac_resusp = 120;
 					
 					fprintf ( stderr, "Warning: resuspend timeout must be >= 30 sec. -- now set to 120 sec\n" );
 				}
 				break;
 			case 'f':
 				fix_rtc = 1;
 				break;				
 			default:
 				usage ( );
 		}
 	}	
 	
 	if ( geteuid ( ) != 0 ) {
 		fprintf ( stderr, "You need root priviledges to run opiealarm." );
 		return 2;
 	}
 	
 	if ( !mode )
 		usage ( );
 
 
 	parent_pid = getpid ( );
 
 	// kill running opiealarm
 	opiealarm_was_running = kill_with_pidfile ( );
 	remove_pidfile ( );
 
 	switch ( mode ) {
 		case 'r': opt = resume ( ac_resusp );
 		          break;
 		case 's':
 		default : opt = suspend ( fix_rtc );
 		          break;
 	}
 	
 	parent_pid = 0;
 	return opt;
 }		
 		
 
 int suspend ( int fix_rtc )
 {
-	FILE *fp;
+	FILE *fp = NULL;
 	char buf [64];
 	time_t alrt, syst, rtct;
 	struct tm alr, sys, rtc;
 	int fd;
 	int rtc_sys_diff;
 	
 	
 	if ( !fork_with_pidfile ( ))
 		return 3;
 
 	// we are the child process from here on ...
 
 	tzset ( );  // not sure if it is really needed -- it probably doesn't hurt ...
 	
 	time ( &syst );// get the UNIX system time
 	sys = *localtime ( &syst );		
 	
 	do {
 		
 		if (( fd = open ( "/dev/misc/rtc", O_RDWR )) < 0 )
 			if (( fd = open ( "/dev/rtc", O_RDWR )) < 0 )
 				break; //  ( 1, "rtc" );	
 	
 		memset ( &rtc, 0, sizeof ( struct tm ));    // get the RTC time
 	
 		if ( ioctl ( fd, RTC_RD_TIME, &rtc ) < 0 )
 			break; //  ( 1, "ioctl RTC_RD_TIME" );		
 	
 		rtct = mktime ( &rtc );
 
 		rtc_sys_diff = ( syst - rtct ) - sys. tm_gmtoff;  // calculate the difference between system and hardware time
 	
 		if ( fix_rtc && (( rtc_sys_diff < -3 ) || ( rtc_sys_diff > 3 ))) {
 			struct tm set;		
 			set = *gmtime ( &syst );
 		
 			// if the difference between system and hardware time is more than 3 seconds,
 			// we have to set the RTC (hwclock --systohc), or alarms won't work reliably.
 
 			if ( ioctl ( fd, RTC_SET_TIME, &set ) < 0 )
 				break; //  ( 1, "ioctl RTC_SET_TIME" );
 		}
 
 		// read the wakeup time from TIMEFILE
 		if (!( fp = fopen ( TIMEFILE, "r" ))) 
 			break; //  ( 1, TIMEFILE );
 	
 		if ( !fgets ( buf, sizeof( buf ) - 1, fp ))
 			break; //  ( 1, TIMEFILE );
 
 		fclose ( fp );
-		fp = 0;
+		fp = NULL;
 	
 		alrt = atoi ( buf ); // get the alarm time
 
 		if ( alrt == 0 )
 			break; //  ( 0, TIMEFILE " contains an invalid time description" );	
 		alrt -= 5; 	// wake up 5 sec before the specified time	
 	
 		alr = *gmtime ( &alrt );
 	
 		if ( ioctl ( fd, RTC_ALM_SET, &alr ) < 0 )  // set RTC alarm time
 			break; //  ( 1, "ioctl RTC_ALM_SET" );		
 	
 	 	if ( ioctl ( fd, RTC_AIE_ON, 0 ) < 0 )
 			break; //  ( 1, "ioctl RTC_AIE_ON" );   // enable RTC alarm irq
 
 		// tell the parent it is safe to exit now .. we have set the RTC alarm
 		kill ( parent_pid, SIGUSR1 );
 			
 		if ( read ( fd, buf, sizeof( unsigned long )) < 0 ) // wait for the RTC alarm irq
 			break; //  ( 1, "read rtc alarm" );
 	
 		// iPAQ woke up via RTC irq -- otherwise we would have received a SIGUSR2
 		// from the "resume instance" of opiealarm.
 	
 		if ( ioctl ( fd, RTC_AIE_OFF, 0 ) < 0 )     // disable RTC alarm irq
 			break; //  ( 1, "ioctl RTC_AIE_OFF" );
 
 		close ( fd );
 		fd = -1;
 		
 		remove_pidfile ( );
 		
 		return 0;	
 
 	} while ( 0 );
 
 	if ( fp != NULL )
 		fclose ( fp );
 	
 	if ( fd != -1 )
 		close ( fd );
 
 	kill ( parent_pid, SIGUSR1 );
 
 	while ( 1 )		    // pretend that we are waiting on RTC, so opiealarm -r can kill us
 		sleep ( 1000 ); // if we don't do this, the "resuspend on AC" would be triggerd
 	return 0;
 }
 
 int onac ( void )
 {
 	FILE *fp;
 	int on = 0;
 
 	// check the apm proc interface for AC status
 
 	if (( fp = fopen ( APMFILE, "r" ))) { 
 		int ac = 0;
 	
 		if ( fscanf ( fp, "%*[^ ] %*d.%*d 0x%*x 0x%x 0x%*x 0x%*x %*d%% %*i %*c", &ac ) == 1 )
 			on = ( ac == 0x01 ) ? 1 : 0;
 
 		fclose ( fp );
 	}
 	return on;
 }
 
 int resume ( int resuspend )
 {
 	FILE *fp;
 
 	// re-suspend when on AC (optional) when woken up via RTC
 
 	if ( !opiealarm_was_running ) { 
 		// if opiealarm -s didn't wake up via RTC, the old process gets killed
 		// by kill_by_pidfile(), which is recorded in opiealarm_was_running
 	
 		if ( resuspend && onac ( )) {	
 			time_t start, now;
 			char *argv [4];
 						
 			if ( !fork_with_pidfile ( ))
 				return 4;
 				
 			// we can't wait for the resuspend timeout in the parent process.
 			// so we fork and tell the parent it can exit immediatly
 				
 			kill ( parent_pid, SIGUSR1 );
 
 			// sleep <resuspend> seconds - this method is much more precise than sleep() !
 			time ( &start );
 			do {
 				sleep ( 1 );
 				time ( &now );
 			} while (( now - start ) < resuspend );
 
 			if ( onac ( )) { // still on ac ?
 				argv[0] = "qcop";
 				argv[1] = "QPE/Desktop";
 				argv[2] = "suspend()";
 				argv[3] = 0;
 	
 				// hard coded for now ...but needed
 				// another way would be to simulate a power-button press
 				
 				setenv ( "LOGNAME", "root", 1 );
 				setenv ( "HOME", "/root", 1 );
 				setenv ( "LD_LIBRARY_PATH", "/opt/QtPalmtop/lib", 1 );
 				setenv ( "QTDIR", "/opt/QtPalmtop", 1 );
 			
 				remove_pidfile ( );
 			
-				// no need for system() since this process is no longer usefull anyway
+				// no need for system() since this process is no longer usefull anyway				
 				execv ( "/opt/QtPalmtop/bin/qcop", argv );
 				
 				perror ( "exec for qcop failed" );
 				return 5;
 			}
 		}
 	}
 	return 0;
 }
diff --git a/core/settings/launcher/tabdialog.cpp b/core/settings/launcher/tabdialog.cpp
index 5f68010..de99a09 100644
--- a/core/settings/launcher/tabdialog.cpp
+++ b/core/settings/launcher/tabdialog.cpp
@@ -1,224 +1,224 @@
 /*
                =.            This file is part of the OPIE Project
              .=l.            Copyright (c)  2002 Robert Griebl <sandman@handhelds.org>
            .>+-=
  _;:,     .>    :=|.         This file is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This file 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 file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #include <qpe/applnk.h>
 
 #include <qlayout.h>
 #include <qvbox.h>
 #include <qtabbar.h>
 #include <qiconview.h>
 #include <qapplication.h>
 #include <qlabel.h>
 #include <qradiobutton.h>
 #include <qbuttongroup.h>
 #include <qpushbutton.h>
 #include <qwhatsthis.h>
 #include <qcheckbox.h>
 
 #include <opie/ofontselector.h>
 #include <opie/otabwidget.h>
 #include <opie/ocolorbutton.h>
 #include <opie/ofiledialog.h>
 
 #include "tabdialog.h"
 
 
 class SampleItem : public QIconViewItem {
 public:
 	SampleItem ( QIconView *v, const QString &text, const QPixmap &pix ) : QIconViewItem ( v, text )
 	{
 		m_large = pix;
 		m_small. convertFromImage ( pix. convertToImage ( ). smoothScale ( pix. width ( ) / 2, pix. height ( ) / 2 ));
 	}
 
 	void sizeChange ( )
 	{
 		calcRect ( );
 		repaint ( );
 	}
 
 	QPixmap *pixmap ( ) const
 	{
 		if ( iconView ( )-> itemTextPos ( ) == QIconView::Right )
 			return (QPixmap *) &m_small;
 		else
 			return (QPixmap *) &m_large;
 	}
 
 private:
 	QPixmap m_large, m_small;
 };
 
 class SampleView : public QIconView {
 public:
 	SampleView ( QWidget *parent = 0, const char *name = 0 ) : QIconView ( parent, name )
 	{
 		setItemsMovable ( false );
 		setAutoArrange ( true );
 		setSorting ( true );
 		setFrameStyle ( QFrame::NoFrame );
 		setSpacing ( 4 );
 		setMargin ( 0 );
 		setSelectionMode ( QIconView::NoSelection );
 		setBackgroundMode ( PaletteBase );
 		setViewMode ( TabConfig::Icon );
 		calculateGrid ( Bottom );
 
 
-		new SampleItem ( this, tr( "Sample 1" ), Resource::loadPixmap ( "datebook/DateBook" ));
-		new SampleItem ( this, tr( "Sample 2" ), Resource::loadPixmap ( "Calibrate" ));
-		new SampleItem ( this, tr( "Sample 3" ), Resource::loadPixmap ( "UnknownDocument" ));
+		new SampleItem ( this, QObject::tr( "Sample 1" ), Resource::loadPixmap ( "datebook/DateBook" ));
+		new SampleItem ( this, QObject::tr( "Sample 2" ), Resource::loadPixmap ( "Calibrate" ));
+		new SampleItem ( this, QObject::tr( "Sample 3" ), Resource::loadPixmap ( "UnknownDocument" ));
 
 		setBackgroundType ( TabConfig::Ruled, QString::null );
 
 		setMaximumHeight ( firstItem ( )-> height ( ) + 16 );
 	}
 
 	void setViewMode ( TabConfig::ViewMode m )
 	{
 		viewport ( )-> setUpdatesEnabled ( false );
 
 		switch ( m ) {
 			case TabConfig::List:
 				setItemTextPos( QIconView::Right );
 				break;
 			case TabConfig::Icon:
 				setItemTextPos( QIconView::Bottom );
 				break;
 		}
 //		hideOrShowItems ( false );
 
 		for ( QIconViewItem *it = firstItem ( ); it; it = it-> nextItem ( ))
 			((SampleItem *) it )-> sizeChange ( );
 		arrangeItemsInGrid ( true );
 		viewport ( )-> setUpdatesEnabled ( true );
 		update ( );
 	}
 
 
 	void setBackgroundType( TabConfig::BackgroundType t, const QString &val )
 	{
 		switch ( t ) {
 			case TabConfig::Ruled: {
 				QPixmap bg ( width ( ), 9 );
 				QPainter painter ( &bg );
 				for ( int i = 0; i < 3; i++ ) {
 					painter. setPen ( white );
 					painter. drawLine ( 0, i*3, width()-1, i*3 );
 					painter. drawLine ( 0, i*3+1, width()-1, i*3+1 );
 					painter. setPen ( colorGroup().background().light(105) );
 					painter. drawLine ( 0, i*3+2, width()-1, i*3+2 );
 				}
 				painter.end ( );
 				setBackgroundPixmap ( bg );
 				break;
 			}
 
 			case TabConfig::SolidColor: {
 				setBackgroundPixmap ( QPixmap ( ));
 				if ( val. isEmpty ( ))
 					setBackgroundColor ( colorGroup ( ). base ( ));
 				else
 					setBackgroundColor ( val );
 				break;
 			}
 
 			case TabConfig::Image: {
 				qDebug( "Loading image: %s", val.latin1() );
 				QPixmap bg ( Resource::loadPixmap ( "wallpaper/" + val ));
 				if ( bg. isNull ( )) {
 					QImageIO imgio;
 					imgio. setFileName ( val );
 					QSize ds = qApp-> desktop ( )-> size ( );
 					QString param ( "Scale( %1, %2, ScaleMin )" ); // No tr
 					imgio. setParameters ( param. arg ( ds. width ( )). arg ( ds. height ( )). latin1 ( ));
 					imgio. read ( );
 					bg = imgio. image ( );
 				}
 				setBackgroundPixmap ( bg );
 				break;
 			}
 		}
 		m_bgtype = t;
 		viewport ( )-> update ( );
 	}
 
 	void setTextColor ( const QColor &tc )
 	{
 		m_textcolor = tc;
 		QColorGroup cg = colorGroup ( );
 		cg. setColor ( QColorGroup::Text, tc );
 		setPalette ( QPalette ( cg, cg, cg ));
 		viewport ( )-> update ( );
 	}
 
 	void setViewFont ( const QFont &f )
 	{
 		setFont ( f );
 	}
 
 	void setItemTextPos ( ItemTextPos pos )
 	{
 		calculateGrid ( pos );
 		QIconView::setItemTextPos( pos );
 	}
 
 	void calculateGrid ( ItemTextPos pos )
 	{
 		int dw = QApplication::desktop ( )-> width ( );
 		int viewerWidth = dw - style ( ).scrollBarExtent ( ). width ( );
 		if ( pos == Bottom ) {
 			int cols = 3;
 			if ( viewerWidth <= 200 )
 				cols = 2;
 			else if ( viewerWidth >= 400 )
 				cols = viewerWidth/96;
 			setSpacing ( 4 );
 			setGridX (( viewerWidth - ( cols + 1 ) * spacing ( )) / cols );
 			setGridY ( fontMetrics ( ). height ( ) * 2 + 24 );
 		}
 		else {
 			int cols = 2;
 			if ( viewerWidth < 150 )
 				cols = 1;
 			else if ( viewerWidth >= 400 )
 				cols = viewerWidth / 150;
 			setSpacing ( 2 );
 			setGridX (( viewerWidth - ( cols + 1 ) * spacing ( )) / cols );
 			setGridY ( fontMetrics ( ). height ( ) + 2 );
 		}
 	}
 
 	void paletteChange( const QPalette &p )
 	{
 		static bool excllock = false;
 
 		if ( excllock )
 			return;
 		excllock = true;
diff --git a/core/settings/security/security.cpp b/core/settings/security/security.cpp
index 4701506..75a181b 100644
--- a/core/settings/security/security.cpp
+++ b/core/settings/security/security.cpp
@@ -1,235 +1,307 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
-**
-** This file is part of Qtopia 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.
-**
-**********************************************************************/
+ ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+ **
+ ** This file is part of Qtopia 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 "security.h"
 
+#include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <qpe/password.h>
 #include <qpe/qpedialog.h>
 
 #include <qcheckbox.h>
 #include <qpushbutton.h>
 #include <qcombobox.h>
 #include <qmessagebox.h>
+#include <qfile.h>
+#include <qlistview.h>
+#include <qtextstream.h>
 
-Security::Security( QWidget* parent,  const char* name, WFlags fl )
-    : SecurityBase( parent, name, TRUE, fl )
+    Security::Security( QWidget* parent,  const char* name, WFlags fl )
+: SecurityBase( parent, name, TRUE, fl )
 {
     valid=FALSE;
     Config cfg("Security");
     cfg.setGroup("Passcode");
     passcode = cfg.readEntry("passcode");
     passcode_poweron->setChecked(cfg.readBoolEntry("passcode_poweron",FALSE));
     cfg.setGroup("Sync");
     int auth_peer = cfg.readNumEntry("auth_peer",0xc0a88100);//new default 192.168.129.0/24
     int auth_peer_bits = cfg.readNumEntry("auth_peer_bits",24);
     selectNet(auth_peer,auth_peer_bits);
     connect(syncnet, SIGNAL(textChanged(const QString&)),
-      this, SLOT(setSyncNet(const QString&)));
+            this, SLOT(setSyncNet(const QString&)));
 
     /*
-    cfg.setGroup("Remote");
-    if ( telnetAvailable() )
-  telnet->setChecked(cfg.readEntry("allow_telnet"));
-    else
-  telnet->hide();
-
-    if ( sshAvailable() )
-  ssh->setChecked(cfg.readEntry("allow_ssh"));
-    else
-  ssh->hide();
-    */
+       cfg.setGroup("Remote");
+       if ( telnetAvailable() )
+       telnet->setChecked(cfg.readEntry("allow_telnet"));
+       else
+       telnet->hide();
 
+       if ( sshAvailable() )
+       ssh->setChecked(cfg.readEntry("allow_ssh"));
+       else
+       ssh->hide();
+       */
+
+    QString configFile = QPEApplication::qpeDir() + "/etc/opie-login.conf";
+    Config loginCfg(configFile,Config::File);
+
+    loginCfg.setGroup("General");
+    autoLoginName=loginCfg.readEntry("AutoLogin","");
+
+    if (autoLoginName.stripWhiteSpace().isEmpty()) {
+        autoLogin=false;
+    } else {
+        autoLogin=true;
+    }
+
+
+    connect(autologinToggle, SIGNAL(toggled(bool)), this, SLOT(toggleAutoLogin(bool)));
+    connect(userlist, SIGNAL(activated(int)), this, SLOT(changeLoginName(int)));
     connect(changepasscode,SIGNAL(clicked()), this, SLOT(changePassCode()));
     connect(clearpasscode,SIGNAL(clicked()), this, SLOT(clearPassCode()));
+
+    loadUsers();
     updateGUI();
 
     dl = new QPEDialogListener(this);
     showMaximized();
 }
 
 Security::~Security()
 {
 }
 
 
 void Security::updateGUI()
 {
     bool empty = passcode.isEmpty();
 
     changepasscode->setText( empty ? tr("Set passcode" )
-           : tr("Change passcode" )  );
+            : tr("Change passcode" )  );
     passcode_poweron->setEnabled( !empty );
     clearpasscode->setEnabled( !empty );
+
+    autologinToggle->setChecked(autoLogin);
+    userlist->setEnabled(autoLogin);
+
 }
 
 
 void Security::show()
 {
     valid=FALSE;
     setEnabled(FALSE);
     SecurityBase::show();
     if ( passcode.isEmpty() ) {
-  // could insist...
-  //changePassCode();
-  //if ( passcode.isEmpty() )
-      //reject();
+        // could insist...
+        //changePassCode();
+        //if ( passcode.isEmpty() )
+        //reject();
     } else {
-  QString pc = enterPassCode(tr("Enter passcode"));
-  if ( pc != passcode ) {
-      QMessageBox::critical(this, tr("Passcode incorrect"),
-        tr("The passcode entered is incorrect.\nAccess denied"));
-      reject();
-      return;
-  }
+        QString pc = enterPassCode(tr("Enter passcode"));
+        if ( pc != passcode ) {
+            QMessageBox::critical(this, tr("Passcode incorrect"),
+                    tr("The passcode entered is incorrect.\nAccess denied"));
+            reject();
+            return;
+        }
     }
     setEnabled(TRUE);
     valid=TRUE;
 }
 
 void Security::accept()
 {
     applySecurity();
     QDialog::accept();
 }
 
 void Security::done(int r)
 {
     QDialog::done(r);
     close();
 }
 
 void Security::selectNet(int auth_peer,int auth_peer_bits)
 {
     QString sn;
     if ( auth_peer_bits == 0 && auth_peer == 0 ) {
-  sn = tr("Any");
+        sn = tr("Any");
     } else if ( auth_peer_bits == 32 && auth_peer == 0 ) {
-  sn = tr("None");
+        sn = tr("None");
     } else {
-  sn =
-      QString::number((auth_peer>>24)&0xff) + "."
-      + QString::number((auth_peer>>16)&0xff) + "."
-      + QString::number((auth_peer>>8)&0xff) + "."
-      + QString::number((auth_peer>>0)&0xff) + "/"
-      + QString::number(auth_peer_bits);
+        sn =
+            QString::number((auth_peer>>24)&0xff) + "."
+            + QString::number((auth_peer>>16)&0xff) + "."
+            + QString::number((auth_peer>>8)&0xff) + "."
+            + QString::number((auth_peer>>0)&0xff) + "/"
+            + QString::number(auth_peer_bits);
     }
     for (int i=0; i<syncnet->count(); i++) {
-  if ( syncnet->text(i).left(sn.length()) == sn ) {
-      syncnet->setCurrentItem(i);
-      return;
-  }
+        if ( syncnet->text(i).left(sn.length()) == sn ) {
+            syncnet->setCurrentItem(i);
+            return;
+        }
     }
     qDebug("No match for \"%s\"",sn.latin1());
 }
 
 void Security::parseNet(const QString& sn,int& auth_peer,int& auth_peer_bits)
 {
     auth_peer=0;
     if ( sn == tr("Any") ) {
-  auth_peer = 0;
-  auth_peer_bits = 0;
+        auth_peer = 0;
+        auth_peer_bits = 0;
     } else if ( sn == tr("None") ) {
-  auth_peer = 0;
-  auth_peer_bits = 32;
+        auth_peer = 0;
+        auth_peer_bits = 32;
     } else {
-  int x=0;
-  for (int i=0; i<4; i++) {
-      int nx = sn.find(QChar(i==3 ? '/' : '.'),x);
-      auth_peer = (auth_peer<<8)|sn.mid(x,nx-x).toInt();
-      x = nx+1;
-  }
-  uint n = (uint)sn.find(' ',x)-x;
-  auth_peer_bits = sn.mid(x,n).toInt();
+        int x=0;
+        for (int i=0; i<4; i++) {
+            int nx = sn.find(QChar(i==3 ? '/' : '.'),x);
+            auth_peer = (auth_peer<<8)|sn.mid(x,nx-x).toInt();
+            x = nx+1;
+        }
+        uint n = (uint)sn.find(' ',x)-x;
+        auth_peer_bits = sn.mid(x,n).toInt();
     }
 }
 
+void Security::loadUsers ( void ) 
+{
+    QFile passwd("/etc/passwd");
+    if ( passwd.open(IO_ReadOnly) ) {
+        QTextStream t( &passwd );   
+        QString s;
+        QStringList account;
+        while ( !t.eof() ) {        
+            account = QStringList::split(':',t.readLine());
+
+            // Hide disabled accounts
+            if (*account.at(1)!="*") {
+
+                userlist->insertItem(*account.at(0));
+                // Highlight this item if it is set to autologinToggle
+                if ( *account.at(0) == autoLoginName) 
+                    userlist->setCurrentItem(userlist->count()-1);
+            }
+        }
+        passwd.close();
+    }
+
+}
+void Security::toggleAutoLogin(bool val)
+{
+    autoLogin=val;
+    userlist->setEnabled(val);
+    if (!autoLogin) 
+        autoLoginName=userlist->currentText();
+}
 void Security::setSyncNet(const QString& sn)
 {
     int auth_peer,auth_peer_bits;
     parseNet(sn,auth_peer,auth_peer_bits);
     selectNet(auth_peer,auth_peer_bits);
 }
 
 void Security::applySecurity()
 {
     if ( valid ) {
-  Config cfg("Security");
-  cfg.setGroup("Passcode");
-  cfg.writeEntry("passcode",passcode);
-  cfg.writeEntry("passcode_poweron",passcode_poweron->isChecked());
-  cfg.setGroup("Sync");
-  int auth_peer=0;
-  int auth_peer_bits;
-  QString sn = syncnet->currentText();
-  parseNet(sn,auth_peer,auth_peer_bits);
-  cfg.writeEntry("auth_peer",auth_peer);
-  cfg.writeEntry("auth_peer_bits",auth_peer_bits);
-  /*
-  cfg.setGroup("Remote");
-  if ( telnetAvailable() )
-      cfg.writeEntry("allow_telnet",telnet->isChecked());
-  if ( sshAvailable() )
-      cfg.writeEntry("allow_ssh",ssh->isChecked());
-  // ### write ssh/telnet sys config files
-  */
+        Config cfg("Security");
+        cfg.setGroup("Passcode");
+        cfg.writeEntry("passcode",passcode);
+        cfg.writeEntry("passcode_poweron",passcode_poweron->isChecked());
+        cfg.setGroup("Sync");
+        int auth_peer=0;
+        int auth_peer_bits;
+        QString sn = syncnet->currentText();
+        parseNet(sn,auth_peer,auth_peer_bits);
+        cfg.writeEntry("auth_peer",auth_peer);
+        cfg.writeEntry("auth_peer_bits",auth_peer_bits);
+        /*
+           cfg.setGroup("Remote");
+           if ( telnetAvailable() )
+           cfg.writeEntry("allow_telnet",telnet->isChecked());
+           if ( sshAvailable() )
+           cfg.writeEntry("allow_ssh",ssh->isChecked());
+        // ### write ssh/telnet sys config files
+        */
+
+        QString configFile = QPEApplication::qpeDir() + "/etc/opie-login.conf";
+        Config loginCfg(configFile,Config::File);
+        loginCfg.setGroup("General");
+
+        if (autoLogin) {
+            loginCfg.writeEntry("AutoLogin",autoLoginName);
+        } else {
+            loginCfg.removeEntry("AutoLogin");
+        }
+
     }
 }
 
+void Security::changeLoginName( int idx )
+{
+    autoLoginName = userlist->text(idx);;
+    updateGUI();
+}
+
 void Security::changePassCode()
 {
     QString new1;
     QString new2;
 
     do {
-  new1 = enterPassCode(tr("Enter new passcode"));
-  if ( new1.isNull() )
-      return;
-  new2 = enterPassCode(tr("Re-enter new passcode"));
-  if ( new2.isNull() )
-      return;
+        new1 = enterPassCode(tr("Enter new passcode"));
+        if ( new1.isNull() )
+            return;
+        new2 = enterPassCode(tr("Re-enter new passcode"));
+        if ( new2.isNull() )
+            return;
     } while (new1 != new2);
 
     passcode = new1;
     updateGUI();
 }
 
 void Security::clearPassCode()
 {
     passcode = QString::null;
     updateGUI();
 }
 
 
 QString Security::enterPassCode(const QString& prompt)
 {
     return Password::getPassword(prompt);
 }
 
 bool Security::telnetAvailable() const
 {
     // ### not implemented
     return FALSE;
 }
 
 bool Security::sshAvailable() const
 {
     // ### not implemented
     return FALSE;
 }
diff --git a/core/settings/security/security.h b/core/settings/security/security.h
index efc83a2..2f18f91 100644
--- a/core/settings/security/security.h
+++ b/core/settings/security/security.h
@@ -1,64 +1,70 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia 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.
 **
 **********************************************************************/
 #ifndef SECURITY_H
 #define SECURITY_H
 
 #include "securitybase.h"
 
 class QPEDialogListener;
 
 class Security : public SecurityBase
 { 
     Q_OBJECT
 
 public:
     Security( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~Security();
 
     void show();
 
 protected:
     void accept();
     void applySecurity();
     void done(int);
 
 private slots:
     void changePassCode();
     void clearPassCode();
     void setSyncNet(const QString&);
+    void changeLoginName(int);
+    void toggleAutoLogin(bool);
+
 
 private:
+    void loadUsers(void);
     bool telnetAvailable() const;
     bool sshAvailable() const;
     void updateGUI();
 
     static void parseNet(const QString& sn,int& auth_peer,int& auth_peer_bits);
     void selectNet(int auth_peer,int auth_peer_bits);
     
     QString enterPassCode(const QString&);
     QString passcode;
     bool valid;
+    bool autoLogin;
+    QString autoLoginName;
 
     QPEDialogListener *dl;
 };
 
 
 #endif // SECURITY_H
 
diff --git a/core/settings/security/securitybase.ui b/core/settings/security/securitybase.ui
index c2a8953..da25f39 100644
--- a/core/settings/security/securitybase.ui
+++ b/core/settings/security/securitybase.ui
@@ -1,215 +1,412 @@
 <!DOCTYPE UI><UI>
 <class>SecurityBase</class>
 <widget>
     <class>QDialog</class>
     <property stdset="1">
         <name>name</name>
         <cstring>SecurityBase</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>277</width>
-            <height>328</height>
+            <width>329</width>
+            <height>483</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>Security Settings</string>
     </property>
     <property>
         <name>layoutMargin</name>
     </property>
     <property>
         <name>layoutSpacing</name>
     </property>
-    <grid>
+    <vbox>
         <property stdset="1">
             <name>margin</name>
-            <number>3</number>
+            <number>0</number>
         </property>
         <property stdset="1">
             <name>spacing</name>
-            <number>3</number>
+            <number>0</number>
         </property>
-        <widget row="0"  column="0" >
-            <class>QLayoutWidget</class>
+        <widget>
+            <class>QTabWidget</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>Layout1</cstring>
+                <cstring>TabWidget2</cstring>
             </property>
             <property>
-                <name>layoutSpacing</name>
+                <name>layoutMargin</name>
             </property>
-            <hbox>
-                <property stdset="1">
-                    <name>margin</name>
-                    <number>0</number>
-                </property>
+            <widget>
+                <class>QWidget</class>
                 <property stdset="1">
-                    <name>spacing</name>
-                    <number>-1</number>
+                    <name>name</name>
+                    <cstring>tab</cstring>
                 </property>
-                <widget>
-                    <class>QPushButton</class>
+                <attribute>
+                    <name>title</name>
+                    <string>Passcode</string>
+                </attribute>
+                <vbox>
                     <property stdset="1">
-                        <name>name</name>
-                        <cstring>changepasscode</cstring>
+                        <name>margin</name>
+                        <number>6</number>
                     </property>
                     <property stdset="1">
-                        <name>text</name>
-                        <string>Change passcode</string>
+                        <name>spacing</name>
+                        <number>6</number>
                     </property>
-                </widget>
-                <widget>
-                    <class>QPushButton</class>
+                    <widget>
+                        <class>QGroupBox</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>GroupBox4</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>title</name>
+                            <string>Passcode</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>Layout1</cstring>
+                                </property>
+                                <property>
+                                    <name>layoutSpacing</name>
+                                </property>
+                                <hbox>
+                                    <property stdset="1">
+                                        <name>margin</name>
+                                        <number>0</number>
+                                    </property>
+                                    <property stdset="1">
+                                        <name>spacing</name>
+                                        <number>-1</number>
+                                    </property>
+                                    <widget>
+                                        <class>QPushButton</class>
+                                        <property stdset="1">
+                                            <name>name</name>
+                                            <cstring>changepasscode</cstring>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>text</name>
+                                            <string>Change passcode</string>
+                                        </property>
+                                    </widget>
+                                    <widget>
+                                        <class>QPushButton</class>
+                                        <property stdset="1">
+                                            <name>name</name>
+                                            <cstring>clearpasscode</cstring>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>text</name>
+                                            <string>Clear passcode</string>
+                                        </property>
+                                    </widget>
+                                </hbox>
+                            </widget>
+                            <widget>
+                                <class>QCheckBox</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>passcode_poweron</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>text</name>
+                                    <string>Require pass code at power-on</string>
+                                </property>
+                            </widget>
+                            <widget>
+                                <class>QLabel</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>TextLabel1</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>sizePolicy</name>
+                                    <sizepolicy>
+                                        <hsizetype>5</hsizetype>
+                                        <vsizetype>7</vsizetype>
+                                    </sizepolicy>
+                                </property>
+                                <property stdset="1">
+                                    <name>text</name>
+                                    <string>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</string>
+                                </property>
+                                <property stdset="1">
+                                    <name>textFormat</name>
+                                    <enum>RichText</enum>
+                                </property>
+                                <property stdset="1">
+                                    <name>alignment</name>
+                                    <set>AlignTop|AlignLeft</set>
+                                </property>
+                                <property>
+                                    <name>vAlign</name>
+                                </property>
+                            </widget>
+                        </vbox>
+                    </widget>
+                    <spacer>
+                        <property>
+                            <name>name</name>
+                            <cstring>Spacer3</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>orientation</name>
+                            <enum>Vertical</enum>
+                        </property>
+                        <property stdset="1">
+                            <name>sizeType</name>
+                            <enum>Expanding</enum>
+                        </property>
+                        <property>
+                            <name>sizeHint</name>
+                            <size>
+                                <width>20</width>
+                                <height>20</height>
+                            </size>
+                        </property>
+                    </spacer>
+                </vbox>
+            </widget>
+            <widget>
+                <class>QWidget</class>
+                <property stdset="1">
+                    <name>name</name>
+                    <cstring>tab</cstring>
+                </property>
+                <attribute>
+                    <name>title</name>
+                    <string>Login</string>
+                </attribute>
+                <vbox>
                     <property stdset="1">
-                        <name>name</name>
-                        <cstring>clearpasscode</cstring>
+                        <name>margin</name>
+                        <number>6</number>
                     </property>
                     <property stdset="1">
-                        <name>text</name>
-                        <string>Clear passcode</string>
+                        <name>spacing</name>
+                        <number>6</number>
                     </property>
-                </widget>
-            </hbox>
-        </widget>
-        <widget row="1"  column="0" >
-            <class>QCheckBox</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>passcode_poweron</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>Require pass code at power-on</string>
-            </property>
-        </widget>
-        <widget row="3"  column="0" >
-            <class>QTabWidget</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>TabWidget2</cstring>
-            </property>
+                    <widget>
+                        <class>QGroupBox</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>GroupBox3</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>title</name>
+                            <string>Login</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>QCheckBox</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>autologinToggle</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>text</name>
+                                    <string>Login Automatically</string>
+                                </property>
+                            </widget>
+                            <widget>
+                                <class>QComboBox</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>userlist</cstring>
+                                </property>
+                            </widget>
+                        </vbox>
+                    </widget>
+                    <spacer>
+                        <property>
+                            <name>name</name>
+                            <cstring>Spacer2</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>orientation</name>
+                            <enum>Vertical</enum>
+                        </property>
+                        <property stdset="1">
+                            <name>sizeType</name>
+                            <enum>Expanding</enum>
+                        </property>
+                        <property>
+                            <name>sizeHint</name>
+                            <size>
+                                <width>20</width>
+                                <height>20</height>
+                            </size>
+                        </property>
+                    </spacer>
+                </vbox>
+            </widget>
             <widget>
                 <class>QWidget</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>tab</cstring>
                 </property>
                 <attribute>
                     <name>title</name>
                     <string>Sync</string>
                 </attribute>
                 <vbox>
                     <property stdset="1">
                         <name>margin</name>
-                        <number>11</number>
+                        <number>6</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
                         <number>6</number>
                     </property>
                     <widget>
-                        <class>QLabel</class>
+                        <class>QGroupBox</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>TextLabel1_2</cstring>
+                            <cstring>GroupBox2</cstring>
                         </property>
                         <property stdset="1">
-                            <name>text</name>
-                            <string>Accept sync from network:</string>
+                            <name>title</name>
+                            <string>Sync</string>
                         </property>
-                    </widget>
-                    <widget>
-                        <class>QComboBox</class>
-                        <item>
-                            <property>
-                                <name>text</name>
-                                <string>192.168.129.0/24 (default)</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property>
-                                <name>text</name>
-                                <string>192.168.1.0/24</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property>
-                                <name>text</name>
-                                <string>192.168.0.0/16</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property>
-                                <name>text</name>
-                                <string>172.16.0.0/12</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property>
-                                <name>text</name>
-                                <string>10.0.0.0/8</string>
-                            </property>
-                        </item>
-                        <item>
-                            <property>
-                                <name>text</name>
-                                <string>1.0.0.0/8</string>
+                        <vbox>
+                            <property stdset="1">
+                                <name>margin</name>
+                                <number>11</number>
                             </property>
-                        </item>
-                        <item>
-                            <property>
-                                <name>text</name>
-                                <string>Any</string>
+                            <property stdset="1">
+                                <name>spacing</name>
+                                <number>6</number>
                             </property>
-                        </item>
-                        <item>
-                            <property>
-                                <name>text</name>
-                                <string>None</string>
-                            </property>
-                        </item>
-                        <property stdset="1">
+                            <widget>
+                                <class>QLabel</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>TextLabel1_2</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>text</name>
+                                    <string>Accept sync from network:</string>
+                                </property>
+                                <property stdset="1">
+                                    <name>textFormat</name>
+                                    <enum>RichText</enum>
+                                </property>
+                            </widget>
+                            <widget>
+                                <class>QComboBox</class>
+                                <item>
+                                    <property>
+                                        <name>text</name>
+                                        <string>192.168.129.0/24 (default)</string>
+                                    </property>
+                                </item>
+                                <item>
+                                    <property>
+                                        <name>text</name>
+                                        <string>192.168.1.0/24</string>
+                                    </property>
+                                </item>
+                                <item>
+                                    <property>
+                                        <name>text</name>
+                                        <string>192.168.0.0/16</string>
+                                    </property>
+                                </item>
+                                <item>
+                                    <property>
+                                        <name>text</name>
+                                        <string>172.16.0.0/12</string>
+                                    </property>
+                                </item>
+                                <item>
+                                    <property>
+                                        <name>text</name>
+                                        <string>10.0.0.0/8</string>
+                                    </property>
+                                </item>
+                                <item>
+                                    <property>
+                                        <name>text</name>
+                                        <string>1.0.0.0/8</string>
+                                    </property>
+                                </item>
+                                <item>
+                                    <property>
+                                        <name>text</name>
+                                        <string>Any</string>
+                                    </property>
+                                </item>
+                                <item>
+                                    <property>
+                                        <name>text</name>
+                                        <string>None</string>
+                                    </property>
+                                </item>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>syncnet</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>editable</name>
+                                    <bool>true</bool>
+                                </property>
+                            </widget>
+                        </vbox>
+                    </widget>
+                    <spacer>
+                        <property>
                             <name>name</name>
-                            <cstring>syncnet</cstring>
+                            <cstring>Spacer1</cstring>
                         </property>
                         <property stdset="1">
-                            <name>editable</name>
-                            <bool>true</bool>
+                            <name>orientation</name>
+                            <enum>Vertical</enum>
                         </property>
-                    </widget>
+                        <property stdset="1">
+                            <name>sizeType</name>
+                            <enum>Expanding</enum>
+                        </property>
+                        <property>
+                            <name>sizeHint</name>
+                            <size>
+                                <width>20</width>
+                                <height>20</height>
+                            </size>
+                        </property>
+                    </spacer>
                 </vbox>
             </widget>
         </widget>
-        <widget row="2"  column="0" >
-            <class>QLabel</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>TextLabel1</cstring>
-            </property>
-            <property stdset="1">
-                <name>sizePolicy</name>
-                <sizepolicy>
-                    <hsizetype>5</hsizetype>
-                    <vsizetype>7</vsizetype>
-                </sizepolicy>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</string>
-            </property>
-            <property stdset="1">
-                <name>alignment</name>
-                <set>AlignTop|AlignLeft</set>
-            </property>
-            <property>
-                <name>vAlign</name>
-            </property>
-        </widget>
-    </grid>
+    </vbox>
 </widget>
 </UI>