Merge branch 'gui' into cache

[mdictionary] / trunk / src / base / gui / TranslationWidget.cpp

diff --git a/trunk/src/base/gui/TranslationWidget.cpp b/trunk/src/base/gui/TranslationWidget.cpp
index f1a4d8b..d6d480b 100644 (file)
--- a/trunk/src/base/gui/TranslationWidget.cpp
+++ b/trunk/src/base/gui/TranslationWidget.cpp
@@ -69,12 +69,10 @@ void TranslationWidget::show(QStringList translations) {
         trans += t + "\n";
     }
 
+    qDebug()<<trans;
 
     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);
 
@@ -112,7 +110,6 @@ void TranslationWidget::initButtons() {
 
         showButtonsButton->move(QPoint(x,y));
         showButtonsButton->show();
-        showButtonsButton->setCheckable(true);
 //==================================================================
 
         x = width() - zoomOutButton->sizeHint().width();
@@ -188,8 +185,8 @@ void TranslationWidget::initButtons() {
         buttonsInitialized = true;
         buttonsVisible = false;
 
-        connect(showButtonsButton, SIGNAL(toggled(bool)),
-                this, SLOT(showButtons(bool)));
+        connect(showButtonsButton, SIGNAL(clicked()),
+                this, SLOT(showButtons()));
 }
 #endif
 
@@ -238,7 +235,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()),
@@ -279,16 +276,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);
     }
 }