diff --git a/sources/awesome-widget/plugin/awactions.cpp b/sources/awesome-widget/plugin/awactions.cpp index 0fb24ff..1b5168c 100644 --- a/sources/awesome-widget/plugin/awactions.cpp +++ b/sources/awesome-widget/plugin/awactions.cpp @@ -23,6 +23,8 @@ #include #include #include +#include +#include #include #include #include @@ -141,9 +143,9 @@ QString AWActions::getAboutText(const QString type) const QStringList trdPartyList = QString(TRDPARTY_LICENSE).split(QChar(';'), QString::SkipEmptyParts); for (int i=0; i%1 (%2 license)") - .arg(trdPartyList[i].split(QChar(','))[0]) - .arg(trdPartyList[i].split(QChar(','))[1]) - .arg(trdPartyList[i].split(QChar(','))[2]); + .arg(trdPartyList.at(i).split(QChar(','))[0]) + .arg(trdPartyList.at(i).split(QChar(','))[1]) + .arg(trdPartyList.at(i).split(QChar(','))[2]); text = i18n("This software uses: %1", trdPartyList.join(QString(", "))); } @@ -249,26 +251,28 @@ void AWActions::versionReplyRecieved(QNetworkReply *reply) const { if (debug) qDebug() << PDEBUG; - QString answer = reply->readAll(); - if (!answer.contains(QString("tag_name"))) return; - QString version = QString(VERSION); - if (debug) qDebug() << PDEBUG << answer; - for (int i=0; ireadAll(), &error); + reply->deleteLater(); + if (debug) qDebug() << PDEBUG << ":" << "Json parse error" << error.errorString(); + if ((reply->error() != QNetworkReply::NoError) || + (error.error != QJsonParseError::NoError)) { + return; } - int old_major = QString(VERSION).split(QChar('.'))[0].toInt(); - int old_minor = QString(VERSION).split(QChar('.'))[1].toInt(); - int old_patch = QString(VERSION).split(QChar('.'))[2].toInt(); - int new_major = QString(version).split(QChar('.'))[0].toInt(); - int new_minor = QString(version).split(QChar('.'))[1].toInt(); - int new_patch = QString(version).split(QChar('.'))[2].toInt(); + // convert to map + QVariantMap firstRelease = jsonDoc.toVariant().toList().first().toMap(); + QString version = firstRelease[QString("tag_name")].toString(); + version.remove(QString("V.")); + + int old_major = QString(VERSION).split(QChar('.')).at(0).toInt(); + int old_minor = QString(VERSION).split(QChar('.')).at(1).toInt(); + int old_patch = QString(VERSION).split(QChar('.')).at(2).toInt(); + int new_major = QString(version).split(QChar('.')).at(0).toInt(); + int new_minor = QString(version).split(QChar('.')).at(1).toInt(); + int new_patch = QString(version).split(QChar('.')).at(2).toInt(); if ((old_major < new_major) || ((old_major == new_major) && (old_minor < new_minor)) || ((old_major == new_major) && (old_minor == new_minor) && (old_patch < new_patch))) - showUpdates(version); + return showUpdates(version); } diff --git a/sources/awesome-widget/plugin/awkeys.cpp b/sources/awesome-widget/plugin/awkeys.cpp index 541f371..6e72dfd 100644 --- a/sources/awesome-widget/plugin/awkeys.cpp +++ b/sources/awesome-widget/plugin/awkeys.cpp @@ -131,10 +131,10 @@ QString AWKeys::parsePattern() const QString parsed = pattern; parsed.replace(QString("$$"), QString("$\\$\\")); - for (int i=0; iimage(valueByKey(foundBars[i]).toFloat())); + foreach(QString key, foundKeys) + parsed.replace(QString("$%1").arg(key), htmlValue(key)); + foreach(QString bar, foundBars) + parsed.replace(QString("$%1").arg(bar), getItemByTag(bar)->image(valueByKey(bar).toFloat())); parsed.replace(QString("$\\$\\"), QString("$$")); // wrap new lines if required if (wrapNewLines) parsed.replace(QString("\n"), QString("
")); @@ -269,26 +269,26 @@ QStringList AWKeys::dictKeys(const bool sorted) const allKeys.append(QString("ps")); // package manager for (int i=extUpgrade->items().count()-1; i>=0; i--) { - if (!extUpgrade->items()[i]->isActive()) continue; - allKeys.append(extUpgrade->items()[i]->tag(QString("pkgcount"))); + if (!extUpgrade->items().at(i)->isActive()) continue; + allKeys.append(extUpgrade->items().at(i)->tag(QString("pkgcount"))); } // quotes for (int i=extQuotes->items().count()-1; i>=0; i--) { - if (!extQuotes->items()[i]->isActive()) continue; - allKeys.append(extQuotes->items()[i]->tag(QString("ask"))); - allKeys.append(extQuotes->items()[i]->tag(QString("askchg"))); - allKeys.append(extQuotes->items()[i]->tag(QString("percaskchg"))); - allKeys.append(extQuotes->items()[i]->tag(QString("bid"))); - allKeys.append(extQuotes->items()[i]->tag(QString("bidchg"))); - allKeys.append(extQuotes->items()[i]->tag(QString("percbidchg"))); - allKeys.append(extQuotes->items()[i]->tag(QString("price"))); - allKeys.append(extQuotes->items()[i]->tag(QString("pricechg"))); - allKeys.append(extQuotes->items()[i]->tag(QString("percpricechg"))); + if (!extQuotes->items().at(i)->isActive()) continue; + allKeys.append(extQuotes->items().at(i)->tag(QString("ask"))); + allKeys.append(extQuotes->items().at(i)->tag(QString("askchg"))); + allKeys.append(extQuotes->items().at(i)->tag(QString("percaskchg"))); + allKeys.append(extQuotes->items().at(i)->tag(QString("bid"))); + allKeys.append(extQuotes->items().at(i)->tag(QString("bidchg"))); + allKeys.append(extQuotes->items().at(i)->tag(QString("percbidchg"))); + allKeys.append(extQuotes->items().at(i)->tag(QString("price"))); + allKeys.append(extQuotes->items().at(i)->tag(QString("pricechg"))); + allKeys.append(extQuotes->items().at(i)->tag(QString("percpricechg"))); } // custom for (int i=extScripts->items().count()-1; i>=0; i--) { - if (!extScripts->items()[i]->isActive()) continue; - allKeys.append(extScripts->items()[i]->tag(QString("custom"))); + if (!extScripts->items().at(i)->isActive()) continue; + allKeys.append(extScripts->items().at(i)->tag(QString("custom"))); } // desktop allKeys.append(QString("desktop")); @@ -300,22 +300,21 @@ QStringList AWKeys::dictKeys(const bool sorted) const allKeys.append(QString("la1")); // weather for (int i=extWeather->items().count()-1; i>=0; i--) { - if (!extWeather->items()[i]->isActive()) continue; - allKeys.append(extWeather->items()[i]->tag(QString("weatherId"))); - allKeys.append(extWeather->items()[i]->tag(QString("weather"))); - allKeys.append(extWeather->items()[i]->tag(QString("humidity"))); - allKeys.append(extWeather->items()[i]->tag(QString("pressure"))); - allKeys.append(extWeather->items()[i]->tag(QString("temperature"))); - allKeys.append(extWeather->items()[i]->tag(QString("timestamp"))); + if (!extWeather->items().at(i)->isActive()) continue; + allKeys.append(extWeather->items().at(i)->tag(QString("weatherId"))); + allKeys.append(extWeather->items().at(i)->tag(QString("weather"))); + allKeys.append(extWeather->items().at(i)->tag(QString("humidity"))); + allKeys.append(extWeather->items().at(i)->tag(QString("pressure"))); + allKeys.append(extWeather->items().at(i)->tag(QString("temperature"))); + allKeys.append(extWeather->items().at(i)->tag(QString("timestamp"))); } // bars QStringList graphicalItemsKeys; - for (int i=0; iitems().count(); i++) - graphicalItemsKeys.append(QString("%1%2").arg(graphicalItems->items()[i]->name()) - .arg(graphicalItems->items()[i]->bar())); + foreach(GraphicalItem *item, graphicalItems->items()) + graphicalItemsKeys.append(QString("%1%2").arg(item->name()).arg(item->bar())); graphicalItemsKeys.sort(); for (int i=graphicalItemsKeys.count()-1; i>=0; i--) - allKeys.append(graphicalItemsKeys[i]); + allKeys.append(graphicalItemsKeys.at(i)); // sort if required if (sorted) allKeys.sort(); @@ -342,6 +341,7 @@ void AWKeys::setDataBySource(const QString sourceName, const QVariantMap data, { if (debug) qDebug() << PDEBUG; if (debug) qDebug() << PDEBUG << ":" << "Source" << sourceName; + if (debug) qDebug() << PDEBUG << ":" << "Data" << data; if (sourceName == QString("update")) return emit(needToBeUpdated()); @@ -362,8 +362,8 @@ void AWKeys::setDataBySource(const QString sourceName, const QVariantMap data, if (sourceName == QString("battery")) { // battery - for (int i=0; i= 90.0) && (values[QString("hdd%1").arg(i)].toFloat() < 90.0)) - AWActions::sendNotification(QString("event"), i18n("Free space on %1 less than 10%", mount), enablePopup); - values[QString("hdd%1").arg(i)] = QString("%1").arg(data[QString("value")].toFloat(), 5, 'f', 1); - break; - } + for (int i=0; i= 90.0) && (values[QString("hdd%1").arg(i)].toFloat() < 90.0)) + AWActions::sendNotification(QString("event"), i18n("Free space on %1 less than 10%", mount), enablePopup); + values[QString("hdd%1").arg(i)] = QString("%1").arg(data[QString("value")].toFloat(), 5, 'f', 1); + break; + } } else if (sourceName.contains(mountFreeRegExp)) { // free space QString mount = sourceName; mount.remove(QString("partitions")).remove(QString("/freespace")); - for (int i=0; i 1000.0) values[QString("down%1").arg(i)] = QString("%1").arg(value / 1024.0, 4, 'f', 1); else @@ -554,7 +552,7 @@ void AWKeys::setDataBySource(const QString sourceName, const QVariantMap data, device.remove(QString("network/interfaces/")).remove(QString("/transmitter/data")); QStringList allNetworkDevices = networkDevices; for (int i=0; i 1000.0) values[QString("up%1").arg(i)] = QString("%1").arg(data[QString("value")].toFloat() / 1024.0, 4, 'f', 1); else @@ -569,8 +567,7 @@ void AWKeys::setDataBySource(const QString sourceName, const QVariantMap data, } } else if (sourceName == QString("pkg")) { // package manager - for (int i=0; iitems().count(); i++) { - if (extScripts->items()[i]->tag(QString("custom")) != key) continue; - return extScripts->items()[i]->executable(); + foreach(ExtScript *item, extScripts->items()) { + if (item->tag(QString("custom")) != key) continue; + return item->executable(); } else if (key.contains(QRegExp(QString("^hdd[rw]")))) return QString("%1").arg(diskDevices[key.remove(QRegExp(QString("hdd[rw]"))).toInt()]); @@ -701,14 +696,14 @@ QString AWKeys::infoByKey(QString key) const else if (key.contains(QRegExp(QString("^(down|up)[0-9]")))) return QString("%1").arg(networkDevices[key.remove(QRegExp(QString("^(down|up)"))).toInt()]); else if (key.startsWith(QString("pkgcount"))) - for (int i=0; iitems().count(); i++) { - if (extUpgrade->items()[i]->tag(QString("pkgcount")) != key) continue; - return extUpgrade->items()[i]->executable(); + foreach(ExtUpgrade *item, extUpgrade->items()) { + if (item->tag(QString("pkgcount")) != key) continue; + return item->executable(); } else if (key.contains(QRegExp(QString("(^|perc)(ask|bid|price)(chg|)")))) - for (int i=0; iitems().count(); i++) { - if (extQuotes->items()[i]->number() != key.remove(QRegExp(QString("(^|perc)(ask|bid|price)(chg|)"))).toInt()) continue; - return extQuotes->items()[i]->ticker(); + foreach(ExtQuotes *item, extQuotes->items()) { + if (item->number() != key.remove(QRegExp(QString("(^|perc)(ask|bid|price)(chg|)"))).toInt()) continue; + return item->ticker(); } else if (key.startsWith(QString("temp"))) return QString("%1").arg(tempDevices[key.remove(QString("temp")).toInt()]); @@ -771,41 +766,35 @@ void AWKeys::loadKeysFromCache() .arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation)); if (debug) qDebug() << PDEBUG << ":" << "Cache file" << fileName; QSettings cache(fileName, QSettings::IniFormat); - QStringList cachedKeys; cache.beginGroup(QString("Disk")); diskDevices.clear(); - cachedKeys = cache.allKeys(); - for (int i=0; i rawInterfaceList = QNetworkInterface::allInterfaces(); - for (int i=0; iitems().count(); i++) - orderedKeys.append(graphicalItems->items()[i]->name() + graphicalItems->items()[i]->bar()); + foreach(GraphicalItem *item, graphicalItems->items()) + orderedKeys.append(item->name() + item->bar()); orderedKeys.sort(); QStringList selectedKeys; for (int i=orderedKeys.count()-1; i>=0; i--) - if (pattern.contains(QString("$%1").arg(orderedKeys[i]))) { - if (debug) qDebug() << PDEBUG << ":" << "Found key" << orderedKeys[i]; - selectedKeys.append(orderedKeys[i]); + if (pattern.contains(QString("$%1").arg(orderedKeys.at(i)))) { + if (debug) qDebug() << PDEBUG << ":" << "Found key" << orderedKeys.at(i); + selectedKeys.append(orderedKeys.at(i)); } return selectedKeys; @@ -932,11 +921,11 @@ QStringList AWKeys::findGraphicalItems() const QStringList AWKeys::findKeys() const { QStringList selectedKeys; - for (int i=0; iitems().count(); i++) { - if ((graphicalItems->items()[i]->name() + graphicalItems->items()[i]->bar()) != tag) continue; - item = graphicalItems->items()[i]; + foreach(GraphicalItem *gitem, graphicalItems->items()) { + if ((gitem->name() + gitem->bar()) != tag) continue; + item = gitem; break; } diff --git a/sources/awesome-widget/plugin/awtooltip.cpp b/sources/awesome-widget/plugin/awtooltip.cpp index a102867..b7aedbf 100644 --- a/sources/awesome-widget/plugin/awtooltip.cpp +++ b/sources/awesome-widget/plugin/awtooltip.cpp @@ -27,7 +27,7 @@ AWToolTip::AWToolTip(QObject *parent, QVariantMap settings) : QObject(parent), - configuration(settings) + configuration(qvariant_cast(settings)) { // debug QProcessEnvironment environment = QProcessEnvironment::systemEnvironment(); @@ -137,26 +137,26 @@ QPixmap AWToolTip::image() QBrush(Qt::NoBrush)); bool down = false; for (int i=0; i(data[requiredKeys[i]].count()); - float normY = 100.0 / (1.5 * boundaries[requiredKeys[i]]); - if (requiredKeys[i] != QString("batTooltip")) - pen.setColor(QColor(configuration[QString("%1Color").arg(requiredKeys[i])].toString())); + float normX = 100.0 / static_cast(data[requiredKeys.at(i)].count()); + float normY = 100.0 / (1.5 * boundaries[requiredKeys.at(i)]); + if (requiredKeys.at(i) != QString("batTooltip")) + pen.setColor(QColor(configuration[QString("%1Color").arg(requiredKeys.at(i))].toString())); float shift = i * 100.0; if (down) shift -= 100.0; - for (int j=0; j 0) + float y2 = - fabs(data[requiredKeys.at(i)].at(j+1)) * normY + 5.0; + if (requiredKeys.at(i) == QString("batTooltip")) { + if (data[requiredKeys.at(i)].at(j+1) > 0) pen.setColor(QColor(configuration[QString("batTooltipColor")].toString())); else pen.setColor(QColor(configuration[QString("batInTooltipColor")].toString())); } toolTipScene->addLine(x1, y1, x2, y2, pen); } - if (requiredKeys[i] == QString("downTooltip")) down = true; + if (requiredKeys.at(i) == QString("downTooltip")) down = true; } return toolTipView->grab(); @@ -179,12 +179,12 @@ void AWToolTip::setData(const QString source, float value, const bool ac) data[source].append(-value); if ((source == QString("downTooltip")) || (source == QString("upTooltip"))) { - for (int i=0; i boundaries; QHash> data; QStringList requiredKeys; diff --git a/sources/desktop-panel/plugin/dpadds.cpp b/sources/desktop-panel/plugin/dpadds.cpp index fcf3d8e..fdfcc20 100644 --- a/sources/desktop-panel/plugin/dpadds.cpp +++ b/sources/desktop-panel/plugin/dpadds.cpp @@ -110,8 +110,7 @@ QString DPAdds::toolTipImage(const int desktop) const DesktopWindowsInfo info = getInfoByDesktop(desktop); if (tooltipType == QString("names")) { QStringList windowList; - for (int i=0; i
  • %1
    • ").arg(windowList.join(QString("
  • "))); } // init @@ -139,8 +138,8 @@ QString DPAdds::toolTipImage(const int desktop) const QPen pen = QPen(); pen.setWidthF(2.0 * info.desktop.width() / 400.0); pen.setColor(QColor(tooltipColor)); - for (int i=0; iaddLine(rect.left() + margin, rect.bottom() + margin, rect.left() + margin, rect.top() + margin, pen); toolTipScene->addLine(rect.left() + margin, rect.top() + margin, @@ -152,22 +151,19 @@ QString DPAdds::toolTipImage(const int desktop) const } } else if (tooltipType == QString("clean")) { QScreen *screen = QGuiApplication::primaryScreen(); - for (int i=0; igrabWindow(info.desktopsData[i].id); - toolTipScene->addPixmap(desktop) - ->setOffset(info.desktopsData[i].rect.left(), info.desktopsData[i].rect.top()); + foreach(WindowData data, info.desktopsData) { + QPixmap desktop = screen->grabWindow(data.id); + toolTipScene->addPixmap(desktop)->setOffset(data.rect.left(), data.rect.top()); } } else if (tooltipType == QString("windows")) { QScreen *screen = QGuiApplication::primaryScreen(); - for (int i=0; igrabWindow(info.desktopsData[i].id); - toolTipScene->addPixmap(desktop) - ->setOffset(info.desktopsData[i].rect.left(), info.desktopsData[i].rect.top()); + foreach(WindowData data, info.desktopsData) { + QPixmap desktop = screen->grabWindow(data.id); + toolTipScene->addPixmap(desktop)->setOffset(data.rect.left(), data.rect.top()); } - for (int i=0; igrabWindow(info.windowsData[i].id); - toolTipScene->addPixmap(window) - ->setOffset(info.windowsData[i].rect.left(), info.windowsData[i].rect.top()); + foreach(WindowData data, info.windowsData) { + QPixmap window = screen->grabWindow(data.id); + toolTipScene->addPixmap(window)->setOffset(data.rect.left(), data.rect.top()); } } @@ -188,10 +184,9 @@ QString DPAdds::parsePattern(const QString pattern, const int desktop) const if (debug) qDebug() << PDEBUG; QString parsed = pattern; - QStringList keys = dictKeys(); parsed.replace(QString("$$"), QString("$\\$\\")); - for (int i=0; i panels = getPanels(); for (int i=0; ilocation()), widget); + QListWidgetItem *item = new QListWidgetItem(panelLocationToStr(panels.at(i)->location()), widget); if ((current.split(QChar(',')).contains(QString::number(i))) || (current == QString("-1"))) item->setCheckState(Qt::Checked); @@ -334,9 +329,9 @@ QString DPAdds::getAboutText(const QString type) const QStringList trdPartyList = QString(TRDPARTY_LICENSE).split(QChar(';'), QString::SkipEmptyParts); for (int i=0; i%1 (%2 license)") - .arg(trdPartyList[i].split(QChar(','))[0]) - .arg(trdPartyList[i].split(QChar(','))[1]) - .arg(trdPartyList[i].split(QChar(','))[2]); + .arg(trdPartyList.at(i).split(QChar(',')).at(0)) + .arg(trdPartyList.at(i).split(QChar(',')).at(1)) + .arg(trdPartyList.at(i).split(QChar(',')).at(2)); text = i18n("This software uses: %1", trdPartyList.join(QString(", "))); } @@ -370,16 +365,16 @@ void DPAdds::changePanelsState() const // QList panels = getPanels(); // for (int i=0; iview()->isVisible(); -// int winId = panels[i]->view()->winId(); +// bool wasVisible = panels.at(i)->view()->isVisible(); +// int winId = panels.at(i)->view()->winId(); // if (wasVisible) { // if (debug) qDebug() << PDEBUG << ":" << "Hide panel"; // KWindowInfo oldInfo = KWindowSystem::windowInfo(winId, NET::WMState); // oldState = oldInfo.state(); -// panels[i]->view()->setVisible(false); +// panels.at(i)->view()->setVisible(false); // } else { // if (debug) qDebug() << PDEBUG << ":" << "Show panel"; -// panels[i]->view()->setVisible(true); +// panels.at(i)->view()->setVisible(true); // KWindowSystem::clearState(winId, NET::KeepAbove); // KWindowSystem::setState(winId, oldState | NET::StaysOnTop); // KWindowSystem::setOnAllDesktops(winId, true); @@ -432,15 +427,14 @@ DPAdds::DesktopWindowsInfo DPAdds::getInfoByDesktop(const int desktop) const DesktopWindowsInfo info; info.desktop = KWindowSystem::workArea(desktop); - QList windows = KWindowSystem::windows(); - for (int i=0; i DPAdds::getPanels() const // Plasma::Corona *corona = new Plasma::Corona(this); QList panels; -// for (int i=0; icontainments().count(); i++) -// if (corona->containments()[i]->containmentType() == Plasma::Types::ContainmentType::PanelContainment) -// panels.append(corona->containments()[i]); +// foreach(Plasma::Containment *cont, corona->containments()) { +// if (cont->containmentType() != Plasma::Types::ContainmentType::PanelContainment) continue +// panels.append(cont); +// } // delete corona; return panels;