The new old TerminalWidget I'm anything but happy about it

1 files changed, 9 insertions, 6 deletions

diff --git a/noncore/apps/opie-console/profilemanager.cpp b/noncore/apps/opie-console/profilemanager.cpp
index 4b88dec..113327c 100644
--- a/noncore/apps/opie-console/profilemanager.cpp
+++ b/noncore/apps/opie-console/profilemanager.cpp
@@ -1,21 +1,22 @@
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <qfile.h>
 #include <qlayout.h>
 #include <qwidgetstack.h>
 
 #include <qpe/config.h>
 
+#include "emulation_handler.h"
 #include "widget_layer.h"
 #include "emulation_widget.h"
 #include "metafactory.h"
 #include "profileconfig.h"
 #include "profilemanager.h"
 
 ProfileManager::ProfileManager( MetaFactory* fact )
     : m_fact( fact )
 {
 
 }
 ProfileManager::~ProfileManager() {
@@ -74,30 +75,32 @@ Session* ProfileManager::fromProfile( const Profile& prof,  QWidget* parent) {
     Session* session = new Session();
     session->setName( prof.name() );
     /* translate the internal name to the external */
     session->setIOLayer(m_fact->newIOLayer( m_fact->external(prof.ioLayerName()) ,
                                             prof) );
 
     QWidgetStack *stack = new QWidgetStack(parent);
     session->setWidgetStack( stack );
     QWidget* dummy = new QWidget( stack );
     QHBoxLayout* lay = new QHBoxLayout(dummy );
     stack->addWidget( dummy, 0 );
     stack->raiseWidget( 0 );
-    WidgetLayer* wid = new EmulationWidget( prof, dummy );
-    lay->addWidget( wid );
-
-    session->setEmulationWidget( wid );
-    session->setEmulationLayer( m_fact->newEmulationLayer( m_fact->external( prof.terminalName() ),
-                                                        wid ) );
+    EmulationHandler* handler = new EmulationHandler(prof,dummy );
+    lay->addWidget( handler->widget() );
+//    WidgetLayer* wid = new EmulationWidget( prof, dummy );
+//    lay->addWidget( wid );
+
+//    session->setEmulationWidget( wid );
+//    session->setEmulationLayer( m_fact->newEmulationLayer( m_fact->external( prof.terminalName() ),
+//                                                        wid ) );
     session->connect();
 
     return session;
 }
 void ProfileManager::save(  ) {
     QFile::remove( (QString(getenv("HOME") )+ "/Settings/opie-console-profiles.conf" ) );
     ProfileConfig conf("opie-console-profiles");
     Profile::ValueList::Iterator it2;
     for (it2 = m_list.begin(); it2 != m_list.end(); ++it2 ) {
         conf.setGroup( (*it2).name() );
 
         /* now the config stuff */