Merge branch 'master' into google

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

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

diff --cc trunk/src/plugins/xdxf/src/xdxfplugin.cpp
index a0f8d5e,0988ed1..64d5fce
--- 1/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
--- 2/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
+++ b/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
@@@ -297,9 -302,9 +297,7 @@@ CommonDictInterface* XdxfPlugin::getNew
      if(settings){
          plugin->setPath(settings->value("path"));
          QStringList list = settings->keys();
-         foreach(QString key, list)
-             plugin->settings()->setValue(key, settings->value(key));
  
 -        a=a+1;
          plugin->db_name = plugin->_settings->value("type")
                           + plugin->_settings->value("path");
          plugin->db = QSqlDatabase::addDatabase("QSQLITE", plugin->db_name);
@@@ -343,22 -361,27 +354,27 @@@ void XdxfPlugin::setSettings(Settings *
          setPath(settings->value("path"));
      }
  
+    foreach(QString key, settings->keys())
+        if(key != "generateCache")
+            _settings->setValue(key, settings->value(key));
+ 
      if((_settings->value("cached") == "false" ||
-         _settings->value("cached").isEmpty()) &&
-        settings->value("generateCache") == "true") {
+             _settings->value("cached").isEmpty()) &&
+             settings->value("generateCache") == "true") {
          makeCache("");
      }
-     else {
+     else if (settings->value("generateCache") != "true") {
         _settings->setValue("cached", "false");
      }
-    foreach(QString key, settings->keys())
-        if(key != "generateCache")
-            _settings->setValue(key, settings->value(key));
+ 
+ 
      delete settings;
  
 -    emit settingsChanged();
 +    Q_EMIT settingsChanged();
  }
  
+ 
+ 
  void XdxfPlugin::getDictionaryInfo() {
      QFile dictionaryFile(path);
      if(!dictionaryFile.open(QFile::ReadOnly | QFile::Text)) {