merge core/apps/*

7 files changed, 72 insertions, 85 deletions

diff --git a/core/apps/embeddedkonsole/embeddedkonsole.pro b/core/apps/embeddedkonsole/embeddedkonsole.pro
index f8d2793..55a1bb4 100755
--- a/core/apps/embeddedkonsole/embeddedkonsole.pro
+++ b/core/apps/embeddedkonsole/embeddedkonsole.pro
@@ -1,61 +1,59 @@
 QMAKE_CFLAGS = -DHAVE_OPENPTY
 TMAKE_FLAGS += -DHAVE_OPENPTY
 QMAKE_LIBS = -lutil
-TEMPLATE  = app
-CONFIG    += qt warn_on release
-DESTDIR   = $(OPIEDIR)/bin
+CONFIG    += qt warn_on release quick-app
 HEADERS   = TEWidget.h \
       TEScreen.h \
       TECommon.h \
       TEHistory.h \
       TEmulation.h \
       TEmuVt102.h \
       session.h \
       keytrans.h \
       konsole.h \
       commandeditdialog.h \
       commandeditwidget.h \
       playlistselection.h \
       MyPty.h
 SOURCES   = TEScreen.cpp \
       TEWidget.cpp \
       TEHistory.cpp \
       TEmulation.cpp \
       TEmuVt102.cpp \
       session.cpp \
       keytrans.cpp \
       konsole.cpp \
       commandeditdialog.cpp \
       commandeditwidget.cpp \
       playlistselection.cpp \
       MyPty.cpp \
       main.cpp 
 INTERFACES =  commandeditdialogbase.ui smallcommandeditdialogbase.ui
 TARGET    = embeddedkonsole
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe -lopie
 TMAKE_CXXFLAGS += -DQT_QWS_OPIE -DHAVE_OPENPTY
 
 TRANSLATIONS = ../../../i18n/de/embeddedkonsole.ts \
 	 ../../../i18n/nl/embeddedkonsole.ts \
         ../../../i18n/xx/embeddedkonsole.ts \
         ../../../i18n/en/embeddedkonsole.ts \
         ../../../i18n/es/embeddedkonsole.ts \
         ../../../i18n/fr/embeddedkonsole.ts \
         ../../../i18n/hu/embeddedkonsole.ts \
         ../../../i18n/ja/embeddedkonsole.ts \
         ../../../i18n/ko/embeddedkonsole.ts \
         ../../../i18n/no/embeddedkonsole.ts \
         ../../../i18n/pl/embeddedkonsole.ts \
         ../../../i18n/pt/embeddedkonsole.ts \
         ../../../i18n/pt_BR/embeddedkonsole.ts \
         ../../../i18n/sl/embeddedkonsole.ts \
         ../../../i18n/zh_CN/embeddedkonsole.ts \
         ../../../i18n/zh_TW/embeddedkonsole.ts \
         ../../../i18n/it/embeddedkonsole.ts \
         ../../../i18n/da/embeddedkonsole.ts
 
 
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp
index c324c35..ec438c3 100644
--- a/core/apps/embeddedkonsole/konsole.cpp
+++ b/core/apps/embeddedkonsole/konsole.cpp
@@ -1,1062 +1,1102 @@
 /* ---------------------------------------------------------------------- */
 /*                                                                        */
 /* [main.C]                        Konsole                                */
 /*                                                                        */
 /* ---------------------------------------------------------------------- */
 /*                                                                        */
 /* Copyright (c) 1997,1998 by Lars Doelle <lars.doelle@on-line.de>        */
 /*                                                                        */
 /* This file is part of Konsole, an X terminal.                           */
 /*                                                                        */
 /* The material contained in here more or less directly orginates from    */
 /* kvt, which is copyright (c) 1996 by Matthias Ettrich <ettrich@kde.org> */
 /*                                                                        */
 /* ---------------------------------------------------------------------- */
 /*                        */
 /* Ported Konsole to Qt/Embedded                                              */
 /*                        */
 /* Copyright (C) 2000 by John Ryland <jryland@trolltech.com>                  */
 /*                        */
 /* -------------------------------------------------------------------------- */
 // enhancements added by L.J. Potter <ljp@llornkcor.com>
 #define QT_QWS_OPIE
 
 #include <qpe/resource.h>
 
 #include <qdir.h>
 #include <qevent.h>
 #include <qdragobject.h>
 #include <qobjectlist.h>
 #include <qtoolbutton.h>
 #include <qpe/qpetoolbar.h>
 #include <qpushbutton.h>
 #include <qfontdialog.h>
 #include <qglobal.h>
 #include <qpainter.h>
 #include <qpe/qpemenubar.h>
 #include <qmessagebox.h>
 #include <qaction.h>
 #include <qapplication.h>
 #include <qfontmetrics.h>
 #include <qcombobox.h>
 #include <qevent.h>
 #include <qtabwidget.h>
 #include <qtabbar.h>
 #include <qpe/config.h>
 #include <qstringlist.h>
 #include <qpalette.h>
 
+#include <unistd.h>
+#include <pwd.h>
+#include <sys/types.h>
 #include <sys/wait.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
 
 #include "konsole.h"
 #include "keytrans.h"
 #include "commandeditdialog.h"
 
 #ifdef  QT_QWS_OPIE
 #include <opie/colorpopupmenu.h>
 #endif
 
 class EKNumTabBar : public QTabBar {
 public:
     void numberTabs()
     {
   // Yes, it really is this messy. QTabWidget needs functions
   // that provide acces to tabs in a sequential way.
   int m=INT_MIN;
   for (int i=0; i<count(); i++) {
       QTab* left=0;
       QListIterator<QTab> it(*tabList());
       int x=INT_MAX;
       for( QTab* t; (t=it.current()); ++it ) {
     int tx = t->rect().x();
     if ( tx<x && tx>m ) {
         x = tx;
         left = t;
     }
       }
       if ( left ) {
     left->setText(QString::number(i+1));
     m = left->rect().x();
       }
   }
     }
 };
 
 class EKNumTabWidget : public QTabWidget {
 public:
     EKNumTabWidget(QWidget* parent) : QTabWidget(parent)
     {
     }
 
     void addTab(QWidget* w)
     {
   QTab* t = new QTab(QString::number(tabBar()->count()+1));
   QTabWidget::addTab(w,t);
     }
 
     void removeTab(QWidget* w)
     {
   removePage(w);
   ((EKNumTabBar*)tabBar())->numberTabs();
     }
 };
 
 // This could be configurable or dynamicly generated from the bash history
 // file of the user
 static const char *commonCmds[] =
 {
     "ls ", // I left this here, cause it looks better than the first alpha
     "cardctl eject",
     "cat ",
     "cd ",
     "chmod ",
     "clear",
     "cp ",
     "dc ",
     "df ",
     "dmesg",
     "echo ",
     "env",
     "find ",
     "free",
     "grep ",
     "ifconfig ",
     "ipkg ",
     "mkdir ",
     "mv ",
     "nc localhost 7776",
     "nc localhost 7777",
     "netstat ",
     "nslookup ",
     "ping ",
     "ps aux",
     "pwd ",
     "qcop QPE/System 'linkChanged(QString)' ''",
     "qcop QPE/System 'restart()'",
     "qcop QPE/System 'quit()'",
     "rm ",
     "rmdir ",
     "route ",
     "set ",
     "traceroute",
 
 /*
     "gzip",
     "gunzip",
     "chgrp",
     "chown",
     "date",
     "dd",
     "df",
     "dmesg",
     "fuser",
     "hostname",
     "kill",
     "killall",
     "ln",
     "ping",
     "mount",
     "more",
     "sort",
     "touch",
     "umount",
     "mknod",
     "netstat",
 */
 
     "exit",
     NULL
 };
 
