* Adds a keyboard layout with a configure button to multikey when it is

  unable to load the selected layout. Fixes (#920)

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
@@ -26,32 +26,44 @@
 
 #include <qwindowsystem_qws.h>
 #include <qpainter.h>
 #include <qfontmetrics.h>
 #include <qtimer.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <ctype.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #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),
     unicode(-1), qkeycode(0), modifiers(0), schar(0), mchar(0), echar(0),
     configdlg(0)
 
 {
 
     // get the default font
     Config *config = new Config( "qpe" );
     config->setGroup( "Appearance" );
     QString familyStr = config->readEntry( "FontFamily", "smallsmooth" );
     delete config;
@@ -1509,37 +1521,43 @@ void Keys::setKeysFromFile(const char * filename) {
                 } 
 
                 buf = t.readLine();
             }
             // comments
             else if (buf.contains(QRegExp("^\\s*#"))) {
 
                 buf = t.readLine();
 
             } else { // blank line, or garbage
 
                 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; 
     key->qcode = qcode;
     key->unicode = unicode;
     key->width = width;
 
     // share key->pressed between same keys
     bool found = 0;
     for (int i = 1; i <= 5; i++) {
         for (unsigned int j = 0; j < keys[i].count(); j++)
             if (keys[i].at(j)->qcode == qcode && keys[i].at(j)->unicode == unicode) {