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,54 +1,53 @@
 /*
  * TODO
  * make a font selection thing (size too)
- * make a cursor thing
- * add meta key support for german, etc
- *
+ * make vertical keys possible
+ * make a keymap editor
  *
  *
  */
 
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 
 #include <qwidget.h>
 #include <qdialog.h>
 #include <qtabwidget.h>
 #include <qvbox.h>
 #include <qgrid.h>
 #include <qgroupbox.h>
 #include <qlabel.h>
 #include <qcheckbox.h>
 #include <qsizepolicy.h>
 #include <qpushbutton.h>
 #include <qlistbox.h>
 #include <qstringlist.h>
 #include <opie/ofiledialog.h>
 #include <opie/colordialog.h>
 #include <qdir.h>
 #include <qfileinfo.h>
 #include "configdlg.h"
 #include "keyboard.h"
 
 // ConfigDlg::ConfigDlg() {{{1
 ConfigDlg::ConfigDlg () : QTabWidget ()
 {
     setCaption( tr("Multikey Configuration") );
     Config config ("multikey");
     config.setGroup("keymaps");
     QString current_map = config.readEntry("current", 0);
 
     /*
      * 'general config' tab
      */
 
     QVBox *gen_box = new QVBox (this);
     gen_box->setMargin(3);
     addTab(gen_box, tr("General Settings"));
 
     QGroupBox *map_group = new QGroupBox (2, Qt::Vertical, tr("Keymap File"), gen_box);
 
     keymaps = new QListBox (map_group);
     keymaps->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
 
     QString cur(tr("Current Language"));
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
@@ -10,98 +10,98 @@
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "keyboard.h"
 #include "configdlg.h"
 
 #include <qpe/global.h>
 #include <qpe/qcopenvelope_qws.h>
 
 #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>
 
 
 /* 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), 
     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", "fixed" );
     delete config;
 
     config = new Config("multikey");
     config->setGroup ("general");
-    usePicks = config->readBoolEntry ("usePickboard", "0"); // default closed
-    useRepeat = config->readBoolEntry ("useRepeat", "1");
+    usePicks = config->readBoolEntry ("usePickboard", 0); // default closed
+    useRepeat = config->readBoolEntry ("useRepeat", 1);
     delete config;
 
 
     setFont( QFont( familyStr, 10 ) );
 
     picks = new KeyboardPicks( this );
     picks->setFont( QFont( familyStr, 10 ) );
     picks->initialise();
     if (usePicks) {
 
         QObject::connect( picks, SIGNAL(key(ushort,ushort,ushort,bool,bool) ),
             this, SIGNAL(key(ushort,ushort,ushort,bool,bool)) );
 
     } else picks->hide();
 
     loadKeyboardColors();
 
     keys = new Keys();
 
     repeatTimer = new QTimer( this );
     connect( repeatTimer, SIGNAL(timeout()), this, SLOT(repeat()) );
 
 }
 
 Keyboard::~Keyboard() {
 
     if ( configdlg ) { 
         delete (ConfigDlg *) configdlg; 
         configdlg = 0;
     }
 
 }
 
 /* Keyboard::resizeEvent {{{1 */
 void Keyboard::resizeEvent(QResizeEvent*)
 {
     int ph = picks->sizeHint().height();
     picks->setGeometry( 0, 0, width(), ph );
     keyHeight = (height()-(usePicks ? ph : 0))/5;
 
     int nk; // number of keys?
     if ( useLargeKeys ) {
         nk = 15;
     } else {
         nk = 19;
     }
     defaultKeyWidth = (width()/nk)/2;
     xoffs = (width()-defaultKeyWidth*nk)/2; // empty key spaces?