Merge lp:~ubuntu-sdk-team/ubuntu-ui-extras/ubuntu-ui-extras-share-popover into lp:~ubuntu-sdk-team/ubuntu-ui-extras/trunk

[Ugo Riboni]

Add a SharePopover component that apps can use to let the user chose to which service to share.

Add a SharePopover component that apps can use to let the user chose to which service to share.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:47
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-extras/ubuntu-ui-extras-share-popover/+merge/181034/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-ui-extras-ci/22/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2394
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-extras-saucy-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-extras-saucy-armhf-ci/22
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-extras-saucy-armhf-ci/22/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2400
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2400/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2032

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-extras-ci/22/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ubuntu-sdk-team/ubuntu-ui-extras/ubuntu-ui-extras-share-popover]

48. By Ugo Riboni on 2013-08-21

Merge changes from trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:48
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-extras-ci/29/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-extras-saucy-amd64-ci/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-extras-saucy-armhf-ci/29
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-extras-saucy-armhf-ci/29/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-extras-ci/29/rebuild

review: Approve (continuous-integration)

[Günter Schwann (schwann)]

looks good, and works

review: Approve

=== modified file 'modules/Ubuntu/Components/Extras/CMakeLists.txt'
--- modules/Ubuntu/Components/Extras/CMakeLists.txt	2013-08-19 09:15:31 +0000
+++ modules/Ubuntu/Components/Extras/CMakeLists.txt	2013-08-21 11:26:55 +0000
@@ -21,3 +21,4 @@
 
 add_subdirectory(plugin)
 add_subdirectory(Example)
+add_subdirectory(Share)
 
=== added file 'modules/Ubuntu/Components/Extras/Share/CMakeLists.txt'
--- modules/Ubuntu/Components/Extras/Share/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/Extras/Share/CMakeLists.txt	2013-08-21 11:26:55 +0000
@@ -0,0 +1,2 @@
+file(GLOB QML_FILES *.qml)
+install(FILES ${QML_FILES} DESTINATION ${PLUGIN_DIR}/Share)
 
=== added file 'modules/Ubuntu/Components/Extras/Share/ShareMenu.qml'
--- modules/Ubuntu/Components/Extras/Share/ShareMenu.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/Extras/Share/ShareMenu.qml	2013-08-21 11:26:55 +0000
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2012-2013 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.OnlineAccounts 0.1
+
+/*!
+*/
+Item {
+    id: sharemenu
+
+    height: childrenRect.height
+
+    signal selected(string accountId)
+
+    ListView {
+        anchors {
+            top: parent.top
+            left: parent.left
+            right: parent.right
+        }
+        height: childrenRect.height
+        interactive: false
+
+        model: AccountServiceModel {
+            serviceType: "microblogging"
+            includeDisabled: true
+        }
+
+        delegate: Item {
+            width: parent.width
+            height: childrenRect.height
+            visible: serviceName == "Facebook"
+
+            AccountService {
+                id: service
+                objectHandle: accountService
+            }
+
+            ListItem.Subtitled {
+                text: service.provider.displayName
+                subText: displayName
+                icon: "image://gicon/" + service.provider.iconName
+                __iconHeight: units.gu(5)
+                __iconWidth: units.gu(5)
+
+                onClicked: {
+                    if (service.provider.displayName == "Facebook") {
+                        sharemenu.selected(accountId);
+                    } else {
+                        console.log("Sharing to this service is not supported yet.");
+                        sharemenu.selected(null);
+                    }
+                }
+            }
+        }
+    }
+}
 
=== added file 'modules/Ubuntu/Components/Extras/Share/SharePopover.qml'
--- modules/Ubuntu/Components/Extras/Share/SharePopover.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/Extras/Share/SharePopover.qml	2013-08-21 11:26:55 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2012-2013 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+/*!
+*/
+Popover {
+    id: sharePopover
+
+    signal selected(string accountId)
+
+    ShareMenu {
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: parent.top
+        }
+        onSelected: {
+            if (accountId !== null) {
+                sharePopover.selected(accountId)
+            }
+            sharePopover.hide()
+        }
+    }
+}
 
=== modified file 'modules/Ubuntu/Components/Extras/qmldir'
--- modules/Ubuntu/Components/Extras/qmldir	2013-08-12 11:10:11 +0000
+++ modules/Ubuntu/Components/Extras/qmldir	2013-08-21 11:26:55 +0000
@@ -2,3 +2,4 @@
 plugin ubuntu-ui-extras-plugin
 Example 0.1 Example.qml
 Share 0.1 Share.qml
+SharePopover 0.1 Share/SharePopover.qml
 
=== added file 'ubuntu-ui-extras.qmlproject'
--- ubuntu-ui-extras.qmlproject	1970-01-01 00:00:00 +0000
+++ ubuntu-ui-extras.qmlproject	2013-08-21 11:26:55 +0000
@@ -0,0 +1,14 @@
+import QmlProject 1.1
+
+Project {
+    QmlFiles {
+        directory: "modules"
+    }
+    JavaScriptFiles {
+        directory: "modules"
+    }
+    Files {
+        filter: ["modules/Ubuntu/Components/Extras/qmldir"]
+    }
+}
+