summaryrefslogtreecommitdiff
path: root/inputmethods
Unidiff
Diffstat (limited to 'inputmethods') (more/less context) (show whitespace changes)
-rw-r--r--inputmethods/multikey/configdlg.cpp5
-rw-r--r--inputmethods/multikey/keyboard.cpp4
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,30 +1,29 @@
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>
19#include <qgroupbox.h> 18#include <qgroupbox.h>
20#include <qlabel.h> 19#include <qlabel.h>
21#include <qcheckbox.h> 20#include <qcheckbox.h>
22#include <qsizepolicy.h> 21#include <qsizepolicy.h>
23#include <qpushbutton.h> 22#include <qpushbutton.h>
24#include <qlistbox.h> 23#include <qlistbox.h>
25#include <qstringlist.h> 24#include <qstringlist.h>
26#include <opie/ofiledialog.h> 25#include <opie/ofiledialog.h>
27#include <opie/colordialog.h> 26#include <opie/colordialog.h>
28#include <qdir.h> 27#include <qdir.h>
29#include <qfileinfo.h> 28#include <qfileinfo.h>
30#include "configdlg.h" 29#include "configdlg.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
@@ -34,50 +34,50 @@
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 40
41/* Keyboard::Keyboard {{{1 */ 41/* Keyboard::Keyboard {{{1 */
42Keyboard::Keyboard(QWidget* parent, const char* _name, WFlags f) : 42Keyboard::Keyboard(QWidget* parent, const char* _name, WFlags f) :
43 QFrame(parent, _name, f), shift(0), lock(0), ctrl(0), alt(0), meta(0), 43 QFrame(parent, _name, f), shift(0), lock(0), ctrl(0), alt(0), meta(0),
44 useLargeKeys(TRUE), usePicks(0), useRepeat(0), pressedKeyRow(-1), pressedKeyCol(-1), 44 useLargeKeys(TRUE), usePicks(0), useRepeat(0), pressedKeyRow(-1), pressedKeyCol(-1),
45 unicode(-1), qkeycode(0), modifiers(0), schar(0), mchar(0), echar(0), 45 unicode(-1), qkeycode(0), modifiers(0), schar(0), mchar(0), echar(0),
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)) );
72 72
73 } else picks->hide(); 73 } else picks->hide();
74 74
75 loadKeyboardColors(); 75 loadKeyboardColors();
76 76
77 keys = new Keys(); 77 keys = new Keys();
78 78
79 repeatTimer = new QTimer( this ); 79 repeatTimer = new QTimer( this );
80 connect( repeatTimer, SIGNAL(timeout()), this, SLOT(repeat()) ); 80 connect( repeatTimer, SIGNAL(timeout()), this, SLOT(repeat()) );
81 81
82} 82}
83 83