Unity 8

Merge lp:~unity-team/unity8/unity8.preview_image into lp:unity8

unity8.preview_image
Merge into trunk

Proposed by Andrea Cimitan on 2014-02-11

Status:	Superseded
Proposed branch:	lp:~unity-team/unity8/unity8.preview_image
Merge into:	lp:unity8
Prerequisite:	lp:~aacid/unity8/image_gallery_preview_widget
Diff against target:	286 lines (+204/-6) 8 files modified qml/Dash/Previews/PreviewHeader.qml (+38/-0) qml/Dash/Previews/PreviewWidgetFactory.qml (+4/-2) qml/Dash/Previews/PreviewZoomableImage.qml (+41/-0) tests/qmltests/CMakeLists.txt (+2/-0) tests/qmltests/Dash/Previews/tst_PreviewHeader.qml (+56/-0) tests/qmltests/Dash/Previews/tst_PreviewImageGallery.qml (+2/-2) tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml (+4/-2) tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qml (+57/-0)
To merge this branch:	bzr merge lp:~unity-team/unity8/unity8.preview_image
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2014-02-12
Michal Hruby (community)		2014-02-11	Needs Fixing on 2014-02-11
Review via email: mp+205757@code.launchpad.net

This proposal has been superseded by a proposal from 2014-02-12.

Commit message

Add PreviewImage

Description of the change

Add PreviewImage, since I was there I changed name of PreviewImageGallery test

* Are there any related MPs required for this MP to build/function as expected? Please list.
no
* Did you perform an exploratory manual test run of your code change and any related functionality?
obviously
* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
* If you changed the UI, has there been a design review?
not on production yet

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

lp:~unity-team/unity8/unity8.preview_image updated on 2014-02-11

684. By Andrea Cimitan on 2014-02-11: Renamed preview image
685. By Andrea Cimitan on 2014-02-11: changed anchors

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

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

review: Approve (continuous-integration)

Revision history for this message

Michal Hruby (mhr3) wrote on 2014-02-11:

Please add the missing switch case to PreviewWidgetFactory.qml

review: Needs Fixing

lp:~unity-team/unity8/unity8.preview_image updated on 2014-02-12

686. By Andrea Cimitan on 2014-02-12: Merged trunk and added remaining switch case to preview widget factory

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-02-12:

The test is being fixed at https://code.launchpad.net/~aacid/unity8/fix_test_preview/+merge/205910

lp:~unity-team/unity8/unity8.preview_image updated on 2014-02-12

687. By Andrea Cimitan on 2014-02-12: Merged and fixed

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

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:

Mohammad Rakibul Hasan

Unity Team

 === added file 'qml/Dash/Previews/PreviewHeader.qml'
 --- qml/Dash/Previews/PreviewHeader.qml	1970-01-01 00:00:00 +0000
 +++ qml/Dash/Previews/PreviewHeader.qml	2014-02-12 11:11:51 +0000
@@ -0,0 +1,38 @@
++/*
++ * 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 "../"
++
++/*! This preview widget shows a header that is the same as the card header
++ *  The title comes in widgetData["title"]
++ *  The mascot comes in widgetData["mascot"]
++ *  The subtitle comes in widgetData["subtitle"]
++ */
++
++PreviewWidget {
++    id: root
++
++    height: childrenRect.height
++
++    CardHeader {
++        objectName: "cardHeader"
++        mascot: root.widgetData["mascot"] || ""
++        title: root.widgetData["title"] || ""
++        subtitle: root.widgetData["subtitle"] || ""
++        width: parent.width
++    }
++}
 \ No newline at end of file
 === modified file 'qml/Dash/Previews/PreviewWidgetFactory.qml'
 --- qml/Dash/Previews/PreviewWidgetFactory.qml	2014-02-07 09:58:04 +0000
 +++ qml/Dash/Previews/PreviewWidgetFactory.qml	2014-02-12 11:11:51 +0000
@@ -42,10 +42,12 @@
      //! \cond private
      property url widgetSource: {
          switch (widgetType) {
++            case "actions": return "PreviewActions.qml";
              case "audio": return "PreviewAudioPlayback.qml";
++            case "gallery": return "PreviewImageGallery.qml";
++            case "header": return "PreviewHeader.qml";
++            case "image": return "PreviewZoomableImage.qml"
              case "text": return "PreviewTextSummary.qml";
--            case "gallery": return "PreviewImageGallery.qml";
--            case "actions": return "PreviewActions.qml";
              default: return "";
+         }
+     }
 === added file 'qml/Dash/Previews/PreviewZoomableImage.qml'
 --- qml/Dash/Previews/PreviewZoomableImage.qml	1970-01-01 00:00:00 +0000
 +++ qml/Dash/Previews/PreviewZoomableImage.qml	2014-02-12 11:11:51 +0000
@@ -0,0 +1,41 @@
++/*
++ * 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 Ubuntu.Components 0.1
++import "../../Components"
++
++/*! \brief Preview widget for image.
++
++    This widget shows image contained in widgetData["source"],
++    can be zoomable accordingly with widgetData["zoomable"].
++ */
++
++PreviewWidget {
++    id: root
++    implicitHeight: units.gu(22)
++
++    LazyImage {
++        objectName: "image"
++        anchors {
++            top: parent.top
++            bottom: parent.bottom
++        }
++        scaleTo: "height"
++        source: widgetData["source"]
++        initialWidth: units.gu(13)
++    }
++}
 === modified file 'tests/qmltests/CMakeLists.txt'
 --- tests/qmltests/CMakeLists.txt	2014-02-07 10:46:06 +0000
 +++ tests/qmltests/CMakeLists.txt	2014-02-12 11:11:51 +0000
