Merge branch 'qml' of ssh://drop.maemo.org/git/mdictionary into qml

Conflicts:
	src/mdictionary/mdictionary.pro

diff --combined src/mdictionary/mdictionary.pro
index c31eed0,5101211..8701e4e
--- 1/src/mdictionary/mdictionary.pro
--- 2/src/mdictionary/mdictionary.pro
+++ b/src/mdictionary/mdictionary.pro
@@@ -38,7 -38,8 +38,8 @@@ SOURCES += gui/main.cpp 
      gui/TranslationView.cpp \
      gui/DBusAdapter.cpp \
      gui/NotifyManager.cpp \
-     gui/SpinBox.cpp
+     gui/SpinBox.cpp \
+     gui/DictTypeModel.cpp
  
  HEADERS += gui/MainWindow.h \
      backbone/ConfigGenerator.h \
@@@ -69,7 -70,8 +70,8 @@@
      ../include/DictDialog.h \
      gui/DBusAdapter.h \
      gui/NotifyManager.h \
-     gui/SpinBox.h
+     gui/SpinBox.h \
+     gui/DictTypeModel.h
  
  RESOURCES += ../../data/gui.qrc
  
@@@ -83,7 -85,10 +85,11 @@@ OTHER_FILES += 
      qml/SearchBarWidget.qml \
      qml/IconButton.qml \
      qml/MyTextLineEdit.qml \
-     qml/ProgressBar.qml
++    qml/ProgressBar.qml \
+     qml/ElementsListView.qml \
+     qml/DictTypeSelectDialog.qml \
+     qml/DictManagerWidget.qml \
+     qml/WordListWidget.qml
  
  target.path = $$BIN_DIR
  INSTALLS += target
@@@ -129,8 -134,8 +135,8 @@@ unix 
          css_images.files += ../../data/css_meego/images/shadow-white-bg.png
          css_images.files += ../../data/css_meego/images/tab-background.png
          css_images.files += ../../data/css_meego/images/key-background.png
 -    css_images.files += ../../data/css_meego/images/shadow-transparent-bg. png
 -      css_images.files += ../../data/css_meego/images/splash2.png
 +        css_images.files += ../../data/css_meego/images/shadow-transparent-bg. png
 +        css_images.files += ../../data/css_meego/images/splash2.png
      }
      else:maemo5 {
          css.path = $$DATA_DIR/css
@@@ -178,7 -183,10 +184,11 @@@
        qmls.files += ./qml/SearchBarWidget.qml
        qmls.files += ./qml/IconButton.qml
        qmls.files += ./qml/MyTextLineEdit.qml
 +        qmls.files += ./qml/ProgressBar.qml
+         qmls.files += ./qml/ElementsListView.qml
+         qmls.files += ./qml/DictTypeSelectDialog.qml
+         qmls.files += ./qml/DictManagerWidget.qml
+         qmls.files += ./qml/WordListWidget.qml
      }
        
      INSTALLS += desktop icon64 shared service css css_images qmls