Merge branch 'bookmarks' into gui

Conflicts:
	trunk/src/base/base.pro
	trunk/src/base/gui/WordListItem.cpp
	trunk/src/base/gui/WordListProxyStyle.h
	trunk/src/base/gui/WordListWidget.cpp
	trunk/src/base/gui/WordListWidget.h

diff --cc trunk/src/base/base.pro
index 07d62a1,f48ede5..784ab8f
--- 1/trunk/src/base/base.pro
--- 2/trunk/src/base/base.pro
+++ b/trunk/src/base/base.pro
@@@ -33,7 -33,8 +33,8 @@@ SOURCES += gui/main.cpp
      gui/DictTypeSelectDialog.cpp \
      backbone/History.cpp \
      gui/HistoryListDialog.cpp \
-     gui/WordListProxyStyle.cpp
++    gui/WordListProxyStyle.cpp \
+     backbone/Bookmarks.cpp \
 -    gui/WordListItem.cpp
  
  HEADERS  += gui/MainWindow.h \
      gui/SearchBarWidget.h \
@@@ -51,7 -52,9 +52,9 @@@
      ../includes/History.h \
      gui/HistoryListDialog.h \
      ../includes/GUIInterface.h \
-     gui/WordListProxyStyle.h
++    gui/WordListProxyStyle.h \
+     backbone/Bookmarks.h \
 -    gui/WordListItem.h \
+     backbone/BookmarkTranslations.h
  
  FORMS    += gui/MainWindow.ui
  

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

diff --cc trunk/src/base/gui/WordListWidget.cpp
index f8133ed,7135933..9f03ade
--- 1/trunk/src/base/gui/WordListWidget.cpp
--- 2/trunk/src/base/gui/WordListWidget.cpp
+++ b/trunk/src/base/gui/WordListWidget.cpp
@@@ -66,22 -77,24 +66,26 @@@ void WordListWidget::showSearchResults
      for(i = result.begin(); i != result.end(); i++) {
             addWord(i.key());
      }
 -
  }
  
 -void WordListWidget::itemClicked(QString key) {
 -    emit showTranslation(searchResult[key]);
 +void WordListWidget::wordClicked(QListWidgetItem *item) {
 +    if(itemState == item->checkState()) {
 +        emit showTranslation(
 +                searchResult[item->data(Qt::DisplayRole).toString()]);
 +    }
 +    else {
 +        qDebug()<<"edited";
 +    }
  }
  
 -void WordListWidget::itemSelected(QString key) {
 -    for(int i = 0; i < items.count(); i++) {
 -        if(items.at(i)->text() != key)
 -            items.at(i)->unselect();
 -    }
 +void WordListWidget::wordPressed(QListWidgetItem *item) {
 +    itemState = item->checkState();
  }
  
+ void WordListWidget::itemButtonClicked(QString key) {
+     emit addToBookmarks(searchResult[key]);
+ }
+ 
  void WordListWidget::lockList() {
      setEnabled(false);
  }

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