Added about page

Also bugfixed the large image source implemetation.

Fixes SfietKonstantin#21

Author: SfietKonstantin

.gitignore

@@ -2,5 +2,6 @@ build
 *.pro.*
 CMakeLists.txt.*
 src/lib/twitter-secrets.h
+src/bin/version.h
 report
 doc

rpm/harbour-twablet.spec

@@ -22,6 +22,14 @@ A Twitter application for big screens
 %prep
 %setup -q -n %{name}-%{version}
 cp -p %{SOURCE1} src/lib
+cat > src/bin/version.h << EOL
+#ifndef VERSION_H
+#define VERSION_H
+
+static const char *Version = "${RPM_PACKAGE_VERSION}";
+
+#endif // VERSION_H
+EOL
 
 %build
 cmake -DCMAKE_INSTALL_PREFIX=/usr .

src/bin/CMakeLists.txt

@@ -29,6 +29,7 @@ include_directories(
 )
 
 set(${PROJECT_NAME}_SRCS
+    version.h
     main.cpp
 )
 
@@ -53,6 +54,7 @@ set(${PROJECT_NAME}_Qml_SRCS
     qml/pages/TweetPage.qml
     qml/pages/StatusUpdater.qml
     qml/pages/ProgressIconButton.qml
+    qml/pages/AboutPage.qml
     qml/pages/LinkHandler.js
 )
 
@@ -63,6 +65,7 @@ set(${PROJECT_NAME}_Data_SRCS
     data/search.svg
     data/me.svg
     data/background.png
+    data/logo.png
 )
 
 add_executable(${PROJECT_NAME}

src/bin/data/logo.png

@@ -57,6 +57,36 @@
 #include "qml/tweetqueryitem.h"
 #include "qml/retweetqueryitem.h"
 #include "qml/favoritequeryitem.h"
+#include "version.h"
+
+static const char *PAYPAL_DONATE = "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&"
+                                   "hosted_button_id=R6AJV4U2G33XG";
+static const char *FLATTR_DONATE = "https://flattr.com/profile/sfiet_konstantin";
+
+class Info: public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString version READ version CONSTANT)
+    Q_PROPERTY(QString paypal READ paypal CONSTANT)
+    Q_PROPERTY(QString flattr READ flattr CONSTANT)
+public:
+    explicit Info(QObject *parent = 0)
+        : QObject(parent)
+    {
+    }
+    QString version() const
+    {
+        return QLatin1String(Version);
+    }
+    QString paypal() const
+    {
+        return QLatin1String(PAYPAL_DONATE);
+    }
+    QString flattr() const
+    {
+        return QLatin1String(FLATTR_DONATE);
+    }
+};
 
 int main(int argc, char *argv[])
 {
@@ -70,6 +100,7 @@ int main(int argc, char *argv[])
     qmlRegisterUncreatableType<qml::MediaObject>("harbour.twablet", 1, 0, "Media", QLatin1String("Uncreatable"));
     qmlRegisterUncreatableType<qml::MediaModel>("harbour.twablet", 1, 0, "MediaModel", QLatin1String("Uncreatable"));
     qmlRegisterUncreatableType<qml::AbstractQueryItem>("harbour.twablet", 1, 0, "QueryItem", QLatin1String("Uncreatable"));
+    qmlRegisterUncreatableType<Info>("harbour.twablet", 1, 0, "InfoObject", QLatin1String("Uncreatable"));
     qmlRegisterType<qml::TwitterAuthentification>("harbour.twablet", 1, 0, "TwitterAuthentification");
     qmlRegisterType<qml::AccountModel>("harbour.twablet", 1, 0, "AccountModel");
     qmlRegisterType<qml::AccountSelectionModel>("harbour.twablet", 1, 0, "AccountSelectionModel");
@@ -88,6 +119,10 @@ int main(int argc, char *argv[])
                                                           [](QQmlEngine *e, QJSEngine *) -> QObject * {
         return new qml::DataRepositoryObject(e);
     });
+    qmlRegisterSingletonType<Info>("harbour.twablet", 1, 0, "Info",
+                                   [](QQmlEngine *e, QJSEngine *) -> QObject * {
+        return new Info(e);
+    });
 
 #ifndef DESKTOP
     return SailfishApp::main(argc, argv);
@@ -100,3 +135,5 @@ int main(int argc, char *argv[])
     return app.exec();
 #endif
 }
+
+#include "main.moc"

src/bin/main.cpp

