Merge branch 'cache' into gui

diff --combined trunk/src/base/gui/TranslationWidget.cpp
index 6e2349e,f1a4d8b..16216c2
--- 1/trunk/src/base/gui/TranslationWidget.cpp
--- 2/trunk/src/base/gui/TranslationWidget.cpp
+++ b/trunk/src/base/gui/TranslationWidget.cpp
@@@ -69,12 -69,14 +69,14 @@@ void TranslationWidget::show(QStringLis
          trans += t + "\n";
      }
  
-   //  qDebug()<<trans;
-     trans=tr("<?xml version=\"1.0\" encoding=\"UTF-8\"?>") + tr("\n <ar>") + trans + tr("\n </ar>");
  
+     trans=tr("<?xml version=\"1.0\" encoding=\"UTF-8\"?>") + tr("\n <ar>") + trans + tr("\n </ar>");
+ //    trans.replace("&","&amp;");
      trans=XslConversion(trans);
+     qDebug()<<trans;
+ //    trans.replace("&amp;","&");
      textEdit->insertHtml(trans);
-   //  textEdit->setPlainText(trans);
+  //   textEdit->setPlainText(trans);
  
      textEdit->repaint(this->rect());
  
@@@ -87,7 -89,7 +89,7 @@@ QString TranslationWidget::XslConversio
  {
      QXmlQuery myQuery(QXmlQuery::XSLT20);
      myQuery.setFocus(translation);
- //    qDebug()<<translation;
+ 
      QFile file(":/xsl/xsl.xsl");
      if(!file.open(QFile::ReadOnly)){
          qDebug()<<"can't open a xslt file";
@@@ -110,6 -112,7 +112,6 @@@ void TranslationWidget::initButtons() 
  
          showButtonsButton->move(QPoint(x,y));
          showButtonsButton->show();
 -        showButtonsButton->setCheckable(true);
  //==================================================================
  
          x = width() - zoomOutButton->sizeHint().width();
@@@ -185,8 -188,8 +187,8 @@@
          buttonsInitialized = true;
          buttonsVisible = false;
  
 -        connect(showButtonsButton, SIGNAL(toggled(bool)),
 -                this, SLOT(showButtons(bool)));
 +        connect(showButtonsButton, SIGNAL(clicked()),
 +                this, SLOT(showButtons()));
  }
  #endif
  
@@@ -235,7 -238,7 +237,7 @@@ void TranslationWidget::initializeUI() 
          searchButton->setEnabled(false);
  
          showButtonsButton = new QToolButton(this);
 -        showButtonsButton->setIcon(QIcon::fromTheme("general_search"));
 +        showButtonsButton->setArrowType(Qt::UpArrow);
          showButtonsButton->setMinimumSize(searchButton->sizeHint());
  
          connect(zoomInButton, SIGNAL(clicked()),
@@@ -276,19 -279,16 +278,19 @@@ void TranslationWidget::searchSelected(
  }
  
  #ifdef Q_WS_MAEMO_5
 -void TranslationWidget::showButtons(bool show) {
 -    if(show && !buttonsVisible) {
 +void TranslationWidget::showButtons() {
 +    if(!buttonsVisible) {
          buttonsAnimation->setDirection(QAbstractAnimation::Forward);
          buttonsAnimation->start();
          buttonsVisible = true;
 +
 +        showButtonsButton->setArrowType(Qt::DownArrow);
      }
 -    else if(!show && buttonsVisible) {
 +    else if(buttonsVisible) {
          buttonsAnimation->setDirection(QAbstractAnimation::Backward);
          buttonsAnimation->start();
          buttonsVisible = false;
 +        showButtonsButton->setArrowType(Qt::UpArrow);
      }
  }