Merge lp:~nik90/ubuntu-clock-app/migrate-clock-pageheaders into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

- Migrated all page.head to the new PageHeaders except for SoundPeerPicker.qml (since it uses ContentPeerPicker that uses UC 1.2. Mixing 1.2 and 1.3 is not recommended)

- Removed custom select-none.svg and select.svg icon assets as they have been added to the theme.

Migrated all page.head to the new PageHeaders except for SoundPeerPicker.qml (since it uses ContentPeerPicker that uses UC 1.2. Mixing 1.2 and 1.3 is not recommended)

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

FAILED: Continuous integration, rev:455
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1083/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/640/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1083/rebuild

review: Needs Fixing (continuous-integration)

[lp:~nik90/ubuntu-clock-app/migrate-clock-pageheaders]

456. By Nekhelesh Ramananthan on 2016-02-29

Switched to select & select-none icons provided by unity theme

[Michal Predotka (mpredotka)]

Looks and works as expected.

review: Approve

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

FAILED: Continuous integration, rev:456
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1087/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/644/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1087/rebuild

review: Needs Fixing (continuous-integration)

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

review: Approve (continuous-integration)

=== modified file 'app/alarm/AlarmLabel.qml'
--- app/alarm/AlarmLabel.qml	2016-02-25 22:16:54 +0000
+++ app/alarm/AlarmLabel.qml	2016-02-29 11:40:48 +0000
@@ -30,27 +30,32 @@
     property string oldAlarmLabel: alarm.message
 
     visible: false
-    title: i18n.tr("Label")
-
-    head.backAction: Action {
-        id: backAction
-        iconName: "back"
-        onTriggered: {
-            // Restore old alarm label if user presses the back button
-            alarm.message = oldAlarmLabel
-            pop()
-        }
-    }
-
-    head.actions: Action {
-        id: saveAction
-        objectName: "saveAction"
-        iconName: "ok"
-        enabled: oldAlarmLabel !== _labelEntry.text.trim() && _labelEntry.text.trim()
-        onTriggered: {
-            alarm.message = _labelEntry.text.trim()
-            pop()
-        }
+
+    header: PageHeader {
+        title: i18n.tr("Label")
+        leadingActionBar.actions: [
+            Action {
+                id: backAction
+                iconName: "back"
+                onTriggered: {
+                    // Restore old alarm label if user presses the back button
+                    alarm.message = oldAlarmLabel
+                    pop()
+                }
+            }
+        ]
+        trailingActionBar.actions: [
+            Action {
+                id: saveAction
+                objectName: "saveAction"
+                iconName: "ok"
+                enabled: oldAlarmLabel !== _labelEntry.text.trim() && _labelEntry.text.trim()
+                onTriggered: {
+                    alarm.message = _labelEntry.text.trim()
+                    pop()
+                }
+            }
+        ]
     }
 
     Component.onCompleted: {
@@ -63,7 +68,10 @@
         spacing: units.gu(0.5)
 
         anchors {
-            fill: parent
+            top: _alarmLabelPage.header.bottom
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
             margins: units.gu(2)
         }
 

=== modified file 'app/alarm/AlarmPage.qml'
--- app/alarm/AlarmPage.qml	2016-02-26 11:24:13 +0000
+++ app/alarm/AlarmPage.qml	2016-02-29 11:40:48 +0000
@@ -81,11 +81,11 @@
                     }
                 }
 
