Merge branch 'master' into backbone

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

diff --cc 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
@@@ -53,15 -56,12 +56,19 @@@ MainWindow::MainWindow(Backbone *backbo
      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);
  

diff --cc trunk/src/base/gui/SearchBarWidget.cpp
Simple merge

diff --cc trunk/src/base/gui/SearchBarWidget.h
Simple merge

diff --cc 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
@@@ -45,7 -46,12 +46,7 @@@ TranslationWidget::TranslationWidget(Ba
  
  
  void TranslationWidget::show() {
-     QWidget::show();
+     QScrollArea::show();
 -}
 -
 -void TranslationWidget::show(QList<Translation*> translations) {
 -
 -    show();
  
      textEdit->clear();
  
@@@ -59,7 -63,8 +60,7 @@@
  
      textEdit->setPlainText(trans);
  
-     textEdit->repaint(this->rect());
+     textEdit->update(this->rect());
 -
  }
  
  void TranslationWidget::initializeUI() {

diff --cc trunk/src/base/gui/TranslationWidget.h
Simple merge