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
@@ -2,7 +2,5 @@ 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 \
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
@@ -47,4 +47,7 @@
 #include <qpalette.h>
 
+#include <unistd.h>
+#include <pwd.h>
+#include <sys/types.h>
 #include <sys/wait.h>
 #include <stdio.h>
@@ -172,18 +175,55 @@ static const char *commonCmds[] =
 };
 
+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()
 {
@@ -300,5 +340,5 @@ void Konsole::init(const char* _pgm, QStrList & _args)
   colorMenu->insertItem(tr( "Custom"));
 #endif
-  
+
   configMenu->insertItem( tr("Font"), fontList );
   configMenu->insertItem(tr( "Colors") ,colorMenu);
@@ -369,5 +409,5 @@ void Konsole::init(const char* _pgm, QStrList & _args)
 //   scrollMenu->insertSeparator(4);
 //   scrollMenu->insertItem(tr( "Horizontal" ));
- 
+
   configMenu->insertItem(tr( "ScrollBar" ),scrollMenu);
 
@@ -381,5 +421,5 @@ void Konsole::init(const char* _pgm, QStrList & _args)
   configMenu->setItemChecked(jut, cfg.readBoolEntry("useBeep",0));
 
-  
+
 //scrollMenuSelected(-29);
 //   cfg.setGroup("ScrollBar");
@@ -419,5 +459,5 @@ void Konsole::show()
   }
   QMainWindow::show();
-  
+
 }
 
@@ -542,5 +582,5 @@ void Konsole::setColLin(int columns, int lines)
 {
   qDebug("konsole::setColLin:: Columns %d", columns);
-    
+
   if ((columns==0) || (lines==0))
   {
@@ -764,5 +804,5 @@ void Konsole::colorMenuSelected(int iD)
             colorMenu->setItemChecked(-18,TRUE);
         }
-#ifdef QT_QWS_OPIE        
+#ifdef QT_QWS_OPIE
         if(iD==-19) {
 // Custom
@@ -891,5 +931,5 @@ i=-24;j=-25;k=-26;
      cfg.writeEntry("Position",0);
  }  else if(index == j) {
-        
+
      te->setScrollbarLocation(1);
      cfg.writeEntry("Position",1);
@@ -899,5 +939,5 @@ i=-24;j=-25;k=-26;
      cfg.writeEntry("Position",2);
  }
-    
+
 //       case -29: {
 //           bool b=cfg.readBoolEntry("HorzScroll",0);
@@ -1048,5 +1088,5 @@ i=-29;
 i=-28;
 #endif
-    
+
  Config cfg("Konsole");
     cfg.setGroup("ScrollBar");
@@ -1059,4 +1099,4 @@ i=-28;
         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
@@ -44,13 +44,13 @@ 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();
@@ -95,8 +95,8 @@ private:
 bool fromMenu;
 private:
-  class VTFont 
+  class VTFont
   {
   public:
-    VTFont(QString name, QFont& font) 
+    VTFont(QString name, QFont& font)
     {
       this->name = name;
@@ -104,10 +104,10 @@ private:
     }
 
-    QFont& getFont() 
+    QFont& getFont()
     {
       return font;
     }
 
-    QString getName() 
+    QString getName()
     {
       return name;
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
@@ -23,4 +23,5 @@
 
 #include <qpe/qpeapplication.h>
+#include <opie/oapplicationfactory.h>
 
 #include <qfile.h>
@@ -35,45 +36,3 @@
 
 /* --| 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
@@ -22,14 +22,5 @@
 
 #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
@@ -55,4 +55,5 @@ class TextEdit : public QMainWindow
 
 public:
+   static QString appName() { return QString::fromLatin1("textedit"); }
    TextEdit( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
    ~TextEdit();
@@ -74,5 +75,5 @@ private slots:
    void receive(const QCString&, const QByteArray&);
    void timerCrank();
-   void doTimer(bool); 
+   void doTimer(bool);
    void editPasteTimeDate();
    void doPrompt(bool);
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,5 +1,3 @@
-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