Unity 8

Merge lp:~cimi/unity8/preview-sharing into lp:unity8

preview-sharing
Merge into trunk

Proposed by Andrea Cimitan on 2015-10-02

Status:	Merged
Approved by:	Albert Astals Cid on 2015-11-04
Approved revision:	2005
Merged at revision:	2045
Proposed branch:	lp:~cimi/unity8/preview-sharing
Merge into:	lp:unity8
Prerequisite:	lp:~cimi/unity8/wide-preview-zoomable-videoplayback
Diff against target:	793 lines (+336/-169) 8 files modified debian/control (+1/-0) po/unity8.pot (+102/-169) qml/Dash/Previews/PreviewMediaToolbar.qml (+36/-0) qml/Dash/Previews/PreviewSharing.qml (+105/-0) qml/Dash/Previews/PreviewVideoPlayback.qml (+10/-0) qml/Dash/Previews/PreviewZoomableImage.qml (+10/-0) tests/qmltests/CMakeLists.txt (+1/-0) tests/qmltests/Dash/Previews/tst_PreviewSharing.qml (+71/-0)
To merge this branch:	bzr merge lp:~cimi/unity8/preview-sharing
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-11-05
Albert Astals Cid (community)			Approve on 2015-11-04
Michał Sawicz			Needs Fixing on 2015-10-26
Paweł Stołowski		2015-10-02	Approve on 2015-10-13
Review via email: mp+273233@code.launchpad.net

Commit Message

Add sharing widget to zoomable image and video playback

Description of the Change

* Are there any related MPs required for this MP to build/function as expected? Please list.
nope, but unity-api needs to document the new scope properties
* Did you perform an exploratory manual test run of your code change and any related functionality?
y
* Did you make sure that your branch does not contain spurious tags?
y
* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
n/a
* If you changed the UI, has there been a design review?
y

PS Jenkins bot (ps-jenkins) wrote on 2015-10-02:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6411/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-10-05:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6419/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-10-05:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6420/rebuild

review: Needs Fixing (continuous-integration)

Paweł Stołowski (stolowski) wrote on 2015-10-08:

Looks good overall, just a couple of inline comments.

review: Needs Information

Michael Zanetti (mzanetti) wrote on 2015-10-08:

Some replies/discussion to Pawel's comments.

Paweł Stołowski (stolowski) wrote on 2015-10-09:

See comment inline.

PS Jenkins bot (ps-jenkins) wrote on 2015-10-13:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6453/rebuild

review: Needs Fixing (continuous-integration)

Paweł Stołowski (stolowski) wrote on 2015-10-13:

<pstolowski> kenvandine, hello, can you take a quick look at comments re content type here: https://code.launchpad.net/~cimi/unity8/preview-sharing/+merge/273233 ? is content-hub going to support mimetypes in near future?
<kenvandine> pstolowski, we want to switch to using mimetypes, but it isn't on the near term roadmap
<pstolowski> kenvandine, if you switch, do you plan to still support the old content types for existing clients (i'm not sure it's really possible though)?
<kenvandine> pstolowski, we'll have to for some time
<kenvandine> have to deprecate it

With that I'm not going to insist on any remapping of mime types (I'm not thrilled by the idea of doing it in the shell, just wanted to rise the concern). We can use c-h content types and when they switch to mime types, update affected scopes (and according to the above, old content types will still be supported for some time before deprecating).

So, it looks good to me, +1. Thanks!

review: Approve

Albert Astals Cid (aacid) wrote on 2015-10-14:

make pot_file to update the .pot file

review: Needs Fixing

Albert Astals Cid (aacid) wrote on 2015-10-14:

sourceComponent: root.visible ? contentPeerComponent : undefined

Maybe just use the active property for this?

review: Needs Information

PS Jenkins bot (ps-jenkins) wrote on 2015-10-19:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6490/rebuild

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2015-10-21:

visible: sharingWidget.url != ""

