-rw-r--r-- | noncore/apps/opie-console/PLANS | 12 | ||||
-rw-r--r-- | noncore/apps/opie-console/default.cpp | 7 | ||||
-rw-r--r-- | noncore/apps/opie-console/default.h | 4 | ||||
-rw-r--r-- | noncore/apps/opie-console/emulation_layer.h | 2 | ||||
-rw-r--r-- | noncore/apps/opie-console/keytrans.cpp | 3 | ||||
-rw-r--r-- | noncore/apps/opie-console/mainwindow.cpp | 48 | ||||
-rw-r--r-- | noncore/apps/opie-console/mainwindow.h | 4 | ||||
-rw-r--r-- | noncore/apps/opie-console/metafactory.cpp | 25 | ||||
-rw-r--r-- | noncore/apps/opie-console/metafactory.h | 21 | ||||
-rw-r--r-- | noncore/apps/opie-console/profilemanager.cpp | 44 | ||||
-rw-r--r-- | noncore/apps/opie-console/profilemanager.h | 2 | ||||
-rw-r--r-- | noncore/apps/opie-console/session.cpp | 49 | ||||
-rw-r--r-- | noncore/apps/opie-console/session.h | 38 | ||||
-rw-r--r-- | noncore/apps/opie-console/tabwidget.cpp | 21 | ||||
-rw-r--r-- | noncore/apps/opie-console/tabwidget.h | 5 | ||||
-rw-r--r-- | noncore/apps/opie-console/vt102emulation.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/opie-console/vt102emulation.h | 2 |
17 files changed, 248 insertions, 41 deletions
diff --git a/noncore/apps/opie-console/PLANS b/noncore/apps/opie-console/PLANS index 8f6b807..0ec45cb 100644 --- a/noncore/apps/opie-console/PLANS +++ b/noncore/apps/opie-console/PLANS | |||
@@ -2,2 +2,4 @@ can we please get a working serial connection for now? if that works | |||
2 | i can test file transfers and stuff. -hash | 2 | i can test file transfers and stuff. -hash |
3 | sure. I finished the ConfigDialog and now doing the Profile->Session | ||
4 | stuff. Then you just need to click Open -zecke | ||
3 | 5 | ||
@@ -20,2 +22,4 @@ Serial IOLayer | |||
20 | Saving and Restoring Profiles | 22 | Saving and Restoring Profiles |
23 | ConfigDialog Framework | ||
24 | FilesendingLayer - hash | ||
21 | 25 | ||
@@ -23,10 +27,10 @@ TASKS in progress: | |||
23 | Profile->Session and MainWidget --- Harlekin | 27 | Profile->Session and MainWidget --- Harlekin |
24 | FilesendingLayer - hash | ||
25 | IOLayer - wazlaf | 28 | IOLayer - wazlaf |
26 | Configuration - josef | ||
27 | TE - ibotty | 29 | TE - ibotty |
28 | |||
29 | OPEN tasks: | ||
30 | Session->Profile - hash | 30 | Session->Profile - hash |
31 | Scripting - wazlaf | 31 | Scripting - wazlaf |
32 | |||
33 | OPEN tasks: | ||
34 | Irda ConfigWidget | ||
35 | BT ConfigWidget | ||
32 | Keys - open | 36 | Keys - open |
diff --git a/noncore/apps/opie-console/default.cpp b/noncore/apps/opie-console/default.cpp index d9a0557..da6f3e2 100644 --- a/noncore/apps/opie-console/default.cpp +++ b/noncore/apps/opie-console/default.cpp | |||
@@ -4,2 +4,3 @@ | |||
4 | #include "terminalwidget.h" | 4 | #include "terminalwidget.h" |
5 | #include "vt102emulation.h" | ||
5 | 6 | ||
@@ -46,2 +47,7 @@ extern "C" { | |||
46 | 47 | ||
48 | // VT Emulations | ||
49 | EmulationLayer* newVT102( Widget* wid ) { | ||
50 | return new Vt102Emulation( wid ); | ||
51 | } | ||
52 | |||
47 | }; | 53 | }; |
@@ -63,2 +69,3 @@ Default::Default( MetaFactory* fact ) { | |||
63 | 69 | ||
70 | fact->addEmulationLayer( "default", QObject::tr("Default Terminal"), newVT102 ); | ||
64 | } | 71 | } |
diff --git a/noncore/apps/opie-console/default.h b/noncore/apps/opie-console/default.h index ed78986..b9af898 100644 --- a/noncore/apps/opie-console/default.h +++ b/noncore/apps/opie-console/default.h | |||
@@ -5,2 +5,4 @@ | |||
5 | 5 | ||
6 | class Widget; | ||
7 | |||
6 | extern "C" { | 8 | extern "C" { |
@@ -19,2 +21,4 @@ extern "C" { | |||
19 | ProfileDialogWidget* newTerminalWidget(const QString&, QWidget* ); | 21 | ProfileDialogWidget* newTerminalWidget(const QString&, QWidget* ); |
22 | |||
23 | EmulationLayer* newVT102( Widget* ); | ||
20 | }; | 24 | }; |
diff --git a/noncore/apps/opie-console/emulation_layer.h b/noncore/apps/opie-console/emulation_layer.h index 0f54331..5781acc 100644 --- a/noncore/apps/opie-console/emulation_layer.h +++ b/noncore/apps/opie-console/emulation_layer.h | |||
@@ -28,3 +28,3 @@ | |||
28 | 28 | ||
29 | #include "widget.h" | 29 | #include "widget_layer.h" |
30 | #include "screen.h" | 30 | #include "screen.h" |
diff --git a/noncore/apps/opie-console/keytrans.cpp b/noncore/apps/opie-console/keytrans.cpp index d569ae0..5ea192e 100644 --- a/noncore/apps/opie-console/keytrans.cpp +++ b/noncore/apps/opie-console/keytrans.cpp | |||
@@ -629,2 +629,3 @@ KeyTrans* KeyTrans::find(int numb) | |||
629 | { | 629 | { |
630 | loadAll(); | ||
630 | KeyTrans* res = numb2keymap->find(numb); | 631 | KeyTrans* res = numb2keymap->find(numb); |
@@ -635,2 +636,3 @@ KeyTrans* KeyTrans::find(const char* path) | |||
635 | { | 636 | { |
637 | loadAll(); | ||
636 | KeyTrans* res = path2keymap->find(path); | 638 | KeyTrans* res = path2keymap->find(path); |
@@ -641,2 +643,3 @@ int KeyTrans::count() | |||
641 | { | 643 | { |
644 | loadAll(); | ||
642 | return numb2keymap->count(); | 645 | return numb2keymap->count(); |
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp index 3531478..aeb3742 100644 --- a/noncore/apps/opie-console/mainwindow.cpp +++ b/noncore/apps/opie-console/mainwindow.cpp | |||
@@ -7,2 +7,3 @@ | |||
7 | 7 | ||
8 | #include "profileeditordialog.h" | ||
8 | #include "configdialog.h" | 9 | #include "configdialog.h" |
@@ -10,2 +11,3 @@ | |||
10 | #include "metafactory.h" | 11 | #include "metafactory.h" |
12 | #include "profile.h" | ||
11 | #include "profilemanager.h" | 13 | #include "profilemanager.h" |
@@ -111,3 +113,5 @@ ProfileManager* MainWindow::manager() { | |||
111 | } | 113 | } |
112 | 114 | TabWidget* MainWindow::tabWidget() { | |
115 | return m_consoleWindow; | ||
116 | } | ||
113 | void MainWindow::populateProfiles() { | 117 | void MainWindow::populateProfiles() { |
@@ -139,2 +143,8 @@ void MainWindow::slotNew() { | |||
139 | qWarning("New Connection"); | 143 | qWarning("New Connection"); |
144 | ProfileEditorDialog dlg(factory() ); | ||
145 | int ret = dlg.exec(); | ||
146 | |||
147 | if ( ret == QDialog::Accepted ) { | ||
148 | create( dlg.profile() ); | ||
149 | } | ||
140 | } | 150 | } |
@@ -154,4 +164,4 @@ void MainWindow::slotTerminate() { | |||
154 | currentSession()->layer()->close(); | 164 | currentSession()->layer()->close(); |
155 | delete m_curSession; | 165 | |
156 | m_curSession = 0l; | 166 | slotClose(); |
157 | /* FIXME move to the next session */ | 167 | /* FIXME move to the next session */ |
@@ -172,9 +182,35 @@ void MainWindow::slotConfigure() { | |||
172 | } | 182 | } |
173 | 183 | /* | |
184 | * we will remove | ||
185 | * this window from the tabwidget | ||
186 | * remove it from the list | ||
187 | * delete it | ||
188 | * and set the currentSession() | ||
189 | */ | ||
174 | void MainWindow::slotClose() { | 190 | void MainWindow::slotClose() { |
175 | } | 191 | if (!currentSession() ) |
192 | return; | ||
176 | 193 | ||
177 | void MainWindow::slotProfile( int ) { | 194 | tabWidget()->remove( currentSession() ); |
195 | tabWidget()->setCurrent( m_sessions.first() ); | ||
196 | m_sessions.remove( m_curSession ); | ||
197 | delete m_curSession; | ||
198 | m_curSession = m_sessions.first(); | ||
199 | } | ||
178 | 200 | ||
201 | /* | ||
202 | * We will get the name | ||
203 | * Then the profile | ||
204 | * and then we will make a profile | ||
205 | */ | ||
206 | void MainWindow::slotProfile( int id) { | ||
207 | Profile prof = manager()->profile( m_sessionsPop->text( id) ); | ||
208 | create( prof ); | ||
209 | } | ||
210 | void MainWindow::create( const Profile& prof ) { | ||
211 | Session *ses = manager()->fromProfile( prof, tabWidget() ); | ||
179 | 212 | ||
213 | m_sessions.append( ses ); | ||
214 | tabWidget()->add( ses ); | ||
215 | m_curSession = ses; | ||
180 | } | 216 | } |
diff --git a/noncore/apps/opie-console/mainwindow.h b/noncore/apps/opie-console/mainwindow.h index 36eb3a7..7ef9c26 100644 --- a/noncore/apps/opie-console/mainwindow.h +++ b/noncore/apps/opie-console/mainwindow.h | |||
@@ -19,3 +19,3 @@ class TabWidget; | |||
19 | class ProfileManager; | 19 | class ProfileManager; |
20 | 20 | class Profile; | |
21 | class MainWindow : public QMainWindow { | 21 | class MainWindow : public QMainWindow { |
@@ -47,2 +47,3 @@ public: | |||
47 | ProfileManager* manager(); | 47 | ProfileManager* manager(); |
48 | TabWidget* tabWidget(); | ||
48 | 49 | ||
@@ -60,2 +61,3 @@ private: | |||
60 | void populateProfiles(); | 61 | void populateProfiles(); |
62 | void create( const Profile& ); | ||
61 | /** | 63 | /** |
diff --git a/noncore/apps/opie-console/metafactory.cpp b/noncore/apps/opie-console/metafactory.cpp index 4501ec2..02a9f9b 100644 --- a/noncore/apps/opie-console/metafactory.cpp +++ b/noncore/apps/opie-console/metafactory.cpp | |||
@@ -32,2 +32,8 @@ void MetaFactory::addFileTransferLayer( const QCString& name, | |||
32 | } | 32 | } |
33 | void MetaFactory::addEmulationLayer( const QCString& name, | ||
34 | const QString& str, | ||
35 | emulationLayer em) { | ||
36 | m_strings.insert(str, name ); | ||
37 | m_emu.insert( str, em ); | ||
38 | } | ||
33 | QStringList MetaFactory::ioLayers()const { | 39 | QStringList MetaFactory::ioLayers()const { |
@@ -64,2 +70,10 @@ QStringList MetaFactory::fileTransferLayers()const { | |||
64 | } | 70 | } |
71 | QStringList MetaFactory::emulationLayers()const { | ||
72 | QStringList list; | ||
73 | QMap<QString, emulationLayer>::ConstIterator it; | ||
74 | for ( it = m_emu.begin(); it != m_emu.end(); ++it ) { | ||
75 | list << it.key(); | ||
76 | } | ||
77 | return list; | ||
78 | } | ||
65 | 79 | ||
@@ -103,2 +117,13 @@ ProfileDialogWidget *MetaFactory::newTerminalPlugin( const QString& str, QWidget | |||
103 | } | 117 | } |
118 | EmulationLayer* MetaFactory::newEmulationLayer( const QString& str, Widget* wid) { | ||
119 | EmulationLayer* lay = 0l; | ||
120 | |||
121 | QMap<QString, emulationLayer>::Iterator it; | ||
122 | it = m_emu.find( str ); | ||
123 | if ( it != m_emu.end() ) { | ||
124 | lay = (*(it.data() ) )(wid); | ||
125 | } | ||
126 | |||
127 | return lay; | ||
128 | } | ||
104 | QCString MetaFactory::internal( const QString& str )const { | 129 | QCString MetaFactory::internal( const QString& str )const { |
diff --git a/noncore/apps/opie-console/metafactory.h b/noncore/apps/opie-console/metafactory.h index 3f7ddce..71c35a2 100644 --- a/noncore/apps/opie-console/metafactory.h +++ b/noncore/apps/opie-console/metafactory.h | |||
@@ -17,3 +17,5 @@ | |||
17 | #include "profiledialogwidget.h" | 17 | #include "profiledialogwidget.h" |
18 | #include "emulation_layer.h" | ||
18 | 19 | ||
20 | class Widget; | ||
19 | class MetaFactory { | 21 | class MetaFactory { |
@@ -23,2 +25,3 @@ public: | |||
23 | typedef FileTransferLayer* (*filelayer)(IOLayer*); | 25 | typedef FileTransferLayer* (*filelayer)(IOLayer*); |
26 | typedef EmulationLayer* (*emulationLayer)(Widget* ); | ||
24 | 27 | ||
@@ -52,2 +55,9 @@ public: | |||
52 | 55 | ||
56 | /** | ||
57 | * adds a Factory for Emulation to the Layer.. | ||
58 | */ | ||
59 | void addEmulationLayer ( const QCString& name, | ||
60 | const QString& uiString, | ||
61 | emulationLayer ); | ||
62 | |||
53 | /* translated UI Strings */ | 63 | /* translated UI Strings */ |
@@ -55,4 +65,13 @@ public: | |||
55 | QStringList connectionWidgets()const; | 65 | QStringList connectionWidgets()const; |
66 | |||
67 | /** | ||
68 | * Terminal Configuration widgets | ||
69 | */ | ||
56 | QStringList terminalWidgets()const; | 70 | QStringList terminalWidgets()const; |
57 | QStringList fileTransferLayers()const; | 71 | QStringList fileTransferLayers()const; |
72 | QStringList emulationLayers()const; | ||
73 | |||
74 | /** | ||
75 | * the generation... | ||
76 | */ | ||
58 | IOLayer* newIOLayer( const QString&,const Profile& ); | 77 | IOLayer* newIOLayer( const QString&,const Profile& ); |
@@ -60,2 +79,3 @@ public: | |||
60 | ProfileDialogWidget* newTerminalPlugin( const QString&, QWidget* ); | 79 | ProfileDialogWidget* newTerminalPlugin( const QString&, QWidget* ); |
80 | EmulationLayer* newEmulationLayer(const QString&, Widget* ); | ||
61 | 81 | ||
@@ -81,2 +101,3 @@ private: | |||
81 | QMap<QString, filelayer> m_fileFact; | 101 | QMap<QString, filelayer> m_fileFact; |
102 | QMap<QString, emulationLayer> m_emu; | ||
82 | }; | 103 | }; |
diff --git a/noncore/apps/opie-console/profilemanager.cpp b/noncore/apps/opie-console/profilemanager.cpp index e66ebcc..dcf3cbd 100644 --- a/noncore/apps/opie-console/profilemanager.cpp +++ b/noncore/apps/opie-console/profilemanager.cpp | |||
@@ -4,2 +4,4 @@ | |||
4 | #include <qfile.h> | 4 | #include <qfile.h> |
5 | #include <qlayout.h> | ||
6 | #include <qwidgetstack.h> | ||
5 | 7 | ||
@@ -7,2 +9,3 @@ | |||
7 | 9 | ||
10 | #include "widget.h" | ||
8 | #include "metafactory.h" | 11 | #include "metafactory.h" |
@@ -53,13 +56,36 @@ Profile::ValueList ProfileManager::all()const { | |||
53 | } | 56 | } |
54 | Session* ProfileManager::fromProfile( const Profile& prof) { | 57 | /* |
58 | * Our goal is to create a Session | ||
59 | * We will load the the IOLayer and EmulationLayer | ||
60 | * from the factory | ||
61 | * we will generate a QWidgetStack | ||
62 | * add a dummy widget with layout | ||
63 | * add "Widget" to the layout | ||
64 | * add the dummy to the stack | ||
65 | * raise the dummy | ||
66 | * call session->connect(= | ||
67 | * this way we only need to reparent | ||
68 | * in TabWidget | ||
69 | */ | ||
70 | Session* ProfileManager::fromProfile( const Profile& prof, QWidget* parent) { | ||
55 | Session* session = new Session(); | 71 | Session* session = new Session(); |
56 | session->setName( prof.name() ); | 72 | session->setName( prof.name() ); |
57 | session->setIOLayer(m_fact->newIOLayer(prof.ioLayerName(), | 73 | /* translate the internal name to the external */ |
58 | prof) ); | 74 | session->setIOLayer(m_fact->newIOLayer( m_fact->external(prof.ioLayerName()) , |
59 | /* | 75 | prof) ); |
60 | * FIXME | 76 | |
61 | * load emulation | 77 | QWidgetStack *stack = new QWidgetStack(parent); |
62 | * load widget? | 78 | session->setWidgetStack( stack ); |
63 | * set colors + fonts | 79 | QWidget* dummy = new QWidget(stack ); |
64 | */ | 80 | QHBoxLayout* lay = new QHBoxLayout(dummy ); |
81 | stack->addWidget( dummy, 0 ); | ||
82 | stack->raiseWidget( 0 ); | ||
83 | Widget* wid = new Widget(dummy ); | ||
84 | lay->addWidget( wid ); | ||
85 | |||
86 | session->setEmulationWidget( wid ); | ||
87 | session->setEmulationLayer( m_fact->newEmulationLayer( m_fact->external( prof.terminalName() ), | ||
88 | wid ) ); | ||
89 | session->connect(); | ||
90 | |||
65 | return session; | 91 | return session; |
diff --git a/noncore/apps/opie-console/profilemanager.h b/noncore/apps/opie-console/profilemanager.h index 1387247..33b7095 100644 --- a/noncore/apps/opie-console/profilemanager.h +++ b/noncore/apps/opie-console/profilemanager.h | |||
@@ -24,3 +24,3 @@ public: | |||
24 | Profile profile(const QString& name )const; | 24 | Profile profile(const QString& name )const; |
25 | Session* fromProfile( const Profile& ); | 25 | Session* fromProfile( const Profile& , QWidget* parent = 0l); |
26 | void setProfiles( const Profile::ValueList& ); | 26 | void setProfiles( const Profile::ValueList& ); |
diff --git a/noncore/apps/opie-console/session.cpp b/noncore/apps/opie-console/session.cpp index d32b340..42b0583 100644 --- a/noncore/apps/opie-console/session.cpp +++ b/noncore/apps/opie-console/session.cpp | |||
@@ -4,4 +4,7 @@ | |||
4 | #include "file_layer.h" | 4 | #include "file_layer.h" |
5 | #include "widget.h" | ||
6 | #include "emulation_layer.h" | ||
5 | #include "session.h" | 7 | #include "session.h" |
6 | 8 | ||
9 | |||
7 | Session::Session() { | 10 | Session::Session() { |
@@ -9,6 +12,10 @@ Session::Session() { | |||
9 | m_layer = 0l; | 12 | m_layer = 0l; |
13 | m_widLay = 0l; | ||
14 | m_emLay = 0l; | ||
10 | } | 15 | } |
11 | Session::Session( const QString& na, QWidget* widget, IOLayer* lay) | 16 | Session::Session( const QString& na, QWidgetStack* widget, IOLayer* lay) |
12 | : m_name( na ), m_widget( widget ), m_layer( lay ) | 17 | : m_name( na ), m_widget( widget ), m_layer( lay ) |
13 | { | 18 | { |
19 | m_widLay = 0l; | ||
20 | m_emLay = 0l; | ||
14 | } | 21 | } |
@@ -16,3 +23,5 @@ Session::~Session() { | |||
16 | delete m_layer; | 23 | delete m_layer; |
24 | delete m_emLay; | ||
17 | delete m_widget; | 25 | delete m_widget; |
26 | /* the widget layer should be deleted by the m_widget */ | ||
18 | } | 27 | } |
@@ -21,3 +30,3 @@ QString Session::name()const { | |||
21 | } | 30 | } |
22 | QWidget* Session::widget() { | 31 | QWidgetStack* Session::widgetStack() { |
23 | return m_widget; | 32 | return m_widget; |
@@ -27,2 +36,26 @@ IOLayer* Session::layer() { | |||
27 | } | 36 | } |
37 | EmulationLayer* Session::emulationLayer() { | ||
38 | return m_emLay; | ||
39 | } | ||
40 | Widget* Session::emulationWidget() { | ||
41 | return m_widLay; | ||
42 | } | ||
43 | void Session::connect() { | ||
44 | if ( !m_layer || !m_emLay ) | ||
45 | return; | ||
46 | |||
47 | QObject::connect(m_layer, SIGNAL(received(const QByteArray&) ), | ||
48 | m_emLay, SLOT(onRcvBlock(const QByteArray&) ) ); | ||
49 | QObject::connect(m_emLay, SIGNAL(sndBlock(const QByteArray&) ), | ||
50 | m_layer, SLOT(send(const QByteArray&) ) ); | ||
51 | } | ||
52 | void Session::disconnect() { | ||
53 | if ( !m_layer || !m_emLay ) | ||
54 | return; | ||
55 | |||
56 | QObject::disconnect(m_layer, SIGNAL(received(const QByteArray&) ), | ||
57 | m_emLay, SLOT(onRcvBlock(const QByteArray&) ) ); | ||
58 | QObject::disconnect(m_emLay, SIGNAL(sndBlock(const QByteArray&) ), | ||
59 | m_layer, SLOT(send(const QByteArray&) ) ); | ||
60 | } | ||
28 | void Session::setName( const QString& na){ | 61 | void Session::setName( const QString& na){ |
@@ -30,4 +63,6 @@ void Session::setName( const QString& na){ | |||
30 | } | 63 | } |
31 | void Session::setWidget( QWidget* wid ) { | 64 | void Session::setWidgetStack( QWidgetStack* wid ) { |
32 | delete m_widget; | 65 | delete m_widget; |
66 | /* the EmulationLayer was destroyed... */ | ||
67 | delete m_emLay; | ||
33 | m_widget = wid; | 68 | m_widget = wid; |
@@ -38 +73,9 @@ void Session::setIOLayer( IOLayer* lay ) { | |||
38 | } | 73 | } |
74 | void Session::setEmulationLayer( EmulationLayer* lay ) { | ||
75 | delete m_emLay; | ||
76 | m_emLay = lay; | ||
77 | } | ||
78 | void Session::setEmulationWidget( Widget* lay ) { | ||
79 | delete m_widLay; | ||
80 | m_widLay = lay; | ||
81 | } | ||
diff --git a/noncore/apps/opie-console/session.h b/noncore/apps/opie-console/session.h index 44b5fc8..c3673fc 100644 --- a/noncore/apps/opie-console/session.h +++ b/noncore/apps/opie-console/session.h | |||
@@ -3,5 +3,7 @@ | |||
3 | 3 | ||
4 | #include <qwidget.h> | 4 | #include <qwidgetstack.h> |
5 | 5 | ||
6 | class IOLayer; | 6 | class IOLayer; |
7 | class EmulationLayer; | ||
8 | class Widget; | ||
7 | /** | 9 | /** |
@@ -19,3 +21,3 @@ public: | |||
19 | Session(); | 21 | Session(); |
20 | Session( const QString&, QWidget* widget, IOLayer* ); | 22 | Session( const QString&, QWidgetStack* widget, IOLayer* ); |
21 | ~Session(); | 23 | ~Session(); |
@@ -28,5 +30,9 @@ public: | |||
28 | /** | 30 | /** |
29 | * return the widget | 31 | * return the widgetstack |
32 | * this is used to be semi modal | ||
33 | * for FileTransfer | ||
34 | * | ||
35 | * semi modal == SessionModal | ||
30 | */ | 36 | */ |
31 | QWidget* widget(); | 37 | QWidgetStack* widgetStack(); |
32 | 38 | ||
@@ -36,3 +42,21 @@ public: | |||
36 | IOLayer* layer(); | 42 | IOLayer* layer(); |
37 | void setWidget( QWidget* widget ); | 43 | |
44 | EmulationLayer* emulationLayer(); | ||
45 | Widget* emulationWidget(); | ||
46 | |||
47 | /* | ||
48 | * connects the data flow from | ||
49 | * the IOLayer to the EmulationLayer | ||
50 | */ | ||
51 | void connect(); | ||
52 | |||
53 | /* | ||
54 | * disconnect the dataflow | ||
55 | * this will be done for ft | ||
56 | */ | ||
57 | void disconnect(); | ||
58 | |||
59 | void setWidgetStack( QWidgetStack* widget ); | ||
60 | void setEmulationLayer( EmulationLayer* lay ); | ||
61 | void setEmulationWidget( Widget* lay ); | ||
38 | void setIOLayer( IOLayer* ); | 62 | void setIOLayer( IOLayer* ); |
@@ -42,4 +66,6 @@ private: | |||
42 | QString m_name; | 66 | QString m_name; |
43 | QWidget* m_widget; | 67 | QWidgetStack* m_widget; |
44 | IOLayer* m_layer; | 68 | IOLayer* m_layer; |
69 | EmulationLayer* m_emLay; | ||
70 | Widget* m_widLay; | ||
45 | 71 | ||
diff --git a/noncore/apps/opie-console/tabwidget.cpp b/noncore/apps/opie-console/tabwidget.cpp index 783bf13..cfaef91 100644 --- a/noncore/apps/opie-console/tabwidget.cpp +++ b/noncore/apps/opie-console/tabwidget.cpp | |||
@@ -4,3 +4,3 @@ | |||
4 | TabWidget::TabWidget( QWidget* parent, const char* name ) | 4 | TabWidget::TabWidget( QWidget* parent, const char* name ) |
5 | : OTabWidget( parent, name ) { | 5 | : QTabWidget( parent, name ) { |
6 | connect(this, SIGNAL( currentChanged(QWidget*) ), | 6 | connect(this, SIGNAL( currentChanged(QWidget*) ), |
@@ -13,5 +13,8 @@ TabWidget::~TabWidget() { | |||
13 | void TabWidget::add( Session* ses ) { | 13 | void TabWidget::add( Session* ses ) { |
14 | if ( !ses->widget() ) return; | 14 | if ( !ses->widgetStack() ) return; |
15 | addTab( ses->widget(), "console/konsole", ses->name() ); | 15 | qWarning("going to add it"); |
16 | m_map.insert( ses->widget(), ses ); | 16 | //reparent( ses->widgetStack(), QPoint() ); |
17 | //addTab( ses->widgetStack(), "console/konsole", ses->name() ); | ||
18 | addTab( ses->widgetStack(), ses->name() ); | ||
19 | m_map.insert( ses->widgetStack(), ses ); | ||
17 | } | 20 | } |
@@ -19,4 +22,4 @@ void TabWidget::add( Session* ses ) { | |||
19 | void TabWidget::remove( Session* ses ) { | 22 | void TabWidget::remove( Session* ses ) { |
20 | m_map.remove( ses->widget() ); | 23 | m_map.remove( ses->widgetStack() ); |
21 | removePage( ses->widget() ); | 24 | removePage( ses->widgetStack() ); |
22 | } | 25 | } |
@@ -32,2 +35,8 @@ void TabWidget::slotCurChanged( QWidget* wid ) { | |||
32 | } | 35 | } |
36 | void TabWidget::setCurrent( Session* ses ) { | ||
37 | if (!ses ) | ||
38 | return; | ||
39 | |||
40 | showPage( ses->widgetStack() ); | ||
41 | } | ||
33 | 42 | ||
diff --git a/noncore/apps/opie-console/tabwidget.h b/noncore/apps/opie-console/tabwidget.h index a701488..42a00ec 100644 --- a/noncore/apps/opie-console/tabwidget.h +++ b/noncore/apps/opie-console/tabwidget.h | |||
@@ -4,3 +4,3 @@ | |||
4 | #include <qmap.h> | 4 | #include <qmap.h> |
5 | #include <opie/otabwidget.h> | 5 | #include <qtabwidget.h> |
6 | 6 | ||
@@ -11,3 +11,3 @@ | |||
11 | */ | 11 | */ |
12 | class TabWidget : public OTabWidget{ | 12 | class TabWidget : public QTabWidget{ |
13 | Q_OBJECT | 13 | Q_OBJECT |
@@ -18,2 +18,3 @@ public: | |||
18 | void remove( Session* ); | 18 | void remove( Session* ); |
19 | void setCurrent( Session* ); | ||
19 | 20 | ||
diff --git a/noncore/apps/opie-console/vt102emulation.cpp b/noncore/apps/opie-console/vt102emulation.cpp index dc977f5..2220f4e 100644 --- a/noncore/apps/opie-console/vt102emulation.cpp +++ b/noncore/apps/opie-console/vt102emulation.cpp | |||
@@ -624,3 +624,3 @@ void Vt102Emulation::sendString(const char* s) | |||
624 | 624 | ||
625 | void Vt102Emulation::sendString(const QByteArray s) | 625 | void Vt102Emulation::sendString(const QByteArray& s) |
626 | { | 626 | { |
diff --git a/noncore/apps/opie-console/vt102emulation.h b/noncore/apps/opie-console/vt102emulation.h index 018835e..a3d0ae6 100644 --- a/noncore/apps/opie-console/vt102emulation.h +++ b/noncore/apps/opie-console/vt102emulation.h | |||
@@ -88,3 +88,3 @@ public: | |||
88 | */ | 88 | */ |
89 | void sendString(const QByteArray); | 89 | void sendString(const QByteArray&); |
90 | 90 | ||