Merge lp:~ibelieve/ubuntu-filemanager-app/fixed-home-icon into lp:ubuntu-filemanager-app

[Michael Spencer]

Fixed the missing home folder icon and also removed the UbuntuShape from around the file/folder icons

Fixed the missing home folder icon and also removed the UbuntuShape from around the file/folder icons.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:92
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/75/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/220
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/75
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/75
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/25

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

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:92
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/84/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/242
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/84
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/84
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/34

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

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:92
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/85/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/243
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/85
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/85
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/35

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

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:92
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/86/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/246/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/86
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/86
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/36

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

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'FolderListDelegate.qml'
--- FolderListDelegate.qml	2013-08-07 00:20:36 +0000
+++ FolderListDelegate.qml	2013-11-23 15:50:37 +0000
@@ -32,4 +32,5 @@
     property string path: fileView.path + '/' + model.fileName
     icon: fileIcon(path, model.isDir)
     progression: model.isDir
+    iconFrame: false
 }

=== modified file 'FolderListPage.qml'
--- FolderListPage.qml	2013-10-10 22:34:46 +0000
+++ FolderListPage.qml	2013-11-23 15:50:37 +0000
@@ -111,35 +111,34 @@
     // TODO: Remove isDir parameter and use new model functions
     function fileIcon(file, isDir) {
         file = file.replace(pageModel.homePath(), "~")
+        var iconPath = isDir ? "/usr/share/icons/Humanity/places/48/folder.svg"
+                             : "/usr/share/icons/Humanity/mimes/48/empty.svg"
+
         if (file === "~") {
-            return "/usr/share/icons/ubuntu-mono-dark/places/48/folder-home.svg"
+            iconPath = "icons/folder-home.svg"
         } else if (file === i18n.tr("~/Desktop")) {
-            return "/usr/share/icons/Humanity/places/48/user-desktop.svg"
+            iconPath = "/usr/share/icons/Humanity/places/48/user-desktop.svg"
         } else if (file === i18n.tr("~/Documents")) {
-            return "/usr/share/icons/Humanity/places/48/folder-documents.svg"
+            iconPath = "/usr/share/icons/Humanity/places/48/folder-documents.svg"
         } else if (file === i18n.tr("~/Downloads")) {
-            return "/usr/share/icons/Humanity/places/48/folder-downloads.svg"
+            iconPath = "/usr/share/icons/Humanity/places/48/folder-downloads.svg"
         } else if (file === i18n.tr("~/Music")) {
-            return "/usr/share/icons/Humanity/places/48/folder-music.svg"
+            iconPath = "/usr/share/icons/Humanity/places/48/folder-music.svg"
         } else if (file === i18n.tr("~/Pictures")) {
-            return "/usr/share/icons/Humanity/places/48/folder-pictures.svg"
+            iconPath = "/usr/share/icons/Humanity/places/48/folder-pictures.svg"
         } else if (file === i18n.tr("~/Public")) {
-            return "/usr/share/icons/Humanity/places/48/folder-publicshare.svg"
+            iconPath = "/usr/share/icons/Humanity/places/48/folder-publicshare.svg"
         } else if (file === i18n.tr("~/Programs")) {
-            return "/usr/share/icons/Humanity/places/48/folder-system.svg"
+            iconPath = "/usr/share/icons/Humanity/places/48/folder-system.svg"
         } else if (file === i18n.tr("~/Templates")) {
-            return "/usr/share/icons/Humanity/places/48/folder-templates.svg"
+            iconPath = "/usr/share/icons/Humanity/places/48/folder-templates.svg"
         } else if (file === i18n.tr("~/Videos")) {
-            return "/usr/share/icons/Humanity/places/48/folder-videos.svg"
+            iconPath = "/usr/share/icons/Humanity/places/48/folder-videos.svg"
         } else if (file === "/") {
-            return "/usr/share/icons/Humanity/devices/48/drive-harddisk.svg"
+            iconPath = "/usr/share/icons/Humanity/devices/48/drive-harddisk.svg"
         }
 
-        if (isDir) {
-            return "/usr/share/icons/Humanity/places/48/folder.svg"
-        } else {
-            return "/usr/share/icons/Humanity/mimes/48/empty.svg"
-        }
+        return Qt.resolvedUrl(iconPath)
     }
 
     function folderName(folder) {

=== modified file 'PlacesPopover.qml'
--- PlacesPopover.qml	2013-08-30 16:12:41 +0000
+++ PlacesPopover.qml	2013-11-23 15:50:37 +0000
@@ -130,6 +130,8 @@
                 }
 
                 selected: folder === path
