Merge lp:~mpredotka/ubuntu-clock-app/fix-header-in-alarms into lp:ubuntu-clock-app

[Michal Predotka]

Display selection header for alarms when needed

Fix for bug #1600487

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:477
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~mpredotka/ubuntu-clock-app/fix-header-in-alarms/+merge/299624/+edit-commit-message

https://core-apps-jenkins.ubuntu.com/job/clock-app-ci/93/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/950/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/clock-app-ci/93/rebuild

review: Needs Fixing (continuous-integration)

[Bartosz Kosiorek (gang65)]

Works perfectly now. Thanks Michal.

review: Approve

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'app/alarm/AlarmPage.qml'
--- app/alarm/AlarmPage.qml	2016-02-29 11:40:30 +0000
+++ app/alarm/AlarmPage.qml	2016-07-10 09:41:30 +0000
@@ -23,7 +23,7 @@
     id: alarmPage
     objectName: 'AlarmPage'
 
-    header: standardHeader
+    header: alarmListView.ViewItems.selectMode ? selectionHeader : standardHeader
 
     property var model: null
     property var pageStack: null
@@ -59,13 +59,11 @@
 
     PageHeader {
         id: selectionHeader
-        visible: alarmListView.ViewItems.selectMode
         leadingActionBar.actions: [
             Action {
                 iconName: "back"
                 text: i18n.tr("Back")
                 onTriggered: {
-                    alarmPage.header = standardHeader
                     alarmListView.ViewItems.selectMode = false
                 }
             }