From e14a639d714e59d8a303b8c7847bfcb8fd0e1f43 Mon Sep 17 00:00:00 2001 From: Jeena Date: Sat, 28 Feb 2015 21:43:53 +0100 Subject: [PATCH] restructured resource files directories --- FeedTheMonkey.pro | 4 +++- {resources/html => html}/content.css | 0 {resources/html => html}/content.html | 0 {resources/html => html}/content.js | 0 html/html.qrc | 7 ++++++ {resources/misc => misc}/Icon.icns | Bin .../misc => misc}/feedthemonkey.desktop | 0 {resources/misc => misc}/feedthemonkey.xpm | 0 misc/misc.qrc | 7 ++++++ {resources/qml => qml}/Content.qml | 2 +- {resources/qml => qml}/Login.qml | 0 {resources/qml => qml}/PostListItem.qml | 0 {resources/qml => qml}/Sidebar.qml | 0 {resources/qml => qml}/TheMenuBar.qml | 0 {resources/qml => qml}/main.qml | 0 qml/qml.qrc | 10 +++++++++ resources/resources.qrc | 20 ------------------ src/tinytinyrss.cpp | 2 +- 18 files changed, 29 insertions(+), 23 deletions(-) rename {resources/html => html}/content.css (100%) rename {resources/html => html}/content.html (100%) rename {resources/html => html}/content.js (100%) create mode 100644 html/html.qrc rename {resources/misc => misc}/Icon.icns (100%) rename {resources/misc => misc}/feedthemonkey.desktop (100%) rename {resources/misc => misc}/feedthemonkey.xpm (100%) create mode 100644 misc/misc.qrc rename {resources/qml => qml}/Content.qml (98%) rename {resources/qml => qml}/Login.qml (100%) rename {resources/qml => qml}/PostListItem.qml (100%) rename {resources/qml => qml}/Sidebar.qml (100%) rename {resources/qml => qml}/TheMenuBar.qml (100%) rename {resources/qml => qml}/main.qml (100%) create mode 100644 qml/qml.qrc delete mode 100644 resources/resources.qrc diff --git a/FeedTheMonkey.pro b/FeedTheMonkey.pro index f9f47f5..f555b0c 100644 --- 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 b/html/content.css similarity index 100% rename from resources/html/content.css rename to html/content.css diff --git a/resources/html/content.html b/html/content.html similarity index 100% rename from resources/html/content.html rename to html/content.html diff --git a/resources/html/content.js b/html/content.js similarity index 100% rename from resources/html/content.js rename to html/content.js diff --git a/html/html.qrc b/html/html.qrc new file mode 100644 index 0000000..90d8b19 --- /dev/null +++ b/html/html.qrc @@ -0,0 +1,7 @@ + + + content.css + content.html + content.js + + diff --git a/resources/misc/Icon.icns b/misc/Icon.icns similarity index 100% rename from resources/misc/Icon.icns rename to misc/Icon.icns diff --git a/resources/misc/feedthemonkey.desktop b/misc/feedthemonkey.desktop similarity index 100% rename from resources/misc/feedthemonkey.desktop rename to misc/feedthemonkey.desktop diff --git a/resources/misc/feedthemonkey.xpm b/misc/feedthemonkey.xpm similarity index 100% rename from resources/misc/feedthemonkey.xpm rename to misc/feedthemonkey.xpm diff --git a/misc/misc.qrc b/misc/misc.qrc new file mode 100644 index 0000000..615a2a0 --- /dev/null +++ b/misc/misc.qrc @@ -0,0 +1,7 @@ + + + feedthemonkey.xpm + Icon.icns + feedthemonkey.desktop + + diff --git a/resources/qml/Content.qml b/qml/Content.qml similarity index 98% rename from resources/qml/Content.qml rename to qml/Content.qml index 278f2d7..085902a 100644 --- a/resources/qml/Content.qml +++ b/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 b/qml/Login.qml similarity index 100% rename from resources/qml/Login.qml rename to qml/Login.qml diff --git a/resources/qml/PostListItem.qml b/qml/PostListItem.qml similarity index 100% rename from resources/qml/PostListItem.qml rename to qml/PostListItem.qml diff --git a/resources/qml/Sidebar.qml b/qml/Sidebar.qml similarity index 100% rename from resources/qml/Sidebar.qml rename to qml/Sidebar.qml diff --git a/resources/qml/TheMenuBar.qml b/qml/TheMenuBar.qml similarity index 100% rename from resources/qml/TheMenuBar.qml rename to qml/TheMenuBar.qml diff --git a/resources/qml/main.qml b/qml/main.qml similarity index 100% rename from resources/qml/main.qml rename to qml/main.qml diff --git a/qml/qml.qrc b/qml/qml.qrc new file mode 100644 index 0000000..c0ff3c6 --- /dev/null +++ b/qml/qml.qrc @@ -0,0 +1,10 @@ + + + main.qml + TheMenuBar.qml + Content.qml + Login.qml + PostListItem.qml + Sidebar.qml + + diff --git a/resources/resources.qrc b/resources/resources.qrc deleted file mode 100644 index e654991..0000000 --- a/resources/resources.qrc +++ /dev/null @@ -1,20 +0,0 @@ - - - html/content.css - html/content.html - html/content.js - - - qml/main.qml - qml/TheMenuBar.qml - qml/Content.qml - qml/Login.qml - qml/PostListItem.qml - qml/Sidebar.qml - - - misc/feedthemonkey.xpm - misc/Icon.icns - misc/feedthemonkey.desktop - - diff --git a/src/tinytinyrss.cpp b/src/tinytinyrss.cpp index a15aa62..9fc2a5d 100644 --- 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. }); }