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

List:       kde-commits
Subject:    [kde-workspace/KDE/4.8] plasma/generic/applets/devicenotifier/package/contents/ui: Do not show
From:       Jacopo De Simoi <wilderkde () gmail ! com>
Date:       2012-01-16 19:42:54
Message-ID: 20120116194254.96E73A60B9 () git ! kde ! org
[Download RAW message or body]

Git commit f1a0c5b24ed00a860098cfd199d707c90410f0a6 by Jacopo De Simoi.
Committed on 15/01/2012 at 22:05.
Pushed by jacopods into branch 'KDE/4.8'.

Do not show "safe to remove" while unmounting

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


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

diff --git a/plasma/generic/applets/devicenotifier/package/contents/ui/DeviceItem.qml \
b/plasma/generic/applets/devicenotifier/package/contents/ui/DeviceItem.qml index \
                4035c5a..cf575bd 100644
--- a/plasma/generic/applets/devicenotifier/package/contents/ui/DeviceItem.qml
+++ b/plasma/generic/applets/devicenotifier/package/contents/ui/DeviceItem.qml
@@ -70,7 +70,7 @@ Item {
                 id: emblem
                 width: 16
                 height: 16
-                icon: QIcon(emblemIcon)
+                icon: deviceItem.state == 0 ? QIcon(emblemIcon) : QIcon();
                 anchors {
                     left: parent.left
                     bottom: parent.bottom
@@ -101,7 +101,7 @@ 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.italic: true
                 font.pointSize: theme.smallestFont.pointSize
                 color: "#99"+(theme.textColor.toString().substr(1))
@@ -169,7 +169,7 @@ Item {
         PlasmaCore.ToolTip {
             target: deviceIcon
             subText: {
-                if (model["Accessible"]) {
+                if (model["Accessible"] || deviceItem.state != 0) {
                     if (model["Removable"]) {
                         return i18n("It is currently <b>not safe</b> to remove this \
device: applications may be accessing it. Click the eject button to safely remove \
this device.")  } else {
@@ -198,7 +198,7 @@ Item {
                 verticalCenter: deviceIcon.verticalCenter
             }
             running: visible
-            visible: state!=0
+            visible: deviceItem.state != 0
         }
 
         MouseArea {


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