From: Bartosz Szatkowski <bulislaw@linux.com>
Date: Wed, 6 Oct 2010 08:34:06 +0000 (+0200)
Subject: Added searching for word list in stardict
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=cb4e15e67b3f19546bdd9afe31d19948ab47f99a;p=mdictionary

Added searching for word list in stardict
---

diff --git a/src/plugins/stardict/StarDialog.cpp b/src/plugins/stardict/StarDialog.cpp
index b6b4e78..9b4b001 100644
--- a/src/plugins/stardict/StarDialog.cpp
+++ b/src/plugins/stardict/StarDialog.cpp
@@ -197,7 +197,7 @@ void StarDialog::saveSettings() {
         foreach(QString key, plugin->settings()->keys())
             _settings->setValue(key, plugin->settings()->value(key));
     }
-    else {
+    //else {
         _settings->setValue("path", _dictionaryFilePath);
         _settings->setValue("ifoFileName", _dictName + ".ifo");
         _settings->setValue("idxFileName", _dictName + ".idx");
@@ -205,7 +205,7 @@ void StarDialog::saveSettings() {
         if (QFile::exists(_dictName + ".syn") == true) {
                 _settings->setValue("synFileName", _dictName + ".syn");
         }
-    }
+    //}
     if(_accents)
         _settings->setValue("strip_accents", "true");
     else
diff --git a/src/plugins/stardict/StarDictPlugin.cpp b/src/plugins/stardict/StarDictPlugin.cpp
index 452f9f5..50a7dd8 100644
--- a/src/plugins/stardict/StarDictPlugin.cpp
+++ b/src/plugins/stardict/StarDictPlugin.cpp
@@ -89,6 +89,7 @@ QString StarDictPlugin::infoNote() const {
 
 
 QList<Translation*> StarDictPlugin::searchWordList(QString word, int limit) {
+    qDebug() << "StarDict searachWordList" << word;
     QList<TranslationStarDict> translations;
     bool is32b = false;
     if(settings()->value("idxoffsetbits") == "32" ||
@@ -97,12 +98,11 @@ QList<Translation*> StarDictPlugin::searchWordList(QString word, int limit) {
 
     bool err = 0;
     int wordcount = settings()->value("wordcount").toInt(&err);
-    if(err)
+    if(!err)
         return QList<Translation*>();
 
     QString idxPath = settings()->value("idxFileName");
     StarDictReader * reader = StarDictReaderFactory::createReader(idxPath);
-
     QString fkey;
     qint64 offset = 0, len = 0;
     QRegExp keyword(word, Qt::CaseInsensitive, QRegExp::Wildcard);
@@ -162,7 +162,8 @@ CommonDictInterface* StarDictPlugin::getNew(const Settings *settings) const {
     connect(plugin, SIGNAL(notify(Notify::NotifyType,QString)),
             this, SIGNAL(notify(Notify::NotifyType,QString)));
 
-    ((StarDictDialog*)plugin->dictDialog())->setLastDialogParent(_dictDialog->lastDialogParent());
+    ((StarDictDialog*)plugin->dictDialog())->
+            setLastDialogParent(_dictDialog->lastDialogParent());
 
 
 
@@ -170,6 +171,7 @@ CommonDictInterface* StarDictPlugin::getNew(const Settings *settings) const {
 
         disconnect(plugin, SIGNAL(notify(Notify::NotifyType,QString)),
                 this, SIGNAL(notify(Notify::NotifyType,QString)));
+        plugin->getDictionaryInfo();
         return plugin;
     }
     else {
@@ -196,8 +198,10 @@ bool StarDictPlugin::isCached() {
 }
 
 
-bool StarDictPlugin::setSettings(const Settings *settings) {
-    if(settings) {
+bool StarDictPlugin::setSettings(const Settings *sett) {
+    if(sett) {
+        foreach(QString key, sett->keys())
+            _settings->setValue(key, sett->value(key));
 
     } else
         return false;