Unity 8

Merge lp:~albaguirre/unity8/add-screenshotter into lp:unity8

add-screenshotter
Merge into trunk

Proposed by Alberto Aguirre on 2014-09-24

Status:

Merged

Approved by:

Albert Astals Cid on 2014-10-30

Approved revision:

1308

Merged at revision:

1398

Proposed branch:

lp:~albaguirre/unity8/add-screenshotter

Merge into:

lp:unity8

Diff against target:

569 lines (+413/-4)

15 files modified

debian/unity8-private.install (+1/-0)
plugins/CMakeLists.txt (+1/-0)
plugins/ScreenGrabber/CMakeLists.txt (+13/-0)
plugins/ScreenGrabber/ScreenGrabber.qmltypes (+17/-0)
plugins/ScreenGrabber/plugin.cpp (+28/-0)
plugins/ScreenGrabber/plugin.h (+33/-0)
plugins/ScreenGrabber/qmldir (+3/-0)
plugins/ScreenGrabber/screengrabber.cpp (+94/-0)
plugins/ScreenGrabber/screengrabber.h (+42/-0)
qml/Components/ScreenGrabber.qml (+72/-0)
qml/Components/VolumeKeyFilter.qml (+63/-0)
qml/Shell.qml (+14/-4)
tests/mocks/QtMultimedia/QtMultimedia.qmltypes (+10/-0)
tests/mocks/QtMultimedia/audio.cpp (+10/-0)
tests/mocks/QtMultimedia/audio.h (+12/-0)

To merge this branch:

bzr merge lp:~albaguirre/unity8/add-screenshotter

Undecided

Opinion

Link a bug report

Reviewer	Review Type	Date Requested	Status
Albert Astals Cid (community)		2014-09-24	Approve on 2014-10-30
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2014-10-30
Daniel d'Andrada (community)			Abstain on 2014-10-03
Michael Zanetti (community)			Needs Information on 2014-09-26
Gerry Boland (community)			Needs Fixing on 2014-09-25
Review via email: mp+235834@code.launchpad.net

Commit message

Add a plugin to take screenshots on vol up + vol down

The screenshots are saved into <Pictures dir>/Screenshots/

Description of the change

Add a plugin to take screenshots on vol up + vol down

The screenshots are saved into <Pictures dir>/Screenshots/

