Merge branch 'gui' into cache

Conflicts:
	trunk/src/plugins/xdxf/src/TranslationXdxf.cpp

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

diff --cc trunk/src/plugins/xdxf/src/TranslationXdxf.cpp
index caf16ba,ee06a42..39caf28
--- 1/trunk/src/plugins/xdxf/src/TranslationXdxf.cpp
--- 2/trunk/src/plugins/xdxf/src/TranslationXdxf.cpp
+++ b/trunk/src/plugins/xdxf/src/TranslationXdxf.cpp
@@@ -42,8 -42,12 +45,12 @@@ QString TranslationXdxf::dictionaryInfo
  
  QString TranslationXdxf::toHtml() const {
      QString result("");
++    
+     if(!xdxfPlugin)
+         return result;
 -    result+="<dict>" + _dictionaryInfo + "<key>" + _key + "</key>"  +
 -            xdxfPlugin->search(_key) + "</dict>";
 +    result+="<dict>" + _dictionaryInfo + xdxfPlugin->search(_key) + "</dict>";
      result.replace("&","&amp;");
 -
++    
      return result;
  }
  

diff --cc trunk/src/plugins/xdxf/src/TranslationXdxf.h
Simple merge

diff --cc trunk/src/plugins/xdxf/src/xdxfplugin.cpp
index 55b8a84,9f06587..c20185d
--- 1/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
--- 2/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
+++ b/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
@@@ -292,7 -286,9 +292,8 @@@ CommonDictInterface* XdxfPlugin::getNew
             settings->value("generateCache") == "true") {
              plugin->makeCache("");
          }
+         delete settings;
      }
 -
      plugin->getDictionaryInfo();
      return  plugin;
  }