Stars connected to add and remove bookmark signals

diff --git a/trunk/src/base/base.pro b/trunk/src/base/base.pro
index 784ab8f..9600dc0 100644 (file)
--- a/trunk/src/base/base.pro
+++ b/trunk/src/base/base.pro
@@ -34,7 +34,7 @@ SOURCES += gui/main.cpp\
     backbone/History.cpp \
     gui/HistoryListDialog.cpp \
     gui/WordListProxyStyle.cpp \
-    backbone/Bookmarks.cpp \
+    backbone/Bookmarks.cpp
 
 HEADERS  += gui/MainWindow.h \
     gui/SearchBarWidget.h \

diff --git a/trunk/src/base/gui/MainWindow.cpp b/trunk/src/base/gui/MainWindow.cpp
index 24d82f1..5d1a9e3 100644 (file)
--- a/trunk/src/base/gui/MainWindow.cpp
+++ b/trunk/src/base/gui/MainWindow.cpp
@@ -358,8 +358,11 @@ void MainWindow::connectWordList() {
     connect(this, SIGNAL(setIdle()),
             wordListWidget, SLOT(unlockList()));
 
-    connect(wordListWidget, SIGNAL(addToBookmarks(QList<Translation*>)),
+    connect(wordListWidget, SIGNAL(addBookmark(QList<Translation*>)),
             backbone, SLOT(addBookmark(QList<Translation*>)));
+
+    connect(wordListWidget, SIGNAL(removeBookmark(QList<Translation*>)),
+            backbone, SLOT(removeBookmark(QList<Translation*>)));
 }
 
 void MainWindow::connectTranslationWidget() {

diff --git a/trunk/src/base/gui/WordListWidget.cpp b/trunk/src/base/gui/WordListWidget.cpp
index 9f03ade..d03b9a1 100644 (file)
--- a/trunk/src/base/gui/WordListWidget.cpp
+++ b/trunk/src/base/gui/WordListWidget.cpp
@@ -74,7 +74,14 @@ void WordListWidget::wordClicked(QListWidgetItem *item) {
                 searchResult[item->data(Qt::DisplayRole).toString()]);
     }
     else {
-        qDebug()<<"edited";
+        if(item->checkState() == Qt::Checked) {
+            emit addBookmark(
+                    searchResult[item->data(Qt::DisplayRole).toString()]);
+        }
+        else {
+            emit removeBookmark(
+                    searchResult[item->data(Qt::DisplayRole).toString()]);
+        }
     }
 }
 
@@ -82,9 +89,6 @@ void WordListWidget::wordPressed(QListWidgetItem *item) {
     itemState = item->checkState();
 }
 
-void WordListWidget::itemButtonClicked(QString key) {
-    emit addToBookmarks(searchResult[key]);
-}
 
 void WordListWidget::lockList() {
     setEnabled(false);

diff --git a/trunk/src/base/gui/WordListWidget.h b/trunk/src/base/gui/WordListWidget.h
index 5e91450..f368653 100644 (file)
--- a/trunk/src/base/gui/WordListWidget.h
+++ b/trunk/src/base/gui/WordListWidget.h
@@ -45,7 +45,9 @@ Q_SIGNALS:
     //! objects
     void showTranslation(QList<Translation*>);
 
-    void addToBookmarks(QList<Translation*>);
+    void addBookmark(QList<Translation*>);
+
+    void removeBookmark(QList<Translation*>);
 
 
 public Q_SLOTS:

diff --git a/trunk/tests/mDictionaryTests/mDictionaryTests.pro b/trunk/tests/mDictionaryTests/mDictionaryTests.pro
index ed2c910..656bb4b 100644 (file)
--- a/trunk/tests/mDictionaryTests/mDictionaryTests.pro
+++ b/trunk/tests/mDictionaryTests/mDictionaryTests.pro
@@ -4,7 +4,7 @@
 #
 #-------------------------------------------------
 
-QT       += testlib core
+QT       += testlib core sql
 
 
 TARGET = mDictionaryTests
@@ -16,7 +16,8 @@ TEMPLATE = app
 
 SOURCES += tst_Backbone.cpp \
     ../../src/base/backbone/backbone.cpp \
-    ../../src/base/backbone/History.cpp
+    ../../src/base/backbone/History.cpp \
+    ../../src/base/backbone/Bookmarks.cpp
 DEFINES += SRCDIR=\\\"$$PWD/\\\"
 
 HEADERS += \
@@ -26,9 +27,10 @@ HEADERS += \
     ../../src/includes/settings.h \
     ../../src/includes/CommonDictInterface.h \
     ../../src/includes/History.h \
-    TranslationMock.h
+    TranslationMock.h \
+    ../../src/base/backbone/BookmarkTranslations.h \
+    ../../src/base/backbone/Bookmarks.h
 
 check.target = check
 check.commands += ./mDictionaryTests
 QMAKE_EXTRA_TARGETS += check
-

diff --git a/trunk/trunk.pro b/trunk/trunk.pro
index 0739438..7235070 100644 (file)
--- a/trunk/trunk.pro
+++ b/trunk/trunk.pro
@@ -3,5 +3,5 @@ SUBDIRS = tests src
 
 check.target = check
 check.CONFIG = recursive
-check.recurse = tests src
+check.recurse = src
 QMAKE_EXTRA_TARGETS += check