summaryrefslogtreecommitdiff
Unidiff
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 @@
6#include "emulation_handler.h" 6#include "emulation_handler.h"
7 7
8 8
9EmulationHandler::EmulationHandler( const Profile& prof, QWidget* parent, const char* name ) 9EmulationHandler::EmulationHandler( const Profile& prof, QWidget* parent,const char* name )
10 : QObject(0, name ) 10 : QObject(0, name )
11{ 11{
12 load(prof ); 12 m_teWid = new TEWidget( parent, "TerminalMain");
13 m_teWid = new TEWidget( parent, "TerminalMain" ); 13 m_teWid->setMinimumSize(150, 70 );
14 parent->resize( m_teWid->calcSize(80, 24 ) ); 14 parent->resize( m_teWid->calcSize(80, 24 ) );
15 m_teEmu = new TEmuVt102(m_teWid ); 15 m_teEmu = new TEmuVt102(m_teWid );
16 16
@@ -18,6 +18,10 @@ EmulationHandler::EmulationHandler( const Profile& prof, QWidget* parent, const
18 this, SIGNAL(changeSize(int, int) ) ); 18 this, SIGNAL(changeSize(int, int) ) );
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 );
22 load( prof );
23
24
21 25
22} 26}
23EmulationHandler::~EmulationHandler() { 27EmulationHandler::~EmulationHandler() {
@@ -25,7 +29,10 @@ EmulationHandler::~EmulationHandler() {
25 delete m_teWid; 29 delete m_teWid;
26} 30}
27void EmulationHandler::load( const Profile& ) { 31void EmulationHandler::load( const Profile& ) {
28 32 QFont font = QFont("Fixed", 12, QFont::Normal );
33 font.setFixedPitch(TRUE);
34 m_teWid->setVTFont( font );
35 m_teWid->setBackgroundColor(Qt::black );
29} 36}
30void EmulationHandler::recv( const QByteArray& ar) { 37void EmulationHandler::recv( const QByteArray& ar) {
31 m_teEmu->onRcvBlock(ar.data(), ar.count() ); 38 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;
627 627
628KeyTrans* KeyTrans::find(int numb) 628KeyTrans* KeyTrans::find(int numb)
629{ 629{
630 loadAll();
631 KeyTrans* res = numb2keymap->find(numb); 630 KeyTrans* res = numb2keymap->find(numb);
632 return res ? res : numb2keymap->find(0); 631 return res ? res : numb2keymap->find(0);
633} 632}
634 633
635KeyTrans* KeyTrans::find(const char* path) 634KeyTrans* KeyTrans::find(const char* path)
636{ 635{
637 loadAll();
638 KeyTrans* res = path2keymap->find(path); 636 KeyTrans* res = path2keymap->find(path);
639 return res ? res : numb2keymap->find(0); 637 return res ? res : numb2keymap->find(0);
640} 638}
641 639
642int KeyTrans::count() 640int KeyTrans::count()
643{ 641{
644 loadAll();
645 return numb2keymap->count(); 642 return numb2keymap->count();
646} 643}
647 644
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 @@
1#include <assert.h>
2
3
1 4
2#include <qaction.h> 5#include <qaction.h>
3#include <qmenubar.h> 6#include <qmenubar.h>
@@ -8,6 +11,7 @@
8#include <opie/ofiledialog.h> 11#include <opie/ofiledialog.h>
9#include <qmessagebox.h> 12#include <qmessagebox.h>
10 13
14#include "keytrans.h"
11#include "profileeditordialog.h" 15#include "profileeditordialog.h"
12#include "configdialog.h" 16#include "configdialog.h"
13#include "default.h" 17#include "default.h"
@@ -21,6 +25,11 @@
21#include "script.h" 25#include "script.h"
22 26
23MainWindow::MainWindow() { 27MainWindow::MainWindow() {
28 KeyTrans::loadAll();
29 for (int i = 0; i < KeyTrans::count(); i++ ) {
30 KeyTrans* s = KeyTrans::find(i );
31 assert( s );
32 }
24 m_factory = new MetaFactory(); 33 m_factory = new MetaFactory();
25 Default def(m_factory); 34 Default def(m_factory);
26 m_sessions.setAutoDelete( TRUE ); 35 m_sessions.setAutoDelete( TRUE );