this should probably be sharingWidget.visible and delegate to sharingWidget what it wants to be visible (you're already doing the url comparison but maybe in the future may be more things)

review: Needs Fixing

Albert Astals Cid (aacid) wrote on 2015-10-21:

I also have the feeling that it may make sense to make the "toolbar" a reusable component instead of copying the code. What do you think?

review: Needs Information

PS Jenkins bot (ps-jenkins) wrote on 2015-10-21:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6502/rebuild

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2015-10-23:

* Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

* Did CI run pass? If not, please explain why.
enough

* Did you make sure that the branch does not contain spurious tags?
Yes

review: Approve

Michał Sawicz (saviq) wrote on 2015-10-26:

Please bump to 1.3:

/«BUILDDIR»/unity8-8.11+16.04.20151026/qml/Dash/Previews/PreviewMediaToolbar.qml: bad import version in line 17
/«BUILDDIR»/unity8-8.11+16.04.20151026/qml/Dash/Previews/PreviewMediaToolbar.qml: bad import version in line 18
/«BUILDDIR»/unity8-8.11+16.04.20151026/qml/Dash/Previews/PreviewSharing.qml: bad import version in line 18
/«BUILDDIR»/unity8-8.11+16.04.20151026/tests/qmltests/Dash/Previews/tst_PreviewSharing.qml: bad import version in line 17
/«BUILDDIR»/unity8-8.11+16.04.20151026/tests/qmltests/Dash/Previews/tst_PreviewSharing.qml: bad import version in line 19

review: Needs Fixing

PS Jenkins bot (ps-jenkins) wrote on 2015-10-27:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6562/rebuild

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2015-11-04:

Please update the pot file

review: Needs Fixing

Albert Astals Cid (aacid) on 2015-11-04:

review: Approve

PS Jenkins bot (ps-jenkins) wrote on 2015-11-05:

FAILED: Continuous integration, rev:2005
http://jenkins.qa.ubuntu.com/job/unity8-ci/6644/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5015
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/59/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1356
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/59/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1251/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1252
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/58
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/58/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/4026
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5012
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5012/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24905
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/59
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/59/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6644/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-11-05:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6647/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Andrea Cimitan

Mohammad Rakibul Hasan

Unity Team

 === modified file 'debian/control'
 --- debian/control	2015-11-04 15:03:24 +0000
 +++ debian/control	2015-11-04 15:03:25 +0000
@@ -49,6 +49,7 @@
                 qtdeclarative5-dev-tools,
                 qtdeclarative5-private-dev (>= 5.2.1),
                 qtdeclarative5-qtmultimedia-plugin,
++               qtdeclarative5-ubuntu-content1,
                 qtdeclarative5-ubuntu-settings-components (>= 0.6),
                 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1676) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1676),
                 qtdeclarative5-ubuntu-web-plugin,
 === modified file 'po/unity8.pot'
 --- po/unity8.pot	2015-09-15 22:50:16 +0000
 +++ po/unity8.pot	2015-11-04 15:03:25 +0000
@@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: unity8\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2015-09-16 00:49+0200\n"
++"POT-Creation-Date: 2015-11-04 15:02+0000\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -35,86 +35,6 @@
  msgid "Unpin shortcut"
  msgstr ""