@@ -0,0 +1,129 @@
+/*
+ * Copyright (C) 2013 Lucien XU <[email protected]>
+ *
+ * You may use this file under the terms of the BSD license as follows:
+ *
+ * "Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *   * The names of its contributors may not be used to endorse or promote
+ *     products derived from this software without specific prior written
+ *     permission.
+ *
+ * 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 DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER 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."
+ */
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import harbour.twablet 1.0
+
+Page {
+    id: container
+    property RightPanel rightPanel
+    allowedOrientations: app.defaultAllowedOrientations
+
+    SilicaFlickable {
+        anchors.fill: parent
+        contentHeight: mainColumn.height + Theme.paddingLarge + buttonsColumn.height
+        Column {
+            id: mainColumn
+            spacing: Theme.paddingMedium
+            anchors.left: parent.left; anchors.right: parent.right
+            PageHeader {
+                title: qsTr("About")
+            }
+
+            Image {
+                anchors.horizontalCenter: parent.horizontalCenter
+                source: "../../data/logo.png"
+            }
+
+            Column {
+                anchors.left: parent.left; anchors.leftMargin: Theme.horizontalPageMargin
+                anchors.right: parent.right; anchors.rightMargin: Theme.horizontalPageMargin
+                spacing: Theme.paddingSmall
+
+                Label {
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    color: Theme.highlightColor
+                    font.pixelSize: Theme.fontSizeHuge
+                    text: qsTr("Twablet")
+                }
+
+                Label {
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    font.pixelSize: Theme.fontSizeExtraSmall
+                    color: Theme.highlightColor
+                    wrapMode: Text.WordWrap
+                    text: qsTr("By Lucien Xu")
+                }
+
+                Label {
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    font.pixelSize: Theme.fontSizeExtraSmall
+                    color: Theme.secondaryHighlightColor
+                    wrapMode: Text.WordWrap
+                    text: qsTr("Version %1").arg(Info.version)
+                }
+            }
+
+            Label {
+                wrapMode: Text.WordWrap
+                anchors.left: parent.left; anchors.leftMargin: Theme.horizontalPageMargin
+                anchors.right: parent.right; anchors.rightMargin: Theme.horizontalPageMargin
+                font.pixelSize: Theme.fontSizeSmall
+                text: qsTr("Twablet is a Twitter client designed for bigger screens. It is an Open Source software, meaning that it can be modified and enhanced by anybody. If you like Friends, please consider a donation. It will help improving the software, while keeping it free and Open Source.")
+            }
+        }
+
+        Column {
+            id: buttonsColumn
+            anchors.top: mainColumn.bottom; anchors.topMargin: Theme.paddingLarge
+            anchors.left: parent.left; anchors.right: parent.right
+            MiniButton {
+                anchors.left: parent.left; anchors.right: parent.right
+                text: qsTr("Donate via Paypal")
+                onClicked: Qt.openUrlExternally(Info.paypal)
+            }
+            MiniButton {
+                anchors.left: parent.left; anchors.right: parent.right
+                text: qsTr("Flattr me")
+                onClicked: Qt.openUrlExternally(Info.flattr)
+            }
+            MiniButton {
+                AccountSelectionModel {
+                    id: accountSelectionModel
+                    repository: Repository
+                    Component.onCompleted: {
+                        accountSelectionModel.index = 0
+                    }
+                }
+
+                anchors.left: parent.left; anchors.right: parent.right
+                text: qsTr("Follow me on Twitter")
+                onClicked: {
+                    pageStack.pop()
+                    container.rightPanel.openUser("361931860", accountSelectionModel.selection, false)
+                }
+            }
+        }
+
+        VerticalScrollDecorator {}
+    }
+}

src/bin/qml/pages/AboutPage.qml

@@ -98,7 +98,7 @@ Page {
 
             MenuItem {
                 text: qsTr("About")
-                enabled: false
+                onClicked: pageStack.push(Qt.resolvedUrl("AboutPage.qml"), {rightPanel: panel})
             }
         }
 

src/bin/qml/pages/MainPage.qml

@@ -36,6 +36,8 @@ Item {
     id: container
     property alias source: image.source
     property alias image: image
+    property alias progress: image.progress
+    property alias status: image.status
 
     Rectangle {
         id: background

src/bin/qml/pages/TwitterImage.qml

@@ -30,5 +30,7 @@
         <file>qml/pages/TweetPage.qml</file>
         <file>qml/pages/StatusUpdater.qml</file>
         <file>qml/pages/ProgressIconButton.qml</file>
+        <file>qml/pages/AboutPage.qml</file>
+        <file>data/logo.png</file>
     </qresource>
 </RCC>

src/bin/res.qrc

@@ -99,6 +99,9 @@ QString MediaEntity::mediaUrl() const
 
 QString MediaEntity::mediaUrlLarge() const
 {
+    if (m_mediaUrl.isEmpty()) {
+        return QString();
+    }
     return m_mediaUrl + QLatin1String(":large");
 }
 

src/lib/mediaentity.cpp

@@ -143,6 +143,9 @@ QString User::imageUrl() const
 
 QString User::imageUrlLarge() const
 {
+    if (m_imageUrl.isEmpty()) {
+        return QString();
+    }
     QString returned {m_imageUrl};
     return returned.replace(QLatin1String("_normal"), QLatin1String("_bigger"));
 }
@@ -154,6 +157,9 @@ QString User::bannerUrl() const
 
 QString User::bannerUrlLarge() const
 {
+    if (m_bannerUrl.isEmpty()) {
+        return QString();
+    }
     return m_bannerUrl + QLatin1String("/ipad_retina");
 }