summaryrefslogtreecommitdiff
path: root/inputmethods
authorsandman <sandman>2002-10-22 11:38:47 (UTC)
committer sandman <sandman>2002-10-22 11:38:47 (UTC)
commit1ee836bd1bb777dded54810909e508dc0470ada3 (patch) (side-by-side diff)
tree7bba0cd910c49c7f7dc7ca61f80c471b039861af /inputmethods
parentbbb2c5fee87baa345ff5c16404204054442f5c11 (diff)
downloadopie-1ee836bd1bb777dded54810909e508dc0470ada3.zip
opie-1ee836bd1bb777dded54810909e508dc0470ada3.tar.gz
opie-1ee836bd1bb777dded54810909e508dc0470ada3.tar.bz2
- Always try to load the "en" keymap, if a user specified one cannot be
found - Fix the divison by zero error in resizeEvent, in case there is a keymap with 0 rows or no keymap at all.
Diffstat (limited to 'inputmethods') (more/less context) (ignore whitespace changes)
-rw-r--r--inputmethods/multikey/keyboard.cpp7
-rw-r--r--inputmethods/multikey/keyboardimpl.cpp1
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*)
picks->setGeometry( 0, 0, width(), ph );
- keyHeight = (height()-(usePicks ? ph : 0))/keys->rows();
+ keyHeight = (height()-(usePicks ? ph : 0))/(keys->rows()?keys->rows():1);
@@ -1323,3 +1323,6 @@ Keys::Keys() {
}
-
+ if (map.isNull() || !(QFile(map).exists())) {
+ map = QPEApplication::qpeDir() + "/share/multikey/en.keymap";
+ }
+
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()
return qApp->translate( "InputMethods", "Multikey" );
-// return qApp->translate( "InputMethods", "Opti" );
}