[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-08 13:18:31
Message-ID: 1252415911.787076.26423.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1021175 by pdamsten:

* hdd icon has mounted emblem so main view does not need 'not accessible' text.
* 'not accessible' text is shown with path in config dialog because name is user editable.
BUG: 200865
BUG: 199634


 M  +7 -1      hdd.cpp  
 M  +1 -0      hdd.h  


--- trunk/KDE/kdebase/workspace/plasma/applets/system-monitor/hdd.cpp #1021174:1021175
@@ -68,7 +68,7 @@
         if (!isValidDevice(uuid, &data)) {
             continue;
         }
-        QStandardItem *item1 = new QStandardItem(data["File Path"].toString());
+        QStandardItem *item1 = new QStandardItem(filePath(data));
         item1->setEditable(false);
         item1->setCheckable(true);
         item1->setData(uuid);
@@ -139,6 +139,12 @@
             }
         }
     }
+    return label;
+}
+
+QString Hdd::filePath(const Plasma::DataEngine::Data &data)
+{
+    QString label = data["File Path"].toString();
     QVariant accessible = data["Accessible"];
     if (accessible.isValid()) {
         if (accessible.canConvert(QVariant::Bool)) {
--- trunk/KDE/kdebase/workspace/plasma/applets/system-monitor/hdd.h #1021174:1021175
@@ -56,6 +56,7 @@
         QHash<QString, QString> m_html;
 
         QString hddTitle(const QString& uuid, const Plasma::DataEngine::Data &data);
+        QString filePath(const Plasma::DataEngine::Data &data);
         bool addMeter(const QString& source);
         void deleteMeters(QGraphicsLinearLayout* layout = 0);
         bool isValidDevice(const QString& uuid, Plasma::DataEngine::Data* data);
[prev in list] [next in list] [prev in thread] [next in thread]