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

[mdictionary] / src / mdictionary / mdictionary.pro

diff --git a/src/mdictionary/mdictionary.pro b/src/mdictionary/mdictionary.pro
index d049501..b790af9 100644 (file)
--- a/src/mdictionary/mdictionary.pro
+++ b/src/mdictionary/mdictionary.pro
@@ -38,7 +38,9 @@ SOURCES += gui/main.cpp \
     gui/TranslationView.cpp \
     gui/DBusAdapter.cpp \
     gui/NotifyManager.cpp \
-    gui/SpinBox.cpp
+    gui/SpinBox.cpp \
+    gui/DictTypeModel.cpp \
+    gui/DictManagerModel.cpp
 
 HEADERS += gui/MainWindow.h \
     backbone/ConfigGenerator.h \
@@ -69,17 +71,38 @@ HEADERS += gui/MainWindow.h \
     ../include/DictDialog.h \
     gui/DBusAdapter.h \
     gui/NotifyManager.h \
-    gui/SpinBox.h
+    gui/SpinBox.h \
+    gui/DictTypeModel.h \
+    gui/DictManagerModel.h
 
 RESOURCES += ../../data/gui.qrc
 
 TRANSLATIONS += pl_PL.ts \
                 en_US.ts
 
+OTHER_FILES += \
+    qml/WelcomeScreenWidget.qml \
+    qml/Button.qml \
+    qml/AboutWidget.qml \
+    qml/SearchBarWidget.qml \
+    qml/IconButton.qml \
+    qml/MyTextLineEdit.qml \
+    qml/ProgressBar.qml \
+    qml/ElementsListView.qml \
+    qml/DictTypeSelectDialog.qml \
+    qml/DictManagerWidget.qml \
+    qml/WordListWidget.qml \
+    qml/TranslationView.qml \
+    qml/FlickableWebView.qml \
+    qml/ScrollBar.qml \
+    qml/SpinBox.qml
+    qml/Checkbox.qml
+
 target.path = $$BIN_DIR
 INSTALLS += target
 
 unix { 
+        #icons and misc
        maemo5 {
                desktop.path = $$SHARE_DIR/applications/hildon
                icon64.path = $$SHARE_DIR/icons/hicolor/64x64/hildon
@@ -96,6 +119,7 @@ unix {
     shared.files += ../../data/icons/16x16/staron.png
     shared.files += ../../data/xsl/mask.png
 
+    #css
     meego {
         css.path = $$DATA_DIR/css
         css.files += ../../data/css_meego/style.css
@@ -109,6 +133,7 @@ unix {
         css.files += ../../data/css_desktop/style.css
     }
 
+    #css images
     meego {
        css_images.path = $$DATA_DIR/css/images
         css_images.files += ../../data/css_meego/images/header-background.png
@@ -117,8 +142,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
@@ -145,19 +170,41 @@ unix {
         css_images.files += ../../data/css_desktop/images/key-background.png
     }
 
+    #services
     service.path = $$SHARE_DIR/dbus-1/services
     service.files += ../../data/other/com.comarch.mdictionary.service
+
+    #qmls (stub)
+    meego {
+        qmls.path = $$DATA_DIR/qml
+        qmls.files += ./qml/WelcomeScreenWidget.qml
+    }
+    else:maemo5 {
+        qmls.path = $$DATA_DIR/qml
+        qmls.files += ./qml/WelcomeScreenWidget.qml
+    }
+    else {
+        qmls.path = $$DATA_DIR/qml
+        qmls.files += ./qml/WelcomeScreenWidget.qml
+       qmls.files += ./qml/Button.qml 
+       qmls.files += ./qml/AboutWidget.qml
+       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
+        qmls.files += ./qml/TranslationView.qml
+        qmls.files += ./qml/FlickableWebView.qml
+        qmls.files += ./qml/ScrollBar.qml
+        qmls.files += ./qml/Checkbox.qml
+    }
        
-    INSTALLS += desktop icon64 shared service css css_images
+    INSTALLS += desktop icon64 shared service css css_images qmls
 }
 
 
 check.commands = echo 'No check here'
 QMAKE_EXTRA_TARGETS += check
-
-OTHER_FILES += \
-    qml/Button.qml \
-    qml/AboutWidget.qml \
-    qml/SearchBarWidget.qml \
-    qml/IconButton.qml \
-    qml/MyTextLineEdit.qml