restructured resource files directories

jeena · Feb 28, 2015 · e14a639 · e14a639
1 parent b6c0d89
commit e14a639
Show file tree

Hide file tree

Showing 18 changed files with 29 additions and 23 deletions.
diff --git a/FeedTheMonkey.pro b/FeedTheMonkey.pro
@@ -11,7 +11,9 @@ SOURCES += \
     src/tinytinyrsslogin.cpp
 
 RESOURCES += \
-    resources/resources.qrc \
+    html/html.qrc \
+    misc/misc.qrc \
+    qml/qml.qrc \
 
 mac {
     RC_FILE = misc/Icon.icns

diff --git a/resources/html/content.css → html/content.css b/resources/html/content.css → html/content.css
diff --git a/resources/html/content.html → html/content.html b/resources/html/content.html → html/content.html
diff --git a/resources/html/content.js → html/content.js b/resources/html/content.js → html/content.js
diff --git a/html/html.qrc b/html/html.qrc
@@ -0,0 +1,7 @@
+<RCC>
+    <qresource prefix="/html">
+        <file>content.css</file>
+        <file>content.html</file>
+        <file>content.js</file>
+    </qresource>
+</RCC>
diff --git a/resources/misc/Icon.icns → misc/Icon.icns b/resources/misc/Icon.icns → misc/Icon.icns
diff --git a/resources/misc/feedthemonkey.desktop → misc/feedthemonkey.desktop b/resources/misc/feedthemonkey.desktop → misc/feedthemonkey.desktop
diff --git a/resources/misc/feedthemonkey.xpm → misc/feedthemonkey.xpm b/resources/misc/feedthemonkey.xpm → misc/feedthemonkey.xpm
diff --git a/misc/misc.qrc b/misc/misc.qrc
@@ -0,0 +1,7 @@
+<RCC>
+    <qresource prefix="/misc">
+        <file>feedthemonkey.xpm</file>
+        <file>Icon.icns</file>
+	<file>feedthemonkey.desktop</file>
+    </qresource>
+</RCC>
diff --git a/resources/qml/Content.qml → qml/Content.qml b/resources/qml/Content.qml → qml/Content.qml
@@ -46,7 +46,7 @@ ScrollView {
 
     WebView {
         id: webView
-        url: "content.html"
+        url: "../html/content.html"
 
         // Enable communication between QML and WebKit
         experimental.preferences.navigatorQtObjectEnabled: true;

diff --git a/resources/qml/Login.qml → qml/Login.qml b/resources/qml/Login.qml → qml/Login.qml
diff --git a/resources/qml/PostListItem.qml → qml/PostListItem.qml b/resources/qml/PostListItem.qml → qml/PostListItem.qml
diff --git a/resources/qml/Sidebar.qml → qml/Sidebar.qml b/resources/qml/Sidebar.qml → qml/Sidebar.qml
diff --git a/resources/qml/TheMenuBar.qml → qml/TheMenuBar.qml b/resources/qml/TheMenuBar.qml → qml/TheMenuBar.qml
diff --git a/resources/qml/main.qml → qml/main.qml b/resources/qml/main.qml → qml/main.qml
diff --git a/qml/qml.qrc b/qml/qml.qrc
@@ -0,0 +1,10 @@
+<RCC>
+    <qresource prefix="/qml">
+        <file>main.qml</file>
+        <file>TheMenuBar.qml</file>
+        <file>Content.qml</file>
+        <file>Login.qml</file>
+        <file>PostListItem.qml</file>
+        <file>Sidebar.qml</file>
+    </qresource>
+</RCC>
diff --git a/resources/resources.qrc b/resources/resources.qrc
diff --git a/src/tinytinyrss.cpp b/src/tinytinyrss.cpp
@@ -100,7 +100,7 @@ void TinyTinyRSS::onPostReadChanged(bool r)
 {
     Post *post = (Post *)sender();
 
-    updateArticle(post->id(), 2, !r, [post] (const QJsonObject &json) {
+    updateArticle(post->id(), 2, !r, [post] (const QJsonObject &) {
         // not doing anything with this yet.
     });
 }