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

List:       kde-commits
Subject:    KDE/kdelibs/solid/solid/backends/hal
From:       Jacopo De Simoi <wilderkde () gmail ! com>
Date:       2010-01-04 8:52:59
Message-ID: 1262595179.192337.11795.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1069727 by jacopods:

Use the new encrypted-(un)locked emblems. Thanks pinheiro


 M  +12 -6     haldevice.cpp  


--- trunk/KDE/kdelibs/solid/solid/backends/hal/haldevice.cpp #1069726:1069727
@@ -317,16 +317,22 @@
     QStringList res;
 
     if (queryDeviceInterface(Solid::DeviceInterface::StorageAccess)) {
+        bool isEncrypted = property("volume.fsusage").toString()=="crypto";
+
         const Hal::StorageAccess accessIface(const_cast<HalDevice *>(this));
         if (accessIface.isAccessible()) {
-            res << "emblem-mounted";
+            if (isEncrypted) {
+                res << "emblem-encrypted-unlocked";
+            } else {
+                res << "emblem-mounted";
+            }
         } else {
-            res << "emblem-unmounted";
+            if (isEncrypted) {
+                res << "emblem-encrypted-locked";
+            } else {
+                res << "emblem-unmounted";
+            }
         }
-
-        if (property("volume.fsusage").toString()=="crypto") {
-            res << "security-high";
-        }
     }
 
     return res;
[prev in list] [next in list] [prev in thread] [next in thread]