Merge lp:~nik90/owncloud-sync/aboutpage into lp:owncloud-sync

[Nekhelesh Ramananthan]

Added a basic about page showing the version and other details of owncloud-sync.

=== modified file 'Owncloud-Sync/Owncloud-Sync/Main.qml'
--- Owncloud-Sync/Owncloud-Sync/Main.qml	2016-04-22 20:48:15 +0000
+++ Owncloud-Sync/Owncloud-Sync/Main.qml	2016-05-04 09:53:14 +0000
@@ -152,6 +152,7 @@
             property string serverURL
             property string lastSync
             property bool mobileData
+            property string owncloudcmdVersion
         }
 
         layouts: PageColumnsLayout {
@@ -176,11 +177,20 @@
         AccountSettingsPage {
             id: ocSettings
 
-            trailingAction: Action {
-                iconName: "document-open"
-                visible: apl.windowWidth < apl.maxWidth
-                text: i18n.tr("Folders")
-                onTriggered: apl.addPageToNextColumn(apl.primaryPageSource, syncSettings)
+            trailingAction: ActionList {
+                children: [
+                    Action {
+                        iconName: "document-open"
+                        visible: apl.windowWidth < apl.maxWidth
+                        text: i18n.tr("Folders")
+                        onTriggered: apl.addPageToNextColumn(apl.primaryPageSource, syncSettings)
+                    },
+
+                    Action {
+                        iconName: "info"
+                        onTriggered: apl.addPageToCurrentColumn(apl.primaryPageSource, Qt.resolvedUrl("ui/AboutPage.qml"), {daemonVersion: accountSettings.owncloudcmdVersion})
+                    }
+                ]
             }
 
             accountSettings: {
@@ -194,7 +204,7 @@
 
 
             onConnectClicked: {
-            testConnection(username, password, timer, serverURL, mobileData, lastSync)
+                testConnection(username, password, timer, serverURL, mobileData, lastSync)
             }
         }
 

=== added file 'Owncloud-Sync/Owncloud-Sync/ui/AboutPage.qml'
--- Owncloud-Sync/Owncloud-Sync/ui/AboutPage.qml	1970-01-01 00:00:00 +0000
+++ Owncloud-Sync/Owncloud-Sync/ui/AboutPage.qml	2016-05-04 09:53:14 +0000
@@ -0,0 +1,93 @@
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+Page {
+    id: aboutPage
+
+    property string daemonVersion: ""
+
+    header: PageHeader {
+        title: i18n.tr("About")
+        flickable: flickable
+    }
+
+    Flickable {
+        id: flickable
+
+        anchors.fill: parent
+        contentHeight: dataColumn.height + units.gu(10) + dataColumn.anchors.topMargin
+
+        Column {
+            id: dataColumn
+
+            spacing: units.gu(3)
+            anchors {
+                top: parent.top; left: parent.left; right: parent.right; topMargin: units.gu(5)
+            }
+
+            Image {
+                height: width
+                width: Math.min(parent.width/2, parent.height/2)
+                source: "../Owncloud-Sync.png"
+                anchors.horizontalCenter: parent.horizontalCenter
+            }
+
+            Label {
+                width: parent.width
+                textSize: Label.XLarge
+                font.weight: Font.DemiBold
+                horizontalAlignment: Text.AlignHCenter
+                text: "Owncloud Sync"
+            }
+
+            Column {
+                width: parent.width
+
+                Label {
+                    width: parent.width
+                    horizontalAlignment: Text.AlignHCenter
+                    // TRANSLATORS: Owncloud Sync version number e.g Version 0.1
+                    text: i18n.tr("Client Version %1").arg("0.1")
+                }
+
+                Label {
+                    width: parent.width
+                    horizontalAlignment: Text.AlignHCenter
+                    // TRANSLATORS: Owncloud Sync daemon version number e.g Version 1.8.1
+                    text: i18n.tr("Daemon Version %1").arg(daemonVersion)
+                }
+            }
+
+            Column {
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                    margins: units.gu(2)
+                }
+                Label {
+                    width: parent.width
+                    wrapMode: Text.WordWrap
+                    horizontalAlignment: Text.AlignHCenter
+                    text: "(C) 2016 Owncloud Sync Devs"
+                }
+                Label {
+                    textSize: Label.Small
+                    width: parent.width
+                    wrapMode: Text.WordWrap
+                    horizontalAlignment: Text.AlignHCenter
+                    text: i18n.tr("Released under the terms of the GNU GPL v3")
+                }
+            }
+
+            Label {
+                width: parent.width
+                wrapMode: Text.WordWrap
+                textSize: Label.Small
+                horizontalAlignment: Text.AlignHCenter
+                text: i18n.tr("Source code available on %1").arg("<a href=\"https://launchpad.net/owncloud-sync\">launchpad.net</a>")
+                onLinkActivated: Qt.openUrlExternally(link)
+            }
+        }
+    }
+}
+

=== modified file 'Owncloud-Sync/Owncloud-Sync/ui/AccountSettingsPage.qml'
--- Owncloud-Sync/Owncloud-Sync/ui/AccountSettingsPage.qml	2016-04-23 10:26:58 +0000
+++ Owncloud-Sync/Owncloud-Sync/ui/AccountSettingsPage.qml	2016-05-04 09:53:14 +0000
@@ -6,7 +6,7 @@
     id: accountSettingsPage
 
     // Page header trailing action
-    property Action trailingAction
+    property ActionList trailingAction
 
     // Signal fired when connect button is clicked
     signal connectClicked(string username, string password, int timer, string serverURL, bool mobileData, string lastSync)
@@ -17,7 +17,7 @@
         id: header
         title: i18n.tr("Owncloud Settings")
         flickable: accountSettingsFlickable
-        trailingActionBar.actions: accountSettingsPage.trailingAction
+        trailingActionBar.actions: accountSettingsPage.trailingAction.actions
     }
     
     Flickable {