Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary

Conflicts:
	trunk/src/plugins/google/src/GoogleSettingsDialog.cpp

diff --cc trunk/src/plugins/google/src/GoogleSettingsDialog.cpp
index 6a0194a,f37fa53..041f4a0
--- 1/trunk/src/plugins/google/src/GoogleSettingsDialog.cpp
--- 2/trunk/src/plugins/google/src/GoogleSettingsDialog.cpp
+++ b/trunk/src/plugins/google/src/GoogleSettingsDialog.cpp
@@@ -37,20 -37,19 +37,20 @@@ GoogleSettingsDialog::GoogleSettingsDia
      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"));
+     }
  
 +    setMinimumHeight(370);
      #ifdef Q_WS_MAEMO_5
-         changeLangButton=new
-                          QPushButton(
-                                  QIcon::fromTheme("general_refresh"),tr(""));
+ 
+         changeLangButton=new QPushButton(
+                                  QIcon::fromTheme("general_refresh"), "");
      #else
          changeLangButton=new QPushButton(
                  QIcon::fromTheme("object-flip-vertical"),tr(""));
@@@ -74,18 -73,18 +74,19 @@@
  
      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;
+ 
      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);
@@@ -94,10 -93,8 +95,11 @@@
      langToComboBox->setCurrentIndex(actualLangTo);
      langFromComboBox->setCurrentIndex(actualLangFrom);
  
 +
 +
+     setWindowTitle(tr("Google Settings"));
      verticalLayout->addWidget(connectInfoLabel);
 +
      langFromLayout->addWidget(langFromLabel);
      langFromLayout->addWidget(langFromComboBox);
      langToLayout->addWidget(langToLabel);
@@@ -140,18 -128,13 +140,16 @@@ void GoogleSettingsDialog::activatedTo(
       _langTo=langToComboBox->itemText(index);
  }
  
 +
  void GoogleSettingsDialog::changeLangButtonClicked() {
 +
      int tempIndexTo=langToComboBox->currentIndex();
      QString tempLangTo=_langTo;
- 
      langToComboBox->setCurrentIndex(langFromComboBox->currentIndex());
      langFromComboBox->setCurrentIndex(tempIndexTo);
- 
      _langTo=_langFrom;
      _langFrom=tempLangTo;
 +
  }
  
  QString GoogleSettingsDialog::langFrom() {

diff --cc trunk/src/plugins/google/src/GoogleSettingsDialog.h
Simple merge