[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: Fix anchoring
From:       David Edmundson <kde () davidedmundson ! co ! uk>
Date:       2014-02-10 16:41:34
Message-ID: E1WCtvK-0007nr-Rr () scm ! kde ! org
[Download RAW message or body]

Git commit f51bf11299cf15d82d49ee5704f0acd2b07f0b82 by David Edmundson.
Committed on 10/02/2014 at 16:38.
Pushed by davidedmundson into branch 'master'.

Fix anchoring errors

M  +17   -21   plasma/generic/applets/devicenotifier/package/contents/ui/DeviceItem.qml


http://commits.kde.org/kde-workspace/f51bf11299cf15d82d49ee5704f0acd2b07f0b82

diff --git a/plasma/generic/applets/devicenotifier/package/contents/ui/DeviceItem.qml \
b/plasma/generic/applets/devicenotifier/package/contents/ui/DeviceItem.qml index \
                348192e..2b1bf3f 100644
--- a/plasma/generic/applets/devicenotifier/package/contents/ui/DeviceItem.qml
+++ b/plasma/generic/applets/devicenotifier/package/contents/ui/DeviceItem.qml
@@ -130,8 +130,9 @@ Item {
                 enabled: deviceItem.state == 0
             }
 
-            Item {
+            PlasmaCore.ToolTipArea {
                 height:freeSpaceBar.height
+                subText: i18nc("@info:status Free disk space", "%1 free", \
sdSource.data[udi]["Free Space Text"])  anchors {
                     left: parent.left
                     right: parent.right
@@ -181,11 +182,6 @@ Item {
         }
 
 
-        PlasmaCore.ToolTipArea {
-            anchors.fill: freeSpaceBar
-            subText: i18nc("@info:status Free disk space", "%1 free", \
                sdSource.data[udi]["Free Space Text"])
-        }
-
         MouseEventListener {
             id: leftActionArea
             width: units.iconSizes.medium*0.8
@@ -208,6 +204,21 @@ Item {
                 anchors.fill: parent
                 active: leftActionArea.containsMouse
                 visible: !busySpinner.visible
+
+                PlasmaCore.ToolTipArea {
+                    anchors.fill: leftAction
+                    subText: {
+                        if (!model["Accessible"]) {
+                            return i18n("Click to mount this device.")
+                        } else if (model["Device Types"].indexOf("OpticalDisc") != \
-1) { +                            return i18n("Click to eject this disc.")
+                        } else if (model["Removable"]) {
+                            return i18n("Click to safely remove this device.")
+                        } else {
+                            return i18n("Click to access this device from other \
applications.") +                        }
+                    }
+                }
             }
 
             PlasmaComponents.BusyIndicator {
@@ -219,21 +230,6 @@ Item {
         }
 
         PlasmaCore.ToolTipArea {
-            anchors.fill: leftAction
-            subText: {
-                if (!model["Accessible"]) {
-                    return i18n("Click to mount this device.")
-                } else if (model["Device Types"].indexOf("OpticalDisc") != -1) {
-                    return i18n("Click to eject this disc.")
-                } else if (model["Removable"]) {
-                    return i18n("Click to safely remove this device.")
-                } else {
-                    return i18n("Click to access this device from other \
                applications.")
-                }
-            }
-        }
-
-        PlasmaCore.ToolTipArea {
             anchors.fill: deviceIcon
             subText: {
                 if (model["Accessible"] || deviceItem.state != 0) {


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