Merge branch 'master' into backbone

Conflicts:
	trunk/src/base/gui/MainWindow.cpp
	trunk/src/base/gui/TranslationWidget.cpp

diff --combined trunk/src/base/gui/MainWindow.cpp
index 850d625,4427411..c01f20d
--- 1/trunk/src/base/gui/MainWindow.cpp
--- 2/trunk/src/base/gui/MainWindow.cpp
+++ b/trunk/src/base/gui/MainWindow.cpp
@@@ -40,6 -40,8 +40,8 @@@ MainWindow::MainWindow(Backbone *backbo
      searchBarWidget = new SearchBarWidget(backbone);
      wordListWidget = new WordListWidget(backbone);
      translationWidget = new TranslationWidget(backbone, this);
+ 
+     searchBarWidget->setFocus();
      menuWidget = new MenuWidget(this);
  
  
@@@ -50,18 -52,16 +52,23 @@@
  
      ui->menuBar->addAction(menuWidget);
  
+ 
      connect(this, SIGNAL(searchWordList(QStringList)),
              searchBarWidget, SLOT(searchWordList(QStringList)));
  
 +    connect(backbone, SIGNAL(htmlReady()),
 +            translationWidget, SLOT(show()));
 +
 +    connect(backbone, SIGNAL(htmlReady()),
 +            searchBarWidget, SLOT(showIdle()));
 +
 +    connect(wordListWidget, SIGNAL(clicked(QModelIndex)),
 +            searchBarWidget, SLOT(showBusy()));
 +
+     connect(searchBarWidget, SIGNAL(enableMenu(bool)),
+             this, SLOT(enableMenu(bool)));
+ 
 -    connect(wordListWidget, SIGNAL(showTranslation(QList<Translation*>)),
 -            translationWidget, SLOT(show(QList<Translation*>)));
+ 
      ui->centralWidget->layout()->addWidget(wordListWidget);
      ui->centralWidget->layout()->addWidget(searchBarWidget);
  
@@@ -96,3 -96,8 +103,8 @@@ void MainWindow::closeOk() 
  void MainWindow::search(QStringList words) {
      emit searchWordList(words);
  }
+ 
+ void MainWindow::enableMenu(bool enabled) {
+     ui->menuBar->setVisible(enabled);
+     qDebug()<<enabled;
+ }

diff --combined trunk/src/base/gui/SearchBarWidget.cpp
index 8046bda,3165837..146bd39
--- 1/trunk/src/base/gui/SearchBarWidget.cpp
--- 2/trunk/src/base/gui/SearchBarWidget.cpp
+++ b/trunk/src/base/gui/SearchBarWidget.cpp
@@@ -41,6 -41,9 +41,9 @@@ SearchBarWidget::SearchBarWidget(Backbo
      connect(searchPushButton, SIGNAL(clicked()),
              this, SLOT(searchPushButtonClicked()));
  
+     connect(searchWordLineEdit, SIGNAL(returnPressed()),
+             this, SLOT(searchPushButtonClicked()));
+ 
      connect(historyNextToolButton, SIGNAL(clicked()),
              this, SLOT(historyNextToolButtonClicked()));
  
@@@ -64,6 -67,7 +67,7 @@@
      connect(backbone, SIGNAL(ready()),
              this, SLOT(searchFinished()));
  
+     searchWordLineEdit->setFocus();
  }
  
  SearchBarWidget::~SearchBarWidget() {
@@@ -76,12 -80,13 +80,13 @@@ void SearchBarWidget::initializeUI() 
      verticalLayout = new QVBoxLayout();
  
  
+ 
      searchPushButton = new QPushButton(tr("Search"));
-     searchPushButton->setMinimumWidth(200);
+     searchPushButton->setMinimumWidth(150);
  
  
      searchWordLineEdit = new QLineEdit();
-     searchWordLineEdit->setMinimumWidth(350);
+     searchWordLineEdit->setMinimumWidth(300);
      //create layout for lineEdit to have clear button on it
      QHBoxLayout* lineEditLayout = new QHBoxLayout;
      searchWordLineEdit->setLayout(lineEditLayout);
@@@ -97,23 -102,23 +102,23 @@@
  
      historyNextToolButton = new QToolButton();
      historyNextToolButton->setIcon(QIcon::fromTheme("general_forward"));
-     historyNextToolButton->setMaximumSize(
+    /* historyNextToolButton->setMaximumSize(
              historyNextToolButton->sizeHint().width()/2,
-             historyNextToolButton->sizeHint().height()/2);
+             historyNextToolButton->sizeHint().height()/2);*/
  
  
      historyPrevToolButton = new QToolButton();
      historyPrevToolButton->setIcon(QIcon::fromTheme("general_back"));
-     historyPrevToolButton->setMaximumSize(
+     /*historyPrevToolButton->setMaximumSize(
              historyPrevToolButton->sizeHint().width()/2,
-             historyPrevToolButton->sizeHint().height()/2);
+             historyPrevToolButton->sizeHint().height()/2);*/
  
  
      historyShowToolButton = new QToolButton();
      historyShowToolButton->setIcon(QIcon::fromTheme("general_back"));
-     historyShowToolButton->setMaximumSize(
+     /*historyShowToolButton->setMaximumSize(
              historyShowToolButton->sizeHint().width()/2,
-             historyShowToolButton->sizeHint().height()/2);
+             historyShowToolButton->sizeHint().height()/2);*/
  
      QPixmap p = historyShowToolButton->icon().pixmap(256);
      QMatrix m;
@@@ -151,6 -156,8 +156,8 @@@
                                Qt::AlignRight | Qt::AlignVCenter);
  
      verticalLayout->addLayout(horizontalLayout);
+ 
+ 
  }
  
  
@@@ -159,6 -166,7 +166,7 @@@ void SearchBarWidget::searchPushButtonC
          searchingProgressBar->hide();
          searchPushButton->setText(tr("Search"));
          setEnabled(true);
+         emit enableMenu(true);
          _isSearching = false;
          emit stopSearching();
      }
@@@ -166,6 -174,7 +174,7 @@@
          searchingProgressBar->show();
          searchPushButton->setText(tr("Stop"));
          setEnabled(false);
+         emit enableMenu(false);
          _isSearching = true;
          QStringList searchWord;
          searchWord << searchWordLineEdit->text();
@@@ -178,6 -187,7 +187,7 @@@ void SearchBarWidget::searchWordList(QS
          searchingProgressBar->show();
          searchPushButton->setText(tr("Stop"));
          setEnabled(false);
+         emit enableMenu(false);
          _isSearching = true;
          emit searchForTranslations(words);
      }
@@@ -190,27 -200,17 +200,26 @@@ void SearchBarWidget::setEnabled(bool e
      historyShowToolButton->setEnabled(enabled);
  }
  
 +void SearchBarWidget::showBusy() {
 +    searchingProgressBar->show();
 +    setEnabled(false);
 +}
 +
 +void SearchBarWidget::showIdle() {
 +    searchingProgressBar->hide();
 +    setEnabled(true);
 +}
  
  void SearchBarWidget::searchFinished() {
          searchingProgressBar->hide();
          searchPushButton->setText(tr("Search"));
          setEnabled(true);
+         emit enableMenu(true);
          _isSearching = false;
  }
  
  void SearchBarWidget::historyNextToolButtonClicked() {
  
-     CommonDictInterface*p = backbone->getPlugins()[0];
-     p->dictDialog()->addNewDictionary(this);
  }
  
  void SearchBarWidget::historyPrevToolButtonClicked() {

diff --combined trunk/src/base/gui/SearchBarWidget.h
index a502973,09fade5..474545c
--- 1/trunk/src/base/gui/SearchBarWidget.h
--- 2/trunk/src/base/gui/SearchBarWidget.h
+++ b/trunk/src/base/gui/SearchBarWidget.h
@@@ -52,6 -52,8 +52,8 @@@ Q_SIGNALS
      //! Request to stop all active searchings
      void stopSearching();
  
+     void enableMenu(bool);
+ 
  public Q_SLOTS:
      //! Enable or disable search word line edit and history buttons
      /*!
@@@ -61,8 -63,6 +63,8 @@@
      void setEnabled(bool enabled = true);
      void searchFinished();
      void searchWordList(QStringList);
 +    void showBusy();
 +    void showIdle();
  
  private Q_SLOTS:
      void clearSearchWordToolButtonClicked();

diff --combined trunk/src/base/gui/TranslationWidget.cpp
index 8aa99ad,25ef2d8..fc0ee6f
--- 1/trunk/src/base/gui/TranslationWidget.cpp
--- 2/trunk/src/base/gui/TranslationWidget.cpp
+++ b/trunk/src/base/gui/TranslationWidget.cpp
@@@ -22,10 -22,11 +22,11 @@@
  //Created by Mateusz Półrola
  
  #include "TranslationWidget.h"
+ #include "TranslationWidgetAutoResizer.h"
  #include <QDebug>
  
  TranslationWidget::TranslationWidget(Backbone *backbone, QWidget *parent):
-     QWidget(parent) {
+     QScrollArea(parent) {
  
      this->backbone = backbone;
  
@@@ -37,45 -38,55 +38,51 @@@
  
      initializeUI();
  
-     connect(textEdit, SIGNAL(customContextMenuRequested(QPoint)),
-             this, SLOT(showContextMenu(QPoint)));
+    /* connect(textEdit, SIGNAL(customContextMenuRequested(QPoint)),
+             this, SLOT(showContextMenu(QPoint)));*/
  
      setWindowTitle(tr("Translation"));
  }
  
  
  void TranslationWidget::show() {
-     QWidget::show();
+     QScrollArea::show();
  
      textEdit->clear();
  
 +    QStringList translations = backbone->htmls();
 +
      QString trans;
 -    Translation* t;
 +    QString t;
      foreach(t, translations) {
 -        trans += t->toHtml() + "\n";
 +        trans += t + "\n";
      }
  
      textEdit->setPlainText(trans);
  
-     textEdit->repaint(this->rect());
+     textEdit->update(this->rect());
  }
  
  void TranslationWidget::initializeUI() {
-     contextMenu = new QMenu;
+     /*contextMenu = new QMenu;
  
      contextMenu->addAction(tr("Copy"), this, SLOT(copy()));
      contextMenu->addAction(tr("Paste"), this, SLOT(paste()));
-     contextMenu->addAction(tr("Select all"), this, SLOT(selectAll()));
+     contextMenu->addAction(tr("Select all"), this, SLOT(selectAll()));*/
  
      textEdit = new QTextEdit;
      textEdit->setReadOnly(true);
-     textEdit->setContextMenuPolicy(Qt::CustomContextMenu);
  
-     verticalLayout = new QVBoxLayout;
-     setLayout(verticalLayout);
+     new TranslationWidgetAutoResizer(textEdit);
+ 
+     QWidget*w = new QWidget;
+     verticalLayout = new QVBoxLayout(w);
      verticalLayout->addWidget(textEdit);
+ 
+     this->setWidget(w);
+     this->setWidgetResizable(true);
+ 
+ 
  }
  
  void TranslationWidget::showContextMenu(QPoint pos) {

diff --combined trunk/src/base/gui/TranslationWidget.h
index 919445a,7755e3c..acb8f88
--- 1/trunk/src/base/gui/TranslationWidget.h
--- 2/trunk/src/base/gui/TranslationWidget.h
+++ b/trunk/src/base/gui/TranslationWidget.h
@@@ -33,7 -33,7 +33,7 @@@
  /*!
      Display many translation of word, formatted as html.
  */
- class TranslationWidget : public QWidget {
+ class TranslationWidget : public QScrollArea {
      Q_OBJECT
  public:
      explicit TranslationWidget(Backbone* backbone, QWidget *parent = 0);
@@@ -43,6 -43,7 +43,6 @@@ Q_SIGNALS
  public Q_SLOTS:
      //! Request to show translation of word passed as QModelIndex from word list
      void show();
 -    void show(QList<Translation*>);
  
  private Q_SLOTS:
      void showContextMenu(QPoint pos);