Merge branch 'master' into google

Conflicts:
	trunk/src/plugins/google/src/GooglePlugin.cpp
	trunk/src/plugins/xdxf/src/XdxfCachingDialog.cpp
	trunk/src/plugins/xdxf/src/xdxfplugin.cpp

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

diff --cc trunk/src/plugins/google/src/GooglePlugin.cpp
index 39aa5ae,607c41c..d62d6ed
--- 1/trunk/src/plugins/google/src/GooglePlugin.cpp
--- 2/trunk/src/plugins/google/src/GooglePlugin.cpp
+++ b/trunk/src/plugins/google/src/GooglePlugin.cpp
@@@ -27,19 -27,20 +27,18 @@@
  #include <QDebug>
  #include "GoogleDictDialog.h"
  
 -
  GooglePlugin::GooglePlugin(QObject *parent): CommonDictInterface(parent),
 -                    _langFrom(tr("")), _langTo(tr("")),_name(tr("")),
 -                    _type("google"), _infoNote(tr("")) {
 -
 -    stopped = false;
 -    _connectionAccept = false;
 +                    _name(tr("")),_infoNote(tr("")) {
- 
      _settings = new Settings();
 +    _settings->setValue("lang_to","");
 +    _settings->setValue("lang_from","");
 +    _settings->setValue("type","google");
 +    _settings->setValue("connection_acepted","true");
      _dictDialog = new GoogleDictDialog(this,this);
 -
      _icon = QIcon(":/icons/drawing.png");
 +
 +    stopped = false;
      languages=initLanguages();
 -    _settings->setValue("type","google");
 -    _settings->setValue("connectionAcepted","false");
  
      http = new QHttp(this);
      connect(http, SIGNAL(done(bool)), this, SLOT(done()));

diff --cc trunk/src/plugins/xdxf/src/XdxfCachingDialog.cpp
index 41ae949,402fd31..f06f69c
--- 1/trunk/src/plugins/xdxf/src/XdxfCachingDialog.cpp
--- 2/trunk/src/plugins/xdxf/src/XdxfCachingDialog.cpp
+++ b/trunk/src/plugins/xdxf/src/XdxfCachingDialog.cpp
@@@ -54,9 -54,9 +54,8 @@@ XdxfCachingDialog::XdxfCachingDialog(Xd
      connect(cancelButton, SIGNAL(clicked()),
              this, SIGNAL(cancelCaching()));
  
 -   // connect(parent, SIGNAL(updateCachingProgress(int, int)),
 -    //        this, SLOT(updateCachingProgress(int, int)));
 -
 +   connect(parent, SIGNAL(updateCachingProgress(int, int)),
 +           this, SLOT(updateCachingProgress(int, int)));
- 
      time.start();
  }
  

diff --cc trunk/src/plugins/xdxf/src/xdxfplugin.cpp
index a4fbe9b,ae9f35e..09af5e7
--- 1/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
--- 2/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
+++ b/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
@@@ -29,8 -29,7 +29,7 @@@
  
  XdxfPlugin::XdxfPlugin(QObject *parent) : CommonDictInterface(parent),
                      _langFrom(tr("")), _langTo(tr("")),_name(tr("")),
 -                    _type("xdxf"), _infoNote(tr("")) {
 +                    _type(tr("xdxf")), _infoNote(tr("")) {
- 
      _wordsCount = -1;
      _settings = new Settings();
      _dictDialog = new XdxfDictDialog(this);