author | kergoth <kergoth> | 2003-01-24 04:16:17 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-01-24 04:16:17 (UTC) |
commit | 067166880b657925d95ddd688099e56b1463fba8 (patch) (unidiff) | |
tree | 616a36f012cc345f7566eb9c5d47df7d0bb22b0e | |
parent | a50448ae6d0ea041abb7c396c9dddf197ca6f125 (diff) | |
download | opie-067166880b657925d95ddd688099e56b1463fba8.zip opie-067166880b657925d95ddd688099e56b1463fba8.tar.gz opie-067166880b657925d95ddd688099e56b1463fba8.tar.bz2 |
I dont know why we were defaulting to fixed... *shudders*.. but we default to smallsmooth now.
-rw-r--r-- | inputmethods/multikey/keyboard.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/inputmethods/multikey/keyboard.cpp b/inputmethods/multikey/keyboard.cpp index c22fbb1..bded447 100644 --- a/inputmethods/multikey/keyboard.cpp +++ b/inputmethods/multikey/keyboard.cpp | |||
@@ -1,120 +1,120 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "keyboard.h" | 21 | #include "keyboard.h" |
22 | #include "configdlg.h" | 22 | #include "configdlg.h" |
23 | 23 | ||
24 | #include <qpe/global.h> | 24 | #include <qpe/global.h> |
25 | #include <qpe/qcopenvelope_qws.h> | 25 | #include <qpe/qcopenvelope_qws.h> |
26 | 26 | ||
27 | #include <qwindowsystem_qws.h> | 27 | #include <qwindowsystem_qws.h> |
28 | #include <qpainter.h> | 28 | #include <qpainter.h> |
29 | #include <qfontmetrics.h> | 29 | #include <qfontmetrics.h> |
30 | #include <qtimer.h> | 30 | #include <qtimer.h> |
31 | #include <qpe/qpeapplication.h> | 31 | #include <qpe/qpeapplication.h> |
32 | #include <qpe/config.h> | 32 | #include <qpe/config.h> |
33 | #include <ctype.h> | 33 | #include <ctype.h> |
34 | #include <qfile.h> | 34 | #include <qfile.h> |
35 | #include <qtextstream.h> | 35 | #include <qtextstream.h> |
36 | #include <qstringlist.h> | 36 | #include <qstringlist.h> |
37 | 37 | ||
38 | #include <sys/utsname.h> | 38 | #include <sys/utsname.h> |
39 | 39 | ||
40 | using namespace MultiKey; | 40 | using namespace MultiKey; |
41 | 41 | ||
42 | /* Keyboard::Keyboard {{{1 */ | 42 | /* Keyboard::Keyboard {{{1 */ |
43 | Keyboard::Keyboard(QWidget* parent, const char* _name, WFlags f) : | 43 | Keyboard::Keyboard(QWidget* parent, const char* _name, WFlags f) : |
44 | QFrame(parent, _name, f), shift(0), lock(0), ctrl(0), alt(0), | 44 | QFrame(parent, _name, f), shift(0), lock(0), ctrl(0), alt(0), |
45 | meta(0), circumflex(0), diaeresis(0), baccent(0), accent(0), | 45 | meta(0), circumflex(0), diaeresis(0), baccent(0), accent(0), |
46 | useLargeKeys(TRUE), usePicks(0), useRepeat(0), | 46 | useLargeKeys(TRUE), usePicks(0), useRepeat(0), |
47 | pressedKeyRow(-1), pressedKeyCol(-1), | 47 | pressedKeyRow(-1), pressedKeyCol(-1), |
48 | unicode(-1), qkeycode(0), modifiers(0), schar(0), mchar(0), echar(0), | 48 | unicode(-1), qkeycode(0), modifiers(0), schar(0), mchar(0), echar(0), |
49 | configdlg(0) | 49 | configdlg(0) |
50 | 50 | ||
51 | { | 51 | { |
52 | 52 | ||
53 | // get the default font | 53 | // get the default font |
54 | Config *config = new Config( "qpe" ); | 54 | Config *config = new Config( "qpe" ); |
55 | config->setGroup( "Appearance" ); | 55 | config->setGroup( "Appearance" ); |
56 | QString familyStr = config->readEntry( "FontFamily", "fixed" ); | 56 | QString familyStr = config->readEntry( "FontFamily", "smallsmooth" ); |
57 | delete config; | 57 | delete config; |
58 | 58 | ||
59 | config = new Config("multikey"); | 59 | config = new Config("multikey"); |
60 | config->setGroup ("general"); | 60 | config->setGroup ("general"); |
61 | usePicks = config->readBoolEntry ("usePickboard", 0); // default closed | 61 | usePicks = config->readBoolEntry ("usePickboard", 0); // default closed |
62 | useRepeat = config->readBoolEntry ("useRepeat", 1); | 62 | useRepeat = config->readBoolEntry ("useRepeat", 1); |
63 | delete config; | 63 | delete config; |
64 | 64 | ||
65 | 65 | ||
66 | setFont( QFont( familyStr, 10 ) ); | 66 | setFont( QFont( familyStr, 10 ) ); |
67 | 67 | ||
68 | picks = new KeyboardPicks( this ); | 68 | picks = new KeyboardPicks( this ); |
69 | picks->setFont( QFont( familyStr, 10 ) ); | 69 | picks->setFont( QFont( familyStr, 10 ) ); |
70 | picks->initialise(); | 70 | picks->initialise(); |
71 | if (usePicks) { | 71 | if (usePicks) { |
72 | 72 | ||
73 | QObject::connect( picks, SIGNAL(key(ushort,ushort,ushort,bool,bool) ), | 73 | QObject::connect( picks, SIGNAL(key(ushort,ushort,ushort,bool,bool) ), |
74 | this, SIGNAL(key(ushort,ushort,ushort,bool,bool)) ); | 74 | this, SIGNAL(key(ushort,ushort,ushort,bool,bool)) ); |
75 | 75 | ||
76 | } else picks->hide(); | 76 | } else picks->hide(); |
77 | 77 | ||
78 | loadKeyboardColors(); | 78 | loadKeyboardColors(); |
79 | 79 | ||
80 | keys = new Keys(); | 80 | keys = new Keys(); |
81 | 81 | ||
82 | repeatTimer = new QTimer( this ); | 82 | repeatTimer = new QTimer( this ); |
83 | connect( repeatTimer, SIGNAL(timeout()), this, SLOT(repeat()) ); | 83 | connect( repeatTimer, SIGNAL(timeout()), this, SLOT(repeat()) ); |
84 | 84 | ||
85 | } | 85 | } |
86 | 86 | ||
87 | Keyboard::~Keyboard() { | 87 | Keyboard::~Keyboard() { |
88 | 88 | ||
89 | if ( configdlg ) { | 89 | if ( configdlg ) { |
90 | delete (ConfigDlg *) configdlg; | 90 | delete (ConfigDlg *) configdlg; |
91 | configdlg = 0; | 91 | configdlg = 0; |
92 | } | 92 | } |
93 | 93 | ||
94 | } | 94 | } |
95 | 95 | ||
96 | /* Keyboard::resizeEvent {{{1 */ | 96 | /* Keyboard::resizeEvent {{{1 */ |
97 | void Keyboard::resizeEvent(QResizeEvent*) | 97 | void Keyboard::resizeEvent(QResizeEvent*) |
98 | { | 98 | { |
99 | int ph = picks->sizeHint().height(); | 99 | int ph = picks->sizeHint().height(); |
100 | picks->setGeometry( 0, 0, width(), ph ); | 100 | picks->setGeometry( 0, 0, width(), ph ); |
101 | keyHeight = (height()-(usePicks ? ph : 0))/(keys->rows()?keys->rows():1); | 101 | keyHeight = (height()-(usePicks ? ph : 0))/(keys->rows()?keys->rows():1); |
102 | 102 | ||
103 | int nk; // number of keys? | 103 | int nk; // number of keys? |
104 | if ( useLargeKeys ) { | 104 | if ( useLargeKeys ) { |
105 | nk = 15; | 105 | nk = 15; |
106 | } else { | 106 | } else { |
107 | nk = 19; | 107 | nk = 19; |
108 | } | 108 | } |
109 | defaultKeyWidth = (width()/nk)/2; | 109 | defaultKeyWidth = (width()/nk)/2; |
110 | xoffs = (width()-defaultKeyWidth*nk)/2; // empty key spaces? | 110 | xoffs = (width()-defaultKeyWidth*nk)/2; // empty key spaces? |
111 | 111 | ||
112 | } | 112 | } |
113 | 113 | ||
114 | /* KeyboardPicks::initialize {{{1 */ | 114 | /* KeyboardPicks::initialize {{{1 */ |
115 | void KeyboardPicks::initialise() | 115 | void KeyboardPicks::initialise() |
116 | { | 116 | { |
117 | setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Fixed)); | 117 | setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Fixed)); |
118 | mode = 0; | 118 | mode = 0; |
119 | dc = new KeyboardConfig(this); | 119 | dc = new KeyboardConfig(this); |
120 | configs.append(dc); | 120 | configs.append(dc); |