+static void konsoleInit(const char** shell) {
+    if(setuid(getuid()) !=0) qDebug("setuid failed");
+    if(setgid(getgid()) != 0) qDebug("setgid failed"); // drop privileges
+
+
+//  QPEApplication::grabKeyboard(); // for CTRL and ALT
+
+    qDebug("keyboard grabbed");
+#ifdef FAKE_CTRL_AND_ALT
+    qDebug("Fake Ctrl and Alt defined");
+    QPEApplication::grabKeyboard(); // for CTRL and ALT
+#endif
+
+    *shell = getenv("SHELL");
+    qWarning("SHell initially is %s", *shell );
+
+    if (shell == NULL || *shell == '\0') {
+        struct passwd *ent = 0;
+        uid_t me = getuid();
+        *shell = "/bin/sh";
+
+        while ( (ent = getpwent()) != 0 ) {
+            if (ent->pw_uid == me) {
+                if (ent->pw_shell != "")
+                    *shell = ent->pw_shell;
+                break;
+            }
+        }
+        endpwent();
+    }
+
+    qWarning("SHELL now is %s", *shell );
+
+    if( putenv((char*)"COLORTERM=") !=0)
+        qDebug("putenv failed"); // to trigger mc's color detection
+}
 
 Konsole::Konsole(QWidget* parent, const char* name, WFlags fl) :
     QMainWindow(parent, name, fl)
 {
-    QStrList args;
-    init("/bin/sh",args);
-}
+    QStrList tmp; const char* shell;
 
-Konsole::Konsole(const char* name, const char* _pgm, QStrList & _args, int)
- : QMainWindow(0, name)
-{
-    init(_pgm,_args);
+    setCaption( tr("Terminal") );
+
+    konsoleInit( &shell);
+    qWarning("Using shell %s", shell);
+    init(shell,tmp);
 }
 
