Merge branch 'cache'

Conflicts:
	trunk/src/base/gui/TranslationWidget.cpp
	trunk/src/plugins/xdxf/src/xdxfplugin.cpp

diff --cc trunk/src/base/backbone/Bookmarks.cpp
Simple merge

diff --cc trunk/src/base/gui/AboutWidget.cpp
Simple merge

diff --cc trunk/src/base/gui/BookmarksWidget.cpp
Simple merge

diff --cc trunk/src/base/gui/DictManagerWidget.cpp
Simple merge

diff --cc trunk/src/base/gui/MainWindow.cpp
Simple merge

diff --cc trunk/src/base/gui/SearchBarWidget.cpp
Simple merge

diff --cc trunk/src/base/gui/SettingsWidget.cpp
Simple merge

diff --cc trunk/src/base/gui/TranslationWidget.cpp
index 79f38e9,f62ffda..54f5fb2
--- 1/trunk/src/base/gui/TranslationWidget.cpp
--- 2/trunk/src/base/gui/TranslationWidget.cpp
+++ b/trunk/src/base/gui/TranslationWidget.cpp
@@@ -72,18 -71,18 +72,19 @@@ void TranslationWidget::show(QStringLis
          trans += t + "\n";
      }
  
-  //   qDebug()<<trans;
+     QImage image(":icons/16x16/staron.png");
+     QTextDocument *document = textEdit->document();
+     document->addResource(QTextDocument::ImageResource, QUrl("mydata://image.png"), QVariant(image));
  
 +
      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->repaint(this->rect());
  
+     textEdit->insertHtml(trans);
  
+ //  textEdit->setPlainText(trans);
  
+     textEdit->repaint(this->rect());
      update(this->rect());
  
      emit updateSize();

diff --cc trunk/src/plugins/xdxf/src/XdxfCachingDialog.cpp
Simple merge

diff --cc trunk/src/plugins/xdxf/src/XdxfSettingsDialog.cpp
Simple merge

diff --cc trunk/src/plugins/xdxf/src/xdxfplugin.cpp
index d2a81fd,ae3549e..e99f6ba
--- 1/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
--- 2/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
+++ b/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
@@@ -24,12 -24,6 +24,7 @@@
  
  #include "xdxfplugin.h"
  #include <QDebug>
- #include <QFile>
- #include <QXmlStreamReader>
- #include <QtPlugin>
- #include "TranslationXdxf.h"
- #include "../../../includes/settings.h"
 +#include "../../../includes/Notify.h"
  
  XdxfPlugin::XdxfPlugin(QObject *parent) : CommonDictInterface(parent),
                      _langFrom(tr("")), _langTo(tr("")),_name(tr("")),
@@@ -375,10 -361,12 +372,8 @@@ void XdxfPlugin::getDictionaryInfo() 
  
      QString format = "png";
      QString initialPath = QDir::currentPath() + tr("/xdxf.") + format;
 -//  qDebug()<<initialPath;
 -//  QPixmap test(":/icons/xdxf.png");
 -//  qDebug()<<QPixmap(test).save(initialPath,format.toAscii());
 -//  qDebug()<<QPixmap("/home/jakub/star.jpg").save(initialPath,format.toAscii());
  
-     _infoNote="<info path=\""+initialPath+"\">"+"\n" + _name + " [" + _langFrom + "-" + _langTo + "] "+ "(" + _type + ")"  + "</info>";
- 
- 
+     _infoNote="path=\""+initialPath+"\">"+"\n" + _name + " [" + _langFrom + "-" + _langTo + "] "+ "(" + _type + ")";
  
      dictionaryFile.close();
  }