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

[Dan Chapman ]

Migrate FolderListDelegate and Places delegate to new ListItem

Migrate FolderListDelegate and Places delegate to new ListItem

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

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

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

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

LGTM! Thanks!

review: Approve

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

FAILED: Autolanding.
More details in the following jenkins job:
https://core-apps-jenkins.ubuntu.com/job/filemanager-app-autolanding/44/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/5756/console

review: Needs Fixing (continuous-integration)

[Dan Chapman  (dpniel)]

meh. pot file conflict. Probably from the updated page-header branch.

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Doh, can you fix and we'll land it?

[Dan Chapman  (dpniel)]

forgot to push it last night. Doing it now :-D

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

544. By Dan Chapman  on 2016-06-10

Fix pot conflicts

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

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

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

review: Approve (continuous-integration)

Unmerged revisions

544. By Dan Chapman  on 2016-06-10

Fix pot conflicts

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

Migrate FolderListDelegate and Places delegate to new ListItem

=== modified file 'po/com.ubuntu.filemanager.pot'
--- po/com.ubuntu.filemanager.pot	2016-06-09 11:17:57 +0000
+++ po/com.ubuntu.filemanager.pot	2016-06-10 13:37:51 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-09 12:17+0100\n"
+"POT-Creation-Date: 2016-06-10 14:34+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"
 
=== modified file 'src/app/qml/components/FolderListDelegate.qml'
--- src/app/qml/components/FolderListDelegate.qml	2016-01-18 10:32:34 +0000
+++ src/app/qml/components/FolderListDelegate.qml	2016-06-10 13:37:51 +0000
@@ -17,23 +17,38 @@
  */
 import QtQuick 2.4
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.3 as ListItem
 import org.nemomobile.folderlistmodel 1.0
 
-ListItem.Subtitled {
+ListItem {
     objectName: "folder" + index
 
     property string fileName: model.fileName
     property string filePath: path
 
-    text: model.fileName
-    subText: itemDateAndSize(model)
-
-    property string path: fileView.folder + '/' + model.fileName
-    iconSource: fileIcon(path, model)
-
-    progression: model.isBrowsable
-    iconFrame: false
-
-    selected: model.isSelected
+    height: layout.height
+    // Because Flickable is used over ListView??
+    // we cannot set the highlight component so
+    // instead fudge it here with a rectangle.
+    Rectangle {
+        anchors.fill: parent
+        color: UbuntuColors.silk
+        visible: model.isSelected
+    }
+
+    ListItemLayout {
+        id: layout
+        title.text: model.fileName
+        subtitle.text: itemDateAndSize(model)
+
+        Icon {
+            property string path: fileView.folder + '/' + model.fileName
+            source: fileIcon(path, model)
+            height: units.gu(5); width: height
+            SlotsLayout.position: SlotsLayout.Leading
+        }
+
+        ProgressionSlot{
+            visible: model.isBrowsable
+        }
+    }
 }
 
=== modified file 'src/app/qml/components/PlacesSidebar.qml'
--- src/app/qml/components/PlacesSidebar.qml	2016-04-07 17:27:53 +0000
+++ src/app/qml/components/PlacesSidebar.qml	2016-06-10 13:37:51 +0000
@@ -60,10 +60,21 @@
 
             model: userplaces
 
-            delegate: Standard {
+            delegate: ListItem {
                 objectName: "place" + folderDisplayName(path).replace(/ /g,'')
-                text: folderDisplayName(path)
-                __foregroundColor: "black"
+                divider.visible: !collapsed
+                height: layout.height
+
+                onClicked: {
+                    goTo(model.path)
+                }
+
+                Rectangle {
+                    id: selectedHighlight
+                    anchors.fill: parent
+                    color: UbuntuColors.silk
+                    visible: folder === path
+                }
 
                 Image {
                     anchors {
@@ -75,25 +86,25 @@
                     width: height
 
                     source: Qt.resolvedUrl("../icons/arrow.png")
-                    opacity: selected && collapsed ? 1 : 0
+                    opacity: selectedHighlight.visible && collapsed ? 1 : 0
 
                     Behavior on opacity {
                         UbuntuNumberAnimation {}
                     }
                 }
 
-                iconSource: model.icon || fileIcon(model.path) //using only path, model is null
+                ListItemLayout {
+                    id: layout
+                    height: units.gu(5)
+                    title.text: folderDisplayName(path)
 
-                onClicked: {
-                    goTo(model.path)
+                    Icon {
+                        height: units.gu(4)
+                        width: height
+                        source: model.icon || fileIcon(model.path)
+                        SlotsLayout.position: SlotsLayout.Leading
+                    }
                 }
-
-                height: units.gu(5)
-                showDivider: !collapsed
-
-                // This refers to a parent FolderListPage.folder
-                selected: folder === path
-                iconFrame: false
             }
         }
     }