+                iconFrame: false
+                showDivider: index < (placesList.count - 1)
             }
         }
     }

=== modified file 'PlacesSidebar.qml'
--- PlacesSidebar.qml	2013-09-17 16:07:50 +0000
+++ PlacesSidebar.qml	2013-11-23 15:50:37 +0000
@@ -98,6 +98,7 @@
                 height: units.gu(5)
 
                 selected: folder === path
+                iconFrame: false
             }
         }
     }

=== added file 'icons/folder-home.svg'
--- icons/folder-home.svg	1970-01-01 00:00:00 +0000
+++ icons/folder-home.svg	2013-11-23 15:50:37 +0000
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="svg3478" xmlns="http://www.w3.org/2000/svg" height="48" width="48" version="1.0" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <defs id="defs3480">
+  <linearGradient id="linearGradient2435" y2="33.955" gradientUnits="userSpaceOnUse" x2="15.215" y1="22.292" x1="11.566">
+   <stop id="stop2687" style="stop-color:#fff;stop-opacity:.27451" offset="0"/>
+   <stop id="stop2689" style="stop-color:#fff;stop-opacity:.078431" offset="1"/>
+  </linearGradient>
+  <radialGradient id="radialGradient2438" gradientUnits="userSpaceOnUse" cy="8.3021" cx="7.2647" gradientTransform="matrix(0 1.208 -1.6272 0 26.372 8.2665)" r="20.98">
+   <stop id="stop2693" style="stop-color:#fff;stop-opacity:0.4" offset="0"/>
+   <stop id="stop2695" style="stop-color:#fff;stop-opacity:0" offset="1"/>
+  </radialGradient>
+  <linearGradient id="linearGradient2441" y2="36.658" gradientUnits="userSpaceOnUse" x2="22.809" gradientTransform="matrix(1.1447 0 0 .99775 -3.4661 1.0988)" y1="49.629" x1="22.935">
+   <stop id="stop2661" style="stop-color:#0a0a0a;stop-opacity:.498" offset="0"/>
+   <stop id="stop2663" style="stop-color:#0a0a0a;stop-opacity:0" offset="1"/>
+  </linearGradient>
+  <linearGradient id="linearGradient2446" y2="15.944" xlink:href="#linearGradient3390-178-986-453" gradientUnits="userSpaceOnUse" x2="65.34" gradientTransform="translate(-53.765 -.11419)" y1="45.114" x1="82.453"/>
+  <radialGradient id="radialGradient2444" gradientUnits="userSpaceOnUse" cy="14.113" cx="63.969" gradientTransform="matrix(1.5647 -9.5143e-8 6.1772e-8 1.0159 -86.213 8.1461)" r="23.097">
+   <stop id="stop3618" style="stop-color:#f0c178" offset="0"/>
+   <stop id="stop3270" style="stop-color:#e18941" offset=".5"/>
+   <stop id="stop3620" style="stop-color:#ec4f18" offset="1"/>
+  </radialGradient>
+  <radialGradient id="radialGradient7600-312" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.032130 0 0 .037059 23.363 25.412)" r="117.14">
+   <stop id="stop2681" offset="0"/>
+   <stop id="stop2683" style="stop-opacity:0" offset="1"/>
+  </radialGradient>
+  <radialGradient id="radialGradient7598-526" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.032130 0 0 .037059 24.637 25.412)" r="117.14">
+   <stop id="stop2675" offset="0"/>
+   <stop id="stop2677" style="stop-opacity:0" offset="1"/>
+  </radialGradient>
+  <linearGradient id="linearGradient7596-975" y2="609.51" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.082840 0 0 .037059 -5.9408 25.412)" y1="366.65" x1="302.86">
+   <stop id="stop2667" style="stop-opacity:0" offset="0"/>
+   <stop id="stop2669" offset=".5"/>
+   <stop id="stop2671" style="stop-opacity:0" offset="1"/>
+  </linearGradient>
+  <radialGradient id="radialGradient2455" gradientUnits="userSpaceOnUse" cy="5.0172" cx="3" gradientTransform="matrix(-1.2749e-8 1.7143 -2.1593 -1.46e-8 12.809 2.857)" r="21">
+   <stop id="stop3486" style="stop-color:#bdbdbd" offset="0"/>
+   <stop id="stop3488" style="stop-color:#d0d0d0" offset="1"/>
+  </radialGradient>
+  <linearGradient id="linearGradient2453" y2="16.19" gradientUnits="userSpaceOnUse" x2="62.989" gradientTransform="translate(-50.941)" y1="13.183" x1="62.989">
+   <stop id="stop6406" style="stop-color:#f9f9f9" offset="0"/>
+   <stop id="stop6408" style="stop-color:#c9c9c9" offset="1"/>
+  </linearGradient>
+  <linearGradient id="linearGradient3390-178-986-453">
+   <stop id="stop3624" style="stop-color:#bb2b12" offset="0"/>
+   <stop id="stop3626" style="stop-color:#cd7233" offset="1"/>
+  </linearGradient>
+  <linearGradient id="linearGradient3474" y2="20" xlink:href="#linearGradient3390-178-986-453" gradientUnits="userSpaceOnUse" x2="14.575" y1="44.578" x1="25.289"/>
+ </defs>
+ <g id="layer1">
+  <g id="g3531">
+   <path id="path3468" style="stroke-linejoin:round;stroke:url(#radialGradient2455);stroke-linecap:round;fill:url(#linearGradient2453)" d="m3.5062 8.5c-0.6902 0.0077-1.0004 0.3421-1.0004 1 0 5.514 0.0263 9.74-0.0058 14.75 1.4355 0 43-3.699 43-5.292v-6.451c0-0.658-0.554-1.008-1.244-1h-20.256c-2.047 0-3.499-3.007-5-3.007h-15.494 0.0002z"/>
+   <g id="g7591" style="opacity:.4" transform="matrix(.95833 0 0 .66667 1 15)">
+    <rect id="rect4173" style="fill:url(#linearGradient7596-975)" height="9" width="40" y="39" x="4"/>
+    <path id="path5058" style="fill:url(#radialGradient7598-526)" d="m44 39v9c1.655 0.017 4-2.017 4-4.501s-1.846-4.499-4-4.499z"/>
+    <path id="path5018" style="fill:url(#radialGradient7600-312)" d="m4 39v9c-1.6546 0.017-4-2.017-4-4.501s1.8464-4.499 4-4.499z"/>
+   </g>
+   <path id="path3388" style="stroke-linejoin:round;stroke:url(#linearGradient2446);stroke-linecap:round;fill:url(#radialGradient2444)" d="m2.1629 16.525c-1.0728 0.124-0.4998 1.402-0.5853 2.121 0.3925 8.47 0.7889 16.77 1.179 25.24 0.3418 0.966 1.5944 0.471 2.3881 0.594h39.58c1.09-0.107 0.637-1.408 0.79-2.153 0.393-8.47 0.789-16.769 1.179-25.239-0.251-0.955-1.519-0.424-2.263-0.563h-42.268-0.0001z"/>
+   <path id="path6127" style="opacity:.4;fill:url(#linearGradient2441)" d="m2.0582 16.065l43.897 0.001c0.634 0 1.045 0.444 1.045 0.997l-1.244 26.939c0 0.553-0.511 0.998-1.145 0.998h-41.209c-0.6341 0-1.1447-0.445-1.1447-0.998l-1.2442-26.939c0-0.553 0.411-0.998 1.0451-0.998z"/>
+   <path id="path2435" style="stroke-linejoin:round;stroke:url(#radialGradient2438);stroke-linecap:round;fill:none" d="m46.5 17.5h-44l1.1562 24.531"/>
+   <path id="path3455" style="fill:url(#linearGradient2435)" d="m45.75 16c-14.55 0.073-29.105-0.021-43.656 0-1.807 0.411-0.8347 2.467-0.9727 3.772 0.2221 4.163 0.3231 8.344 0.6205 12.496 15-2.362 29.926-4.607 44.664-7.049 0.781-2.587 0.788-5.671 0.658-8.429-0.23-0.505-0.787-0.801-1.314-0.79z"/>
+   <rect id="rect3562" style="display:block;fill:#eda374" rx="1" ry="1" height="2" width="13" y="10" x="5"/>
+  </g>
+  <path id="path3521" style="opacity:.4;fill-rule:evenodd;stroke-width:3pt;fill:#fff" d="m13 32v10h10.033v-9h6v9h5.967v-10h4l-15-11-15 11h4z"/>
+  <path id="path3521-7" style="opacity:.9;fill-rule:evenodd;stroke-width:3pt;fill:url(#linearGradient3474)" d="m13 31v10h10.033v-9h6v9h5.967v-10h4l-15-11-15 11h4z"/>
+ </g>
+</svg>