summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/emulation_handler.cpp15
-rw-r--r--noncore/apps/opie-console/keytrans.cpp3
-rw-r--r--noncore/apps/opie-console/mainwindow.cpp9
3 files changed, 20 insertions, 7 deletions
diff --git a/noncore/apps/opie-console/emulation_handler.cpp b/noncore/apps/opie-console/emulation_handler.cpp
index 787de67..c67c7c7 100644
--- a/noncore/apps/opie-console/emulation_handler.cpp
+++ b/noncore/apps/opie-console/emulation_handler.cpp
@@ -6,11 +6,11 @@
#include "emulation_handler.h"
-EmulationHandler::EmulationHandler( const Profile& prof, QWidget* parent, const char* name )
+EmulationHandler::EmulationHandler( const Profile& prof, QWidget* parent,const char* name )
: QObject(0, name )
{
- load(prof );
- m_teWid = new TEWidget( parent, "TerminalMain" );
+ m_teWid = new TEWidget( parent, "TerminalMain");
+ m_teWid->setMinimumSize(150, 70 );
parent->resize( m_teWid->calcSize(80, 24 ) );
m_teEmu = new TEmuVt102(m_teWid );
@@ -18,6 +18,10 @@ EmulationHandler::EmulationHandler( const Profile& prof, QWidget* parent, const
this, SIGNAL(changeSize(int, int) ) );
connect(m_teEmu, SIGNAL(sndBlock(const char*, int) ),
this, SLOT(recvEmulation(const char*, int) ) );
+ m_teEmu->setConnect( true );
+ load( prof );
+
+
}
EmulationHandler::~EmulationHandler() {
@@ -25,7 +29,10 @@ EmulationHandler::~EmulationHandler() {
delete m_teWid;
}
void EmulationHandler::load( const Profile& ) {
-
+ QFont font = QFont("Fixed", 12, QFont::Normal );
+ font.setFixedPitch(TRUE);
+ m_teWid->setVTFont( font );
+ m_teWid->setBackgroundColor(Qt::black );
}
void EmulationHandler::recv( const QByteArray& ar) {
m_teEmu->onRcvBlock(ar.data(), ar.count() );
diff --git a/noncore/apps/opie-console/keytrans.cpp b/noncore/apps/opie-console/keytrans.cpp
index 5ea192e..d569ae0 100644
--- a/noncore/apps/opie-console/keytrans.cpp
+++ b/noncore/apps/opie-console/keytrans.cpp
@@ -627,21 +627,18 @@ static QDict<KeyTrans> * path2keymap = 0L;
KeyTrans* KeyTrans::find(int numb)
{
- loadAll();
KeyTrans* res = numb2keymap->find(numb);
return res ? res : numb2keymap->find(0);
}
KeyTrans* KeyTrans::find(const char* path)
{
- loadAll();
KeyTrans* res = path2keymap->find(path);
return res ? res : numb2keymap->find(0);
}
int KeyTrans::count()
{
- loadAll();
return numb2keymap->count();
}
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp
index 1d7a4be..02f8451 100644
--- a/noncore/apps/opie-console/mainwindow.cpp
+++ b/noncore/apps/opie-console/mainwindow.cpp
@@ -1,3 +1,6 @@
+#include <assert.h>
+
+
#include <qaction.h>
#include <qmenubar.h>
@@ -8,6 +11,7 @@
#include <opie/ofiledialog.h>
#include <qmessagebox.h>
+#include "keytrans.h"
#include "profileeditordialog.h"
#include "configdialog.h"
#include "default.h"
@@ -21,6 +25,11 @@
#include "script.h"
MainWindow::MainWindow() {
+ KeyTrans::loadAll();
+ for (int i = 0; i < KeyTrans::count(); i++ ) {
+ KeyTrans* s = KeyTrans::find(i );
+ assert( s );
+ }
m_factory = new MetaFactory();
Default def(m_factory);
m_sessions.setAutoDelete( TRUE );