--#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
--#. This format string is used for showing, on a 12-hour clock, times that happen yesterday.
--#. (\u2003 is a unicode em space which is slightly wider than a normal space.)
--#. en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday  1:00 PM"
--#: plugins/Utils/relativetimeformatter.cpp:157
--msgid "Yesterday %l:%M %p"
--msgstr ""
--
--#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
--#. This format string is used for showing, on a 12-hour clock, times that happened today.
--#. en_US example: "%l:%M %p" --> "1:00 PM"
--#: plugins/Utils/relativetimeformatter.cpp:164
--msgid "%l:%M %p"
--msgstr ""
--
--#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
--#. This format string is used for showing, on a 12-hour clock, events/appointments that happen tomorrow.
--#. (\u2003 is a unicode em space which is slightly wider than a normal space.)
--#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow  1:00 PM"
--#: plugins/Utils/relativetimeformatter.cpp:172
--msgid "Tomorrow %l:%M %p"
--msgstr ""
--
--#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
--#. This format string is used for showing, on a 12-hour clock, times that happened in the last week.
--#. (\u2003 is a unicode em space which is slightly wider than a normal space.)
--#. en_US example: "%a\u2003%l:%M %p" --> "Fri  1:00 PM"
--#: plugins/Utils/relativetimeformatter.cpp:181
--msgid "%a %l:%M %p"
--msgstr ""
--
--#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
--#. This format string is used for showing, on a 12-hour clock, times that happened before a week from now.
--#. (\u2003 is a unicode em space which is slightly wider than a normal space.)
--#. en_US example: "%a %d %b\u2003%l:%M %p" --> "Fri Oct 31  1:00 PM"
--#. en_GB example: "%a %b %d\u2003%l:%M %p" --> "Fri 31 Oct  1:00 PM"
--#: plugins/Utils/relativetimeformatter.cpp:190
--msgid "%a %d %b %l:%M %p"
--msgstr ""
--
--#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
--#. This format string is used for showing, on a 24-hour clock, times that happen yesterday.
--#. (\u2003 is a unicode em space which is slightly wider than a normal space.)
--#. en_US example: "Yesterday\u2003%l:%M %p" --> "Yesterday  13:00"
--#: plugins/Utils/relativetimeformatter.cpp:201
--msgid "Yesterday %H:%M"
--msgstr ""
--
--#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
--#. This format string is used for showing, on a 24-hour clock, times that happened today.
--#. en_US example: "%H:%M" --> "13:00"
--#: plugins/Utils/relativetimeformatter.cpp:208
--msgid "%H:%M"
--msgstr ""
--
--#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
--#. This format string is used for showing, on a 24-hour clock, events/appointments that happen tomorrow.
--#. (\u2003 is a unicode em space which is slightly wider than a normal space.)
--#. en_US example: "Tomorrow\u2003%l:%M %p" --> "Tomorrow  13:00"
--#: plugins/Utils/relativetimeformatter.cpp:216
--msgid "Tomorrow %H:%M"
--msgstr ""
--
--#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
--#. This format string is used for showing, on a 24-hour clock, times that happened in the last week.
--#. (\u2003 is a unicode em space which is slightly wider than a normal space.)
--#. en_US example: "%a\u2003%H:%M" --> "Fri  13:00"
--#: plugins/Utils/relativetimeformatter.cpp:225
--msgid "%a %H:%M"
--msgstr ""
--
--#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
--#. This format string is used for showing, on a 24-hour clock, times that happened before a week from now.
--#. (\u2003 is a unicode em space which is slightly wider than a normal space.)
--#. en_US example: "%a %d %b\u2003%H:%M" --> "Fri Oct 31  13:00"
--#. en_GB example: "%a %b %d\u2003%H:%M" --> "Fri 31 Oct  13:00"
--#: plugins/Utils/relativetimeformatter.cpp:234
--msgid "%a %d %b %H:%M"
--msgstr ""
--
  #: qml/Components/DelayedLockscreen.qml:49
  msgid "Device Locked"
  msgstr ""
@@ -134,83 +54,83 @@
  msgstr[0] ""
  msgstr[1] ""
--#: qml/Components/Dialogs.qml:115
++#: qml/Components/Dialogs.qml:116
  msgctxt "Title: Lock/Log out dialog"
  msgid "Log out"
  msgstr ""
--#: qml/Components/Dialogs.qml:116
++#: qml/Components/Dialogs.qml:117
  msgid "Are you sure you want to log out?"
  msgstr ""
--#: qml/Components/Dialogs.qml:118
++#: qml/Components/Dialogs.qml:119
  msgctxt "Button: Lock the system"
  msgid "Lock"
  msgstr ""
--#: qml/Components/Dialogs.qml:125
++#: qml/Components/Dialogs.qml:126
  msgctxt "Button: Log out from the system"
  msgid "Log Out"
  msgstr ""
--#: qml/Components/Dialogs.qml:132 qml/Components/Dialogs.qml:165
--#: qml/Components/Dialogs.qml:224
++#: qml/Components/Dialogs.qml:133 qml/Components/Dialogs.qml:166
++#: qml/Components/Dialogs.qml:225
  msgid "Cancel"
  msgstr ""
--#: qml/Components/Dialogs.qml:144
++#: qml/Components/Dialogs.qml:145
  msgctxt "Title: Reboot/Shut down dialog"
  msgid "Shut down"
  msgstr ""
