Changes - SailfishOS Open Build Service

Changes of Revision 7

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

[-] [+]	Changed	_service:tar_git:harbour-ttrss-cnlpete.changes
@@ -1,4 +1,8 @@ -* Fri Jan 25 2022 Hauke Schade <cnlpete@cnlpete.de> 0.7.4-1-dev +* Sun Jan 16 2022 Hauke Schade <cnlpete@cnlpete.de> 0.7.5-1-dev +- fix support for SailJail +- added material svg icons + +* Fri Jan 14 2022 Hauke Schade <cnlpete@cnlpete.de> 0.7.4-1-dev - add support for chum builds - add support for SailJail
[-] [+]	Changed	_service:tar_git:harbour-ttrss-cnlpete.spec ^
@@ -13,7 +13,7 @@ %{!?qtc_make:%define qtc_make make} %{?qtc_builddir:%define _builddir %qtc_builddir} Summary: Tiny Tiny RSS Reader -Version: 0.7.4+master.20220114211133.8.gf3eda7a +Version: 0.7.5+master.20220116150053.74226a2 Release: v0.3.5 Group: Applications/Internet License: GPLv2+
[-] [+]	Changed	_service ^
@@ -2,7 +2,7 @@ <service name="tar_git"> <param name="url">https://github.com/cnlpete/ttrss.git</param> <param name="branch">master</param> - <param name="revision">f3eda7acc5275330a1db860fbe066957a0d21e2e</param> + <param name="revision">sailfish-v0.7.5-1</param> <param name="token">sailfish</param> </service> </services>
[-] [+]	Changed	_service:tar_git:harbour-ttrss-cnlpete-0.7.5+master.20220116150053.74226a2.tar.bz2/.github/workflows/main.yml ^
@@ -30,7 +30,7 @@ - name: Upload build result uses: actions/upload-artifact@v2 with: - name: sailfish-syncthing-bin-rpms + name: harbour-ttrss-rpms path: RPMS - name: Build aarch64 @@ -43,7 +43,7 @@ - name: Upload build result uses: actions/upload-artifact@v2 with: - name: sailfish-syncthing-bin-rpms + name: harbour-ttrss-rpms path: RPMS - name: Build i486 @@ -58,3 +58,16 @@ with: name: harbour-ttrss-rpms path: RPMS + + - name: Create release + if: contains(github.ref, 'release') + run: \| + set -x + assets=() + for asset in RPMS/.rpm; do + assets+=("-a" "$asset") + done + tag_name="${GITHUB_REF##/}" + hub release create "${assets[@]}" -m "$tag_name" "$tag_name" + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
[-] [+]	Changed	_service:tar_git:harbour-ttrss-cnlpete-0.7.5+master.20220116150053.74226a2.tar.bz2/README.md ^
@@ -11,6 +11,7 @@ ---------- * TinyTinyRSS Logo is taken from the [Android Project](http://tt-rss.org/redmine/projects/tt-rss-android/wiki/) * All other Icons are free Icons provided by [IconFinder](http://www.iconfinder.com/search/?q=iconset%3Adevelopperss) +* newer Icons are taken from [Google Material Icon Font](http://google.github.io/material-design-icons) * The Harmattan Desktop Icon was generated using the amazing [Harmattan Icon Generator](http://apps.javispedro.com/nit/hicg/) by [Javier S. Pedro](https://gitorious.org/hicg/hicg) Translations
[-] [+]	Changed	_service:tar_git:harbour-ttrss-cnlpete-0.7.5+master.20220116150053.74226a2.tar.bz2/harbour-ttrss-cnlpete.desktop ^
@@ -6,9 +6,9 @@ Exec=harbour-ttrss-cnlpete [X-HarbourBackup] -BackupPathList=.config/harbour-ttrss-cnlpete/ +BackupPathList=.config/de.cnlpete/ttrss/ [X-Sailjail] -Permissions=Internet +Permissions=Internet;WebView OrganizationName=de.cnlpete ApplicationName=ttrss
[-] [+]	Changed	_service:tar_git:harbour-ttrss-cnlpete-0.7.5+master.20220116150053.74226a2.tar.bz2/images.qrc ^
@@ -11,5 +11,9 @@ <file alias="ic_star_enabled.png">images/resources/ic_star_enabled.png</file> <file alias="ic_unread.png">images/resources/ic_unread.png</file> <file alias="ttrss256.png">images/resources/ttrss256.png</file> + <file alias="ic_rss.svg">images/resources/material/rss_feed_black_48dp.svg</file> + <file alias="ic_star.svg">images/resources/material/star_black_48dp.svg</file> + <file alias="ic_read.svg">images/resources/material/check_circle_black_48dp.svg</file> + <file alias="ic_unread.svg">images/resources/material/circle_black_48dp.svg</file> </qresource> </RCC>
[-] [+]	Added	_service:tar_git:harbour-ttrss-cnlpete-0.7.5+master.20220116150053.74226a2.tar.bz2/images/resources/material/LICENSE ^
@@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS,
[-] [+]	Added	_service:tar_git:harbour-ttrss-cnlpete-0.7.5+master.20220116150053.74226a2.tar.bz2/images/resources/material/Readme.md ^
@@ -0,0 +1,3 @@ +# Info + +[Google Material Icons](http://google.github.io/material-design-icons) downloaded from [fonts.google.com](https://fonts.google.com/icons?selected=Material+Icons) under [Open Source License Apache 2.0](LICENSE)
[-] [+]	Added	_service:tar_git:harbour-ttrss-cnlpete-0.7.5+master.20220116150053.74226a2.tar.bz2/images/resources/material/check_circle_black_24dp.svg ^
@@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-2 15l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"/></svg> \ No newline at end of file
[-] [+]	Added	_service:tar_git:harbour-ttrss-cnlpete-0.7.5+master.20220116150053.74226a2.tar.bz2/images/resources/material/check_circle_black_48dp.svg ^
@@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" height="48px" viewBox="0 0 24 24" width="48px" fill="#000000"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-2 15l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"/></svg> \ No newline at end of file
[-] [+]	Added	_service:tar_git:harbour-ttrss-cnlpete-0.7.5+master.20220116150053.74226a2.tar.bz2/images/resources/material/circle_black_24dp.svg ^
@@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.47 2 2 6.47 2 12s4.47 10 10 10 10-4.47 10-10S17.53 2 12 2z"/></svg> \ No newline at end of file
[-] [+]	Added	_service:tar_git:harbour-ttrss-cnlpete-0.7.5+master.20220116150053.74226a2.tar.bz2/images/resources/material/circle_black_48dp.svg ^
@@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" height="48px" viewBox="0 0 24 24" width="48px" fill="#000000"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.47 2 2 6.47 2 12s4.47 10 10 10 10-4.47 10-10S17.53 2 12 2z"/></svg> \ No newline at end of file
[-] [+]	Added	_service:tar_git:harbour-ttrss-cnlpete-0.7.5+master.20220116150053.74226a2.tar.bz2/images/resources/material/rss_feed_black_24dp.svg ^
@@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><path d="M0 0h24v24H0z" fill="none"/><circle cx="6.18" cy="17.82" r="2.18"/><path d="M4 4.44v2.83c7.03 0 12.73 5.7 12.73 12.73h2.83c0-8.59-6.97-15.56-15.56-15.56zm0 5.66v2.83c3.9 0 7.07 3.17 7.07 7.07h2.83c0-5.47-4.43-9.9-9.9-9.9z"/></svg> \ No newline at end of file
[-] [+]	Added	_service:tar_git:harbour-ttrss-cnlpete-0.7.5+master.20220116150053.74226a2.tar.bz2/images/resources/material/rss_feed_black_48dp.svg ^
@@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" height="48px" viewBox="0 0 24 24" width="48px" fill="#000000"><path d="M0 0h24v24H0z" fill="none"/><circle cx="6.18" cy="17.82" r="2.18"/><path d="M4 4.44v2.83c7.03 0 12.73 5.7 12.73 12.73h2.83c0-8.59-6.97-15.56-15.56-15.56zm0 5.66v2.83c3.9 0 7.07 3.17 7.07 7.07h2.83c0-5.47-4.43-9.9-9.9-9.9z"/></svg> \ No newline at end of file
[-] [+]	Added	_service:tar_git:harbour-ttrss-cnlpete-0.7.5+master.20220116150053.74226a2.tar.bz2/images/resources/material/star_black_24dp.svg ^
@@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><path d="M0 0h24v24H0z" fill="none"/><path d="M0 0h24v24H0z" fill="none"/><path d="M12 17.27L18.18 21l-1.64-7.03L22 9.24l-7.19-.61L12 2 9.19 8.63 2 9.24l5.46 4.73L5.82 21z"/></svg> \ No newline at end of file
[-] [+]	Added	_service:tar_git:harbour-ttrss-cnlpete-0.7.5+master.20220116150053.74226a2.tar.bz2/images/resources/material/star_black_48dp.svg ^
@@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" height="48px" viewBox="0 0 24 24" width="48px" fill="#000000"><path d="M0 0h24v24H0z" fill="none"/><path d="M0 0h24v24H0z" fill="none"/><path d="M12 17.27L18.18 21l-1.64-7.03L22 9.24l-7.19-.61L12 2 9.19 8.63 2 9.24l5.46 4.73L5.82 21z"/></svg> \ No newline at end of file
[-] [+]	Changed	_service:tar_git:harbour-ttrss-cnlpete-0.7.5+master.20220116150053.74226a2.tar.bz2/main.cpp ^
@@ -57,7 +57,7 @@ Q_DECL_EXPORT int main(int argc, char argv[]) { #if defined(Q_OS_SAILFISH) - QGuiApplication app = SailfishApp::application(argc, argv); + QScopedPointer<QGuiApplication> app(SailfishApp::application(argc, argv)); #elif (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) QScopedPointer<QGuiApplication> app(new QGuiApplication(argc, argv)); #else @@ -67,6 +67,7 @@ app->setApplicationVersion(APP_VERSION); app->setApplicationName(QStringLiteral("ttrss")); app->setOrganizationName(QStringLiteral("de.cnlpete")); + app->setOrganizationDomain(QStringLiteral("de.cnlpete")); // check for old settings files, try to migrate to new location Settings::migrateSettings_v1();
[-] [+]	Changed	_service:tar_git:harbour-ttrss-cnlpete-0.7.5+master.20220116150053.74226a2.tar.bz2/qml/ttrss/sailfish/pages/FeedItem.qml ^
@@ -141,27 +141,24 @@ } spacing: Theme.paddingSmall - Image { - id: starImage + Icon { + source: "qrc:///images/ic_star.svg" + height: dateLabel.height + width: height + color: Theme.highlightColor opacity: marked ? 1 : 0 - width: 32 - height: 32 - sourceSize.width: 32 - sourceSize.height: 32 - source: "qrc:///images/ic_star_enabled.png" Behavior on opacity { FadeAnimation{} } } - Image { - id: rssImage + Icon { + source: "qrc:///images/ic_rss.svg" + height: dateLabel.height + width: height + color: Theme.highlightColor opacity: rss ? 1 : 0 - width: 32 - height: 32 - sourceSize.width: 32 - sourceSize.height: 32 - source: "qrc:///images/ic_rss_enabled.png" Behavior on opacity { FadeAnimation{} } } Label { + id: dateLabel text: date font.pixelSize: Theme.fontSizeSmall font.weight: Font.Light @@ -307,6 +304,7 @@ anchors.centerIn: parent IconButton { + id: previousButton icon.source: "image://theme/icon-m-previous" enabled: previousId !== false onClicked: { @@ -318,9 +316,10 @@ } IconButton { - icon.source: "qrc:///images/ic_rss_" - + (rss ? "enabled" : "disabled") + ".png" - icon.color: undefined + icon.source: "qrc:///images/ic_rss.svg" + icon.color: rss ? Theme.highlightColor : Theme.secondaryColor + icon.width: Theme.iconSizeSmallPlus + icon.height: Theme.iconSizeSmallPlus onClicked: { feedItemModel.togglePublished(function(successful, errorMessage, @@ -332,9 +331,10 @@ } IconButton { - icon.source: "qrc:///images/ic_star_" - + (marked ? "enabled" : "disabled") + ".png" - icon.color: undefined + icon.source: "qrc:///images/ic_star.svg" + icon.color: marked ? Theme.highlightColor : Theme.secondaryColor + icon.width: Theme.iconSizeSmallPlus + icon.height: Theme.iconSizeSmallPlus onClicked: { feedItemModel.toggleStar(function(successful, errorMessage, state) { @@ -346,8 +346,10 @@ IconButton { icon.source: "qrc:///images/ic_" - + (unread ? "unread" : "read") + ".png" - icon.color: undefined + + (unread ? "unread" : "read") + ".svg" + icon.color: unread ? Theme.highlightColor : Theme.secondaryColor + icon.width: Theme.iconSizeSmallPlus + icon.height: Theme.iconSizeSmallPlus onClicked: { feedItemModel.toggleRead(function(successful, errorMessage, state) { @@ -386,9 +388,10 @@ } IconButton { - icon.source: "qrc:///images/ic_rss_" - + (rss ? "enabled" : "disabled") + ".png" - icon.color: undefined + icon.source: "qrc:///images/ic_rss.svg" + icon.color: rss ? Theme.highlightColor : Theme.secondaryColor + icon.width: Theme.iconSizeSmallPlus + icon.height: Theme.iconSizeSmallPlus onClicked: { feedItemModel.togglePublished(function(successful, errorMessage, @@ -400,9 +403,10 @@ } IconButton { - icon.source: "qrc:///images/ic_star_" - + (marked ? "enabled" : "disabled") + ".png" - icon.color: undefined + icon.source: "qrc:///images/ic_star.svg" + icon.color: marked ? Theme.highlightColor : Theme.secondaryColor + icon.width: Theme.iconSizeSmallPlus + icon.height: Theme.iconSizeSmallPlus onClicked: { feedItemModel.toggleStar(function(successful, errorMessage, state) { @@ -414,8 +418,10 @@ IconButton { icon.source: "qrc:///images/ic_" - + (unread ? "unread" : "read") + ".png" - icon.color: undefined + + (unread ? "unread" : "read") + ".svg" + icon.color: unread ? Theme.highlightColor : Theme.secondaryColor + icon.width: Theme.iconSizeSmallPlus + icon.height: Theme.iconSizeSmallPlus onClicked: { feedItemModel.toggleRead(function(successful, errorMessage, state) {
[-] [+]	Changed	_service:tar_git:harbour-ttrss-cnlpete-0.7.5+master.20220116150053.74226a2.tar.bz2/qml/ttrss/sailfish/pages/FeedItemDelegate.qml ^
@@ -38,19 +38,28 @@ Row { id: markerRow spacing: Theme.paddingMedium - anchors.fill: parent - anchors.leftMargin: (icon.visible ? icon.width : 0) + Theme.paddingMedium - Image { - source: "qrc:///images/ic_star_enabled.png" + anchors.rightMargin: Theme.paddingMedium + anchors.right: parent.right + + Icon { + source: "qrc:///images/ic_star.svg" visible: model.marked + color: Theme.highlightColor + highlighted: listItem.highlighted anchors.verticalCenter: parent.verticalCenter opacity: 0.5 + width: Theme.iconSizeSmallPlus + height: Theme.iconSizeSmallPlus } - Image { - source: "qrc:///images/ic_rss_enabled.png" + Icon { + source: "qrc:///images/ic_rss.svg" visible: model.rss + color: Theme.highlightColor + highlighted: listItem.highlighted anchors.verticalCenter: parent.verticalCenter opacity: 0.5 + width: Theme.iconSizeSmallPlus + height: Theme.iconSizeSmallPlus } }
[-] [+]	Changed	_service:tar_git:harbour-ttrss-cnlpete-0.7.5+master.20220116150053.74226a2.tar.bz2/qml/ttrss/sailfish/pages/FeedItems.qml ^
@@ -89,9 +89,10 @@ IconButton { enabled: feedItemModel.selectedItems > 0 - icon.source: "qrc:///images/ic_rss_" - + (feedItemModel.allPublished ? "enabled" : "disabled") + ".png" - icon.color: undefined + icon.source: "qrc:///images/ic_rss.svg" + icon.color: feedItemModel.allPublished ? Theme.highlightColor : Theme.secondaryColor + icon.width: Theme.iconSizeSmallPlus + icon.height: Theme.iconSizeSmallPlus onClicked: { feedItemModel.setAllSelectedRSSState(!feedItemModel.allPublished) } @@ -99,9 +100,10 @@ IconButton { enabled: feedItemModel.selectedItems > 0 - icon.source: "qrc:///images/ic_star_" - + (feedItemModel.allStarred ? "enabled" : "disabled") + ".png" - icon.color: undefined + icon.source: "qrc:///images/ic_star.svg" + icon.color: feedItemModel.allStarred ? Theme.highlightColor : Theme.secondaryColor + icon.width: Theme.iconSizeSmallPlus + icon.height: Theme.iconSizeSmallPlus onClicked: { feedItemModel.setAllSelectedMarkedState(!feedItemModel.allStarred) } @@ -110,8 +112,10 @@ IconButton { enabled: feedItemModel.selectedItems > 0 icon.source: "qrc:///images/ic_" - + (feedItemModel.allUnread ? "unread" : "read") + ".png" - icon.color: undefined + + (feedItemModel.allUnread ? "unread" : "read") + ".svg" + icon.color: feedItemModel.allUnread ? Theme.highlightColor : Theme.secondaryColor + icon.width: Theme.iconSizeSmallPlus + icon.height: Theme.iconSizeSmallPlus onClicked: { feedItemModel.setAllSelectedReadState(feedItemModel.allUnread) }
[-] [+]	Changed	_service:tar_git:harbour-ttrss-cnlpete-0.7.5+master.20220116150053.74226a2.tar.bz2/settings.cpp ^
@@ -21,8 +21,10 @@ #include "settings.hh" +#include <QtCore/QDebug> #include <QtCore/QSettings> #include <QtCore/QStandardPaths> +#include <QtCore/QCoreApplication> #include <QtCore/QDir> #include <QtCore/QFile> #include <QtCore/QFileInfo> @@ -42,6 +44,7 @@ newSettings.setValue(key, oldSettings.value(key)); newSettings.setValue("migrated-v1", true); + qDebug() << "migrated Settings from " << oldSettings.fileName() << " to " << newSettings.fileName(); } void Settings::migrateSettings_v2() { @@ -57,6 +60,7 @@ newSettings.setValue(key, oldSettings.value(key)); newSettings.setValue("migrated-v2", true); + qDebug() << "migrated Settings from " << oldSettings.fileName() << " to " << newSettings.fileName(); } Settings Settings::instance() { @@ -364,7 +368,22 @@ } } -Settings::Settings(QObject parent) : QObject(parent), m_settings(new QSettings(this)) { +QString Settings::settingFile() const { + QString config = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation); + QString file = config + QDir::separator() + + QCoreApplication::organizationName() + QDir::separator() + + QCoreApplication::applicationName() + QDir::separator() + + QCoreApplication::applicationName() + ".conf"; + qDebug() << "config:" << file; + return file; +} + +Settings::Settings(QObject *parent) : + QObject(parent), + m_settings(new QSettings(settingFile(), QSettings::NativeFormat)) { + + qDebug() << "using config at " << m_settings->fileName(); + // Login Credentials _servername = m_settings->value("servername", "http://").toString(); _username = m_settings->value("username", "").toString();
[-] [+]	Changed	_service:tar_git:harbour-ttrss-cnlpete-0.7.5+master.20220116150053.74226a2.tar.bz2/settings.hh ^
@@ -262,6 +262,7 @@ private: static QScopedPointer<Settings> m_instance; + QString settingFile() const; explicit Settings(QObject *parent = 0); Q_DISABLE_COPY(Settings)
[-] [+]	Changed	_service:tar_git:harbour-ttrss-cnlpete.yaml ^
@@ -1,6 +1,6 @@ Name: harbour-ttrss-cnlpete Summary: Tiny Tiny RSS Reader -Version: 0.7.4 +Version: 0.7.5 Release: 1 Group: Applications/Internet URL: http://ttrss.cnlpete.de/