delete cache file when path to dictionawy will be change

diff --git a/trunk/src/includes/CommonDictInterface.h b/trunk/src/includes/CommonDictInterface.h
index e820e48..c5dcdd9 100644 (file)
--- a/trunk/src/includes/CommonDictInterface.h
+++ b/trunk/src/includes/CommonDictInterface.h
@@ -95,7 +95,7 @@ class CommonDictInterface : public QObject, public AccentsNormalizer {
     /*! plugin should delete any files (eg. cache) that has created and be ready
         to be deleted
         */
-    virtual void clean() {};
+    virtual void clean() {}
 
  public Q_SLOTS:
     /*! performs search in dictionary

diff --git a/trunk/src/plugins/google/src/GooglePlugin.cpp b/trunk/src/plugins/google/src/GooglePlugin.cpp
index 5061e19..d05b1cc 100644 (file)
--- a/trunk/src/plugins/google/src/GooglePlugin.cpp
+++ b/trunk/src/plugins/google/src/GooglePlugin.cpp
@@ -153,7 +153,7 @@ CommonDictInterface* GooglePlugin::getNew(const Settings* settings) const {
 
 
 QString GooglePlugin::search(QString) {
-    qDebug() << "function is not used on this plagin";
+    qDebug() << "function is not used this plugin";
     return QString("");
 }
 
@@ -299,64 +299,64 @@ void GooglePlugin::stop() {
 
 QMap<QString, QString> GooglePlugin::initLanguages() {
     QMap<QString, QString> languages;
-    languages["AFRIKAANS"] = "af";
-    languages["ALBANIAN"] = "sq";
-    languages["ARABIC"] = "ar";
-    languages["ARMENIAN"] = "hy";
-    languages["AZERBAIJANI"] = "az";
-    languages["BASQUE"] = "eu";
-    languages["BELARUSIAN"] = "be";
-    languages["BULGARIAN"] = "bg";
-    languages["CATALAN"] = "ca";
-    languages["CHINESE"] = "zh";
-    languages["CROATIAN"] = "hr";
-    languages["CZECH"] = "cs";
-    languages["DANISH"] = "da";
-    languages["DUTCH"] = "nl";
-    languages["ENGLISH"] = "en";
-    languages["ESTONIAN"] = "et";
-    languages["FILIPINO"] = "tl";
-    languages["FINNISH"] = "fi";
-    languages["FRENCH"] = "fr";
-    languages["GALICIAN"] = "gl";
-    languages["GEORGIAN"] = "ka";
-    languages["GERMAN"] = "de";
-    languages["GREEK"] = "el";
-    languages["HAITIAN_CREOLE"] = "ht";
-    languages["HEBREW"] = "iw";
-    languages["HINDI"] = "hi";
-    languages["HUNGARIAN"] = "hu";
-    languages["ICELANDIC"] = "is";
-    languages["INDONESIAN"] = "id";
-    languages["IRISH"] = "ga";
-    languages["ITALIAN"] = "it";
-    languages["JAPANESE"] = "ja";
-    languages["KOREAN"] = "ko";
-    languages["LATVIAN"] = "lv";
-    languages["LITHUANIAN"] = "lt";
-    languages["MACEDONIAN"] = "mk";
-    languages["MALAY"] = "ms";
-    languages["MALTESE"] = "mt";
-    languages["NORWEGIAN"] = "no";
-    languages["PERSIAN"] = "fa";
-    languages["POLISH"] = "pl";
-    languages["PORTUGUESE"] = "pt";
-    languages["ROMANIAN"] = "ro";
-    languages["RUSSIAN"] = "ru";
-    languages["SERBIAN"] = "sr";
-    languages["SLOVAK"] = "sk";
-    languages["SLOVENIAN"] = "sl";
-    languages["SPANISH"] = "es";
-    languages["SWAHILI"] = "sw";
-    languages["SWEDISH"] = "sv";
-    languages["THAI"] = "th";
-    languages["TURKISH"] = "tr";
-    languages["UKRAINIAN"] = "uk";
-    languages["URDU"] = "ur";
-    languages["VIETNAMESE"] = "vi";
-    languages["WELSH"] = "cy";
-    languages["YIDDISH"] = "yi";
-    languages["DETECT LANGLAGE"] = "";
+    languages["Afrikaans"] = "af";
+    languages["Albanian"] = "sq";
+    languages["Arabic"] = "ar";
+    languages["Armenian"] = "hy";
+    languages["Azerbaijani"] = "az";
+    languages["Basque"] = "eu";
+    languages["Belarusian"] = "be";
+    languages["Bulgarian"] = "bg";
+    languages["Catalan"] = "ca";
+    languages["Chinese"] = "zh";
+    languages["Croatian"] = "hr";
+    languages["Czech"] = "cs";
+    languages["Danish"] = "da";
+    languages["Dutch"] = "nl";
+    languages["English"] = "en";
+    languages["Estonian"] = "et";
+    languages["Filipino"] = "tl";
+    languages["Finnish"] = "fi";
+    languages["French"] = "fr";
+    languages["Galician"] = "gl";
+    languages["Georgian"] = "ka";
+    languages["German"] = "de";
+    languages["Greek"] = "el";
+    languages["Haitian_creole"] = "ht";
+    languages["Hebrew"] = "iw";
+    languages["Hindi"] = "hi";
+    languages["Hungarian"] = "hu";
+    languages["Icelandic"] = "is";
+    languages["Indonesian"] = "id";
+    languages["Irish"] = "ga";
+    languages["Italian"] = "it";
+    languages["Japanese"] = "ja";
+    languages["Korean"] = "ko";
+    languages["Latvian"] = "lv";
+    languages["Lithuanian"] = "lt";
+    languages["Macedonian"] = "mk";
+    languages["Malay"] = "ms";
+    languages["Maltese"] = "mt";
+    languages["Norwegian"] = "no";
+    languages["Persian"] = "fa";
+    languages["Polish"] = "pl";
+    languages["Portuguese"] = "pt";
+    languages["Romanian"] = "ro";
+    languages["Russian"] = "ru";
+    languages["Serbian"] = "sr";
+    languages["Slovak"] = "sk";
+    languages["Slovenian"] = "sl";
+    languages["Spanish"] = "es";
+    languages["Swahili"] = "sw";
+    languages["Swedish"] = "sv";
+    languages["Thai"] = "th";
+    languages["Turkish"] = "tr";
+    languages["Ukrainian"] = "uk";
+    languages["Urdu"] = "ur";
+    languages["Vietnamese"] = "vi";
+    languages["Welsh"] = "cy";
+    languages["Yiddish"] = "yi";
+    languages["Detect langlage"] = "";
 //    languages["AMHARIC"] = "am";
 //    languages["BENGALI"] = "bn";
 //    languages["BIHARI"] = "bh";

diff --git a/trunk/src/plugins/google/src/GooglePlugin.h b/trunk/src/plugins/google/src/GooglePlugin.h
index 69b0e35..280ad57 100644 (file)
--- a/trunk/src/plugins/google/src/GooglePlugin.h
+++ b/trunk/src/plugins/google/src/GooglePlugin.h
@@ -122,9 +122,9 @@ public slots:
     void done();
 
     QString jsonParse(QString result);
+    void getDictionaryInfo();
 
 private:
-    void getDictionaryInfo();
     QMap<QString, QString> languages;
     QString _name;
     //! type of a dictionary

diff --git a/trunk/src/plugins/google/src/GoogleSettingsDialog.cpp b/trunk/src/plugins/google/src/GoogleSettingsDialog.cpp
index c4fc2b7..80b2d53 100644 (file)
--- a/trunk/src/plugins/google/src/GoogleSettingsDialog.cpp
+++ b/trunk/src/plugins/google/src/GoogleSettingsDialog.cpp
@@ -26,17 +26,11 @@
 #include "GoogleSettingsDialog.h"
 #include <QDebug>
 
-<<<<<<< HEAD
-GoogleSettingsDialog::GoogleSettingsDialog(QWidget *parent,Settings *pluginSettings) :
-    QDialog(parent)
-{
-=======
 GoogleSettingsDialog::GoogleSettingsDialog(QWidget *parent,
-                                           QString langTo,
-                                           QString langFrom,
+                                           Settings *pluginSettings,
                                            QString acceptButtonLabel) :
-    QDialog(parent) {
->>>>>>> master
+                                           QDialog(parent)
+{
     QMap<QString, QString> languages;
     languages=GooglePlugin::initLanguages();
 
@@ -65,24 +59,8 @@ GoogleSettingsDialog::GoogleSettingsDialog(QWidget *parent,
     langToLabel = new QLabel(" To: ");
     connectInfoLabel = new QLabel(tr("Google plugin make use of internet "
                                      "conection, so it may cost You."));
-<<<<<<< HEAD
-    infoLabel = new QLabel(tr("Plugin:GoogleTranslator \n From: %1 \n To: %2").arg(
-                            _langFrom,_langTo));
-    verticalLayout = new QVBoxLayout(this);
-    langLayout = new QVBoxLayout(this);
-    langFromLayout = new QHBoxLayout(this);
-    langToLayout = new QHBoxLayout(this);
-    changelangLayout = new QHBoxLayout(this);
-    langFromComboBox = new QComboBox(this);
-    langToComboBox = new QComboBox(this);
-    saveButton = new QPushButton(tr("Save settings"),this);
-
-    connectInfoLabel->setWordWrap(true);
 
-=======
     connectInfoLabel->setWordWrap(true);
-
-
     setWindowTitle(tr("Google Settings"));
 
     verticalLayout = new QVBoxLayout;
@@ -95,13 +73,13 @@ GoogleSettingsDialog::GoogleSettingsDialog(QWidget *parent,
 
     infoLabel = new QLabel;
     infoLabel->setText(tr("Plugin:GoogleTranslator \n")+
-                   tr("From: ") + languages.key(langFrom) + "\n" +
-                   tr("To: ") + languages.key(langTo));
+                   tr("From: ") + _langFrom + "\n" +
+                   tr("To: ") + _langTo);
     verticalLayout->addWidget(infoLabel);
 
     langFromComboBox = new QComboBox;
     langToComboBox = new QComboBox;
->>>>>>> master
+
     int i=0;
     foreach(QString langs,languages.keys()){
         if(langs==_langTo)
@@ -116,8 +94,6 @@ GoogleSettingsDialog::GoogleSettingsDialog(QWidget *parent,
     langFromComboBox->setCurrentIndex(actualLangFrom);
 
     setWindowTitle(tr("Google Settings"));
-    setLayout(verticalLayout);
-    verticalLayout->addWidget(infoLabel);
     verticalLayout->addWidget(connectInfoLabel);
     langFromLayout->addWidget(langFromLabel);
     langFromLayout->addWidget(langFromComboBox);
@@ -128,15 +104,8 @@ GoogleSettingsDialog::GoogleSettingsDialog(QWidget *parent,
     changelangLayout->addLayout(langLayout);
     changelangLayout->addWidget(changeLangButton);
     verticalLayout->addLayout(changelangLayout);
-<<<<<<< HEAD
-=======
-
-
-    langToComboBox->setCurrentIndex(actualLangTo);
-    langFromComboBox->setCurrentIndex(actualLangFrom);
 
     saveButton = new QPushButton(acceptButtonLabel);
->>>>>>> master
     verticalLayout->addWidget(saveButton);
 
     setModal(true);
@@ -176,34 +145,19 @@ QString GoogleSettingsDialog::langTo() {
     return _langTo;
 }
 
-<<<<<<< HEAD
-Settings* GoogleSettingsDialog::getSettings(QWidget *parent,Settings *pluginSettings) {
-    GoogleSettingsDialog settingsDialog(parent,pluginSettings);
-=======
 Settings* GoogleSettingsDialog::getSettings(QWidget *parent,
-                                            QString langTo,
-                                            QString langFrom,
-                                            QString acceptButtonLabel) {
-    GoogleSettingsDialog settingsDialog(parent,
-                                        langTo,
-                                        langFrom,
-                                        acceptButtonLabel);
->>>>>>> master
+                                            Settings *pluginSettings,
+                                             QString acceptButtonLabel) {
+    GoogleSettingsDialog settingsDialog(parent,pluginSettings,acceptButtonLabel);
+
     QMap<QString, QString> languages;
     languages=GooglePlugin::initLanguages();
     if(settingsDialog.exec()==QDialog::Accepted) {
         Settings *settings = new Settings();
-<<<<<<< HEAD
         settings->setValue("lang_to",languages.value(settingsDialog.langTo()));
         settings->setValue("lang_from",languages.value(settingsDialog.langFrom()));
         settings->setValue("connection_accept","true");
         settings->setValue("type","google");
-=======
-        settings->setValue("langTo",languages.value(settingsDialog.langTo()));
-        settings->setValue("langFrom",
-                           languages.value(settingsDialog.langFrom()));
-        settings->setValue("connectionAccept","true");
->>>>>>> master
         return settings;
     }
     return 0;
@@ -212,14 +166,7 @@ Settings* GoogleSettingsDialog::getSettings(QWidget *parent,
 void GoogleSettingsDialog::changeSettings(GooglePlugin* plugin,
                                           QWidget *parent) {
     Settings *settings = new Settings();
-<<<<<<< HEAD
-    settings=getSettings(parent,plugin->settings());
-=======
-    settings=getSettings(parent,
-                         plugin->settings()->value("langTo"),
-                         plugin->settings()->value("langFrom"),
-                         tr("Save changes"));
->>>>>>> master
+    settings=getSettings(parent,plugin->settings(),tr("Save changes"));
     if(settings)
         plugin->setSettings(settings);
 }

diff --git a/trunk/src/plugins/google/src/GoogleSettingsDialog.h b/trunk/src/plugins/google/src/GoogleSettingsDialog.h
index 362ba54..c286ef9 100644 (file)
--- a/trunk/src/plugins/google/src/GoogleSettingsDialog.h
+++ b/trunk/src/plugins/google/src/GoogleSettingsDialog.h
@@ -38,14 +38,9 @@ class GoogleSettingsDialog : public QDialog
 {
     Q_OBJECT
 public:
-<<<<<<< HEAD
-    explicit GoogleSettingsDialog(QWidget *parent = 0,Settings *pluginSettings=0);
-=======
     explicit GoogleSettingsDialog(QWidget *parent = 0,
-                                  QString langTo ="",
-                                  QString langFrom ="",
+                                  Settings *pluginSettings=0,
                                   QString acceptButtonLabel = tr("Add"));
->>>>>>> master
 
     /*!
         \param parent parent widget on which will be displayed dialog
@@ -53,15 +48,9 @@ public:
         \param langFrom language witch is display in the comboBox as a startup item
         \returns function return settings to GooglePlugin
     */
-<<<<<<< HEAD
-    static Settings* getSettings(QWidget *parent,Settings *pluginSettings=0);
-=======
     static Settings* getSettings(QWidget *parent,
-                                 QString langTo ="",
-                                 QString langFrom ="",
+                                 Settings *pluginSettings=0,
                                  QString acceptButtonLabel = tr("Add"));
->>>>>>> master
-
     /*!
         function set a new settings in plugin;
         \param plugin plugin whose settings you will change

diff --git a/trunk/src/plugins/google/tests/test.cpp b/trunk/src/plugins/google/tests/test.cpp
index eb71e3f..36492bd 100644 (file)
--- a/trunk/src/plugins/google/tests/test.cpp
+++ b/trunk/src/plugins/google/tests/test.cpp
@@ -33,9 +33,16 @@ void GoogleTest::jsonParse() {
 
     QCOMPARE(plugin.jsonParse(test1),QString("kot<br/><pos>rzeczownik</pos>:kot, kotka, kociątko, złośliwa kobieta<br/><pos>czasownik</pos>:podnieść"));
     QCOMPARE(plugin.jsonParse(test2),QString("Go! wyjechać<br/><pos>czasownik</pos>:wyjechać, odchodzić, zgrzeszyć<br/><pos>wykrzyknik</pos>:Odejdź"));
+}
 
 
+void GoogleTest::getDictionaryInfo() {
+    GooglePlugin plugin;
+    plugin.setLangFrom("pl");
+    plugin.setLangTo("en");
+    plugin.getDictionaryInfo();
 
+    QCOMPARE(plugin.infoNote(),QString(" [Polish-English] (Google)" ));
 }
 
 QTEST_MAIN(GoogleTest)

diff --git a/trunk/src/plugins/google/tests/test.h b/trunk/src/plugins/google/tests/test.h
index 43a9f7d..50e6ee0 100644 (file)
--- a/trunk/src/plugins/google/tests/test.h
+++ b/trunk/src/plugins/google/tests/test.h
@@ -33,7 +33,7 @@
 
  private slots:
      void jsonParse();
-
+     void getDictionaryInfo();
  };
 
 

diff --git a/trunk/src/plugins/xdxf/src/xdxfplugin.cpp b/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
index 346dcb7..a59363b 100644 (file)
--- a/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
+++ b/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
@@ -41,7 +41,6 @@ XdxfPlugin::XdxfPlugin(QObject *parent) : CommonDictInterface(parent),
     connect(this, SIGNAL(updateCachingProgress(int,int)),
             cachingDialog, SLOT(updateCachingProgress(int,int)));
 
-
     _settings->setValue("type","xdxf");
 
     stopped = false;
@@ -56,7 +55,6 @@ XdxfPlugin::~XdxfPlugin() {
     delete cachingDialog;
 }
 
-
 QString XdxfPlugin::langFrom() const {   
     return _langFrom;
 }
@@ -290,6 +288,8 @@ DictDialog* XdxfPlugin::dictDialog() {
 }
 
 void XdxfPlugin::setPath(QString path){
+    if(this->path!=path && this->path!="" && _settings->value("cache_path")!="");
+        clean();
     this->path=path;
     _settings->setValue("path",path);
     //getDictionaryInfo();

diff --git a/trunk/src/plugins/xdxf/src/xdxfplugin.h b/trunk/src/plugins/xdxf/src/xdxfplugin.h
index a763327..1e9d0f5 100644 (file)
--- a/trunk/src/plugins/xdxf/src/xdxfplugin.h
+++ b/trunk/src/plugins/xdxf/src/xdxfplugin.h
@@ -98,12 +98,12 @@ public:
     void setSettings(Settings*);
 
     //! returns plugin icon
-    virtual QIcon* icon();
+    QIcon* icon();
 
     /*! plugin should delete any files (eg. cache) that has created and be ready
         to be deleted
         */
-    virtual void clean();
+    void clean();
 
 public Q_SLOTS:
     /*! performs search in dictionary