fixed bug where it adds blank lines to the keymap list

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
@@ -120,245 +120,248 @@ ConfigDlg::ConfigDlg () : QTabWidget ()
     bool pick_open = config.readBoolEntry ("usePickboard", (bool)0); // default closed
     if (pick_open) {
 
         pick_button->setChecked(true);
     }
 
     // by connecting it after checking it, the signal isn't emmited
     connect (pick_button, SIGNAL(clicked()), this, SLOT(pickTog()));
 
     repeat_button = new QCheckBox(tr("Key Repeat"), other_grid);
     bool repeat_on = config.readBoolEntry ("useRepeat", (bool)1);
 
     if (repeat_on) {
 
         repeat_button->setChecked(true);
     }
     connect (repeat_button, SIGNAL(clicked()), this, SLOT(repeatTog()));
 
 
     /*
      * 'color' tab
      */
 
     QGrid *color_box = new QGrid(2, this);
     color_box->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed));
     color_box->setMargin(3);
     color_box->setSpacing(3);
     addTab(color_box, tr("Colors"));
 
     QLabel *label;
     QStringList color;
     config.setGroup("colors");
 
     label = new QLabel(tr("Key Color"), color_box);
     keycolor_button = new QPushButton(color_box);
     connect(keycolor_button, SIGNAL(clicked()), SLOT(keyColorClicked()));
     keycolor_button->setFlat((bool)1);
     color = config.readListEntry("keycolor", QChar(','));
     /*
      * hopefully not required
 
     if (color.isEmpty()) {
         color = QStringList::split(",", "240,240,240");
         config.writeEntry("keycolor", color.join(","));
 
     }
     */
     keycolor_button->setBackgroundColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt()));
 
 
     label = new QLabel(tr("Key Pressed Color"), color_box);
     keycolor_pressed_button = new QPushButton(color_box);
     connect(keycolor_pressed_button, SIGNAL(clicked()), SLOT(keyColorPressedClicked()));
     keycolor_pressed_button->setFlat((bool)1);
     color = config.readListEntry("keycolor_pressed", QChar(','));
     keycolor_pressed_button->setBackgroundColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt()));
 
     label = new QLabel(tr("Line Color"), color_box);
     keycolor_lines_button = new QPushButton(color_box);
     connect(keycolor_lines_button, SIGNAL(clicked()), SLOT(keyColorLinesClicked()));
     keycolor_lines_button->setFlat((bool)1);
     color = config.readListEntry("keycolor_lines", QChar(','));
     keycolor_lines_button->setBackgroundColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt()));
 
 
     label = new QLabel(tr("Text Color"), color_box);
     textcolor_button = new QPushButton(color_box);
     connect(textcolor_button, SIGNAL(clicked()), SLOT(textColorClicked()));
     textcolor_button->setFlat((bool)1);
     color = config.readListEntry("textcolor", QChar(','));
     textcolor_button->setBackgroundColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt()));
 
 
     label = new QLabel("", color_box); // a spacer so the above buttons dont expand
     label->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
 
 }
 
 void ConfigDlg::pickTog() {
 
     Config config ("multikey");
     config.setGroup ("general");
     config.writeEntry ("usePickboard", pick_button->isChecked()); // default closed
 
     emit pickboardToggled(pick_button->isChecked());
 }
 
 void ConfigDlg::repeatTog() {
 
     Config config ("multikey");
     config.setGroup ("general");
     config.writeEntry ("useRepeat", repeat_button->isChecked()); // default closed
 
     emit repeatToggled(repeat_button->isChecked());
 }
 
 // ConfigDlg::setMap {{{1
 
 /* 
  * the index is kinda screwy, because in the config file, index 0 is just the
  * first element in the QStringList, but here it's the "Current Language"
  * listItem. therefor you have to minus one to the index before you access it.
  *
  */
 
 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);
 
     custom_maps.remove(custom_maps[keymaps->currentItem() - default_maps.count()]);
 
     // write the changes
     Config config ("multikey");
     config.setGroup("keymaps");
     config.writeEntry("maps", custom_maps, QChar('|'));
 }
 
 /* ConfigDlg::slots for the color buttons {{{1
  *
  * these four slots are almost the same, except for the names. i was thinking
  * of making a map with pointers to the buttons and names of the configEntry
  * so it could be one slot, but then there would be no way of telling which 
  * of the buttons was clicked if they all connect to the same slot.
  *
  */
 
 void ConfigDlg::keyColorClicked() {
 
     Config config ("multikey");
     config.setGroup ("colors");
 
     QStringList color = config.readListEntry("keycolor", QChar(','));
 
     QColor newcolor = OColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt()));
 
     color[0].setNum(newcolor.red());
     color[1].setNum(newcolor.green());
     color[2].setNum(newcolor.blue());
 
     config.writeEntry("keycolor", color, QChar(','));
     config.write();
     
     keycolor_button->setBackgroundColor(newcolor);
     emit reloadKeyboard();
 }
 void ConfigDlg::keyColorPressedClicked() {
 
     Config config ("multikey");
     config.setGroup ("colors");
 
     QStringList color = config.readListEntry("keycolor_pressed", QChar(','));
 
     QColor newcolor = OColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt()));
 
     color[0].setNum(newcolor.red());
     color[1].setNum(newcolor.green());
     color[2].setNum(newcolor.blue());
 
     config.writeEntry("keycolor_pressed", color, QChar(','));
     config.write();
     
     keycolor_pressed_button->setBackgroundColor(newcolor);
     emit reloadKeyboard();
 }
 void ConfigDlg::keyColorLinesClicked() {
 
     Config config ("multikey");
     config.setGroup ("colors");
 
     QStringList color = config.readListEntry("keycolor_lines", QChar(','));
 
     QColor newcolor = OColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt()));
 
     color[0].setNum(newcolor.red());
     color[1].setNum(newcolor.green());
     color[2].setNum(newcolor.blue());
 
     config.writeEntry("keycolor_lines", color, QChar(','));
     config.write();
     
     keycolor_lines_button->setBackgroundColor(newcolor);
     emit reloadKeyboard();
 }
 void ConfigDlg::textColorClicked() {
 
     Config config ("multikey");
     config.setGroup ("colors");
 
     QStringList color = config.readListEntry("textcolor", QChar(','));
 
     QColor newcolor = OColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt()));
 
     color[0].setNum(newcolor.red());
     color[1].setNum(newcolor.green());
     color[2].setNum(newcolor.blue());
 
     config.writeEntry("textcolor", color, QChar(','));
     config.write();
     
     textcolor_button->setBackgroundColor(newcolor);
     emit reloadKeyboard();
 }