-Disable Quick Launching as we need a special QApplication

 to prevent filtering the escape key
-Update .pro and .control as we're no longer quicklaunchable
-Update PLANS as most of it is already finished

4 files changed, 38 insertions, 6 deletions

diff --git a/noncore/apps/opie-console/PLANS b/noncore/apps/opie-console/PLANS
index a7c7578..bef7196 100644
--- a/noncore/apps/opie-console/PLANS
+++ b/noncore/apps/opie-console/PLANS
@@ -27,12 +27,11 @@ keyboard?
   Fullscreen
   Modem - Josef
   Keys - hash 
   Scripting - wazlaf 
-
-TASKS in progress:
   Keys - hash
    
+TASKS in progress:
   Session->Profile - hash => why is this needed? you can not change any settings
                              after you start the session, so all you would do is
                              create a duplicate of the profile used to open the
                              current session. maybe needed later when you can change
diff --git a/noncore/apps/opie-console/main.cpp b/noncore/apps/opie-console/main.cpp
index eafc9b2..58c9c57 100644
--- a/noncore/apps/opie-console/main.cpp
+++ b/noncore/apps/opie-console/main.cpp
@@ -1,8 +1,39 @@
-#include <opie2/oapplicationfactory.h>
+#include <opie2/oapplication.h>
+#include <qwsevent_qws.h>
 
 #include "mainwindow.h"
 
+class OConsoleApplication : public Opie::Core::OApplication {
+public:
+    OConsoleApplication(int argc, char* argv[]);
+protected:
+    bool qwsEventFilter( QWSEvent * );    
+};
 
-OPIE_EXPORT_APP(  Opie::Core::OApplicationFactory<MainWindow> );
+OConsoleApplication::OConsoleApplication(int argc, char* argv[] )
+    : Opie::Core::OApplication(argc, argv, "opie-console")
+{}
 
+bool OConsoleApplication::qwsEventFilter( QWSEvent *e) {
+    if( e->type == QWSEvent::Key ) {
+	QWSKeyEvent *key = static_cast<QWSKeyEvent*>(e);
+	
+	/* prevent QPEApplication to filter the key */
+	if(key->simpleData.keycode == Qt::Key_Escape) 
+	    return QApplication::qwsEventFilter(e);
+	
+    }
+    
+    return Opie::Core::OApplication::qwsEventFilter( e);
+}
+
+
+int main(int argc, char* argv[]) {
+    OConsoleApplication app(argc, argv);
+    
+    MainWindow win;
+    app.showMainWidget(&win);
+    
+    return app.exec();
+}
 
diff --git a/noncore/apps/opie-console/opie-console.control b/noncore/apps/opie-console/opie-console.control
index 994e662..e924b79 100644
--- a/noncore/apps/opie-console/opie-console.control
+++ b/noncore/apps/opie-console/opie-console.control
@@ -1,6 +1,6 @@
 Package: opie-console
-Files:  plugins/application/libopie-console.so* bin/opie-console apps/Applications/opie-console.desktop pics/console/*
+Files: bin/opie-console apps/Applications/opie-console.desktop pics/console/*
 Priority: optional
 Section: opie/applications
 Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
diff --git a/noncore/apps/opie-console/opie-console.pro b/noncore/apps/opie-console/opie-console.pro
index 57bd0f4..6bc42bd 100644
--- a/noncore/apps/opie-console/opie-console.pro
+++ b/noncore/apps/opie-console/opie-console.pro
@@ -1,5 +1,6 @@
-CONFIG       += qt warn_on quick-app
+TEMPLATE = app
+CONFIG       += qt warn_on 
 HEADERS      = io_layer.h io_serial.h io_irda.h io_bt.h io_modem.h \
            file_layer.h filetransfer.h \
            metafactory.h \
            session.h \
@@ -59,8 +60,9 @@ SOURCES      = io_layer.cpp io_serial.cpp io_irda.cpp io_bt.cpp io_modem.cpp \
         TEmuVt102.cpp TEmulation.cpp MyPty.cpp \
         consoleconfigwidget.cpp
 
 
+DESTDIR      = $(OPIEDIR)/bin/
 INTERFACES   = configurebase.ui editbase.ui
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopiecore2 -lopieui2 -lutil