From: Marcin Kaźmierczak <marcin@marcin-desktop.(none)>
Date: Thu, 23 Dec 2010 10:52:06 +0000 (+0100)
Subject: Merge branch 'qml' of ssh://drop.maemo.org/git/mdictionary into qml
X-Git-Url: https://vcs.maemo.org/git/?a=commitdiff_plain;h=cbfbd3db6fa29e3415d3d980e94281b1c0ea14b5;hp=-c;p=mdictionary

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

cbfbd3db6fa29e3415d3d980e94281b1c0ea14b5
diff --combined src/mdictionary/mdictionary.pro
index 16df3d5,8ee4658..cc5af0a
--- a/src/mdictionary/mdictionary.pro
+++ b/src/mdictionary/mdictionary.pro
@@@ -39,8 -39,7 +39,8 @@@ SOURCES += gui/main.cpp 
      gui/DBusAdapter.cpp \
      gui/NotifyManager.cpp \
      gui/SpinBox.cpp \
 -    gui/DictTypeModel.cpp
 +    gui/DictTypeModel.cpp \
 +    gui/DictManagerModel.cpp
  
  HEADERS += gui/MainWindow.h \
      backbone/ConfigGenerator.h \
@@@ -72,8 -71,7 +72,8 @@@
      gui/DBusAdapter.h \
      gui/NotifyManager.h \
      gui/SpinBox.h \
 -    gui/DictTypeModel.h
 +    gui/DictTypeModel.h \
 +    gui/DictManagerModel.h
  
  RESOURCES += ../../data/gui.qrc
  
@@@ -91,7 -89,8 +91,8 @@@ OTHER_FILES += 
      qml/ElementsListView.qml \
      qml/DictTypeSelectDialog.qml \
      qml/DictManagerWidget.qml \
-     qml/WordListWidget.qml
+     qml/WordListWidget.qml \
+     qml/TranslationView.qml
  
  target.path = $$BIN_DIR
  INSTALLS += target
@@@ -191,6 -190,7 +192,7 @@@ unix 
          qmls.files += ./qml/DictTypeSelectDialog.qml
          qmls.files += ./qml/DictManagerWidget.qml
          qmls.files += ./qml/WordListWidget.qml
+         qmls.files += ./qml/TranslationView.qml
      }
  	
      INSTALLS += desktop icon64 shared service css css_images qmls