From ceb0ccfad1a495873bd738a46529391536b14212 Mon Sep 17 00:00:00 2001
From: Jakub Jaszczynski <j.j.jaszczynski@gmail.com>
Date: Thu, 19 Aug 2010 12:44:10 +0200
Subject: [PATCH] fixed characters coding problem

---
 data/dicts/eng-us.xdxf                    |    2 +-
 trunk/src/base/gui/TranslationWidget.cpp  |    6 +++---
 trunk/src/base/xsl.xsl                    |    3 ++-
 trunk/src/plugins/xdxf/src/xdxfplugin.cpp |   19 +++++++++++++++----
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/data/dicts/eng-us.xdxf b/data/dicts/eng-us.xdxf
index c45be96..5b1a879 100644
--- a/data/dicts/eng-us.xdxf
+++ b/data/dicts/eng-us.xdxf
@@ -10,7 +10,7 @@ Medium Wave</ar>
 <ar><k>Airplane</k>
 Aeroplane</ar>
 <ar><k>Aluminum</k>
-Aluminium to text text wiecej tekstu to text text wiecej tekstuto text text wiecej tekstuto text text wiecej tekstuto text text wiecej tekstuto text text wiecej tekstuto text text wiecej tekstuto text text wiecej tekstu</ar>
+Aluminium <tr>wymowa</tr> <ex>przyklad</ex> <c c="#FF00FF"> <b> test koloru i pogrobienia </b> </c> </ar>
 <ar><k>Apartment</k>
 Flatlane</ar>
 <ar><k>Appetizer</k>
diff --git a/trunk/src/base/gui/TranslationWidget.cpp b/trunk/src/base/gui/TranslationWidget.cpp
index f8d8e27..d7d2b5c 100644
--- a/trunk/src/base/gui/TranslationWidget.cpp
+++ b/trunk/src/base/gui/TranslationWidget.cpp
@@ -55,12 +55,12 @@ void TranslationWidget::show(QStringList translations) {
         trans += t + "\n";
     }
 
- //   qDebug()<<trans;
-    trans=tr("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>") + tr("\n <ar>") + trans + tr("\n </ar>");
+  //  qDebug()<<trans;
+    trans=tr("<?xml version=\"1.0\" encoding=\"UTF-8\"?>") + tr("\n <ar>") + trans + tr("\n </ar>");
 
     trans=XslConversion(trans);
     textEdit->insertHtml(trans);
-  // textEdit->setPlainText(trans);
+  //  textEdit->setPlainText(trans);
 
     textEdit->repaint(this->rect());
 
diff --git a/trunk/src/base/xsl.xsl b/trunk/src/base/xsl.xsl
index d937301..ce50c46 100644
--- a/trunk/src/base/xsl.xsl
+++ b/trunk/src/base/xsl.xsl
@@ -9,8 +9,9 @@
 		<th><xsl:value-of select="ar/dict[1]/key"/></th>
 	</tr>
 	<xsl:for-each select="ar/dict"> 
+		<!-- <xsl:variable name="path" select="info/@path"/>-->
 		<tr bgcolor="#99FF99">
-			<th><xsl:value-of select="info"/></th>
+			<th><xsl:value-of select="info"/> <!-- <img src="{$path}"/> --></th>
 		</tr>
 		<xsl:for-each select="t">
 			<tr>
diff --git a/trunk/src/plugins/xdxf/src/xdxfplugin.cpp b/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
index 663fafb..b4fdb5a 100644
--- a/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
+++ b/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
@@ -239,7 +239,9 @@ QString XdxfPlugin::searchFile(QString key) {
                 temp+= reader.text().toString();
                 reader.readNext();
             }
-            resultString+=tr("<t>") + temp.replace("\n","") + tr("</t>");
+            if(temp.at(0)==QChar('\n'))
+                temp.remove(0,1);
+            resultString+=tr("<t>") + temp + tr("</t>");    //.replace("\n","")
             match=false;
         }
         this->thread()->yieldCurrentThread();
@@ -276,7 +278,7 @@ CommonDictInterface* XdxfPlugin::getNew(const Settings *settings) const {
 
         plugin->db_name = plugin->_settings->value("type")
                + plugin->_settings->value("path");
-  //      if(!plugin->db.connectionName().isEmpty() || settings->value("generateCache")=="true")
+ //       if(!plugin->db.connectionName().isEmpty() || settings->value("generateCache")=="true")
             plugin->db = QSqlDatabase::addDatabase("QSQLITE", plugin->db_name);
 
         if(settings->value("cached").isEmpty() &&
@@ -352,7 +354,14 @@ void XdxfPlugin::getDictionaryInfo() {
     if(reader.name()=="description")
         _infoNote=reader.readElementText();
 
-    _infoNote="<info path=\""+path+"\">"+"\n" + _name + "(" + _type + ")"  + "</info>";
+    QString format = "png";
+    QString initialPath = QDir::currentPath() + tr("/xdxf.") + format;
+//    qDebug()<<initialPath;
+//    qDebug()<<QPixmap(":/icons/xdxf.png").save(initialPath,format.toAscii());
+
+    _infoNote="<info path=\""+initialPath+"\">"+"\n" + _name + "(" + _type + ")"  + "</info>";
+
+
 
     dictionaryFile.close();
 }
@@ -474,7 +483,9 @@ bool XdxfPlugin::makeCache(QString dir) {
                 temp+= reader.text().toString();
                 reader.readNext();
             }
-            temp=tr("<t>") + temp.replace("\n","") + tr("</t>");
+            if(temp.at(0)==QChar('\n'))
+                temp.remove(0,1);
+            temp=tr("<t>") + temp+ tr("</t>");  //.replace("\n","")
             match=false;
             cur.prepare("insert into dict values(?,?)");
             cur.addBindValue(a);
-- 
1.7.9.5