Diffstat (limited to 'inputmethods/dasher/QtDasherScreen.cc') (more/less context) (ignore whitespace changes)
-rw-r--r-- | inputmethods/dasher/QtDasherScreen.cc | 13 |
1 files changed, 8 insertions, 5 deletions
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 | |||
@@ -15,16 +15,19 @@ | |||
15 | 15 | ||
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 | |||
19 | QtDasherScreen::QtDasherScreen (int _width, int _height, | 22 | QtDasherScreen::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); |
30 | pixmap->setOptimization(QPixmap::BestOptim); | 33 | pixmap->setOptimization(QPixmap::BestOptim); |
@@ -33,17 +36,17 @@ QtDasherScreen::QtDasherScreen (int _width, int _height, | |||
33 | interface->ChangeLanguageModel(0); | 36 | interface->ChangeLanguageModel(0); |
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; |
49 | 52 | ||