Merge branch '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..9b1dc71 100644 (file)
--- a/trunk/src/base/gui/TranslationWidget.cpp
+++ b/trunk/src/base/gui/TranslationWidget.cpp
@@ -35,15 +35,16 @@ TranslationWidget::TranslationWidget(QWidget *parent):
 
     #ifdef Q_WS_MAEMO_5
         setAttribute(Qt::WA_Maemo5StackedWindow);
+        setWindowFlags(windowFlags() | Qt::Window);
     #endif
-    setWindowFlags(windowFlags() | Qt::Window);
+
 
     initializeUI();
-    //Q_INIT_RESOURCE(xslt);
-    setWindowTitle(tr("Translation"));
+
+    setWindowTitle("mDictionary");
 
     connect(textEdit, SIGNAL(search()),
-            this, SLOT(searchSelected()));
+           this, SLOT(searchSelected()));
 
 }
 
@@ -52,6 +53,7 @@ void TranslationWidget::show() {
     QScrollArea::show();
 }
 
+
 void TranslationWidget::show(QStringList translations) {
 
     showMaximized();
@@ -69,12 +71,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 +112,6 @@ void TranslationWidget::initButtons() {
 
         showButtonsButton->move(QPoint(x,y));
         showButtonsButton->show();
-        showButtonsButton->setCheckable(true);
 //==================================================================
 
         x = width() - zoomOutButton->sizeHint().width();
@@ -188,8 +187,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
 
@@ -206,14 +205,14 @@ void TranslationWidget::initializeUI() {
     verticalLayout = new QVBoxLayout(w);
     verticalLayout->addWidget(textEdit);
 
-    textEdit->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    textEdit->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-
+    #ifndef Q_WS_MAEMO_5
+        textEdit->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+        textEdit->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    #endif
 
     this->setWidget(w);
     this->setWidgetResizable(true);
 
-
     #ifdef Q_WS_MAEMO_5
         zoomInButton = new QToolButton(this);
         zoomInButton->setIcon(QIcon::fromTheme("pdf_zoomin"));
@@ -224,7 +223,7 @@ void TranslationWidget::initializeUI() {
         zoomOutButton->setMinimumSize(zoomOutButton->sizeHint());
 
         selectAllButton = new QToolButton(this);
-        selectAllButton->setIcon(QIcon::fromTheme("pdf_zoomout"));
+        selectAllButton->setIcon(QIcon(":/icons/48x48/edit-select-all.png"));
         selectAllButton->setMinimumSize(selectAllButton->sizeHint());
 
         copyButton = new QToolButton(this);
@@ -238,7 +237,7 @@ void TranslationWidget::initializeUI() {
         searchButton->setEnabled(false);
 
         showButtonsButton = new QToolButton(this);
-        showButtonsButton->setIcon(QIcon::fromTheme("general_search"));
+        showButtonsButton->setIcon(QIcon::fromTheme("general_sent"));
         showButtonsButton->setMinimumSize(searchButton->sizeHint());
 
         connect(zoomInButton, SIGNAL(clicked()),
@@ -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->setIcon(QIcon::fromTheme("general_received"));
     }
-    else if(!show && buttonsVisible) {
+    else if(buttonsVisible) {
         buttonsAnimation->setDirection(QAbstractAnimation::Backward);
         buttonsAnimation->start();
         buttonsVisible = false;
+        showButtonsButton->setIcon(QIcon::fromTheme("general_sent"));
     }
 }
 
@@ -314,6 +316,13 @@ void TranslationWidget::grabZoomKeys(bool grab) {
          1);
 }
 
+void TranslationWidget::hideEvent(QHideEvent* e) {
+    if(buttonsVisible)
+        showButtons();
+
+    QScrollArea::hideEvent(e);
+}
+
 void TranslationWidget::keyPressEvent(QKeyEvent* event) {
     switch (event->key()) {
         case Qt::Key_F7: