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

List:       kde-commits
Subject:    playground/base/plasma/applets/system-monitor
From:       Petri Damstén <petri.damsten () kdemail ! net>
Date:       2008-06-25 10:40:50
Message-ID: 1214390450.337578.21075.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 824230 by pdamsten:

- Fix detail after configure.
- Use plasma text color in cpu graph.
- Background svg removed, more consistent with other themes.
- swap in/out in network stacked graph.

 M  +1 -0      applet.cpp  
 M  +3 -4      cpu.cpp  
 M  +8 -3      net.cpp  


--- trunk/playground/base/plasma/applets/system-monitor/applet.cpp #824229:824230
@@ -187,6 +187,7 @@
     }
     checkGeometry();
     constraintsEvent(Plasma::SizeConstraint);
+    setDetail(m_detail);
 }
 
 void Applet::checkGeometry()
--- trunk/playground/base/plasma/applets/system-monitor/cpu.cpp #824229:824230
@@ -80,7 +80,7 @@
     QString cpu = l[2];
     Plasma::Theme* theme = Plasma::Theme::defaultTheme();
     Plasma::SignalPlotter *plotter = new Plasma::SignalPlotter(this);
-    plotter->addPlot(Qt::white);
+    plotter->addPlot(theme->color(Plasma::Theme::TextColor));
     plotter->setUseAutoRange(false);
     plotter->setVerticalRange(0.0, 100.0);
     plotter->setThinFrame(false);
@@ -95,7 +95,7 @@
     plotter->setHorizontalLinesColor(theme->color(Plasma::Theme::HighlightColor));
     plotter->setVerticalLinesColor(theme->color(Plasma::Theme::HighlightColor));
     plotter->setHorizontalLinesCount(4);
-    plotter->setSvgBackground("widgets/plot-background");
+    //plotter->setSvgBackground("widgets/plot-background");
     plotter->setTitle(cpu);
     plotter->setUnit("%");
     appendPlotter(source, plotter);
@@ -104,8 +104,7 @@
     return true;
 }
 
-void SM::Cpu::dataUpdated(const QString& source,
-                          const Plasma::DataEngine::Data &data)
+void SM::Cpu::dataUpdated(const QString& source, const Plasma::DataEngine::Data &data)
 {
     Plasma::SignalPlotter *plotter = plotters()[source];
     if (plotter) {
--- trunk/playground/base/plasma/applets/system-monitor/net.cpp #824229:824230
@@ -51,7 +51,7 @@
 
 void SM::Net::parseSources()
 {
-    QRegExp rx("network/interfaces/(\\w+)/receiver/data");
+    QRegExp rx("network/interfaces/(\\w+)/transmitter/data");
 
     foreach (const QString& s, engine()->sources()) {
         if (rx.indexIn(s) != -1) {
@@ -83,6 +83,7 @@
     QString interface = l[2];
     Plasma::Theme* theme = Plasma::Theme::defaultTheme();
     Plasma::SignalPlotter *plotter = new Plasma::SignalPlotter(this);
+    //QColor color = theme->color(Plasma::Theme::HighlightColor);
     plotter->addPlot(Qt::blue);
     plotter->addPlot(Qt::green);
     plotter->setUseAutoRange(true);
@@ -91,6 +92,7 @@
     plotter->setShowTopBar(false);
     plotter->setShowVerticalLines(false);
     plotter->setShowHorizontalLines(false);
+    plotter->setStackPlots(true);
     plotter->setFontColor(theme->color(Plasma::Theme::HighlightColor));
     QFont font = theme->font(Plasma::Theme::DefaultFont);
     font.setPointSize(8);
@@ -98,23 +100,26 @@
     plotter->setHorizontalLinesColor(theme->color(Plasma::Theme::HighlightColor));
     plotter->setVerticalLinesColor(theme->color(Plasma::Theme::HighlightColor));
     plotter->setHorizontalLinesCount(4);
-    plotter->setSvgBackground("widgets/plot-background");
+    //plotter->setSvgBackground("widgets/plot-background");
     plotter->setTitle(interface);
     plotter->setUnit("KiB/s");
     appendPlotter(interface, plotter);
     mainLayout()->addItem(plotter);
     setPreferredItemHeight(42);
-    connectSource("network/interfaces/" + interface + "/transmitter/data");
+    connectSource("network/interfaces/" + interface + "/receiver/data");
     return true;
 }
 
 void SM::Net::dataUpdated(const QString& source,
                           const Plasma::DataEngine::Data &data)
 {
+    kDebug() << source;
     QString interface = source.split('/')[2];
 
     m_data[interface] << data["value"].toDouble();
     if (m_data[interface].count() > 1) {
+        kDebug() << items();
+        kDebug() << interface << m_data[interface];
         Plasma::SignalPlotter *plotter = plotters()[interface];
         if (plotter) {
             plotter->addSample(m_data[interface]);
[prev in list] [next in list] [prev in thread] [next in thread]