Are there any related MPs required for this MP to build/function as expected?
No

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

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

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?
Yes design has reviewed (see https://bugs.launchpad.net/ubuntu/+source/mir/+bug/1369644)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-24:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-09-25:

Does this actually take screenshot of running applications? ScreenShotter::takeScreenshot seems like it will only take snapshots of the shell itself, no?

review: Needs Information

Revision history for this message

Gerry Boland (gerboland) wrote on 2014-09-25:

+QString ScreenShotter::generateName()
+QString ScreenShotter::generateUniqueNum()
+ // First lets look for existing files using our numbering pattern
instead of this complex numbering pattern, why not just use current date & time?

review: Needs Fixing

Revision history for this message

Alberto Aguirre (albaguirre) wrote on 2014-09-25:

> Does this actually take screenshot of running applications?
> ScreenShotter::takeScreenshot seems like it will only take snapshots of the
> shell itself, no?

Yes it takes screenshots of whatever is being rendered to the screen by qtmir. This is because the shell window will be backed by qtmir's DisplayWindow, which is where all the shell and apps surfaces will be rendered into.

Revision history for this message

Alberto Aguirre (albaguirre) wrote on 2014-09-25:

> +QString ScreenShotter::generateName()
> +QString ScreenShotter::generateUniqueNum()
> + // First lets look for existing files using our numbering pattern
> instead of this complex numbering pattern, why not just use current date &
> time?

Ok I guess I can do that. I suppose I just wanted it to produce sequentially numbered files as most other products do when saving say camera snapshots.

Revision history for this message

Alberto Aguirre (albaguirre) wrote on 2014-09-25:

@Albert:

This is an example screenshot taken with this branch:
https://launchpadlibrarian.net/185774052/screenshot20141825_191841150.jpg

Revision history for this message

Alberto Aguirre (albaguirre) wrote on 2014-09-25:

Done.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-26:

FAILED: Continuous integration, rev:1289
http://jenkins.qa.ubuntu.com/job/unity8-ci/4409/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5207/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1405/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1503/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1503/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6459/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-09-26:

> > Does this actually take screenshot of running applications?
> > ScreenShotter::takeScreenshot seems like it will only take snapshots of the
> > shell itself, no?
>
> Yes it takes screenshots of whatever is being rendered to the screen by qtmir.
> This is because the shell window will be backed by qtmir's DisplayWindow,
> which is where all the shell and apps surfaces will be rendered into.

Isn't this [ab]using an implementation detail of qtmir/qtubuntu? Reading the documentation of QGuiApplication::topLevelWindows it seems pretty clear it is windows about the application itself, not the rest.

I'm fine if we do decide this, but maybe it needs some comment in the code.

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2014-09-26:

Albert, the reason why this works is really because application surfaces are just normal QQuickItems inside the shell. It does only screenshot the shell window with whatever the shell paints, in this case also the application surface items. I think this is ok as it really only works inside the shell application but not from other apps etc.

But the other question I have is if we really want to have such a thing in the product. I imagine people hitting up + down accidentally all the time. Do we really want them to make screenshots without even knowing? This doesn't sound like being something I would want to have enabled in a final product. Instead I think this should be done properly through some ui element, maybe in the developer mode options.

review: Needs Information

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2014-09-26:

> Albert, the reason why this works is really because application surfaces are
> just normal QQuickItems inside the shell. It does only screenshot the shell
> window with whatever the shell paints, in this case also the application
> surface items. I think this is ok as it really only works inside the shell
> application but not from other apps etc.
>
>
> But the other question I have is if we really want to have such a thing in the
> product. I imagine people hitting up + down accidentally all the time. Do we
> really want them to make screenshots without even knowing? This doesn't sound
> like being something I would want to have enabled in a final product. Instead
> I think this should be done properly through some ui element, maybe in the
> developer mode options.

It reminds me that I have a screenshot of my lockscreen in my android phone and I have absolutely no idea how I did it. :-D
Will google it now.

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2014-09-26:

Would it be possible to move the screenshot animation onto a separate QML file? Shell.qml is already quite big as it is.

review: Needs Fixing

Revision history for this message

Alberto Aguirre (albaguirre) wrote on 2014-09-26:

>
> But the other question I have is if we really want to have such a thing in the
> product. I imagine people hitting up + down accidentally all the time. Do we
> really want them to make screenshots without even knowing? This doesn't sound
> like being something I would want to have enabled in a final product. Instead
> I think this should be done properly through some ui element, maybe in the
> developer mode options.

From the bug/feature request I don't think they want a developer option...it's for users to share screenshots of their phone to social media...

As for accidental bumps of the keys...maybe I can just disable screenshotting when screen is off?

Revision history for this message

Alberto Aguirre (albaguirre) wrote on 2014-09-26:

> Would it be possible to move the screenshot animation onto a separate QML
> file? Shell.qml is already quite big as it is.

Sure.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-29:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel d'Andrada (dandrader) on 2014-10-03:

review: Abstain

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-10-06:

How hard would be adding the shutter sound that we use in Camera application be like Vesa suggests in the bug?

review: Needs Information

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-10-06:

Text conflict in qml/Shell.qml
1 conflicts encountered.

Revision history for this message

Alberto Aguirre (albaguirre) wrote on 2014-10-07:

@Albert,

Yes I will add that. I just need to find some time.

Revision history for this message

Alberto Aguirre (albaguirre) wrote on 2014-10-10:

@Albert

Ok, fixed conflict and added shutter sounds as requested by design.

Revision history for this message

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

FAILED: Continuous integration, rev:1300
http://jenkins.qa.ubuntu.com/job/unity8-ci/4614/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5831/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1600/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1710/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1708/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7083/console

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

review: Needs Fixing (continuous-integration)

lp:~albaguirre/unity8/add-screenshotter updated on 2014-10-10

1301. By Alberto Aguirre on 2014-10-10: Clasify shutter sound as alert to avoid pausing other players.

Revision history for this message

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

FAILED: Continuous integration, rev:1301
http://jenkins.qa.ubuntu.com/job/unity8-ci/4619/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5843
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1605
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1715/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1713/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5495
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7095
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7095/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14540

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-10-13:

* saveScreenshot
make QImage and QStrings there const &

* ScreenGrabber::captureAndSave
Make QWindowList windows const so we get the "fast" operator[] when doing windows[0]

* onKeyReleased:
bring the else up to the } line

