[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 7:05:34
Message-ID: 1252479934.292493.14317.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1021425 by pdamsten:

Only save uuid string if user edited it.
CCBUG: 202721

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


--- trunk/KDE/kdebase/workspace/plasma/applets/system-monitor/hdd.cpp #1021424:1021425
@@ -76,6 +76,7 @@
             item1->setCheckState(Qt::Checked);
         }
         QStandardItem *item2 = new QStandardItem(hddTitle(uuid, data));
+        item2->setData(guessHddTitle(data));
         item2->setEditable(true);
         parentItem->appendRow(QList<QStandardItem *>() << item1 << item2);
     }
@@ -99,8 +100,10 @@
     for (int i = 0; i < parentItem->rowCount(); ++i) {
         QStandardItem *item = parentItem->child(i, 0);
         if (item) {
-            cgGlobal.writeEntry(item->data().toString(),
-                                parentItem->child(i, 1)->text());
+            QStandardItem *child = parentItem->child(i, 1);
+            if (child->text() != child->data().toString()) {
+                cgGlobal.writeEntry(item->data().toString(), child->text());
+            }
             if (item->checkState() == Qt::Checked) {
                 appendItem(item->data().toString());
             }
@@ -122,20 +125,25 @@
     KConfigGroup cg = globalConfig();
     QString label = cg.readEntry(uuid, "");
 
-    if (label.isEmpty() || label.startsWith("/dev/")) {
-        label = data["Label"].toString();
+    if (label.isEmpty()) {
+        label = guessHddTitle(data);
+    }
+    return label;
+}
+
+QString Hdd::guessHddTitle(const Plasma::DataEngine::Data &data)
+{
+    QString label = data["Label"].toString();
+    if (label.isEmpty()) {
+        QString path = data["File Path"].toString();
+        if (path == "/")
+            return i18nc("the root filesystem", "root");
+        QFileInfo fi(path);
+        label = fi.fileName();
         if (label.isEmpty()) {
-            QString path = data["File Path"].toString();
-            if (path == "/")
-                return i18nc("the root filesystem", "root");
-            QFileInfo fi(path);
-            label = fi.fileName();
+            label = data["Device"].toString();
             if (label.isEmpty()) {
-                label = data["Device"].toString();
-                if (label.isEmpty()) {
-                    kDebug() << "Disk: " << uuid << " has empty label";
-                    label = i18n("Unknown filesystem");
-                }
+                label = i18n("Unknown filesystem");
             }
         }
     }
--- trunk/KDE/kdebase/workspace/plasma/applets/system-monitor/hdd.h #1021424:1021425
@@ -56,6 +56,7 @@
         QHash<QString, QString> m_html;
 
         QString hddTitle(const QString& uuid, const Plasma::DataEngine::Data &data);
+        QString guessHddTitle(const Plasma::DataEngine::Data &data);
         QString filePath(const Plasma::DataEngine::Data &data);
         bool addMeter(const QString& source);
         void deleteMeters(QGraphicsLinearLayout* layout = 0);
[prev in list] [next in list] [prev in thread] [next in thread]