Merge lp:~fboucault/camera-app/camera-app-gridlines into lp:camera-app

[Florian Boucault]

Add gridlines to the viewfinder controlled by a new settings option

Add gridlines to the viewfinder controlled by a new settings option

[Florian Boucault (fboucault)]

- making the grid of options 4 columns does not really solve the problem of too many options long term (especially with your other MR coming in); thankfully this was solved already in another branch's commit. I think we should merge the specific commit that fixes it: commit 428 from lp:~fboucault/camera-app/jpeg_quality
Merge command: bzr merge -c428 lp:~fboucault/camera-app/jpeg_quality
- icon "view-grid-symbolic" is not good enough. I asked Matthieu (tiheum) from design to provide a better one.
- visually the grid should not have lines around the picture, only the 4 lines inside it; these lines outside are not useful and they create a boxing feel to the UI
- no need to use a Binding object (I understand the consistency reason, but it won't work out for other settings)
- better to not instantiate the Rectangles at all when the grid is disabled; "Repeater.model: settings.gridEnabled ? gridlines.columns * gridlines.rows : 0" will do the trick
- using Rectangle.border to draw is slightly more expensive than using Rectangle.color

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:427
http://jenkins.qa.ubuntu.com/job/camera-app-ci/321/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/17
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/17/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/17
    ABORTED: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/30/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/245
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/50
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/217
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/250
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/250/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/321/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:428
http://jenkins.qa.ubuntu.com/job/camera-app-ci/325/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/21/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/21
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/36
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/254
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/679
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/56
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16329
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/223
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/259
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/259/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/325/rebuild

review: Needs Fixing (continuous-integration)

[lp:~fboucault/camera-app/camera-app-gridlines]

429. By Florian Boucault on 2014-12-02

Proper UI for grid lines.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:428
http://jenkins.qa.ubuntu.com/job/camera-app-ci/331/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/27
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/27/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/27
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/43
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/268
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/686
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/63
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16415
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/232
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/274
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/274/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/331/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:429
http://jenkins.qa.ubuntu.com/job/camera-app-ci/332/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/28
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/28/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/28
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/44
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/269
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/687
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/64
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16419
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/233
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/275
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/275/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/332/rebuild

review: Needs Fixing (continuous-integration)

[Bill Filler (bfiller)]

need some tests

review: Needs Fixing

[Bill Filler (bfiller)]

Other problems:
1) first time you launch the app you see the gridlines briefly visible until the viewfinder is initialized
2) on N4, the grid lines are not aligned properly with the viewfinder, they start at the left edge of the screen, not on the left edge of the viewfinder. And they don't expand all the way to the right edge of the viewfinder.
3) switching to front camera with gridlines on will make the gridlines disappear until you tap on the screen
4) same problem when switching back to back camera

review: Needs Fixing

[lp:~fboucault/camera-app/camera-app-gridlines]

430. By Florian Boucault on 2014-12-05

Merged from trunk

431. By Florian Boucault on 2014-12-05

Center grid lines horizontally.

432. By Florian Boucault on 2014-12-05

Do not display until we confirmed settings' value.

433. By Florian Boucault on 2014-12-08

Merged from trunk

434. By Florian Boucault on 2014-12-08

update pot

435. By Florian Boucault on 2014-12-08

Added AP test

[Florian Boucault (fboucault)]

> Other problems:
> 1) first time you launch the app you see the gridlines briefly visible until
> the viewfinder is initialized

Fixed.

> 2) on N4, the grid lines are not aligned properly with the viewfinder, they
> start at the left edge of the screen, not on the left edge of the viewfinder.

Fixed.

> And they don't expand all the way to the right edge of the viewfinder.
> 3) switching to front camera with gridlines on will make the gridlines
> disappear until you tap on the screen
> 4) same problem when switching back to back camera

Both 3) and 4) are exactly https://bugs.launchpad.net/camera-app/+bug/1373607
Not a new bug unfortunately.

[Florian Boucault (fboucault)]

> need some tests

Fixed.

[Arthur Mello (artmello)]

lgtm

review: Approve

[lp:~fboucault/camera-app/camera-app-gridlines]

436. By Florian Boucault on 2014-12-08

Listing bug

437. By Florian Boucault on 2014-12-08

Better visuals

[Bill Filler (bfiller)]

approved

review: Approve

=== modified file 'ViewFinderOverlay.qml'
--- ViewFinderOverlay.qml	2014-12-05 18:43:54 +0000
+++ ViewFinderOverlay.qml	2014-12-08 15:17:35 +0000
@@ -29,6 +29,7 @@
     property bool touchAcquired: bottomEdge.pressed || zoomPinchArea.active
     property real revealProgress: bottomEdge.progress
     property var controls: controls
