Merge lp:~dpniel/ubuntu-filemanager-app/new-page-header into lp:ubuntu-filemanager-app

[Dan Chapman ]

Migrate to using the latest PageHeader API

This required a few changes in PathHistoryRow so it aligned properly
plus i quickly replaced the Rectangle's that really weren't needed???

Migrate to using the latest PageHeader API.

[Dan Chapman  (dpniel)]

eeeek i see the build directory has been included in translations i'll fix that

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

PASSED: Continuous integration, rev:541
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/83/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/906/console

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

review: Approve (continuous-integration)

[lp:~dpniel/ubuntu-filemanager-app/new-page-header]

542. By Dan Chapman  on 2016-06-05

Fix build dir included in translations

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

PASSED: Continuous integration, rev:542
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/84/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/907/console

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

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Settings page seems blank after this change?

review: Needs Fixing

[Dan Chapman  (dpniel)]

Oh forgot about the settings page :-) Probably because it's named as SettingsSheet so i missed it. I'll update that as well.

[lp:~dpniel/ubuntu-filemanager-app/new-page-header]

543. By Dan Chapman  on 2016-06-09

Fix settings page content hiding behind header :-p

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

PASSED: Continuous integration, rev:543
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-ci/86/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/912/console

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

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

That's better! Thanks Dan!

review: Approve

=== modified file 'po/com.ubuntu.filemanager.pot'
--- po/com.ubuntu.filemanager.pot	2016-06-05 06:28:30 +0000
+++ po/com.ubuntu.filemanager.pot	2016-06-09 11:18:31 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-05 07:23+0100\n"
+"POT-Creation-Date: 2016-06-09 12:17+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -26,13 +26,13 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/app/qml/components/PathHistoryRow.qml:84
-#: ../src/app/qml/ui/FolderListPage.qml:845
+#: ../src/app/qml/components/PathHistoryRow.qml:89
+#: ../src/app/qml/ui/FolderListPage.qml:852
 msgid "Device"
 msgstr ""
 
 #: ../src/app/qml/components/PlacesSidebar.qml:54
-#: ../src/app/qml/ui/FolderListPage.qml:31 ../src/app/qml/ui/PlacesPage.qml:27
+#: ../src/app/qml/ui/FolderListPage.qml:30 ../src/app/qml/ui/PlacesPage.qml:31
 #: ../src/app/qml/ui/PlacesPopover.qml:102
 msgid "Places"
 msgstr ""
@@ -41,8 +41,8 @@
 msgid "Open with"
 msgstr ""
 
-#: ../src/app/qml/filemanager.qml:80 ../src/app/qml/ui/FolderListPage.qml:107
-#: ../src/app/qml/ui/SettingsSheet.qml:31
+#: ../src/app/qml/filemanager.qml:80 ../src/app/qml/ui/FolderListPage.qml:112
+#: ../src/app/qml/ui/SettingsSheet.qml:33
 msgid "Settings"
 msgstr ""
 
@@ -50,12 +50,12 @@
 msgid "Change app settings"
 msgstr ""
 
-#: ../src/app/qml/filemanager.qml:258 ../src/app/qml/ui/FolderListPage.qml:379
+#: ../src/app/qml/filemanager.qml:258 ../src/app/qml/ui/FolderListPage.qml:386
 #: ../src/app/qml/ui/ViewPopover.qml:70
 msgid "Icons"
 msgstr ""
 
-#: ../src/app/qml/filemanager.qml:258 ../src/app/qml/ui/FolderListPage.qml:395
+#: ../src/app/qml/filemanager.qml:258 ../src/app/qml/ui/FolderListPage.qml:402
 #: ../src/app/qml/ui/ViewPopover.qml:71
 msgid "List"
 msgstr ""
@@ -76,7 +76,7 @@
 #: ../src/app/qml/ui/AuthenticationDialog.qml:49
 #: ../src/app/qml/ui/ConfirmDialog.qml:31
 #: ../src/app/qml/ui/ConfirmDialogWithInput.qml:47
