Merge branch 'gui'

diff --git a/trunk/src/base/backbone/backbone.cpp b/trunk/src/base/backbone/backbone.cpp
index e84c4aa..05e17f0 100644 (file)
--- a/trunk/src/base/backbone/backbone.cpp
+++ b/trunk/src/base/backbone/backbone.cpp
@@ -180,6 +180,7 @@ void Backbone::stopSearching() {
 
 
 void Backbone::search(QString word){
+    qDebug() << "SEEEEEEEEEARCH";
     _result.clear();
     mappedSearch = word.toLower();
 
@@ -244,7 +245,11 @@ void Backbone::addDictionary(CommonDictInterface *dict, bool active) {
 
 
 void Backbone::translationReady() {
+    bool changed = 0; // prevents doubling ready() signal, when both if are
+                      //  executed in one translationReady() call then second
+                      // call doubles ready*() emit without any new data
     if(!dictFin && _innerResult.isFinished()) {
+        changed = 1;
         dictFin = 1;
         QFutureIterator<QList<Translation*> > it(_innerResult);
 
@@ -256,6 +261,7 @@ void Backbone::translationReady() {
     }
 
     if(!bookmarkFin && _innerBookmarks.isFinished()) {
+        changed = 1;
         bookmarkFin = 1;
         QList<Translation*> list = _innerBookmarks.result();
 
@@ -263,8 +269,10 @@ void Backbone::translationReady() {
                 _result.insert(trans->key().toLower(), trans);
     }
 
-    if(!stopped && bookmarkFin && dictFin)
+    if(!stopped && bookmarkFin && dictFin && changed) {
+        qDebug() << "EMITTTTTT";
         Q_EMIT ready();
+        }
 }
 
 QStringList Backbone::getFilesFromDir(QString dir, QStringList nameFilter) {
@@ -406,8 +414,6 @@ void Backbone::loadDicts(QString fileName, bool _default) {
 
         set.endGroup();
         addInternalDictionary(plug->getNew(plugSet), active);
-      //  if(plugSet)
-        //    delete plugSet;
     }
 }
 

diff --git a/trunk/src/base/base.pro b/trunk/src/base/base.pro
index c87d985..20d7bb4 100644 (file)
--- a/trunk/src/base/base.pro
+++ b/trunk/src/base/base.pro
@@ -32,11 +32,11 @@ SOURCES += gui/main.cpp \
     backbone/Bookmarks.cpp \
     gui/SettingsWidget.cpp \
     gui/BookmarksWidget.cpp \
-    gui/WelcomeScreenWidget.cpp \ 
+    gui/WelcomeScreenWidget.cpp \
     gui/AboutWidget.cpp \
     gui/TranslationTextEdit.cpp
 
-HEADERS  += gui/MainWindow.h \
+HEADERS += gui/MainWindow.h \
     gui/AboutWidget.h \
     gui/SearchBarWidget.h \
     gui/WordListWidget.h \