author | sandman <sandman> | 2002-10-22 11:38:47 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-10-22 11:38:47 (UTC) |
commit | 1ee836bd1bb777dded54810909e508dc0470ada3 (patch) (unidiff) | |
tree | 7bba0cd910c49c7f7dc7ca61f80c471b039861af | |
parent | bbb2c5fee87baa345ff5c16404204054442f5c11 (diff) | |
download | opie-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.
-rw-r--r-- | inputmethods/multikey/keyboard.cpp | 5 | ||||
-rw-r--r-- | inputmethods/multikey/keyboardimpl.cpp | 1 |
2 files changed, 4 insertions, 2 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 | |||
@@ -96,9 +96,9 @@ Keyboard::~Keyboard() { | |||
96 | void Keyboard::resizeEvent(QResizeEvent*) | 96 | void Keyboard::resizeEvent(QResizeEvent*) |
97 | { | 97 | { |
98 | int ph = picks->sizeHint().height(); | 98 | int ph = picks->sizeHint().height(); |
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 | ||
102 | int nk; // number of keys? | 102 | int nk; // number of keys? |
103 | if ( useLargeKeys ) { | 103 | if ( useLargeKeys ) { |
104 | nk = 15; | 104 | nk = 15; |
@@ -1320,8 +1320,11 @@ Keys::Keys() { | |||
1320 | map = QPEApplication::qpeDir() + "/share/multikey/" | 1320 | map = QPEApplication::qpeDir() + "/share/multikey/" |
1321 | + l + ".keymap"; | 1321 | + l + ".keymap"; |
1322 | 1322 | ||
1323 | } | 1323 | } |
1324 | if (map.isNull() || !(QFile(map).exists())) { | ||
1325 | map = QPEApplication::qpeDir() + "/share/multikey/en.keymap"; | ||
1326 | } | ||
1324 | 1327 | ||
1325 | setKeysFromFile(map); | 1328 | setKeysFromFile(map); |
1326 | } | 1329 | } |
1327 | 1330 | ||
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 | |||
@@ -77,9 +77,8 @@ QPixmap *KeyboardImpl::icon() | |||
77 | 77 | ||
78 | QString KeyboardImpl::name() | 78 | QString KeyboardImpl::name() |
79 | { | 79 | { |
80 | return qApp->translate( "InputMethods", "Multikey" ); | 80 | return qApp->translate( "InputMethods", "Multikey" ); |
81 | // return qApp->translate( "InputMethods", "Opti" ); | ||
82 | } | 81 | } |
83 | 82 | ||
84 | void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot ) | 83 | void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot ) |
85 | { | 84 | { |