summaryrefslogtreecommitdiff
path: root/inputmethods/multikey
authortreke <treke>2003-07-19 16:38:27 (UTC)
committer treke <treke>2003-07-19 16:38:27 (UTC)
commit67b69b7aede83ccb0d933dec9bd959f01eb6ea06 (patch) (unidiff)
tree6e404164453172adc58d088f72c58e6f38e4b4c3 /inputmethods/multikey
parentcf3921fe77f87e94ff821df65bb80b02487a9f9b (diff)
downloadopie-67b69b7aede83ccb0d933dec9bd959f01eb6ea06.zip
opie-67b69b7aede83ccb0d933dec9bd959f01eb6ea06.tar.gz
opie-67b69b7aede83ccb0d933dec9bd959f01eb6ea06.tar.bz2
* Adds a keyboard layout with a configure button to multikey when it is
unable to load the selected layout. Fixes (#920)
Diffstat (limited to 'inputmethods/multikey') (more/less context) (ignore whitespace changes)
-rw-r--r--inputmethods/multikey/keyboard.cpp18
1 files changed, 18 insertions, 0 deletions
diff --git a/inputmethods/multikey/keyboard.cpp b/inputmethods/multikey/keyboard.cpp
index bded447..2ce6dd3 100644
--- a/inputmethods/multikey/keyboard.cpp
+++ b/inputmethods/multikey/keyboard.cpp
@@ -39,6 +39,18 @@
39 39
40using namespace MultiKey; 40using namespace MultiKey;
41 41
42static const char * const kb_config_xpm[] = {
43"13 7 2 1",
44" c None",
45". c #000000",
46" ",
47" . ",
48" ... ",
49" ..... ",
50" . ",
51" . ",
52" "};
53
42/* Keyboard::Keyboard {{{1 */ 54/* Keyboard::Keyboard {{{1 */
43Keyboard::Keyboard(QWidget* parent, const char* _name, WFlags f) : 55Keyboard::Keyboard(QWidget* parent, const char* _name, WFlags f) :
44 QFrame(parent, _name, f), shift(0), lock(0), ctrl(0), alt(0), 56 QFrame(parent, _name, f), shift(0), lock(0), ctrl(0), alt(0),
@@ -1522,11 +1534,17 @@ void Keys::setKeysFromFile(const char * filename) {
1522 } 1534 }
1523 1535
1524 } 1536 }
1537
1525 f.close(); 1538 f.close();
1539 } else {
1540 // We couldnt find the selected keymap, give them a configure button
1541 QImage * btn = new QImage((const char ** )kb_config_xpm);
1542 setKey(1, 0x1030, 0, 2, btn);
1526 } 1543 }
1527 1544
1528} 1545}
1529 1546
1547
1530// Keys::setKey {{{2 1548// Keys::setKey {{{2
1531void Keys::setKey(const int row, const int qcode, const ushort unicode, 1549void Keys::setKey(const int row, const int qcode, const ushort unicode,
1532 const int width, QImage *pix) { 1550 const int width, QImage *pix) {