+
+
 void Konsole::initCommandList()
 {
 //    qDebug("Konsole::initCommandList");
     Config cfg("Konsole");
     cfg.setGroup("Commands");
     commonCombo->setInsertionPolicy(QComboBox::AtCurrent);
     commonCombo->clear();
     if (cfg.readEntry("Commands Set","FALSE") == "FALSE") {
         for (int i = 0; commonCmds[i] != NULL; i++) {
             commonCombo->insertItem(commonCmds[i],i);
         }
     } else {
         for (int i = 0; i < 100; i++) {
             if (!(cfg.readEntry( QString::number(i),"")).isEmpty())
                 commonCombo->insertItem((cfg.readEntry( QString::number(i),"")));
         }
     }
 
 }
 
 void Konsole::init(const char* _pgm, QStrList & _args)
 {
   b_scroll = TRUE; // histon;
   n_keytab = 0;
   n_render = 0;
   startUp=0;
   fromMenu = FALSE;
 
   setCaption( tr("Terminal") );
   setIcon( Resource::loadPixmap( "konsole" ) );
 
   Config cfg("Konsole");
   cfg.setGroup("Konsole");
   QString tmp;
   // initialize the list of allowed fonts ///////////////////////////////////
   cfont = cfg.readNumEntry("FontID", 1);
   QFont f = QFont("Micro", 4, QFont::Normal);
   f.setFixedPitch(TRUE);
   fonts.append(new VTFont(tr("Micro"), f));
 
   f = QFont("Fixed", 7, QFont::Normal);
   f.setFixedPitch(TRUE);
   fonts.append(new VTFont(tr("Small Fixed"), f));
 
   f = QFont("Fixed", 12, QFont::Normal);
   f.setFixedPitch(TRUE);
   fonts.append(new VTFont(tr("Medium Fixed"), f));
 
   // create terminal emulation framework ////////////////////////////////////
   nsessions = 0;
 
   tab = new EKNumTabWidget(this);
 
   connect(tab, SIGNAL(currentChanged(QWidget*)), this, SLOT(switchSession(QWidget*)));
 
      // create terminal toolbar ////////////////////////////////////////////////
   setToolBarsMovable( FALSE );
   QPEToolBar *menuToolBar = new QPEToolBar( this );
   menuToolBar->setHorizontalStretchable( TRUE );
 
   QPEMenuBar *menuBar = new QPEMenuBar( menuToolBar );
 
   fontList = new QPopupMenu( this );
   for(uint i = 0; i < fonts.count(); i++) {
     VTFont *fnt = fonts.at(i);
     fontList->insertItem(fnt->getName(), i);
   }
   fontChanged(cfont);
 
   configMenu = new QPopupMenu( this);
   colorMenu = new QPopupMenu( this);
   scrollMenu = new QPopupMenu( this);
   editCommandListMenu = new QPopupMenu( this);
 
   configMenu->insertItem(tr("Command List"), editCommandListMenu);
 
   bool listHidden;
   cfg.setGroup("Menubar");
   if( cfg.readEntry("Hidden","FALSE") == "TRUE")  {
       editCommandListMenu->insertItem( tr( "Show command list" ));
       listHidden=TRUE;
   } else {
       editCommandListMenu->insertItem( tr( "Hide command list" ));
       listHidden=FALSE;
   }
 
   cfg.setGroup("Tabs");
   tmp=cfg.readEntry("Position","Bottom");
   if(tmp=="Top") {
       tab->setTabPosition(QTabWidget::Top);
       configMenu->insertItem( tr( "Tabs on Bottom" ) );
   } else {
       tab->setTabPosition(QTabWidget::Bottom);
       configMenu->insertItem(tr("Tabs on Top"));
   }
   configMenu->insertSeparator(2);
 
   colorMenu->insertItem(tr( "Green on Black"));
   colorMenu->insertItem(tr( "Black on White"));
   colorMenu->insertItem(tr( "White on Black"));
   colorMenu->insertItem(tr( "Black on Transparent"));
   colorMenu->insertItem(tr( "Black on Red"));
   colorMenu->insertItem(tr( "Red on Black"));
   colorMenu->insertItem(tr( "Green on Yellow"));
   colorMenu->insertItem(tr( "Blue on Magenta"));
   colorMenu->insertItem(tr( "Magenta on Blue"));
   colorMenu->insertItem(tr( "Cyan on White"));
   colorMenu->insertItem(tr( "White on Cyan"));
   colorMenu->insertItem(tr( "Blue on Black"));
   colorMenu->insertItem(tr( "Amber on Black"));
 
 #ifdef QT_QWS_OPIE
   colorMenu->insertItem(tr( "Custom"));
 #endif
-  
+
   configMenu->insertItem( tr("Font"), fontList );
   configMenu->insertItem(tr( "Colors") ,colorMenu);
 
   connect( fontList, SIGNAL( activated(int) ), this, SLOT( fontChanged(int) ));
   connect( configMenu, SIGNAL( activated(int) ), this, SLOT( configMenuSelected(int) ));
   connect( colorMenu, SIGNAL( activated(int) ), this, SLOT( colorMenuIsSelected(int) ));
   connect( scrollMenu, SIGNAL(activated(int)),this,SLOT(scrollMenuSelected(int)));
   connect(editCommandListMenu,SIGNAL(activated(int)),this,SLOT(editCommandListMenuSelected(int)));
 
   menuBar->insertItem( tr("Options"), configMenu );
 
   QPEToolBar *toolbar = new QPEToolBar( this );
 
   QAction *a;
 
   // Button Commands
   a = new QAction( tr("New"), Resource::loadPixmap( "konsole" ), QString::null, 0, this, 0 );
   connect( a, SIGNAL( activated() ), this, SLOT( newSession() ) ); a->addTo( toolbar );
   a = new QAction( tr("Enter"), Resource::loadPixmap( "konsole/enter" ), QString::null, 0, this, 0 );
   connect( a, SIGNAL( activated() ), this, SLOT( hitEnter() ) ); a->addTo( toolbar );
   a = new QAction( tr("Space"), Resource::loadPixmap( "konsole/space" ), QString::null, 0, this, 0 );
   connect( a, SIGNAL( activated() ), this, SLOT( hitSpace() ) ); a->addTo( toolbar );
   a = new QAction( tr("Tab"), Resource::loadPixmap( "konsole/tab" ), QString::null, 0, this, 0 );
   connect( a, SIGNAL( activated() ), this, SLOT( hitTab() ) ); a->addTo( toolbar );
   a = new QAction( tr("Up"), Resource::loadPixmap( "konsole/up" ), QString::null, 0, this, 0 );
   connect( a, SIGNAL( activated() ), this, SLOT( hitUp() ) ); a->addTo( toolbar );
   a = new QAction( tr("Down"), Resource::loadPixmap( "konsole/down" ), QString::null, 0, this, 0 );
   connect( a, SIGNAL( activated() ), this, SLOT( hitDown() ) ); a->addTo( toolbar );
   a = new QAction( tr("Paste"), Resource::loadPixmap( "paste" ), QString::null, 0, this, 0 );
   connect( a, SIGNAL( activated() ), this, SLOT( hitPaste() ) ); a->addTo( toolbar );
 /*
   a = new QAction( tr("Up"), Resource::loadPixmap( "up" ), QString::null, 0, this, 0 );
   connect( a, SIGNAL( activated() ), this, SLOT( hitUp() ) ); a->addTo( toolbar );
   a = new QAction( tr("Down"), Resource::loadPixmap( "down" ), QString::null, 0, this, 0 );
   connect( a, SIGNAL( activated() ), this, SLOT( hitDown() ) ); a->addTo( toolbar );
 */
 
   secondToolBar = new QPEToolBar( this );
   secondToolBar->setHorizontalStretchable( TRUE );
 
   commonCombo = new QComboBox( secondToolBar );
   commonCombo->setMaximumWidth(236);
 
   editCommandListMenu->insertItem( tr( "Quick Edit" ) );
   if( listHidden) {
       secondToolBar->hide();
       editCommandListMenu->setItemEnabled(-23 ,FALSE);
   }
   editCommandListMenu->insertItem(tr(  "Edit" ) );
 
   cfg.setGroup("Commands");
   commonCombo->setInsertionPolicy(QComboBox::AtCurrent);
 
   initCommandList();
 //   for (int i = 0; commonCmds[i] != NULL; i++) {
 //        commonCombo->insertItem( commonCmds[i], i );
 //        tmp = cfg.readEntry( QString::number(i),"");
 //        if(tmp != "")
 //            commonCombo->changeItem( tmp,i );
 //    }
 
   connect( commonCombo, SIGNAL( activated(int) ), this, SLOT( enterCommand(int) ));
 
   scrollMenu->insertItem(tr( "None" ));
   scrollMenu->insertItem(tr( "Left" ));
   scrollMenu->insertItem(tr( "Right" ));
 //   scrollMenu->insertSeparator(4);
 //   scrollMenu->insertItem(tr( "Horizontal" ));
- 
+
   configMenu->insertItem(tr( "ScrollBar" ),scrollMenu);
 
   int jut = configMenu->insertItem(tr( "Wrap" ));
     cfg.setGroup("ScrollBar");
   configMenu->setItemChecked(jut, cfg.readBoolEntry("HorzScroll",0));
 
   jut = configMenu->insertItem(tr( "Use Beep" ));
   cfg.setGroup("Menubar");
 
   configMenu->setItemChecked(jut, cfg.readBoolEntry("useBeep",0));
 
-  
+
 //scrollMenuSelected(-29);
 //   cfg.setGroup("ScrollBar");
 //   if(cfg.readBoolEntry("HorzScroll",0)) {
 //       if(cfg.readNumEntry("Position",2) == 0)
 //           te->setScrollbarLocation(1);
 //       else
 //           te->setScrollbarLocation(0);
 //       te->setScrollbarLocation( cfg.readNumEntry("Position",2));
 //       te->setWrapAt(120);
 //   }
       // create applications /////////////////////////////////////////////////////
   setCentralWidget(tab);
 
   // load keymaps ////////////////////////////////////////////////////////////
   KeyTrans::loadAll();
   for (int i = 0; i < KeyTrans::count(); i++)
   { KeyTrans* s = KeyTrans::find(i);
     assert( s );
   }
 
   se_pgm = _pgm;
   se_args = _args;
   se_args.prepend("--login");
 parseCommandLine();
   // read and apply default values ///////////////////////////////////////////
   resize(321, 321); // Dummy.
   QSize currentSize = size();
   if (currentSize != size())
      defaultSize = size();
 }
 
 void Konsole::show()
 {
   if ( !nsessions ) {
     newSession();
   }
   QMainWindow::show();
-  
+
 }
 
 void Konsole::initSession(const char*, QStrList &)
 {
   QMainWindow::show();
 }
 
 Konsole::~Konsole()
 {
     while (nsessions > 0) {
       doneSession(getTe()->currentSession, 0);
      }
 
   Config cfg("Konsole");
   cfg.setGroup("Konsole");
   cfg.writeEntry("FontID", cfont);
 }
 
 void Konsole::fontChanged(int f)
 {
     VTFont* font = fonts.at(f);
     if (font != 0) {
         for(uint i = 0; i < fonts.count(); i++) {
             fontList->setItemChecked(i, (i == (uint) f) ? TRUE : FALSE);
         }
 
         cfont = f;
 
         TEWidget* te = getTe();
         if (te != 0) {
             te->setVTFont(font->getFont());
         }
     }
 }
 
 
 void Konsole::enterCommand(int c)
 {
     TEWidget* te = getTe();
     if (te != 0) {
         if(!commonCombo->editable()) {
             QString text = commonCombo->text(c); //commonCmds[c];
             te->emitText(text);
         } else {
             changeCommand( commonCombo->text(c), c);
         }
     }
 }
 
 void Konsole::hitEnter()
 {
     TEWidget* te = getTe();
     if (te != 0) {
     te->emitText(QString("\r"));
     }
 }
 
 void Konsole::hitSpace()
 {
     TEWidget* te = getTe();
     if (te != 0) {
     te->emitText(QString(" "));
     }
 }
 
 void Konsole::hitTab()
 {
     TEWidget* te = getTe();
     if (te != 0) {
     te->emitText(QString("\t"));
     }
 }
 
 void Konsole::hitPaste()
 {
     TEWidget* te = getTe();
     if (te != 0) {
     te->pasteClipboard();
     }
 }
 
 void Konsole::hitUp()
 {
     TEWidget* te = getTe();
     if (te != 0) {
     QKeyEvent ke( QKeyEvent::KeyPress, Qt::Key_Up, 0, 0);
     QApplication::sendEvent( te, &ke );
     }
 }
 
 void Konsole::hitDown()
 {
     TEWidget* te = getTe();
     if (te != 0) {
     QKeyEvent ke( QKeyEvent::KeyPress, Qt::Key_Down, 0, 0);
     QApplication::sendEvent( te, &ke );
     }
 }
 
 /**
    This function calculates the size of the external widget
    needed for the internal widget to be
  */
 QSize Konsole::calcSize(int columns, int lines) {
     TEWidget* te = getTe();
     if (te != 0) {
     QSize size = te->calcSize(columns, lines);
     return size;
     } else {
   QSize size;
   return size;
     }
 }
 
 /**
     sets application window to a size based on columns X lines of the te
     guest widget. Call with (0,0) for setting default size.
 */
 
 void Konsole::setColLin(int columns, int lines)
 {
   qDebug("konsole::setColLin:: Columns %d", columns);
-    
+
   if ((columns==0) || (lines==0))
   {
     if (defaultSize.isEmpty()) // not in config file : set default value
     {
       defaultSize = calcSize(80,24);
       // notifySize(24,80); // set menu items (strange arg order !)
     }
     resize(defaultSize);
   } else {
     resize(calcSize(columns, lines));
     // notifySize(lines,columns); // set menu items (strange arg order !)
   }
 }
 
 /*
 void Konsole::setFont(int fontno)
 {
   QFont f;
   if (fontno == 0)
     f = defaultFont = QFont( "Helvetica", 12  );
   else
   if (fonts[fontno][0] == '-')
     f.setRawName( fonts[fontno] );
   else
   {
     f.setFamily(fonts[fontno]);
     f.setRawMode( TRUE );
   }
   if ( !f.exactMatch() && fontno != 0)
   {
     QString msg = i18n("Font `%1' not found.\nCheck README.linux.console for help.").arg(fonts[fontno]);
     QMessageBox(this,  msg);
     return;
   }
   if (se) se->setFontNo(fontno);
   te->setVTFont(f);
   n_font = fontno;
 }
 */
 
 // --| color selection |-------------------------------------------------------
 
 void Konsole::changeColumns(int columns)
 { //FIXME this seems to cause silliness when reset command is executed
 //     qDebug("change columns");
 //   TEWidget* te = getTe();
 //   if (te != 0) {
 //   setColLin(columns,te->Lines());
 //   te->update();
 //   }
 }
 
 //FIXME: If a child dies during session swap,
 //       this routine might be called before
 //       session swap is completed.
 
 void Konsole::doneSession(TESession*, int )
 {
   TEWidget *te = getTe();
   if (te != 0) {
     te->currentSession->setConnect(FALSE);
     tab->removeTab(te);
     delete te->currentSession;
     delete te;
     nsessions--;
   }
 
   if (nsessions == 0) {
   close();
   }
 }
 
 void Konsole::newSession() {
     if(nsessions < 15) {    // seems to be something weird about 16 tabs on the Zaurus.... memory?
         TEWidget* te = new TEWidget(tab);
         Config c("Konsole");
         c.setGroup("Menubar");
         te->useBeep=c.readBoolEntry("useBeep",0);
 
 //  te->setBackgroundMode(PaletteBase); //we want transparent!!
         te->setVTFont(fonts.at(cfont)->getFont());
         tab->addTab(te);
         TESession* se = new TESession(this, te, se_pgm, se_args, "xterm");
         te->currentSession = se;
         connect( se, SIGNAL(done(TESession*,int)), this, SLOT(doneSession(TESession*,int)) );
         se->run();
         se->setConnect(TRUE);
         se->setHistory(b_scroll);
         tab->setCurrentPage(nsessions);
         nsessions++;
         doWrap();
         setColor();
     }
 }
 
 TEWidget* Konsole::getTe() {
   if (nsessions) {
     return (TEWidget *) tab->currentPage();
   } else {
     return 0;
   }
 }
 
 void Konsole::switchSession(QWidget* w) {
   TEWidget* te = (TEWidget *) w;
 
   QFont teFnt = te->getVTFont();
   for(uint i = 0; i < fonts.count(); i++) {
     VTFont *fnt = fonts.at(i);
     bool cf = fnt->getFont() == teFnt;
     fontList->setItemChecked(i, cf);
     if (cf) {
       cfont = i;
     }
   }
 }
 
 void Konsole::colorMenuIsSelected(int iD) {
     fromMenu = TRUE;
     colorMenuSelected(iD);
 }
 
 /// -------------------------------   some new stuff by L.J. Potter
 void Konsole::colorMenuSelected(int iD)
 { // this is NOT pretty, elegant or anything else besides functional
 //       QString temp;
 //      qDebug( temp.sprintf("colormenu %d", iD));
 
      TEWidget* te = getTe();
     Config cfg("Konsole");
     cfg.setGroup("Colors");
 //     QColor foreground;
 //     QColor background;
     colorMenu->setItemChecked(lastSelectedMenu,FALSE);
     ColorEntry m_table[TABLE_COLORS];
     const ColorEntry * defaultCt=te->getdefaultColorTable();
       /////////// fore back
     int i;
     if(iD==-9) { // default default
         for (i = 0; i < TABLE_COLORS; i++)  {
             m_table[i].color = defaultCt[i].color;
             if(i==1 || i == 11)
                 m_table[i].transparent=1;
             cfg.writeEntry("Schema","9");
             colorMenu->setItemChecked(-9,TRUE);
         }
     } else {
         if(iD==-6) { // green black
             foreground.setRgb(0x18,255,0x18);
             background.setRgb(0x00,0x00,0x00);
             cfg.writeEntry("Schema","6");
             colorMenu->setItemChecked(-6,TRUE);
         }
         if(iD==-7) { // black white
             foreground.setRgb(0x00,0x00,0x00);
             background.setRgb(0xFF,0xFF,0xFF);
             cfg.writeEntry("Schema","7");
             colorMenu->setItemChecked(-7,TRUE);
         }
         if(iD==-8) { // white black
             foreground.setRgb(0xFF,0xFF,0xFF);
             background.setRgb(0x00,0x00,0x00);
             cfg.writeEntry("Schema","8");
             colorMenu->setItemChecked(-8,TRUE);
         }
         if(iD==-10) {// Black, Red
             foreground.setRgb(0x00,0x00,0x00);
             background.setRgb(0xB2,0x18,0x18);
             cfg.writeEntry("Schema","10");
             colorMenu->setItemChecked(-10,TRUE);
         }
         if(iD==-11) {// Red, Black
             foreground.setRgb(230,31,31); //0xB2,0x18,0x18
             background.setRgb(0x00,0x00,0x00);
             cfg.writeEntry("Schema","11");
             colorMenu->setItemChecked(-11,TRUE);
         }
         if(iD==-12) {// Green, Yellow - is ugly
 //            foreground.setRgb(0x18,0xB2,0x18);
             foreground.setRgb(36,139,10);
 //            background.setRgb(0xB2,0x68,0x18);
             background.setRgb(255,255,0);
             cfg.writeEntry("Schema","12");
             colorMenu->setItemChecked(-12,TRUE);
         }
         if(iD==-13) {// Blue,  Magenta
             foreground.setRgb(0x18,0xB2,0xB2);
             background.setRgb(0x18,0x18,0xB2);
             cfg.writeEntry("Schema","13");
             colorMenu->setItemChecked(-13,TRUE);
         }
         if(iD==-14) {// Magenta, Blue
             foreground.setRgb(0x18,0x18,0xB2);
             background.setRgb(0x18,0xB2,0xB2);
             cfg.writeEntry("Schema","14");
             colorMenu->setItemChecked(-14,TRUE);
         }
         if(iD==-15) {// Cyan,  White
             foreground.setRgb(0x18,0xB2,0xB2);
             background.setRgb(0xFF,0xFF,0xFF);
             cfg.writeEntry("Schema","15");
             colorMenu->setItemChecked(-15,TRUE);
         }
         if(iD==-16) {// White, Cyan
             background.setRgb(0x18,0xB2,0xB2);
             foreground.setRgb(0xFF,0xFF,0xFF);
             cfg.writeEntry("Schema","16");
             colorMenu->setItemChecked(-16,TRUE);
         }
         if(iD==-17) {// Black, Blue
             background.setRgb(0x00,0x00,0x00);
             foreground.setRgb(0x18,0xB2,0xB2);
             cfg.writeEntry("Schema","17");
             colorMenu->setItemChecked(-17,TRUE);
         }
         if(iD==-18) {// Black, Gold
             background.setRgb(0x00,0x00,0x00);
             foreground.setRgb(255,215,0);
             cfg.writeEntry("Schema","18");
             colorMenu->setItemChecked(-18,TRUE);
         }
-#ifdef QT_QWS_OPIE        
+#ifdef QT_QWS_OPIE
         if(iD==-19) {
 // Custom
             qDebug("do custom");
             if(fromMenu) {
             OColorPopupMenu* penColorPopupMenu = new OColorPopupMenu(Qt::black, this, "foreground color");
             connect(penColorPopupMenu, SIGNAL(colorSelected(const QColor&)), this,
                     SLOT(changeForegroundColor(const QColor&)));
             penColorPopupMenu->exec();
             }
             cfg.writeEntry("Schema","19");
             if(!fromMenu) {
                 foreground.setNamedColor(cfg.readEntry("foreground",""));
                 background.setNamedColor(cfg.readEntry("background",""));
             }
             fromMenu=FALSE;
             colorMenu->setItemChecked(-19,TRUE);
         }
 #endif
         for (i = 0; i < TABLE_COLORS; i++)  {
             if(i==0 || i == 10) {
                 m_table[i].color = foreground;
             }
             else if(i==1 || i == 11) {
                 m_table[i].color = background; m_table[i].transparent=0;
             }
             else
                 m_table[i].color = defaultCt[i].color;
         }
     }
     lastSelectedMenu = iD;
     te->setColorTable(m_table);
     update();
 
 }
 
 void Konsole::configMenuSelected(int iD)
 {
 //      QString temp;
 //      qDebug( temp.sprintf("configmenu %d",iD));
 
      TEWidget* te = getTe();
     Config cfg("Konsole");
     cfg.setGroup("Menubar");
     int i,j;
 #ifdef QT_QWS_OPIE
     i=-29;j=-30;
 #else
     i=-28;j=-29;
 #endif
 
     if(iD == -4) {
           cfg.setGroup("Tabs");
           QString tmp=cfg.readEntry("Position","Bottom");
 
           if(tmp=="Top") {
               tab->setTabPosition(QTabWidget::Bottom);
               configMenu->changeItem( iD, tr("Tabs on Top"));
               cfg.writeEntry("Position","Bottom");
           } else {
               tab->setTabPosition(QTabWidget::Top);
               configMenu->changeItem( iD, tr("Tabs on Bottom"));
               cfg.writeEntry("Position","Top");
           }
       }
       if(iD == i) {
           cfg.setGroup("ScrollBar");
           bool b=cfg.readBoolEntry("HorzScroll",0);
           b=!b;
           cfg.writeEntry("HorzScroll", b );
           cfg.write();
           doWrap();
           if(cfg.readNumEntry("Position",2) == 0) {
               te->setScrollbarLocation(1);
           } else {
               te->setScrollbarLocation(0);
           }
           te->setScrollbarLocation( cfg.readNumEntry("Position",2));
       }
       if(iD ==  j) {
           cfg.setGroup("Menubar");
           bool b=cfg.readBoolEntry("useBeep",0);
           b=!b;
           cfg.writeEntry("useBeep", b );
           cfg.write();
           configMenu->setItemChecked(j,b);
           te->useBeep=b;
       }
 }
 
 void Konsole::changeCommand(const QString &text, int c)
 {
     Config cfg("Konsole");
     cfg.setGroup("Commands");
     if(commonCmds[c] != text) {
         cfg.writeEntry(QString::number(c),text);
         commonCombo->clearEdit();
         commonCombo->setCurrentItem(c);
     }
 }
 
 void Konsole::setColor()
 {
     Config cfg("Konsole");
     cfg.setGroup("Colors");
     int scheme = cfg.readNumEntry("Schema",1);
     if(scheme != 1) colorMenuSelected( -scheme);
 }
 
 void Konsole::scrollMenuSelected(int index)
 {
 //    qDebug( "scrollbar menu %d",index);
 
     TEWidget* te = getTe();
     Config cfg("Konsole");
     cfg.setGroup("ScrollBar");
     int i,j,k;
 #ifdef QT_QWS_OPIE
 i=-25;j=-26;k=-27;
 #else
 i=-24;j=-25;k=-26;
 #endif
  if(index == i) {
 
      te->setScrollbarLocation(0);
      cfg.writeEntry("Position",0);
  }  else if(index == j) {
-        
+
      te->setScrollbarLocation(1);
      cfg.writeEntry("Position",1);
  }  else if(index == k) {
 
      te->setScrollbarLocation(2);
      cfg.writeEntry("Position",2);
  }
-    
+
 //       case -29: {
 //           bool b=cfg.readBoolEntry("HorzScroll",0);
 //           cfg.writeEntry("HorzScroll", !b );
 //           cfg.write();
 //           if(cfg.readNumEntry("Position",2) == 0) {
 //               te->setScrollbarLocation(1);
 //           te->setWrapAt(0);
 //           } else {
 //               te->setScrollbarLocation(0);
 //           te->setWrapAt(120);
 //           }
 //           te->setScrollbarLocation( cfg.readNumEntry("Position",2));
 //       }
 //         break;
 }
 
 void Konsole::editCommandListMenuSelected(int iD)
 {
 //      QString temp;
 //      qDebug( temp.sprintf("edit command list %d",iD));
     TEWidget* te = getTe();
     Config cfg("Konsole");
     cfg.setGroup("Menubar");
     if( iD  == -3) {
         if(!secondToolBar->isHidden()) {
             secondToolBar->hide();
             configMenu->changeItem( iD,tr( "Show Command List" ));
             cfg.writeEntry("Hidden","TRUE");
             configMenu->setItemEnabled(-23 ,FALSE);
         } else {
             secondToolBar->show();
             configMenu->changeItem( iD,tr( "Hide Command List" ));
             cfg.writeEntry("Hidden","FALSE");
             configMenu->setItemEnabled(-23 ,TRUE);
 
             if(cfg.readEntry("EditEnabled","FALSE")=="TRUE") {
                 configMenu->setItemChecked(-23,TRUE);
                 commonCombo->setEditable( TRUE );
             } else {
                 configMenu->setItemChecked(-23,FALSE);
                 commonCombo->setEditable( FALSE );
             }
         }
     }
     if( iD  == -23) {
         cfg.setGroup("Commands");
 //        qDebug("enableCommandEdit");
         if( !configMenu->isItemChecked(iD) ) {
             commonCombo->setEditable( TRUE );
             configMenu->setItemChecked(iD,TRUE);
             commonCombo->setCurrentItem(0);
             cfg.writeEntry("EditEnabled","TRUE");
         } else {
             commonCombo->setEditable( FALSE );
             configMenu->setItemChecked(iD,FALSE);
             cfg.writeEntry("EditEnabled","FALSE");
             commonCombo->setFocusPolicy(QWidget::NoFocus);
             te->setFocus();
         }
     }
     if(iD == -24) {
     // "edit commands"
     CommandEditDialog *m = new CommandEditDialog(this);
     connect(m,SIGNAL(commandsEdited()),this,SLOT(initCommandList()));
     m->showMaximized();
     }
 
 }
 
 // $QPEDIR/bin/qcop QPE/Application/embeddedkonsole 'setDocument(QString)' 'ssh -V'
 void Konsole::setDocument( const QString &cmd) {
     newSession();
     TEWidget* te = getTe();
     if(cmd.find("-e", 0, TRUE) != -1) {
         QString cmd2;
         cmd2=cmd.right(cmd.length()-3)+" &";
         system(cmd2.latin1());
         if(startUp <= 1 && nsessions < 2) {
             doneSession(getTe()->currentSession, 0);
             exit(0);
         } else
             doneSession(getTe()->currentSession, 0);
     } else {
         if (te != 0) {
             te->emitText(cmd+"\r");
         }
     }
     startUp++;
 }
 
 void Konsole::parseCommandLine() {
     QString cmd;
       //    newSession();
     for (int i=1;i< qApp->argc();i++) {
         if( QString(qApp->argv()[i]) == "-e") {
             i++;
             for ( int j=i;j< qApp->argc();j++) {
                 cmd+=QString(qApp->argv()[j])+" ";
             }
             cmd.stripWhiteSpace();
             system(cmd.latin1());
             exit(0);//close();
         } // end -e switch
     }
     startUp++;
 }
 
 void Konsole::changeForegroundColor(const QColor &color) {
     Config cfg("Konsole");
     cfg.setGroup("Colors");
     int r, g, b;
     color.rgb(&r,&g,&b);
     foreground.setRgb(r,g,b);
 
     cfg.writeEntry("foreground",color.name());
     qDebug("foreground "+color.name());
     cfg.write();
 
 qDebug("do other dialog");
 #ifdef QT_QWS_OPIE
 
  OColorPopupMenu* penColorPopupMenu2 = new OColorPopupMenu(Qt::black, this,"background color");
     connect(penColorPopupMenu2, SIGNAL(colorSelected(const QColor&)), this,
             SLOT(changeBackgroundColor(const QColor&)));
    penColorPopupMenu2->exec();
 #endif
 }
 
 void Konsole::changeBackgroundColor(const QColor &color) {
 
     qDebug("Change background");
     Config cfg("Konsole");
     cfg.setGroup("Colors");
     int r, g, b;
     color.rgb(&r,&g,&b);
     background.setRgb(r,g,b);
     cfg.writeEntry("background",color.name());
     qDebug("background "+color.name());
     cfg.write();
 }
 
 void Konsole::doWrap() {
 int i;
 #ifdef QT_QWS_OPIE
 i=-29;
 #else
 i=-28;
 #endif
-    
+
  Config cfg("Konsole");
     cfg.setGroup("ScrollBar");
     TEWidget* te = getTe();
     if( !cfg.readBoolEntry("HorzScroll",0)) {
         te->setWrapAt(0);
         configMenu->setItemChecked( i,TRUE);
     } else {
 //        te->setWrapAt(90);
         te->setWrapAt(120);
         configMenu->setItemChecked( i,FALSE);
-    }       
+    }
 }