-#: ../src/app/qml/ui/FolderListPage.qml:679
+#: ../src/app/qml/ui/FolderListPage.qml:686
 #: ../src/app/qml/ui/NotifyDialog.qml:25
 msgid "OK"
 msgstr ""
@@ -86,9 +86,9 @@
 #: ../src/app/qml/ui/ConfirmDialogWithInput.qml:57
 #: ../src/app/qml/ui/FileActionDialog.qml:45
 #: ../src/app/qml/ui/FileOperationProgressDialog.qml:44
-#: ../src/app/qml/ui/FolderListPage.qml:357
-#: ../src/app/qml/ui/FolderListPage.qml:670
-#: ../src/app/qml/ui/FolderListPage.qml:737 ../src/app/qml/ui/GoToDialog.qml:67
+#: ../src/app/qml/ui/FolderListPage.qml:364
+#: ../src/app/qml/ui/FolderListPage.qml:677
+#: ../src/app/qml/ui/FolderListPage.qml:744 ../src/app/qml/ui/GoToDialog.qml:67
 #: ../src/app/qml/ui/NetAuthenticationDialog.qml:108
 msgid "Cancel"
 msgstr ""
@@ -150,195 +150,195 @@
 msgid "File operation"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:57
+#: ../src/app/qml/ui/FolderListPage.qml:62
 #, qt-format
 msgid "Paste %1 File"
 msgid_plural "Paste %1 Files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:61
+#: ../src/app/qml/ui/FolderListPage.qml:66
 msgid "Paste files"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:69
+#: ../src/app/qml/ui/FolderListPage.qml:74
 msgid "Clear clipboard"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:79
-#: ../src/app/qml/ui/FolderListPage.qml:97
-#: ../src/app/qml/ui/FolderListPage.qml:607
+#: ../src/app/qml/ui/FolderListPage.qml:84
+#: ../src/app/qml/ui/FolderListPage.qml:102
+#: ../src/app/qml/ui/FolderListPage.qml:614
 msgid "Properties"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:88
+#: ../src/app/qml/ui/FolderListPage.qml:93
 msgid "New Folder"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:115
+#: ../src/app/qml/ui/FolderListPage.qml:120
 msgid "Go To"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:122
+#: ../src/app/qml/ui/FolderListPage.qml:127
 msgid "Unlock full access"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:136
+#: ../src/app/qml/ui/FolderListPage.qml:141
 msgid "Authentication failed"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:210
+#: ../src/app/qml/ui/FolderListPage.qml:217
 #, qt-format
 msgid "%1 file"
 msgid_plural "%1 files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:254
+#: ../src/app/qml/ui/FolderListPage.qml:261
 msgid "Open in a new tab"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:262
+#: ../src/app/qml/ui/FolderListPage.qml:269
 msgid "Close this tab"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:275
+#: ../src/app/qml/ui/FolderListPage.qml:282
 msgid "Create folder"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:276
+#: ../src/app/qml/ui/FolderListPage.qml:283
 msgid "Enter name for new folder"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:292
+#: ../src/app/qml/ui/FolderListPage.qml:299
 msgid "Create file"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:293
+#: ../src/app/qml/ui/FolderListPage.qml:300
 msgid "Enter name for new file"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:342
+#: ../src/app/qml/ui/FolderListPage.qml:349
 msgid "Select"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:439
+#: ../src/app/qml/ui/FolderListPage.qml:446
 msgid "No files"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:459
-#: ../src/app/qml/ui/FolderListPage.qml:568
+#: ../src/app/qml/ui/FolderListPage.qml:466
+#: ../src/app/qml/ui/FolderListPage.qml:575
 msgid "Delete"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:460
+#: ../src/app/qml/ui/FolderListPage.qml:467
 #, qt-format
 msgid "Are you sure you want to permanently delete '%1'?"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:465
