From f5c22995fc155ac701d6ea05280838d9770efde2 Mon Sep 17 00:00:00 2001 From: Hauke Schade Date: Sun, 2 Nov 2014 18:53:42 +0100 Subject: [PATCH] readded resources folder (as the js files are needed) and moved the images someplace else --- harbour-ttrss-cnlpete.pro | 2 ++ images.qrc | 21 +++++++++--------- {qml/ttrss => images}/resources/ic_all.png | Bin .../ttrss => images}/resources/ic_archive.png | Bin {qml/ttrss => images}/resources/ic_fresh.png | Bin {qml/ttrss => images}/resources/ic_read.png | Bin .../resources/ic_recently.png | Bin .../resources/ic_rss_disabled.png | Bin .../resources/ic_rss_enabled.png | Bin .../resources/ic_star_disabled.png | Bin .../resources/ic_star_enabled.png | Bin {qml/ttrss => images}/resources/ic_unread.png | Bin {qml/ttrss => images}/resources/ttrss256.png | Bin qml/ttrss/harmattan/MainPage.qml | 2 +- qml/ttrss/sailfish/pages/MainPage.qml | 2 +- 15 files changed, 15 insertions(+), 12 deletions(-) rename {qml/ttrss => images}/resources/ic_all.png (100%) rename {qml/ttrss => images}/resources/ic_archive.png (100%) rename {qml/ttrss => images}/resources/ic_fresh.png (100%) rename {qml/ttrss => images}/resources/ic_read.png (100%) rename {qml/ttrss => images}/resources/ic_recently.png (100%) rename {qml/ttrss => images}/resources/ic_rss_disabled.png (100%) rename {qml/ttrss => images}/resources/ic_rss_enabled.png (100%) rename {qml/ttrss => images}/resources/ic_star_disabled.png (100%) rename {qml/ttrss => images}/resources/ic_star_enabled.png (100%) rename {qml/ttrss => images}/resources/ic_unread.png (100%) rename {qml/ttrss => images}/resources/ttrss256.png (100%) diff --git a/harbour-ttrss-cnlpete.pro b/harbour-ttrss-cnlpete.pro index 8976fb5..e3fc057 100644 --- a/harbour-ttrss-cnlpete.pro +++ b/harbour-ttrss-cnlpete.pro @@ -40,6 +40,8 @@ qml_1.files = qml/ttrss/sailfish qml_1.path = $$INSTALL_ROOT/usr/share/$$TARGET/qml qml_2.files = qml/ttrss/models qml_2.path = $$INSTALL_ROOT/usr/share/$$TARGET/qml +qml_3.files = qml/ttrss/resources +qml_3.path = $$INSTALL_ROOT/usr/share/$$TARGET/qml INSTALLS += qml_1 qml_2 icon.files = images/$${TARGET}.png diff --git a/images.qrc b/images.qrc index fcd0163..812bfab 100644 --- a/images.qrc +++ b/images.qrc @@ -1,14 +1,15 @@ - qml/ttrss/resources/ic_all.png - qml/ttrss/resources/ic_archive.png - qml/ttrss/resources/ic_fresh.png - qml/ttrss/resources/ic_read.png - qml/ttrss/resources/ic_recently.png - qml/ttrss/resources/ic_rss_disabled.png - qml/ttrss/resources/ic_rss_enabled.png - qml/ttrss/resources/ic_star_disabled.png - qml/ttrss/resources/ic_star_enabled.png - qml/ttrss/resources/ic_unread.png + images/resources/ic_all.png + images/resources/ic_archive.png + images/resources/ic_fresh.png + images/resources/ic_read.png + images/resources/ic_recently.png + images/resources/ic_rss_disabled.png + images/resources/ic_rss_enabled.png + images/resources/ic_star_disabled.png + images/resources/ic_star_enabled.png + images/resources/ic_unread.png + images/resources/ttrss256.png diff --git a/qml/ttrss/resources/ic_all.png b/images/resources/ic_all.png similarity index 100% rename from qml/ttrss/resources/ic_all.png rename to images/resources/ic_all.png diff --git a/qml/ttrss/resources/ic_archive.png b/images/resources/ic_archive.png similarity index 100% rename from qml/ttrss/resources/ic_archive.png rename to images/resources/ic_archive.png diff --git a/qml/ttrss/resources/ic_fresh.png b/images/resources/ic_fresh.png similarity index 100% rename from qml/ttrss/resources/ic_fresh.png rename to images/resources/ic_fresh.png diff --git a/qml/ttrss/resources/ic_read.png b/images/resources/ic_read.png similarity index 100% rename from qml/ttrss/resources/ic_read.png rename to images/resources/ic_read.png diff --git a/qml/ttrss/resources/ic_recently.png b/images/resources/ic_recently.png similarity index 100% rename from qml/ttrss/resources/ic_recently.png rename to images/resources/ic_recently.png diff --git a/qml/ttrss/resources/ic_rss_disabled.png b/images/resources/ic_rss_disabled.png similarity index 100% rename from qml/ttrss/resources/ic_rss_disabled.png rename to images/resources/ic_rss_disabled.png diff --git a/qml/ttrss/resources/ic_rss_enabled.png b/images/resources/ic_rss_enabled.png similarity index 100% rename from qml/ttrss/resources/ic_rss_enabled.png rename to images/resources/ic_rss_enabled.png diff --git a/qml/ttrss/resources/ic_star_disabled.png b/images/resources/ic_star_disabled.png similarity index 100% rename from qml/ttrss/resources/ic_star_disabled.png rename to images/resources/ic_star_disabled.png diff --git a/qml/ttrss/resources/ic_star_enabled.png b/images/resources/ic_star_enabled.png similarity index 100% rename from qml/ttrss/resources/ic_star_enabled.png rename to images/resources/ic_star_enabled.png diff --git a/qml/ttrss/resources/ic_unread.png b/images/resources/ic_unread.png similarity index 100% rename from qml/ttrss/resources/ic_unread.png rename to images/resources/ic_unread.png diff --git a/qml/ttrss/resources/ttrss256.png b/images/resources/ttrss256.png similarity index 100% rename from qml/ttrss/resources/ttrss256.png rename to images/resources/ttrss256.png diff --git a/qml/ttrss/harmattan/MainPage.qml b/qml/ttrss/harmattan/MainPage.qml index 621d627..88e518e 100644 --- a/qml/ttrss/harmattan/MainPage.qml +++ b/qml/ttrss/harmattan/MainPage.qml @@ -42,7 +42,7 @@ Page { width: 256 height: 256 anchors.horizontalCenter: parent.horizontalCenter - source: "../resources/ttrss256.png" + source: "qrc:///images/ttrss256.png" anchors.bottomMargin: 50 } diff --git a/qml/ttrss/sailfish/pages/MainPage.qml b/qml/ttrss/sailfish/pages/MainPage.qml index c5b603f..8452911 100644 --- a/qml/ttrss/sailfish/pages/MainPage.qml +++ b/qml/ttrss/sailfish/pages/MainPage.qml @@ -69,7 +69,7 @@ Dialog { width: 256 height: 256 anchors.horizontalCenter: parent.horizontalCenter - source: "../../resources/ttrss256.png" + source: "qrc:///images/ttrss256.png" } TextField {