delete unnecessary variable

[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 b9183e9..f35f017 100644 (file)
--- a/trunk/src/plugins/google/src/GoogleSettingsDialog.cpp
+++ b/trunk/src/plugins/google/src/GoogleSettingsDialog.cpp
@@ -26,7 +26,7 @@
 #include "GoogleSettingsDialog.h"
 #include <QDebug>
 
-GoogleSettingsDialog::GoogleSettingsDialog(QWidget *parent,QString langTo,QString langFrom) :
+GoogleSettingsDialog::GoogleSettingsDialog(QWidget *parent,Settings *pluginSettings) :
     QDialog(parent)
 {
     QMap<QString, QString> languages;
@@ -35,26 +35,27 @@ GoogleSettingsDialog::GoogleSettingsDialog(QWidget *parent,QString langTo,QStrin
     int actualLangTo=1;
     int actualLangFrom=1;
 
-    if(langTo=="")
-        langTo="pl";
-    if(langFrom=="")
-        langFrom="en";
-
-    _langTo=languages.key(langTo);
-    _langFrom=languages.key(langFrom);
+    if(pluginSettings==0) {
+        _langTo=languages.key("pl");
+        _langFrom=languages.key("en");
+    }
+    else {
+        _langTo=languages.key(pluginSettings->value("lang_to"));
+        _langFrom=languages.key(pluginSettings->value("lang_from"));
+    }
 
     #ifdef Q_WS_MAEMO_5
         changeLangButton=new QPushButton(QIcon::fromTheme("general_refresh"),tr(""));
     #else
         changeLangButton=new QPushButton(QIcon::fromTheme("object-flip-vertical"),tr(""));
     #endif
+
     langFromLabel = new QLabel("From:");
     langToLabel = new QLabel(" To: ");
     connectInfoLabel = new QLabel(tr("Google plugin make use of internet "
                                      "conection, so it may cost You."));
-    infoLabel = new QLabel(tr("Plugin:GoogleTranslator \n")+
-                   tr("From: ") + languages.key(langFrom) + "\n" +
-                   tr("To: ") + languages.key(langTo));
+    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);
@@ -68,9 +69,9 @@ GoogleSettingsDialog::GoogleSettingsDialog(QWidget *parent,QString langTo,QStrin
 
     int i=0;
     foreach(QString langs,languages.keys()){
-        if(langs==languages.key(langTo))
+        if(langs==_langTo)
             actualLangTo=i;
-        if(langs==languages.key(langFrom))
+        if(langs==_langFrom)
             actualLangFrom=i;
         langToComboBox->addItem(langs);
         langFromComboBox->addItem(langs);
@@ -127,15 +128,16 @@ QString GoogleSettingsDialog::langTo() {
     return _langTo;
 }
 
-Settings* GoogleSettingsDialog::getSettings(QWidget *parent,QString langTo,QString langFrom) {
-    GoogleSettingsDialog settingsDialog(parent,langTo,langFrom);
+Settings* GoogleSettingsDialog::getSettings(QWidget *parent,Settings *pluginSettings) {
+    GoogleSettingsDialog settingsDialog(parent,pluginSettings);
     QMap<QString, QString> languages;
     languages=GooglePlugin::initLanguages();
     if(settingsDialog.exec()==QDialog::Accepted) {
         Settings *settings = new Settings();
-        settings->setValue("langTo",languages.value(settingsDialog.langTo()));
-        settings->setValue("langFrom",languages.value(settingsDialog.langFrom()));
-        settings->setValue("connectionAccept","true");
+        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");
         return settings;
     }
     return 0;
@@ -143,7 +145,7 @@ Settings* GoogleSettingsDialog::getSettings(QWidget *parent,QString langTo,QStri
 
 void GoogleSettingsDialog::changeSettings(GooglePlugin* plugin, QWidget *parent) {
     Settings *settings = new Settings();
-    settings=getSettings(parent,plugin->settings()->value("langTo"),plugin->settings()->value("langFrom"));
+    settings=getSettings(parent,plugin->settings());
     if(settings)
         plugin->setSettings(settings);
 }