-                iconSource: {
+                iconName: {
                     if(alarmListView.ViewItems.selectedIndices.length === alarmListView.count) {
-                        return Qt.resolvedUrl("../graphics/select-none.svg")
+                        return "select-none"
                     } else {
-                        return Qt.resolvedUrl("../graphics/select.svg")
+                        return "select"
                     }
                 }
 

=== modified file 'app/alarm/AlarmRepeat.qml'
--- app/alarm/AlarmRepeat.qml	2016-02-25 22:16:54 +0000
+++ app/alarm/AlarmRepeat.qml	2016-02-29 11:40:48 +0000
@@ -33,7 +33,50 @@
     property int oldAlarmDaysOfWeek
 
     visible: false
-    title: i18n.tr("Repeat")
+
+    header: PageHeader {
+        title: i18n.tr("Repeat")
+        leadingActionBar.actions: [
+            Action {
+                iconName: "back"
+                onTriggered: {
+                    // Restore alarm frequency and type if user presses the back button
+                    alarm.daysOfWeek = oldAlarmDaysOfWeek
+                    detectAlarmType()
+                    pop()
+                }
+            }
+        ]
+        trailingActionBar.actions: [
+            Action {
+                id: saveAction
+                objectName: "saveAction"
+                iconName: "ok"
+                enabled: oldAlarmDaysOfWeek !== alarm.daysOfWeek
+                onTriggered: {
+                    pop()
+                }
+            },
+
+            Action {
+                text: i18n.tr("Select All")
+                iconName: alarm.daysOfWeek === 127 ? "select-none" : "select"
+                onTriggered: {
+                    if (alarm.daysOfWeek === 127) {
+                        for (var i=0; i<_alarmDays.count; i++) {
+                            _alarmDays.itemAt(i).isChecked = false
+                        }
+                    }
+
+                    else {
+                        for (var i=0; i<_alarmDays.count; i++) {
+                            _alarmDays.itemAt(i).isChecked = true
+                        }
+                    }
+                }
+            }
+        ]
+    }
 
     // Function to detect if alarm is OneTime or Repeating
     function detectAlarmType() {
@@ -44,53 +87,6 @@
         }
     }
 
