summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--inputmethods/dasher/QtDasherScreen.cc3
-rw-r--r--inputmethods/dasher/QtDasherScreen.h2
2 files changed, 0 insertions, 5 deletions
diff --git a/inputmethods/dasher/QtDasherScreen.cc b/inputmethods/dasher/QtDasherScreen.cc
index 7d77511..747b705 100644
--- a/inputmethods/dasher/QtDasherScreen.cc
+++ b/inputmethods/dasher/QtDasherScreen.cc
@@ -1,45 +1,42 @@
1// QtDasherScreen.cc 1// QtDasherScreen.cc
2// (c) 2003 Yann Dirson 2// (c) 2003 Yann Dirson
3// Derived from GtkDasherCanvas.cc 3// Derived from GtkDasherCanvas.cc
4// (c) 2002 Philip Cowans 4// (c) 2002 Philip Cowans
5 5
6#include <iostream> 6#include <iostream>
7#include <string> 7#include <string>
8 8
9#include <qpointarray.h> 9#include <qpointarray.h>
10#include <qpoint.h> 10#include <qpoint.h>
11 11
12#include "QtDasherScreen.h" 12#include "QtDasherScreen.h"
13#include "DasherScreen.h" 13#include "DasherScreen.h"
14#include "SettingsStore.h" 14#include "SettingsStore.h"
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
22QtDasherScreen::QtDasherScreen (int _width, int _height, 19QtDasherScreen::QtDasherScreen (int _width, int _height,
23 CDasherInterface *_interface, 20 CDasherInterface *_interface,
24 QWidget * _parent, Dasher::CDashEditbox *edit): 21 QWidget * _parent, Dasher::CDashEditbox *edit):
25 QWidget(_parent), interface( _interface ), 22 QWidget(_parent), interface( _interface ),
26 fontname( "fixed" ), fontsize(12), 23 fontname( "fixed" ), fontsize(12),
27 Dasher::CDasherScreen(_width, _height) 24 Dasher::CDasherScreen(_width, _height)
28{ 25{
29 font = QFont (fontname.c_str(), fontsize); 26 font = QFont (fontname.c_str(), fontsize);
30 painter = new QPainter (); 27 painter = new QPainter ();
31 28
32 pixmap = new QPixmap (_width, _height); 29 pixmap = new QPixmap (_width, _height);
33 pixmap->setOptimization(QPixmap::BestOptim); 30 pixmap->setOptimization(QPixmap::BestOptim);
34 interface->SetSettingsStore(new CSettingsStore); 31 interface->SetSettingsStore(new CSettingsStore);
35 32
36 interface->ChangeLanguageModel(0); 33 interface->ChangeLanguageModel(0);
37 interface->ChangeView(0); 34 interface->ChangeView(0);
38 interface->ChangeEdit(edit); 35 interface->ChangeEdit(edit);
39 36
40/* interface->GetFontSizes(&FontSizes); 37/* interface->GetFontSizes(&FontSizes);
41 38
42 for (int i=0; i<FontSizes.size(); i++) { 39 for (int i=0; i<FontSizes.size(); i++) {
43 if (FontSizes[i]>Fonts.size()) 40 if (FontSizes[i]>Fonts.size())
44 Fonts.resize((FontSizes[i])+1); 41 Fonts.resize((FontSizes[i])+1);
45 Fonts[FontSizes[i]]= QFont (fontname.c_str(), FontSizes[i]); 42 Fonts[FontSizes[i]]= QFont (fontname.c_str(), FontSizes[i]);
diff --git a/inputmethods/dasher/QtDasherScreen.h b/inputmethods/dasher/QtDasherScreen.h
index c029a60..06689d6 100644
--- a/inputmethods/dasher/QtDasherScreen.h
+++ b/inputmethods/dasher/QtDasherScreen.h
@@ -1,49 +1,47 @@
1// QtDasherScreen.h 1// QtDasherScreen.h
2// (c) 2003 Yann Dirson 2// (c) 2003 Yann Dirson
3// Derived from GtkDasherCanvas.h 3// Derived from GtkDasherCanvas.h
4// (c) 2002 Philip Cowans 4// (c) 2002 Philip Cowans
5 5
6#ifndef QT_DASHER_SCREEN_H 6#ifndef QT_DASHER_SCREEN_H
7#define QT_DASHER_SCREEN_H 7#define QT_DASHER_SCREEN_H
8 8
9#include <string> 9#include <string>
10#include <sys/time.h> 10#include <sys/time.h>
11 11
12#include <qwidget.h> 12#include <qwidget.h>
13#include <qpainter.h> 13#include <qpainter.h>
14#include <qfont.h> 14#include <qfont.h>
15#include <qstring.h> 15#include <qstring.h>
16#include <qpixmap.h> 16#include <qpixmap.h>
17#include <qtimer.h> 17#include <qtimer.h>
18#include <qcursor.h> 18#include <qcursor.h>
19 19
20#include "DasherScreen.h" 20#include "DasherScreen.h"
21#include "DashEdit.h" 21#include "DashEdit.h"
22#include "DasherInterface.h" 22#include "DasherInterface.h"
23 23
24#include <iconv.h>
25
26using namespace Dasher; 24using namespace Dasher;
27 25
28class QtDasherScreen : public QWidget, public Dasher::CDasherScreen 26class QtDasherScreen : public QWidget, public Dasher::CDasherScreen
29 27
30{ 28{
31 Q_OBJECT 29 Q_OBJECT
32 public: 30 public:
33 QtDasherScreen (int _width, int _height, 31 QtDasherScreen (int _width, int _height,
34 CDasherInterface *_interface, 32 CDasherInterface *_interface,
35 QWidget * _parent=0, Dasher::CDashEditbox* edit=0); 33 QWidget * _parent=0, Dasher::CDashEditbox* edit=0);
36 QtDasherScreen::~QtDasherScreen(); 34 QtDasherScreen::~QtDasherScreen();
37 35
38 void SetFont(std::string Name) 36 void SetFont(std::string Name)
39 { fontname = Name; /* set_the_font(); */ } 37 { fontname = Name; /* set_the_font(); */ }
40 38
41 void SetFontSize(Dasher::Opts::FontSize fontsize) 39 void SetFontSize(Dasher::Opts::FontSize fontsize)
42 { 40 {
43#warning QtDasherScreen::SetFontSize() not implemented 41#warning QtDasherScreen::SetFontSize() not implemented
44 } 42 }
45 Dasher::Opts::FontSize GetFontSize() 43 Dasher::Opts::FontSize GetFontSize()
46 { 44 {
47#warning QtDasherScreen::GetFontSize() not implemented 45#warning QtDasherScreen::GetFontSize() not implemented
48 return (Dasher::Opts::Normal); 46 return (Dasher::Opts::Normal);
49 } 47 }