Improved About page

5 files changed, 108 insertions, 24 deletions

diff --git a/app/app.pro b/app/app.pro
index dc6240c..80dd18d 100644
--- a/app/app.pro
+++ b/app/app.pro
@@ -28,13 +28,12 @@ OTHER_FILES += \
     qml/pages/InstallAppDialog.qml \
     qml/pages/AppConfigDialog.qml \
     qml/pages/WebItemSelDialog.qml \
+    qml/pages/AppStorePage.qml \
+    qml/pages/WatchInfo.qml \
     qml/pebble.qml \
-    qml/images/* \
     translations/*.ts \
     pebble.desktop \
-    pebble.png \
-    qml/pages/AppStorePage.qml \
-    qml/pages/WatchInfo.qml
+    pebble.png
 
 CONFIG += sailfishapp_i18n
 TRANSLATIONS += translations/pebble-es.ts
diff --git a/app/qml/images/btn_donate.png b/app/qml/images/btn_donate.png
deleted file mode 100644
index 3777e64..0000000
--- a/app/qml/images/btn_donate.png
+++ /dev/null
diff --git a/app/qml/pages/AboutPage.qml b/app/qml/pages/AboutPage.qml
index 12f4d53..c121608 100644
--- a/app/qml/pages/AboutPage.qml
+++ b/app/qml/pages/AboutPage.qml
@@ -21,7 +21,7 @@ Page {
                 title: "pebbled"
             }
             Label {
-                text: qsTr("Version ") + APP_VERSION
+                text: qsTr("Version") + " " + APP_VERSION
                 horizontalAlignment: Text.AlignRight
                 anchors {
                     left: parent.left
@@ -33,7 +33,7 @@ Page {
                 color: Theme.highlightColor
                 width: parent.width
                 horizontalAlignment: Text.AlignHCenter
-                text: "© 2014 Tomasz Sterna / Xiaoka.com\nAll Rights Reserved."
+                text: "© 2014 Tomasz Sterna / Xiaoka.com\n" + qsTr("All Rights Reserved.")
             }
             Label {
                 wrapMode: Text.Wrap
@@ -44,7 +44,7 @@ Page {
                 }
                 font.pixelSize: Theme.fontSizeTiny
                 horizontalAlignment: Text.AlignJustify
-                text: qsTr(
+                text: (
 "THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND "+
 "ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED "+
 "WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE "+
@@ -56,14 +56,30 @@ Page {
 "(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS "+
 "SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.")
             }
-            IconButton {
+            Label {
+                text: qsTr("Support")
+                font.family: Theme.fontFamilyHeading
+                color: Theme.highlightColor
+                anchors.right: parent.right
+                anchors.rightMargin: Theme.paddingMedium
+            }
+            Label {
                 anchors {
                     left: parent.left
                     right: parent.right
-                    margins: Theme.paddingMedium
+                    margins: Theme.paddingLarge
+                }
+                font.pixelSize: Theme.fontSizeSmall
+                wrapMode: Text.Wrap
+                text: qsTr("Your donations help justify development time.")
+            }
+            Button {
+                text: qsTr("PayPal Donate")
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                    margins: Theme.paddingLarge * 2
                 }
-                icon.source: "../images/btn_donate.png"
-                height: icon.height - Theme.paddingLarge
                 onClicked: Qt.openUrlExternally("https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=MAGN86VCARBSA")
             }
 
@@ -75,20 +91,29 @@ Page {
                 anchors.rightMargin: Theme.paddingMedium
             }
             Button {
-                text: "Open Bug Tracker"
+                text: qsTr("Open Bug Tracker")
                 anchors {
                     left: parent.left
                     right: parent.right
-                    margins: Theme.paddingLarge
+                    margins: Theme.paddingLarge * 2
                 }
                 onClicked: Qt.openUrlExternally("https://github.com/smokku/pebble/issues")
             }
             Button {
-                text: "Send issue e-mail to developer"
+                text: qsTr("Forum Thread")
                 anchors {
                     left: parent.left
                     right: parent.right
-                    margins: Theme.paddingLarge
+                    margins: Theme.paddingLarge * 2
+                }
+                onClicked: Qt.openUrlExternally("http://talk.maemo.org/showthread.php?t=93399")
+            }
+            Button {
+                text: qsTr("Send issue e-mail to developer")
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                    margins: Theme.paddingLarge * 2
                 }
                 onClicked: Qt.openUrlExternally("mailto:bugs@xiaoka.com?subject=pebbled issue&body=describe your issue here")
             }
diff --git a/app/translations/pebble-es.ts b/app/translations/pebble-es.ts
index 8f50323..f93bc2b 100644
--- a/app/translations/pebble-es.ts
+++ b/app/translations/pebble-es.ts
@@ -5,19 +5,49 @@
     <name>AboutPage</name>
     <message>
         <location filename="../qml/pages/AboutPage.qml" line="24"/>
-        <source>Version </source>
-        <translation>Versión </translation>
+        <source>Version</source>
+        <translation>Versión</translation>
     </message>
     <message>
-        <location filename="../qml/pages/AboutPage.qml" line="47"/>
-        <source>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&quot; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</source>
+        <location filename="../qml/pages/AboutPage.qml" line="36"/>
+        <source>All Rights Reserved.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/AboutPage.qml" line="71"/>
+        <location filename="../qml/pages/AboutPage.qml" line="60"/>
+        <source>Support</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/AboutPage.qml" line="74"/>
+        <source>Your donations help justify development time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/AboutPage.qml" line="77"/>
+        <source>PayPal Donate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/AboutPage.qml" line="87"/>
         <source>Bugs?</source>
         <translation>¿Errores?</translation>
     </message>
+    <message>
+        <location filename="../qml/pages/AboutPage.qml" line="94"/>
+        <source>Open Bug Tracker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/AboutPage.qml" line="103"/>
+        <source>Forum Thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/AboutPage.qml" line="112"/>
+        <source>Send issue e-mail to developer</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AppConfigDialog</name>
diff --git a/app/translations/pebble.ts b/app/translations/pebble.ts
index d019ecd..5cf9a4d 100644
--- a/app/translations/pebble.ts
+++ b/app/translations/pebble.ts
@@ -5,19 +5,49 @@
     <name>AboutPage</name>
     <message>
         <location filename="../qml/pages/AboutPage.qml" line="24"/>
-        <source>Version </source>
+        <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/AboutPage.qml" line="47"/>
-        <source>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&quot; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</source>
+        <location filename="../qml/pages/AboutPage.qml" line="36"/>
+        <source>All Rights Reserved.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/AboutPage.qml" line="71"/>
+        <location filename="../qml/pages/AboutPage.qml" line="60"/>
+        <source>Support</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/AboutPage.qml" line="74"/>
+        <source>Your donations help justify development time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/AboutPage.qml" line="77"/>
+        <source>PayPal Donate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/AboutPage.qml" line="87"/>
         <source>Bugs?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qml/pages/AboutPage.qml" line="94"/>
+        <source>Open Bug Tracker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/AboutPage.qml" line="103"/>
+        <source>Forum Thread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/AboutPage.qml" line="112"/>
+        <source>Send issue e-mail to developer</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AppConfigDialog</name>