X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fmdictionary%2Fgui%2FTranslationWidget.cpp;h=d9d9fb4303a568714019ffb9fa0d655f86bc256e;hb=fdf869b54ee6e68d37e9266d5acae8290e010300;hp=15b830c73697d68d408cbb455f47953211b20397;hpb=3a474ba21f9ee414f14ba783e038c01ff9cd0c6c;p=mdictionary diff --git a/src/mdictionary/gui/TranslationWidget.cpp b/src/mdictionary/gui/TranslationWidget.cpp index 15b830c..d9d9fb4 100644 --- a/src/mdictionary/gui/TranslationWidget.cpp +++ b/src/mdictionary/gui/TranslationWidget.cpp @@ -29,6 +29,7 @@ #include #include #endif +#include TranslationWidget::TranslationWidget(QWidget *parent): QScrollArea(parent){ @@ -79,24 +80,22 @@ void TranslationWidget::show(QStringList translations) { trans += t + "\n"; } - trans=tr("") + tr("\n ") - + trans + tr("\n "); + trans=QString("") + QString("\n ") + + trans + QString("\n "); + + trans=XslConversion(trans); QString head = ""; head += ""; trans = head + trans; trans+= ""; trans.replace("$STAR$", "/usr/share/mdictionary/staron.png"); -// qDebug()<setHtml(trans, QUrl().fromLocalFile("/")); - - //webkit->repaint(this->rect()); //update(this->rect()); @@ -215,7 +214,7 @@ void TranslationWidget::initButtons() { void TranslationWidget::initializeUI() { - webkit = new TranslationTextEdit(this); + webkit = new TranslationView(this); Settings* set = guiinterface->settings(); qreal fac = set->value("zoom").toFloat(); if(!fac) @@ -246,12 +245,10 @@ void TranslationWidget::initializeUI() { copyButton = new QToolButton(this); copyButton->setIcon(QIcon::fromTheme("general_notes")); copyButton->setMinimumSize(copyButton->sizeHint()); - copyButton->setEnabled(false); searchButton = new QToolButton(this); searchButton->setIcon(QIcon::fromTheme("general_search")); searchButton->setMinimumSize(searchButton->sizeHint()); - searchButton->setEnabled(false); showButtonsButton = new QToolButton(this); showButtonsButton->setIcon(QIcon::fromTheme("general_sent")); @@ -268,13 +265,7 @@ void TranslationWidget::initializeUI() { this, SLOT(searchSelected())); connect(copyButton, SIGNAL(clicked()), - webkit, SLOT(copy())); - - connect(webkit, SIGNAL(copyAvailable(bool)), - searchButton, SLOT(setEnabled(bool))); - - connect(webkit, SIGNAL(copyAvailable(bool)), - copyButton, SLOT(setEnabled(bool))); + this, SLOT(copySelected())); connect(selectAllButton, SIGNAL(clicked()), webkit, SLOT(selectAll())); @@ -288,10 +279,24 @@ void TranslationWidget::initializeUI() { } void TranslationWidget::searchSelected() { - #ifdef Q_WS_MAEMO_5 - hide(); - #endif - Q_EMIT search(webkit->selectedText().toLower()); + if(webkit->selectedText().isEmpty()) { + Q_EMIT notify(Notify::Warning, tr("No text is selected")); + } + else { + #ifdef Q_WS_MAEMO_5 + hide(); + #endif + Q_EMIT search(webkit->selectedText().toLower()); + } +} + +void TranslationWidget::copySelected() { + if(webkit->selectedText().isEmpty()) { + Q_EMIT notify(Notify::Warning, tr("No text is selected")); + } + else { + Q_EMIT notify(Notify::Info, tr("Copyied selected text")); + } } #ifdef Q_WS_MAEMO_5