Merge branch 'gui'

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

diff --cc trunk/src/plugins/xdxf/src/src.pro
Simple merge

diff --cc trunk/src/plugins/xdxf/src/xdxfplugin.cpp
index 4d3aa55,4d7828d..2e37889
--- 1/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
--- 2/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
+++ b/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
@@@ -202,7 -288,10 +285,10 @@@ Settings* XdxfPlugin::settings() 
      return _settings;
  }
  
 -bool XdxfPlugin::isCached()
 +bool XdxfPlugin::isCached() {
+ {
+     if(_settings->value("cached") == "true")
+         return true;
      return false;
  }