author | zecke <zecke> | 2002-10-14 19:58:07 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-10-14 19:58:07 (UTC) |
commit | 0547ecc794209a0824fd7662e434706ac625dbb2 (patch) (unidiff) | |
tree | 90243ddbca14b2c01552d55b413be0d044c3a108 | |
parent | 7114c1567399d9b134af337824ef56e7d5facee7 (diff) | |
download | opie-0547ecc794209a0824fd7662e434706ac625dbb2.zip opie-0547ecc794209a0824fd7662e434706ac625dbb2.tar.gz opie-0547ecc794209a0824fd7662e434706ac625dbb2.tar.bz2 |
Make it work
history and other stuff
-rw-r--r-- | noncore/apps/opie-console/emulation_handler.cpp | 6 | ||||
-rw-r--r-- | noncore/apps/opie-console/profilemanager.cpp | 9 | ||||
-rw-r--r-- | noncore/apps/opie-console/session.cpp | 47 | ||||
-rw-r--r-- | noncore/apps/opie-console/session.h | 12 |
4 files changed, 43 insertions, 31 deletions
diff --git a/noncore/apps/opie-console/emulation_handler.cpp b/noncore/apps/opie-console/emulation_handler.cpp index c67c7c7..9e7f56c 100644 --- a/noncore/apps/opie-console/emulation_handler.cpp +++ b/noncore/apps/opie-console/emulation_handler.cpp | |||
@@ -19,6 +19,7 @@ EmulationHandler::EmulationHandler( const Profile& prof, QWidget* parent,const c | |||
19 | connect(m_teEmu, SIGNAL(sndBlock(const char*, int) ), | 19 | connect(m_teEmu, SIGNAL(sndBlock(const char*, int) ), |
20 | this, SLOT(recvEmulation(const char*, int) ) ); | 20 | this, SLOT(recvEmulation(const char*, int) ) ); |
21 | m_teEmu->setConnect( true ); | 21 | m_teEmu->setConnect( true ); |
22 | m_teEmu->setHistory( TRUE ); | ||
22 | load( prof ); | 23 | load( prof ); |
23 | 24 | ||
24 | 25 | ||
@@ -32,13 +33,16 @@ void EmulationHandler::load( const Profile& ) { | |||
32 | QFont font = QFont("Fixed", 12, QFont::Normal ); | 33 | QFont font = QFont("Fixed", 12, QFont::Normal ); |
33 | font.setFixedPitch(TRUE); | 34 | font.setFixedPitch(TRUE); |
34 | m_teWid->setVTFont( font ); | 35 | m_teWid->setVTFont( font ); |
35 | m_teWid->setBackgroundColor(Qt::black ); | 36 | m_teWid->setBackgroundColor(Qt::gray ); |
36 | } | 37 | } |
37 | void EmulationHandler::recv( const QByteArray& ar) { | 38 | void EmulationHandler::recv( const QByteArray& ar) { |
39 | qWarning("received in EmulationHandler!"); | ||
38 | m_teEmu->onRcvBlock(ar.data(), ar.count() ); | 40 | m_teEmu->onRcvBlock(ar.data(), ar.count() ); |
39 | } | 41 | } |
40 | void EmulationHandler::recvEmulation(const char* src, int len ) { | 42 | void EmulationHandler::recvEmulation(const char* src, int len ) { |
43 | qWarning("received from te "); | ||
41 | QByteArray ar(len); | 44 | QByteArray ar(len); |
45 | |||
42 | memcpy(ar.data(), src, sizeof(char) * len ); | 46 | memcpy(ar.data(), src, sizeof(char) * len ); |
43 | 47 | ||
44 | emit send(ar); | 48 | emit send(ar); |
diff --git a/noncore/apps/opie-console/profilemanager.cpp b/noncore/apps/opie-console/profilemanager.cpp index e8bdb2e..95a46f9 100644 --- a/noncore/apps/opie-console/profilemanager.cpp +++ b/noncore/apps/opie-console/profilemanager.cpp | |||
@@ -72,6 +72,14 @@ Profile::ValueList ProfileManager::all()const { | |||
72 | * in TabWidget | 72 | * in TabWidget |
73 | */ | 73 | */ |
74 | Session* ProfileManager::fromProfile( const Profile& prof, QWidget* parent) { | 74 | Session* ProfileManager::fromProfile( const Profile& prof, QWidget* parent) { |
75 | /* TEST PROFILE!!! | ||
76 | Profile prof; | ||
77 | QString str = "/dev/ttyS0"; | ||
78 | prof.writeEntry("Device",str ); | ||
79 | prof.writeEntry("Baud", 115200 ); | ||
80 | prof.setIOLayer("serial"); | ||
81 | prof.setName( "test"); | ||
82 | */ | ||
75 | Session* session = new Session(); | 83 | Session* session = new Session(); |
76 | session->setName( prof.name() ); | 84 | session->setName( prof.name() ); |
77 | /* translate the internal name to the external */ | 85 | /* translate the internal name to the external */ |
@@ -85,6 +93,7 @@ Session* ProfileManager::fromProfile( const Profile& prof, QWidget* parent) { | |||
85 | stack->addWidget( dummy, 0 ); | 93 | stack->addWidget( dummy, 0 ); |
86 | stack->raiseWidget( 0 ); | 94 | stack->raiseWidget( 0 ); |
87 | EmulationHandler* handler = new EmulationHandler(prof,dummy ); | 95 | EmulationHandler* handler = new EmulationHandler(prof,dummy ); |
96 | session->setEmulationHandler( handler ); | ||
88 | lay->addWidget( handler->widget() ); | 97 | lay->addWidget( handler->widget() ); |
89 | // WidgetLayer* wid = new EmulationWidget( prof, dummy ); | 98 | // WidgetLayer* wid = new EmulationWidget( prof, dummy ); |
90 | // lay->addWidget( wid ); | 99 | // lay->addWidget( wid ); |
diff --git a/noncore/apps/opie-console/session.cpp b/noncore/apps/opie-console/session.cpp index 7cae0df..f4fbcf2 100644 --- a/noncore/apps/opie-console/session.cpp +++ b/noncore/apps/opie-console/session.cpp | |||
@@ -2,26 +2,25 @@ | |||
2 | 2 | ||
3 | #include "io_layer.h" | 3 | #include "io_layer.h" |
4 | #include "file_layer.h" | 4 | #include "file_layer.h" |
5 | #include "widget_layer.h" | 5 | #include "emulation_handler.h" |
6 | #include "emulation_layer.h" | ||
7 | #include "session.h" | 6 | #include "session.h" |
8 | 7 | ||
9 | 8 | ||
10 | Session::Session() { | 9 | Session::Session() { |
11 | m_widget = 0l; | 10 | m_widget = 0l; |
12 | m_layer = 0l; | 11 | m_layer = 0l; |
13 | // m_widLay = 0l; | 12 | m_emu = 0l; |
14 | // m_emLay = 0l; | ||
15 | } | 13 | } |
16 | Session::Session( const QString& na, QWidgetStack* widget, IOLayer* lay) | 14 | Session::Session( const QString& na, QWidgetStack* widget, IOLayer* lay) |
17 | : m_name( na ), m_widget( widget ), m_layer( lay ) | 15 | : m_name( na ), m_widget( widget ), m_layer( lay ) |
18 | { | 16 | { |
19 | // m_widLay = 0l; | 17 | // m_widLay = 0l; |
20 | // m_emLay = 0l; | 18 | // m_emLay = 0l; |
19 | m_emu = 0l; | ||
21 | } | 20 | } |
22 | Session::~Session() { | 21 | Session::~Session() { |
23 | delete m_layer; | 22 | delete m_layer; |
24 | // delete m_emLay; | 23 | delete m_emu; |
25 | delete m_widget; | 24 | delete m_widget; |
26 | /* the widget layer should be deleted by the m_widget */ | 25 | /* the widget layer should be deleted by the m_widget */ |
27 | } | 26 | } |
@@ -34,54 +33,58 @@ QWidgetStack* Session::widgetStack() { | |||
34 | IOLayer* Session::layer() { | 33 | IOLayer* Session::layer() { |
35 | return m_layer; | 34 | return m_layer; |
36 | } | 35 | } |
37 | /*EmulationLayer* Session::emulationLayer() { | 36 | EmulationHandler* Session::emulationHandler() { |
38 | return m_emLay; | 37 | return m_emu; |
39 | } | 38 | } |
39 | /* | ||
40 | WidgetLayer* Session::emulationWidget() { | 40 | WidgetLayer* Session::emulationWidget() { |
41 | return m_widLay; | 41 | return m_widLay; |
42 | } | 42 | } |
43 | */ | 43 | */ |
44 | void Session::connect() { | 44 | void Session::connect() { |
45 | /* if ( !m_layer || !m_emLay ) | 45 | if ( !m_layer || !m_emu ) |
46 | return; | 46 | return; |
47 | 47 | ||
48 | qWarning("connection in session"); | ||
48 | QObject::connect(m_layer, SIGNAL(received(const QByteArray&) ), | 49 | QObject::connect(m_layer, SIGNAL(received(const QByteArray&) ), |
49 | m_emLay, SLOT(onRcvBlock(const QByteArray&) ) ); | 50 | m_emu, SLOT(recv(const QByteArray&) ) ); |
50 | QObject::connect(m_emLay, SIGNAL(sndBlock(const QByteArray&) ), | 51 | QObject::connect(m_emu, SIGNAL(send(const QByteArray&) ), |
51 | m_layer, SLOT(send(const QByteArray&) ) ); | 52 | m_layer, SLOT(send(const QByteArray&) ) ); |
52 | */ | 53 | |
53 | } | 54 | } |
54 | void Session::disconnect() { | 55 | void Session::disconnect() { |
55 | /* | 56 | |
56 | if ( !m_layer || !m_emLay ) | 57 | if ( !m_layer || !m_emu ) |
57 | return; | 58 | return; |
58 | 59 | ||
59 | QObject::disconnect(m_layer, SIGNAL(received(const QByteArray&) ), | 60 | QObject::disconnect(m_layer, SIGNAL(received(const QByteArray&) ), |
60 | m_emLay, SLOT(onRcvBlock(const QByteArray&) ) ); | 61 | m_emu, SLOT(recv(const QByteArray&) ) ); |
61 | QObject::disconnect(m_emLay, SIGNAL(sndBlock(const QByteArray&) ), | 62 | QObject::disconnect(m_emu, SIGNAL(send(const QByteArray&) ), |
62 | m_layer, SLOT(send(const QByteArray&) ) ); | 63 | m_layer, SLOT(send(const QByteArray&) ) ); |
63 | */ | ||
64 | } | 64 | } |
65 | void Session::setName( const QString& na){ | 65 | void Session::setName( const QString& na){ |
66 | m_name = na; | 66 | m_name = na; |
67 | } | 67 | } |
68 | void Session::setWidgetStack( QWidgetStack* wid ) { | 68 | void Session::setWidgetStack( QWidgetStack* wid ) { |
69 | delete m_emu; | ||
70 | m_emu = 0l; | ||
69 | delete m_widget; | 71 | delete m_widget; |
70 | /* the EmulationLayer was destroyed... */ | 72 | /* the EmulationLayer was destroyed... */ |
71 | //delete m_emLay; | 73 | |
72 | m_widget = wid; | 74 | m_widget = wid; |
73 | } | 75 | } |
74 | void Session::setIOLayer( IOLayer* lay ) { | 76 | void Session::setIOLayer( IOLayer* lay ) { |
75 | delete m_layer; | 77 | delete m_layer; |
76 | m_layer = lay; | 78 | m_layer = lay; |
77 | } | 79 | } |
78 | /* | 80 | |
79 | void Session::setEmulationLayer( EmulationLayer* lay ) { | 81 | void Session::setEmulationHandler( EmulationHandler* lay ) { |
80 | delete m_emLay; | 82 | delete m_emu; |
81 | m_emLay = lay; | 83 | m_emu = lay; |
82 | } | 84 | } |
85 | /* | ||
83 | void Session::setEmulationWidget( WidgetLayer* lay ) { | 86 | void Session::setEmulationWidget( WidgetLayer* lay ) { |
84 | delete m_widLay; | 87 | delete m_widLay; |
85 | m_widLay = lay; | 88 | m_widLay = lay; |
86 | } | 89 | } |
87 | */ \ No newline at end of file | 90 | */ |
diff --git a/noncore/apps/opie-console/session.h b/noncore/apps/opie-console/session.h index 04bf257..c3f3661 100644 --- a/noncore/apps/opie-console/session.h +++ b/noncore/apps/opie-console/session.h | |||
@@ -4,8 +4,7 @@ | |||
4 | #include <qwidgetstack.h> | 4 | #include <qwidgetstack.h> |
5 | 5 | ||
6 | class IOLayer; | 6 | class IOLayer; |
7 | class EmulationLayer; | 7 | class EmulationHandler; |
8 | class WidgetLayer; | ||
9 | /** | 8 | /** |
10 | * This is a Session. A session contains | 9 | * This is a Session. A session contains |
11 | * a QWidget pointer and a IOLayer | 10 | * a QWidget pointer and a IOLayer |
@@ -41,8 +40,7 @@ public: | |||
41 | */ | 40 | */ |
42 | IOLayer* layer(); | 41 | IOLayer* layer(); |
43 | 42 | ||
44 | // EmulationLayer* emulationLayer(); | 43 | EmulationHandler* emulationHandler(); |
45 | WidgetLayer* emulationWidget(); | ||
46 | 44 | ||
47 | /* | 45 | /* |
48 | * connects the data flow from | 46 | * connects the data flow from |
@@ -57,8 +55,7 @@ public: | |||
57 | void disconnect(); | 55 | void disconnect(); |
58 | 56 | ||
59 | void setWidgetStack( QWidgetStack* widget ); | 57 | void setWidgetStack( QWidgetStack* widget ); |
60 | // void setEmulationLayer( EmulationLayer* lay ); | 58 | void setEmulationHandler( EmulationHandler* lay ); |
61 | // void setEmulationWidget( WidgetLayer* lay ); | ||
62 | void setIOLayer( IOLayer* ); | 59 | void setIOLayer( IOLayer* ); |
63 | void setName( const QString& ); | 60 | void setName( const QString& ); |
64 | 61 | ||
@@ -66,8 +63,7 @@ private: | |||
66 | QString m_name; | 63 | QString m_name; |
67 | QWidgetStack* m_widget; | 64 | QWidgetStack* m_widget; |
68 | IOLayer* m_layer; | 65 | IOLayer* m_layer; |
69 | // EmulationLayer* m_emLay; | 66 | EmulationHandler* m_emu; |
70 | // WidgetLayer* m_widLay; | ||
71 | 67 | ||
72 | }; | 68 | }; |
73 | 69 | ||