qml folder structure reorganized

main.cpp

@@ -40,7 +40,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
     viewer.rootContext()->setContextProperty("settings", Settings::instance());
 
     viewer.setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
-    viewer.setMainQmlFile(QLatin1String("qml/ttrss/main.qml"));
+    viewer.setMainQmlFile(QLatin1String("qml/harmattan/main.qml"));
     viewer.showExpanded();
 
     return app->exec();

qml/ttrss/harmattan/FeedItem.qml

@@ -180,19 +180,19 @@ Page {
                 showFeedItem()
             } }
         ToolIcon {
-            iconSource: "resources/ic_star_"+(marked?"enabled":"disabled")+".png"
+            iconSource: "../resources/ic_star_"+(marked?"enabled":"disabled")+".png"
             onClicked: {
                 feedItems.toggleStar()
                 marked = !marked
             } }
         ToolIcon {
-            iconSource: "resources/ic_rss_"+(rss?"enabled":"disabled")+".png"
+            iconSource: "../resources/ic_rss_"+(rss?"enabled":"disabled")+".png"
             onClicked: {
                 feedItems.togglePublished()
                 rss = !rss
             } }
         ToolIcon {
-            iconSource: "resources/ic_"+(unread?"unread":"read")+".png"
+            iconSource: "../resources/ic_"+(unread?"unread":"read")+".png"
             onClicked: {
                 feedItems.toggleRead()
                 unread = !unread

qml/ttrss/harmattan/FeedItemDelegate.qml

@@ -36,13 +36,13 @@ Item {
         spacing: constant.paddingMedium
         anchors.fill: parent
         Image {
-            source: "resources/ic_star_enabled.png"
+            source: "../resources/ic_star_enabled.png"
             visible: model.marked
             anchors.verticalCenter: parent.verticalCenter
             opacity: 0.5
         }
         Image {
-            source: "resources/ic_rss_enabled.png"
+            source: "../resources/ic_rss_enabled.png"
             visible: model.rss
             anchors.verticalCenter: parent.verticalCenter
             opacity: 0.5

qml/ttrss/harmattan/MainPage.qml

@@ -31,7 +31,7 @@ Page {
             width: 256
             height: 256
             anchors.horizontalCenter: parent.horizontalCenter
-            source: "resources/ttrss256.png"
+            source: "../resources/ttrss256.png"
 
             anchors.bottomMargin: 50
         }

qml/ttrss/harmattan/main.qml

@@ -12,7 +12,8 @@
 import QtQuick 1.1
 import com.nokia.meego 1.0
 import com.nokia.extras 1.1
-import "tinytinyrss.js" as TTRss
+import "../models/tinytinyrss.js" as TTRss
+import "../models" 1.0
 
 PageStackWindow {
     id: rootWindow

qml/ttrss/models/tinytinyrss.js

@@ -817,10 +817,10 @@ function getIconUrl(feedId) {
         return ''
         break;
     case constants['feeds']['starred']:
-        return "file:///opt/ttrss/qml/ttrss/resources/ic_star_enabled.png"
+        return "file:///opt/ttrss/qml/resources/ic_star_enabled.png"
         break;
     case constants['feeds']['published']:
-        return "file:///opt/ttrss/qml/ttrss/resources/ic_rss_enabled.png"
+        return "file:///opt/ttrss/qml/resources/ic_rss_enabled.png"
         break;
     default:
         return state['shorturl'] + state['icons_url'] + '/' + feedId + '.ico'

ttrss.pro

@@ -2,11 +2,15 @@ VERSION = 0.3.2
 DEFINES += APP_VERSION=\\\"$$VERSION\\\"
 
 # Add more folders to ship with the application, here
-folder_01.source = qml/ttrss
+folder_01.source = qml/ttrss/models
 folder_01.target = qml
-folder_02.source = qml/components
+folder_02.source = qml/ttrss/harmattan
 folder_02.target = qml
-DEPLOYMENTFOLDERS = folder_01 folder_02
+folder_03.source = qml/ttrss/components
+folder_03.target = qml
+folder_04.source = qml/ttrss/resources
+folder_04.target = qml
+DEPLOYMENTFOLDERS = folder_01 folder_02 folder_03 folder_04
 
 # Additional import path used to resolve QML modules in Creator's code model
 QML_IMPORT_PATH =