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

diff --combined src/plugins/xdxf/XdxfDialog.cpp
index f89b92b,cdabb31..b92206f
--- 1/src/plugins/xdxf/XdxfDialog.cpp
--- 2/src/plugins/xdxf/XdxfDialog.cpp
+++ b/src/plugins/xdxf/XdxfDialog.cpp
@@@ -87,23 -87,22 +87,22 @@@ void XdxfDialog::initializeUI() 
  
          browseLayout = new QHBoxLayout;
  
-         QHBoxLayout* buttonLayout = new QHBoxLayout;
+         QVBoxLayout* buttonLayout = new QVBoxLayout;
          browseButton = new QPushButton(tr("Browse"));
-         browseButton->setMaximumWidth(100);
+         browseButton->setMaximumWidth(150);
  
          downloadButton = new QPushButton(tr("Download"));
          downloadButton->setMaximumWidth(150);
  
          infoLayout = new QHBoxLayout;
-         infoLayout->addWidget(infoLabel,0,Qt::AlignLeft);
          infoLabel->setText(tr("Dictionary file: not selected"));
  
+         browseLayout->addWidget(infoLabel,0,Qt::AlignLeft);
          browseLayout->addLayout(buttonLayout);
-         buttonLayout->addWidget(browseButton);
-         buttonLayout->addWidget(downloadButton);
+         buttonLayout->addWidget(browseButton,0,Qt::AlignLeft);
+         buttonLayout->addWidget(downloadButton,0,Qt::AlignLeft);
  
          mainVerticalLayout->addLayout(browseLayout);
-         mainVerticalLayout->addLayout(infoLayout);
      }
      else {
          setWindowTitle(tr("XDXF Settings"));
@@@ -187,7 -186,7 +186,7 @@@
          scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
      #else
          if(type==New) {
-             infoLabel->setMinimumWidth(550);
+             infoLabel->setMinimumWidth(250);
              setMinimumSize(sizeHint().width()*1.5, sizeHint().height()*1.2);
              setMaximumSize(sizeHint().width()*1.7, sizeHint().height()*1.5);
              scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
@@@ -199,7 -198,7 +198,7 @@@
      setLayout(layout);
  
      #ifndef Q_WS_MAEMO_5
-         setMinimumSize(600,200);
+         setMinimumSize(385,200);
      #else
          setMinimumHeight(350);
      #endif
@@@ -245,6 -244,7 +244,6 @@@ void XdxfDialog::selectFile() 
  }
  
  void XdxfDialog::downloadFile() {
 -   qDebug()<<"a";
     XdxfPlugin::dictDownloader.download(this);
  }