--#: qml/Components/Dialogs.qml:145
++#: qml/Components/Dialogs.qml:146
  msgid "Are you sure you want to shut down?"
  msgstr ""
--#: qml/Components/Dialogs.qml:147
++#: qml/Components/Dialogs.qml:148
  msgctxt "Button: Reboot the system"
  msgid "Reboot"
  msgstr ""
--#: qml/Components/Dialogs.qml:156
++#: qml/Components/Dialogs.qml:157
  msgctxt "Button: Shut down the system"
  msgid "Shut down"
  msgstr ""
--#: qml/Components/Dialogs.qml:178
++#: qml/Components/Dialogs.qml:179
  msgctxt "Title: Reboot dialog"
  msgid "Reboot"
  msgstr ""
--#: qml/Components/Dialogs.qml:179
++#: qml/Components/Dialogs.qml:180
  msgid "Are you sure you want to reboot?"
  msgstr ""
--#: qml/Components/Dialogs.qml:181
++#: qml/Components/Dialogs.qml:182
  msgid "No"
  msgstr ""
--#: qml/Components/Dialogs.qml:188
++#: qml/Components/Dialogs.qml:189
  msgid "Yes"
  msgstr ""
--#: qml/Components/Dialogs.qml:203
++#: qml/Components/Dialogs.qml:204
  msgctxt "Title: Power off/Restart dialog"
  msgid "Power"
  msgstr ""
--#: qml/Components/Dialogs.qml:204
++#: qml/Components/Dialogs.qml:205
  msgid ""
  "Are you sure you would like\n"
  "to power off?"
  msgstr ""
--#: qml/Components/Dialogs.qml:206
++#: qml/Components/Dialogs.qml:207
  msgctxt "Button: Power off the system"
  msgid "Power off"
  msgstr ""
--#: qml/Components/Dialogs.qml:215
++#: qml/Components/Dialogs.qml:216
  msgctxt "Button: Restart the system"
  msgid "Restart"
  msgstr ""
@@ -227,42 +147,42 @@
  msgid "OK"
  msgstr ""
--#: qml/Dash/GenericScopeView.qml:569 qml/Dash/GenericScopeView.qml:727
--msgid "See less"
--msgstr ""
--
--#: qml/Dash/GenericScopeView.qml:569
--msgid "See all"
--msgstr ""
--
--#: qml/Dash/GenericScopeView.qml:631
--msgctxt "Label: Hint for dash search line edit"
--msgid "Search"
--msgstr ""
--
--#: qml/Dash/PageHeader.qml:269
++#: qml/Dash/DashPageHeader.qml:265
  msgctxt "Button: Open the Ubuntu Store"
  msgid "Store"
  msgstr ""
--#: qml/Dash/PageHeader.qml:276
++#: qml/Dash/DashPageHeader.qml:272
  msgctxt "Button: Start a search in the current dash scope"
  msgid "Search"
  msgstr ""
--#: qml/Dash/PageHeader.qml:286
++#: qml/Dash/DashPageHeader.qml:282
  msgctxt "Button: Show the current dash scope settings"
  msgid "Settings"
  msgstr ""
--#: qml/Dash/PageHeader.qml:293
++#: qml/Dash/DashPageHeader.qml:289
  msgid "Remove from Favorites"
  msgstr ""
--#: qml/Dash/PageHeader.qml:293
++#: qml/Dash/DashPageHeader.qml:289
  msgid "Add to Favorites"
  msgstr ""
++#: qml/Dash/GenericScopeView.qml:569 qml/Dash/GenericScopeView.qml:727
++msgid "See less"
++msgstr ""
++
++#: qml/Dash/GenericScopeView.qml:569
++msgid "See all"
++msgstr ""
++
++#: qml/Dash/GenericScopeView.qml:631
++msgctxt "Label: Hint for dash search line edit"
++msgid "Search"
++msgstr ""
++
  #: qml/Dash/Previews/PreviewActionCombo.qml:35
  msgid "More..."
  msgstr ""
@@ -273,8 +193,6 @@
  #: qml/Dash/Previews/PreviewCommentInput.qml:68
  #: qml/Dash/Previews/PreviewRatingInput.qml:174
