diff --git a/sources/awesome-widget/awesome-widget.cpp b/sources/awesome-widget/awesome-widget.cpp index 7113cd7..36cf608 100644 --- a/sources/awesome-widget/awesome-widget.cpp +++ b/sources/awesome-widget/awesome-widget.cpp @@ -20,10 +20,12 @@ #include #include #include +#include #include #include "customlabel.h" #include +#include AwesomeWidget::AwesomeWidget(QObject *parent, const QVariantList &args) @@ -68,6 +70,20 @@ QString AwesomeWidget::getNetworkDevice() } +int AwesomeWidget::getNumberCpus() +{ + if (debug) qDebug() << PDEBUG; + + 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; + if (process.exitCode != 0) + if (debug) qDebug() << PDEBUG << ":" << "Error" << process.error; + return QTextCodec::codecForMib(106)->toUnicode(process.output).toInt(); +} + + void AwesomeWidget::init() { if (debug) qDebug() << PDEBUG; @@ -93,6 +109,109 @@ void AwesomeWidget::init() } +QStringList AwesomeWidget::findKeys() +{ + if (debug) qDebug() << PDEBUG; + + QStringList selectedKeys; + + return selectedKeys; +} + + +QStringList AwesomeWidget::getKeys() +{ + if (debug) qDebug() << PDEBUG; + + QStringList allKeys; + int numCpus = getNumberCpus(); + QMap deSettings = readDataEngineConfiguration(); + // time + allKeys.append(QString("time")); + allKeys.append(QString("isotime")); + allKeys.append(QString("shorttime")); + allKeys.append(QString("longtime")); + allKeys.append(QString("ctime")); + // uptime + allKeys.append(QString("uptime")); + allKeys.append(QString("cuptime")); + // cpu + allKeys.append(QString("cpu")); + for (int i=0; i readDataEngineConfiguration(); @@ -67,10 +68,12 @@ protected: private: // functions - QTimer *timer; + QStringList findKeys(); + QStringList getKeys(); // ui QGraphicsLinearLayout *mainLayout; CustomLabel *textLabel; + QTimer *timer; // values QMap values; // debug diff --git a/sources/awesome-widget/configuration.cpp b/sources/awesome-widget/configuration.cpp index d0791f5..048bd2c 100644 --- a/sources/awesome-widget/configuration.cpp +++ b/sources/awesome-widget/configuration.cpp @@ -223,6 +223,25 @@ void AwesomeWidget::createConfigurationInterface(KConfigDialog *parent) for (int j=0; jsetCheckState(Qt::Checked); } + cmd = QString("find /dev -name '[hms]d[a-z]'"); + if (debug) qDebug() << PDEBUG << ":" << "cmd" << cmd; + process = runTask(cmd); + if (debug) qDebug() << PDEBUG << ":" << "Cmd returns" << process.exitCode; + if (process.exitCode != 0) + if (debug) qDebug() << PDEBUG << ":" << "Error" << process.error; + qoutput = QTextCodec::codecForMib(106)->toUnicode(process.output); + uiAdvancedConfig.listWidget_hddDevice->clear(); + for (int i=0; iaddItem(&item); + } + for (int i=0; i items = uiAdvancedConfig.listWidget_hddDevice + ->findItems(configuration[QString("hdd")].split(QString("@@"))[i], Qt::MatchFixedString); + for (int j=0; jsetCheckState(Qt::Checked); + } if (configuration[QString("useCustomNetdev")].toInt() == 0) uiAdvancedConfig.checkBox_netdev->setCheckState(Qt::Unchecked); else @@ -385,6 +404,11 @@ void AwesomeWidget::configAccepted() items.append(uiAdvancedConfig.listWidget_mount->item(i)->text()); cg.writeEntry("mount", items.join(QString("@@"))); items.clear(); + for (int i=0; icount(); i++) + if (uiAdvancedConfig.listWidget_hddDevice->item(i)->checkState() == Qt::Checked) + items.append(uiAdvancedConfig.listWidget_hddDevice->item(i)->text()); + cg.writeEntry("hdd", items.join(QString("@@"))); + items.clear(); for (int i=0; icount(); i++) if (uiAdvancedConfig.listWidget_hddSpeedDevice->item(i)->checkState() == Qt::Checked) items.append(uiAdvancedConfig.listWidget_hddSpeedDevice->item(i)->text()); @@ -470,6 +494,7 @@ void AwesomeWidget::configChanged() configuration[QString("tempUnits")] = cg.readEntry("tempUnits", "Celsius"); configuration[QString("tempDevice")] = cg.readEntry("tempUnits", ""); configuration[QString("mount")] = cg.readEntry("mount", "/"); + configuration[QString("hdd")] = cg.readEntry("hdd", "/dev/sda"); configuration[QString("disk")] = cg.readEntry("disk", "disk/sda_(8:0)"); configuration[QString("useCustomNetdev")] = cg.readEntry("useCustomNetdev", "0"); configuration[QString("customNetdev")] = cg.readEntry("customNetdev", "lo"); diff --git a/sources/awesome-widget/reinit.cpp b/sources/awesome-widget/reinit.cpp index 44b241e..ade0909 100644 --- a/sources/awesome-widget/reinit.cpp +++ b/sources/awesome-widget/reinit.cpp @@ -48,6 +48,8 @@ void AwesomeWidget::reinit() if (configuration[QString("rightStretch")].toInt() == 2) mainLayout->addStretch(1); + keys = getKeys(); + foundKeys = findKeys(); values[QString("netdev")] = getNetworkDevice(); // thread()->wait(60000); connectToEngine();