Merge lp:~unity-team/unity8/rotateScreenshots into lp:unity8

[Michał Sawicz]

Rotate the screenshots according to the actual orientation

Rotate the screenshots according to the actual orientation when saving them

Cf. https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1504538

* Are there any related MPs required for this MP to build/function as expected? Please list.

Yes, lp:~unity-team/unity8/externalMonitor

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

Yes, see http://developer.kde.org/~lukas/screenshots/unity8/rotatedScreenshot.png

* 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?

Yes

* If you changed the UI, has there been a design review?

N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2008
http://jenkins.qa.ubuntu.com/job/unity8-ci/6484/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4688/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/866/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1196/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/512/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1091/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1092/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/723/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/724/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4685/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/866/console

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Y
 * Did CI run pass? If not, please explain why.
No, dependencies
 * Did you make sure that the branch does not contain spurious tags?
Y

review: Approve

=== modified file 'plugins/ScreenGrabber/screengrabber.cpp'
--- plugins/ScreenGrabber/screengrabber.cpp	2015-09-23 15:14:01 +0000
+++ plugins/ScreenGrabber/screengrabber.cpp	2015-10-16 17:12:30 +0000
@@ -60,7 +60,7 @@
     }
 }
 
-void ScreenGrabber::captureAndSave()
+void ScreenGrabber::captureAndSave(int angle)
 {
     if (fileNamePrefix.isEmpty())
     {
@@ -82,7 +82,7 @@
         return;
     }
 
-    const QImage screenshot = main_window->grabWindow();
+    const QImage screenshot = main_window->grabWindow().transformed(QTransform().rotate(angle));
     const QString filename = makeFileName();
     qDebug() << "Saving screenshot to" << filename;
     auto saveOp = QtConcurrent::run(saveScreenshot, screenshot, filename, getFormat(), screenshotQuality);

=== modified file 'plugins/ScreenGrabber/screengrabber.h'
--- plugins/ScreenGrabber/screengrabber.h	2015-07-17 19:59:31 +0000
+++ plugins/ScreenGrabber/screengrabber.h	2015-10-16 17:12:30 +0000
@@ -29,7 +29,7 @@
     ~ScreenGrabber() = default;
 
 public Q_SLOTS:
-    void captureAndSave();
+    void captureAndSave(int angle = 0);
 
 Q_SIGNALS:
     void screenshotSaved(const QString &filename);

=== modified file 'qml/Components/ScreenGrabber.qml'
--- qml/Components/ScreenGrabber.qml	2015-08-24 15:39:53 +0000
+++ qml/Components/ScreenGrabber.qml	2015-10-16 17:12:30 +0000
@@ -26,6 +26,9 @@
     anchors.fill: parent
     opacity: 0.0
 
+    // to be set from outside
+    property int rotationAngle: 0
+
     ScreenGrabber {
         id: screenGrabber
         objectName: "screenGrabber"
@@ -67,7 +70,7 @@
         to: 0.0
         onStopped: {
             if (visible) {
-                screenGrabber.captureAndSave();
+                screenGrabber.captureAndSave(root.rotationAngle);
                 visible = false;
             }
         }

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2015-10-16 17:12:30 +0000
+++ qml/Shell.qml	2015-10-16 17:12:30 +0000
@@ -659,6 +659,7 @@
 
     ScreenGrabber {
         id: screenGrabber
+        rotationAngle: -shell.orientationAngle
         z: dialogs.z + 10
     }
 
@@ -687,5 +688,4 @@
             }
         }
     }
-
 }

=== modified file 'tests/plugins/ScreenGrabber/ScreenGrabberTest.cpp'
--- tests/plugins/ScreenGrabber/ScreenGrabberTest.cpp	2015-07-20 15:06:46 +0000
+++ tests/plugins/ScreenGrabber/ScreenGrabberTest.cpp	2015-10-16 17:12:30 +0000
@@ -55,6 +55,17 @@
         QVERIFY(!args.first().toString().isEmpty());
     }
 
+    void testRotatedScreenshot()
+    {
+        QSignalSpy grabberSpy(m_grabber, &ScreenGrabber::screenshotSaved);
+        m_grabber->captureAndSave(90); // rotate by 90°
+        const QVariantList args = grabberSpy.takeFirst();
+        const QString filename = args.first().toString();
+        QVERIFY(!filename.isEmpty());
+        QImage img(filename);
+        QVERIFY(img.height() > img.width()); // verify that the image got rotated by 90° (height > width)
+    }
+
 private:
     QQuickView *m_view;
     ScreenGrabber *m_grabber = nullptr;

=== modified file 'tests/plugins/ScreenGrabber/grabber.qml'
--- tests/plugins/ScreenGrabber/grabber.qml	2015-07-17 19:59:31 +0000
+++ tests/plugins/ScreenGrabber/grabber.qml	2015-10-16 17:12:30 +0000
@@ -20,7 +20,7 @@
 Rectangle {
     property var grabber: screenGrabber
 
-    width: 100
+    width: 101 // width intentionally bigger than height to test rotation
     height: 100
     color: "green"