--#: qml/Panel/Indicators/MessageMenuItemFactory.qml:148
--#: qml/Panel/Indicators/MessageMenuItemFactory.qml:205
  msgid "Send"
  msgstr ""
@@ -286,6 +204,10 @@
  msgid "Add a review"
  msgstr ""
++#: qml/Dash/Previews/PreviewSharing.qml:51
++msgid "Preview Share Item"
++msgstr ""
++
  #: qml/Dash/PullToRefreshScopeStyle.qml:55
  msgid "Pull to refresh…"
  msgstr ""
@@ -310,6 +232,10 @@
  msgid "Also installed"
  msgstr ""
++#: qml/DisabledScreenNotice.qml:42
++msgid "Your device is now connected to an external display."
++msgstr ""
++
  #: qml/Greeter/CoverPage.qml:107
  msgid "Unlock"
  msgstr ""
@@ -377,7 +303,7 @@
  msgid "Sorry, incorrect passcode"
  msgstr ""
--#: qml/Notifications/NotificationMenuItemFactory.qml:128
++#: qml/Notifications/NotificationMenuItemFactory.qml:129
  msgid "Show password"
  msgstr ""
@@ -389,71 +315,78 @@
  msgid "Conference"
  msgstr ""
--#: qml/Panel/Indicators/MenuItemFactory.qml:718
++#: qml/Panel/Indicators/MenuItemFactory.qml:731
  msgid "Nothing is playing"
  msgstr ""
--#: qml/Panel/Indicators/MenuItemFactory.qml:847
++#: qml/Panel/Indicators/MenuItemFactory.qml:860
  #, qt-format
  msgid "%1 hour"
  msgid_plural "%1 hours"
  msgstr[0] ""
  msgstr[1] ""
--#: qml/Panel/Indicators/MenuItemFactory.qml:851
++#: qml/Panel/Indicators/MenuItemFactory.qml:864
  #, qt-format
  msgid "%1 minute"
  msgid_plural "%1 minutes"
  msgstr[0] ""
  msgstr[1] ""
--#: qml/Panel/Indicators/MenuItemFactory.qml:856
++#: qml/Panel/Indicators/MenuItemFactory.qml:869
  #, qt-format
  msgid "%1 second"
  msgid_plural "%1 seconds"
  msgstr[0] ""
  msgstr[1] ""
--#: qml/Panel/Indicators/MenuItemFactory.qml:859
++#: qml/Panel/Indicators/MenuItemFactory.qml:872
  msgid "0 seconds"
  msgstr ""
  #. Translators: String like "1 hour, 2 minutes, 3 seconds remaining"
--#: qml/Panel/Indicators/MenuItemFactory.qml:861
++#: qml/Panel/Indicators/MenuItemFactory.qml:874
  #, qt-format
  msgid "%1 remaining"
  msgstr ""
--#: qml/Panel/Indicators/MenuItemFactory.qml:867
++#: qml/Panel/Indicators/MenuItemFactory.qml:880
  msgid "In queue…"
  msgstr ""
--#: qml/Panel/Indicators/MenuItemFactory.qml:871
++#: qml/Panel/Indicators/MenuItemFactory.qml:884
  msgid "Downloading"
  msgstr ""
--#: qml/Panel/Indicators/MenuItemFactory.qml:873
++#: qml/Panel/Indicators/MenuItemFactory.qml:886
  msgid "Paused, tap to resume"
  msgstr ""
--#: qml/Panel/Indicators/MenuItemFactory.qml:875
++#: qml/Panel/Indicators/MenuItemFactory.qml:888
  msgid "Canceled"
  msgstr ""
--#: qml/Panel/Indicators/MenuItemFactory.qml:877
++#: qml/Panel/Indicators/MenuItemFactory.qml:890
  msgid "Finished"
  msgstr ""
--#: qml/Panel/Indicators/MenuItemFactory.qml:879
++#: qml/Panel/Indicators/MenuItemFactory.qml:892
  msgid "Failed, tap to retry"
  msgstr ""
