Merge branch 'gui'

Conflicts:
	trunk/src/base/backbone/backbone.h

diff --cc trunk/src/base/backbone/backbone.h
index 1c8165f,6600a45..aaace41
--- 1/trunk/src/base/backbone/backbone.h
--- 2/trunk/src/base/backbone/backbone.h
+++ b/trunk/src/base/backbone/backbone.h
@@@ -86,11 -77,11 +86,6 @@@ public
      //! \return maximum number of word that plugin could find
      int searchLimit() const;
  
-     /*! Performs search for final translation (html/xml) form
-       \param list of Translation* to be searched for
-       */
-     void searchHtml(QList<Translation*>);
- 
 -    //! \return number of active searches
 -    int activeSearches() const;
 -
 -
 -
      //! \return final translation (after searching for html)
      QStringList htmls();
  

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

diff --cc trunk/src/base/gui/SearchBarWidget.cpp
index 03eeda8,ba69183..afdceb4
--- 1/trunk/src/base/gui/SearchBarWidget.cpp
--- 2/trunk/src/base/gui/SearchBarWidget.cpp
+++ b/trunk/src/base/gui/SearchBarWidget.cpp
@@@ -60,25 -56,8 +56,11 @@@ SearchBarWidget::SearchBarWidget(QWidge
              this, SLOT(clearSearchWordToolButtonClicked()));
  
  
-     //connects request to backbone
-     connect(this, SIGNAL(searchForTranslations(QString)),
-             backbone, SLOT(search(QString)));
- 
-     connect(this, SIGNAL(stopSearching()),
-             backbone, SLOT(stopSearching()));
- 
-     connect(backbone, SIGNAL(ready()),
-             this, SLOT(setIdle()));
- 
-     connect(backbone, SIGNAL(htmlReady()),
-             this, SLOT(setIdle()));
- 
- 
-     connect(history, SIGNAL(historyChanged(bool,bool,bool)),
-             this, SLOT(updateHistoryButtons(bool,bool,bool)));
- 
      searchWordLineEdit->setFocus();
  
++    historyPrevToolButton->setEnabled(false);
++    historyNextToolButton->setEnabled(false);
++    historyShowToolButton->setEnabled(false);
      setEnabled(true);
  }
  
@@@ -251,12 -206,12 +209,9 @@@ void SearchBarWidget::clearSearchWordTo
  }
  
  
--bool SearchBarWidget::isSearching() const {
--    return _isSearching;
--}
  
  void SearchBarWidget::updateHistoryButtons(bool prev, bool next, bool list) {
--    if(!isSearching()) {
++    if(!_isSearching) {
          historyPrevToolButton->setEnabled(prev);
          historyNextToolButton->setEnabled(next);
          historyShowToolButton->setEnabled(list);