diff --git a/core/apps/embeddedkonsole/konsole.h b/core/apps/embeddedkonsole/konsole.h
index 4938159..e9d0e4b 100644
--- a/core/apps/embeddedkonsole/konsole.h
+++ b/core/apps/embeddedkonsole/konsole.h
@@ -1,144 +1,144 @@
 /* ----------------------------------------------------------------------- */
 /*                                                                         */
 /* [konsole.h]                      Konsole                                   */
 /*                                                                            */
 /* -------------------------------------------------------------------------- */
 /*                                                                            */
 /* Copyright (c) 1997,1998 by Lars Doelle <lars.doelle@on-line.de>            */
 /*                                                                            */
 /* This file is part of Konsole, an X terminal.                               */
 /*                                                                            */
 /* The material contained in here more or less directly orginates from        */
 /* kvt, which is copyright (c) 1996 by Matthias Ettrich <ettrich@kde.org>     */
 /*                                                                            */
 /* -------------------------------------------------------------------------- */
 /*                        */
 /* Ported Konsole to Qt/Embedded                                              */
 /*                        */
 /* Copyright (C) 2000 by John Ryland <jryland@trolltech.com>                  */
 /*                        */
 /* -------------------------------------------------------------------------- */
 
 #ifndef KONSOLE_H
 #define KONSOLE_H
 
 
 #include <qmainwindow.h>
 #include <qaction.h>
 #include <qpopupmenu.h>
 #include <qstrlist.h>
 #include <qintdict.h>
 #include <qptrdict.h>
 #include <qtabwidget.h>
 #include <qpe/qpetoolbar.h>
 #include <qcombobox.h>
 #include <qcolor.h>
 
 #include "MyPty.h"
 #include "TEWidget.h"
 #include "TEmuVt102.h"
 #include "session.h"
 
 class EKNumTabWidget;
 
 class Konsole : public QMainWindow
 {
-Q_OBJECT
+    Q_OBJECT
 
 public:
+  static QString appName() { return QString::fromLatin1("embeddedkonsole"); }
 
   Konsole(QWidget* parent = 0, const char* name = 0, WFlags fl = 0);
-  Konsole(const char * name, const char* pgm, QStrList & _args, int histon);
   ~Konsole();
   void setColLin(int columns, int lines);
-  QPEToolBar *secondToolBar; 
+  QPEToolBar *secondToolBar;
   void show();
   void setColor();
   int lastSelectedMenu;
   int startUp;
 private slots:
   void setDocument(const QString &);
   void doneSession(TESession*,int);
   void changeColumns(int);
   void fontChanged(int);
   void configMenuSelected(int );
   void colorMenuSelected(int);
   void colorMenuIsSelected(int);
   void enterCommand(int);
   void hitEnter();
   void hitSpace();
   void hitTab();
   void hitPaste();
   void hitUp();
   void hitDown();
   void switchSession(QWidget *);
   void newSession();
   void changeCommand(const QString &, int);
   void initCommandList();
   void scrollMenuSelected(int);
   void editCommandListMenuSelected(int);
   void parseCommandLine();
     void changeForegroundColor(const QColor &);
     void changeBackgroundColor(const QColor &);
 private:
     void doWrap();
   void init(const char* _pgm, QStrList & _args);
   void initSession(const char* _pgm, QStrList & _args);
   void runSession(TESession* s);
   void setColorPixmaps();
   void setHistory(bool);
   QSize calcSize(int columns, int lines);
   TEWidget* getTe();
   QStringList commands;
   QLabel * msgLabel;
   QColor foreground, background;
 bool fromMenu;
 private:
-  class VTFont 
+  class VTFont
   {
   public:
-    VTFont(QString name, QFont& font) 
+    VTFont(QString name, QFont& font)
     {
       this->name = name;
       this->font = font;
     }
 
-    QFont& getFont() 
+    QFont& getFont()
     {
       return font;
     }
 
-    QString getName() 
+    QString getName()
     {
       return name;
     }
 
   private:
     QString name;
     QFont font;
   };
 
   EKNumTabWidget* tab;
   int nsessions;
   QList<VTFont> fonts;
   int cfont;
   QCString se_pgm;
   QStrList se_args;
 
   QPopupMenu *fontList,*configMenu,*colorMenu,*scrollMenu,*editCommandListMenu;
   QComboBox *commonCombo;
     // history scrolling I think
   bool        b_scroll;
 
   int         n_keytab;
   int         n_scroll;
   int         n_render;
   QString     pmPath; // pixmap path
   QString     dropText;
   QFont       defaultFont;
   QSize       defaultSize;
 
 };
 
 #endif
 
