[sailfish] Reworked the AboutPage

Also:
- Introduced a generic TextPage.qml to display the License and the
  Privacy Policy.
- Updated my contributor information. :)

CONTRIBUTORS.md

@@ -8,4 +8,4 @@ CONTRIBUTORS
 - gwmgdemj
 - equeim
 - Silviu Vulcan (silviuvulcan)
-- michael-k
+- Michael Käufl (michael-k)

qml/ttrss/components/AboutItem.qml

@@ -33,8 +33,8 @@ MenuItem {
             donateurl: constant.donateUrl,
             text: qsTr("Author: %1").arg("Hauke Schade 2013") + "<br/>"
                    + qsTr("Thanks to:") + " "
-                    + "Francois Cattin, Jakub Kožíšek, Alberto Mardegan, gwmgdemj, equeim, Silviu Vulcan, michael-k",
-            homepageurl: constant.sourceRepoSite,
+                    + "Francois Cattin, Jakub Kožíšek, Alberto Mardegan, gwmgdemj, equeim, Silviu Vulcan, Michael Käufl",
+            homepageurl: constant.website,
             issuetrackertext: qsTr("If you encounter bugs or have feature requests, please visit the Issue Tracker"),
             issuetrackerurl: constant.issueTrackerUrl
         }

qml/ttrss/models/Constants.qml