--#: qml/Panel/Indicators/MessageMenuItemFactory.qml:149
++#: qml/Panel/Indicators/MessageMenuItemFactory.qml:155
++#: qml/Panel/Indicators/MessageMenuItemFactory.qml:214
++msgctxt "Button: Send a reply message"
++msgid "Send"
++msgstr ""
++
++#: qml/Panel/Indicators/MessageMenuItemFactory.qml:156
  msgctxt "Label: Hint in message indicator line edit"
  msgid "Reply"
  msgstr ""
--#: qml/Panel/Indicators/MessageMenuItemFactory.qml:204
++#: qml/Panel/Indicators/MessageMenuItemFactory.qml:213
++msgctxt "Button: Call back on phone"
  msgid "Call back"
  msgstr ""
@@ -523,38 +456,6 @@
  msgid "Back"
  msgstr ""
--#: qml/Wizard/Pages/here-terms.qml:27
--msgid "Terms & Conditions"
--msgstr ""
--
--#: qml/Wizard/Pages/passwd-confirm.qml:49
--msgid "Confirm passphrase"
--msgstr ""
--
--#: qml/Wizard/Pages/passwd-confirm.qml:50
--msgid "Confirm passcode"
--msgstr ""
--
--#: qml/Wizard/Pages/passwd-confirm.qml:53
--#: qml/Wizard/Pages/passwd-confirm.qml:54
--msgid "Please try again."
--msgstr ""
--
--#: qml/Wizard/Pages/passwd-confirm.qml:82 qml/Wizard/Pages/passwd-set.qml:90
--#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
--#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
--#: qml/Wizard/Pages/60-reporting.qml:50
--msgid "Continue"
--msgstr ""
--
--#: qml/Wizard/Pages/passwd-set.qml:61
--msgid "Choose your passcode"
--msgstr ""
--
--#: qml/Wizard/Pages/passwd-set.qml:68
--msgid "Passphrase must be 4 characters long"
--msgstr ""
--
  #: qml/Wizard/Pages/10-welcome.qml:27
  msgid "Hi!"
  msgstr ""
@@ -567,6 +468,13 @@
  msgid "Let’s get started."
  msgstr ""
++#: qml/Wizard/Pages/10-welcome.qml:88 qml/Wizard/Pages/30-passwd-type.qml:128
++#: qml/Wizard/Pages/40-wifi.qml:215 qml/Wizard/Pages/50-location.qml:131
++#: qml/Wizard/Pages/60-reporting.qml:60 qml/Wizard/Pages/passwd-confirm.qml:82
++#: qml/Wizard/Pages/passwd-set.qml:90
++msgid "Continue"
++msgstr ""
++
  #: qml/Wizard/Pages/20-sim.qml:25
  msgid "Add a SIM card and restart your device"
  msgstr ""
@@ -660,17 +568,17 @@
  msgid "You can change your mind later in <b>System Settings</b>."
  msgstr ""
--#: qml/Wizard/Pages/60-reporting.qml:24
++#: qml/Wizard/Pages/60-reporting.qml:26
  msgid "Improving your experience"
  msgstr ""
--#: qml/Wizard/Pages/60-reporting.qml:36
++#: qml/Wizard/Pages/60-reporting.qml:46
  msgid ""
  "Your phone is set up to automatically report errors to Canonical and its "
  "partners, the makers of the operating system."
  msgstr ""
--#: qml/Wizard/Pages/60-reporting.qml:43
++#: qml/Wizard/Pages/60-reporting.qml:53
  msgid ""
  "This can be disabled in <b>System Settings</b> under <b>Security &amp; "
  "Privacy</b>"
@@ -692,6 +600,31 @@
  msgid "Finish"
  msgstr ""
++#: qml/Wizard/Pages/here-terms.qml:27
++msgid "Terms & Conditions"
++msgstr ""
++
++#: qml/Wizard/Pages/passwd-confirm.qml:49
++msgid "Confirm passphrase"
++msgstr ""
++
++#: qml/Wizard/Pages/passwd-confirm.qml:50
++msgid "Confirm passcode"
++msgstr ""
++
++#: qml/Wizard/Pages/passwd-confirm.qml:53
++#: qml/Wizard/Pages/passwd-confirm.qml:54
++msgid "Please try again."
++msgstr ""
++
++#: qml/Wizard/Pages/passwd-set.qml:61
++msgid "Choose your passcode"
++msgstr ""
++
++#: qml/Wizard/Pages/passwd-set.qml:68
++msgid "Passphrase must be 4 characters long"
++msgstr ""
++
  #. Translators: This is the arrow for "Back" buttons
  #: qml/Wizard/StackButton.qml:39
  #, qt-format
 === added file 'qml/Dash/Previews/PreviewMediaToolbar.qml'
 --- qml/Dash/Previews/PreviewMediaToolbar.qml	1970-01-01 00:00:00 +0000
 +++ qml/Dash/Previews/PreviewMediaToolbar.qml	2015-11-04 15:03:25 +0000
