From becbcfae3bf3b5a714e7d3e39b924e08761739c2 Mon Sep 17 00:00:00 2001
From: mjg59 <mjg59>
Date: Wed, 10 Dec 2003 03:57:04 +0000
Subject: Fix the search directory for the training file, remove the (non-working anyway) font size calculation code - with luck, this'll fix the failure to start under Opie

---
(limited to 'inputmethods/dasher/QtDasherScreen.h')

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
@@ -21,6 +21,8 @@
 #include "DashEdit.h"
 #include "DasherInterface.h"
 
+#include <iconv.h>
+
 using namespace Dasher;
 
 class QtDasherScreen : public QWidget, public Dasher::CDasherScreen
@@ -49,7 +51,7 @@ class QtDasherScreen : public QWidget, public Dasher::CDasherScreen
   void TextSize(symbol Character, int* Width, int* Height, int Size) const
     { 
       // should probably use QPainter::boundingRect()
-      *Width = *Height = Fonts[Size].pixelSize();
+      *Width = *Height = font.pixelSize();
       
     }
   void DrawText(symbol Character, int x1, int y1, int Size) const
@@ -58,7 +60,7 @@ class QtDasherScreen : public QWidget, public Dasher::CDasherScreen
       //      font.setPixelSize(Size);
       QPoint point = QPoint(x1, y1+Size/2);
   
-      painter->setFont (Fonts[Size]);
+      painter->setFont (font);
       painter->drawText (point,
 			 QString(interface->GetDisplayText(Character).c_str()));
     }
@@ -71,7 +73,8 @@ class QtDasherScreen : public QWidget, public Dasher::CDasherScreen
 
   std::vector<int> FontSizes;
   std::vector<QFont> Fonts;
-
+  QFont font;
+  int fontsize;
   void Blank() const {
     painter->begin(pixmap);
     painter->setPen (NoPen);
--
cgit v0.9.0.2