* screenGrabber.enable(Powerd.status === Powerd.On):
Looks like this could be a binding instead of a function call?

* There's a few ; missing in the two onStopped functions

* //TODO: This should be configurable (perhaps through gsettings?):
What's the use case/benefit for the user of making this configurable?

* screenshotsDir.mkdir("Screenshots");
Should we localize this?

review: Needs Fixing

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-10-13:

> * //TODO: This should be configurable (perhaps through gsettings?):
> What's the use case/benefit for the user of making this configurable?

Yeah, don't think we need to configure this. Why not PNG by default though?

> * screenshotsDir.mkdir("Screenshots");
> Should we localize this?

No, we decided against localizing folder names because of having to "unlocalize" them everywhere that tries to read them.

Is that folder be picked up by the gallery app already?

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-10-13:

> > * //TODO: This should be configurable (perhaps through gsettings?):
> > What's the use case/benefit for the user of making this configurable?
>
> Yeah, don't think we need to configure this. Why not PNG by default though?

Yeah maybe PNG makes more sense

>
> > * screenshotsDir.mkdir("Screenshots");
> > Should we localize this?
>
> No, we decided against localizing folder names because of having to
> "unlocalize" them everywhere that tries to read them.
>
> Is that folder be picked up by the gallery app already?

Yes (screenshots look very fuzzy in the gallery app, but when downloaded with adb they look fine so i guess it's a gallery bug)

Revision history for this message

Alberto Aguirre (albaguirre) wrote on 2014-10-14:

I had it as PNG but other products do jpg too...presumably size?

> > * screenshotsDir.mkdir("Screenshots");
> > Should we localize this?
>
> No, we decided against localizing folder names because of having to
> "unlocalize" them everywhere that tries to read them.
>
> Is that folder be picked up by the gallery app already?

Yes it is.

Revision history for this message

Alberto Aguirre (albaguirre) wrote on 2014-10-14:

> * saveScreenshot
> make QImage and QStrings there const &
>
They need to be copies, because they will be run in a separate thread plus Qt has copy on writing semantics on those.

>
> * ScreenGrabber::captureAndSave
> Make QWindowList windows const so we get the "fast" operator[] when doing
> windows[0]
>
Agree.

>
> * onKeyReleased:
> bring the else up to the } line
>
Sure.

>
> * screenGrabber.enable(Powerd.status === Powerd.On):
> Looks like this could be a binding instead of a function call?
>
Ok will do.

> * There's a few ; missing in the two onStopped functions
>
Ok I'll fix it.

>
> * //TODO: This should be configurable (perhaps through gsettings?):
> What's the use case/benefit for the user of making this configurable?
>
I guess simply size/quality tradeoff.

lp:~albaguirre/unity8/add-screenshotter updated on 2014-10-14

1302. By Alberto Aguirre on 2014-10-14: Address review feedback
1303. By Alberto Aguirre on 2014-10-14: merge lp:unity8
1304. By Alberto Aguirre on 2014-10-14: Use binding instead of function call to enable/disable screenshotting according to screen power status.

Revision history for this message

Alberto Aguirre (albaguirre) wrote on 2014-10-14:

I've addressed the review comments.

I have left JPG as the format as the size tradeoff is:

For 960x540 screenshot we are talking about 41KB (JPG) vs 1.6MB (PNG).

Let me know if you still want PNG as default.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-14:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Alberto Aguirre (albaguirre) wrote on 2014-10-15:

Actually it looks like QIMage does compress png if we set the quality number to 0 or something low.

So the size is about for a 960x540 screenshot is around 41KB (JPG) vs 330KB (PNG).

lp:~albaguirre/unity8/add-screenshotter updated on 2014-10-15

1305. By Alberto Aguirre on 2014-10-15: Make PNG the default screenshot format

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-15:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-20:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-10-20:

file:///tmp/buildd/unity8-8.00+14.10.20141013.2bzr1306pkg0utopic1686/qml/Components/ScreenGrabber.qml:44:9: Cannot assign to non-existent property "audioRole"
audioRole: MediaPlayer.alert

review: Approve

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-10-20:

i meant needs fixing

review: Needs Fixing

Revision history for this message

Alberto Aguirre (albaguirre) wrote on 2014-10-20:

Is this not supported in utopic?
https://bugs.launchpad.net/music-app/+bug/1366586/comments/4

Revision history for this message

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

It is, but we have our own QtMultimedia mock to make testing easier and the role is not available there. Can you define it in the mock? tests/mocks/QtMultimedia/audio.* ?

lp:~albaguirre/unity8/add-screenshotter updated on 2014-10-21

1306. By Alberto Aguirre on 2014-10-21: Add audioRole to QtMultimedia mock

Revision history for this message

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

FAILED: Continuous integration, rev:1306
http://jenkins.qa.ubuntu.com/job/unity8-ci/4727/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6111/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1713
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1823
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1821
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5739/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7363
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7363/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14919

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-10-22:

We should try to eat the key presses, otherwise if i let the button pressed after taking the screenshot it changes my volume that is clearly not what we want, no?

review: Needs Fixing

lp:~albaguirre/unity8/add-screenshotter updated on 2014-10-30

1307. By Alberto Aguirre on 2014-10-30: Avoid volume control changes when both volume keys are pressed.

Revision history for this message

Alberto Aguirre (albaguirre) wrote on 2014-10-30:

> We should try to eat the key presses, otherwise if i let the button pressed
> after taking the screenshot it changes my volume that is clearly not what we
> want, no?

Fixed.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-30:

FAILED: Continuous integration, rev:1307
http://jenkins.qa.ubuntu.com/job/unity8-ci/4786/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6297/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1772/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1882/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1880/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7549/console

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

review: Needs Fixing (continuous-integration)

lp:~albaguirre/unity8/add-screenshotter updated on 2014-10-30

1308. By Alberto Aguirre on 2014-10-30: Remove trailing whitespace in comments

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-30:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-10-30:

* 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.
Autopilot is previously borked

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

review: Approve

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:

Alberto Aguirre

Mohammad Rakibul Hasan

Unity Team

 === modified file 'debian/unity8-private.install'
 --- debian/unity8-private.install	2014-10-06 15:45:25 +0000
 +++ debian/unity8-private.install	2014-10-30 02:40:10 +0000
@@ -6,6 +6,7 @@
  usr/lib/*/unity8/qml/Lights
  usr/lib/*/unity8/qml/Powerd
  usr/lib/*/unity8/qml/SessionBroadcast
++usr/lib/*/unity8/qml/ScreenGrabber
  usr/lib/*/unity8/qml/Ubuntu
  usr/lib/*/unity8/qml/Unity
  usr/lib/*/unity8/qml/Utils
 === modified file 'plugins/CMakeLists.txt'
 --- plugins/CMakeLists.txt	2014-09-29 09:43:18 +0000
 +++ plugins/CMakeLists.txt	2014-10-30 02:40:10 +0000
@@ -18,6 +18,7 @@
  add_subdirectory(Dash)
  add_subdirectory(Powerd)
  add_subdirectory(SessionBroadcast)
++add_subdirectory(ScreenGrabber)
  add_subdirectory(Ubuntu)
  add_subdirectory(Unity)
  add_subdirectory(Utils)
 === added directory 'plugins/ScreenGrabber'
 === added file 'plugins/ScreenGrabber/CMakeLists.txt'
 --- plugins/ScreenGrabber/CMakeLists.txt	1970-01-01 00:00:00 +0000
 +++ plugins/ScreenGrabber/CMakeLists.txt	2014-10-30 02:40:10 +0000
@@ -0,0 +1,13 @@
++include_directories(
++  ${CMAKE_CURRENT_BINARY_DIR}
++)
++
++set(SCREENGRABBERSOURCES
++  screengrabber.cpp
++  plugin.cpp
++)
++
++add_library(ScreenGrabber-qml MODULE ${SCREENGRABBERSOURCES})
++qt5_use_modules(ScreenGrabber-qml Qml Gui Quick Concurrent)
++
++add_unity8_plugin(ScreenGrabber 0.1 ScreenGrabber TARGETS ScreenGrabber-qml)
 === added file 'plugins/ScreenGrabber/ScreenGrabber.qmltypes'
 --- plugins/ScreenGrabber/ScreenGrabber.qmltypes	1970-01-01 00:00:00 +0000
 +++ plugins/ScreenGrabber/ScreenGrabber.qmltypes	2014-10-30 02:40:10 +0000
@@ -0,0 +1,17 @@
++import QtQuick.tooling 1.1
++
++// This file describes the plugin-supplied types contained in the library.
++// It is used for QML tooling purposes only.
++//
++// This file was auto-generated by:
++// 'qmlplugindump -nonrelocatable ScreenGrabber 0.1 plugins'
++
++Module {
++    Component {
++        name: "ScreenGrabber"
++        prototype: "QObject"
++        exports: ["ScreenGrabber/ScreenGrabber 0.1"]
++        exportMetaObjectRevisions: [0]
++        Method { name: "captureAndSave" }
++    }
++}
 === added file 'plugins/ScreenGrabber/plugin.cpp'
 --- plugins/ScreenGrabber/plugin.cpp	1970-01-01 00:00:00 +0000
 +++ plugins/ScreenGrabber/plugin.cpp	2014-10-30 02:40:10 +0000
@@ -0,0 +1,28 @@
++/*
++ * Copyright (C) 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/>.
++ *
++ * Authors: Alberto Aguirre <alberto.aguirre@canonical.com>
++ */
++
++#include "plugin.h"
++#include "screengrabber.h"
++
++#include <QtQml/qqml.h>
++
++void ScreenGrabberPlugin::registerTypes(const char *uri)
++{
++    Q_ASSERT(uri == QLatin1String("ScreenGrabber"));
++    qmlRegisterType<ScreenGrabber>(uri, 0, 1, "ScreenGrabber");
++}
 === added file 'plugins/ScreenGrabber/plugin.h'
 --- plugins/ScreenGrabber/plugin.h	1970-01-01 00:00:00 +0000
 +++ plugins/ScreenGrabber/plugin.h	2014-10-30 02:40:10 +0000
@@ -0,0 +1,33 @@
++/*
++ * Copyright (C) 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/>.
++ *
++ * Authors: Alberto Aguirre <alberto.aguirre@canonical.com>
++ */
++
++#ifndef SCREENGRABBER_PLUGIN_H
++#define SCREENGRABBER_PLUGIN_H
++
++#include <QtQml/QQmlExtensionPlugin>
++
++class ScreenGrabberPlugin : public QQmlExtensionPlugin
++{
++    Q_OBJECT
++    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
++
++public:
++    void registerTypes(const char *uri);
++};
++
++#endif // SCREENGRABBER_PLUGIN_H
 === added file 'plugins/ScreenGrabber/qmldir'
 --- plugins/ScreenGrabber/qmldir	1970-01-01 00:00:00 +0000
 +++ plugins/ScreenGrabber/qmldir	2014-10-30 02:40:10 +0000
@@ -0,0 +1,3 @@
++module ScreenGrabber
++plugin ScreenGrabber-qml
++typeinfo ScreenGrabber.qmltypes
 === added file 'plugins/ScreenGrabber/screengrabber.cpp'
 --- plugins/ScreenGrabber/screengrabber.cpp	1970-01-01 00:00:00 +0000
 +++ plugins/ScreenGrabber/screengrabber.cpp	2014-10-30 02:40:10 +0000
