code clean

[mdictionary] / src / plugins / google / GooglePlugin.cpp

diff --git a/src/plugins/google/GooglePlugin.cpp b/src/plugins/google/GooglePlugin.cpp
index 2fcd0b5..3c3ff11 100644 (file)
--- a/src/plugins/google/GooglePlugin.cpp
+++ b/src/plugins/google/GooglePlugin.cpp
@@ -18,8 +18,10 @@
     Copyright 2010 Comarch S.A.
 
 *******************************************************************************/
+/*!
+    \file GooglePlugin.cpp
+    \brief Implementation of google plugin's main class.
 
-/*! \file GooglePlugin.cpp
     \author Jakub Jaszczynski <j.j.jaszczynski@gmail.com>
 */
 
@@ -27,6 +29,10 @@
 #include <QDebug>
 #include "GoogleDictDialog.h"
 
+QMap<QString, QString> GooglePlugin::languages;
+bool GooglePlugin::noNetworkErrorShowed = false;
+
+
 GooglePlugin::GooglePlugin(QObject *parent): CommonDictInterface(parent),
                     _name(""),_infoNote("") {
     _settings = new Settings();
@@ -35,26 +41,26 @@ GooglePlugin::GooglePlugin(QObject *parent): CommonDictInterface(parent),
     _settings->setValue("type","google");
     _settings->setValue("connection_accepted","true");
     _dictDialog = new GoogleDictDialog(this,this);
-    _icon = QIcon(":/icons/drawing.png");
+    _iconPath = "/usr/share/mdictionary/google.png";
+    _icon = QIcon(_iconPath);
 
     stopped = false;
-    languages=initLanguages();
+    initLanguages();
 
-    http = new QHttp(this);
+    http = new QHttp();
     connect(http, SIGNAL(done(bool)), this, SLOT(done()));
+    threa=new QThread();
+    http->moveToThread(threa);
+    threa->start();
 }
 
 void GooglePlugin::retranslate() {
     QString locale = QLocale::system().name();
-
-    QTranslator *googleTranslator = new QTranslator(this);
-
-    if(locale == "pl_PL")
-        googleTranslator->load(":/translations/dict_google_pl");
-    else
-        googleTranslator->load(":/translations/dict_google_en");
-
-    QCoreApplication::installTranslator(googleTranslator);
+    QTranslator *translator = new QTranslator(this);
+    if(!translator->load(":/google/translations/" + locale)) {
+        translator->load(":/google/translations/en_US");
+    }
+    QCoreApplication::installTranslator(translator);
 }
 
 
@@ -116,6 +122,7 @@ void GooglePlugin::setConnectionAccept(QString connectionAcepted) {
         _settings->setValue("connection_accepted","false");
 }
 
+
 bool GooglePlugin::isConnectionAccept() const {
     if(_settings->value("connection_accepted")=="true")
         return true;
@@ -124,23 +131,7 @@ bool GooglePlugin::isConnectionAccept() const {
 }
 
 
-uint GooglePlugin::hash() const {
-    return _hash;
-}
-
-
-void GooglePlugin::setHash(uint _hash) {
-    this->_hash=_hash;
-}
-
-
 Settings* GooglePlugin::settings() {
-/*    Settings *returnSettings=new Settings;
-    QStringList list = _settings->keys();
-    foreach(QString key, list)
-            returnSettings->setValue(key,_settings->value(key));
-    return returnSettings;
-*/
     return _settings;
 }
 
@@ -160,6 +151,10 @@ QIcon* GooglePlugin::icon() {
     return &_icon;
 }
 
+QString GooglePlugin::iconPath(){
+    return _iconPath;
+}
+
 
 CommonDictInterface* GooglePlugin::getNew(const Settings* settings) const {
     GooglePlugin *plugin = new GooglePlugin();
@@ -170,7 +165,7 @@ CommonDictInterface* GooglePlugin::getNew(const Settings* settings) const {
 
 
 QString GooglePlugin::search(QString) {
-    qDebug() << "function is not used in this plugin";
+    qDebug() << "function is not used in google plugin";
     return QString("");
 }
 
@@ -184,8 +179,10 @@ QList<Translation*> GooglePlugin::searchWordList(QString word, int ) {
     QList<Translation*> translations;
     if(isAvailable()) {
         QString error("");
-        word.replace("*","");   /*remove wildcard*/
-        word.replace("?","");
+        char wrongChar[]={"*?&<>"};
+        for(unsigned int a=0;a<sizeof(wrongChar);a++)    /*remove wrong char*/
+            word.replace(wrongChar[a],"");
+
         QString url=QString("/translate_a/t?client=t&sl=%1&tl=%2").arg(
                                               _settings->value("lang_from"),
                                               _settings->value("lang_to"));
@@ -202,14 +199,22 @@ QList<Translation*> GooglePlugin::searchWordList(QString word, int ) {
 
         wait=true;      /* bool - change in slot done (initiate by http) */
         stopped=false;  /* bool - change in slot stop (initiate in gui)  */
+        int lastState=0;
         http->request(head, data);
-        while(wait && (error=="" || error=="Unknown error") && !stopped)
+        while(wait && (error=="" || error=="Unknown error") && !stopped){
             error=http->errorString();
-
+            if(lastState!=http->state()) {
+                lastState=http->state();
+                if(lastState==0)
+                    done();
+            }
+        }
         if(error!="" && error!="Unknown error") {
-            qDebug()<<error;
-            Q_EMIT notify(Notify::Warning,
-                    tr("GooglePlugin: %1").arg(error));
+            if(!noNetworkErrorShowed) {
+                noNetworkErrorShowed = true;
+                Q_EMIT notify(Notify::Warning,
+                        tr("GooglePlugin: %1").arg(error));
+            }
         }
 
         QString text = QString::fromUtf8(http->readAll());
@@ -287,9 +292,8 @@ QString GooglePlugin::jsonParse(QString result) {
     }
     returnLang=list1.at(index*2+1);
     if(partOfSpeach.size()==0){
-        if(translation.toLower()==original.toLower()){
+        if(translation.toLower()==original.toLower())
             return QString(""); // word doesn't exist";
-        }
         else
             return "\""+translation+"\"";
     }
@@ -314,8 +318,9 @@ void GooglePlugin::stop() {
 }
 
 
-QMap<QString, QString> GooglePlugin::initLanguages() {
-    QMap<QString, QString> languages;
+void GooglePlugin::initLanguages() {
+    if(languages.count() != 0) return;
+
     languages["Afrikaans"] = "af";
     languages["Albanian"] = "sq";
     languages["Arabic"] = "ar";
@@ -423,14 +428,13 @@ QMap<QString, QString> GooglePlugin::initLanguages() {
 //    languages["TONGA"] = "to";
 //    languages["UZBEK"] = "uz";
 //    languages["UIGHUR"] = "ug";
-    return languages;  
 }
 
 
 void GooglePlugin::getDictionaryInfo() {
     QString fullLangFrom=languages.key(_settings->value("lang_from"));
     QString fullLangTo=languages.key(_settings->value("lang_to"));
-    _infoNote=" [" + fullLangFrom + "-" + fullLangTo + "] (Google)";
+    _infoNote=" [" + fullLangFrom + "-" + fullLangTo + "] ";
 }