author | treke <treke> | 2003-07-19 16:38:27 (UTC) |
---|---|---|
committer | treke <treke> | 2003-07-19 16:38:27 (UTC) |
commit | 67b69b7aede83ccb0d933dec9bd959f01eb6ea06 (patch) (side-by-side diff) | |
tree | 6e404164453172adc58d088f72c58e6f38e4b4c3 /inputmethods | |
parent | cf3921fe77f87e94ff821df65bb80b02487a9f9b (diff) | |
download | opie-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)
-rw-r--r-- | inputmethods/multikey/keyboard.cpp | 18 |
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 @@ -36,12 +36,24 @@ #include <qstringlist.h> #include <sys/utsname.h> using namespace MultiKey; +static const char * const kb_config_xpm[] = { +"13 7 2 1", +" c None", +". c #000000", +" ", +" . ", +" ... ", +" ..... ", +" . ", +" . ", +" "}; + /* Keyboard::Keyboard {{{1 */ Keyboard::Keyboard(QWidget* parent, const char* _name, WFlags f) : QFrame(parent, _name, f), shift(0), lock(0), ctrl(0), alt(0), meta(0), circumflex(0), diaeresis(0), baccent(0), accent(0), useLargeKeys(TRUE), usePicks(0), useRepeat(0), pressedKeyRow(-1), pressedKeyCol(-1), @@ -1519,17 +1531,23 @@ void Keys::setKeysFromFile(const char * filename) { buf = t.readLine(); } } + f.close(); + } else { + // We couldnt find the selected keymap, give them a configure button + QImage * btn = new QImage((const char ** )kb_config_xpm); + setKey(1, 0x1030, 0, 2, btn); } } + // Keys::setKey {{{2 void Keys::setKey(const int row, const int qcode, const ushort unicode, const int width, QImage *pix) { Key * key; key = new Key; |