@@ -0,0 +1,94 @@
++/*
++ * Copyright (C) 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/>.
++ *
++ * Authors: Alberto Aguirre <alberto.aguirre@canonical.com>
++ */
++
++#include "screengrabber.h"
++
++#include <QDir>
++#include <QDateTime>
++#include <QStandardPaths>
++#include <QtGui/QImage>
++#include <QtGui/QGuiApplication>
++#include <QtQuick/QQuickWindow>
++#include <QtConcurrent/QtConcurrentRun>
++
++#include <QDebug>
++
++void saveScreenshot(QImage screenshot, QString filename, QString format, int quality)
++{
++    if (!screenshot.save(filename, format.toLatin1().data(), quality))
++        qWarning() << "ScreenShotter: failed to save snapshot!";
++}
++
++ScreenGrabber::ScreenGrabber(QObject *parent)
++    : QObject(parent),
++      screenshotQuality(0)
++{
++    QDir screenshotsDir(QStandardPaths::displayName(QStandardPaths::PicturesLocation));
++    screenshotsDir.mkdir("Screenshots");
++    screenshotsDir.cd("Screenshots");
++    if (screenshotsDir.exists())
++    {
++        fileNamePrefix = screenshotsDir.absolutePath();
++        fileNamePrefix.append("/screenshot");
++    }
++    else
++    {
++        qWarning() << "ScreenShotter: failed to create directory at: " << screenshotsDir.absolutePath();
++    }
++}
++
++void ScreenGrabber::captureAndSave()
++{
++    if (fileNamePrefix.isEmpty())
++    {
++        qWarning() << "ScreenShotter: no directory to save screenshot";
++        return;
++    }
++
++    const QWindowList windows = QGuiApplication::topLevelWindows();
++    if (windows.empty())
++    {
++        qWarning() << "ScreenShotter: no top level windows found!";
++        return;
++    }
++
++    QQuickWindow *main_window = qobject_cast<QQuickWindow *>(windows[0]);
++    if (!main_window)
++    {
++        qWarning() << "ScreenShotter: can only take screenshots of QQuickWindows";
++        return;
++    }
++
++    QImage screenshot = main_window->grabWindow();
++    QtConcurrent::run(saveScreenshot, screenshot, makeFileName(), getFormat(), screenshotQuality);
++}
++
++QString ScreenGrabber::makeFileName()
++{
++    QString fileName(fileNamePrefix);
++    fileName.append(QDateTime::currentDateTime().toString("yyyymmdd_hhmmsszzz"));
++    fileName.append(".");
++    fileName.append(getFormat());
++    return fileName;
++}
++
++QString ScreenGrabber::getFormat()
++{
++    //TODO: This should be configurable (perhaps through gsettings?)
++    return "png";
++}
 === added file 'plugins/ScreenGrabber/screengrabber.h'
 --- plugins/ScreenGrabber/screengrabber.h	1970-01-01 00:00:00 +0000
 +++ plugins/ScreenGrabber/screengrabber.h	2014-10-30 02:40:10 +0000
@@ -0,0 +1,42 @@
++/*
++ * Copyright (C) 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/>.
++ *
++ * Authors: Alberto Aguirre <alberto.aguirre@canonical.com>
++ */
++
++#ifndef SNAPSHOTTER_H
++#define SNAPSHOTTER_H
++
++#include <QObject>
++#include <QString>
++
++class ScreenGrabber: public QObject
++{
++    Q_OBJECT
++
++public:
++    explicit ScreenGrabber(QObject *parent = 0);
++
++public Q_SLOTS:
++    void captureAndSave();
++
++private:
++    QString makeFileName();
++    QString getFormat();
++    QString fileNamePrefix;
++    int screenshotQuality;
++};
++
++#endif
 === added file 'qml/Components/ScreenGrabber.qml'
 --- qml/Components/ScreenGrabber.qml	1970-01-01 00:00:00 +0000
 +++ qml/Components/ScreenGrabber.qml	2014-10-30 02:40:10 +0000
