serachBar + progressBar

[mdictionary] / src / mdictionary / mdictionary.pro

diff --git a/src/mdictionary/mdictionary.pro b/src/mdictionary/mdictionary.pro
index 0025ded..c31eed0 100644 (file)
--- a/src/mdictionary/mdictionary.pro
+++ b/src/mdictionary/mdictionary.pro
@@ -9,7 +9,8 @@ QT = core \
     xmlpatterns \
     sql \
     dbus \
-    webkit
+    webkit \
+    declarative
 
 maemo5:QT += maemo5
 
@@ -75,10 +76,20 @@ 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
+
 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
@@ -95,10 +106,22 @@ 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
+        css.path = $$DATA_DIR/css
+        css.files += ../../data/css_meego/style.css
+    }
+    else:maemo5 {
+        css.path = $$DATA_DIR/css
+        css.files += ../../data/css_maemo/style.css
+    }
+    else {
+        css.path = $$DATA_DIR/css
+        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
         css_images.files += ../../data/css_meego/images/header-border.png
@@ -106,25 +129,59 @@ 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
+        css.files += ../../data/css_maemo/style.css
+
+        css_images.path = $$DATA_DIR/css/images
+        css_images.files += ../../data/css_maemo/images/header-background.png
+        css_images.files += ../../data/css_maemo/images/header-border.png
+        css_images.files += ../../data/css_maemo/images/shadow-grey-bg.png
+        css_images.files += ../../data/css_maemo/images/shadow-white-bg.png
+        css_images.files += ../../data/css_maemo/images/tab-background.png
+        css_images.files += ../../data/css_maemo/images/key-background.png
     }
-    !meego {   
-       css.path = $$DATA_DIR/css
-       css.files += ../../data/css_maemo/style.css
-
-       css_images.path = $$DATA_DIR/css/images
-       css_images.files += ../../data/css_maemo/images/header-background.png
-       css_images.files += ../../data/css_maemo/images/header-border.png
-       css_images.files += ../../data/css_maemo/images/shadow-grey-bg.png
-       css_images.files += ../../data/css_maemo/images/shadow-white-bg.png
-       css_images.files += ../../data/css_maemo/images/tab-background.png
-       css_images.files += ../../data/css_maemo/images/key-background.png
+    else {
+        css.path = $$DATA_DIR/css
+        css.files += ../../data/css_desktop/style.css
+
+        css_images.path = $$DATA_DIR/css/images
+        css_images.files += ../../data/css_desktop/images/header-background.png
+        css_images.files += ../../data/css_desktop/images/header-border.png
+        css_images.files += ../../data/css_desktop/images/shadow-grey-bg.png
+        css_images.files += ../../data/css_desktop/images/shadow-white-bg.png
+        css_images.files += ../../data/css_desktop/images/tab-background.png
+        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
+    }
        
-    INSTALLS += desktop icon64 shared service css css_images
+    INSTALLS += desktop icon64 shared service css css_images qmls
 }