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

[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 0887429..cdadfe2 100644 (file)
--- a/trunk/src/plugins/google/src/GoogleSettingsDialog.cpp
+++ b/trunk/src/plugins/google/src/GoogleSettingsDialog.cpp
@@ -46,6 +46,7 @@ GoogleSettingsDialog::GoogleSettingsDialog(QWidget *parent,
         _langFrom=languages.key(pluginSettings->value("lang_from"));
     }
 
+    setMinimumHeight(370);
     #ifdef Q_WS_MAEMO_5
 
         changeLangButton=new QPushButton(
@@ -77,6 +78,7 @@ GoogleSettingsDialog::GoogleSettingsDialog(QWidget *parent,
                    tr("To: ") + _langTo);
     verticalLayout->addWidget(infoLabel);
 
+
     langFromComboBox = new QComboBox;
     langToComboBox = new QComboBox;
 
@@ -93,12 +95,17 @@ GoogleSettingsDialog::GoogleSettingsDialog(QWidget *parent,
     langToComboBox->setCurrentIndex(actualLangTo);
     langFromComboBox->setCurrentIndex(actualLangFrom);
 
+
+
     setWindowTitle(tr("Google Settings"));
     verticalLayout->addWidget(connectInfoLabel);
+
     langFromLayout->addWidget(langFromLabel);
     langFromLayout->addWidget(langFromComboBox);
     langToLayout->addWidget(langToLabel);
     langToLayout->addWidget(langToComboBox);
+
+
     langLayout->addLayout(langFromLayout);
     langLayout->addLayout(langToLayout);
     changelangLayout->addLayout(langLayout);
@@ -112,29 +119,37 @@ GoogleSettingsDialog::GoogleSettingsDialog(QWidget *parent,
 
     connect(saveButton, SIGNAL(clicked()),
             this, SLOT(accept()));
+
+
     connect(langFromComboBox, SIGNAL(activated(int)),
             this, SLOT(activatedFrom(int)));
     connect(langToComboBox, SIGNAL(activated(int)),
             this, SLOT(activatedTo(int)));
+
+
     connect(changeLangButton, SIGNAL(clicked()),
             this, SLOT(changeLangButtonClicked()));
 }
 
+
 void GoogleSettingsDialog::activatedFrom(int index) {
-    _langFrom=langFromComboBox->itemText(index);
+        _langFrom=langFromComboBox->itemText(index);
 }
 
 void GoogleSettingsDialog::activatedTo(int index) {
      _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() {