delete cache file when path to dictionawy will be change

[mdictionary] / trunk / src / plugins / google / src / GoogleSettingsDialog.cpp

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);
 }