author | hash <hash> | 2002-08-27 17:55:22 (UTC) |
---|---|---|
committer | hash <hash> | 2002-08-27 17:55:22 (UTC) |
commit | 48a1af2115e44f44ccc3918ef77f77167d1bbc24 (patch) (unidiff) | |
tree | f6cbd81ac5019c6fc5b38ae9445b1510a9b91845 /inputmethods | |
parent | 83091c400324e103650a709206f6983ebf2a5e22 (diff) | |
download | opie-48a1af2115e44f44ccc3918ef77f77167d1bbc24.zip opie-48a1af2115e44f44ccc3918ef77f77167d1bbc24.tar.gz opie-48a1af2115e44f44ccc3918ef77f77167d1bbc24.tar.bz2 |
pickboard off by default now working
-rw-r--r-- | inputmethods/multikey/configdlg.cpp | 5 | ||||
-rw-r--r-- | inputmethods/multikey/keyboard.cpp | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/inputmethods/multikey/configdlg.cpp b/inputmethods/multikey/configdlg.cpp index f6507b4..26c9233 100644 --- a/inputmethods/multikey/configdlg.cpp +++ b/inputmethods/multikey/configdlg.cpp | |||
@@ -1,18 +1,17 @@ | |||
1 | /* | 1 | /* |
2 | * TODO | 2 | * TODO |
3 | * make a font selection thing (size too) | 3 | * make a font selection thing (size too) |
4 | * make a cursor thing | 4 | * make vertical keys possible |
5 | * add meta key support for german, etc | 5 | * make a keymap editor |
6 | * | ||
7 | * | 6 | * |
8 | * | 7 | * |
9 | */ | 8 | */ |
10 | 9 | ||
11 | #include <qpe/qpeapplication.h> | 10 | #include <qpe/qpeapplication.h> |
12 | #include <qpe/config.h> | 11 | #include <qpe/config.h> |
13 | 12 | ||
14 | #include <qwidget.h> | 13 | #include <qwidget.h> |
15 | #include <qdialog.h> | 14 | #include <qdialog.h> |
16 | #include <qtabwidget.h> | 15 | #include <qtabwidget.h> |
17 | #include <qvbox.h> | 16 | #include <qvbox.h> |
18 | #include <qgrid.h> | 17 | #include <qgrid.h> |
diff --git a/inputmethods/multikey/keyboard.cpp b/inputmethods/multikey/keyboard.cpp index 92ea896..4747f59 100644 --- a/inputmethods/multikey/keyboard.cpp +++ b/inputmethods/multikey/keyboard.cpp | |||
@@ -46,26 +46,26 @@ Keyboard::Keyboard(QWidget* parent, const char* _name, WFlags f) : | |||
46 | configdlg(0) | 46 | configdlg(0) |
47 | 47 | ||
48 | { | 48 | { |
49 | 49 | ||
50 | // get the default font | 50 | // get the default font |
51 | Config *config = new Config( "qpe" ); | 51 | Config *config = new Config( "qpe" ); |
52 | config->setGroup( "Appearance" ); | 52 | config->setGroup( "Appearance" ); |
53 | QString familyStr = config->readEntry( "FontFamily", "fixed" ); | 53 | QString familyStr = config->readEntry( "FontFamily", "fixed" ); |
54 | delete config; | 54 | delete config; |
55 | 55 | ||
56 | config = new Config("multikey"); | 56 | config = new Config("multikey"); |
57 | config->setGroup ("general"); | 57 | config->setGroup ("general"); |
58 | usePicks = config->readBoolEntry ("usePickboard", "0"); // default closed | 58 | usePicks = config->readBoolEntry ("usePickboard", 0); // default closed |
59 | useRepeat = config->readBoolEntry ("useRepeat", "1"); | 59 | useRepeat = config->readBoolEntry ("useRepeat", 1); |
60 | delete config; | 60 | delete config; |
61 | 61 | ||
62 | 62 | ||
63 | setFont( QFont( familyStr, 10 ) ); | 63 | setFont( QFont( familyStr, 10 ) ); |
64 | 64 | ||
65 | picks = new KeyboardPicks( this ); | 65 | picks = new KeyboardPicks( this ); |
66 | picks->setFont( QFont( familyStr, 10 ) ); | 66 | picks->setFont( QFont( familyStr, 10 ) ); |
67 | picks->initialise(); | 67 | picks->initialise(); |
68 | if (usePicks) { | 68 | if (usePicks) { |
69 | 69 | ||
70 | QObject::connect( picks, SIGNAL(key(ushort,ushort,ushort,bool,bool) ), | 70 | QObject::connect( picks, SIGNAL(key(ushort,ushort,ushort,bool,bool) ), |
71 | this, SIGNAL(key(ushort,ushort,ushort,bool,bool)) ); | 71 | this, SIGNAL(key(ushort,ushort,ushort,bool,bool)) ); |