made the keysize a little larger

2 files changed, 4 insertions, 1 deletions

diff --git a/inputmethods/multikey/configdlg.cpp b/inputmethods/multikey/configdlg.cpp
index 68c31be..6ec8d0e 100644
--- a/inputmethods/multikey/configdlg.cpp
+++ b/inputmethods/multikey/configdlg.cpp
@@ -24,64 +24,67 @@
 #include <qpushbutton.h>
 #include <qcombobox.h>
 #include "configdlg.h"
 #include "keyboard.h"
 
 ConfigDlg::ConfigDlg () : QTabWidget ()
 {
     setCaption( tr("Multikey Configuration") );
 
     /*
      * '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::Horizontal, tr("Keymap File"), gen_box);
 
     map_combo = new QComboBox ((bool)0, map_group);
     map_combo->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed));
 
     QString cur(tr("Current Language"));
     map_combo->insertItem(cur);
     connect(map_combo, SIGNAL(activated(int)), SLOT(setMap(int)));
 
     QString ko(tr("/opt/opie/share/multikey/ko.keymap"));
     map_combo->insertItem(ko);
 
     QString en(tr("/opt/opie/share/multikey/en.keymap"));
     map_combo->insertItem(en);
 
+    QString de(tr("/opt/opie/share/multikey/de.keymap"));
+    map_combo->insertItem(de);
+
     QPushButton *button = new QPushButton(tr("Browse..."), map_group);
     button->setFlat((bool)1);
 
     pick_button = new QCheckBox(tr("Pickboard"), gen_box);
 
     Config config ("multikey");
     config.setGroup ("pickboard");
     bool pick_open = config.readBoolEntry ("open", "0"); // default closed
     if (pick_open) {
 
         pick_button->setChecked(true);
     }
 
     // by connecting it after checking it, the signal isn't emmited
     connect (pick_button, SIGNAL(clicked()), this, SLOT(pickTog()));
 
     /*
      * 'color' tab
      */
 
     QGrid *color_box = new QGrid(2, this);
     color_box->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed));
     color_box->setMargin(3);
     addTab(color_box, tr("Colors"));
 
     QLabel *label;
 
     label = new QLabel(tr("Key Color"), color_box);
     button = new QPushButton(color_box);
     button->setFlat((bool)1);
     label = new QLabel(tr("Key Pressed Color"), color_box);
     button = new QPushButton(color_box);
diff --git a/inputmethods/multikey/keyboard.cpp b/inputmethods/multikey/keyboard.cpp
index 1d91b82..b793391 100644
--- a/inputmethods/multikey/keyboard.cpp
+++ b/inputmethods/multikey/keyboard.cpp
@@ -426,65 +426,65 @@ void Keyboard::timerEvent(QTimerEvent* e)
         cout << "calling clearHighlight from timerEvent\n";
 	    clearHighlight();
     }
 }
 */
 
 void Keyboard::repeat()
 {
 
   repeatTimer->start( 200 );
   emit key( unicode, 0, modifiers, true, true );
 }
 
 void Keyboard::clearHighlight()
 {
     if ( pressedKeyRow >= 0 && pressedKeyCol >= 0) {
 	    int tmpRow = pressedKeyRow;
         int tmpCol = pressedKeyCol;
 
 	    pressedKeyRow = -1;
 	    pressedKeyCol = -1;
 
 	    QPainter p(this);
 	    drawKeyboard(p, tmpRow, tmpCol);
     }
 }
 
 
 /* Keyboard::sizeHint {{{1 */
 QSize Keyboard::sizeHint() const
 {
     QFontMetrics fm=fontMetrics();
-    int keyHeight = fm.lineSpacing();
+    int keyHeight = fm.lineSpacing() + 2;
 
     return QSize( 240, keyHeight * 5 + (usePicks ? picks->sizeHint().height() : 0) + 1);
 }
 
 
 void Keyboard::resetState()
 {
     schar = mchar = echar = 0;
     picks->resetState();
 }
 
 /* Keyboard::togglePickboard {{{1 */
 void Keyboard::togglePickboard(bool on_off)
 {
     usePicks = on_off;
     if (usePicks) {
         picks->show();
         //move(x(), y() - picks->height()); // not required anymore because QCopChannel::send
         //adjustSize();
         QObject::connect( picks, SIGNAL(key(ushort,ushort,ushort,bool,bool) ),
             this, SIGNAL(key(ushort,ushort,ushort,bool,bool)) );
     } else {
 
         picks->hide();
         picks->resetState();
         //move(x(), y() + picks->height());
         //adjustSize();
         QObject::disconnect( picks, SIGNAL(key(ushort,ushort,ushort,bool,bool) ),
             this, SIGNAL(key(ushort,ushort,ushort,bool,bool)) );
 
     }
     /*