Merge branch 'xdxf' into gui

Conflicts:
	trunk/src/includes/settings.h

diff --cc trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp
index 466b7a6,34d6d22..b06bca5
--- 1/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp
--- 2/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp
+++ b/trunk/src/plugins/xdxf/src/XdxfPlugin/xdxfplugin.cpp
@@@ -113,16 -116,14 +116,13 @@@ void XdxfPlugin::stop() 
      stopped=true;
  }
  
- QDialog* XdxfPlugin::loadDialog() {
-      path="dict.xdxf";
+ DictDialog* XdxfPlugin::dictDialog() {
+      return _dictDialog;
  }
  
- QDialog* XdxfPlugin::settingsDialog() {
-     path="dict.xdxf";
- }
  
  CommonDictInterface* XdxfPlugin::getNew(const Settings*) const {
 -  // CommonDictInterface *commonDictInterface= new
 -    ;
 +  return new XdxfPlugin();
  }
  
  bool XdxfPlugin::isAvailable() const {