Readded icons

support/utils.cpp

@@ -687,8 +687,12 @@ QString Utils::cacheDir(const QString &sub, bool create)
     return userDir(QDesktopServices::storageLocation(QDesktopServices::CacheLocation)+constDirSep, sub, create);
     #else
     QString env = qgetenv("XDG_CACHE_HOME");
+    #ifdef ENABLE_UBUNTU
+    return dataDir(".cache", create);
+    #else
     return userDir((env.isEmpty() ? QDir::homePath() + "/.cache" : env) + constDirSep+FOLDER_NAME+constDirSep, sub, create);
     #endif
+    #endif
 }
 
 bool Utils::moveFile(const QString &from, const QString &to)

ubuntu/qml/cantata/AlbumPage.qml

@@ -94,54 +94,9 @@ Page {
         delegate: PlayQueueListItemDelegate {
             text: model.mainText
             subText: model.subText
-//            icon: model.image
+            iconSource: !(model.image.indexOf("qrc:") === 0)?"file:" + model.image:model.image
 //           progression: true //Removed due to the app showdown, will be implemented later
 
-//            Image {
-//                id: addImage
-//                width: units.gu(3)
-//                height: units.gu(3)
-//                smooth: true
-//                source: "../../icons/toolbar/add.svg"
-//                opacity: 0.9
-
-//                anchors {
-//                    right: parent.right
-//                    rightMargin: units.gu(4)
-//                    verticalCenter: parent.verticalCenter
-//                }
-
-//                MouseArea {
-//                    onClicked: {
-//                        backend.addAlbum(index, false)
-//                        pageStack.push(currentlyPlayingPage)
-//                    }
-//                    anchors.fill: parent
-//                    preventStealing: true
-//                }
-//            }
-//            Image {
-//                width: units.gu(3)
-//                height: units.gu(3)
-//                smooth: true
-//                source: "../../icons/toolbar/media-playback-start-light.svg"
-//                opacity: 0.9
-
-//                anchors {
-//                    right: parent.right
-//                    rightMargin: units.gu(0)
-//                    verticalCenter: parent.verticalCenter
-//                }
-
-//                MouseArea {
-//                    onClicked: {
-//                        backend.addAlbum(index, true)
-//                        pageStack.push(currentlyPlayingPage)
-//                    }
-//                    anchors.fill: parent
-//                    preventStealing: true
-//                }
-//            }
         }
     }
 

ubuntu/qml/cantata/PlayQueueListItemDelegate.qml

@@ -85,25 +85,29 @@ Empty {
      */
     property alias subText: subLabel.text
 
-    Image {
-        id: iconImage
-        width: units.gu(3)
-        height: units.gu(3)
-        smooth: true
-        source: "../../icons/toolbar/add.svg"
-        opacity: 0.9
+    property alias iconSource: iconImage.source
 
+    UbuntuShape {
+        id: iconShape
+        width: units.gu(5.5)
+        height: units.gu(5.5)
         anchors {
             left: parent.left
             leftMargin: units.gu(1)
             verticalCenter: parent.verticalCenter
         }
+
+        image: Image {
+            id: iconImage
+            smooth: true
+            opacity: 0.9
+        }
     }
 
     Item  {
         id: middleVisuals
         anchors {
-            left: iconImage.right
+            left: iconShape.right
             right: addImage.left
             leftMargin: units.gu(1)
             rightMargin: units.gu(1)