[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 display of
From:       Jacopo De Simoi <wilderkde () gmail ! com>
Date:       2012-12-04 9:26:35
Message-ID: 20121204092635.0DF62A6091 () git ! kde ! org
[Download RAW message or body]

Git commit 6cc3fbdbdee866553440b832790eb94473c4c21e by Jacopo De Simoi.
Committed on 04/12/2012 at 10:24.
Pushed by jacopods into branch 'master'.

Fix display of labels/spacebar

If we are currently mounting/unmounting we should always
give some information on why the device is busy, not only on hover.
Moreover, the freespace bar is not reliable during mounting/unmounting,
so it should be hidden

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


http://commits.kde.org/kde-workspace/6cc3fbdbdee866553440b832790eb94473c4c21e

diff --git a/plasma/generic/applets/devicenotifier/package/contents/ui/DeviceItem.qml \
b/plasma/generic/applets/devicenotifier/package/contents/ui/DeviceItem.qml index \
                607da9f..0d46169 100644
--- a/plasma/generic/applets/devicenotifier/package/contents/ui/DeviceItem.qml
+++ b/plasma/generic/applets/devicenotifier/package/contents/ui/DeviceItem.qml
@@ -144,10 +144,10 @@ Item {
                     // FIXME: state changes do not reach the plasmoid if the
                     // device was already attached when the plasmoid was
                     // initialized
-                    text: deviceItem.state ==0 ? container.idleStatus() : \
(deviceItem.state==1 ? i18nc("Accessing is a less technical word for Mounting; \
translation should be short and mean \'Currently mounting this device\'", \
"Accessing...") : i18nc("Removing is a less technical word for Unmounting; \
translation shoud be short and mean \'Currently unmounting this device\'", \
"Removing...")) +                    text: deviceItem.state == 0 ? \
container.idleStatus() : (deviceItem.state==1 ? i18nc("Accessing is a less technical \
word for Mounting; translation should be short and mean \'Currently mounting this \
device\'", "Accessing...") : i18nc("Removing is a less technical word for Unmounting; \
translation shoud be short and mean \'Currently unmounting this device\'", \
"Removing..."))  font.pointSize: theme.smallestFont.pointSize
                     color: "#99"+(theme.textColor.toString().substr(1))
-                    opacity: container.containsMouse || expanded ? 1 : 0;
+                    opacity: deviceItem.state != 0 || container.containsMouse || \
expanded ? 1 : 0;  
                     Behavior on opacity { NumberAnimation { duration: 150 } }
                     }
@@ -159,7 +159,7 @@ Item {
                     left: parent.left
                     right: parent.right
                 }
-                opacity: mounted ? 1 : 0
+                opacity: (deviceItem.state == 0 && mounted) ? 1 : 0
                 PlasmaComponents.ProgressBar {
                     id: freeSpaceBar
                     height: deviceStatus.height


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