← Back to team overview

ubuntu-touch-coreapps-reviewers team mailing list archive

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

 

Michal Predotka has proposed merging lp:~mpredotka/ubuntu-clock-app/fix-header-in-alarms into lp:ubuntu-clock-app.

Requested reviews:
  Jenkins Bot (ubuntu-core-apps-jenkins-bot): continuous-integration
  Ubuntu Clock Developers (ubuntu-clock-dev)
Related bugs:
  Bug #1600487 in Ubuntu Clock App: "Unable to delete mutiple alarms"
  https://bugs.launchpad.net/ubuntu-clock-app/+bug/1600487

For more details, see:
https://code.launchpad.net/~mpredotka/ubuntu-clock-app/fix-header-in-alarms/+merge/299624

Fix for bug #1600487
-- 
Your team Ubuntu Clock Developers is requested to review the proposed merge of lp:~mpredotka/ubuntu-clock-app/fix-header-in-alarms into lp:ubuntu-clock-app.
=== 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
                 }
             }