Ubuntu File Manager App

Merge lp:~vthompson/ubuntu-filemanager-app/fix-1275061 into lp:ubuntu-filemanager-app

  1. fix-1275061
  2. Merge into trunk
Proposed by Victor Thompson
Status: Merged
Approved by: Arto Jalkanen
Approved revision: 118
Merged at revision: 128
Proposed branch: lp:~vthompson/ubuntu-filemanager-app/fix-1275061
Merge into: lp:ubuntu-filemanager-app
Diff against target: 38 lines (+3/-3)
3 files modified
FolderListDelegate.qml (+1/-1)
PlacesPopover.qml (+1/-1)
PlacesSidebar.qml (+1/-1)
To merge this branch: bzr merge lp:~vthompson/ubuntu-filemanager-app/fix-1275061
Reviewer Review Type Date Requested Status
Arto Jalkanen Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+204331@code.launchpad.net

Commit message

* Use ListItem iconSource since the icon property is deprecated.

Description of the change

Use ListItem iconSource since the icon property is deprecated.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:118
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/111/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/895
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/111
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/111
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/61

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/111/rebuild

review: Approve (continuous-integration)
Revision history for this message
Arto Jalkanen (ajalkane) wrote :

Looks proper, thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'FolderListDelegate.qml'
2--- FolderListDelegate.qml 2013-11-23 15:42:58 +0000
3+++ FolderListDelegate.qml 2014-01-31 19:52:49 +0000
4@@ -30,7 +30,7 @@
5 subText: Qt.formatDateTime(model.modifiedDate, Qt.DefaultLocaleShortDate) + (!model.isDir ? ", " + fileSize : "")
6
7 property string path: fileView.path + '/' + model.fileName
8- icon: fileIcon(path, model.isDir)
9+ iconSource: fileIcon(path, model.isDir)
10 progression: model.isDir
11 iconFrame: false
12 }
13
14=== modified file 'PlacesPopover.qml'
15--- PlacesPopover.qml 2013-12-03 19:32:35 +0000
16+++ PlacesPopover.qml 2014-01-31 19:52:49 +0000
17@@ -124,7 +124,7 @@
18 color: selected ? UbuntuColors.orange : Theme.palette.normal.overlayText
19 }
20
21- icon: model.icon || fileIcon(model.path, true)
22+ iconSource: model.icon || fileIcon(model.path, true)
23
24 onClicked: {
25 PopupUtils.close(root)
26
27=== modified file 'PlacesSidebar.qml'
28--- PlacesSidebar.qml 2013-11-23 15:42:58 +0000
29+++ PlacesSidebar.qml 2014-01-31 19:52:49 +0000
30@@ -89,7 +89,7 @@
31 text: folderName(path)
32 // color: Theme.palette.normal.overlayText
33 // }
34- icon: model.icon || fileIcon(model.path, true)
35+ iconSource: model.icon || fileIcon(model.path, true)
36
37 onClicked: {
38 goTo(model.path)

Subscribers

People subscribed via source and target branches