summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--inputmethods/dasher/QtDasherPlugin.cc2
-rw-r--r--inputmethods/dasher/QtDasherScreen.cc13
-rw-r--r--inputmethods/dasher/QtDasherScreen.h9
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
@@ -19,7 +19,7 @@ QtDasherPlugin::QtDasherPlugin(QWidget* parent, const char* name, WFlags f) : QF
19{ 19{
20 (new QHBoxLayout(this))->setAutoAdd(TRUE); 20 (new QHBoxLayout(this))->setAutoAdd(TRUE);
21 interface = new CDasherInterface; 21 interface = new CDasherInterface;
22 interface->SetSystemLocation("/opt/QtPalmtop/share/dasher"); 22 interface->SetSystemLocation("/opt/QtPalmtop/share/dasher/");
23 interface->Unpause(0); 23 interface->Unpause(0);
24 interface->Start(); 24 interface->Start();
25 d = new QtDasherScreen(240,100,interface,this,this); 25 d = new QtDasherScreen(240,100,interface,this,this);
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
@@ -16,14 +16,17 @@
16#define MAXFONTSIZE 25 16#define MAXFONTSIZE 25
17#define MINFONTSIZE 8 17#define MINFONTSIZE 8
18 18
19#include <iconv.h>
20#include <iostream>
21
19QtDasherScreen::QtDasherScreen (int _width, int _height, 22QtDasherScreen::QtDasherScreen (int _width, int _height,
20 CDasherInterface *_interface, 23 CDasherInterface *_interface,
21 QWidget * _parent, Dasher::CDashEditbox *edit): 24 QWidget * _parent, Dasher::CDashEditbox *edit):
22 QWidget(_parent), interface( _interface ), 25 QWidget(_parent), interface( _interface ),
23 fontname( "fixed" ), // fontsize(12), 26 fontname( "fixed" ), fontsize(12),
24 Dasher::CDasherScreen(_width, _height) 27 Dasher::CDasherScreen(_width, _height)
25{ 28{
26 // font = new QFont (fontname, fontsize); 29 font = QFont (fontname.c_str(), fontsize);
27 painter = new QPainter (); 30 painter = new QPainter ();
28 31
29 pixmap = new QPixmap (_width, _height); 32 pixmap = new QPixmap (_width, _height);
@@ -34,15 +37,15 @@ QtDasherScreen::QtDasherScreen (int _width, int _height,
34 interface->ChangeView(0); 37 interface->ChangeView(0);
35 interface->ChangeEdit(edit); 38 interface->ChangeEdit(edit);
36 39
37 interface->GetFontSizes(&FontSizes); 40/* interface->GetFontSizes(&FontSizes);
38 41
39 for (int i=0; i<FontSizes.size(); i++) { 42 for (int i=0; i<FontSizes.size(); i++) {
40 if (FontSizes[i]>Fonts.size()) 43 if (FontSizes[i]>Fonts.size())
41 Fonts.resize((FontSizes[i])+1); 44 Fonts.resize((FontSizes[i])+1);
42 Fonts[FontSizes[i]]= QFont (fontname.c_str(), FontSizes[i]); 45 Fonts[FontSizes[i]]= QFont (fontname.c_str(), FontSizes[i]);
43 Fonts[FontSizes[i]].setPixelSize(FontSizes[i]); 46// Fonts[FontSizes[i]].setPixelSize(FontSizes[i]);
44 } 47 }
45 48*/
46 interface->ChangeScreen(this); 49 interface->ChangeScreen(this);
47 50
48 paused=true; 51 paused=true;
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 @@
21#include "DashEdit.h" 21#include "DashEdit.h"
22#include "DasherInterface.h" 22#include "DasherInterface.h"
23 23
24#include <iconv.h>
25
24using namespace Dasher; 26using namespace Dasher;
25 27
26class QtDasherScreen : public QWidget, public Dasher::CDasherScreen 28class QtDasherScreen : public QWidget, public Dasher::CDasherScreen
@@ -49,7 +51,7 @@ class QtDasherScreen : public QWidget, public Dasher::CDasherScreen
49 void TextSize(symbol Character, int* Width, int* Height, int Size) const 51 void TextSize(symbol Character, int* Width, int* Height, int Size) const
50 { 52 {
51 // should probably use QPainter::boundingRect() 53 // should probably use QPainter::boundingRect()
52 *Width = *Height = Fonts[Size].pixelSize(); 54 *Width = *Height = font.pixelSize();
53 55
54 } 56 }
55 void DrawText(symbol Character, int x1, int y1, int Size) const 57 void DrawText(symbol Character, int x1, int y1, int Size) const
@@ -58,7 +60,7 @@ class QtDasherScreen : public QWidget, public Dasher::CDasherScreen
58 // font.setPixelSize(Size); 60 // font.setPixelSize(Size);
59 QPoint point = QPoint(x1, y1+Size/2); 61 QPoint point = QPoint(x1, y1+Size/2);
60 62
61 painter->setFont (Fonts[Size]); 63 painter->setFont (font);
62 painter->drawText (point, 64 painter->drawText (point,
63 QString(interface->GetDisplayText(Character).c_str())); 65 QString(interface->GetDisplayText(Character).c_str()));
64 } 66 }
@@ -71,7 +73,8 @@ class QtDasherScreen : public QWidget, public Dasher::CDasherScreen
71 73
72 std::vector<int> FontSizes; 74 std::vector<int> FontSizes;
73 std::vector<QFont> Fonts; 75 std::vector<QFont> Fonts;
74 76 QFont font;
77 int fontsize;
75 void Blank() const { 78 void Blank() const {
76 painter->begin(pixmap); 79 painter->begin(pixmap);
77 painter->setPen (NoPen); 80 painter->setPen (NoPen);