From 9a5a44bb80e7f36de9790ee2a7326e6834741285 Mon Sep 17 00:00:00 2001
From: Morgan McMillian <gilag@monkeystew.com>
Date: Fri, 4 Nov 2016 17:39:28 -0700
Subject: [PATCH] added about page

---
 Goober.pro               |   2 +-
 assets/.assets.index     |   4 ++-
 assets/AboutPage.qml     |  55 +++++++++++++++++++++++++++++++++++++++
 assets/icons/ic_info.png | Bin 0 -> 2884 bytes
 assets/main.qml          |  13 +++++++++
 buildnum                 |   2 +-
 config.pri               |   2 ++
 src/applicationui.cpp    |   8 ++++++
 src/applicationui.hpp    |   1 +
 translations/Goober.ts   |  21 +++++++++------
 10 files changed, 97 insertions(+), 11 deletions(-)
 create mode 100644 assets/AboutPage.qml
 create mode 100644 assets/icons/ic_info.png

diff --git a/Goober.pro b/Goober.pro
index d9ea75d..13d284e 100644
--- a/Goober.pro
+++ b/Goober.pro
@@ -1,7 +1,7 @@
 APP_NAME = Goober
 
 CONFIG += qt warn_on cascades10
-LIBS   += -lbbdata -lbbsystem
+LIBS   += -lbbdata -lbbsystem -lbb
 QT     += network
 
 include(config.pri)
diff --git a/assets/.assets.index b/assets/.assets.index
index 6e8d35c..3495f3d 100644
--- a/assets/.assets.index
+++ b/assets/.assets.index
@@ -1,5 +1,6 @@
 1
-41
+43
+AboutPage.qml
 AppCover.qml
 icons/at.png
 icons/bell-slash.png
@@ -17,6 +18,7 @@ icons/ic_contact.png
 icons/ic_del_bookmarks.png
 icons/ic_edit.png
 icons/ic_favorite.png
+icons/ic_info.png
 icons/ic_reload.png
 icons/ic_reply.png
 icons/ic_reply_all.png
