Merge branch 'master' into cache

Conflicts:
	trunk/src/base/base.pro
	trunk/src/plugins/xdxf/src/xdxfplugin.cpp

diff --cc trunk/src/base/base.pro
index d504c20,8d29e8a..03940d0
--- 1/trunk/src/base/base.pro
--- 2/trunk/src/base/base.pro
+++ b/trunk/src/base/base.pro
@@@ -1,28 -1,17 +1,23 @@@
- #-------------------------------------------------
- #
+ # -------------------------------------------------
  # Project created by QtCreator 2010-08-03T08:54:27
- #
 -# -------------------------------------------------
 +#-------------------------------------------------
 +
- QT       += core gui xmlpatterns xml
+ QT += core \
+     gui \
 -    sql
++    sql \
++    xml \
++    xmlpatterns
++
+ maemo5:QT += maemo5
 +
- maemo5 {
-     QT += maemo5
- }
 +
  TARGET = mdictionary
  TEMPLATE = app
- 
  MDICT_BINDIR = $$[MDICT_BINDIR]
- 
- isEmpty(MDICT_BINDIR) {
-   MDICT_BINDIR = .
- }
- 
+ isEmpty(MDICT_BINDIR):MDICT_BINDIR = .
  DESTDIR = $${MDICT_BINDIR}
- 
- SOURCES += gui/main.cpp\
-         gui/MainWindow.cpp \
+ SOURCES += gui/main.cpp \
+     gui/MainWindow.cpp \
      gui/SearchBarWidget.cpp \
      gui/WordListWidget.cpp \
      gui/TranslationWidget.cpp \
@@@ -49,40 -45,41 +51,43 @@@ HEADERS  += gui/MainWindow.h 
      gui/TranslationWidgetAutoResizer.h \
      ../includes/History.h \
      gui/HistoryListDialog.h \
-     ../includes/GUIInterface.h
+     ../includes/GUIInterface.h \
+     gui/WordListProxyStyle.h \
+     backbone/Bookmarks.h \
+     backbone/BookmarkTranslations.h \
+     gui/SettingsWidget.h \
+     gui/BookmarksWidget.h \
+     gui/WelcomeScreenWidget.h
  
  FORMS    += gui/MainWindow.ui
- 
- unix {
-   #VARIABLES
-   isEmpty(PREFIX) {
-     PREFIX = /usr
-   }
-   BINDIR = $$PREFIX/bin
-   DATADIR =$$PREFIX/share
- 
-   DEFINES += DATADIR=\\\"$$DATADIR\\\" PKGDATADIR=\\\"$$PKGDATADIR\\\"
- 
-   #MAKE INSTALL
- 
-   INSTALLS += target desktop icon64 configs
- 
-   configs.path = ~/.mdictionary
-   configs.files += ../../../data/mdictionary.defaults
- 
-   target.path =$$BINDIR
- 
- maemo5 {
-   desktop.path = $$DATADIR/applications/hildon
-   icon64.path = $$DATADIR/icons/hicolor/64x64/hildon
- }
- 
- unix {
-   desktop.path = $$DATADIR/applications
-   icon64.path = $$DATADIR/icons
- }
-   desktop.files += ../../../data/other/$${TARGET}.desktop
-   icon64.files += ../../../data/icons/64x64/$${TARGET}.png
+ RESOURCES += gui/gui.qrc
+ 
+ unix { 
+     # VARIABLES
+     isEmpty(PREFIX):PREFIX = /usr
+     BINDIR = $$PREFIX/bin
+     DATADIR = $$PREFIX/share
+     DEFINES += DATADIR=\\\"$$DATADIR\\\" \
+         PKGDATADIR=\\\"$$PKGDATADIR\\\"
+     
+     # MAKE INSTALL
+     INSTALLS += target \
+         desktop \
+         icon64 \
+         configs
+     configs.path = ~/.mdictionary
+     configs.files += ../../../data/mdictionary.defaults
+     target.path = $$BINDIR
+     maemo5 { 
+         desktop.path = $$DATADIR/applications/hildon
+         icon64.path = $$DATADIR/icons/hicolor/64x64/hildon
+     }
+     !maemo5 { 
+         desktop.path = $$DATADIR/applications
+         icon64.path = $$DATADIR/icons
+     }
+     desktop.files += ../../../data/other/$${TARGET}.desktop
+     icon64.files += ../../../data/icons/64x64/$${TARGET}.png
  }
 +
 +RESOURCES += xslt2.qrc

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

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

diff --cc trunk/src/plugins/xdxf/src/xdxfplugin.cpp
index 73c7e5f,807937e..7f1e985
--- 1/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
--- 2/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
+++ b/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
@@@ -100,10 -101,10 +101,11 @@@ QList<Translation*> XdxfPlugin::searchW
          cur.addBindValue(limit);
          cur.exec();
          while(cur.next())
-             translations.insert(new TranslationXdxf(cur.value(0).toString(),
-                                                     _infoNote, this));
+             translations.insert(new TranslationXdxf(
+                         cur.value(0).toString().toLower(),
+                         _infoNote, this));
 -        return translations.toList();
 +        db.close();
-         return translations.toList();
++      return translations.toList();
  }