diff --git a/core/apps/embeddedkonsole/main.cpp b/core/apps/embeddedkonsole/main.cpp
index 91199eb..f77fe24 100644
--- a/core/apps/embeddedkonsole/main.cpp
+++ b/core/apps/embeddedkonsole/main.cpp
@@ -1,79 +1,38 @@
 /* ---------------------------------------------------------------------- */
 /*                                                                        */
 /* [main.C]                        Konsole                                */
 /*                                                                        */
 /* ---------------------------------------------------------------------- */
 /*                                                                        */
 /* Copyright (c) 1997,1998 by Lars Doelle <lars.doelle@on-line.de>        */
 /*                                                                        */
 /* This file is part of Konsole, an X terminal.                           */
 /*                                                                        */
 /* The material contained in here more or less directly orginates from    */
 /* kvt, which is copyright (c) 1996 by Matthias Ettrich <ettrich@kde.org> */
 /*                                                                        */
 /* ---------------------------------------------------------------------- */
 /*                        */
 /* Ported Konsole to Qt/Embedded                                              */
 /*                        */
 /* Copyright (C) 2000 by John Ryland <jryland@trolltech.com>                  */
 /*                        */
 /* -------------------------------------------------------------------------- */
 
 #include "konsole.h"
 
 #include <qpe/qpeapplication.h>