@@ -0,0 +1,72 @@
++/*
++ * Copyright (C) 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.0
++import QtMultimedia 5.0
++import ScreenGrabber 0.1
++
++Rectangle {
++    id: root
++    enabled: true
++    visible: false
++    color: "white"
++    anchors.fill: parent
++    opacity: 0.0
++
++    ScreenGrabber {
++        id: screenGrabber
++        objectName: "screenGrabber"
++    }
++
++    Audio {
++        id: shutterSound
++        audioRole: MediaPlayer.alert
++        source: "/system/media/audio/ui/camera_click.ogg"
++    }
++
++    function capture() {
++        if (!enabled)
++            return;
++
++        visible = true;
++        shutterSound.stop();
++        shutterSound.play();
++        fadeIn.start();
++    }
++
++    NumberAnimation on opacity {
++        id: fadeIn
++        from: 0.0
++        to: 1.0
++        onStopped: {
++            if (visible) {
++                fadeOut.start();
++            }
++        }
++    }
++
++    NumberAnimation on opacity {
++        id: fadeOut
++        from: 1.0
++        to: 0.0
++        onStopped: {
++            if (visible) {
++                screenGrabber.captureAndSave();
++                visible = false;
++            }
++        }
++    }
++}
 === added file 'qml/Components/VolumeKeyFilter.qml'
 --- qml/Components/VolumeKeyFilter.qml	1970-01-01 00:00:00 +0000
 +++ qml/Components/VolumeKeyFilter.qml	2014-10-30 02:40:10 +0000
@@ -0,0 +1,63 @@
++/*
++ * Copyright (C) 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.0
++/*!
++ \brief A filter for volume keys
++
++A filter which treats volume keys as single tri-state key with the states:
++VolumeUp Pressed, VolumeDown Pressed or Volume Up+Down pressed
++*/
++QtObject {
++    id: root
++
++    signal volumeUpPressed()
++    signal volumeDownPressed()
++    signal bothVolumeKeysPressed()
++
++    property bool volumeUpKeyPressed: false
++    property bool volumeDownKeyPressed: false
++    property bool aVolumeKeyWasReleased: true
++
++    function onKeyPressed(key) {
++        if (key == Qt.Key_VolumeUp)
++            volumeUpKeyPressed = true;
++        else if (key == Qt.Key_VolumeDown)
++            volumeDownKeyPressed = true;
++
++        if (volumeDownKeyPressed && volumeUpKeyPressed) {
++            //avoids sending a signal repeatedly if both keys are held
++            //instead one of the keys must have been previously released
++            if (aVolumeKeyWasReleased)
++                bothVolumeKeysPressed();
++            aVolumeKeyWasReleased = false;
++        } else if (volumeDownKeyPressed) {
++            volumeDownPressed();
++        } else if (volumeUpKeyPressed) {
++            volumeUpPressed();
++        }
++    }
++
++    function onKeyReleased(key) {
++        if (key == Qt.Key_VolumeUp) {
++            volumeUpKeyPressed = false;
++            aVolumeKeyWasReleased = true;
++        } else if (key == Qt.Key_VolumeDown) {
++            volumeDownKeyPressed = false;
++            aVolumeKeyWasReleased = true;
++        }
++    }
++}
 === modified file 'qml/Shell.qml'
 --- qml/Shell.qml	2014-10-13 15:41:29 +0000
 +++ qml/Shell.qml	2014-10-30 02:40:10 +0000
@@ -132,23 +132,32 @@
          objectName: "dashCommunicator"
