Merge branch 'master' into google

[mdictionary] / src / mdictionary / backbone / backbone.cpp

diff --git a/src/mdictionary/backbone/backbone.cpp b/src/mdictionary/backbone/backbone.cpp
index f61266e..62e1e12 100644 (file)
--- a/src/mdictionary/backbone/backbone.cpp
+++ b/src/mdictionary/backbone/backbone.cpp
@@ -81,7 +81,7 @@ void Backbone::init() {
 
    //Install default config files
    ConfigGenerator confGen;
-   confGen.generateCss(_dir + "style.css");
+   ///confGen.generateCss(_dir + "style.css");
    confGen.generateDefaultConfig(_configPath);
 
    loadPrefs(_configPath);
@@ -363,6 +363,8 @@ void Backbone::loadPlugins() {
         if(!exists) {
             _plugins.append(plugin);
             plugin->retranslate();
+            connect(plugin, SIGNAL(notify(Notify::NotifyType,QString)),
+                    this, SIGNAL(notify(Notify::NotifyType,QString)));
         }
     }
 }
@@ -468,7 +470,7 @@ void Backbone::dictUpdated() {
 
     // For convienence this function is called for each change in dictionaries
     // and each call dumps configuration for all dictionaries into file.
-    // Maybe better way would be to store new/changed configuration but
+    // Maybe a better way would be to store new/changed configuration but
     // parsing settings file and figuring out what was changed, in my opinion,
     // would take more time
     _history->setMaxSize(_historyLen);
@@ -521,11 +523,6 @@ void Backbone::searchHtml(QList<Translation *> translations) {
     foreach(Translation* tr, translations) {
          if(containsDict(tr->dict()) || !tr->dict())
             dummy.append(TranslationPtr(tr));
-  /*      foreach(CommonDictInterface* dict, activeDicts()) {
-            Translation* trans = dict->getTranslationFor(tr->key());
-            if(trans)
-                dummy.append(TranslationPtr(trans));
-        } */
     }
     if(translations.size()>0) {
         Translation *tr = translations.at(0);