summaryrefslogtreecommitdiff
authorhash <hash>2002-08-21 20:00:48 (UTC)
committer hash <hash>2002-08-21 20:00:48 (UTC)
commit10739e8b7d203e56ef30011770f6d12d8b0bb270 (patch) (side-by-side diff)
tree341451202d077ed4bdf16beb696a94e494c7693c
parent33fb38da29cfb4b29eff08928742b8d6918eb852 (diff)
downloadopie-10739e8b7d203e56ef30011770f6d12d8b0bb270.zip
opie-10739e8b7d203e56ef30011770f6d12d8b0bb270.tar.gz
opie-10739e8b7d203e56ef30011770f6d12d8b0bb270.tar.bz2
fixed bug where it adds blank lines to the keymap list
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--inputmethods/multikey/configdlg.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/inputmethods/multikey/configdlg.cpp b/inputmethods/multikey/configdlg.cpp
index a9137b9..9ea59a4 100644
--- a/inputmethods/multikey/configdlg.cpp
+++ b/inputmethods/multikey/configdlg.cpp
@@ -224,48 +224,51 @@ void ConfigDlg::repeatTog() {
void ConfigDlg::setMap(int index) {
if (index == 0) {
remove_button->setDisabled(true);
emit setMapToDefault();
}
else if ((uint)index <= default_maps.count()) {
remove_button->setDisabled(true);
emit setMapToFile(keymaps->text(index));
} else {
remove_button->setEnabled(true);
emit setMapToFile(keymaps->text(index));
}
}
// ConfigDlg::addMap() {{{1
void ConfigDlg::addMap() {
QString map = OFileDialog::getOpenFileName(1, QDir::home().absPath());
+
+ if (map.isNull()) return;
+
Config config ("multikey");
config.setGroup("keymaps");
QStringList maps = config.readListEntry("maps", QChar('|'));
maps.append(map);
keymaps->insertItem(map);
keymaps->setSelected(keymaps->count() - 1, true);
config.writeEntry("maps", maps, QChar('|'));
config.writeEntry("current", map);
}
// ConfigDlg::removeMap() {{{1
void ConfigDlg::removeMap() {
cout << "removing : " << custom_maps[keymaps->currentItem() - default_maps.count() - 1] << "\n";
cout << "currentItem : " << keymaps->currentItem() << "\n";
// move selection up one
keymaps->setSelected(keymaps->currentItem() - 1, true);
// delete the next selected item cus you just moved it up
keymaps->removeItem(keymaps->currentItem() + 1);