[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-workspace] plasma/generic/applets/devicenotifier/package/contents/ui: Use default
From:       Jacopo De Simoi <wilderkde () gmail ! com>
Date:       2012-12-04 10:45:51
Message-ID: 20121204104551.43919A6091 () git ! kde ! org
[Download RAW message or body]

Git commit f8299d2496253ad0b58624d9900b25ea59e38728 by Jacopo De Simoi.
Committed on 04/12/2012 at 11:45.
Pushed by jacopods into branch 'master'.

Use default component for the highlighters

M  +1    -18   plasma/generic/applets/devicenotifier/package/contents/ui/De=
viceItem.qml
M  +2    -19   plasma/generic/applets/devicenotifier/package/contents/ui/de=
vicenotifier.qml

http://commits.kde.org/kde-workspace/f8299d2496253ad0b58624d9900b25ea59e387=
28

diff --git a/plasma/generic/applets/devicenotifier/package/contents/ui/Devi=
ceItem.qml b/plasma/generic/applets/devicenotifier/package/contents/ui/Devi=
ceItem.qml
index 0d46169..3635d8e 100644
--- a/plasma/generic/applets/devicenotifier/package/contents/ui/DeviceItem.=
qml
+++ b/plasma/generic/applets/devicenotifier/package/contents/ui/DeviceItem.=
qml
@@ -265,7 +265,7 @@ Item {
             height: expanded ? ((actionIconHeight+(2*actionVerticalMargins=
))*model.length)+anchors.topMargin : 0
             opacity: expanded ? 1 : 0
             delegate: actionItem
-            highlight: actionHighlighter
+            highlight: PlasmaComponents.Highlight{}
             Behavior on opacity { NumberAnimation { duration: 150 } }
         }
 =

@@ -278,23 +278,6 @@ Item {
                 predicate: modelData["predicate"]
             }
         }
-
-        Component {
-            id: actionHighlighter
-
-            PlasmaCore.FrameSvgItem {
-                width: actionsList.width
-                imagePath: "widgets/viewitem"
-                prefix: "hover"
-                opacity: 0
-                Behavior on opacity {
-                    NumberAnimation {
-                        duration: 250
-                        easing.type: Easing.OutQuad
-                    }
-                }
-            }
-        }
     }
 =

     function makeCurrent()
diff --git a/plasma/generic/applets/devicenotifier/package/contents/ui/devi=
cenotifier.qml b/plasma/generic/applets/devicenotifier/package/contents/ui/=
devicenotifier.qml
index f8728d0..e4ebd64 100644
--- a/plasma/generic/applets/devicenotifier/package/contents/ui/devicenotif=
ier.qml
+++ b/plasma/generic/applets/devicenotifier/package/contents/ui/devicenotif=
ier.qml
@@ -231,9 +231,8 @@ Item {
                 property int currentExpanded: -1
                 property bool itemClicked: true
                 delegate: deviceItem
-                highlight: deviceHighlighter
-                highlightMoveDuration: 250
-                highlightMoveSpeed: 1
+                highlight: PlasmaComponents.Highlight{}
+
                 //this is needed to make SectionScroller actually work
                 //acceptable since one doesn't have a billion of devices
                 cacheBuffer: 1000
@@ -353,22 +352,6 @@ Item {
             }
         }
 =

-        Component {
-            id: deviceHighlighter
-
-            PlasmaCore.FrameSvgItem {
-                imagePath: "widgets/viewitem"
-                prefix: "hover"
-                opacity: 0
-                Behavior on opacity {
-                    NumberAnimation {
-                        duration: 250
-                        easing.type: Easing.OutQuad
-                    }
-                }
-            }
-        }
-
         PlasmaCore.SvgItem {
             id: statusBarSeparator
             svg: lineSvg
[prev in list] [next in list] [prev in thread] [next in thread]