From cd48ac8245558cb86497617d063837c16af79fb2 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Tue, 2 Sep 2014 22:16:13 +0400 Subject: [PATCH] fix cpu reading --- sources/awesome-widget/awesome-widget.cpp | 3 +-- sources/awesome-widget/configuration.cpp | 4 ++-- sources/awesome-widget/deinteraction.cpp | 4 ++-- sources/awesome-widget/reinit.cpp | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/sources/awesome-widget/awesome-widget.cpp b/sources/awesome-widget/awesome-widget.cpp index 9fa2de0..d67ac75 100644 --- a/sources/awesome-widget/awesome-widget.cpp +++ b/sources/awesome-widget/awesome-widget.cpp @@ -83,7 +83,6 @@ void AwesomeWidget::createActions() i18n("Update text"), this)); connect(contextMenu[2], SIGNAL(triggered(bool)), extsysmonEngine, SLOT(updateAllSources())); connect(contextMenu[2], SIGNAL(triggered(bool)), sysmonEngine, SLOT(updateAllSources())); - connect(contextMenu[2], SIGNAL(triggered(bool)), timeEngine, SLOT(updateAllSources())); connect(contextMenu[2], SIGNAL(triggered(bool)), this, SLOT(updateNetworkDevice())); } @@ -111,7 +110,7 @@ int AwesomeWidget::getNumberCpus() { if (debug) qDebug() << PDEBUG; - QString cmd = QString("grep -c '^processor' /proc/cpuinfo"); + QString cmd = QString("grep -c ^processor /proc/cpuinfo"); if (debug) qDebug() << PDEBUG << ":" << "cmd" << cmd; TaskResult process = runTask(cmd); if (debug) qDebug() << PDEBUG << ":" << "Cmd returns" << process.exitCode; diff --git a/sources/awesome-widget/configuration.cpp b/sources/awesome-widget/configuration.cpp index 24844cf..57b1c14 100644 --- a/sources/awesome-widget/configuration.cpp +++ b/sources/awesome-widget/configuration.cpp @@ -566,13 +566,13 @@ void AwesomeWidget::configChanged() QString fontStyle = cg.readEntry("fontStyle", "normal"); formatLine[0] = QString("\ \ - 
")
+    ")
                 .arg(fontFamily)
                 .arg(QString::number(fontSize))
                 .arg(QString::number(fontWeight))
                 .arg(fontStyle)
                 .arg(fontColor);
-    formatLine[1] = QString("
"); + formatLine[1] = QString(""); // counts QMap deSettings = readDataEngineConfiguration(); diff --git a/sources/awesome-widget/deinteraction.cpp b/sources/awesome-widget/deinteraction.cpp index c74aecb..ffb1944 100644 --- a/sources/awesome-widget/deinteraction.cpp +++ b/sources/awesome-widget/deinteraction.cpp @@ -36,7 +36,7 @@ void AwesomeWidget::connectToEngine() // cpu sysmonEngine->connectSource(QString("cpu/system/TotalLoad"), this, configuration[QString("interval")].toInt()); - regExp = QRegExp(QString("cpu.*")); + regExp = QRegExp(QString("cpu[0-9].*")); if (foundKeys.indexOf(regExp) > -1) for (int i=0; iconnectSource(QString("cpu/cpu") + QString::number(i) + QString("/TotalLoad"), @@ -44,7 +44,7 @@ void AwesomeWidget::connectToEngine() // cpuclock sysmonEngine->connectSource(QString("cpu/system/AverageClock"), this, configuration[QString("interval")].toInt()); - regExp = QRegExp(QString("cpucl.*")); + regExp = QRegExp(QString("cpucl[0-9].*")); if (foundKeys.indexOf(regExp) > -1) for (int i=0; iconnectSource(QString("cpu/cpu") + QString::number(i) + QString("/clock"), diff --git a/sources/awesome-widget/reinit.cpp b/sources/awesome-widget/reinit.cpp index 1f4dff4..cb56bc8 100644 --- a/sources/awesome-widget/reinit.cpp +++ b/sources/awesome-widget/reinit.cpp @@ -56,9 +56,9 @@ void AwesomeWidget::reinit() textLabel->setPopupEnabled(true); updateText(true); mainLayout->addItem(textLabel); - resize(10, 10); if (configuration[QString("rightStretch")].toInt() == 2) mainLayout->addStretch(1); + resize(10, 10); keys = getKeys(); foundKeys = findKeys();