From 9864821c38cbd3c2152094b49c71e0a6c3b295db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <mgraesslin@kde.org>
Date: Fri, 6 Dec 2013 15:28:36 +0100
Subject: [PATCH] [kwin] Use QIconItem in informative tabbox for the icon

---
 .../clients/informative/contents/ui/main.qml    | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/tabbox/qml/clients/informative/contents/ui/main.qml b/tabbox/qml/clients/informative/contents/ui/main.qml
index 071b10a538..da3193c7d7 100644
--- a/tabbox/qml/clients/informative/contents/ui/main.qml
+++ b/tabbox/qml/clients/informative/contents/ui/main.qml
@@ -27,7 +27,6 @@ Item {
     property int screenHeight : 0
     property bool allDesktops: true
     property string longestCaption: ""
-    property int imagePathPrefix: (new Date()).getTime()
     property int optimalWidth: listView.maxRowWidth
     property int optimalHeight: listView.rowHeight * listView.count + background.topMargin + background.bottomMargin
     property bool canStretchX: true
@@ -50,11 +49,6 @@ Item {
     function setModel(model) {
         listView.model = model;
         listView.maxRowWidth = listView.calculateMaxRowWidth();
-        listView.imageId++;
-    }
-
-    function modelChanged() {
-        listView.imageId++;
     }
 
     /**
@@ -91,15 +85,12 @@ Item {
             id: delegateItem
             width: listView.width
             height: listView.rowHeight
-            Image {
+            QIconItem {
                 id: iconItem
-                source: "image://client/" + index + "/" + informativeTabBox.imagePathPrefix + "-" + listView.imageId + (index == listView.currentIndex ? "/selected" : "/disabled")
+                icon: model.icon
                 width: 32
                 height: 32
-                sourceSize {
-                    width: 32
-                    height: 32
-                }
+                state: index == listView.currentIndex ? QIconItem.ActiveState : QIconItem.DisabledState
                 anchors {
                     verticalCenter: parent.verticalCenter
                     left: parent.left
@@ -189,8 +180,6 @@ Item {
         // the maximum text width + icon item width (32 + 4 margin) + margins for hover item + margins for background
         property int maxRowWidth: calculateMaxRowWidth()
         property int rowHeight: calcRowHeight()
-        // used for image provider URL to trick Qt into reloading icons when the model changes
-        property int imageId: 0
         anchors {
             fill: parent
             topMargin: background.topMargin