[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-07-23 11:36:53
Message-ID: 1248349013.515770.17721.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1001470 by pdamsten:

* Add interfaces correctly
* Fix regexp so it won't match for dataTotal
BUG: 198885
BUG: 196712


 M  +7 -5      net.cpp  


--- trunk/KDE/kdebase/workspace/plasma/applets/system-monitor/net.cpp #1001469:1001470
@@ -26,7 +26,7 @@
 
 SM::Net::Net(QObject *parent, const QVariantList &args)
     : SM::Applet(parent, args)
-    , m_rx("network/interfaces/(\\w+)/transmitter/data")
+    , m_rx("^network/interfaces/(\\w+)/transmitter/data$")
 {
     setHasConfigurationInterface(true);
     resize(234 + 20 + 23, 135 + 20 + 25);
@@ -46,18 +46,20 @@
     setEngine(dataEngine("systemmonitor"));
     setInterval(cg.readEntry("interval", 2) * 1000);
     setTitle(i18n("Network"));
-    
+
     m_showTopBar = cg.readEntry("showTopBar", true);
     m_showBackground = cg.readEntry("showBackground", true);
     m_inColor = cg.readEntry("inColor", QColor("#d2d200"));
     m_outColor = cg.readEntry("outColor", QColor("#f20000"));
-    
+
     connect(engine(), SIGNAL(sourceAdded(const QString&)),
             this, SLOT(sourceAdded(const QString&)));
     connect(engine(), SIGNAL(sourceRemoved(const QString&)),
             this, SLOT(sourceRemoved(const QString&)));
     if (!engine()->sources().isEmpty()) {
-        sourcesAdded();
+        foreach (const QString& source, engine()->sources()) {
+            sourceAdded(source);
+        }
     }
 }
 
@@ -222,7 +224,7 @@
     cg.writeEntry("interval", interval);
     interval *= 1000;
     setInterval(interval);
-    
+
     cg.writeEntry("showTopBar", m_showTopBar = uiAdv.showTopBarCheckBox->isChecked());
     cg.writeEntry("showBackground", m_showBackground = uiAdv.showBackgroundCheckBox->isChecked());
     cg.writeEntry("inColor", m_inColor = uiAdv.inColorCombo->color());
[prev in list] [next in list] [prev in thread] [next in thread]