@@ -60,7 +60,9 @@
  add_qml_test(Dash/Previews PreviewActions IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
  add_qml_test(Dash/Previews PreviewAudioPlayback IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
  add_qml_test(Dash/Previews PreviewImageGallery IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
++add_qml_test(Dash/Previews PreviewHeader IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
  add_qml_test(Dash/Previews PreviewTextSummary IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
++add_qml_test(Dash/Previews PreviewZoomableImage IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
  add_qml_test(Greeter Lockscreen IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
                               PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
  add_qml_test(Greeter Tablet IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
 === added file 'tests/qmltests/Dash/Previews/tst_PreviewHeader.qml'
 --- tests/qmltests/Dash/Previews/tst_PreviewHeader.qml	1970-01-01 00:00:00 +0000
 +++ tests/qmltests/Dash/Previews/tst_PreviewHeader.qml	2014-02-12 11:11:51 +0000
@@ -0,0 +1,56 @@
++/*
++ * 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.0
++import QtTest 1.0
++import "../../../../qml/Dash/Previews"
++import Unity.Test 0.1 as UT
++
++Rectangle {
++    id: root
++    width: units.gu(60)
++    height: units.gu(80)
++
++    property var headerjson: {
++        "title": "THE TITLE",
++        "subtitle": "Something catchy",
++        "mascot": "../graphics/play_button.png"
++    }
++
++    PreviewHeader {
++        id: previewHeader
++        widgetData: headerjson
++        width: units.gu(30)
++
++        Rectangle {
++            anchors.fill: parent
++            color: "red"
++            opacity: 0.1
++        }
++    }
++
++    UT.UnityTestCase {
++        name: "PreviewHeaderTest"
++        when: windowShown
++
++        function test_json() {
++            var cardHeader = findChild(previewHeader, "cardHeader");
++            compare(cardHeader.title, "THE TITLE");
++            compare(cardHeader.subtitle, "Something catchy");
++            compare(cardHeader.mascot.toString().slice(-24), "graphics/play_button.png");
++        }
++    }
++}
 === modified file 'tests/qmltests/Dash/Previews/tst_PreviewImageGallery.qml'
 --- tests/qmltests/Dash/Previews/tst_PreviewImageGallery.qml	2014-02-05 08:48:43 +0000
 +++ tests/qmltests/Dash/Previews/tst_PreviewImageGallery.qml	2014-02-12 11:11:51 +0000
@@ -23,7 +23,7 @@
      id: root
      width: units.gu(60)
      height: units.gu(80)
--    color: "grey"
++    color: "lightgrey"
      property var sourcesModel0: {
          "sources": []
@@ -44,7 +44,7 @@
+     }
      UT.UnityTestCase {
--        name: "ImageGalleryTest"
++        name: "PreviewImageGalleryTest"
          when: windowShown
          function test_changeEmptyModel() {
 === modified file 'tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml'
 --- tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml	2014-02-07 09:58:04 +0000
 +++ tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml	2014-02-12 11:11:51 +0000
@@ -75,10 +75,12 @@
          function test_mapping_data() {
              return [
++                { tag: "Actions", type: "actions", source: "PreviewActions.qml" },
                  { tag: "Audio", type: "audio", source: "PreviewAudioPlayback.qml" },
++                { tag: "Gallery", type: "gallery", source: "PreviewImageGallery.qml" },
++                { tag: "Header", type: "header", source: "PreviewHeader.qml" },
++                { tag: "Image", type: "image", source: "PreviewZoomableImage.qml" },
                  { tag: "Text", type: "text", source: "PreviewTextSummary.qml" },
--                { tag: "Gallery", type: "gallery", source: "PreviewImageGallery.qml" },
--                { tag: "Actions", type: "actions", source: "PreviewActions.qml" },
              ];
+         }
 === added file 'tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qml'
 --- tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qml	1970-01-01 00:00:00 +0000
 +++ tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qml	2014-02-12 11:11:51 +0000
@@ -0,0 +1,57 @@
++/*
++ * 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.0
++import QtTest 1.0
++import "../../../../qml/Dash/Previews"
++import Unity.Test 0.1 as UT
++
++Rectangle {
++    id: root
++    width: units.gu(40)
++    height: units.gu(80)
++    color: "lightgrey"
++
++    property var widgetData0: {
++        "source": ""
++    }
++
++    property var widgetData1: {
++        "source": "../../graphics/phone_background.jpg",
++        "zoomable": false
++    }
++
++    PreviewZoomableImage {
++        id: zoomableImage
++        width: parent.width
++        widgetData: widgetData1
++    }
++
++    UT.UnityTestCase {
++        name: "PreviewZoomableImageTest"
++        when: windowShown
++
++        function test_loadImage() {
++            var image = findChild(zoomableImage, "image");
++
++            zoomableImage.widgetData = widgetData0;
++            tryCompare(image.state, "default");
++
++            zoomableImage.widgetData = widgetData1;
++            tryCompare(image.state, "ready");
++        }
++    }
++}