+#: ../src/app/qml/ui/FolderListPage.qml:472
 msgid "Deleting files"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:483
-#: ../src/app/qml/ui/FolderListPage.qml:581
+#: ../src/app/qml/ui/FolderListPage.qml:490
+#: ../src/app/qml/ui/FolderListPage.qml:588
 msgid "Rename"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:484
+#: ../src/app/qml/ui/FolderListPage.qml:491
 msgid "Enter a new name"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:493
+#: ../src/app/qml/ui/FolderListPage.qml:500
 msgid "Could not rename"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:494
+#: ../src/app/qml/ui/FolderListPage.qml:501
 msgid "Insufficient permissions or name already exists?"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:512
+#: ../src/app/qml/ui/FolderListPage.qml:519
 msgid "Extract Archive"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:513
+#: ../src/app/qml/ui/FolderListPage.qml:520
 #, qt-format
 msgid "Are you sure you want to extract '%1' here?"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:545
+#: ../src/app/qml/ui/FolderListPage.qml:552
 msgid "Cut"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:556
+#: ../src/app/qml/ui/FolderListPage.qml:563
 msgid "Copy"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:596
-#: ../src/app/qml/ui/FolderListPage.qml:717
+#: ../src/app/qml/ui/FolderListPage.qml:603
+#: ../src/app/qml/ui/FolderListPage.qml:724
 msgid "Extract archive"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:627
+#: ../src/app/qml/ui/FolderListPage.qml:634
 msgid "File operation error"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:658
+#: ../src/app/qml/ui/FolderListPage.qml:665
 #, qt-format
 msgid "Extracting archive '%1'"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:694
+#: ../src/app/qml/ui/FolderListPage.qml:701
 msgid "Extracting failed"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:695
+#: ../src/app/qml/ui/FolderListPage.qml:702
 #, qt-format
 msgid "Extracting the archive '%1' failed."
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:709
+#: ../src/app/qml/ui/FolderListPage.qml:716
 msgid "Archive file"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:710
+#: ../src/app/qml/ui/FolderListPage.qml:717
 msgid "Do you want to extract the archive here?"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:727
+#: ../src/app/qml/ui/FolderListPage.qml:734
 msgid "Open with another app"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:811
+#: ../src/app/qml/ui/FolderListPage.qml:818
 msgid "~/Desktop"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:821
+#: ../src/app/qml/ui/FolderListPage.qml:828
 msgid "~/Public"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:823
+#: ../src/app/qml/ui/FolderListPage.qml:830
 msgid "~/Programs"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:825
+#: ../src/app/qml/ui/FolderListPage.qml:832
 msgid "~/Templates"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:843
+#: ../src/app/qml/ui/FolderListPage.qml:850
 msgid "Home"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:847
+#: ../src/app/qml/ui/FolderListPage.qml:854
 msgid "Network"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:948
+#: ../src/app/qml/ui/FolderListPage.qml:955
 msgid "Folder not accessible"
 msgstr ""
 
 #. TRANSLATORS: this refers to a folder name
-#: ../src/app/qml/ui/FolderListPage.qml:950
+#: ../src/app/qml/ui/FolderListPage.qml:957
 #, qt-format
 msgid "Can not access %1"
 msgstr ""
@@ -351,12 +351,12 @@
 msgid "Enter a location to go to:"
 msgstr ""
 
-#: ../src/app/qml/ui/GoToDialog.qml:45 ../src/app/qml/ui/PlacesPage.qml:63
+#: ../src/app/qml/ui/GoToDialog.qml:45 ../src/app/qml/ui/PlacesPage.qml:65
 #: ../src/app/qml/ui/PlacesPopover.qml:66
 msgid "Location..."
 msgstr ""
 
-#: ../src/app/qml/ui/GoToDialog.qml:54 ../src/app/qml/ui/PlacesPage.qml:78
+#: ../src/app/qml/ui/GoToDialog.qml:54 ../src/app/qml/ui/PlacesPage.qml:80
 #: ../src/app/qml/ui/PlacesPopover.qml:81
 msgid "Go"
 msgstr ""
