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

[Arthur Mello]

Show header by default on an empty album

Show header by default on an empty album

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1102
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1062/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-amd64-ci/237
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/237
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/237/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-i386-ci/237
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/485
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4069
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/628
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/805
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14619
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3434
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4398
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4398/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Ugo Riboni (uriboni)]

LGTM

review: Approve

[lp:~artmello/gallery-app/gallery-app-fix_1378367]

1103. By Arthur Mello on 2014-10-14

Fix code style

=== modified file 'rc/qml/AlbumViewer/AlbumViewer.qml'
--- rc/qml/AlbumViewer/AlbumViewer.qml	2014-10-07 13:07:34 +0000
+++ rc/qml/AlbumViewer/AlbumViewer.qml	2014-10-14 16:21:19 +0000
@@ -188,8 +188,7 @@
                 // Handle add button.
                 if (hit.objectName === "addButton")
                     showMediaSelector();
-
-                if (!hit.mediaSource) {
+                else if (!hit.mediaSource) {
                     albumViewer.toggleHeaderVisibility();
                     return;
                 }

=== modified file 'rc/qml/AlbumsOverview.qml'
--- rc/qml/AlbumsOverview.qml	2014-10-07 19:07:47 +0000
+++ rc/qml/AlbumsOverview.qml	2014-10-14 16:21:19 +0000
@@ -174,7 +174,10 @@
         if (albumViewer.origin) {
             albumViewer.visible = true;
             overview.pushPage(albumViewer);
-            header.visible = false;
+            if (object.containedCount > 0)
+                header.visible = false;
+            else
+                header.visible = true;
         }
         else
             albumViewer.visible = true