-    head.backAction: Action {
-        iconName: "back"
-        onTriggered: {
-            // Restore alarm frequency and type if user presses the back button
-            alarm.daysOfWeek = oldAlarmDaysOfWeek
-            detectAlarmType()
-            pop()
-        }
-    }
-
-    head.actions: [
-        Action {
-            text: i18n.tr("Select All")
-
-            iconSource: {
-                if(alarm.daysOfWeek === 127)
-                    return Qt.resolvedUrl("../graphics/select-none.svg")
-                else
-                    return Qt.resolvedUrl("../graphics/select.svg")
-            }
-
-            onTriggered: {
-                if (alarm.daysOfWeek === 127) {
-                    for (var i=0; i<_alarmDays.count; i++) {
-                        _alarmDays.itemAt(i).isChecked = false
-                    }
-                }
-
-                else {
-                    for (var i=0; i<_alarmDays.count; i++) {
-                        _alarmDays.itemAt(i).isChecked = true
-                    }
-                }
-            }
-        },
-
-        Action {
-            id: saveAction
-            objectName: "saveAction"
-            iconName: "ok"
-            enabled: oldAlarmDaysOfWeek !== alarm.daysOfWeek
-            onTriggered: {
-                pop()
-            }
-        }
-    ]
-
     /*
      By Default, the alarm is set to Today. However if it is a one-time alarm,
      this should be set to none, since this page shows the days the alarm
@@ -135,7 +131,12 @@
     Column {
         id: _alarmDayColumn
 
-        anchors.fill: parent
+        anchors {
+            top: _alarmRepeatPage.header.bottom
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+        }
 
         Repeater {
             id: _alarmDays

=== modified file 'app/alarm/AlarmSettingsPage.qml'
--- app/alarm/AlarmSettingsPage.qml	2016-02-25 22:16:54 +0000
+++ app/alarm/AlarmSettingsPage.qml	2016-02-29 11:40:48 +0000
@@ -25,9 +25,12 @@
 Page {
     id: _alarmSettings
 
-    title: i18n.tr("Settings")
     visible: false
-    flickable: settingsPlugin
+
+    header: PageHeader {
+        title: i18n.tr("Settings")
+        flickable: settingsPlugin
+    }
 
     Connections {
         target: clockApp

=== modified file 'app/alarm/AlarmSound.qml'
--- app/alarm/AlarmSound.qml	2016-02-15 21:44:47 +0000
+++ app/alarm/AlarmSound.qml	2016-02-29 11:40:48 +0000
@@ -27,8 +27,6 @@
     id: _alarmSoundPage
     objectName: "alarmSoundPage"
 
-    title: i18n.tr("Sound")
-    flickable: _pageFlickable
     visible: false
 
     // Property used to let pageStack know that this is the alarm sound page
@@ -58,24 +56,31 @@
         oldAlarmSoundName = alarmSound.subText
     }
 
-    head.backAction: Action {
-        iconName: "back"
-        onTriggered: {
-            // Restore alarm sound to old values (url, name) if the back button is pressed
-            alarm.sound = oldAlarmSoundUrl
-            alarmSound.subText = oldAlarmSoundName
-            pop()
-        }
-    }
-
-    head.actions: Action {
-        id: saveAction
-        objectName: "saveAction"
-        iconName: "ok"
-        enabled: oldAlarmSoundUrl !== alarm.sound
-        onTriggered: {
-            pop()
-        }
+    header: PageHeader {
+        title: i18n.tr("Sound")
+        flickable: _pageFlickable
+        leadingActionBar.actions: [
+            Action {
+                iconName: "back"
+                onTriggered: {
+                    // Restore alarm sound to old values (url, name) if the back button is pressed
+                    alarm.sound = oldAlarmSoundUrl
+                    alarmSound.subText = oldAlarmSoundName
+                    pop()
+                }
+            }
+        ]
+        trailingActionBar.actions: [
+            Action {
+                id: saveAction
+                objectName: "saveAction"
+                iconName: "ok"
+                enabled: oldAlarmSoundUrl !== alarm.sound
+                onTriggered: {
+                    pop()
+                }
+            }
+        ]
     }
 
     FolderListModel {
@@ -125,7 +130,7 @@
         for (var i=0; i<customSoundModel.count; i++) {
             if (soundUrl === customSoundModel.get(i, "fileURL")) {
                 alarmSound.subText = customSoundModel.get(i, "fileBaseName")
-                alarm.sound = soundUrl                
+                alarm.sound = soundUrl
                 _customAlarmSounds.itemAt(i).isChecked = true
                 previewAlarmSound.controlPlayback(soundUrl)
                 return
@@ -217,7 +222,7 @@
                     objectName: "customAlarmSoundDelegate" + index
 
                     property bool isChecked: alarmSound.subText === _customSoundName.title.text ? true
-                                                                                          : false
+                                                                                                : false
 
                     height: _customSoundName.height + divider.height
 
@@ -244,7 +249,7 @@
                                             for (var i=0; i<defaultSoundModel.count; i++) {
                                                 if (defaultSoundModel.get(i, "fileBaseName") === alarmSound.subText) {
                                                     alarm.sound = defaultSoundModel.get(i, "fileURL")
-                                                    oldAlarmSoundUrl = alarm.sound                                                    
+                                                    oldAlarmSoundUrl = alarm.sound
                                                     _alarmSounds.itemAt(i).isChecked = true
                                                     previewAlarmSound.controlPlayback(defaultSoundModel.get(i, "fileURL"))
                                                 }
@@ -354,7 +359,7 @@
                     objectName: "alarmSoundDelegate" + index
 
                     property bool isChecked: alarmSound.subText === _soundName.title.text ? true
-                                                                                    : false
+                                                                                          : false
 
                     height: _soundName.height + divider.height
 

=== modified file 'app/components/EmptyState.qml'
--- app/components/EmptyState.qml	2016-02-25 22:16:54 +0000
+++ app/components/EmptyState.qml	2016-02-29 11:40:48 +0000
@@ -45,12 +45,13 @@
     Label {
         id: emptyLabel
         textSize: Label.Large
-        font.bold: true
+        font.weight: Font.Normal
         width: parent.width
         wrapMode: Text.WordWrap
         anchors.top: emptyIcon.bottom
         anchors.topMargin: units.gu(4)
         horizontalAlignment: Text.AlignHCenter
+        color: "#5d5d5d"
     }
 
     Label {
@@ -59,5 +60,6 @@
         wrapMode: Text.WordWrap
         anchors.top: emptyLabel.bottom
         horizontalAlignment: Text.AlignHCenter
+        color: "#888888"
     }
 }

=== modified file 'app/graphics/CMakeLists.txt'
--- app/graphics/CMakeLists.txt	2016-02-20 23:49:00 +0000
+++ app/graphics/CMakeLists.txt	2016-02-29 11:40:48 +0000
@@ -7,8 +7,6 @@
     [e-mail]
     [e-mail]
     [e-mail]
-    select-none.svg
-    select.svg
 )
 
 # make the files visible in the qtcreator tree

=== removed file 'app/graphics/select-none.svg'
--- app/graphics/select-none.svg	2015-09-17 04:33:11 +0000
+++ app/graphics/select-none.svg	1970-01-01 00:00:00 +0000
@@ -1,153 +0,0 @@
-<?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.48+devel r"
-   viewBox="0 0 90 90.000001"
-   sodipodi:docname="select-none.svg">
-  <defs
-     id="defs4876" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="12.434498"
-     inkscape:cx="10.237647"
-     inkscape:cy="53.078139"
-     inkscape:document-units="px"
-     inkscape:current-layer="g1311"
-     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: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)">
-    <g
-       transform="matrix(0,-1,-1,0,373.50506,516.50504)"
-       id="g4845"
-       style="display:inline">
-      <g
-         transform="matrix(0,-1,-1,0,567.36222,615.36221)"
-         id="g1311"
-         inkscape:export-filename="envelope02.png"
-         inkscape:export-xdpi="90"
-         inkscape:export-ydpi="90">
-        <g
-           id="g1313"
-           transform="matrix(1.875,0,0,1.875,-366,-1657.8169)">
-          <rect
-             transform="translate(0,804.3622)"
-             y="152"
-             x="288"
-             height="48"
-             width="48"
-             id="rect1315"
-             style="opacity:0.21171169;fill:none;stroke:none" />
-        </g>
-        <path
-           style="font-size:15px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#808080;fill-opacity:1;stroke:none;display:inline;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
-           d="M 21 6 C 11 6 6 5.9998033 6 17.626953 L 6 72.373047 C 6 84.000207 11 84 21 84 L 69 84 C 79 84 84 84.000207 84 72.373047 L 84 17.626953 C 84 5.9998033 79 6 69 6 L 21 6 z M 22.867188 12 L 67.132812 12 C 75.065512 12 78 11.999356 78 20.191406 L 78 69.808594 C 78 78.000644 75.065512 78 67.132812 78 L 22.867188 78 C 14.934488 78 12 78.000644 12 69.808594 L 12 20.191406 C 12 11.999356 14.934488 12 22.867188 12 z "
-           transform="translate(174,135.36222)"
-           id="path4098" />
-      </g>
-    </g>
-  </g>
-</svg>

=== removed file 'app/graphics/select.svg'
--- app/graphics/select.svg	2015-09-17 04:33:11 +0000
+++ app/graphics/select.svg	1970-01-01 00:00:00 +0000
@@ -1,158 +0,0 @@
-<?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.48+devel r12833"
-   viewBox="0 0 90 90.000001"
-   sodipodi:docname="select.svg">
-  <defs
-     id="defs4876" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="12.434498"
-     inkscape:cx="30.343002"
-     inkscape:cy="53.600878"
-     inkscape:document-units="px"
-     inkscape:current-layer="g1311"
-     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: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)">
-    <g
-       transform="matrix(0,-1,-1,0,373.50506,516.50504)"
-       id="g4845"
-       style="display:inline">
-      <g
-         transform="matrix(0,-1,-1,0,567.36222,615.36221)"
-         id="g1311"
-         inkscape:export-filename="envelope02.png"
-         inkscape:export-xdpi="90"
-         inkscape:export-ydpi="90">
-        <g
-           id="g1313"
-           transform="matrix(1.875,0,0,1.875,-366,-1657.8169)">
-          <rect
-             transform="translate(0,804.3622)"
-             y="152"
-             x="288"
-             height="48"
-             width="48"
-             id="rect1315"
-             style="opacity:0.21171169;fill:none;stroke:none" />
-        </g>
-        <path
-           style="font-size:15px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#808080;fill-opacity:1;stroke:none;display:inline;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
-           d="M 21 6 C 11 6 6 5.9998033 6 17.626953 L 6 72.373047 C 6 84.000207 11 84 21 84 L 69 84 C 79 84 84 84.000207 84 72.373047 L 84 17.626953 C 84 5.9998033 79 6 69 6 L 21 6 z M 22.867188 12 L 67.132812 12 C 75.065512 12 78 11.999356 78 20.191406 L 78 69.808594 C 78 78.000644 75.065512 78 67.132812 78 L 22.867188 78 C 14.934488 78 12 78.000644 12 69.808594 L 12 20.191406 C 12 11.999356 14.934488 12 22.867188 12 z "
-           transform="translate(174,135.36222)"
-           id="path4098" />
-        <path
-           style="font-size:15px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#808080;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
-           d="m 242.00422,161.6591 -0.375,0.32812 -26.94727,23.60352 -15.79687,-13.55079 -4.77539,5.4004 20.57617,21.64843 31.30078,-32.9375 -3.98242,-4.49218 z"
-           id="path4041-9"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-  </g>
-</svg>

=== modified file 'app/worldclock/WorldCityList.qml'
--- app/worldclock/WorldCityList.qml	2016-02-25 22:16:54 +0000
+++ app/worldclock/WorldCityList.qml	2016-02-29 11:40:48 +0000
@@ -47,56 +47,60 @@
         staticTimeZoneModelLoader.sourceComponent = staticTimeZoneModelComponent
     }
 
-    title: i18n.tr("Select a city")
     visible: false
-    flickable: null
-
-    state: "default"
-    states: [
-        PageHeadState {
-            name: "default"
-            head: worldCityList.head
-            actions: [
-                Action {
-                    objectName: "searchButton"
-                    iconName: "search"
-                    text: i18n.tr("City")
-                    onTriggered: {
-                        worldCityList.state = "search"
-                        searchComponentLoader.sourceComponent = searchComponent
-                        jsonTimeZoneModelLoader.sourceComponent = jsonTimeZoneModelComponent
-                        searchComponentLoader.item.forceActiveFocus()
-                    }
+    header: standardHeader
+
+    PageHeader {
+        id: standardHeader
+
+        title: i18n.tr("Select a city")
+        flickable: null
+        visible: worldCityList.header === standardHeader
+        trailingActionBar.actions: [
+            Action {
+                objectName: "searchButton"
+                iconName: "search"
+                text: i18n.tr("City")
+                onTriggered: {
+                    worldCityList.header = searchHeader
+                    searchComponentLoader.sourceComponent = searchComponent
+                    jsonTimeZoneModelLoader.sourceComponent = jsonTimeZoneModelComponent
+                    searchComponentLoader.item.forceActiveFocus()
                 }
-            ]
-        },
-
-        PageHeadState {
-            name: "search"
-            head: worldCityList.head
-            backAction: Action {
+            }
+        ]
+    }
+
+    PageHeader {
+        id: searchHeader
+
+        flickable: null
+        visible: worldCityList.header === searchHeader
+
+        leadingActionBar.actions: [
+            Action {
                 iconName: "back"
                 text: i18n.tr("Back")
                 onTriggered: {
                     cityList.forceActiveFocus()
                     searchComponentLoader.item.text = ""
-                    worldCityList.state = "default"
+                    worldCityList.header = standardHeader
                     isOnlineMode = false
                     searchComponentLoader.sourceComponent = undefined
                     jsonTimeZoneModelLoader.sourceComponent = undefined
                 }
             }
+        ]
 
-            contents: Loader {
-                id: searchComponentLoader
-                anchors {
-                    left: parent ? parent.left : undefined
-                    right: parent ? parent.right : undefined
-                    rightMargin: units.gu(2)
-                }
+        contents: Loader {
+            id: searchComponentLoader
+            anchors {
+                left: parent ? parent.left : undefined
+                right: parent ? parent.right : undefined
+                verticalCenter: parent ? parent.verticalCenter : undefined
             }
         }
-    ]
+    }
 
     Component {
         id: searchComponent
@@ -242,7 +246,7 @@
             left: parent.left
             right: parent.right
             margins: units.gu(2)
-            top: parent.top
+            top: worldCityList.header.bottom
             topMargin: units.gu(4)
         }
     }
@@ -262,7 +266,7 @@
         }
     }
 
-    ListView {
+    UbuntuListView {
         id: cityList
         objectName: "cityList"
 
@@ -293,9 +297,14 @@
             forceActiveFocus()
         }
 
-        anchors.fill: parent
-        anchors.rightMargin: fastScroll.showing ? fastScroll.width - units.gu(1)
-                                                : 0
+        anchors {
+            top: worldCityList.header.bottom
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+            rightMargin: fastScroll.showing ? fastScroll.width - units.gu(1)
+                                            : 0
+        }
 
         model: sortedTimeZoneModel
         currentIndex: -1

=== modified file 'debian/changelog'
--- debian/changelog	2016-02-26 10:01:48 +0000
+++ debian/changelog	2016-02-29 11:40:48 +0000
@@ -24,6 +24,7 @@
   [ Nekhelesh Ramananthan ]
   * Fix 'Shutter' effect animation on title bar when opening bottom edge (LP: #1543496)
   * Migrate to the new SDK Bottom edge (LP: #1549988)
+  * Migrated all page head to the new PageHeader (LP: #1550991)
   * Reduce binding in ActionIcon.qml and fixed stopwatch slide delete UI issue.
 
  -- Bartosz Kosiorek <[e-mail]>  Wed, 30 Dec 2015 01:43:24 +0100