1 files changed, 31 insertions, 41 deletions

diff --git a/rockwork/qml/InstalledAppDelegate.qml b/rockwork/qml/InstalledAppDelegate.qml
index 89f6ba8..e910a40 100644
--- a/rockwork/qml/InstalledAppDelegate.qml
+++ b/rockwork/qml/InstalledAppDelegate.qml
@@ -1,7 +1,6 @@
-import QtQuick 2.4
-import QtQuick.Layouts 1.1
-import Ubuntu.Components 1.3
-import RockWork 1.0
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import RockPool 1.0
 
 ListItem {
     id: root
@@ -17,71 +16,62 @@ ListItem {
     signal deleteApp();
     signal configureApp();
 
-    leadingActions: ListItemActions {
-        actions: [
-            Action {
-                visible: !root.isSystemApp
-                iconName: "delete"
-                onTriggered: {
-                    root.deleteApp();
-                }
+    menu: ContextMenu {
+        MenuItem {
+            visible: !root.isSystemApp
+            text: "Delete"
+            onClicked: {
+                root.deleteApp();
             }
-        ]
-    }
-
-    trailingActions: ListItemActions {
-        actions: [
-            Action {
-                visible: root.hasSettings
-                iconName: "settings"
-                onTriggered: {
-                    print("settings triggered")
-                    root.configureApp();
-                }
+        }
+        MenuItem {
+            visible: root.hasSettings
+            text: "Settings"
+            onClicked: {
+                print("Settings triggered")
+                root.configureApp();
             }
-        ]
+        }
     }
 
-    RowLayout {
+    Row {
         anchors {
             fill: parent
-            margins: units.gu(1)
+            //margins: units.gu(1)
         }
-        spacing: units.gu(1)
+        //spacing: units.gu(1)
 
         SystemAppIcon {
-            Layout.fillHeight: true
-            Layout.preferredWidth: height
             isSystemApp: root.isSystemApp
             uuid: root.uuid
             iconSource: root.iconSource
         }
 
-        ColumnLayout {
-            Layout.fillWidth: true
+        Column {
+            width: parent.width
             Label {
                 text: root.name
-                Layout.fillWidth: true
+                width: parent.width
             }
 
             Label {
                 text: root.vendor
-                Layout.fillWidth: true
-                fontSize: "small"
+                width: parent.width
+                font.pixelSize: Theme.fontSizeSmall
             }
         }
 
         Item {
             id: grip
-            Layout.fillHeight: true
-            Layout.preferredWidth: height
+//            Layout.fillHeight: true
+//            Layout.preferredWidth: height
             opacity: (root.contentMoving || root.swiped || root.dragging) ? 0 : 1
-            Behavior on opacity { UbuntuNumberAnimation {} }
-            Icon {
-                width: units.gu(3)
+            Behavior on opacity { NumberAnimation {} }
+            IconButton {
+                //width: units.gu(3)
                 height: width
                 anchors.centerIn: parent
-                name: "grip-large"
+                icon.source: "image://theme/icon-m-gesture"
             }
         }
     }