@@ -377,11 +377,7 @@
 msgid "Ok"
 msgstr ""
 
-#: ../src/app/qml/ui/SettingsSheet.qml:34
-msgid "Close"
-msgstr ""
-
-#: ../src/app/qml/ui/SettingsSheet.qml:43
+#: ../src/app/qml/ui/SettingsSheet.qml:45
 msgid "Show Advanced Features"
 msgstr ""
 
 
=== modified file 'src/app/qml/components/PathHistoryRow.qml'
--- src/app/qml/components/PathHistoryRow.qml	2016-04-06 14:51:26 +0000
+++ src/app/qml/components/PathHistoryRow.qml	2016-06-09 11:18:31 +0000
@@ -20,13 +20,22 @@
 import Ubuntu.Components.ListItems 1.3
 
 /* Full path of your current folder and recent history, that you can jump to by clicking its members */
+
+
 Flickable {
     id: flickable
-
+    anchors {
+        fill: parent
+        topMargin: units.gu(1)
+        rightMargin: units.gu(1)
+        bottomMargin: units.gu(1)
+    }
     /* Convenience properties ; used a large amount of times to warrant a variable */
     property int iconWidth: units.gu(2.5)
     property string textSize: "large"
     property string separatorText: " /"
+
+
     /* contentWidth equals this to allow it to hide Device and Home */
     contentWidth: {
         repeater.model > 0 ?
@@ -35,11 +44,8 @@
                       : width + row.width - repeater.itemAt(repeater.model-1).width
         : width + memoryRow.width - memoryRepeater.itemAt(memoryRepeater.model-1).width
     }
-    height: units.gu(7)
     anchors {
-        left: parent.left // back.right
-        right: parent.right
-        rightMargin: units.gu(1)
+        fill: parent
     }
     clip: true
     boundsBehavior: Flickable.StopAtBounds
@@ -52,6 +58,11 @@
     /* Flickable Contents */
     Row {
         id: row
+        anchors {
+            left: parent.left
+            top: parent.top
+            bottom: parent.bottom
+        }
         spacing: 0 // Safety; having any spacing will throw off the contentX calculations.
 
         function repositionScrollable() {
@@ -61,23 +72,17 @@
                 flickable.contentX = row.width - repeater.itemAt(repeater.model - 1).width
             }
         }
-
-        Timer {
-            id: repositionTimer
-            onTriggered: repositionScrollabe()
-        }
-
         /* Adjust contentX according to the current folder */
         onWidthChanged: {
             repositionScrollable()
         }
 
         /* Root Folder displayed as "Device" */
-        Rectangle {
+        AbstractButton {
             id: device
-            width: deviceLabel.contentWidth + flickable.iconWidth
-            height: units.gu(7)
-            color: "transparent"
+            width: deviceLabel.width + flickable.iconWidth
+            height: parent.height
+            onClicked: goTo("/")
 
             Label {
                 id: deviceLabel
@@ -89,13 +94,6 @@
                 /* Maximum Width = Flickable Width */
                 width: if (contentWidth > flickable.width) { flickable.width }
             }
-
-            MouseArea {
-                anchors.fill: parent
-                onClicked: {
-                    goTo("/")
-                }
-            }
         }
 
         /* Current Directory and its parents */
@@ -128,11 +126,21 @@
                 // console.log("Memory Path  = " + memoryPath)
             }
 
-            delegate: Rectangle {
+            delegate: AbstractButton {
                 visible: folder !== "/" // This is to avoid issues with naming the root folder, "Device"
                 width: label.width + pathSeparator.width
-                height: units.gu(7)
-                color: "transparent"
+                height: row.height
+                onClicked: {
+                    // When clicking on an already selected item, go up one level. Otherwise go to
+                    // the clicked item. This behaviour is to make it easy to go up in the folder
+                    // hierarchy now that the "back" button goes back in history and not up the directory
+                    // hierarchy
+                    if (repeater.model === index + 1) {
+                        goUp()
+                    } else {
+                        goTo(pathRaw(folder, index))
+                    }
+                }
 
                 Label {
                     id: label
@@ -156,21 +164,6 @@
                     color: UbuntuColors.inkstone
                     // clip: true
                 }
-
-                MouseArea {
-                    anchors.fill: parent
-                    onClicked: {
-                        // When clicking on an already selected item, go up one level. Otherwise go to
-                        // the clicked item. This behaviour is to make it easy to go up in the folder
-                        // hierarchy now that the "back" button goes back in history and not up the directory
-                        // hierarchy
-                        if (repeater.model === index + 1) {
-                            goUp()
-                        } else {
-                            goTo(pathRaw(folder, index))
-                        }
-                    }
-                }
             }
         }
     }
