configdlg now based on QDialog, instead of QTabWidget

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
@@ -316,100 +316,97 @@ void ConfigDlg::accept()
     emit pickboardToggled(pick_button->isChecked());
     emit repeatToggled(repeat_button->isChecked());
     emit reloadSw();
 
     QDialog::accept();
     emit configDlgClosed();
 }
 
 void ConfigDlg::moveSelectedUp()
 {
     int i = keymaps->currentItem();
     /* Ignore Current Language */
     if (i > 1) {
 	QString t = sw_maps[i-1];
 	sw_maps[i-1] = sw_maps[i-2];
 	sw_maps[i-2] = t;
 
     	QString item = keymaps->currentText();
 	keymaps->removeItem(i);
 	keymaps->insertItem(item, i-1);
 	keymaps->setCurrentItem(i-1);
     }
 }
 
 void ConfigDlg::moveSelectedDown()
 {
     int i = keymaps->currentItem();
     /* Ignore Current Language */
     if (i > 0 && i < (int)keymaps->count() - 1) {
 	QString t = sw_maps[i-1];
 	sw_maps[i-1] = sw_maps[i];
 	sw_maps[i] = t;
 
     	QString item = keymaps->currentText();
 	keymaps->removeItem(i);
 	keymaps->insertItem(item, i+1);
 	keymaps->setCurrentItem(i+1);
     }
 }
 
 void ConfigDlg::closeEvent(QCloseEvent *) {
 
     // tell the parent it was closed, so delete me
     emit configDlgClosed();
 }
 
 void ConfigDlg::setMap(int index) {
 
-    if (index == 0) {
-        remove_button->setDisabled(true);
-    }
-    else if (default_maps.find(sw_maps[index-1]) != default_maps.end()) {
+    if (index == 0 || default_maps.find(sw_maps[index-1]) != default_maps.end()) {
         remove_button->setDisabled(true);
     } else {
         remove_button->setEnabled(true);
     }
 }
 
 // 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);
     custom_maps.append(map);
     if (sw_maps.find(map) == sw_maps.end())
 	sw_maps.append(map);
 
     QFile map_file (map);
     if (map_file.open(IO_ReadOnly)) {
 
         QString line; bool found = 0;
 
         map_file.readLine(line, 1024);
         while (!map_file.atEnd()) {
 
             if (line.find(QRegExp("^title\\s*=\\s*")) != -1) {
                 
                 keymaps->insertItem(line.right(line.length() - line.find(QChar('=')) - 1).stripWhiteSpace());
                 found = 1;
                 break;
             }
             map_file.readLine(line, 1024);
         }
         if (!found) keymaps->insertItem(map);
 
         map_file.close();
     }
 
     keymaps->setSelected(keymaps->count() - 1, true);
 }
 
 // ConfigDlg::removeMap() {{{1
 void ConfigDlg::removeMap() {