-rw-r--r-- | inputmethods/multikey/configdlg.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/inputmethods/multikey/configdlg.cpp b/inputmethods/multikey/configdlg.cpp index d29109a..3e39415 100644 --- a/inputmethods/multikey/configdlg.cpp +++ b/inputmethods/multikey/configdlg.cpp | |||
@@ -348,36 +348,33 @@ void ConfigDlg::moveSelectedDown() | |||
348 | 348 | ||
349 | QString item = keymaps->currentText(); | 349 | QString item = keymaps->currentText(); |
350 | keymaps->removeItem(i); | 350 | keymaps->removeItem(i); |
351 | keymaps->insertItem(item, i+1); | 351 | keymaps->insertItem(item, i+1); |
352 | keymaps->setCurrentItem(i+1); | 352 | keymaps->setCurrentItem(i+1); |
353 | } | 353 | } |
354 | } | 354 | } |
355 | 355 | ||
356 | void ConfigDlg::closeEvent(QCloseEvent *) { | 356 | void ConfigDlg::closeEvent(QCloseEvent *) { |
357 | 357 | ||
358 | // tell the parent it was closed, so delete me | 358 | // tell the parent it was closed, so delete me |
359 | emit configDlgClosed(); | 359 | emit configDlgClosed(); |
360 | } | 360 | } |
361 | 361 | ||
362 | void ConfigDlg::setMap(int index) { | 362 | void ConfigDlg::setMap(int index) { |
363 | 363 | ||
364 | if (index == 0) { | 364 | if (index == 0 || default_maps.find(sw_maps[index-1]) != default_maps.end()) { |
365 | remove_button->setDisabled(true); | ||
366 | } | ||
367 | else if (default_maps.find(sw_maps[index-1]) != default_maps.end()) { | ||
368 | remove_button->setDisabled(true); | 365 | remove_button->setDisabled(true); |
369 | } else { | 366 | } else { |
370 | remove_button->setEnabled(true); | 367 | remove_button->setEnabled(true); |
371 | } | 368 | } |
372 | } | 369 | } |
373 | 370 | ||
374 | // ConfigDlg::addMap() {{{1 | 371 | // ConfigDlg::addMap() {{{1 |
375 | void ConfigDlg::addMap() { | 372 | void ConfigDlg::addMap() { |
376 | 373 | ||
377 | QString map = OFileDialog::getOpenFileName(1, QDir::home().absPath()); | 374 | QString map = OFileDialog::getOpenFileName(1, QDir::home().absPath()); |
378 | 375 | ||
379 | if (map.isNull()) return; | 376 | if (map.isNull()) return; |
380 | 377 | ||
381 | Config config ("multikey"); | 378 | Config config ("multikey"); |
382 | config.setGroup("keymaps"); | 379 | config.setGroup("keymaps"); |
383 | QStringList maps = config.readListEntry("maps", QChar('|')); | 380 | QStringList maps = config.readListEntry("maps", QChar('|')); |