summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/PLANS5
-rw-r--r--noncore/apps/opie-console/main.cpp35
-rw-r--r--noncore/apps/opie-console/opie-console.control2
-rw-r--r--noncore/apps/opie-console/opie-console.pro4
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
@@ -15,41 +15,40 @@ should we have a general opie-console setting dialog where you configure
general things like where the tabs are, the profiles, and the default
keyboard?
(Almost) DONE:
Framework
Serial IOLayer
Saving and Restoring Profiles
ConfigDialog Framework
IOLayer
Profile->Session and MainWidget
FilesendingLayer ( Z/Y Modem tested X does not work at all )
Fullscreen
Modem - Josef
Keys - hash
Scripting - wazlaf
+ Keys - hash
TASKS in progress:
- Keys - hash
-
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
settings while the session is running (colors, fonts...)
zecke => think of that. You try to hook up with a New Device
neither know anything.... speed flow and such stuff
you start to experiment and it starts to work
now you want to save the session
- hash => got it.
+ hash => got it.
OPEN tasks:
Receiving ( copy &n paste from filetransfer.cpp )
POSTPONED UNTIL LATER:
Irda ConfigWidget
BT ConfigWidget
IRDA-Layer
Bluetooth-Layer
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,10 +1,10 @@
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
Version: 0.6-$SUB_VERSION
Depends: qpe-base, libopiecore2, libopieui2, opie-console-help-en, lrzsz, opie-keytabs
License: GPL
Description: Opie terminal app
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,17 +1,18 @@
-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 \
mainwindow.h \
profile.h \
profileconfig.h \
profilemanager.h \
tabwidget.h \
configdialog.h \
keytrans.h \
transferdialog.h \
profiledialogwidget.h \
profileeditordialog.h \
default.h \
iolayerbase.h \
@@ -47,26 +48,27 @@ SOURCES = io_layer.cpp io_serial.cpp io_irda.cpp io_bt.cpp io_modem.cpp \
iolayerbase.cpp \
serialconfigwidget.cpp irdaconfigwidget.cpp \
btconfigwidget.cpp modemconfigwidget.cpp \
atconfigdialog.cpp dialdialog.cpp \
default.cpp procctl.cpp \
function_keyboard.cpp \
receive_layer.cpp filereceive.cpp \
script.cpp \
dialer.cpp \
terminalwidget.cpp \
emulation_handler.cpp TEHistory.cpp \
TEScreen.cpp TEWidget.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
TARGET = opie-console
DEFINES += HAVE_OPENPTY
include ( $(OPIEDIR)/include.pro )