Merge branch 'stardict' of ssh://drop.maemo.org/git/mdictionary into stardict

Conflicts:
	src/plugins/stardict/TranslationStarDict.cpp

diff --git a/src/mdictionary/gui/DictManagerWidget.cpp b/src/mdictionary/gui/DictManagerWidget.cpp
index 4353301..04aad2f 100644 (file)
--- a/src/mdictionary/gui/DictManagerWidget.cpp
+++ b/src/mdictionary/gui/DictManagerWidget.cpp
@@ -125,8 +125,15 @@ void DictManagerWidget::refreshDictsList() {
     while(i.hasNext()) {
         i.next();
         QListWidgetItem* item = new QListWidgetItem();
-        QString name = i.key()->langFrom() + " - " + i.key()->langTo() + " (" +
-                       i.key()->type() + " " + i.key()->name() + ")";
+        QString name;
+        if (i.key()->type() == "stardict") {
+            name = i.key()->name() + " (" + i.key()->type() + ")";
+        }
+        else {
+            name = i.key()->langFrom() + " - " + i.key()->langTo() +
+                   " (" + i.key()->type() + " " +
+                   i.key()->name() + ")";
+        }
         item->setText(name);
         item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
         if(i.value()) {

diff --git a/src/plugins/stardict/StarDictPlugin.cpp b/src/plugins/stardict/StarDictPlugin.cpp
index 8e27f51..a58d7a6 100644 (file)
--- a/src/plugins/stardict/StarDictPlugin.cpp
+++ b/src/plugins/stardict/StarDictPlugin.cpp
@@ -38,7 +38,7 @@ StarDictPlugin::StarDictPlugin(QObject *parent) : CommonDictInterface(parent),
 
 
     _settings->setValue("type","stardict");
-    _icon = QIcon("/usr/share/mdictionary/xdxf.png");
+    _icon = QIcon("/usr/share/mdictionary/stardict.png");
     _wordsCount = -1;
     stopped = false;
 
@@ -236,6 +236,8 @@ bool StarDictPlugin::getDictionaryInfo() {
         }
     }
 
+    _name = settings()->value("bookname");
+
     return true;
 }
 

diff --git a/src/plugins/stardict/TranslationStarDict.cpp b/src/plugins/stardict/TranslationStarDict.cpp
index f6720d3..a95f285 100644 (file)
--- a/src/plugins/stardict/TranslationStarDict.cpp
+++ b/src/plugins/stardict/TranslationStarDict.cpp
@@ -64,9 +64,10 @@ QString TranslationStarDict::toXml() const {
     QString result("");
     if(!starDictPlugin)
         return result;
+
     qDebug() << "asdf";
     for(int i = 0; i < offsets.size(); i++) {
-        result=result + "<dict> <info path=\"/usr/share/mdictionary/xdxf.png\" ";
+        result=result + "<dict> <info path=\"/usr/share/mdictionary/stardict.png\" ";
         if(isBookmark())
             result+= " bookmark=\"true\" > \n";
         else

diff --git a/src/plugins/stardict/stardict.png b/src/plugins/stardict/stardict.png
new file mode 100644 (file)
index 0000000..19ab37c
Binary files /dev/null and b/src/plugins/stardict/stardict.png differ

diff --git a/src/plugins/stardict/stardict.pro b/src/plugins/stardict/stardict.pro
index 7401341..8ae6fe1 100644 (file)
--- a/src/plugins/stardict/stardict.pro
+++ b/src/plugins/stardict/stardict.pro
@@ -47,7 +47,7 @@ unix {
 
 
   plugin-icon.path = $$DATA_DIR
-  plugin-icon.files += xdxf.png
+  plugin-icon.files += stardict.png
 }
 
 check.commands = echo 'No check here'

diff --git a/src/plugins/stardict/xdxf.png b/src/plugins/stardict/xdxf.png
deleted file mode 100644 (file)
index 3d87cf4..0000000
Binary files a/src/plugins/stardict/xdxf.png and /dev/null differ