diff --git a/assets/AboutPage.qml b/assets/AboutPage.qml
new file mode 100644
index 0000000..89ef274
--- /dev/null
+++ b/assets/AboutPage.qml
@@ -0,0 +1,55 @@
+import bb.cascades 1.4
+
+Page {
+    
+    property string appversion
+    
+    Container {
+        layout: DockLayout {}
+        verticalAlignment: VerticalAlignment.Fill
+        horizontalAlignment: HorizontalAlignment.Fill
+        Container {
+            horizontalAlignment: HorizontalAlignment.Center
+            verticalAlignment: VerticalAlignment.Center
+            Container {
+                horizontalAlignment: HorizontalAlignment.Center
+                Label {
+                    text: "Goober"
+                    horizontalAlignment: HorizontalAlignment.Center
+                    textStyle.fontSize: FontSize.XXLarge
+                }
+            }
+            Container {
+                horizontalAlignment: HorizontalAlignment.Center
+                Label {
+                    text: "v%1".arg(appversion)
+                }
+            }
+            Container {
+                horizontalAlignment: HorizontalAlignment.Center
+                topPadding: ui.sdu(2)
+                Label {
+                    text: "A short messaging client for the pnut.io network."
+                    multiline: true
+                }   
+            }
+            Container {
+                horizontalAlignment: HorizontalAlignment.Center
+                topPadding: ui.sdu(2)
+                Label {
+                    text: "Copyright &copy;  2016  Morgan McMillian"
+                    textStyle.fontSize: FontSize.XSmall
+                    textFormat: TextFormat.Html
+                }
+            }
+            Container {
+                horizontalAlignment: HorizontalAlignment.Center
+                topPadding: ui.sdu(3)
+                Label {
+                    text: "<a href=\"https://monkeystew.org\">https://monkeystew.org</a>"
+                    textFormat: TextFormat.Html
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/assets/icons/ic_info.png b/assets/icons/ic_info.png
new file mode 100644
index 0000000000000000000000000000000000000000..145f94482010cfc1ee5eb2077cb6a28cd99e0730
GIT binary patch
literal 2884
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

literal 0
HcmV?d00001

diff --git a/assets/main.qml b/assets/main.qml
index f4e0413..77d37d3 100644
--- a/assets/main.qml
+++ b/assets/main.qml
@@ -37,6 +37,15 @@ TabbedPane {
                 onTriggered: {
                     activePane.logout();
                 }
+            },
+            ActionItem {
+                title: qsTr("About")
+                imageSource: "asset:///icons/ic_info.png"
+                onTriggered: {
+                    var page = aboutPage.createObject()
+                    page.appversion = _app.appversion()
+                    activePane.push(page)
+                }
             }
         ]
     }
@@ -156,6 +165,10 @@ TabbedPane {
         ComponentDefinition {
             id: settingsPage
             source: "SettingsPage.qml"
+        },
+        ComponentDefinition {
+            id: aboutPage
+            source: "AboutPage.qml"
         }
     ]
     
diff --git a/buildnum b/buildnum
index f937f7e..b6e2760 100644
--- a/buildnum
+++ b/buildnum
@@ -1 +1 @@
-233
\ No newline at end of file
+242
\ No newline at end of file
diff --git a/config.pri b/config.pri
index cf67b3d..5f84b1b 100644
--- a/config.pri
+++ b/config.pri
@@ -66,6 +66,7 @@ simulator {
 
 config_pri_assets {
     OTHER_FILES += \
+        $$quote($$BASEDIR/assets/AboutPage.qml) \
         $$quote($$BASEDIR/assets/AppCover.qml) \
         $$quote($$BASEDIR/assets/LoginSheet.qml) \
         $$quote($$BASEDIR/assets/NewPostSheet.qml) \
@@ -91,6 +92,7 @@ config_pri_assets {
         $$quote($$BASEDIR/assets/icons/ic_del_bookmarks.png) \
         $$quote($$BASEDIR/assets/icons/ic_edit.png) \
         $$quote($$BASEDIR/assets/icons/ic_favorite.png) \
+        $$quote($$BASEDIR/assets/icons/ic_info.png) \
         $$quote($$BASEDIR/assets/icons/ic_reload.png) \
         $$quote($$BASEDIR/assets/icons/ic_reply.png) \
         $$quote($$BASEDIR/assets/icons/ic_reply_all.png) \
diff --git a/src/applicationui.cpp b/src/applicationui.cpp
index aed9dc8..61e321d 100644
--- a/src/applicationui.cpp
+++ b/src/applicationui.cpp
@@ -23,6 +23,7 @@
 #include <bb/cascades/QmlDocument>
 #include <bb/cascades/AbstractPane>
 #include <bb/cascades/LocaleHandler>
+#include <bb/ApplicationInfo>
 
 using namespace bb::cascades;
 
@@ -64,6 +65,7 @@ ApplicationUI::ApplicationUI() :
 
     // Set created root object as the application scene
     Application::instance()->setScene(root);
+
 }
 
 QVariant ApplicationUI::setting(const QString& key)
@@ -86,3 +88,9 @@ void ApplicationUI::onSystemLanguageChanged()
         QCoreApplication::instance()->installTranslator(m_pTranslator);
     }
 }
+
+QString ApplicationUI::appversion()
+{
+    bb::ApplicationInfo appinfo;
+    return appinfo.version();
+}
diff --git a/src/applicationui.hpp b/src/applicationui.hpp
index cba42ae..46d0e60 100644
--- a/src/applicationui.hpp
+++ b/src/applicationui.hpp
@@ -44,6 +44,7 @@ public:
 
     Q_INVOKABLE QVariant setting(const QString &key);
     Q_INVOKABLE void setSetting(const QString &key, const QString &value);
+    Q_INVOKABLE QString appversion();
 private slots:
     void onSystemLanguageChanged();
 private:
diff --git a/translations/Goober.ts b/translations/Goober.ts
index b37ea43..aca0054 100644
--- a/translations/Goober.ts
+++ b/translations/Goober.ts
@@ -200,26 +200,31 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../assets/main.qml" line="59"/>
-        <location filename="../assets/main.qml" line="63"/>
+        <location filename="../assets/main.qml" line="42"/>
+        <source>About</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../assets/main.qml" line="68"/>
+        <location filename="../assets/main.qml" line="72"/>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../assets/main.qml" line="81"/>
-        <location filename="../assets/main.qml" line="85"/>
+        <location filename="../assets/main.qml" line="90"/>
+        <location filename="../assets/main.qml" line="94"/>
         <source>Mentions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../assets/main.qml" line="103"/>
-        <location filename="../assets/main.qml" line="107"/>
+        <location filename="../assets/main.qml" line="112"/>
+        <location filename="../assets/main.qml" line="116"/>
         <source>Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../assets/main.qml" line="125"/>
-        <location filename="../assets/main.qml" line="129"/>
+        <location filename="../assets/main.qml" line="134"/>
+        <location filename="../assets/main.qml" line="138"/>
         <source>Global</source>
         <translation type="unfinished"></translation>
     </message>