2 files changed, 23 insertions, 2 deletions

diff --git a/inputmethods/multikey/configdlg.cpp b/inputmethods/multikey/configdlg.cpp
index c5ebe3c..f6507b4 100644
--- a/inputmethods/multikey/configdlg.cpp
+++ b/inputmethods/multikey/configdlg.cpp
@@ -276,33 +276,54 @@ void ConfigDlg::setMap(int index) {
         emit setMapToFile(custom_maps[index - default_maps.count() - 1]);
     }
 }
 
 // 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);
-    keymaps->insertItem(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);
 
 
     config.writeEntry("maps", maps, QChar('|'));
     config.writeEntry("current", map);
 
 }
 
 // ConfigDlg::removeMap() {{{1
 void ConfigDlg::removeMap() {
 
     // 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);
 
diff --git a/inputmethods/multikey/multikey.pro b/inputmethods/multikey/multikey.pro
index 9d76a3d..1171602 100644
--- a/inputmethods/multikey/multikey.pro
+++ b/inputmethods/multikey/multikey.pro
@@ -1,30 +1,30 @@
         TEMPLATE= lib
         CONFIG  += qt warn_on release
         HEADERS=   keyboard.h \
             configdlg.h \
             ../pickboard/pickboardcfg.h \
             ../pickboard/pickboardpicks.h \
             keyboardimpl.h 
         SOURCES=   keyboard.cpp \
             configdlg.cpp \
             ../pickboard/pickboardcfg.cpp \
             ../pickboard/pickboardpicks.cpp \
             keyboardimpl.cpp
         TARGET  = qmultikey
-        DESTDIR         = ../../plugins/inputmethods
+        DESTDIR         = $(OPIEDIR)/plugins/inputmethods
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += ../$(OPIEDIR)/include ../../launcher
 LIBS            += -lqpe
         VERSION         = 1.0.0
 
 TRANSLATIONS    = ../../i18n/pt_BR/libqmultikey.ts
 TRANSLATIONS   += ../../i18n/de/libqmultikey.ts
 TRANSLATIONS   += ../../i18n/en/libqmultikey.ts
 TRANSLATIONS   += ../../i18n/hu/libqmultikey.ts
 TRANSLATIONS   += ../../i18n/sl/libqmultikey.ts
 TRANSLATIONS   += ../../i18n/ja/libqmultikey.ts
 TRANSLATIONS   += ../../i18n/ko/libqmultikey.ts
 TRANSLATIONS   += ../../i18n/pl/libqmultikey.ts
 TRANSLATIONS   += ../../i18n/no/libqmultikey.ts
 TRANSLATIONS   += ../../i18n/zh_CN/libqmultikey.ts
 TRANSLATIONS   += ../../i18n/zh_TW/libqmultikey.ts