+    property var settings: settings
 
     function showFocusRing(x, y) {
         focusRing.center = Qt.point(x, y);
@@ -44,6 +45,7 @@
         property int videoFlashMode: Camera.FlashOff
         property int selfTimerDelay: 0
         property int encodingQuality: 2 // QMultimedia.NormalQuality
+        property bool gridEnabled: false
     }
 
     Binding {
@@ -271,6 +273,29 @@
                     label: QT_TR_NOOP("Basic Quality")
                     value: 1 // QMultimedia.LowQuality
                 }
+            },
+            ListModel {
+                id: gridOptionsModel
+
+                property string settingsProperty: "gridEnabled"
+                property string icon: ""
+                property string iconSource: "assets/grid_lines.svg"
+                property string label: ""
+                property bool isToggle: true
+                property int selectedIndex: bottomEdge.indexForValue(gridOptionsModel, settings.gridEnabled)
+                property bool available: true
+                property bool visible: true
+
+                ListElement {
+                    icon: ""
+                    label: QT_TR_NOOP("On")
+                    value: true
+                }
+                ListElement {
+                    icon: ""
+                    label: QT_TR_NOOP("Off")
+                    value: false
+                }
             }
         ]
 

=== modified file 'ViewFinderOverlayLoader.qml'
--- ViewFinderOverlayLoader.qml	2014-12-03 12:56:42 +0000
+++ ViewFinderOverlayLoader.qml	2014-12-08 15:17:35 +0000
@@ -23,6 +23,7 @@
     property bool touchAcquired: loader.item ? loader.item.touchAcquired : false
     property real revealProgress: loader.item ? loader.item.revealProgress : 0
     property var controls: loader.item ? loader.item.controls : null
+    property var settings: loader.item.settings
 
     function showFocusRing(x, y) {
         loader.item.showFocusRing(x, y);

=== modified file 'ViewFinderView.qml'
--- ViewFinderView.qml	2014-12-05 18:43:54 +0000
+++ ViewFinderView.qml	2014-12-08 15:17:35 +0000
@@ -133,7 +133,7 @@
         id: viewFinderSwitcher
         anchors.fill: parent
         visible: !viewFinderSwitcherBlurred.visible
-        
+
         ShaderEffectSource {
             id: viewFinderGrab
             live: false
@@ -250,6 +250,46 @@
             }
         }
 
