From fd81fda9a1bff93524f59b8634eafec88ff7bf11 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Tue, 2 Sep 2014 02:42:34 +0400 Subject: [PATCH] fix tooltip fix memory remove layout settings more correct parsing --- sources/awesome-widget/advanced.ui | 11 +- sources/awesome-widget/awesome-widget.cpp | 10 ++ sources/awesome-widget/configuration.cpp | 43 ++++---- sources/awesome-widget/deinteraction.cpp | 117 ++++++++++------------ sources/awesome-widget/reinit.cpp | 39 +++++--- sources/awesome-widget/tooltip.cpp | 77 -------------- sources/awesome-widget/tooltipconfig.ui | 23 ++++- sources/awesome-widget/widget.ui | 4 +- 8 files changed, 132 insertions(+), 192 deletions(-) delete mode 100644 sources/awesome-widget/tooltip.cpp diff --git a/sources/awesome-widget/advanced.ui b/sources/awesome-widget/advanced.ui index 2267572..f4636f6 100644 --- a/sources/awesome-widget/advanced.ui +++ b/sources/awesome-widget/advanced.ui @@ -41,9 +41,9 @@ 0 - -87 + 0 677 - 665 + 640 @@ -54,13 +54,6 @@ - - - - Vertical layout - - - diff --git a/sources/awesome-widget/awesome-widget.cpp b/sources/awesome-widget/awesome-widget.cpp index 1ba9174..1a5a96b 100644 --- a/sources/awesome-widget/awesome-widget.cpp +++ b/sources/awesome-widget/awesome-widget.cpp @@ -42,6 +42,8 @@ AwesomeWidget::AwesomeWidget(QObject *parent, const QVariantList &args) else debug = false; + setBackgroundHints(DefaultBackground); + setAspectRatioMode(Plasma::IgnoreAspectRatio); setHasConfigurationInterface(true); // text format init formatLine.append(QString("")); @@ -162,8 +164,10 @@ void AwesomeWidget::init() // body mainLayout = new QGraphicsLinearLayout(); mainLayout->setContentsMargins(1, 1, 1, 1); + mainLayout->setOrientation(Qt::Horizontal); setLayout(mainLayout); textLabel = new CustomLabel(this, debug); + textLabel->setWordWrap(false); // read variables configChanged(); @@ -238,12 +242,18 @@ QStringList AwesomeWidget::getKeys() allKeys.append(QString("mem")); allKeys.append(QString("memmb")); allKeys.append(QString("memgb")); + allKeys.append(QString("memfreemb")); + allKeys.append(QString("memfreegb")); allKeys.append(QString("memtotmb")); allKeys.append(QString("memtotgb")); + allKeys.append(QString("memusedmb")); + allKeys.append(QString("memusedgb")); // swap allKeys.append(QString("swap")); allKeys.append(QString("swapmb")); allKeys.append(QString("swapgb")); + allKeys.append(QString("swapfreemb")); + allKeys.append(QString("swapfreegb")); allKeys.append(QString("swaptotmb")); allKeys.append(QString("swaptotgb")); // hdd diff --git a/sources/awesome-widget/configuration.cpp b/sources/awesome-widget/configuration.cpp index 4cd53cf..473156b 100644 --- a/sources/awesome-widget/configuration.cpp +++ b/sources/awesome-widget/configuration.cpp @@ -146,10 +146,6 @@ void AwesomeWidget::createConfigurationInterface(KConfigDialog *parent) uiAdvancedConfig.checkBox_background->setCheckState(Qt::Unchecked); else uiAdvancedConfig.checkBox_background->setCheckState(Qt::Checked); - if (configuration[QString("layout")].toInt() == 0) - uiAdvancedConfig.checkBox_layout->setCheckState(Qt::Unchecked); - else - uiAdvancedConfig.checkBox_layout->setCheckState(Qt::Checked); if (configuration[QString("popup")].toInt() == 0) uiAdvancedConfig.checkBox_popup->setCheckState(Qt::Unchecked); else @@ -292,10 +288,6 @@ void AwesomeWidget::createConfigurationInterface(KConfigDialog *parent) else uiTooltipConfig.checkBox_down->setCheckState(Qt::Checked); uiTooltipConfig.kcolorcombo_down->setColor(QColor(configuration[QString("downColor")])); - if (configuration[QString("upTooltip")].toInt() == 0) - uiTooltipConfig.checkBox_up->setCheckState(Qt::Unchecked); - else - uiTooltipConfig.checkBox_up->setCheckState(Qt::Checked); uiTooltipConfig.kcolorcombo_up->setColor(QColor(configuration[QString("upColor")])); // appearance @@ -407,7 +399,6 @@ void AwesomeWidget::configAccepted() // advanced cg.writeEntry("background", QString::number(uiAdvancedConfig.checkBox_background->checkState())); - cg.writeEntry("layout", QString::number(uiAdvancedConfig.checkBox_layout->checkState())); cg.writeEntry("popup", QString::number(uiAdvancedConfig.checkBox_popup->checkState())); cg.writeEntry("leftStretch", QString::number(uiAdvancedConfig.checkBox_leftStretch->checkState())); cg.writeEntry("rightStretch", QString::number(uiAdvancedConfig.checkBox_rightStretch->checkState())); @@ -453,7 +444,6 @@ void AwesomeWidget::configAccepted() cg.writeEntry("swapColor", uiTooltipConfig.kcolorcombo_swap->color().name()); cg.writeEntry("downTooltip", QString::number(uiTooltipConfig.checkBox_down->checkState())); cg.writeEntry("downColor", uiTooltipConfig.kcolorcombo_down->color().name()); - cg.writeEntry("upTooltip", QString::number(uiTooltipConfig.checkBox_up->checkState())); cg.writeEntry("upColor", uiTooltipConfig.kcolorcombo_up->color().name()); // appearance @@ -506,7 +496,6 @@ void AwesomeWidget::configChanged() // advanced configuration[QString("background")] = cg.readEntry("background", "2"); - configuration[QString("layout")] = cg.readEntry("layout", "0"); configuration[QString("popup")] = cg.readEntry("popup", "2"); configuration[QString("leftStretch")] = cg.readEntry("leftStretch", "2"); configuration[QString("rightStretch")] = cg.readEntry("rightStretch", "2"); @@ -523,20 +512,42 @@ void AwesomeWidget::configChanged() configuration[QString("acOffile")] = cg.readEntry("acOffile", "( )"); // tooltip + tooltipValues.clear(); configuration[QString("tooltipNumber")] = cg.readEntry("tooltipNumber", "100"); configuration[QString("useTooltipBackground")] = cg.readEntry("useTooltipBackground", "2"); configuration[QString("tooltipBackground")] = cg.readEntry("tooltipBackground", "#ffffff"); configuration[QString("cpuTooltip")] = cg.readEntry("cpuTooltip", "2"); + if (configuration[QString("cpuTooltip")].toInt() == 2) { + tooltipValues[QString("cpu")].append(0.0); + tooltipValues[QString("cpu")].append(0.01); + } configuration[QString("cpuColor")] = cg.readEntry("cpuColor", "#ff0000"); configuration[QString("cpuclTooltip")] = cg.readEntry("cpuclTooltip", "2"); + if (configuration[QString("cpuclTooltip")].toInt() == 2) { + tooltipValues[QString("cpucl")].append(0.0); + tooltipValues[QString("cpucl")].append(0.01); + } configuration[QString("cpuclColor")] = cg.readEntry("cpuclColor", "#00ff00"); configuration[QString("memTooltip")] = cg.readEntry("memTooltip", "2"); + if (configuration[QString("memTooltip")].toInt() == 2) { + tooltipValues[QString("mem")].append(0.0); + tooltipValues[QString("mem")].append(0.01); + } configuration[QString("memColor")] = cg.readEntry("memColor", "#0000ff"); configuration[QString("swapTooltip")] = cg.readEntry("swapTooltip", "2"); + if (configuration[QString("swapTooltip")].toInt() == 2) { + tooltipValues[QString("swap")].append(0.0); + tooltipValues[QString("swap")].append(0.01); + } configuration[QString("swapColor")] = cg.readEntry("swapColor", "#ffff00"); configuration[QString("downTooltip")] = cg.readEntry("downTooltip", "2"); + if (configuration[QString("downTooltip")].toInt() == 2) { + tooltipValues[QString("down")].append(0.0); + tooltipValues[QString("down")].append(0.01); + tooltipValues[QString("up")].append(0.0); + tooltipValues[QString("up")].append(0.01); + } configuration[QString("downColor")] = cg.readEntry("downColor", "#00ffff"); - configuration[QString("upTooltip")] = cg.readEntry("upTooltip", "2"); configuration[QString("upColor")] = cg.readEntry("upColor", "#ff00ff"); // appearance @@ -570,9 +581,7 @@ void AwesomeWidget::configChanged() counts[QString("tooltip")] += configuration[QString("cpuclTooltip")].toInt(); counts[QString("tooltip")] += configuration[QString("memTooltip")].toInt(); counts[QString("tooltip")] += configuration[QString("swapTooltip")].toInt(); - if ((configuration[QString("downTooltip")].toInt() == 2) || - (configuration[QString("upTooltip")].toInt() == 2)) - counts[QString("tooltip")] += 2; + counts[QString("tooltip")] += configuration[QString("downTooltip")].toInt(); counts[QString("tooltip")] = counts[QString("tooltip")] / 2; reinit(); @@ -610,7 +619,7 @@ void AwesomeWidget::contextMenuCustomCommand(const QPoint pos) if (uiDEConfig.tableWidget_customCommand->currentItem() == 0) return; QMenu menu(uiDEConfig.tableWidget_customCommand); - QAction *remove = menu.addAction(i18n("Remove")); + QAction *remove = menu.addAction(QIcon("edit-delete"), i18n("Remove")); QAction *action = menu.exec(uiDEConfig.tableWidget_customCommand->viewport()->mapToGlobal(pos)); if (action == remove) uiDEConfig.tableWidget_customCommand->removeRow( @@ -624,7 +633,7 @@ void AwesomeWidget::contextMenuPkgCommand(const QPoint pos) if (uiDEConfig.tableWidget_pkgCommand->currentItem() == 0) return; QMenu menu(uiDEConfig.tableWidget_pkgCommand); - QAction *remove = menu.addAction(i18n("Remove")); + QAction *remove = menu.addAction(QIcon("edit-delete"), i18n("Remove")); QAction *action = menu.exec(uiDEConfig.tableWidget_pkgCommand->viewport()->mapToGlobal(pos)); if (action == remove) uiDEConfig.tableWidget_pkgCommand->removeRow( diff --git a/sources/awesome-widget/deinteraction.cpp b/sources/awesome-widget/deinteraction.cpp index 97a02b4..25c1ec5 100644 --- a/sources/awesome-widget/deinteraction.cpp +++ b/sources/awesome-widget/deinteraction.cpp @@ -18,6 +18,7 @@ #include "awesome-widget.h" #include +#include #include @@ -33,23 +34,21 @@ void AwesomeWidget::connectToEngine() extsysmonEngine->connectSource(QString("battery"), this, configuration[QString("interval")].toInt()); // cpu + sysmonEngine->connectSource(QString("cpu/system/TotalLoad"), + this, configuration[QString("interval")].toInt()); regExp = QRegExp(QString("cpu.*")); - if (foundKeys.indexOf(regExp) > -1) { - sysmonEngine->connectSource(QString("cpu/system/TotalLoad"), - this, configuration[QString("interval")].toInt()); + if (foundKeys.indexOf(regExp) > -1) for (int i=0; iconnectSource(QString("cpu/cpu") + QString::number(i) + QString("/TotalLoad"), this, configuration[QString("interval")].toInt()); - } // cpuclock + sysmonEngine->connectSource(QString("cpu/system/AverageClock"), + this, configuration[QString("interval")].toInt()); regExp = QRegExp(QString("cpucl.*")); - if (foundKeys.indexOf(regExp) > -1) { - sysmonEngine->connectSource(QString("cpu/system/AverageClock"), - this, configuration[QString("interval")].toInt()); + if (foundKeys.indexOf(regExp) > -1) for (int i=0; iconnectSource(QString("cpu/cpu") + QString::number(i) + QString("/clock"), this, configuration[QString("interval")].toInt()); - } // custom command regExp = QRegExp(QString("custom.*")); if (foundKeys.indexOf(regExp) > -1) @@ -96,24 +95,18 @@ void AwesomeWidget::connectToEngine() extsysmonEngine->connectSource(QString("hddtemp"), this, configuration[QString("interval")].toInt()); // memory - regExp = QRegExp(QString("mem.*")); - if (foundKeys.indexOf(regExp) > -1) { - sysmonEngine->connectSource(QString("mem/physical/free"), - this, configuration[QString("interval")].toInt()); - sysmonEngine->connectSource(QString("mem/physical/used"), - this, configuration[QString("interval")].toInt()); - sysmonEngine->connectSource(QString("mem/physical/application"), - this, configuration[QString("interval")].toInt()); - } + sysmonEngine->connectSource(QString("mem/physical/free"), + this, configuration[QString("interval")].toInt()); + sysmonEngine->connectSource(QString("mem/physical/used"), + this, configuration[QString("interval")].toInt()); + sysmonEngine->connectSource(QString("mem/physical/application"), + this, configuration[QString("interval")].toInt()); // network - regExp = QRegExp(QString("(down|up|netdev)")); - if (foundKeys.indexOf(regExp) > -1) { - networkDeviceUpdate = 0; - sysmonEngine->connectSource(QString("network/interfaces/") + values[QString("netdev")] + QString("/transmitter/data"), - this, configuration[QString("interval")].toInt()); - sysmonEngine->connectSource(QString("network/interfaces/") + values[QString("netdev")] + QString("/receiver/data"), - this, configuration[QString("interval")].toInt()); - } + networkDeviceUpdate = 0; + sysmonEngine->connectSource(QString("network/interfaces/") + values[QString("netdev")] + QString("/transmitter/data"), + this, configuration[QString("interval")].toInt()); + sysmonEngine->connectSource(QString("network/interfaces/") + values[QString("netdev")] + QString("/receiver/data"), + this, configuration[QString("interval")].toInt()); // package manager regExp = QRegExp(QString("pkgcount.*")); if (foundKeys.indexOf(regExp) > -1) @@ -130,13 +123,10 @@ void AwesomeWidget::connectToEngine() extsysmonEngine->connectSource(QString("ps"), this, configuration[QString("interval")].toInt()); // swap - regExp = QRegExp(QString("swap.*")); - if (foundKeys.indexOf(regExp) > -1) { - sysmonEngine->connectSource(QString("mem/swap/free"), - this, configuration[QString("interval")].toInt()); - sysmonEngine->connectSource(QString("mem/swap/used"), - this, configuration[QString("interval")].toInt()); - } + sysmonEngine->connectSource(QString("mem/swap/free"), + this, configuration[QString("interval")].toInt()); + sysmonEngine->connectSource(QString("mem/swap/used"), + this, configuration[QString("interval")].toInt()); // temp regExp = QRegExp(QString("temp.*")); if (foundKeys.indexOf(regExp) > -1) @@ -182,7 +172,8 @@ void AwesomeWidget::dataUpdated(const QString &sourceName, const Plasma::DataEng values[QString("bat")] = QString("%1").arg(data[QString("bat")].toFloat(), 3, 'f', 0); } else if (sourceName == QString("cpu/system/TotalLoad")) { values[QString("cpu")] = QString("%1").arg(data[QString("value")].toFloat(), 5, 'f', 1); - if (configuration[QString("cpuTooltip")].toInt() == 2) + if ((configuration[QString("cpuTooltip")].toInt() == 2) && + (!isnan(data[QString("value")].toFloat()))) tooltipValues[QString("cpu")].append(data[QString("value")].toFloat()); } else if (sourceName.indexOf(cpuRegExp) > -1) { QString number = sourceName; @@ -191,7 +182,8 @@ void AwesomeWidget::dataUpdated(const QString &sourceName, const Plasma::DataEng values[QString("cpu") + number] = QString("%1").arg(data[QString("value")].toFloat(), 5, 'f', 1); } else if (sourceName == QString("cpu/system/AverageClock")) { values[QString("cpucl")] = QString("%1").arg(data[QString("value")].toFloat(), 4, 'f', 0); - if (configuration[QString("cpuclTooltip")].toInt() == 2) + if ((configuration[QString("cpuclTooltip")].toInt() == 2) && + (!isnan(data[QString("value")].toFloat()))) tooltipValues[QString("cpucl")].append(data[QString("value")].toFloat()); } else if (sourceName.indexOf(cpuclRegExp) > -1) { QString number = sourceName; @@ -274,28 +266,30 @@ void AwesomeWidget::dataUpdated(const QString &sourceName, const Plasma::DataEng break; } } else if (sourceName == QString("mem/physical/application")) { - values[QString("memappmb")] = QString("%1").arg(data[QString("value")].toFloat() / 1024.0, 0, 'f', 0); - values[QString("memappgb")] = QString("%1").arg(data[QString("value")].toFloat() / (1024.0 * 1024.0), 5, 'f', 1); + values[QString("memmb")] = QString("%1").arg(data[QString("value")].toFloat() / 1024.0, 0, 'f', 0); + values[QString("memgb")] = QString("%1").arg(data[QString("value")].toFloat() / (1024.0 * 1024.0), 5, 'f', 1); } else if (sourceName == QString("mem/physical/free")) { values[QString("memfreemb")] = QString("%1").arg(data[QString("value")].toFloat() / 1024.0, 0, 'f', 0); values[QString("memfreegb")] = QString("%1").arg(data[QString("value")].toFloat() / (1024.0 * 1024.0), 5, 'f', 1); } else if (sourceName == QString("mem/physical/used")) { - values[QString("memmb")] = QString("%1").arg(data[QString("value")].toFloat() / 1024.0, 0, 'f', 0); - values[QString("memgb")] = QString("%1").arg(data[QString("value")].toFloat() / (1024.0 * 1024.0), 5, 'f', 1); + values[QString("memusedmb")] = QString("%1").arg(data[QString("value")].toFloat() / 1024.0, 0, 'f', 0); + values[QString("memusedgb")] = QString("%1").arg(data[QString("value")].toFloat() / (1024.0 * 1024.0), 5, 'f', 1); // total values[QString("memtotmb")] = QString("%1").arg( - values[QString("memmb")].toInt() + values[QString("memfreemb")].toInt()); + values[QString("memusedmb")].toInt() + values[QString("memfreemb")].toInt()); values[QString("memtotgb")] = QString("%1").arg( - values[QString("memgb")].toFloat() + values[QString("memfreegb")].toFloat(), + values[QString("memusedgb")].toFloat() + values[QString("memfreegb")].toFloat(), 5, 'f', 1); // percentage values[QString("mem")] = QString("%1").arg(100.0 * values[QString("memmb")].toFloat() / values[QString("memtotmb")].toFloat(), 5, 'f', 1); - if (configuration[QString("memTooltip")].toInt() == 2) + if ((configuration[QString("memTooltip")].toInt() == 2) && + (!isnan(values[QString("mem")].toFloat()))) tooltipValues[QString("mem")].append(values[QString("mem")].toFloat()); } else if (sourceName.indexOf(netRecRegExp) > -1) { values[QString("down")] = QString("%1").arg(data[QString("value")].toFloat(), 4, 'f', 0); - if (configuration[QString("downTooltip")].toInt() == 2) + if ((configuration[QString("downTooltip")].toInt() == 2) && + (!isnan(data[QString("value")].toFloat()))) tooltipValues[QString("down")].append(data[QString("value")].toFloat()); networkDeviceUpdate++; if (networkDeviceUpdate == 30) { @@ -312,7 +306,8 @@ void AwesomeWidget::dataUpdated(const QString &sourceName, const Plasma::DataEng } } else if (sourceName.indexOf(netTransRegExp) > -1) { values[QString("up")] = QString("%1").arg(data[QString("value")].toFloat(), 4, 'f', 0); - if (configuration[QString("upTooltip")].toInt() == 2) + if ((configuration[QString("downTooltip")].toInt() == 2) && + (!isnan(data[QString("value")].toFloat()))) tooltipValues[QString("up")].append(data[QString("value")].toFloat()); } else if (sourceName == QString("pkg")) { for (int i=0; i -1) { for (int i=0; i -1) extsysmonEngine->disconnectSource(QString("battery"), this); // cpu + sysmonEngine->disconnectSource(QString("cpu/system/TotalLoad"), this); regExp = QRegExp(QString("cpu.*")); - if (foundKeys.indexOf(regExp) > -1) { - sysmonEngine->disconnectSource(QString("cpu/system/TotalLoad"), this); + if (foundKeys.indexOf(regExp) > -1) for (int i=0; idisconnectSource(QString("cpu/cpu") + QString::number(i) + QString("/TotalLoad"), this); - } // cpuclock + sysmonEngine->disconnectSource(QString("cpu/system/AverageClock"), this); regExp = QRegExp(QString("cpucl.*")); - if (foundKeys.indexOf(regExp) > -1) { - sysmonEngine->disconnectSource(QString("cpu/system/AverageClock"), this); + if (foundKeys.indexOf(regExp) > -1) for (int i=0; idisconnectSource(QString("cpu/cpu") + QString::number(i) + QString("/clock"), this); - } // custom command regExp = QRegExp(QString("custom.*")); if (foundKeys.indexOf(regExp) > -1) @@ -435,18 +429,12 @@ void AwesomeWidget::disconnectFromEngine() if (foundKeys.indexOf(regExp) > -1) extsysmonEngine->disconnectSource(QString("hddtemp"), this); // memory - regExp = QRegExp(QString("mem.*")); - if (foundKeys.indexOf(regExp) > -1) { - sysmonEngine->disconnectSource(QString("mem/physical/free"), this); - sysmonEngine->disconnectSource(QString("mem/physical/used"), this); - sysmonEngine->disconnectSource(QString("mem/physical/application"), this); - } + sysmonEngine->disconnectSource(QString("mem/physical/free"), this); + sysmonEngine->disconnectSource(QString("mem/physical/used"), this); + sysmonEngine->disconnectSource(QString("mem/physical/application"), this); // network - regExp = QRegExp(QString("(down|up|netdev)")); - if (foundKeys.indexOf(regExp) > -1) { - sysmonEngine->disconnectSource(QString("network/interfaces/") + values[QString("netdev")] + QString("/transmitter/data"), this); - sysmonEngine->disconnectSource(QString("network/interfaces/") + values[QString("netdev")] + QString("/receiver/data"), this); - } + sysmonEngine->disconnectSource(QString("network/interfaces/") + values[QString("netdev")] + QString("/transmitter/data"), this); + sysmonEngine->disconnectSource(QString("network/interfaces/") + values[QString("netdev")] + QString("/receiver/data"), this); // package manager regExp = QRegExp(QString("pkgcount.*")); if (foundKeys.indexOf(regExp) > -1) @@ -460,11 +448,8 @@ void AwesomeWidget::disconnectFromEngine() if (foundKeys.indexOf(regExp) > -1) extsysmonEngine->disconnectSource(QString("ps"), this); // swap - regExp = QRegExp(QString("swap.*")); - if (foundKeys.indexOf(regExp) > -1) { - sysmonEngine->disconnectSource(QString("mem/swap/free"), this); - sysmonEngine->disconnectSource(QString("mem/swap/used"), this); - } + sysmonEngine->disconnectSource(QString("mem/swap/free"), this); + sysmonEngine->disconnectSource(QString("mem/swap/used"), this); // temp regExp = QRegExp(QString("temp.*")); if (foundKeys.indexOf(regExp) > -1) diff --git a/sources/awesome-widget/reinit.cpp b/sources/awesome-widget/reinit.cpp index 92fe1d2..8a8cd72 100644 --- a/sources/awesome-widget/reinit.cpp +++ b/sources/awesome-widget/reinit.cpp @@ -44,15 +44,15 @@ void AwesomeWidget::reinit() setBackgroundHints(NoBackground); else setBackgroundHints(DefaultBackground); - if (configuration[QString("layout")].toInt() == 0) - mainLayout->setOrientation(Qt::Horizontal); - else - mainLayout->setOrientation(Qt::Vertical); if (configuration[QString("leftStretch")].toInt() == 2) mainLayout->addStretch(1); if (configuration[QString("popup")].toInt() == 0) textLabel->setPopupEnabled(true); + else + textLabel->setPopupEnabled(false); + updateText(true); mainLayout->addItem(textLabel); + resize(10, 10); if (configuration[QString("rightStretch")].toInt() == 2) mainLayout->addStretch(1); @@ -62,8 +62,6 @@ void AwesomeWidget::reinit() values[QString("netdev")] = getNetworkDevice(); // thread()->wait(60000); connectToEngine(); - updateText(true); - resize(10, 10); } @@ -72,6 +70,7 @@ void AwesomeWidget::updateText(bool clear) if (debug) qDebug() << PDEBUG; QString text = configuration[QString("text")]; + text.replace(QString("\n"), QString("
")); if (!clear) for (int i=0; iresize(100.0 * counts[QString("tooltip")], 100.0); + // remove nan // boundaries QMap boundaries; @@ -92,14 +92,14 @@ void AwesomeWidget::updateTooltip() boundaries[QString("mem")] = 100.0; boundaries[QString("swap")] = 100.0; boundaries[QString("down")] = 1.0; - if (configuration[QString("downTooltip")].toInt() == 2) + if (configuration[QString("downTooltip")].toInt() == 2) { for (int i=0; isetBackgroundBrush(QBrush(Qt::NoBrush)); bool down = false; - for (int i=0; iaddLine(x1, y1, x2, y2, pen); } - if (tooltipValues.keys()[i] == QString("down")) + if (trueKeys[i] == QString("down")) down = true; } diff --git a/sources/awesome-widget/tooltip.cpp b/sources/awesome-widget/tooltip.cpp deleted file mode 100644 index 1b8c54d..0000000 --- a/sources/awesome-widget/tooltip.cpp +++ /dev/null @@ -1,77 +0,0 @@ -/*************************************************************************** - * This file is part of pytextmonitor * - * * - * pytextmonitor is free software: you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation, either version 3 of the * - * License, or (at your option) any later version. * - * * - * pytextmonitor is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with pytextmonitor. If not, see http://www.gnu.org/licenses/ * - ***************************************************************************/ - -#include "awesome-widget.h" - -#include - - -void AwesomeWidget::initValues() -{ - if (debug) qDebug() << PDEBUG; -} - - -void AwesomeWidget::reinit() -{ - if (debug) qDebug() << PDEBUG; - - mainLayout = new QGraphicsLinearLayout(); - mainLayout->setContentsMargins(1, 1, 1, 1); - setLayout(mainLayout); - - if (configuration[QString("background")].toInt() == 0) - setBackgroundHints(NoBackground); - else - setBackgroundHints(DefaultBackground); - if (configuration[QString("layout")].toInt() == 0) - mainLayout->setOrientation(Qt::Horizontal); - else - mainLayout->setOrientation(Qt::Vertical); - if (configuration[QString("leftStretch")].toInt() == 2) - mainLayout->addStretch(1); - if (configuration[QString("popup")].toInt() == 0) - textLabel->setPopupEnabled(true); - mainLayout->addItem(textLabel); - if (configuration[QString("rightStretch")].toInt() == 2) - mainLayout->addStretch(1); - - keys = getKeys(); - foundKeys = findKeys(); - initValues(); - values[QString("netdev")] = getNetworkDevice(); -// thread()->wait(60000); - connectToEngine(); - resize(10, 10); -} - - -void AwesomeWidget::updateText() -{ - if (debug) qDebug() << PDEBUG; - - QString text = configuration[QString("text")]; - for (int i=0; isetText(text); -} - - -void AwesomeWidget::updateTooltip() -{ - if (debug) qDebug() << PDEBUG; -} diff --git a/sources/awesome-widget/tooltipconfig.ui b/sources/awesome-widget/tooltipconfig.ui index 4c6a0c1..4c1833b 100644 --- a/sources/awesome-widget/tooltipconfig.ui +++ b/sources/awesome-widget/tooltipconfig.ui @@ -376,19 +376,32 @@ - + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 20 + 20 + + + + + + - 200 + 180 0 Upload speed color - - true - diff --git a/sources/awesome-widget/widget.ui b/sources/awesome-widget/widget.ui index 9685ddc..2680597 100644 --- a/sources/awesome-widget/widget.ui +++ b/sources/awesome-widget/widget.ui @@ -7,7 +7,7 @@ 0 0 700 - 594 + 600 @@ -19,7 +19,7 @@ 700 - 0 + 600