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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/applets/system-monitor
From:       Petri Damstén <petri.damsten () kdemail ! net>
Date:       2009-09-09 13:39:48
Message-ID: 1252503588.036562.7076.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1021541 by pdamsten:

Show only mounted partitions by default.
CCBUG:188344

 M  +22 -2     hdd.cpp  
 M  +1 -0      hdd.h  


--- trunk/KDE/kdebase/workspace/plasma/applets/system-monitor/hdd.cpp #1021540:1021541
@@ -45,14 +45,34 @@
     KConfigGroup cg = config();
     QString predicateString("IS StorageVolume");
     setEngine(dataEngine("soliddevice"));
-    setItems(cg.readEntry("uuids",
-             engine()->query(predicateString)[predicateString].toStringList()));
+    QStringList items = cg.readEntry("uuids", QStringList());
+    if (items.isEmpty()) {
+        items = mounted();
+    }
+    setItems(items);
     setInterval(cg.readEntry("interval", 2) * 60 * 1000);
 
     setTitle(i18n("Disk Space"), true);
     connectToEngine();
 }
 
+QStringList Hdd::mounted()
+{
+    Plasma::DataEngine::Data data;
+    QString predicate("IS StorageVolume");
+    QStringList result;
+
+    foreach (const QString& uuid, engine()->query(predicate)[predicate].toStringList()) {
+        if (!isValidDevice(uuid, &data)) {
+            continue;
+        }
+        if (data["Accessible"].toBool()) {
+            result << uuid;
+        }
+    }
+    return result;
+}
+
 void Hdd::createConfigurationInterface(KConfigDialog *parent)
 {
     QWidget *widget = new QWidget();
--- trunk/KDE/kdebase/workspace/plasma/applets/system-monitor/hdd.h #1021540:1021541
@@ -54,6 +54,7 @@
         QHash<const QString, MonitorIcon *> m_icons;
         QHash<QString, QList<Plasma::Meter *> > m_diskMap;
         QHash<QString, QString> m_html;
+        QStringList mounted();
 
         QString hddTitle(const QString& uuid, const Plasma::DataEngine::Data &data);
         QString guessHddTitle(const Plasma::DataEngine::Data &data);
[prev in list] [next in list] [prev in thread] [next in thread]