Set minimum height for google settings dialog

diff --git a/trunk/src/plugins/google/src/GoogleSettingsDialog.cpp b/trunk/src/plugins/google/src/GoogleSettingsDialog.cpp
index 555a143..6a0194a 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(langFrom);
 
 
+    setMinimumHeight(370);
     #ifdef Q_WS_MAEMO_5
         changeLangButton=new
                          QPushButton(
@@ -77,6 +78,7 @@ GoogleSettingsDialog::GoogleSettingsDialog(QWidget *parent,
                    tr("To: ") + languages.key(langTo));
     verticalLayout->addWidget(infoLabel);
 
+
     langFromComboBox = new QComboBox;
     langToComboBox = new QComboBox;
     int i=0;
@@ -89,12 +91,19 @@ GoogleSettingsDialog::GoogleSettingsDialog(QWidget *parent,
         langFromComboBox->addItem(langs);
         i++;
     }
+    langToComboBox->setCurrentIndex(actualLangTo);
+    langFromComboBox->setCurrentIndex(actualLangFrom);
+
+
 
     verticalLayout->addWidget(connectInfoLabel);
+
     langFromLayout->addWidget(langFromLabel);
     langFromLayout->addWidget(langFromComboBox);
     langToLayout->addWidget(langToLabel);
     langToLayout->addWidget(langToComboBox);
+
+
     langLayout->addLayout(langFromLayout);
     langLayout->addLayout(langToLayout);
     changelangLayout->addLayout(langLayout);
@@ -102,8 +111,6 @@ GoogleSettingsDialog::GoogleSettingsDialog(QWidget *parent,
     verticalLayout->addLayout(changelangLayout);
 
 
-    langToComboBox->setCurrentIndex(actualLangTo);
-    langFromComboBox->setCurrentIndex(actualLangFrom);
 
     saveButton = new QPushButton(acceptButtonLabel);
     verticalLayout->addWidget(saveButton);
@@ -112,23 +119,30 @@ 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;
 
@@ -137,6 +151,7 @@ void GoogleSettingsDialog::changeLangButtonClicked() {
 
     _langTo=_langFrom;
     _langFrom=tempLangTo;
+
 }
 
 QString GoogleSettingsDialog::langFrom() {

diff --git a/trunk/src/plugins/google/src/GoogleSettingsDialog.h b/trunk/src/plugins/google/src/GoogleSettingsDialog.h
index 866bda2..c150efe 100644 (file)
--- a/trunk/src/plugins/google/src/GoogleSettingsDialog.h
+++ b/trunk/src/plugins/google/src/GoogleSettingsDialog.h
@@ -67,11 +67,12 @@ public:
     //! \return destination language code iso 639-2
     QString langTo();
 
-public slots:
+private slots:
     void activatedFrom(int);
     void activatedTo(int);
     void changeLangButtonClicked();
 
+
 private:
     QLabel* infoLabel;
     QLabel* langFromLabel;
@@ -79,6 +80,8 @@ private:
     QLabel* connectInfoLabel;
     QPushButton* saveButton;
     QPushButton* changeLangButton;
+
+
     QComboBox *langFromComboBox;
     QComboBox *langToComboBox;
 

diff --git a/trunk/src/plugins/google/src/src.pro b/trunk/src/plugins/google/src/src.pro
index 8d862e0..122e377 100644 (file)
--- a/trunk/src/plugins/google/src/src.pro
+++ b/trunk/src/plugins/google/src/src.pro
@@ -5,7 +5,7 @@
 #-------------------------------------------------
 
 QT       += core xml gui network
-
+maemo5:QT += maemo5
 
 TARGET = GooglePlugin
 TEMPLATE = lib