-rw-r--r-- | inputmethods/multikey/keyboard.cpp | 7 | ||||
-rw-r--r-- | inputmethods/multikey/keyboardimpl.cpp | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/inputmethods/multikey/keyboard.cpp b/inputmethods/multikey/keyboard.cpp index 1dd8ca1..de3aa52 100644 --- a/inputmethods/multikey/keyboard.cpp +++ b/inputmethods/multikey/keyboard.cpp | |||
@@ -99,3 +99,3 @@ void Keyboard::resizeEvent(QResizeEvent*) | |||
99 | picks->setGeometry( 0, 0, width(), ph ); | 99 | picks->setGeometry( 0, 0, width(), ph ); |
100 | keyHeight = (height()-(usePicks ? ph : 0))/keys->rows(); | 100 | keyHeight = (height()-(usePicks ? ph : 0))/(keys->rows()?keys->rows():1); |
101 | 101 | ||
@@ -1323,3 +1323,6 @@ Keys::Keys() { | |||
1323 | } | 1323 | } |
1324 | 1324 | if (map.isNull() || !(QFile(map).exists())) { | |
1325 | map = QPEApplication::qpeDir() + "/share/multikey/en.keymap"; | ||
1326 | } | ||
1327 | |||
1325 | setKeysFromFile(map); | 1328 | setKeysFromFile(map); |
diff --git a/inputmethods/multikey/keyboardimpl.cpp b/inputmethods/multikey/keyboardimpl.cpp index 2bcb0fa..cebd43d 100644 --- a/inputmethods/multikey/keyboardimpl.cpp +++ b/inputmethods/multikey/keyboardimpl.cpp | |||
@@ -80,3 +80,2 @@ QString KeyboardImpl::name() | |||
80 | return qApp->translate( "InputMethods", "Multikey" ); | 80 | return qApp->translate( "InputMethods", "Multikey" ); |
81 | // return qApp->translate( "InputMethods", "Opti" ); | ||
82 | } | 81 | } |