@@ -25,7 +25,8 @@ import QtQuick 2.0 // sailfish
 QtObject{
     id: constant
 
-    property url sourceRepoSite: "http://ttrss.cnlpete.de/"
+    property url website: "http://ttrss.cnlpete.de/"
+    property url sourceRepoSite: "https://github.com/cnlpete/ttrss/"
     property url issueTrackerUrl: "https://github.com/cnlpete/ttrss/issues"
     property url registerUrl: "http://tt-rss.org/redmine/projects/tt-rss/wiki"
     property url donateUrl: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=WUWGSGAK8K7ZN"

qml/ttrss/resources/gplv2.js

@@ -0,0 +1,369 @@
+var short = "<p>TTRss is free software; you can redistribute it and/or modify "
++ "it under the terms of the GNU General Public License as published by "
++ "the Free Software Foundation; either version 2 of the License, or "
++ "(at your option) any later version.</p>"
+
++ "<p>TTRss is distributed in the hope that it will be useful, "
++ "but WITHOUT ANY WARRANTY; without even the implied warranty of "
++ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the "
++ "GNU General Public License for more details.</p>"
+
++ "<p>You should have received a copy of the GNU General Public License along "
++ "with this program; if not, write to the Free Software Foundation, Inc., "
++ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see "
++ "<a href=\"http://www.gnu.org/licenses/\">http://www.gnu.org/licenses/</a>.</p>"
+
+
+var full = "<h2>GNU GENERAL PUBLIC LICENSE</h2>"
++ "<p><b>Version 2, June 1991</b></p>"
+
++ "<p>Copyright (C) 1989, 1991 Free Software Foundation, Inc., "
++ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA "
++ "Everyone is permitted to copy and distribute verbatim copies "
++ "of this license document, but changing it is not allowed.</p>"
+
++ "<h3>Preamble</h3>"
+
++ "<p>&nbsp;&nbsp;The licenses for most software are designed to take away your "
++ "freedom to share and change it.  By contrast, the GNU General Public "
++ "License is intended to guarantee your freedom to share and change free "
++ "software--to make sure the software is free for all its users.  This "
++ "General Public License applies to most of the Free Software "
++ "Foundation's software and to any other program whose authors commit to "
++ "using it.  (Some other Free Software Foundation software is covered by "
++ "the GNU Lesser General Public License instead.)  You can apply it to "
++ "your programs, too.</p>"
+
++ "<p>&nbsp;&nbsp;When we speak of free software, we are referring to freedom, not "
++ "price.  Our General Public Licenses are designed to make sure that you "
++ "have the freedom to distribute copies of free software (and charge for "
++ "this service if you wish), that you receive source code or can get it "
++ "if you want it, that you can change the software or use pieces of it "
++ "in new free programs; and that you know you can do these things.</p>"
+
++ "<p>&nbsp;&nbsp;To protect your rights, we need to make restrictions that forbid "
++ "anyone to deny you these rights or to ask you to surrender the rights. "
++ "These restrictions translate to certain responsibilities for you if you "
++ "distribute copies of the software, or if you modify it.</p>"
+
++ "<p>&nbsp;&nbsp;For example, if you distribute copies of such a program, whether "
++ "gratis or for a fee, you must give the recipients all the rights that "
++ "you have.  You must make sure that they, too, receive or can get the "
++ "source code.  And you must show them these terms so they know their "
++ "rights.</p>"
+
++ "<p>&nbsp;&nbsp;We protect your rights with two steps: (1) copyright the software, and "
++ "(2) offer you this license which gives you legal permission to copy, "
++ "distribute and/or modify the software.</p>"
+
++ "<p>&nbsp;&nbsp;Also, for each author's protection and ours, we want to make certain "
++ "that everyone understands that there is no warranty for this free "
++ "software.  If the software is modified by someone else and passed on, we "
++ "want its recipients to know that what they have is not the original, so "
++ "that any problems introduced by others will not reflect on the original "
++ "authors' reputations.</p>"
+
++ "<p>&nbsp;&nbsp;Finally, any free program is threatened constantly by software "
++ "patents.  We wish to avoid the danger that redistributors of a free "
++ "program will individually obtain patent licenses, in effect making the "
++ "program proprietary.  To prevent this, we have made it clear that any "
++ "patent must be licensed for everyone's free use or not licensed at all.</p>"
+
++ "<p>&nbsp;&nbsp;The precise terms and conditions for copying, distribution and "
++ "modification follow.</p>"
+
++ "<h3>GNU GENERAL PUBLIC LICENSE</h3>"
++ "<h4>TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</h4>"
+
++ "<ul>" // <ol start='0'> is not supported :(
++ "  <li><p>0. This License applies to any program or other work which contains "
++ "a notice placed by the copyright holder saying it may be distributed "
++ "under the terms of this General Public License.  The \"Program\", below, "
++ "refers to any such program or work, and a \"work based on the Program\" "
++ "means either the Program or any derivative work under copyright law: "
++ "that is to say, a work containing the Program or a portion of it, "
++ "either verbatim or with modifications and/or translated into another "
++ "language.  (Hereinafter, translation is included without limitation in "
++ "the term \"modification\".)  Each licensee is addressed as \"you\".</p>"
+
++ "<p>Activities other than copying, distribution and modification are not "
++ "covered by this License; they are outside its scope.  The act of "
++ "running the Program is not restricted, and the output from the Program "
++ "is covered only if its contents constitute a work based on the "
++ "Program (independent of having been made by running the Program). "
++ "Whether that is true depends on what the Program does.</p></li>"
++ "</ul>"
+
++ "<ol>"
++ "<li><p>You may copy and distribute verbatim copies of the Program's "
++ "source code as you receive it, in any medium, provided that you "
++ "conspicuously and appropriately publish on each copy an appropriate "
++ "copyright notice and disclaimer of warranty; keep intact all the "
++ "notices that refer to this License and to the absence of any warranty; "
++ "and give any other recipients of the Program a copy of this License "
++ "along with the Program.</p>"
+
++ "<p>You may charge a fee for the physical act of transferring a copy, and "
++ "you may at your option offer warranty protection in exchange for a fee.</p></li>"
+
++ "<li><p>You may modify your copy or copies of the Program or any portion "
++ "of it, thus forming a work based on the Program, and copy and "
++ "distribute such modifications or work under the terms of Section 1 "
++ "above, provided that you also meet all of these conditions:</p>"
+
++ "<ol type=\"a\">"
++ "  <li><p>You must cause the modified files to carry prominent notices "
++ "  stating that you changed the files and the date of any change.</p></li>"
+
++ "  <li><p>You must cause any work that you distribute or publish, that in "
++ "  whole or in part contains or is derived from the Program or any "
++ "  part thereof, to be licensed as a whole at no charge to all third "
++ "  parties under the terms of this License.</p></li>"
+
++ "  <li><p>If the modified program normally reads commands interactively "
++ "  when run, you must cause it, when started running for such "
++ "  interactive use in the most ordinary way, to print or display an "
++ "  announcement including an appropriate copyright notice and a "
++ "  notice that there is no warranty (or else, saying that you provide "
++ "  a warranty) and that users may redistribute the program under "
++ "  these conditions, and telling the user how to view a copy of this "
++ "  License.  (Exception: if the Program itself is interactive but "
++ "  does not normally print such an announcement, your work based on "
++ "  the Program is not required to print an announcement.)</p></li>"
++ "</ol>"
+
++ "<p>These requirements apply to the modified work as a whole.  If "
++ "identifiable sections of that work are not derived from the Program, "
++ "and can be reasonably considered independent and separate works in "
++ "themselves, then this License, and its terms, do not apply to those "
++ "sections when you distribute them as separate works.  But when you "
++ "distribute the same sections as part of a whole which is a work based "
++ "on the Program, the distribution of the whole must be on the terms of "
++ "this License, whose permissions for other licensees extend to the "
++ "entire whole, and thus to each and every part regardless of who wrote it.</p>"
+
++ "<p>Thus, it is not the intent of this section to claim rights or contest "
++ "your rights to work written entirely by you; rather, the intent is to "
++ "exercise the right to control the distribution of derivative or "
++ "collective works based on the Program.</p>"
+
++ "<p>In addition, mere aggregation of another work not based on the Program "
++ "with the Program (or with a work based on the Program) on a volume of "
++ "a storage or distribution medium does not bring the other work under "
++ "the scope of this License.</p></li>"
+
++ "<li><p>You may copy and distribute the Program (or a work based on it, "
++ "under Section 2) in object code or executable form under the terms of "
++ "Sections 1 and 2 above provided that you also do one of the following:</p>"
+
++ "<ol type=\"a\">"
++ "  <li><p>Accompany it with the complete corresponding machine-readable "
++ "  source code, which must be distributed under the terms of Sections "
++ "  1 and 2 above on a medium customarily used for software interchange; or,</p></li>"
+
++ "  <li><p>Accompany it with a written offer, valid for at least three "
++ "  years, to give any third party, for a charge no more than your "
++ "  cost of physically performing source distribution, a complete "
++ "  machine-readable copy of the corresponding source code, to be "
++ "  distributed under the terms of Sections 1 and 2 above on a medium "
++ "  customarily used for software interchange; or,</p></li>"
+
++ "  <li><p>Accompany it with the information you received as to the offer "
++ "  to distribute corresponding source code.  (This alternative is "
++ "  allowed only for noncommercial distribution and only if you "
++ "  received the program in object code or executable form with such "
++ "  an offer, in accord with Subsection b above.)</p></li>"
++ "</ol>"
+
++ "<p>The source code for a work means the preferred form of the work for "
++ "making modifications to it.  For an executable work, complete source "
++ "code means all the source code for all modules it contains, plus any "
++ "associated interface definition files, plus the scripts used to "
++ "control compilation and installation of the executable.  However, as a "
++ "special exception, the source code distributed need not include "
++ "anything that is normally distributed (in either source or binary "
++ "form) with the major components (compiler, kernel, and so on) of the "
++ "operating system on which the executable runs, unless that component "
++ "itself accompanies the executable.</p>"
+
++ "<p>If distribution of executable or object code is made by offering "
++ "access to copy from a designated place, then offering equivalent "
++ "access to copy the source code from the same place counts as "
++ "distribution of the source code, even though third parties are not "
++ "compelled to copy the source along with the object code.</p></li>"
+
++ "<li><p>You may not copy, modify, sublicense, or distribute the Program "
++ "except as expressly provided under this License.  Any attempt "
++ "otherwise to copy, modify, sublicense or distribute the Program is "
++ "void, and will automatically terminate your rights under this License. "
++ "However, parties who have received copies, or rights, from you under "
++ "this License will not have their licenses terminated so long as such "
++ "parties remain in full compliance.</p></li>"
+
++ "<li><p>You are not required to accept this License, since you have not "
++ "signed it.  However, nothing else grants you permission to modify or "
++ "distribute the Program or its derivative works.  These actions are "
++ "prohibited by law if you do not accept this License.  Therefore, by "
++ "modifying or distributing the Program (or any work based on the "
++ "Program), you indicate your acceptance of this License to do so, and "
++ "all its terms and conditions for copying, distributing or modifying "
++ "the Program or works based on it.</p></li>"
+
++ "<li><p>Each time you redistribute the Program (or any work based on the "
++ "Program), the recipient automatically receives a license from the "
++ "original licensor to copy, distribute or modify the Program subject to "
++ "these terms and conditions.  You may not impose any further "
++ "restrictions on the recipients' exercise of the rights granted herein. "
++ "You are not responsible for enforcing compliance by third parties to "
++ "this License.</p></li>"
+
++ "<li><p>If, as a consequence of a court judgment or allegation of patent "
++ "infringement or for any other reason (not limited to patent issues), "
++ "conditions are imposed on you (whether by court order, agreement or "
++ "otherwise) that contradict the conditions of this License, they do not "
++ "excuse you from the conditions of this License.  If you cannot "
++ "distribute so as to satisfy simultaneously your obligations under this "
++ "License and any other pertinent obligations, then as a consequence you "
++ "may not distribute the Program at all.  For example, if a patent "
++ "license would not permit royalty-free redistribution of the Program by "
++ "all those who receive copies directly or indirectly through you, then "
++ "the only way you could satisfy both it and this License would be to "
++ "refrain entirely from distribution of the Program.</p>"
+
++ "<p>If any portion of this section is held invalid or unenforceable under "
++ "any particular circumstance, the balance of the section is intended to "
++ "apply and the section as a whole is intended to apply in other "
++ "circumstances.</p>"
+
++ "<p>It is not the purpose of this section to induce you to infringe any "
++ "patents or other property right claims or to contest validity of any "
++ "such claims; this section has the sole purpose of protecting the "
++ "integrity of the free software distribution system, which is "
++ "implemented by public license practices.  Many people have made "
++ "generous contributions to the wide range of software distributed "
++ "through that system in reliance on consistent application of that "
++ "system; it is up to the author/donor to decide if he or she is willing "
++ "to distribute software through any other system and a licensee cannot "
++ "impose that choice.</p>"
+
++ "<p>This section is intended to make thoroughly clear what is believed to "
++ "be a consequence of the rest of this License.</p></li>"
+
++ "<li><p>If the distribution and/or use of the Program is restricted in "
++ "certain countries either by patents or by copyrighted interfaces, the "
++ "original copyright holder who places the Program under this License "
++ "may add an explicit geographical distribution limitation excluding "
++ "those countries, so that distribution is permitted only in or among "
++ "countries not thus excluded.  In such case, this License incorporates "
++ "the limitation as if written in the body of this License.</p></li>"
+
++ "<li><p>The Free Software Foundation may publish revised and/or new versions "
++ "of the General Public License from time to time.  Such new versions will "
++ "be similar in spirit to the present version, but may differ in detail to "
++ "address new problems or concerns.</p>"
+
++ "<p>Each version is given a distinguishing version number.  If the Program "
++ "specifies a version number of this License which applies to it and \"any "
++ "later version\", you have the option of following the terms and conditions "
++ "either of that version or of any later version published by the Free "
++ "Software Foundation.  If the Program does not specify a version number of "
++ "this License, you may choose any version ever published by the Free Software "
++ "Foundation.</p></li>"
+
++ "<li><p>If you wish to incorporate parts of the Program into other free "
++ "programs whose distribution conditions are different, write to the author "
++ "to ask for permission.  For software which is copyrighted by the Free "
++ "Software Foundation, write to the Free Software Foundation; we sometimes "
++ "make exceptions for this.  Our decision will be guided by the two goals "
++ "of preserving the free status of all derivatives of our free software and "
++ "of promoting the sharing and reuse of software generally.</p></li>"
+
++ "<h4>NO WARRANTY</h4>"
+
++ "<li><p>BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY "
++ "FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN "
++ "OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES "
++ "PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED "
++ "OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF "
++ "MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS "
++ "TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE "
++ "PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, "
++ "REPAIR OR CORRECTION.</p></li>"
+
++ "<li><p>IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING "
++ "WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR "
++ "REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, "
++ "INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING "
++ "OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED "
++ "TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY "
++ "YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER "
++ "PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE "
++ "POSSIBILITY OF SUCH DAMAGES.</p><li>"
++ "</ol>"
+
++ "<h4>END OF TERMS AND CONDITIONS</h4>"
+
++ "<p><b>How to Apply These Terms to Your New Programs</b></p>"
+
++ "<p>&nbsp;&nbsp;If you develop a new program, and you want it to be of the greatest "
++ "possible use to the public, the best way to achieve this is to make it "
++ "free software which everyone can redistribute and change under these terms.</p>"
+
++ "<p>&nbsp;&nbsp;To do so, attach the following notices to the program.  It is safest "
++ "to attach them to the start of each source file to most effectively "
++ "convey the exclusion of warranty; and each file should have at least "
++ "the \"copyright\" line and a pointer to where the full notice is found.</p>"
+
++ "<code>"
++ "  <p>&nbsp;&nbsp;&lt;one line to give the program's name and a brief idea of what it does.&gt;<br>"
++ "  Copyright (C) &lt;year&gt;  &lt;name of author&gt;</p>"
+
++ "  <p>&nbsp;&nbsp;This program is free software; you can redistribute it and/or modify "
++ "  it under the terms of the GNU General Public License as published by "
++ "  the Free Software Foundation; either version 2 of the License, or "
++ "  (at your option) any later version.</p>"
+
++ "  <p>&nbsp;&nbsp;This program is distributed in the hope that it will be useful, "
++ "  but WITHOUT ANY WARRANTY; without even the implied warranty of "
++ "  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the "
++ "  GNU General Public License for more details.</p>"
+
++ "  <p>&nbsp;&nbsp;You should have received a copy of the GNU General Public License along "
++ "  with this program; if not, write to the Free Software Foundation, Inc., "
++ "  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.</p>"
++ "</code>"
+
++ "<p>Also add information on how to contact you by electronic and paper mail.</p>"
+
++ "<p>If the program is interactive, make it output a short notice like this "
++ "when it starts in an interactive mode:</p>"
+
++ "<code>"
++ "  <p>&nbsp;&nbsp;Gnomovision version 69, Copyright (C) year name of author "
++ "  Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. "
++ "  This is free software, and you are welcome to redistribute it "
++ "  under certain conditions; type `show c' for details.</p>"
++ "</code> "
+
++ "<p>The hypothetical commands `show w' and `show c' should show the appropriate "
++ "parts of the General Public License.  Of course, the commands you use may "
++ "be called something other than `show w' and `show c'; they could even be "
++ "mouse-clicks or menu items--whatever suits your program.</p>"
+
++ "<p>You should also get your employer (if you work as a programmer) or your "
++ "school, if any, to sign a \"copyright disclaimer\" for the program, if "
++ "necessary.  Here is a sample; alter the names:</p>"
+
++ "<code>"
++ "  <p>&nbsp;&nbsp;Yoyodyne, Inc., hereby disclaims all copyright interest in the program "
++ "  `Gnomovision' (which makes passes at compilers) written by James Hacker.</p>"
+
++ "  <p>signature of Ty Coon&gt;, 1 April 1989<br>"
++ "  Ty Coon, President of Vice</p>"
++ "</code>"
+
++ "<p>This General Public License does not permit incorporating your program into "
++ "proprietary programs.  If your program is a subroutine library, you may "
++ "consider it more useful to permit linking proprietary applications with the "
++ "library.  If this is what you want to do, use the GNU Lesser General "
++ "Public License instead of this License.</p>"

qml/ttrss/resources/privacypolicy.js

@@ -0,0 +1,10 @@
+var sec1 = "TTRss will collect the login information you give at startup and "
+  + "nothing more. Your login data is stored in a configuration file on your "
+  + "device and nowhere else. TTRss will only use it to establish connections "
+  + "to the available services and/or servers. The login data is not given to "
+  + "any third party and is not used for any other purpose than the functions "
+  + "of TTRss."
+
+var sec2 = "If you have any questions, concerns, or comments about our privacy "
+  + "policy you may contact the author via e-mail: "
+  + "<a href=\"mailto:cnlpete@cnlpete.de\">cnlpete@cnlpete.de</a>"

qml/ttrss/sailfish/items/AboutItem.qml

@@ -25,20 +25,6 @@ import Sailfish.Silica 1.0
 MenuItem {
     text: qsTr("About")
     onClicked: {
-        var params = {
-            title : 'ttrss ' + APP_VERSION,
-            iconSource: Qt.resolvedUrl('/usr/share/icons/hicolor/86x86/apps/harbour-ttrss-cnlpete.png'),
-//            slogan : '',
-            donatebutton: qsTr("Buy me a beer"),
-            donateurl: constant.donateUrl,
-            text: qsTr("Author: %1").arg("Hauke Schade") + "<br/>"
-                   + qsTr("Thanks to:") + " "
-                    + "Francois Cattin, Jakub Kožíšek, Alberto Mardegan, gwmgdemj, equeim, Silviu Vulcan, michael-k",
-            homepageurl: constant.sourceRepoSite,
-            issuetrackertext: qsTr("If you encounter bugs or have feature requests, please visit the Issue Tracker"),
-            issuetrackerurl: constant.issueTrackerUrl
-        }
-
-        pageStack.push(Qt.resolvedUrl("../pages/AboutPage.qml"), params);
+        pageStack.push(Qt.resolvedUrl("../pages/AboutPage.qml"));
     }
 }

qml/ttrss/sailfish/pages/AboutPage.qml

@@ -21,30 +21,16 @@
 
 import QtQuick 2.0
 import Sailfish.Silica 1.0
+import "../../resources/gplv2.js" as License
+import "../../resources/privacypolicy.js" as PrivacyPolicy
+import "../items"
 
 Page {
     id: aboutPage
-    property alias iconSource: icon.source
-    property alias title: title.title
-    property alias slogan: slogan.text
-
-    property alias donatetext: donatetext.text
-    property alias donatebutton: donatebutton.text
-    property string donateurl: donate.text
-
-    property alias homepagebutton: homepagebutton.text
-    property string homepageurl: ''
-
-    property alias text: content.text
-
-    property alias issuetrackerbutton: issuetrackerbutton.text
-    property alias issuetrackertext: issuetrackertext.text
-    property string issuetrackerurl: ''
-
 
     SilicaFlickable {
         anchors.fill: parent
-        contentHeight: aboutContainer.height + 10
+        contentHeight: aboutColumn.height
         contentWidth: parent.width
 
         PullDownMenu {
@@ -53,21 +39,12 @@ Page {
                 onClicked: {
                     var params = {
                         title: qsTr("License"),
-                        iconSource: iconSource,
-                        text: "TTRss is free software; you can redistribute it and/or modify
-                            it under the terms of the GNU General Public License as published by
-                            the Free Software Foundation; either version 2 of the License, or
-                            (at your option) any later version.<br>
-                            <br>
-                            TTRss is distributed in the hope that it will be useful,
-                            but WITHOUT ANY WARRANTY; without even the implied warranty of
-                            MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-                            GNU General Public License for more details.<br>
-                            <br>
-                            You should have received a copy of the GNU General Public License
-                            along with TTRss. If not, see <a href=\"http://www.gnu.org/licenses/\">http://www.gnu.org/licenses/</a>."
+                        data: [
+                            ["", License.short],
+                            [qsTr("Full License"), License.full]
+                        ]
                     }
-                    pageStack.push("TextPage.qml", params)
+                    pageStack.push(Qt.resolvedUrl("TextPage.qml"), params);
                 }
             }
             MenuItem {
@@ -75,112 +52,131 @@ Page {
                 onClicked: {
                     var params = {
                         title: qsTr("Privacy Policy"),
-                        iconSource: iconSource,
-                        text: "ttrss will collect the login information you give at startup and nothing more.
-                            Your login data is stored in a configuration file on your device and nowhere else.
-                            ttrss will only use it to establish connections to the available services and/or servers.
-                            The login data is not given to any third party and is not used for any other purpose than the functions of ttrss.
-                            <br><br>
-                            If you have any questions, concerns, or comments about our privacy policy you may contact us via:<br>
-                            <a href='mailto:cnlpete@cnlpete.de'>cnlpete@cnlpete.de</a>"
+                        data: [
+                            ["", PrivacyPolicy.sec1],
+                            ["", PrivacyPolicy.sec2]
+                        ]
                     }
-                    pageStack.push("TextPage.qml", params)
+                    pageStack.push(Qt.resolvedUrl("TextPage.qml"), params)
                 }
             }
         }
 
-        Item {
-            id: aboutContainer
+        Column {
+            id: aboutColumn
             width: parent.width
-            height: aboutColumn.height
 
-            Column {
-                id: aboutColumn
+            anchors {
+                left: parent.left
+                right: parent.right
+                margins: Theme.paddingMedium
+            }
+            spacing: Theme.paddingMedium
 
-                anchors {
-                    left: parent.left
-                    top: parent.top
-                    right: parent.right
-                    margins: 10
-                }
+            PageHeader {
+                id: title
+                title: 'ttrss ' + APP_VERSION
+            }
 
-                spacing: 10
+            Image {
+                id: icon
+                source: Qt.resolvedUrl("/usr/share/icons/hicolor/86x86/"
+                                       + "apps/harbour-ttrss-cnlpete.png")
+                anchors.horizontalCenter: parent.horizontalCenter
+            }
 
-                PageHeader {
-                    id: title
-                }
+            Label {
+                anchors.horizontalCenter: parent.horizontalCenter
+                wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+                font.pixelSize: Theme.fontSizeSmall
+                text: "<b>Copyright © 2012–2014 Hauke Schade</b>"
+            }
 
-                Image {
-                    id: icon
-                    source: ''
-                    anchors.horizontalCenter: parent.horizontalCenter
-                }
-
-                Label {
-                    id: slogan
-                    text: ''
-                    visible: text !== ''
-                    anchors.horizontalCenter: parent.horizontalCenter
-                }
-
-                Label {
-                    id: donatetext
-                    text: ''
-                    visible: text !== ''
-                    anchors.horizontalCenter: parent.horizontalCenter
-                }
+            Row {
+                width: parent.width
                 Button {
-                    id: donatebutton
-                    width: parent.width
-                    text: qsTr("Donate")
-                    visible: donateurl !== ''
+                    width: Math.floor(parent.width / 2) - Theme.paddingMedium
+                    text: qsTr("Buy me a beer")
                     onClicked: {
-                        Qt.openUrlExternally(donateurl)
+                        Qt.openUrlExternally(constant.donateUrl)
                     }
                 }
-
                 Button {
-                    id: homepagebutton
-                    width: parent.width
+                    width: Math.floor(parent.width / 2) - Theme.paddingMedium
                     text: qsTr("Homepage")
-                    visible: homepageurl !== ''
                     onClicked: {
-                        Qt.openUrlExternally(homepageurl)
+                        Qt.openUrlExternally(constant.website)
                     }
                 }
+            }
 
-                Item {
-                    width: 1
-                    height: 50
-                }
-                Label {
-                    id: content
-                    text: ''
-                    width: aboutPage.width
-                    wrapMode: Text.WordWrap
-                }
-                Item {
-                    width: 1
-                    height: 50
-                }
+            // -- Contributors --
+            Label {
+                width: parent.width
+                horizontalAlignment: Text.AlignRight
+                color: Theme.highlightColor
+                text: qsTr("Contributors")
+                font.pixelSize: Theme.fontSizeSmall;
+            }
+            Label {
+                width: parent.width
+                wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+                font.pixelSize: Theme.fontSizeSmall
+                text: "Francois Cattin, Jakub Kožíšek, Alberto Mardegan, "
+                      + "gwmgdemj, equeim, Silviu Vulcan, Michael Käufl"
+            }
 
-                Label {
-                    id: issuetrackertext
-                    text: ''
-                    visible: text !== ''
-                    width: aboutPage.width
-                    wrapMode: Text.WordWrap
-                }
-                Button {
-                    id: issuetrackerbutton
-                    width: parent.width
-                    text: qsTr("Issuetracker")
-                    visible: issuetrackerurl !== ''
-                    onClicked: {
-                        Qt.openUrlExternally(issuetrackerurl)
-                    }
+            // -- Feature Requests & Bugs --
+            Label {
+                width: parent.width
+                horizontalAlignment: Text.AlignRight
+                color: Theme.highlightColor
+                text: qsTr("Feature Requests & Bugs")
+                font.pixelSize: Theme.fontSizeSmall;
+            }
+            Label {
+                width: parent.width
+                font.pixelSize: Theme.fontSizeSmall
+                wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+                text: qsTr("If you encounter bugs or have feature requests, "
+                           + "please visit the Issue Tracker")
+            }
+            Button {
+                id: issuetrackerbutton
+                width: parent.width / 2 - Theme.paddingMedium
+                anchors.horizontalCenter: parent.horizontalCenter
+                text: qsTr("Issuetracker")
+                visible: constant.issueTrackerUrl !== ''
+                onClicked: {
+                    Qt.openUrlExternally(constant.issueTrackerUrl)
                 }
             }
+
+            // -- Legal Notice --
+            Label {
+                width: parent.width
+                horizontalAlignment: Text.AlignRight
+                color: Theme.highlightColor
+                text: qsTr("Legal Notice")
+                font.pixelSize: Theme.fontSizeSmall;
+            }
+            Label {
+                width: parent.width
+                wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+                font.pixelSize: Theme.fontSizeSmall
+                text: "TTRss comes with ABSOLUTELY NO WARRANTY. "
+                      + "TTRss is free software, and you are welcome to "
+                      + "redistribute it under certain conditions. "
+                      + "See the License for details."
+            }
+            Label {
+                width: parent.width
+                wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+                font.pixelSize: Theme.fontSizeSmall
+                text: qsTr("The source code is available at %1.").arg(
+                          "<a href=\"" + constant.sourceRepoSite + "\">"
+                          + constant.sourceRepoSite + "</a>")
+            }
         }
     }
 }

qml/ttrss/sailfish/pages/TextPage.qml

@@ -0,0 +1,75 @@
+/*
+ * This file is part of TTRss, a Tiny Tiny RSS Reader App
+ * for MeeGo Harmattan and Sailfish OS.
+ * Copyright (C) 2012–2014  Hauke Schade
+ *
+ * TTRss is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * TTRss is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see
+ * http://www.gnu.org/licenses/.
+ */
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+
+Page {
+    property alias title: title.title
+    property alias data: rep.model
+
+    SilicaFlickable {
+        anchors.fill: parent
+        contentHeight: textContainer.height
+        contentWidth: parent.width
+
+        Column {
+            id: textContainer
+            width: parent.width
+
+            anchors {
+                left: parent.left
+                right: parent.right
+                margins: Theme.paddingMedium
+            }
+            spacing: Theme.paddingMedium
+
+            PageHeader {
+                id: title
+            }
+
+            Repeater {
+                id: rep
+                Column {
+                    spacing: Theme.paddingMedium
+                    Label {
+                        width: textContainer.width
+                        color: Theme.highlightColor
+                        font.pixelSize: Theme.fontSizeSmall
+                        text: modelData[0]
+                        visible: text != ''
+                        horizontalAlignment: Text.AlignRight
+                    }
+                    Text {
+                        width: textContainer.width
+                        color: Theme.primaryColor
+                        font.pixelSize: Theme.fontSizeExtraSmall
+                        text: modelData[1]
+                        visible: text != ''
+                        wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+                        textFormat: Text.RichText
+                    }
+                }
+            }
+        }
+        ScrollDecorator{}
+    }
+}