author | zecke <zecke> | 2004-09-10 13:03:32 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-09-10 13:03:32 (UTC) |
commit | cc36d73926cf939cf754e31ea7ee87698e20a4bb (patch) (unidiff) | |
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 | 5 | ||||
-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, 39 insertions, 7 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 | |||
@@ -28,10 +28,9 @@ keyboard? | |||
28 | Modem - Josef | 28 | Modem - Josef |
29 | Keys - hash | 29 | Keys - hash |
30 | Scripting - wazlaf | 30 | Scripting - wazlaf |
31 | Keys - hash | ||
31 | 32 | ||
32 | TASKS in progress: | 33 | TASKS in progress: |
33 | Keys - hash | ||
34 | |||
35 | Session->Profile - hash => why is this needed? you can not change any settings | 34 | Session->Profile - hash => why is this needed? you can not change any settings |
36 | after you start the session, so all you would do is | 35 | after you start the session, so all you would do is |
37 | create a duplicate of the profile used to open the | 36 | create a duplicate of the profile used to open the |
@@ -42,7 +41,7 @@ TASKS in progress: | |||
42 | you start to experiment and it starts to work | 41 | you start to experiment and it starts to work |
43 | now you want to save the session | 42 | now you want to save the session |
44 | 43 | ||
45 | hash => got it. | 44 | hash => got it. |
46 | 45 | ||
47 | OPEN tasks: | 46 | OPEN tasks: |
48 | Receiving ( copy &n paste from filetransfer.cpp ) | 47 | Receiving ( copy &n paste from filetransfer.cpp ) |
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 @@ | |||
1 | #include <opie2/oapplicationfactory.h> | 1 | #include <opie2/oapplication.h> |
2 | #include <qwsevent_qws.h> | ||
2 | 3 | ||
3 | #include "mainwindow.h" | 4 | #include "mainwindow.h" |
4 | 5 | ||
6 | class OConsoleApplication : public Opie::Core::OApplication { | ||
7 | public: | ||
8 | OConsoleApplication(int argc, char* argv[]); | ||
9 | protected: | ||
10 | bool qwsEventFilter( QWSEvent * ); | ||
11 | }; | ||
5 | 12 | ||
6 | OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<MainWindow> ); | 13 | OConsoleApplication::OConsoleApplication(int argc, char* argv[] ) |
14 | : Opie::Core::OApplication(argc, argv, "opie-console") | ||
15 | {} | ||
7 | 16 | ||
17 | bool OConsoleApplication::qwsEventFilter( QWSEvent *e) { | ||
18 | if( e->type == QWSEvent::Key ) { | ||
19 | QWSKeyEvent *key = static_cast<QWSKeyEvent*>(e); | ||
20 | |||
21 | /* prevent QPEApplication to filter the key */ | ||
22 | if(key->simpleData.keycode == Qt::Key_Escape) | ||
23 | return QApplication::qwsEventFilter(e); | ||
24 | |||
25 | } | ||
26 | |||
27 | return Opie::Core::OApplication::qwsEventFilter( e); | ||
28 | } | ||
29 | |||
30 | |||
31 | int main(int argc, char* argv[]) { | ||
32 | OConsoleApplication app(argc, argv); | ||
33 | |||
34 | MainWindow win; | ||
35 | app.showMainWidget(&win); | ||
36 | |||
37 | return app.exec(); | ||
38 | } | ||
8 | 39 | ||
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,5 +1,5 @@ | |||
1 | Package: opie-console | 1 | Package: opie-console |
2 | Files: plugins/application/libopie-console.so* bin/opie-console apps/Applications/opie-console.desktop pics/console/* | 2 | Files: bin/opie-console apps/Applications/opie-console.desktop pics/console/* |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applications | 4 | Section: opie/applications |
5 | Maintainer: Opie Team <opie@handhelds.org> | 5 | Maintainer: Opie Team <opie@handhelds.org> |
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,4 +1,5 @@ | |||
1 | CONFIG += qt warn_on quick-app | 1 | TEMPLATE = app |
2 | CONFIG += qt warn_on | ||
2 | HEADERS = io_layer.h io_serial.h io_irda.h io_bt.h io_modem.h \ | 3 | HEADERS = io_layer.h io_serial.h io_irda.h io_bt.h io_modem.h \ |
3 | file_layer.h filetransfer.h \ | 4 | file_layer.h filetransfer.h \ |
4 | metafactory.h \ | 5 | metafactory.h \ |
@@ -60,6 +61,7 @@ SOURCES = io_layer.cpp io_serial.cpp io_irda.cpp io_bt.cpp io_modem.cpp \ | |||
60 | consoleconfigwidget.cpp | 61 | consoleconfigwidget.cpp |
61 | 62 | ||
62 | 63 | ||
64 | DESTDIR = $(OPIEDIR)/bin/ | ||
63 | INTERFACES = configurebase.ui editbase.ui | 65 | INTERFACES = configurebase.ui editbase.ui |
64 | INCLUDEPATH += $(OPIEDIR)/include | 66 | INCLUDEPATH += $(OPIEDIR)/include |
65 | DEPENDPATH += $(OPIEDIR)/include | 67 | DEPENDPATH += $(OPIEDIR)/include |