Connected button in word list to add bookmark signal

diff --git a/trunk/src/base/backbone/Bookmarks.cpp b/trunk/src/base/backbone/Bookmarks.cpp
index c90edc0..788d60c 100644 (file)
--- a/trunk/src/base/backbone/Bookmarks.cpp
+++ b/trunk/src/base/backbone/Bookmarks.cpp
@@ -33,6 +33,7 @@ void Bookmarks::clear() {
 
 
 void Bookmarks::add(Translation* translation) {
+    qDebug()<<"added";
     QSqlQuery cur(db);
     cur.prepare("insert into bookmarks values (?,?)");
     cur.addBindValue(translation->key());

diff --git a/trunk/src/base/gui/MainWindow.cpp b/trunk/src/base/gui/MainWindow.cpp
index 8bf74a4..13192f7 100644 (file)
--- a/trunk/src/base/gui/MainWindow.cpp
+++ b/trunk/src/base/gui/MainWindow.cpp
@@ -348,9 +348,6 @@ void MainWindow::connectWordList() {
     connect(wordListWidget, SIGNAL(showTranslation(QList<Translation*>)),
             this, SIGNAL(searchTranslations(QList<Translation*>)));
 
-    //TODO TEMP
-    connect(wordListWidget, SIGNAL(showTranslation(QList<Translation*>)),
-            backbone, SLOT(addBookmark(QList<Translation*>)));
 
 
 
@@ -359,6 +356,9 @@ void MainWindow::connectWordList() {
 
     connect(this, SIGNAL(setIdle()),
             wordListWidget, SLOT(unlockList()));
+
+    connect(wordListWidget, SIGNAL(addToBookmarks(QList<Translation*>)),
+            backbone, SLOT(addBookmark(QList<Translation*>)));
 }
 
 void MainWindow::connectTranslationWidget() {

diff --git a/trunk/src/base/gui/WordListItem.cpp b/trunk/src/base/gui/WordListItem.cpp
index f2a7920..5319f25 100644 (file)
--- a/trunk/src/base/gui/WordListItem.cpp
+++ b/trunk/src/base/gui/WordListItem.cpp
@@ -33,6 +33,9 @@ WordListItem::WordListItem(QString text, QWidget *parent) :
     layout = new QHBoxLayout;
     setLayout(layout);
 
+    connect(button, SIGNAL(clicked()),
+            this, SLOT(buttonClicked()));
+
     initializeUI();
 
 }
@@ -98,3 +101,7 @@ void WordListItem::paintEvent(QPaintEvent *e) {
 
     QWidget::paintEvent(e);
 }
+
+void WordListItem::buttonClicked() {
+    emit buttonClicked(label->text());
+}

diff --git a/trunk/src/base/gui/WordListItem.h b/trunk/src/base/gui/WordListItem.h
index 460e1e1..0ed8e39 100644 (file)
--- a/trunk/src/base/gui/WordListItem.h
+++ b/trunk/src/base/gui/WordListItem.h
@@ -38,12 +38,16 @@ public:
 Q_SIGNALS:
     void clicked(QString text);
     void selected(QString text);
+    void buttonClicked(QString text);
 
 protected:
     void mousePressEvent(QMouseEvent *);
     void mouseReleaseEvent(QMouseEvent *);
     void paintEvent(QPaintEvent *);
 
+private Q_SLOTS:
+    void buttonClicked();
+
 private:
     QLabel* label;
     QIcon* icon;

diff --git a/trunk/src/base/gui/WordListWidget.cpp b/trunk/src/base/gui/WordListWidget.cpp
index 389c779..7135933 100644 (file)
--- a/trunk/src/base/gui/WordListWidget.cpp
+++ b/trunk/src/base/gui/WordListWidget.cpp
@@ -54,6 +54,9 @@ void WordListWidget::addWord(QString word) {
 
     connect(w, SIGNAL(selected(QString)),
             this, SLOT(itemSelected(QString)));
+
+    connect(w, SIGNAL(buttonClicked(QString)),
+            this, SLOT(itemButtonClicked(QString)));
 }
 
 void WordListWidget::clear() {
@@ -88,6 +91,10 @@ void WordListWidget::itemSelected(QString key) {
     }
 }
 
+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 6223e1d..9f808c3 100644 (file)
--- a/trunk/src/base/gui/WordListWidget.h
+++ b/trunk/src/base/gui/WordListWidget.h
@@ -46,6 +46,8 @@ Q_SIGNALS:
     //! objects
     void showTranslation(QList<Translation*>);
 
+    void addToBookmarks(QList<Translation*>);
+
 
 public Q_SLOTS:
     //! Shows search results
@@ -64,6 +66,7 @@ public Q_SLOTS:
 private Q_SLOTS:
     void itemClicked(QString key);
     void itemSelected(QString key);
+    void itemButtonClicked(QString key);
 
 private:
     //Backbone *backbone;

diff --git a/trunk/src/includes/GUIInterface.h b/trunk/src/includes/GUIInterface.h
index 7914ce1..1d8e9fb 100644 (file)
--- a/trunk/src/includes/GUIInterface.h
+++ b/trunk/src/includes/GUIInterface.h
@@ -182,6 +182,8 @@ Q_SIGNALS:
     /*! \param list of only active dictionaries
       */
     void selectedDictionaries(QList<CommonDictInterface* >);
+
+    void addToBookmarks(QList<Translation*>);
 };
 
 #endif // GUIINTERFACE_H