summaryrefslogtreecommitdiff
path: root/inputmethods
authormjg59 <mjg59>2003-12-10 03:57:04 (UTC)
committer mjg59 <mjg59>2003-12-10 03:57:04 (UTC)
commitbecbcfae3bf3b5a714e7d3e39b924e08761739c2 (patch) (unidiff)
tree7ec5f6f90a9d529858da340150b415d87e7936ba /inputmethods
parent1f0b92e554b76852af210ceb277b3e9ecb09a43d (diff)
downloadopie-becbcfae3bf3b5a714e7d3e39b924e08761739c2.zip
opie-becbcfae3bf3b5a714e7d3e39b924e08761739c2.tar.gz
opie-becbcfae3bf3b5a714e7d3e39b924e08761739c2.tar.bz2
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
Diffstat (limited to 'inputmethods') (more/less context) (ignore 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
@@ -21,3 +21,3 @@ QtDasherPlugin::QtDasherPlugin(QWidget* parent, const char* name, WFlags f) : QF
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);
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 @@
18 18
19#include <iconv.h>
20#include <iostream>
21
19QtDasherScreen::QtDasherScreen (int _width, int _height, 22QtDasherScreen::QtDasherScreen (int _width, int _height,
@@ -22,6 +25,6 @@ QtDasherScreen::QtDasherScreen (int _width, int _height,
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 ();
@@ -36,3 +39,3 @@ QtDasherScreen::QtDasherScreen (int _width, int _height,
36 39
37 interface->GetFontSizes(&FontSizes); 40/* interface->GetFontSizes(&FontSizes);
38 41
@@ -42,5 +45,5 @@ QtDasherScreen::QtDasherScreen (int _width, int _height,
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);
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 @@
23 23
24#include <iconv.h>
25
24using namespace Dasher; 26using namespace Dasher;
@@ -51,3 +53,3 @@ class QtDasherScreen : public QWidget, public Dasher::CDasherScreen
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
@@ -60,3 +62,3 @@ class QtDasherScreen : public QWidget, public Dasher::CDasherScreen
60 62
61 painter->setFont (Fonts[Size]); 63 painter->setFont (font);
62 painter->drawText (point, 64 painter->drawText (point,
@@ -73,3 +75,4 @@ class QtDasherScreen : public QWidget, public Dasher::CDasherScreen
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 {