Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary into xdxf

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

diff --git a/trunk/src/base/gui/TranslationWidget.cpp b/trunk/src/base/gui/TranslationWidget.cpp
index 658426f..51a8547 100644 (file)
--- a/trunk/src/base/gui/TranslationWidget.cpp
+++ b/trunk/src/base/gui/TranslationWidget.cpp
@@ -25,7 +25,7 @@
 #include <QDebug>
 
 TranslationWidget::TranslationWidget(Backbone *backbone, QWidget *parent):
-    QTextEdit(parent) {
+    QWidget(parent) {
 
     this->backbone = backbone;
 
@@ -35,23 +35,31 @@ TranslationWidget::TranslationWidget(Backbone *backbone, QWidget *parent):
     #endif
     setWindowFlags(windowFlags() | Qt::Window);
 
-    setContextMenuPolicy(Qt::CustomContextMenu);
-
-    setReadOnly(true);
+    initializeUI();
 
-    connect(this, SIGNAL(customContextMenuRequested(QPoint)),
+    connect(textEdit, SIGNAL(customContextMenuRequested(QPoint)),
             this, SLOT(showContextMenu(QPoint)));
 
-    initializeUI();
+
 }
 
-void TranslationWidget::show(QModelIndex index) {
+
+void TranslationWidget::show() {
     QWidget::show();
-    clear();
+}
+
+void TranslationWidget::show(QModelIndex index) {
+
+    show();
     QString v = index.model()->data(index, Qt::DisplayRole).toString();
     Translation* t = backbone->result().value(v);
-    setText(t->toHtml());
-    update();
+
+    textEdit->clear();
+
+    textEdit->setPlainText(t->toHtml());
+
+    textEdit->repaint(this->rect());
+
 }
 
 void TranslationWidget::initializeUI() {
@@ -60,6 +68,14 @@ void TranslationWidget::initializeUI() {
     contextMenu->addAction(tr("Copy"), this, SLOT(copy()));
     contextMenu->addAction(tr("Paste"), this, SLOT(paste()));
     contextMenu->addAction(tr("Select all"), this, SLOT(selectAll()));
+
+    textEdit = new QTextEdit;
+    textEdit->setReadOnly(true);
+    textEdit->setContextMenuPolicy(Qt::CustomContextMenu);
+
+    verticalLayout = new QVBoxLayout;
+    setLayout(verticalLayout);
+    verticalLayout->addWidget(textEdit);
 }
 
 void TranslationWidget::showContextMenu(QPoint pos) {