+#include <opie/oapplicationfactory.h>
 
 #include <qfile.h>
 
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <pwd.h>
 #include <sys/types.h>
 
 
 /* --| main |------------------------------------------------------ */
-int main(int argc, char* argv[])
-{
-  if(setuid(getuid()) !=0) qDebug("setuid failed");
-  if(setgid(getgid()) != 0) qDebug("setgid failed"); // drop privileges
-
-  QPEApplication a( argc, argv );
-
-//  QPEApplication::grabKeyboard(); // for CTRL and ALT
-
-  qDebug("keyboard grabbed");
-#ifdef FAKE_CTRL_AND_ALT
-    qDebug("Fake Ctrl and Alt defined");
-  QPEApplication::grabKeyboard(); // for CTRL and ALT
-#endif
-
-  QStrList tmp;
-  const char* shell = getenv("SHELL");
-
-  if (shell == NULL || *shell == '\0') {
-    struct passwd *ent = 0;
-    uid_t me = getuid();
-    shell = "/bin/sh";
-    
-    while ( (ent = getpwent()) != 0 ) {
-      if (ent->pw_uid == me) {
-        if (ent->pw_shell != "")
-          shell = ent->pw_shell;
-        break;
-      }
-    }
-    endpwent();
-  }
-
- if( putenv((char*)"COLORTERM=") !=0)
-     qDebug("putenv failed"); // to trigger mc's color detection
-
-  Konsole m( "test", shell, tmp, TRUE  );
-  m.setCaption( Konsole::tr("Terminal") );
-  a.showMainWidget( &m );
-
-  return a.exec();
-}
-
+OPIE_EXPORT_APP( OApplicationFactory<Konsole> )
diff --git a/core/apps/textedit/main.cpp b/core/apps/textedit/main.cpp
index f80c5d8..edab73d 100644
--- a/core/apps/textedit/main.cpp
+++ b/core/apps/textedit/main.cpp
@@ -1,35 +1,26 @@
 /**********************************************************************
 ** 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 "textedit.h"
 
 #include <qpe/qpeapplication.h>
+#include <opie/oapplicationfactory.h>
 
-int main( int argc, char **argv )
-{
-    QPEApplication a( argc, argv );
-    
-    TextEdit e;
-    a.showMainDocumentWidget(&e);
-//     if ( argc == 3 && argv[1] == QCString("-f") )
-//   e.openFile(argv[2]);
-
-    return a.exec();
-}
+OPIE_EXPORT_APP( OApplicationFactory<TextEdit> )
diff --git a/core/apps/textedit/textedit.h b/core/apps/textedit/textedit.h
index e0cbea2..303b707 100644
--- a/core/apps/textedit/textedit.h
+++ b/core/apps/textedit/textedit.h
@@ -1,142 +1,143 @@
 /**********************************************************************
  ** 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.
  **
  **********************************************************************/
 // additions made by L.J. Potter Sun 02-17-2002 22:27:46
 
 #ifndef TEXTEDIT_H
 #define TEXTEDIT_H
 
 #define QTEXTEDIT_OPEN_API
 
 //#include "fileBrowser.h"
 //#include "fileSaver.h"
 
 #include <qpe/filemanager.h>
 #include <qpe/qcopenvelope_qws.h>
 
 #include <opie/ofileselector.h>
 
 #include <qmainwindow.h>
 #include <qmultilineedit.h>
 #include <qlist.h>
 #include <qmap.h>
 
 class QAction;
 class QWidgetStack;
 class QToolButton;
 class QPopupMenu;
 class QToolBar;
 class QLineEdit;
 class QAction;
 class FileSelector;
 class QpeEditor;
 class QPopupMenu;
 class QTimer;
 
 class TextEdit : public QMainWindow
 {
    Q_OBJECT
 
 public:
+   static QString appName() { return QString::fromLatin1("textedit"); }
    TextEdit( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
    ~TextEdit();
 
 protected:
    QPopupMenu *font;
    QAction *nStart, *nFileDlgOpt, *nAdvanced, *desktopAction, *filePermAction, *searchBarAction, *nAutoSave;
    bool edited, edited1;
    void openFile( const QString & );
    QCopChannel * channel;
 
    bool featureAutoSave;
    void closeEvent( QCloseEvent *e );
    void doSearchBar();
    int savePrompt();
    void setTimer();
 private slots:
    void editorChanged();
    void receive(const QCString&, const QByteArray&);
    void timerCrank();
-   void doTimer(bool); 
+   void doTimer(bool);
    void editPasteTimeDate();
    void doPrompt(bool);
    void doDesktop(bool);
    void doFilePerms(bool);
    void doAbout();
    void setDocument(const QString&);
    void changeFont();
    void fileNew();
    void fileRevert();
    void fileOpen();
    void changeStartConfig(bool);
    bool save();
    bool saveAs();
    void cleanUp();
 
    void gotoLine();
    void doGoto();
 
 
    void editCut();
    void editCopy();
    void editPaste();
    void editFind();
    void editDelete();
 
    void findNext();
    void findClose();
 
    void search();
    void accept();
 
    void newFile( const DocLnk & );
    void openFile( const DocLnk & );
    void showEditTools();
 
    void zoomIn();
    void zoomOut();
    void setBold(bool y);
    void setItalic(bool y);
    void setWordWrap(bool y);
    void setSearchBar(bool);
 
 private:
    void openDotFile(const QString &);
    void colorChanged( const QColor &c );
    void clear();
    void updateCaption( const QString &name=QString::null );
    void setFontSize(int sz, bool round_down_not_up);
 private:
 //    fileSaver *fileSaveDlg;
 //    fileBrowser *browseForFiles;
    bool fromSetDocument;
    QpeEditor* editor;
    QToolBar *menu, *editBar, *searchBar;
    QPopupMenu *advancedMenu;
    QLineEdit *gotoEdit;
    QLineEdit *searchEdit;
    DocLnk *doc;
    bool fileIs, useAdvancedFeatures, promptExit, openDesktop, filePerms, useSearchBar, startWithNew;
    bool bFromDocView;
    int  viewSelection;
    QAction *zin, *zout;
    QString currentFileName;
 };
 
 #endif
diff --git a/core/apps/textedit/textedit.pro b/core/apps/textedit/textedit.pro
index 2577340..b958ff5 100644
--- a/core/apps/textedit/textedit.pro
+++ b/core/apps/textedit/textedit.pro
@@ -1,31 +1,29 @@
-TEMPLATE  = app
-CONFIG    += qt warn_on release
-DESTDIR   = $(OPIEDIR)/bin
+CONFIG    += qt warn_on release quick-app
 HEADERS = textedit.h filePermissions.h
 SOURCES = main.cpp textedit.cpp filePermissions.cpp
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe -lopie
 TARGET    = textedit
 
 TRANSLATIONS = ../../../i18n/de/textedit.ts \
 	 ../../../i18n/nl/textedit.ts \
    ../../../i18n/da/textedit.ts \
    ../../../i18n/xx/textedit.ts \
          ../../../i18n/en/textedit.ts \
          ../../../i18n/es/textedit.ts \
          ../../../i18n/fr/textedit.ts \
          ../../../i18n/hu/textedit.ts \
          ../../../i18n/ja/textedit.ts \
          ../../../i18n/ko/textedit.ts \
          ../../../i18n/no/textedit.ts \
          ../../../i18n/pl/textedit.ts \
          ../../../i18n/pt/textedit.ts \
          ../../../i18n/pt_BR/textedit.ts \
          ../../../i18n/sl/textedit.ts \
          ../../../i18n/zh_CN/textedit.ts \
          ../../../i18n/zh_TW/textedit.ts
 
 
 
 include ( $(OPIEDIR)/include.pro )