From: Jakub Jaszczynski Date: Thu, 7 Oct 2010 08:17:53 +0000 (+0200) Subject: change returned XML format in toHtml function, and add limit to search word List X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=4d7e661af6133852527663b48c650e6e580298db;hp=7d79c7bf972d4947786b7c0b0369ecacdedabef6;p=mdictionary change returned XML format in toHtml function, and add limit to search word List --- diff --git a/src/mdictionary/gui/TranslationWidget.cpp b/src/mdictionary/gui/TranslationWidget.cpp index d9d9fb4..468087b 100644 --- a/src/mdictionary/gui/TranslationWidget.cpp +++ b/src/mdictionary/gui/TranslationWidget.cpp @@ -83,7 +83,7 @@ void TranslationWidget::show(QStringList translations) { trans=QString("") + QString("\n ") + trans + QString("\n "); - + qDebug()< StarDictPlugin::searchWordList(QString word, int limit) { QRegExp keyword(word, Qt::CaseInsensitive, QRegExp::Wildcard); int counter = 0; - while(counter < wordcount) { + while(counter < wordcount && counterreadKeyword(); if(is32b) @@ -227,7 +227,6 @@ QString StarDictPlugin::search(QString key, qint64 offset, qint32 len) { return ""; QByteArray raw = dictReader->readString(offset, len); - return format(raw, settings()->value("sametypesequence")); } diff --git a/src/plugins/stardict/TranslationStarDict.cpp b/src/plugins/stardict/TranslationStarDict.cpp index a95f285..65c60a0 100644 --- a/src/plugins/stardict/TranslationStarDict.cpp +++ b/src/plugins/stardict/TranslationStarDict.cpp @@ -60,25 +60,35 @@ QString TranslationStarDict::key() const { } QString TranslationStarDict::toXml() const { - qDebug() << "asdf" << _dictionaryInfo; + QString result(""); if(!starDictPlugin) return result; - qDebug() << "asdf"; for(int i = 0; i < offsets.size(); i++) { result=result + " \n"; else result+= " bookmark=\"false\" > \n"; - qDebug() << "!!asdf"; - result+= _dictionaryInfo + "" + - starDictPlugin->search(_key, offsets.at(i), lengths.at(i)) - + ""; - qDebug() << "!!!!asdf"; + if(_dictionaryInfo.isEmpty()) + result+= "starDict dictionary "; + else + result+= _dictionaryInfo +""; + + /*przeformatowanie zwracanego stringu na oczekiwany format*/ + QString text =starDictPlugin->search(_key, offsets.at(i), lengths.at(i)); + text.replace("",""); + text.replace("",""); + int pos=text.indexOf(""); + if(pos!=-1) + text.remove(pos,4); + + result+= text; + result+= " "; + qDebug()<<"trans"<