arcanis/awesome-widgets
1
0
Fork 0
mirror of https://github.com/arcan1s/awesome-widgets.git synced 2025-04-25 07:57:19 +00:00
Code Issues Projects Releases Wiki Activity

fix cpu reading

Browse Source
This commit is contained in:
arcan1s 2014-09-02 22:16:13 +04:00
parent 0751d080eb
commit cd48ac8245
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sources/awesome-widget/awesome-widget.cpp
View File

@ -83,7 +83,6 @@ void AwesomeWidget::createActions()
i18n("Update text"), this)); i18n("Update text"), this));
connect(contextMenu[2], SIGNAL(triggered(bool)), extsysmonEngine, SLOT(updateAllSources())); connect(contextMenu[2], SIGNAL(triggered(bool)), extsysmonEngine, SLOT(updateAllSources()));
connect(contextMenu[2], SIGNAL(triggered(bool)), sysmonEngine, 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())); connect(contextMenu[2], SIGNAL(triggered(bool)), this, SLOT(updateNetworkDevice()));
} }
@ -111,7 +110,7 @@ int AwesomeWidget::getNumberCpus()
{ {
if (debug) qDebug() << PDEBUG; 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; if (debug) qDebug() << PDEBUG << ":" << "cmd" << cmd;
TaskResult process = runTask(cmd); TaskResult process = runTask(cmd);
if (debug) qDebug() << PDEBUG << ":" << "Cmd returns" << process.exitCode; if (debug) qDebug() << PDEBUG << ":" << "Cmd returns" << process.exitCode;

4
sources/awesome-widget/configuration.cpp
View File

@ -566,13 +566,13 @@ void AwesomeWidget::configChanged()
QString fontStyle = cg.readEntry("fontStyle", "normal"); QString fontStyle = cg.readEntry("fontStyle", "normal");
formatLine[0] = QString("<html><head><meta name=\"qrichtext\" content=\"1\" />\ formatLine[0] = QString("<html><head><meta name=\"qrichtext\" content=\"1\" />\
<style type=\"text/css\">p, li { white-space: pre-wrap; }</style>\ <style type=\"text/css\">p, li { white-space: pre-wrap; }</style>\
</head><body style=\"font-family:'%1'; font-size:%2pt; font-weight:%3; font-style:%4; color:%5;\"><pre>") </head><body style=\"font-family:'%1'; font-size:%2pt; font-weight:%3; font-style:%4; color:%5;\">")
.arg(fontFamily) .arg(fontFamily)
.arg(QString::number(fontSize)) .arg(QString::number(fontSize))
.arg(QString::number(fontWeight)) .arg(QString::number(fontWeight))
.arg(fontStyle) .arg(fontStyle)
.arg(fontColor); .arg(fontColor);
formatLine[1] = QString("</pre></body></html>"); formatLine[1] = QString("</body></html>");
// counts // counts
QMap<QString, QString> deSettings = readDataEngineConfiguration(); QMap<QString, QString> deSettings = readDataEngineConfiguration();

4
sources/awesome-widget/deinteraction.cpp
View File

@ -36,7 +36,7 @@ void AwesomeWidget::connectToEngine()
// cpu // cpu
sysmonEngine->connectSource(QString("cpu/system/TotalLoad"), sysmonEngine->connectSource(QString("cpu/system/TotalLoad"),
this, configuration[QString("interval")].toInt()); this, configuration[QString("interval")].toInt());
regExp = QRegExp(QString("cpu.*")); regExp = QRegExp(QString("cpu[0-9].*"));
if (foundKeys.indexOf(regExp) > -1) if (foundKeys.indexOf(regExp) > -1)
for (int i=0; i<counts[QString("cpu")]; i++) for (int i=0; i<counts[QString("cpu")]; i++)
sysmonEngine->connectSource(QString("cpu/cpu") + QString::number(i) + QString("/TotalLoad"), sysmonEngine->connectSource(QString("cpu/cpu") + QString::number(i) + QString("/TotalLoad"),
@ -44,7 +44,7 @@ void AwesomeWidget::connectToEngine()
// cpuclock // cpuclock
sysmonEngine->connectSource(QString("cpu/system/AverageClock"), sysmonEngine->connectSource(QString("cpu/system/AverageClock"),
this, configuration[QString("interval")].toInt()); this, configuration[QString("interval")].toInt());
regExp = QRegExp(QString("cpucl.*")); regExp = QRegExp(QString("cpucl[0-9].*"));
if (foundKeys.indexOf(regExp) > -1) if (foundKeys.indexOf(regExp) > -1)
for (int i=0; i<counts[QString("cpu")]; i++) for (int i=0; i<counts[QString("cpu")]; i++)
sysmonEngine->connectSource(QString("cpu/cpu") + QString::number(i) + QString("/clock"), sysmonEngine->connectSource(QString("cpu/cpu") + QString::number(i) + QString("/clock"),

2
sources/awesome-widget/reinit.cpp
View File

@ -56,9 +56,9 @@ void AwesomeWidget::reinit()
textLabel->setPopupEnabled(true); textLabel->setPopupEnabled(true);
updateText(true); updateText(true);
mainLayout->addItem(textLabel); mainLayout->addItem(textLabel);
resize(10, 10);
if (configuration[QString("rightStretch")].toInt() == 2) if (configuration[QString("rightStretch")].toInt() == 2)
mainLayout->addStretch(1); mainLayout->addStretch(1);
resize(10, 10);
keys = getKeys(); keys = getKeys();
foundKeys = findKeys(); foundKeys = findKeys();