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

Proposed by Dan Chapman ξƒΏ on 2016-06-05
Status: Needs review
Proposed branch: lp:~dpniel/ubuntu-filemanager-app/new-listitems
Merge into: lp:ubuntu-filemanager-app
Prerequisite: lp:~dpniel/ubuntu-filemanager-app/new-page-header
Diff against target: 133 lines (+53/-27)
3 files modified
po/com.ubuntu.filemanager.pot (+1/-1)
src/app/qml/components/FolderListDelegate.qml (+27/-12)
src/app/qml/components/PlacesSidebar.qml (+25/-14)
To merge this branch: bzr merge lp:~dpniel/ubuntu-filemanager-app/new-listitems
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve on 2016-06-10
Alan Pope 🍺🐧🐱 πŸ¦„ 2016-06-05 Approve on 2016-06-09
Review via email: mp+296500@code.launchpad.net

Commit message

Migrate FolderListDelegate and Places delegate to new ListItem

Description of the change

Migrate FolderListDelegate and Places delegate to new ListItem

To post a comment you must log in.
review: Approve (continuous-integration)

LGTM! Thanks!

review: Approve

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) wrote :

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

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

Dan Chapman ξƒΏ (dpniel) wrote :

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

544. By Dan Chapman ξƒΏ on 2016-06-10

Fix pot conflicts

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: \n"9"Project-Id-Version: \n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2016-06-09 12:17+0100\n"11"POT-Creation-Date: 2016-06-10 14:34+0100\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
1515
=== 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 @@
17 */17 */
18import QtQuick 2.418import QtQuick 2.4
19import Ubuntu.Components 1.319import Ubuntu.Components 1.3
20import Ubuntu.Components.ListItems 1.3 as ListItem
21import org.nemomobile.folderlistmodel 1.020import org.nemomobile.folderlistmodel 1.0
2221
23ListItem.Subtitled {22ListItem {
24 objectName: "folder" + index23 objectName: "folder" + index
2524
26 property string fileName: model.fileName25 property string fileName: model.fileName
27 property string filePath: path26 property string filePath: path
2827
29 text: model.fileName28 height: layout.height
30 subText: itemDateAndSize(model)29 // Because Flickable is used over ListView??
3130 // we cannot set the highlight component so
32 property string path: fileView.folder + '/' + model.fileName31 // instead fudge it here with a rectangle.
33 iconSource: fileIcon(path, model)32 Rectangle {
3433 anchors.fill: parent
35 progression: model.isBrowsable34 color: UbuntuColors.silk
36 iconFrame: false35 visible: model.isSelected
3736 }
38 selected: model.isSelected37
38 ListItemLayout {
39 id: layout
40 title.text: model.fileName
41 subtitle.text: itemDateAndSize(model)
42
43 Icon {
44 property string path: fileView.folder + '/' + model.fileName
45 source: fileIcon(path, model)
46 height: units.gu(5); width: height
47 SlotsLayout.position: SlotsLayout.Leading
48 }
49
50 ProgressionSlot{
51 visible: model.isBrowsable
52 }
53 }
39}54}
4055
=== 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 @@
6060
61 model: userplaces61 model: userplaces
6262
63 delegate: Standard {63 delegate: ListItem {
64 objectName: "place" + folderDisplayName(path).replace(/ /g,'')64 objectName: "place" + folderDisplayName(path).replace(/ /g,'')
65 text: folderDisplayName(path)65 divider.visible: !collapsed
66 __foregroundColor: "black"66 height: layout.height
67
68 onClicked: {
69 goTo(model.path)
70 }
71
72 Rectangle {
73 id: selectedHighlight
74 anchors.fill: parent
75 color: UbuntuColors.silk
76 visible: folder === path
77 }
6778
68 Image {79 Image {
69 anchors {80 anchors {
@@ -75,25 +86,25 @@
75 width: height86 width: height
7687
77 source: Qt.resolvedUrl("../icons/arrow.png")88 source: Qt.resolvedUrl("../icons/arrow.png")
78 opacity: selected && collapsed ? 1 : 089 opacity: selectedHighlight.visible && collapsed ? 1 : 0
7990
80 Behavior on opacity {91 Behavior on opacity {
81 UbuntuNumberAnimation {}92 UbuntuNumberAnimation {}
82 }93 }
83 }94 }
8495
85 iconSource: model.icon || fileIcon(model.path) //using only path, model is null96 ListItemLayout {
97 id: layout
98 height: units.gu(5)
99 title.text: folderDisplayName(path)
86100
87 onClicked: {101 Icon {
88 goTo(model.path)102 height: units.gu(4)
103 width: height
104 source: model.icon || fileIcon(model.path)
105 SlotsLayout.position: SlotsLayout.Leading
106 }
89 }107 }
90
91 height: units.gu(5)
92 showDivider: !collapsed
93
94 // This refers to a parent FolderListPage.folder
95 selected: folder === path
96 iconFrame: false
97 }108 }
98 }109 }
99 }110 }

Subscribers

People subscribed via source and target branches