+        Item {
+            id: gridlines
+            objectName: "gridlines"
+            anchors.horizontalCenter: parent.horizontalCenter
+            width: viewFinderGeometry.width
+            height: viewFinderGeometry.height
+            visible: viewFinderOverlay.settings != undefined && viewFinderOverlay.settings.gridEnabled
+
+            property color color: Qt.rgba(0.8, 0.8, 0.8, 0.8)
+            property real thickness: units.dp(1)
+
+            Rectangle {
+                y: parent.height / 3
+                width: parent.width
+                height: gridlines.thickness
+                color: gridlines.color
+            }
+
+            Rectangle {
+                y: 2 * parent.height / 3
+                width: parent.width
+                height: gridlines.thickness
+                color: gridlines.color
+            }
+
+            Rectangle {
+                x: parent.width / 3
+                width: gridlines.thickness
+                height: parent.height
+                color: gridlines.color
+            }
+
+            Rectangle {
+                x: 2 * parent.width / 3
+                width: gridlines.thickness
+                height: parent.height
+                color: gridlines.color
+            }
+        }
+
         Connections {
             target: viewFinderView
             onInViewChanged: if (!viewFinderView.inView) viewFinderOverlay.controls.cancelTimedShoot()

=== added file 'assets/grid_lines.svg'
--- assets/grid_lines.svg	1970-01-01 00:00:00 +0000
+++ assets/grid_lines.svg	2014-12-08 15:17:35 +0000
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="90"
+   height="90"
+   id="svg4874"
+   version="1.1"
+   inkscape:version="0.91+devel r"
+   viewBox="0 0 90 90.000001"
+   sodipodi:docname="camera-grid01.svg">
+  <defs
+     id="defs4876">
+    <clipPath
+       id="clipPath2991-6"
+       clipPathUnits="userSpaceOnUse">
+      <path
+         sodipodi:nodetypes="cccsssssssccc"
+         style="color:#000000;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 0,968.36224 0,83.99996 16.375,0 c -1.525081,-1.7576 -2.659363,-3.8737 -3.25,-6 -0.996189,-3.5863 -1.09375,-7.3341 -1.09375,-12 l 0,-35.99996 c 0,-4.66586 0.09756,-8.41372 1.09375,-12 0.996189,-3.58628 3.508218,-7.14653 6.90625,-9 C 26.827314,973.6553 34.5,974.39349 48,974.39349 l 6,0 c 10.951245,0 18.075349,-0.45164 24,1.34375 l 0,-7.375 z"
+         id="path2993-6"
+         inkscape:connector-curvature="0" />
+    </clipPath>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.0931703"
+     inkscape:cx="-12.526581"
+     inkscape:cy="23.286085"
+     inkscape:document-units="px"
+     inkscape:current-layer="g4122"
+     showgrid="true"
+     showborder="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5451"
+       empspacing="6" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="6,77"
+       id="guide4063" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="3,78"
+       id="guide4065" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="55,84"
+       id="guide4067" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="53,87"
+       id="guide4069" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="20,3"
+       id="guide4071" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="20,6"
+       id="guide4073" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="87,7"
+       id="guide4075" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="84,7"
+       id="guide4077" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="58,81"
+       id="guide4074" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="9,74"
+       id="guide4076" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="21,9"
+       id="guide4078" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="81,4"
+       id="guide4080" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4879">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(67.857146,-84.50504)">
+    <path
+       sodipodi:nodetypes="cssssssccccccccccc"
+       inkscape:connector-curvature="0"
+       style="fill:#808080;fill-opacity:1;display:none"
+       id="path5335"
+       d="m -49.85715,117.50504 0,35.99992 c 0,18 3,18 30,18 l 6,0 c 27,0 30,0 30,-18 l 0,-35.99992 c 0,-18 -3,-18 -30,-18 l -6,0 c -27,0 -30,0 -30,18 z m 30,-12 6,0 c 24,0 24,0 24,12 l 0,35.99992 c 0,12 0,12 -24,12 l -6,0 c -24,0 -24,0 -24,-12 l 0,-35.99992 c 0,-12 0,-12 24,-12 z" />
+    <path
+       transform="translate(-67.85715,-880.85714)"
+       clip-path="url(#clipPath2991-6)"
+       d="m 6,986.36218 0,35.99992 c 0,18 3,18 30,18 l 6,0 c 27,0 30,0 30,-18 l 0,-35.99992 c 0,-18 -3,-18 -30,-18 l -6,0 c -27,0 -30,0 -30,18 z m 30,-12 6,0 c 24,0 24,0 24,12 l 0,35.99992 c 0,12 0,12 -24,12 l -6,0 c -24,0 -24,0 -24,-12 l 0,-35.99992 c 0,-12 0,-12 24,-12 z"
+       id="path5337"
+       style="fill:#808080;fill-opacity:1;display:none"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cssssssccccccccccc" />
+    <g
+       id="g4122">
+      <rect
+         y="84.505043"
+         x="-67.857147"
+         height="90"
+         width="90"
+         id="rect4120"
+         style="opacity:0.02999998;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         d="m -40.857146,93.505041 0,71.999999"
+         id="path4345"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         d="m -4.857146,93.505041 0,71.999999"
+         id="path4347"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         d="m -64.857146,144.50504 84,0"
+         id="path4349"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         d="m -64.857146,114.50504 84,0"
+         id="path4351"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>

=== modified file 'po/camera-app.pot'
--- po/camera-app.pot	2014-12-05 01:21:37 +0000
+++ po/camera-app.pot	2014-12-08 15:17:35 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: camera-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-04 23:20-0200\n"
+"POT-Creation-Date: 2014-12-08 09:47-0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -21,7 +21,7 @@
 msgid "Delete media?"
 msgstr ""
 
-#: ../DeleteDialog.qml:34 ../GalleryView.qml:50 ../SlideshowView.qml:41
+#: ../DeleteDialog.qml:34 ../PhotogridView.qml:50 ../SlideshowView.qml:41
 msgid "Delete"
 msgstr ""
 
@@ -29,11 +29,7 @@
 msgid "Cancel"
 msgstr ""
 
-#: ../GalleryView.qml:41 ../SlideshowView.qml:36
-msgid "Share"
-msgstr ""
-
-#: ../GalleryView.qml:199
+#: ../GalleryView.qml:180
 msgid "No media available."
 msgstr ""
 
@@ -49,42 +45,47 @@
 msgid "Swipe left for photo roll"
 msgstr ""
 
-#: ../ViewFinderOverlay.qml:138 ../ViewFinderOverlay.qml:161
-#: ../ViewFinderOverlay.qml:189 ../ViewFinderOverlay.qml:212
+#: ../PhotogridView.qml:41 ../SlideshowView.qml:36
+msgid "Share"
+msgstr ""
+
+#: ../ViewFinderOverlay.qml:140 ../ViewFinderOverlay.qml:163
+#: ../ViewFinderOverlay.qml:191 ../ViewFinderOverlay.qml:214
+#: ../ViewFinderOverlay.qml:291
 msgid "On"
 msgstr ""
 
-#: ../ViewFinderOverlay.qml:143 ../ViewFinderOverlay.qml:171
-#: ../ViewFinderOverlay.qml:194 ../ViewFinderOverlay.qml:217
-#: ../ViewFinderOverlay.qml:235
+#: ../ViewFinderOverlay.qml:145 ../ViewFinderOverlay.qml:173
+#: ../ViewFinderOverlay.qml:196 ../ViewFinderOverlay.qml:219
+#: ../ViewFinderOverlay.qml:238 ../ViewFinderOverlay.qml:296
 msgid "Off"
 msgstr ""
 
-#: ../ViewFinderOverlay.qml:166
+#: ../ViewFinderOverlay.qml:168
 msgid "Auto"
 msgstr ""
 
-#: ../ViewFinderOverlay.qml:203
+#: ../ViewFinderOverlay.qml:205
 msgid "HDR"
 msgstr ""
 
-#: ../ViewFinderOverlay.qml:240
+#: ../ViewFinderOverlay.qml:243
 msgid "5 seconds"
 msgstr ""
 
-#: ../ViewFinderOverlay.qml:245
+#: ../ViewFinderOverlay.qml:248
 msgid "15 seconds"
 msgstr ""
 
-#: ../ViewFinderOverlay.qml:262
+#: ../ViewFinderOverlay.qml:265
 msgid "Fine Quality"
 msgstr ""
 
-#: ../ViewFinderOverlay.qml:266
+#: ../ViewFinderOverlay.qml:269
 msgid "Normal Quality"
 msgstr ""
 
-#: ../ViewFinderOverlay.qml:270
+#: ../ViewFinderOverlay.qml:273
 msgid "Basic Quality"
 msgstr ""
 

=== modified file 'tests/autopilot/camera_app/emulators/main_window.py'
--- tests/autopilot/camera_app/emulators/main_window.py	2014-12-03 18:18:05 +0000
+++ tests/autopilot/camera_app/emulators/main_window.py	2014-12-08 15:17:35 +0000
@@ -73,6 +73,10 @@
         """Returns the encoding quality button of the camera"""
         return self.get_option_button("encodingQuality")
 
+    def get_grid_lines_button(self):
+        """Returns the grid lines toggle button of the camera"""
+        return self.get_option_button("gridEnabled")
+
     def get_stop_watch(self):
         """Returns the stop watch when using the record button of the camera"""
         return self.app.wait_select_single("StopWatch")

=== modified file 'tests/autopilot/camera_app/tests/test_options.py'
--- tests/autopilot/camera_app/tests/test_options.py	2014-07-29 16:40:16 +0000
+++ tests/autopilot/camera_app/tests/test_options.py	2014-12-08 15:17:35 +0000
@@ -40,3 +40,30 @@
 
         # check overlay is closed
         self.assertThat(bottom_edge.opened, Eventually(Equals(False)))
+
+    """Test toggling on/off grid lines option"""
+    def test_toggle_grid_lines(self):
+        gridlines = self.app.wait_select_single("QQuickItem", objectName="gridlines")
+        self.set_grid_lines_value("On")
+        self.assertEquals(gridlines.visible, True)
+        self.set_grid_lines_value("Off")
+        self.assertEquals(gridlines.visible, False)
+
+    def set_grid_lines_value(self, value="On"):
+        # open bottom edge
+        bottom_edge = self.main_window.get_bottom_edge()
+        bottom_edge.open()
+
+        # open grid lines option value selector showing the possible values
+        grid_lines_button = self.main_window.get_grid_lines_button()
+        self.pointing_device.move_to_object(grid_lines_button)
+        self.pointing_device.click()
+        option_value_selector = self.main_window.get_option_value_selector()
+        self.assertThat(option_value_selector.visible, Eventually(Equals(True)))
+
+        # tap on chosen value
+        option = self.main_window.get_option_value_button(value)
+        self.pointing_device.move_to_object(option)
+        self.pointing_device.click()
+
+        bottom_edge.close()