Merge lp:~artmello/gallery-app/gallery-app-window_title into lp:gallery-app

[Arthur Mello]

Change the page title so it does not show the app name.

Change the page title so it does not show the app name.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:955
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/818/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-amd64-ci/243
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-armhf-ci/244
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-armhf-ci/244/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-i386-ci/243
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-trusty-touch/95
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/5130
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/123
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-trusty-armhf/107
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6525
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4410
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5329
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5329/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'rc/qml/AlbumViewer/AlbumViewer.qml'
--- rc/qml/AlbumViewer/AlbumViewer.qml	2014-03-31 13:06:48 +0000
+++ rc/qml/AlbumViewer/AlbumViewer.qml	2014-04-29 21:11:57 +0000
@@ -81,6 +81,8 @@
     // When the user clicks the back button or pages back to the cover.
     signal quickCloseRequested()
 
+    title: i18n.tr("Album")
+
     Image {
         anchors.fill: parent
         source: "../../img/background-paper.png"

=== modified file 'rc/qml/MediaViewer/PopupPhotoViewer.qml'
--- rc/qml/MediaViewer/PopupPhotoViewer.qml	2013-07-24 19:10:00 +0000
+++ rc/qml/MediaViewer/PopupPhotoViewer.qml	2014-04-29 21:11:57 +0000
@@ -49,7 +49,20 @@
 
     // updating active will automatically set the tools of the toolbar when activating.
     active: isPoppedUp
-    onActiveChanged: if (active && popupPhotoViewer.header) popupPhotoViewer.header.hide()
+    onActiveChanged: {
+        if (active && popupPhotoViewer.header) {
+            popupPhotoViewer.header.hide();
+            // FIXME: The hide function of header is not hiding it sometimes.
+            // The issue started after we changed the page title
+            popupPhotoViewer.header.visible = false;
+        }
+
+        if (!active && popupPhotoViewer.header && popupPhotoViewer.header.visible == false) {
+            popupPhotoViewer.header.visible = true;
+        }
+    }
+
+    title: i18n.tr("Gallery")
 
     /*!
     */