Merge branch 'master' into google

Conflicts:
	trunk/src/base/gui/WordListWidget.cpp
	trunk/src/plugins/xdxf/src/xdxfplugin.cpp

diff --cc trunk/src/base/backbone/Bookmarks.h
index 700b8da,6f8257c..fa82945
--- 1/trunk/src/base/backbone/Bookmarks.h
--- 2/trunk/src/base/backbone/Bookmarks.h
+++ b/trunk/src/base/backbone/Bookmarks.h
@@@ -48,12 -49,11 +49,11 @@@ class BookmarkTranslation
  /*! Bookmarks are way to store words that You think You will need to search
    for often.
  
 -  When You add bookmark (by clickin on "star" in words list) You adds it to
 +  When You add bookmark (by clickin on "star" in words list) You add it to
    special list with cached translations from all available dictionaries so
 -  You can search for them quickly even when You delete coresponding dict.
 +  You can search for them quickly even when You delete corresponding dict.
    */
- class Bookmarks
- {
+ class Bookmarks : public AccentsNormalizer {
  public:
      Bookmarks();
  

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

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

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

diff --cc trunk/src/base/gui/WordListWidget.cpp
index 59f4724,fba6b63..7b4550a
--- 1/trunk/src/base/gui/WordListWidget.cpp
--- 2/trunk/src/base/gui/WordListWidget.cpp
+++ b/trunk/src/base/gui/WordListWidget.cpp
@@@ -111,8 -110,7 +110,7 @@@ void WordListWidget::showSearchResults
  
  void WordListWidget::wordClicked(QModelIndex index) {
      //we're getting translation based on data in index
-     //qDebug()<<searchResult[index.data().toString()].at(0)->dictionaryInfo();
 -    emit showTranslation(
 +    Q_EMIT showTranslation(
              searchResult[index.data().toString()]);
  }
  

diff --cc trunk/src/includes/CommonDictInterface.h
Simple merge

diff --cc trunk/src/includes/settings.h
index bc8c35b,9a8e043..6843a79
--- 1/trunk/src/includes/settings.h
--- 2/trunk/src/includes/settings.h
+++ b/trunk/src/includes/settings.h
@@@ -30,16 -30,13 +30,13 @@@
  
  #include <QString>
  #include <QHash>
- #include "CommonDictInterface.h"
  #include <QDebug>
  
- class CommonDictInterface;
- 
  /*! Plugins or dictionaries may need to keep some of configuration between
 -  sessions, moreover Backbone or GUI may want store some additional info in
 +  sessions, moreover Backbone or GUI may want to store some additional info in
    plugin Settings.
  
 -  Its important for plugin to store all information given it in Settings.*/
 +  It's important for plugin to store all information given to it in Settings.*/
  class Settings {
    public:
      Settings(){}

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

diff --cc trunk/src/plugins/xdxf/src/xdxfplugin.cpp
index eb111dc,4ed34dd..7b43c87
--- 1/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
--- 2/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
+++ b/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
@@@ -340,9 -358,12 +357,12 @@@ void XdxfPlugin::setSettings(Settings *
      else {
         _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() {

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

diff --cc trunk/tests/mDictionaryTests/tst_Backbone.cpp
Simple merge