author | zecke <zecke> | 2004-09-10 13:03:32 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-09-10 13:03:32 (UTC) |
commit | cc36d73926cf939cf754e31ea7ee87698e20a4bb (patch) (side-by-side diff) | |
tree | 1db911900129bc4fa551a92fa0b7c228cec6bc89 /noncore/apps/opie-console | |
parent | f9fb882141b4a519ae958e6332fb5a8ef717d88c (diff) | |
download | opie-cc36d73926cf939cf754e31ea7ee87698e20a4bb.zip opie-cc36d73926cf939cf754e31ea7ee87698e20a4bb.tar.gz opie-cc36d73926cf939cf754e31ea7ee87698e20a4bb.tar.bz2 |
-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
-rw-r--r-- | noncore/apps/opie-console/PLANS | 3 | ||||
-rw-r--r-- | noncore/apps/opie-console/main.cpp | 35 | ||||
-rw-r--r-- | noncore/apps/opie-console/opie-console.control | 2 | ||||
-rw-r--r-- | noncore/apps/opie-console/opie-console.pro | 4 |
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 @@ -30,6 +30,5 @@ keyboard? Scripting - wazlaf - -TASKS in progress: Keys - hash +TASKS in progress: Session->Profile - hash => why is this needed? you can not change any settings 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,2 +1,3 @@ -#include <opie2/oapplicationfactory.h> +#include <opie2/oapplication.h> +#include <qwsevent_qws.h> @@ -4,5 +5,35 @@ +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,3 +1,3 @@ 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 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,2 +1,3 @@ -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 \ @@ -62,2 +63,3 @@ SOURCES = io_layer.cpp io_serial.cpp io_irda.cpp io_bt.cpp io_modem.cpp \ +DESTDIR = $(OPIEDIR)/bin/ INTERFACES = configurebase.ui editbase.ui |