+     }
++    ScreenGrabber {
++        id: screenGrabber
++        z: edgeDemo.z + 10
++        enabled: Powerd.status === Powerd.On
++    }
++
      Binding {
          target: ApplicationManager
          property: "forceDashActive"
          value: launcher.shown || launcher.dashSwipe
+     }
++    VolumeKeyFilter {
++        id: volumeKeyFilter
++        onVolumeDownPressed: volumeControl.volumeDown()
++        onVolumeUpPressed: volumeControl.volumeUp()
++        onBothVolumeKeysPressed: screenGrabber.capture()
++    }
      WindowKeysFilter {
--        // Handle but do not filter out volume keys
--        Keys.onVolumeUpPressed: { volumeControl.volumeUp(); event.accepted = false; }
--        Keys.onVolumeDownPressed: { volumeControl.volumeDown(); event.accepted = false; }
--
          Keys.onPressed: {
              if (event.key == Qt.Key_PowerOff || event.key == Qt.Key_PowerDown) {
                  dialogs.onPowerKeyPressed();
                  event.accepted = true;
              } else {
++                volumeKeyFilter.onKeyPressed(event.key);
                  event.accepted = false;
+             }
+         }
@@ -158,6 +167,7 @@
                  dialogs.onPowerKeyReleased();
                  event.accepted = true;
              } else {
++                volumeKeyFilter.onKeyReleased(event.key);
                  event.accepted = false;
+             }
+         }
 === modified file 'tests/mocks/QtMultimedia/QtMultimedia.qmltypes'
 --- tests/mocks/QtMultimedia/QtMultimedia.qmltypes	2014-06-26 07:47:57 +0000
 +++ tests/mocks/QtMultimedia/QtMultimedia.qmltypes	2014-10-30 02:40:10 +0000
@@ -20,11 +20,21 @@
                  "StoppedState": 2
+             }
+         }
++        Enum {
++            name: "AudioRole"
++            values: {
++                "AlarmRole": 0,
++                "AlertRole": 1,
++                "MultimediaRole": 2,
++                "PhoneRole": 3
++            }
++        }
          Property { name: "source"; type: "QUrl" }
          Property { name: "playbackState"; type: "PlaybackState"; isReadonly: true }
          Property { name: "position"; type: "int"; isReadonly: true }
          Property { name: "duration"; type: "int"; isReadonly: true }
          Property { name: "errorString"; type: "string"; isReadonly: true }
++        Property { name: "audioRole"; type: "AudioRole" }
          Signal {
              name: "sourceChanged"
              Parameter { name: "source"; type: "QUrl" }
 === modified file 'tests/mocks/QtMultimedia/audio.cpp'
 --- tests/mocks/QtMultimedia/audio.cpp	2014-09-12 14:51:55 +0000
 +++ tests/mocks/QtMultimedia/audio.cpp	2014-10-30 02:40:10 +0000
@@ -105,3 +105,13 @@
          stop();
+     }
+ }
++
++Audio::AudioRole Audio::audioRole() const
++{
++    return Audio::MultimediaRole;
++}
++
++void Audio::setAudioRole(Audio::AudioRole audioRole)
++{
++    Q_UNUSED(audioRole);
++}
 === modified file 'tests/mocks/QtMultimedia/audio.h'
 --- tests/mocks/QtMultimedia/audio.h	2013-11-14 12:12:05 +0000
 +++ tests/mocks/QtMultimedia/audio.h	2014-10-30 02:40:10 +0000
@@ -27,11 +27,13 @@
+ {
      Q_OBJECT
      Q_ENUMS(PlaybackState)
++    Q_ENUMS(AudioRole)
      Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
      Q_PROPERTY(PlaybackState playbackState READ playbackState NOTIFY playbackStateChanged)
      Q_PROPERTY(int position READ position NOTIFY positionChanged)
      Q_PROPERTY(int duration READ duration NOTIFY durationChanged)
      Q_PROPERTY(QString errorString READ errorString NOTIFY errorStringChanged)
++    Q_PROPERTY(AudioRole audioRole READ audioRole WRITE setAudioRole)
  public:
      enum PlaybackState {
          PlayingState,
@@ -39,6 +41,13 @@
          StoppedState
      };
++    enum AudioRole {
++        AlarmRole,
++        AlertRole,
++        MultimediaRole,
++        PhoneRole
++    };
++
      explicit Audio(QObject *parent = 0);
      QUrl source() const;
@@ -52,6 +61,9 @@
      QString errorString() const;
++    AudioRole audioRole() const;
++    void setAudioRole(AudioRole audioRole);
++
  public Q_SLOTS:
      void pause();
      void play();