Caching dialog in xdxf is set to modal

[mdictionary] / src / plugins / xdxf / xdxfplugin.cpp

diff --git a/src/plugins/xdxf/xdxfplugin.cpp b/src/plugins/xdxf/xdxfplugin.cpp
index 9335759..ad0a0bb 100644 (file)
--- a/src/plugins/xdxf/xdxfplugin.cpp
+++ b/src/plugins/xdxf/xdxfplugin.cpp
@@ -25,16 +25,21 @@
 
 #include "xdxfplugin.h"
 #include <QDebug>
-#include "../../common/Notify.h"
+#include "../../include/Notify.h"
 
 XdxfPlugin::XdxfPlugin(QObject *parent) : CommonDictInterface(parent),
                     _langFrom(""), _langTo(""),_name(""), _infoNote("") {
     _settings = new Settings();
-    _dictDialog = new XdxfDictDialog(this);
+    _dictDialog = new XdxfDictDialog(this, this);
+
+    connect(_dictDialog, SIGNAL(notify(Notify::NotifyType,QString)),
+            this, SIGNAL(notify(Notify::NotifyType,QString)));
+
     cachingDialog = new XdxfCachingDialog(this);
 
+
     _settings->setValue("type","xdxf");
-    _icon = QIcon(":/icons/xdxf.png");
+    _icon = QIcon("/usr/share/mdictionary/xdxf.png");
     _wordsCount = -1;
     stopped = false;
 
@@ -45,6 +50,17 @@ XdxfPlugin::XdxfPlugin(QObject *parent) : CommonDictInterface(parent),
     initAccents();
 }
 
+void XdxfPlugin::retranslate() {
+    QString locale = QLocale::system().name();
+
+    QTranslator *translator = new QTranslator(this);
+
+    if(!translator->load(":/xdxf/translations/" + locale)) {
+        translator->load(":/xdxf/translations/en_US");
+    }
+    QCoreApplication::installTranslator(translator);
+}
+
 
 XdxfPlugin::~XdxfPlugin() {
     delete _settings;
@@ -74,7 +90,7 @@ QString XdxfPlugin::type() const {
 
 
 QString XdxfPlugin::infoNote() const {
-    return  _infoNote;
+    return _infoNote;
 }
 
 
@@ -133,7 +149,7 @@ QList<Translation*> XdxfPlugin::searchWordListCache(QString word, int limit) {
         if(ok) {  /*add key word to list*/
             translations.insert(new TranslationXdxf(
                     cur.value(0).toString().toLower(),
-                    _infoNote, this));
+                    _dictionaryInfo, this));
             i++;
         }
     }
@@ -184,7 +200,7 @@ QList<Translation*> XdxfPlugin::searchWordListFile(QString word, int limit) {
                 }
                 if(ok) {  /*add key word to list*/
                     translations<<(new TranslationXdxf(readKey.toLower(),
-                                    _infoNote,this));
+                                    _dictionaryInfo,this));
                     i++;
                 }
                 if(i>=limit && limit!=0)
@@ -310,11 +326,13 @@ DictDialog* XdxfPlugin::dictDialog() {
 
 CommonDictInterface* XdxfPlugin::getNew(const Settings *settings) const {
     XdxfPlugin *plugin = new XdxfPlugin();
-    if(settings && plugin->setSettings(settings))
+
+    if(settings && plugin->setSettings(settings)) {
         return plugin;
+    }
     else {
         delete plugin;
-        return new XdxfPlugin();
+        return 0;
     }
 }
 
@@ -324,24 +342,7 @@ bool XdxfPlugin::isAvailable() const {
 }
 
 
-void XdxfPlugin::setHash(uint _hash) {
-    this->_hash=_hash;
-}
-
-
-uint XdxfPlugin::hash() const {
-   return _hash;
-}
-
-
 Settings* XdxfPlugin::settings() {
-/*
-    Settings *returnSettings=new Settings;
-    QStringList list = _settings->keys();
-    foreach(QString key, list)
-            returnSettings->setValue(key,_settings->value(key));
-    return returnSettings;
-*/
     return _settings;
 }
 
@@ -357,12 +358,17 @@ bool XdxfPlugin::setSettings(const Settings *settings) {
     if(settings) {
         bool isPathChange=false;
         QString oldPath = _settings->value("path");
+        Settings *oldSettings =  new Settings ;
+
         if(oldPath != settings->value("path")) {
             if(oldPath!="" && _settings->value("cache_path")!="")
                 clean();
             isPathChange=true;
         }
 
+        foreach(QString key, _settings->keys())
+            oldSettings->setValue(key, _settings->value(key));
+
         foreach(QString key, settings->keys()) {
            if(key != "generateCache")
                _settings->setValue(key, settings->value(key));
@@ -372,6 +378,8 @@ bool XdxfPlugin::setSettings(const Settings *settings) {
             Q_EMIT notify(Notify::Warning,
                 QString(tr("XDXF file is in wrong format")));
             qDebug()<<"Error: xdxf file is in wrong format";
+            delete _settings;
+            _settings=oldSettings;
             return false;
         }
 
@@ -432,11 +440,9 @@ bool XdxfPlugin::getDictionaryInfo() {
     if(reader.name()=="description")
         _infoNote=reader.readElementText();
 
-    QString format = "png";
-    QString initialPath = QDir::currentPath() + "/xdxf." + format;
+    _dictionaryInfo= _name + " [" + _langFrom + "-"
+                + _langTo + "]";
 
-    _infoNote="path=\""+initialPath+"\"> \n" + _name + " [" + _langFrom + "-"
-                + _langTo + "] ( xdxf )";
     dictionaryFile.close();
     if(okFormat)
         return true;
@@ -480,7 +486,7 @@ int XdxfPlugin::countWords() {
 
 
 bool XdxfPlugin::makeCache(QString) {
-    cachingDialog->setVisible(true);
+    cachingDialog->show();
     QCoreApplication::processEvents();
     QFileInfo dictFileN(_settings->value("path"));
     QString cachePathN;
@@ -498,9 +504,6 @@ bool XdxfPlugin::makeCache(QString) {
     db_name = _settings->value("type") + cachePathN;
     db = QSqlDatabase::addDatabase("QSQLITE",db_name);
 
-    qDebug()<<QSqlDatabase::connectionNames().size();
-    foreach(QString name,QSqlDatabase::connectionNames())
-        qDebug()<<name;
     /*checke errors (File open and db open)*/
     QFile dictionaryFile(dictFileN.filePath());
     if (!QFile::exists(_settings->value("path"))
@@ -591,14 +594,14 @@ bool XdxfPlugin::makeCache(QString) {
     }
     cur.exec("END;");
     cur.exec("select count(*) from dict");
-    cachingDialog->setVisible(false);
+    //cachingDialog->hide();
 
     /*checke errors (wrong number of added words)*/
     countWords();
     if(!cur.next() || countWords() != cur.value(0).toInt()) {
         Q_EMIT updateCachingProgress(100, timer.restart());
         Q_EMIT notify(Notify::Warning,
-                QString(tr("Database caching error, please try againg.")));
+                QString(tr("Database caching error, please try again.")));
         db.close();
         return false;
     }