3 files changed, 15 insertions, 9 deletions

diff --git a/inputmethods/dasher/QtDasherPlugin.cc b/inputmethods/dasher/QtDasherPlugin.cc
index fe1712e..cf4fc2c 100644
--- a/inputmethods/dasher/QtDasherPlugin.cc
+++ b/inputmethods/dasher/QtDasherPlugin.cc
@@ -21,3 +21,3 @@ QtDasherPlugin::QtDasherPlugin(QWidget* parent, const char* name, WFlags f) : QF
   interface = new CDasherInterface;
-  interface->SetSystemLocation("/opt/QtPalmtop/share/dasher");
+  interface->SetSystemLocation("/opt/QtPalmtop/share/dasher/");
   interface->Unpause(0);
diff --git a/inputmethods/dasher/QtDasherScreen.cc b/inputmethods/dasher/QtDasherScreen.cc
index d05ef49..7d77511 100644
--- a/inputmethods/dasher/QtDasherScreen.cc
+++ b/inputmethods/dasher/QtDasherScreen.cc
@@ -18,2 +18,5 @@
 
+#include <iconv.h>
+#include <iostream>
+
 QtDasherScreen::QtDasherScreen (int _width, int _height,
@@ -22,6 +25,6 @@ QtDasherScreen::QtDasherScreen (int _width, int _height,
   QWidget(_parent), interface( _interface ),
-  fontname( "fixed" ), // fontsize(12),
+  fontname( "fixed" ), fontsize(12),
   Dasher::CDasherScreen(_width, _height)
 {
-  // font = new QFont (fontname, fontsize);
+  font = QFont (fontname.c_str(), fontsize);
   painter = new QPainter ();
@@ -36,3 +39,3 @@ QtDasherScreen::QtDasherScreen (int _width, int _height,
 
-  interface->GetFontSizes(&FontSizes);
+/* interface->GetFontSizes(&FontSizes);
 
@@ -42,5 +45,5 @@ QtDasherScreen::QtDasherScreen (int _width, int _height,
     Fonts[FontSizes[i]]= QFont (fontname.c_str(), FontSizes[i]);
-    Fonts[FontSizes[i]].setPixelSize(FontSizes[i]);
+//    Fonts[FontSizes[i]].setPixelSize(FontSizes[i]);
   }
-
+*/
   interface->ChangeScreen(this);
diff --git a/inputmethods/dasher/QtDasherScreen.h b/inputmethods/dasher/QtDasherScreen.h
index c4d3b59..c029a60 100644
--- a/inputmethods/dasher/QtDasherScreen.h
+++ b/inputmethods/dasher/QtDasherScreen.h
@@ -23,2 +23,4 @@
 
+#include <iconv.h>
+
 using namespace Dasher;
@@ -51,3 +53,3 @@ class QtDasherScreen : public QWidget, public Dasher::CDasherScreen
       // should probably use QPainter::boundingRect()
-      *Width = *Height = Fonts[Size].pixelSize();
+      *Width = *Height = font.pixelSize();
       
@@ -60,3 +62,3 @@ class QtDasherScreen : public QWidget, public Dasher::CDasherScreen
   
-      painter->setFont (Fonts[Size]);
+      painter->setFont (font);
       painter->drawText (point,
@@ -73,3 +75,4 @@ class QtDasherScreen : public QWidget, public Dasher::CDasherScreen
   std::vector<QFont> Fonts;
-
+  QFont font;
+  int fontsize;
   void Blank() const {