@@ -178,17 +171,20 @@
     /* Memory of Previously visited folders */
     Row {
         id: memoryRow
-        anchors.left: row.right // Not placed in the other row, to help avoid making contentX calculations more complicated.
-
+        anchors {
+            top: parent.top
+            bottom: parent.bottom
+            left: row.right // Not placed in the other row, to help avoid making contentX calculations more complicated.
+        }
         /* Previously visited folders */
         Repeater {
             id: memoryRepeater
             model: repeater.memoryModel - repeater.model
 
-            delegate: Rectangle {
+            delegate: AbstractButton {
                 width: memoryLabel.width + memoryPathSeparator.width
-                height: units.gu(7)
-                color: "transparent"
+                height: memoryRow.height
+                onClicked: goTo(pathRaw(repeater.memoryPath, repeater.memoryModel-memoryRepeater.model+index))
 
                 Label {
                     id: memoryLabel
@@ -213,14 +209,8 @@
                     color: UbuntuColors.inkstone
                     // clip: true
                 }
-
-                MouseArea {
-                    anchors.fill: parent
-                    onClicked: {
-                        goTo(pathRaw(repeater.memoryPath, repeater.memoryModel-memoryRepeater.model+index))
-                    }
-                }
             }
         }
     }
 }
+
 
=== modified file 'src/app/qml/ui/FolderListPage.qml'
--- src/app/qml/ui/FolderListPage.qml	2016-06-05 06:28:30 +0000
+++ src/app/qml/ui/FolderListPage.qml	2016-06-09 11:18:31 +0000
@@ -27,124 +27,129 @@
 
 PageWithBottomEdge {
     id: folderListPage
-    title: basename(folder)
     bottomEdgeTitle: i18n.tr("Places")
     bottomEdgeEnabled: !sidebar.expanded
     bottomEdgePageSource: Qt.resolvedUrl("PlacesPage.qml")
 
-    head.contents: PathHistoryRow {}
-
-    /* Go to last folder visited */
-    head.backAction: Action {
-        id: back
-        objectName: "back"
-        iconName: "back"
-
-        onTriggered: {
-            goBack()
+    header: PageHeader {
+        title: basename(folder)
+        contents: PathHistoryRow {}
+        flickable: !sidebar.expanded ?
+                           (folderListView.visible ? folderListView.flickable : folderIconView.flickable) : null
+        leadingActionBar.actions: [
+            /* Go to last folder visited */
+            Action {
+                id: back
+                objectName: "back"
+                iconName: "back"
+
+                onTriggered: {
+                    goBack()
+                }
+            }
+        ]
+        trailingActionBar {
+            numberOfSlots: 3
+            actions: [
+                Action {
+                    id: pasteButton
+                    objectName: "paste"
+                    iconName: "edit-paste"
+                    // Translation message was implemented according to:
+                    // http://developer.ubuntu.com/api/qml/sdk-14.04/Ubuntu.Components.i18n/
+                    // It allows correct translation for languages with more than two plural forms:
+                    // http://localization-guide.readthedocs.org/en/latest/l10n/pluralforms.html
+                    text: i18n.tr("Paste %1 File", "Paste %1 Files", pageModel.clipboardUrlsCounter).arg(pageModel.clipboardUrlsCounter)
+                    visible: pageModel.clipboardUrlsCounter > 0
+                    onTriggered: {
+                        console.log("Pasting to current folder items of count " + pageModel.clipboardUrlsCounter)
+                        fileOperationDialog.startOperation(i18n.tr("Paste files"))
+                        pageModel.paste()
+                    }
+                },
+                Action {
+                    id: clearClipboardButton
+                    objectName: "clearClipboard"
+                    iconName: "edit-clear"
+                    text: i18n.tr("Clear clipboard")
+                    visible: pageModel.clipboardUrlsCounter > 0
+                    onTriggered: {
+                        console.log("Clearing clipboard")
+                        pageModel.clearClipboard()
+                    }
+                },
+                Action {
+                    id: optionsButton
+                    iconName: "view-list-symbolic"
+                    text: i18n.tr("Properties")
+                    onTriggered: {
+                        PopupUtils.open(Qt.resolvedUrl("ViewPopover.qml"), parent)
+                    }
+                },
+                Action {
+                    id: createNewFolder
+                    objectName: "createFolder"
+                    iconName: "add"
+                    text: i18n.tr("New Folder")
+                    onTriggered: {
+                        print(text)
+                        PopupUtils.open(createFolderDialog, folderListPage)
+                    }
+                },
+                Action {
+                    id: viewProperties
+                    iconName: "info"
+                    text: i18n.tr("Properties")
+                    onTriggered: {
+                        print(text)
+                        PopupUtils.open(Qt.resolvedUrl("FileDetailsPopover.qml"), folderListPage,{ "model": pageModel})
+                    }
+                },
+                Action {
+                    id: settingsButton
+                    iconName: "settings"
+                    objectName: "settings"
+                    text: i18n.tr("Settings")
+                    visible: sidebar.expanded
+                    onTriggered: pageStack.push(settingsPage);
+                },
+                Action {
+                    id: gotoButton
+                    iconName: "find"
+                    objectName:"Find"
+                    text: i18n.tr("Go To")
+                    visible: sidebar.expanded
+                    onTriggered: PopupUtils.open(Qt.resolvedUrl("GoToDialog.qml"), parent)
+                },
+                Action {
+                    id: unlockButton
+                    iconName: "lock"
+                    text: i18n.tr("Unlock full access")
+                    visible: pageModel.onlyAllowedPaths
+                    onTriggered: {
+                        console.log("Full access clicked")
+                        var authDialog = PopupUtils.open(Qt.resolvedUrl("AuthenticationDialog.qml"),
+                                                         folderListPage)
+
+                        authDialog.passwordEntered.connect(function(password) {
+                            if (pamAuthentication.validatePasswordToken(password)) {
+                                console.log("Authenticated for full access")
+                                pageModel.onlyAllowedPaths = false
+                            } else {
+                                PopupUtils.open(Qt.resolvedUrl("NotifyDialog.qml"), folderListPage,
+                                                {
+                                                    title: i18n.tr("Authentication failed")
+                                                })
+
+                                console.log("Could not authenticate")
+                            }
+                        })
+                    }
+                }
+            ]
         }
     }
 
-    head.actions: [
-        Action {
-            id: pasteButton
-            objectName: "paste"
-            iconName: "edit-paste"
-            // Translation message was implemented according to:
-            // http://developer.ubuntu.com/api/qml/sdk-14.04/Ubuntu.Components.i18n/
-            // It allows correct translation for languages with more than two plural forms:
-            // http://localization-guide.readthedocs.org/en/latest/l10n/pluralforms.html
-            text: i18n.tr("Paste %1 File", "Paste %1 Files", pageModel.clipboardUrlsCounter).arg(pageModel.clipboardUrlsCounter)
-            visible: pageModel.clipboardUrlsCounter > 0
-            onTriggered: {
-                console.log("Pasting to current folder items of count " + pageModel.clipboardUrlsCounter)
-                fileOperationDialog.startOperation(i18n.tr("Paste files"))
-                pageModel.paste()
-            }
-        },
-        Action {
-            id: clearClipboardButton
-            objectName: "clearClipboard"
-            iconName: "edit-clear"
-            text: i18n.tr("Clear clipboard")
-            visible: pageModel.clipboardUrlsCounter > 0
-            onTriggered: {
-                console.log("Clearing clipboard")
-                pageModel.clearClipboard()
-            }
-        },
-        Action {
-            id: optionsButton
-            iconName: "view-list-symbolic"
-            text: i18n.tr("Properties")
-            onTriggered: {
-                PopupUtils.open(Qt.resolvedUrl("ViewPopover.qml"), parent)
-            }
-        },
-        Action {
-            id: createNewFolder
-            objectName: "createFolder"
-            iconName: "add"
-            text: i18n.tr("New Folder")
-            onTriggered: {
-                print(text)
-                PopupUtils.open(createFolderDialog, folderListPage)
-            }
-        },
-        Action {
-            id: viewProperties
-            iconName: "info"
-            text: i18n.tr("Properties")
-            onTriggered: {
-                print(text)
-                PopupUtils.open(Qt.resolvedUrl("FileDetailsPopover.qml"), folderListPage,{ "model": pageModel})
-            }
-        },
-        Action {
-            id: settingsButton
-            iconName: "settings"
-            objectName: "settings"
-            text: i18n.tr("Settings")
-            visible: sidebar.expanded
-            onTriggered: pageStack.push(settingsPage);
-        },
-        Action {
-            id: gotoButton
-            iconName: "find"
-            objectName:"Find"
-            text: i18n.tr("Go To")
-            visible: sidebar.expanded
-            onTriggered: PopupUtils.open(Qt.resolvedUrl("GoToDialog.qml"), parent)
-        },
-        Action {
-            id: unlockButton
-            iconName: "lock"
-            text: i18n.tr("Unlock full access")
-            visible: pageModel.onlyAllowedPaths
-            onTriggered: {
-                console.log("Full access clicked")
-                var authDialog = PopupUtils.open(Qt.resolvedUrl("AuthenticationDialog.qml"),
-                                                 folderListPage)
-
-                authDialog.passwordEntered.connect(function(password) {
-                    if (pamAuthentication.validatePasswordToken(password)) {
-                        console.log("Authenticated for full access")
-                        pageModel.onlyAllowedPaths = false
-                    } else {
-                        PopupUtils.open(Qt.resolvedUrl("NotifyDialog.qml"), folderListPage,
-                                        {
-                                            title: i18n.tr("Authentication failed")
-                                        })
-
-                        console.log("Could not authenticate")
-                    }
-                })
-            }
-        }
-    ]
-    flickable: !sidebar.expanded ?
-                   (folderListView.visible ? folderListView.flickable : folderIconView.flickable) : null
-
     property variant fileView: folderListPage
     property bool showHiddenFiles: false
     property bool showingListView: folderListView.visible
@@ -158,6 +163,8 @@
 
     property FolderListSelection selectionManager: pageModel.selectionObject()
 
+    readonly property bool __anchorToHeader: sidebar.expanded
+
     onShowHiddenFilesChanged: {
         pageModel.showHiddenFiles = folderListPage.showHiddenFiles
     }
@@ -306,12 +313,12 @@
     PlacesSidebar {
         id: sidebar
         objectName: "placesSidebar"
-
-        //        anchors {
-        //            top: parent.top
-        //            bottom: parent.bottom
-        //            bottomMargin: units.gu(-2)
-        //        }
+        anchors {
+            left: mode === "left" ? parent.left : undefined
+            right: mode === "right" ? parent.right : undefined
+            top: folderListPage.header.bottom
+            bottom: parent.bottom
+        }
 
         expanded: showSidebar
     }
@@ -370,7 +377,7 @@
 
         folderListModel: pageModel
         anchors {
-            top: parent.top
+            top: __anchorToHeader ? folderListPage.header.bottom : parent.top
             bottom: bottomBar.top
             left: sidebar.right
             right: parent.right
@@ -386,7 +393,7 @@
 
         folderListModel: pageModel
         anchors {
-            top: parent.top
+            top: __anchorToHeader ? folderListPage.header.bottom : parent.top
             bottom: bottomBar.top
             left: sidebar.right
             right: parent.right
@@ -829,7 +836,7 @@
         } else if (file === "/") {
             iconPath = "/usr/share/icons/Humanity/devices/48/drive-harddisk.svg"
         } else if (file === userplaces.locationSamba) {
-          iconPath = "/usr/share/icons/Humanity/places/48/network_local.svg"
+            iconPath = "/usr/share/icons/Humanity/places/48/network_local.svg"
         }  else if (userplaces.isUserMountDirectory(file)) {
             // In context of Ubuntu Touch this means SDCard currently.
             iconPath = "/usr/share/icons/Humanity/devices/48/drive-removable-media.svg"
@@ -936,8 +943,8 @@
         if (model.isBrowsable) {
             console.log("browsable path="+model.filePath+" isRemote="+model.isRemote+" needsAuthentication="+model.needsAuthentication)
             if ((model.isReadable && model.isExecutable) ||
-                (model.isRemote && model.needsAuthentication) //in this case it is necessary to generate the signal needsAuthentication()
-                ) {
+                    (model.isRemote && model.needsAuthentication) //in this case it is necessary to generate the signal needsAuthentication()
+                    ) {
                 console.log("Changing to dir", model.filePath)
                 //prefer pageModel.cdIntoIndex() because it is not necessary to parse the path
                 //goTo(model.filePath)
@@ -956,7 +963,7 @@
             if (fileSelectorMode) {
                 selectionManager.select(model.index,false,true)
             } else {
-               openFile(model)
+                openFile(model)
             }
         }
     }
 
=== modified file 'src/app/qml/ui/PlacesPage.qml'
--- src/app/qml/ui/PlacesPage.qml	2016-01-18 10:32:34 +0000
+++ src/app/qml/ui/PlacesPage.qml	2016-06-09 11:18:31 +0000
@@ -23,11 +23,13 @@
 
 Page {
     id: root
-
-    title: i18n.tr("Places")
-    objectName: 'PlacesPage'
     // ADDED THIS PROPERTY FOR BUG #1341671  WORKAROUND
     property string testProperty: "justForAutopilotTests"
+    objectName: 'PlacesPage'
+
+    header: PageHeader {
+        title: i18n.tr("Places")
+    }
 
     Flickable {
         objectName: "placesFlickable"
@@ -116,5 +118,4 @@
             }
         }
     }
-
 }
 
=== modified file 'src/app/qml/ui/SettingsSheet.qml'
--- src/app/qml/ui/SettingsSheet.qml	2016-01-18 10:32:34 +0000
+++ src/app/qml/ui/SettingsSheet.qml	2016-06-09 11:18:31 +0000
@@ -28,16 +28,18 @@
  */
 Page {
     id: sheet
-    title: i18n.tr("Settings")
 
-    Component.onCompleted: {
-        sheet.__leftButton.text = i18n.tr("Close")
-        sheet.__foreground.style = Theme.createStyleComponent(Qt.resolvedUrl("../components/SuruSheetStyle.qml"), sheet)
+    header: PageHeader {
+        title: i18n.tr("Settings")
     }
 
     Column {
-        anchors.fill: parent
-        anchors.margins: units.gu(-1)
+        anchors {
+            left: parent.left
+            top: sheet.header.bottom
+            right: parent.right
+            bottom: parent.bottom
+        }
 
         Standard {
             text: i18n.tr("Show Advanced Features")