@@ -0,0 +1,36 @@
++/*
++ * Copyright (C) 2015 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * 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.4
++import Ubuntu.Components 1.3
++import "../../Components"
++
++Rectangle {
++    property alias shareData: sharingWidget.shareData
++
++    implicitHeight: units.gu(6)
++    color: Qt.rgba(0, 0, 0, 0.8)
++    visible: sharingWidget.visible
++
++    PreviewSharing {
++        id: sharingWidget
++        anchors {
++            left: parent.left
++            verticalCenter: parent.verticalCenter
++            leftMargin: units.gu(1)
++        }
++    }
++}
 === added file 'qml/Dash/Previews/PreviewSharing.qml'
 --- qml/Dash/Previews/PreviewSharing.qml	1970-01-01 00:00:00 +0000
 +++ qml/Dash/Previews/PreviewSharing.qml	2015-11-04 15:03:25 +0000
@@ -0,0 +1,105 @@
++/*
++ * Copyright (C) 2015 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * 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.4
++import Ubuntu.Components 1.3
++import Ubuntu.Content 1.1
++
++Item {
++    id: root
++    implicitHeight: button.height
++    implicitWidth: button.width
++
++    property var shareData
++    readonly property bool isUrlExternal: url && url.indexOf("file:///") != 0 && url.indexOf("/") != 0
++    readonly property string contentType: shareData ? shareData["contentType"] : ""
++    readonly property var url: shareData ? shareData["uri"] : ""
++    readonly property Item rootItem: QuickUtils.rootItem(root)
++
++    visible: url != ""
++
++    AbstractButton {
++        id: button
++        height: units.gu(4)
++        width: units.gu(4)
++        onClicked: peerPicker.visible = true
++
++        Icon {
++            anchors.centerIn: parent
++            height: units.gu(3)
++            width: units.gu(3)
++            source: "image://theme/share"
++        }
++    }
++
++    Component {
++        id: exportItemComponent
++        ContentItem {
++            name: i18n.tr("Preview Share Item")
++        }
++    }
++
++    Component {
++        id: contentPeerComponent
++        ContentPeerPicker {
++            handler: ContentHandler.Share
++            contentType: {
++                // for now, treat all external urls as Links, or it will break contenthub
++                if (root.isUrlExternal) return ContentType.Links;
++
++                switch(root.contentType) {
++                    case "all": return ContentType.All;
++                    case "contacts": return ContentType.Contacts;
++                    case "documents": return ContentType.Documents;
++                    case "links": return ContentType.Links;
++                    case "music": return ContentType.Music;
++                    case "pictures": return ContentType.Pictures;
++                    case "text": return ContentType.Text;
++                    default:
++                    case "unknown": return ContentType.Unknown;
++                    case "videos": return ContentType.Videos;
++                }
++            }
++
++            onPeerSelected: {
++                var transfer = peer.request();
++                if (transfer.state === ContentTransfer.InProgress) {
++                    var items = new Array();
++                    for (var i = 0; i < url.length; i++) {
++                        var exportItem = exportItemComponent.createObject();
++                        exportItem.url = url[i];
++                        items.push(exportItem);
++                    }
++                    transfer.items = items;
++                    transfer.state = ContentTransfer.Charged;
++                }
++                peerPicker.visible = false;
++            }
++            onCancelPressed: peerPicker.visible = false;
++        }
++    }
++
++    Loader {
++        id: peerPicker
++        objectName: "peerPicker"
++        parent: rootItem
++        anchors.fill: parent
++        visible: false
++        active: root.visible
++
++        sourceComponent: contentPeerComponent
++    }
++}
 === modified file 'qml/Dash/Previews/PreviewVideoPlayback.qml'
 --- qml/Dash/Previews/PreviewVideoPlayback.qml	2015-11-04 15:03:24 +0000
 +++ qml/Dash/Previews/PreviewVideoPlayback.qml	2015-11-04 15:03:25 +0000
@@ -73,5 +73,15 @@
              anchors.fill: parent
              onClicked: Qt.openUrlExternally(widgetData["source"])
+         }
++
++        PreviewMediaToolbar {
++            id: toolbar
++            anchors {
++                left: parent.left
++                right: parent.right
++                bottom: parent.bottom
++            }
++            shareData: widgetData["shareData"]
++        }
+     }
+ }
 === modified file 'qml/Dash/Previews/PreviewZoomableImage.qml'
 --- qml/Dash/Previews/PreviewZoomableImage.qml	2015-11-04 15:03:24 +0000
 +++ qml/Dash/Previews/PreviewZoomableImage.qml	2015-11-04 15:03:25 +0000
@@ -64,6 +64,16 @@
              // But at the moment the model never changes
              onStatusChanged: if (lazyImage.sourceImage.status === Image.Error) lazyImage.sourceImage.source = widgetData["fallback"];
+         }
++
++        PreviewMediaToolbar {
++            id: toolbar
++            anchors {
++                left: parent.left
++                right: parent.right
++                bottom: parent.bottom
++            }
++            shareData: widgetData["shareData"]
++        }
+     }
      PreviewOverlay {
 === modified file 'tests/qmltests/CMakeLists.txt'
 --- tests/qmltests/CMakeLists.txt	2015-11-04 15:03:24 +0000
 +++ tests/qmltests/CMakeLists.txt	2015-11-04 15:03:25 +0000
@@ -42,6 +42,7 @@
  add_unity8_qmltest(Dash/Previews PreviewRatingDisplay)
  add_unity8_qmltest(Dash/Previews PreviewRatingEdit)
  add_unity8_qmltest(Dash/Previews PreviewRatingInput)
++add_unity8_qmltest(Dash/Previews PreviewSharing)
  add_unity8_qmltest(Dash/Previews PreviewTable)
  add_unity8_qmltest(Dash/Previews PreviewTextSummary)
  add_unity8_qmltest(Dash/Previews PreviewVideoPlayback)
 === added file 'tests/qmltests/Dash/Previews/tst_PreviewSharing.qml'
 --- tests/qmltests/Dash/Previews/tst_PreviewSharing.qml	1970-01-01 00:00:00 +0000
 +++ tests/qmltests/Dash/Previews/tst_PreviewSharing.qml	2015-11-04 15:03:25 +0000
@@ -0,0 +1,71 @@
++/*
++ * Copyright 2014 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * 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.4
++import QtTest 1.0
++import Ubuntu.Components 1.3
++import "../../../../qml/Dash/Previews"
++import Unity.Test 0.1 as UT
++
++Rectangle {
++    id: root
++    width: units.gu(40)
++    height: units.gu(80)
++    color: "black"
++
++    property var shareData: {
++        "uri": [
++                    "Text here",
++                    "text here 2",
++                    "text here 3"
++                ],
++        "contentType": "text"
++    }
++
++    property var shareDataNoUri: {
++        "uri": "",
++        "contentType": "text"
++    }
++
++    PreviewSharing {
++        id: previewSharing
++        anchors { left: parent.left; bottom: parent.bottom; }
++        shareData: root.shareData
++    }
++
++    UT.UnityTestCase {
++        name: "PreviewSharingTest"
++        when: windowShown
++
++        property Item peerPicker: findChild(previewSharing.rootItem, "peerPicker")
++
++        function cleanup() {
++            peerPicker.visible = false;
++            previewSharing.shareData = root.shareData;
++        }
++
++        function test_visible() {
++            compare(previewSharing.visible, true);
++            previewSharing.shareData = shareDataNoUri;
++            compare(previewSharing.visible, false);
++        }
++
++        function test_open_picker() {
++            mouseClick(previewSharing);
++            compare(peerPicker.visible, true);
++        }
++    }
++}