projects
/
mdictionary
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4fe3395
)
fix xslt conversion (show all translation)
author
Jakub Jaszczynski
<j.j.jaszczynski@gmail.com>
Thu, 19 Aug 2010 12:42:29 +0000
(14:42 +0200)
committer
Jakub Jaszczynski
<j.j.jaszczynski@gmail.com>
Thu, 19 Aug 2010 12:42:29 +0000
(14:42 +0200)
trunk/src/base/gui/TranslationWidget.cpp
patch
|
blob
|
history
trunk/src/plugins/xdxf/src/TranslationXdxf.cpp
patch
|
blob
|
history
trunk/src/plugins/xdxf/src/xdxfplugin.cpp
patch
|
blob
|
history
trunk/src/plugins/xdxf/tests/test.cpp
patch
|
blob
|
history
diff --git
a/trunk/src/base/gui/TranslationWidget.cpp
b/trunk/src/base/gui/TranslationWidget.cpp
index
39cc238
..
f1a4d8b
100644
(file)
--- a/
trunk/src/base/gui/TranslationWidget.cpp
+++ b/
trunk/src/base/gui/TranslationWidget.cpp
@@
-69,12
+69,14
@@
void TranslationWidget::show(QStringList translations) {
trans += t + "\n";
}
trans += t + "\n";
}
- // qDebug()<<trans;
- trans=tr("<?xml version=\"1.0\" encoding=\"UTF-8\"?>") + tr("\n <ar>") + trans + tr("\n </ar>");
+ trans=tr("<?xml version=\"1.0\" encoding=\"UTF-8\"?>") + tr("\n <ar>") + trans + tr("\n </ar>");
+// trans.replace("&","&");
trans=XslConversion(trans);
trans=XslConversion(trans);
+ qDebug()<<trans;
+// trans.replace("&","&");
textEdit->insertHtml(trans);
textEdit->insertHtml(trans);
- // textEdit->setPlainText(trans);
+ // textEdit->setPlainText(trans);
textEdit->repaint(this->rect());
textEdit->repaint(this->rect());
@@
-87,7
+89,7
@@
QString TranslationWidget::XslConversion(QString translation)
{
QXmlQuery myQuery(QXmlQuery::XSLT20);
myQuery.setFocus(translation);
{
QXmlQuery myQuery(QXmlQuery::XSLT20);
myQuery.setFocus(translation);
-// qDebug()<<translation;
+
QFile file(":/xsl/xsl.xsl");
if(!file.open(QFile::ReadOnly)){
qDebug()<<"can't open a xslt file";
QFile file(":/xsl/xsl.xsl");
if(!file.open(QFile::ReadOnly)){
qDebug()<<"can't open a xslt file";
diff --git
a/trunk/src/plugins/xdxf/src/TranslationXdxf.cpp
b/trunk/src/plugins/xdxf/src/TranslationXdxf.cpp
index
c0ae5d9
..
190e255
100644
(file)
--- a/
trunk/src/plugins/xdxf/src/TranslationXdxf.cpp
+++ b/
trunk/src/plugins/xdxf/src/TranslationXdxf.cpp
@@
-41,6
+41,8
@@
QString TranslationXdxf::toHtml() const {
QString result("");
// qDebug()<<xdxfPlugin->search(_key);
result+="<dict>" + _dictionaryInfo + "<key>" + _key + "</key>" +xdxfPlugin->search(_key) + "</dict>";
QString result("");
// qDebug()<<xdxfPlugin->search(_key);
result+="<dict>" + _dictionaryInfo + "<key>" + _key + "</key>" +xdxfPlugin->search(_key) + "</dict>";
+ result.replace("&","&");
+
// qDebug()<<result;
return result;
}
// qDebug()<<result;
return result;
}
diff --git
a/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
b/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
index
b4fdb5a
..
b734e26
100644
(file)
--- a/
trunk/src/plugins/xdxf/src/xdxfplugin.cpp
+++ b/
trunk/src/plugins/xdxf/src/xdxfplugin.cpp
@@
-210,6
+210,7
@@
QString XdxfPlugin::searchFile(QString key) {
QXmlStreamReader reader(&dictionaryFile);
QXmlStreamReader reader(&dictionaryFile);
+
QString a;
bool match =false;
QString a;
bool match =false;
@@
-236,7
+237,7
@@
QString XdxfPlugin::searchFile(QString key) {
temp= temp + tr(" c=\"") + reader.attributes().value(tr("c")).toString() + tr("\"");
temp+=tr(">");
}
temp= temp + tr(" c=\"") + reader.attributes().value(tr("c")).toString() + tr("\"");
temp+=tr(">");
}
- temp+= reader.text().toString();
+ temp+= reader.text().toString().replace("<","<").replace(">",">");
reader.readNext();
}
if(temp.at(0)==QChar('\n'))
reader.readNext();
}
if(temp.at(0)==QChar('\n'))
@@
-480,7
+481,7
@@
bool XdxfPlugin::makeCache(QString dir) {
temp= temp + tr(" c=\"") + reader.attributes().value(tr("c")).toString() + tr("\"");
temp+=tr(">");
}
temp= temp + tr(" c=\"") + reader.attributes().value(tr("c")).toString() + tr("\"");
temp+=tr(">");
}
- temp+= reader.text().toString();
+ temp+= reader.text().toString().replace("<","<").replace(">",">");;
reader.readNext();
}
if(temp.at(0)==QChar('\n'))
reader.readNext();
}
if(temp.at(0)==QChar('\n'))
diff --git
a/trunk/src/plugins/xdxf/tests/test.cpp
b/trunk/src/plugins/xdxf/tests/test.cpp
index
69c8f5b
..
4e43c2e
100644
(file)
--- a/
trunk/src/plugins/xdxf/tests/test.cpp
+++ b/
trunk/src/plugins/xdxf/tests/test.cpp
@@
-154,7
+154,6
@@
void XdxfTest::searchWordListFile() {
void XdxfTest::stop() {
XdxfPlugin xdxfPluginB(this);
void XdxfTest::stop() {
XdxfPlugin xdxfPluginB(this);
-// xdxfPlugin.setPatch("dict.xdxf");
Settings *settings=new Settings;
settings->setValue("path","../tests/dict.xdxf");
Settings *settings=new Settings;
settings->setValue("path","../tests/dict.xdxf");