arcanis/awesome-widgets
1
0
Fork 0
mirror of https://github.com/arcan1s/awesome-widgets.git synced 2025-04-24 23:47:20 +00:00
Code Issues Projects Releases Wiki Activity

move plugins to iterators

Browse Source
This commit is contained in:
arcan1s 2015-08-08 00:22:25 +03:00
parent 3122c2fa8c
commit df473c53b5
5 changed files with 218 additions and 230 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
sources/awesome-widget/plugin/awactions.cpp
View File

@ -23,6 +23,8 @@
#include <QDebug> #include <QDebug>
#include <QDesktopServices> #include <QDesktopServices>
#include <QDir> #include <QDir>
#include <QJsonDocument>
#include <QJsonParseError>
#include <QMessageBox> #include <QMessageBox>
#include <QNetworkAccessManager> #include <QNetworkAccessManager>
#include <QNetworkRequest> #include <QNetworkRequest>
@ -141,9 +143,9 @@ QString AWActions::getAboutText(const QString type) const
QStringList trdPartyList = QString(TRDPARTY_LICENSE).split(QChar(';'), QString::SkipEmptyParts); QStringList trdPartyList = QString(TRDPARTY_LICENSE).split(QChar(';'), QString::SkipEmptyParts);
for (int i=0; i<trdPartyList.count(); i++) for (int i=0; i<trdPartyList.count(); i++)
trdPartyList[i] = QString("<a href=\"%3\">%1</a> (%2 license)") trdPartyList[i] = QString("<a href=\"%3\">%1</a> (%2 license)")
.arg(trdPartyList[i].split(QChar(','))[0]) .arg(trdPartyList.at(i).split(QChar(','))[0])
.arg(trdPartyList[i].split(QChar(','))[1]) .arg(trdPartyList.at(i).split(QChar(','))[1])
.arg(trdPartyList[i].split(QChar(','))[2]); .arg(trdPartyList.at(i).split(QChar(','))[2]);
text = i18n("This software uses: %1", trdPartyList.join(QString(", "))); text = i18n("This software uses: %1", trdPartyList.join(QString(", ")));
} }
@ -249,26 +251,28 @@ void AWActions::versionReplyRecieved(QNetworkReply *reply) const
{ {
if (debug) qDebug() << PDEBUG; if (debug) qDebug() << PDEBUG;
QString answer = reply->readAll(); QJsonParseError error;
if (!answer.contains(QString("tag_name"))) return; QJsonDocument jsonDoc = QJsonDocument::fromJson(reply->readAll(), &error);
QString version = QString(VERSION); reply->deleteLater();
if (debug) qDebug() << PDEBUG << answer; if (debug) qDebug() << PDEBUG << ":" << "Json parse error" << error.errorString();
for (int i=0; i<answer.split(QString("tag_name")).count(); i++) { if ((reply->error() != QNetworkReply::NoError) ||
version = answer.split(QString("tag_name"))[1].split(QChar(','))[0]; (error.error != QJsonParseError::NoError)) {
version.remove(QChar('"')); return;
version.remove(QChar(':'));
version.remove(QString("V."));
break;
} }
int old_major = QString(VERSION).split(QChar('.'))[0].toInt(); // convert to map
int old_minor = QString(VERSION).split(QChar('.'))[1].toInt(); QVariantMap firstRelease = jsonDoc.toVariant().toList().first().toMap();
int old_patch = QString(VERSION).split(QChar('.'))[2].toInt(); QString version = firstRelease[QString("tag_name")].toString();
int new_major = QString(version).split(QChar('.'))[0].toInt(); version.remove(QString("V."));
int new_minor = QString(version).split(QChar('.'))[1].toInt();
int new_patch = QString(version).split(QChar('.'))[2].toInt(); 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) || if ((old_major < new_major) ||
((old_major == new_major) && (old_minor < new_minor)) || ((old_major == new_major) && (old_minor < new_minor)) ||
((old_major == new_major) && (old_minor == new_minor) && (old_patch < new_patch))) ((old_major == new_major) && (old_minor == new_minor) && (old_patch < new_patch)))
showUpdates(version); return showUpdates(version);
} }

301
sources/awesome-widget/plugin/awkeys.cpp
View File

@ -131,10 +131,10 @@ QString AWKeys::parsePattern() const
QString parsed = pattern; QString parsed = pattern;
parsed.replace(QString("$$"), QString("$\\$\\")); parsed.replace(QString("$$"), QString("$\\$\\"));
for (int i=0; i<foundKeys.count(); i++) foreach(QString key, foundKeys)
parsed.replace(QString("$%1").arg(foundKeys[i]), htmlValue(foundKeys[i])); parsed.replace(QString("$%1").arg(key), htmlValue(key));
for (int i=0; i<foundBars.count(); i++) foreach(QString bar, foundBars)
parsed.replace(QString("$%1").arg(foundBars[i]), getItemByTag(foundBars[i])->image(valueByKey(foundBars[i]).toFloat())); parsed.replace(QString("$%1").arg(bar), getItemByTag(bar)->image(valueByKey(bar).toFloat()));
parsed.replace(QString("$\\$\\"), QString("$$")); parsed.replace(QString("$\\$\\"), QString("$$"));
// wrap new lines if required // wrap new lines if required
if (wrapNewLines) parsed.replace(QString("\n"), QString("<br>")); if (wrapNewLines) parsed.replace(QString("\n"), QString("<br>"));
@ -269,26 +269,26 @@ QStringList AWKeys::dictKeys(const bool sorted) const
allKeys.append(QString("ps")); allKeys.append(QString("ps"));
// package manager // package manager
for (int i=extUpgrade->items().count()-1; i>=0; i--) { for (int i=extUpgrade->items().count()-1; i>=0; i--) {
if (!extUpgrade->items()[i]->isActive()) continue; if (!extUpgrade->items().at(i)->isActive()) continue;
allKeys.append(extUpgrade->items()[i]->tag(QString("pkgcount"))); allKeys.append(extUpgrade->items().at(i)->tag(QString("pkgcount")));
} }
// quotes // quotes
for (int i=extQuotes->items().count()-1; i>=0; i--) { for (int i=extQuotes->items().count()-1; i>=0; i--) {
if (!extQuotes->items()[i]->isActive()) continue; if (!extQuotes->items().at(i)->isActive()) continue;
allKeys.append(extQuotes->items()[i]->tag(QString("ask"))); allKeys.append(extQuotes->items().at(i)->tag(QString("ask")));
allKeys.append(extQuotes->items()[i]->tag(QString("askchg"))); allKeys.append(extQuotes->items().at(i)->tag(QString("askchg")));
allKeys.append(extQuotes->items()[i]->tag(QString("percaskchg"))); allKeys.append(extQuotes->items().at(i)->tag(QString("percaskchg")));
allKeys.append(extQuotes->items()[i]->tag(QString("bid"))); allKeys.append(extQuotes->items().at(i)->tag(QString("bid")));
allKeys.append(extQuotes->items()[i]->tag(QString("bidchg"))); allKeys.append(extQuotes->items().at(i)->tag(QString("bidchg")));
allKeys.append(extQuotes->items()[i]->tag(QString("percbidchg"))); allKeys.append(extQuotes->items().at(i)->tag(QString("percbidchg")));
allKeys.append(extQuotes->items()[i]->tag(QString("price"))); allKeys.append(extQuotes->items().at(i)->tag(QString("price")));
allKeys.append(extQuotes->items()[i]->tag(QString("pricechg"))); allKeys.append(extQuotes->items().at(i)->tag(QString("pricechg")));
allKeys.append(extQuotes->items()[i]->tag(QString("percpricechg"))); allKeys.append(extQuotes->items().at(i)->tag(QString("percpricechg")));
} }
// custom // custom
for (int i=extScripts->items().count()-1; i>=0; i--) { for (int i=extScripts->items().count()-1; i>=0; i--) {
if (!extScripts->items()[i]->isActive()) continue; if (!extScripts->items().at(i)->isActive()) continue;
allKeys.append(extScripts->items()[i]->tag(QString("custom"))); allKeys.append(extScripts->items().at(i)->tag(QString("custom")));
} }
// desktop // desktop
allKeys.append(QString("desktop")); allKeys.append(QString("desktop"));
@ -300,22 +300,21 @@ QStringList AWKeys::dictKeys(const bool sorted) const
allKeys.append(QString("la1")); allKeys.append(QString("la1"));
// weather // weather
for (int i=extWeather->items().count()-1; i>=0; i--) { for (int i=extWeather->items().count()-1; i>=0; i--) {
if (!extWeather->items()[i]->isActive()) continue; if (!extWeather->items().at(i)->isActive()) continue;
allKeys.append(extWeather->items()[i]->tag(QString("weatherId"))); allKeys.append(extWeather->items().at(i)->tag(QString("weatherId")));
allKeys.append(extWeather->items()[i]->tag(QString("weather"))); allKeys.append(extWeather->items().at(i)->tag(QString("weather")));
allKeys.append(extWeather->items()[i]->tag(QString("humidity"))); allKeys.append(extWeather->items().at(i)->tag(QString("humidity")));
allKeys.append(extWeather->items()[i]->tag(QString("pressure"))); allKeys.append(extWeather->items().at(i)->tag(QString("pressure")));
allKeys.append(extWeather->items()[i]->tag(QString("temperature"))); allKeys.append(extWeather->items().at(i)->tag(QString("temperature")));
allKeys.append(extWeather->items()[i]->tag(QString("timestamp"))); allKeys.append(extWeather->items().at(i)->tag(QString("timestamp")));
} }
// bars // bars
QStringList graphicalItemsKeys; QStringList graphicalItemsKeys;
for (int i=0; i<graphicalItems->items().count(); i++) foreach(GraphicalItem *item, graphicalItems->items())
graphicalItemsKeys.append(QString("%1%2").arg(graphicalItems->items()[i]->name()) graphicalItemsKeys.append(QString("%1%2").arg(item->name()).arg(item->bar()));
.arg(graphicalItems->items()[i]->bar()));
graphicalItemsKeys.sort(); graphicalItemsKeys.sort();
for (int i=graphicalItemsKeys.count()-1; i>=0; i--) for (int i=graphicalItemsKeys.count()-1; i>=0; i--)
allKeys.append(graphicalItemsKeys[i]); allKeys.append(graphicalItemsKeys.at(i));
// sort if required // sort if required
if (sorted) allKeys.sort(); 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;
if (debug) qDebug() << PDEBUG << ":" << "Source" << sourceName; if (debug) qDebug() << PDEBUG << ":" << "Source" << sourceName;
if (debug) qDebug() << PDEBUG << ":" << "Data" << data;
if (sourceName == QString("update")) return emit(needToBeUpdated()); if (sourceName == QString("update")) return emit(needToBeUpdated());
@ -362,8 +362,8 @@ void AWKeys::setDataBySource(const QString sourceName, const QVariantMap data,
if (sourceName == QString("battery")) { if (sourceName == QString("battery")) {
// battery // battery
for (int i=0; i<data.keys().count(); i++) { foreach(QString key, data.keys()) {
if (data.keys()[i] == QString("ac")) { if (key == QString("ac")) {
// notification // notification
if ((values[QString("ac")] == params[QString("acOnline")].toString()) != data[QString("ac")].toBool()) { if ((values[QString("ac")] == params[QString("acOnline")].toString()) != data[QString("ac")].toBool()) {
if (data[QString("ac")].toBool()) if (data[QString("ac")].toBool())
@ -372,13 +372,12 @@ void AWKeys::setDataBySource(const QString sourceName, const QVariantMap data,
AWActions::sendNotification(QString("event"), i18n("AC offline"), enablePopup); AWActions::sendNotification(QString("event"), i18n("AC offline"), enablePopup);
} }
// value // value
values[QString("ac")] = data.keys()[i];
if (data[QString("ac")].toBool()) if (data[QString("ac")].toBool())
values[QString("ac")] = params[QString("acOnline")].toString(); values[QString("ac")] = params[QString("acOnline")].toString();
else else
values[QString("ac")] = params[QString("acOffline")].toString(); values[QString("ac")] = params[QString("acOffline")].toString();
} else } else
values[data.keys()[i]] = QString("%1").arg(data[data.keys()[i]].toFloat(), 3, 'f', 0); values[key] = QString("%1").arg(data[key].toFloat(), 3, 'f', 0);
} }
} else if (sourceName == QString("cpu/system/TotalLoad")) { } else if (sourceName == QString("cpu/system/TotalLoad")) {
// cpu // cpu
@ -402,8 +401,7 @@ void AWKeys::setDataBySource(const QString sourceName, const QVariantMap data,
values[QString("cpucl") + number] = QString("%1").arg(data[QString("value")].toFloat(), 4, 'f', 0); values[QString("cpucl") + number] = QString("%1").arg(data[QString("value")].toFloat(), 4, 'f', 0);
} else if (sourceName == QString("custom")) { } else if (sourceName == QString("custom")) {
// custom // custom
for (int i=0; i<data.keys().count(); i++) foreach(QString key, data.keys()) values[key] = data[key].toString();
values[data.keys()[i]] = data[data.keys()[i]].toString();
} else if (sourceName == QString("desktop")) { } else if (sourceName == QString("desktop")) {
// desktops // desktops
values[QString("desktop")] = data[QString("currentName")].toString(); values[QString("desktop")] = data[QString("currentName")].toString();
@ -413,20 +411,20 @@ void AWKeys::setDataBySource(const QString sourceName, const QVariantMap data,
// read speed // read speed
QString device = sourceName; QString device = sourceName;
device.remove(QString("/Rate/rblk")); device.remove(QString("/Rate/rblk"));
for (int i=0; i<diskDevices.count(); i++) for (int i=0; i<diskDevices.count(); i++) {
if (diskDevices[i] == device) { if (diskDevices.at(i) != device) continue;
values[QString("hddr%1").arg(i)] = QString("%1").arg(data[QString("value")].toFloat(), 5, 'f', 0); values[QString("hddr%1").arg(i)] = QString("%1").arg(data[QString("value")].toFloat(), 5, 'f', 0);
break; break;
} }
} else if (sourceName.contains(hddwRegExp)) { } else if (sourceName.contains(hddwRegExp)) {
// write speed // write speed
QString device = sourceName; QString device = sourceName;
device.remove(QString("/Rate/wblk")); device.remove(QString("/Rate/wblk"));
for (int i=0; i<diskDevices.count(); i++) for (int i=0; i<diskDevices.count(); i++) {
if (diskDevices[i] == device) { if (diskDevices.at(i) != device) continue;
values[QString("hddw%1").arg(i)] = QString("%1").arg(data[QString("value")].toFloat(), 5, 'f', 0); values[QString("hddw%1").arg(i)] = QString("%1").arg(data[QString("value")].toFloat(), 5, 'f', 0);
break; break;
} }
} else if (sourceName == QString("gpu")) { } else if (sourceName == QString("gpu")) {
// gpu load // gpu load
// notification // notification
@ -442,53 +440,53 @@ void AWKeys::setDataBySource(const QString sourceName, const QVariantMap data,
// fill level // fill level
QString mount = sourceName; QString mount = sourceName;
mount.remove(QString("partitions")).remove(QString("/filllevel")); mount.remove(QString("partitions")).remove(QString("/filllevel"));
for (int i=0; i<mountDevices.count(); i++) for (int i=0; i<mountDevices.count(); i++) {
if (mountDevices[i] == mount) { if (mountDevices.at(i) != mount) continue;
if ((data[QString("value")].toFloat() >= 90.0) && (values[QString("hdd%1").arg(i)].toFloat() < 90.0)) if ((data[QString("value")].toFloat() >= 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); 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); values[QString("hdd%1").arg(i)] = QString("%1").arg(data[QString("value")].toFloat(), 5, 'f', 1);
break; break;
} }
} else if (sourceName.contains(mountFreeRegExp)) { } else if (sourceName.contains(mountFreeRegExp)) {
// free space // free space
QString mount = sourceName; QString mount = sourceName;
mount.remove(QString("partitions")).remove(QString("/freespace")); mount.remove(QString("partitions")).remove(QString("/freespace"));
for (int i=0; i<mountDevices.count(); i++) for (int i=0; i<mountDevices.count(); i++) {
if (mountDevices[i] == mount) { if (mountDevices.at(i) != mount) continue;
values[QString("hddfreemb%1").arg(i)] = QString("%1").arg( values[QString("hddfreemb%1").arg(i)] = QString("%1").arg(
data[QString("value")].toFloat() / 1024.0, 5, 'f', 0); data[QString("value")].toFloat() / 1024.0, 5, 'f', 0);
values[QString("hddfreegb%1").arg(i)] = QString("%1").arg( values[QString("hddfreegb%1").arg(i)] = QString("%1").arg(
data[QString("value")].toFloat() / (1024.0 * 1024.0), 5, 'f', 1); data[QString("value")].toFloat() / (1024.0 * 1024.0), 5, 'f', 1);
break; break;
} }
} else if (sourceName.contains(mountUsedRegExp)) { } else if (sourceName.contains(mountUsedRegExp)) {
// used // used
QString mount = sourceName; QString mount = sourceName;
mount.remove(QString("partitions")).remove(QString("/usedspace")); mount.remove(QString("partitions")).remove(QString("/usedspace"));
for (int i=0; i<mountDevices.count(); i++) for (int i=0; i<mountDevices.count(); i++) {
if (mountDevices[i] == mount) { if (mountDevices.at(i) != mount) continue;
values[QString("hddmb%1").arg(i)] = QString("%1").arg( values[QString("hddmb%1").arg(i)] = QString("%1").arg(
data[QString("value")].toFloat() / 1024.0, 5, 'f', 0); data[QString("value")].toFloat() / 1024.0, 5, 'f', 0);
values[QString("hddgb%1").arg(i)] = QString("%1").arg( values[QString("hddgb%1").arg(i)] = QString("%1").arg(
data[QString("value")].toFloat() / (1024.0 * 1024.0), 5, 'f', 1); data[QString("value")].toFloat() / (1024.0 * 1024.0), 5, 'f', 1);
// total // total
values[QString("hddtotmb%1").arg(i)] = QString("%1").arg( values[QString("hddtotmb%1").arg(i)] = QString("%1").arg(
values[QString("hddfreemb%1").arg(i)].toInt() + values[QString("hddfreemb%1").arg(i)].toInt() +
values[QString("hddmb%1").arg(i)].toInt()); values[QString("hddmb%1").arg(i)].toInt());
values[QString("hddtotgb%1").arg(i)] = QString("%1").arg( values[QString("hddtotgb%1").arg(i)] = QString("%1").arg(
values[QString("hddfreegb%1").arg(i)].toFloat() + values[QString("hddfreegb%1").arg(i)].toFloat() +
values[QString("hddgb%1").arg(i)].toFloat(), 5, 'f', 1); values[QString("hddgb%1").arg(i)].toFloat(), 5, 'f', 1);
break; break;
} }
} else if (sourceName == QString("hddtemp")) { } else if (sourceName == QString("hddtemp")) {
// hdd temperature // hdd temperature
for (int i=0; i<data.keys().count(); i++) foreach(QString key, data.keys())
for (int j=0; j<hddDevices.count(); j++) for (int i=0; i<hddDevices.count(); i++) {
if (hddDevices[j] == data.keys()[i]) { if (hddDevices.at(i) != key) continue;
values[QString("hddtemp%1").arg(j)] = QString("%1").arg( values[QString("hddtemp%1").arg(i)] = QString("%1").arg(
temperature(data[data.keys()[i]].toFloat(), params[QString("tempUnits")].toString()), 4, 'f', 1); temperature(data[key].toFloat(), params[QString("tempUnits")].toString()), 4, 'f', 1);
break; break;
} }
} else if (sourceName.startsWith(QString("cpu/system/loadavg"))) { } else if (sourceName.startsWith(QString("cpu/system/loadavg"))) {
// load average // load average
QString time = sourceName; QString time = sourceName;
@ -534,7 +532,7 @@ void AWKeys::setDataBySource(const QString sourceName, const QVariantMap data,
device.remove(QString("network/interfaces/")).remove(QString("/receiver/data")); device.remove(QString("network/interfaces/")).remove(QString("/receiver/data"));
QStringList allNetworkDevices = networkDevices; QStringList allNetworkDevices = networkDevices;
for (int i=0; i<allNetworkDevices.count(); i++) { for (int i=0; i<allNetworkDevices.count(); i++) {
if (allNetworkDevices[i] != device) continue; if (allNetworkDevices.at(i) != device) continue;
if (value > 1000.0) if (value > 1000.0)
values[QString("down%1").arg(i)] = QString("%1").arg(value / 1024.0, 4, 'f', 1); values[QString("down%1").arg(i)] = QString("%1").arg(value / 1024.0, 4, 'f', 1);
else else
@ -554,7 +552,7 @@ void AWKeys::setDataBySource(const QString sourceName, const QVariantMap data,
device.remove(QString("network/interfaces/")).remove(QString("/transmitter/data")); device.remove(QString("network/interfaces/")).remove(QString("/transmitter/data"));
QStringList allNetworkDevices = networkDevices; QStringList allNetworkDevices = networkDevices;
for (int i=0; i<allNetworkDevices.count(); i++) { for (int i=0; i<allNetworkDevices.count(); i++) {
if (allNetworkDevices[i] != device) continue; if (allNetworkDevices.at(i) != device) continue;
if (value > 1000.0) if (value > 1000.0)
values[QString("up%1").arg(i)] = QString("%1").arg(data[QString("value")].toFloat() / 1024.0, 4, 'f', 1); values[QString("up%1").arg(i)] = QString("%1").arg(data[QString("value")].toFloat() / 1024.0, 4, 'f', 1);
else else
@ -569,8 +567,7 @@ void AWKeys::setDataBySource(const QString sourceName, const QVariantMap data,
} }
} else if (sourceName == QString("pkg")) { } else if (sourceName == QString("pkg")) {
// package manager // package manager
for (int i=0; i<data.keys().count(); i++) foreach(QString key, data.keys()) values[key] = QString("%1").arg(data[key].toInt(), 2);
values[data.keys()[i]] = QString("%1").arg(data[data.keys()[i]].toInt(), 2);
} else if (sourceName == QString("player")) { } else if (sourceName == QString("player")) {
// player // player
values[QString("album")] = data[QString("album")].toString(); values[QString("album")] = data[QString("album")].toString();
@ -585,8 +582,7 @@ void AWKeys::setDataBySource(const QString sourceName, const QVariantMap data,
values[QString("pstotal")] = QString("%1").arg(data[QString("pstotal")].toInt(), 3); values[QString("pstotal")] = QString("%1").arg(data[QString("pstotal")].toInt(), 3);
} else if (sourceName == QString("quotes")) { } else if (sourceName == QString("quotes")) {
// quotes // quotes
for (int i=0; i<data.keys().count(); i++) foreach(QString key, data.keys()) values[key] = QString("%1").arg(data[key].toFloat(), 7, 'f');
values[data.keys()[i]] = QString("%1").arg(data[data.keys()[i]].toFloat(), 7, 'f');
} else if (sourceName == QString("mem/swap/free")) { } else if (sourceName == QString("mem/swap/free")) {
// free swap // free swap
values[QString("swapfreemb")] = QString("%1").arg(data[QString("value")].toFloat() / 1024.0, 5, 'f', 0); values[QString("swapfreemb")] = QString("%1").arg(data[QString("value")].toFloat() / 1024.0, 5, 'f', 0);
@ -609,25 +605,24 @@ void AWKeys::setDataBySource(const QString sourceName, const QVariantMap data,
values[QString("swap")] = QString("%1").arg(value, 5, 'f', 1); values[QString("swap")] = QString("%1").arg(value, 5, 'f', 1);
} else if (sourceName.contains(tempRegExp)) { } else if (sourceName.contains(tempRegExp)) {
// temperature devices // temperature devices
for (int i=0; i<tempDevices.count(); i++) for (int i=0; i<tempDevices.count(); i++) {
if (sourceName == tempDevices[i]) { if (sourceName != tempDevices.at(i)) continue;
float temp = data[QString("units")].toString() == QString("°C") ? float temp = data[QString("units")].toString() == QString("°C") ?
temperature(data[QString("value")].toFloat(), params[QString("tempUnits")].toString()) : temperature(data[QString("value")].toFloat(), params[QString("tempUnits")].toString()) :
data[QString("value")].toFloat(); data[QString("value")].toFloat();
values[QString("temp%1").arg(i)] = QString("%1").arg(temp, 4, 'f', 1); values[QString("temp%1").arg(i)] = QString("%1").arg(temp, 4, 'f', 1);
break; break;
} }
} else if (sourceName == QString("Local")) { } else if (sourceName == QString("Local")) {
// time // time
values[QString("time")] = data[QString("DateTime")].toDateTime().toString(Qt::TextDate); values[QString("time")] = data[QString("DateTime")].toDateTime().toString(Qt::TextDate);
values[QString("isotime")] = data[QString("DateTime")].toDateTime().toString(Qt::ISODate); values[QString("isotime")] = data[QString("DateTime")].toDateTime().toString(Qt::ISODate);
values[QString("shorttime")] = data[QString("DateTime")].toDateTime().toString(Qt::SystemLocaleShortDate); values[QString("shorttime")] = data[QString("DateTime")].toDateTime().toString(Qt::SystemLocaleShortDate);
values[QString("longtime")] = data[QString("DateTime")].toDateTime().toString(Qt::SystemLocaleLongDate); values[QString("longtime")] = data[QString("DateTime")].toDateTime().toString(Qt::SystemLocaleLongDate);
QStringList _timeKeys = getTimeKeys();
values[QString("ctime")] = params[QString("customTime")].toString(); values[QString("ctime")] = params[QString("customTime")].toString();
for (int i=0; i<_timeKeys.count(); i++) foreach(QString key, getTimeKeys())
values[QString("ctime")].replace(QString("$") + _timeKeys[i], values[QString("ctime")].replace(QString("$%1").arg(key),
data[QString("DateTime")].toDateTime().toString(_timeKeys[i])); data[QString("DateTime")].toDateTime().toString(key));
} else if (sourceName == QString("system/uptime")) { } else if (sourceName == QString("system/uptime")) {
// uptime // uptime
int uptime = data[QString("value")].toFloat(); int uptime = data[QString("value")].toFloat();
@ -644,18 +639,18 @@ void AWKeys::setDataBySource(const QString sourceName, const QVariantMap data,
values[QString("cuptime")].replace(QString("$mm"), QString("%1").arg(minutes, 2, 10, QChar('0'))); values[QString("cuptime")].replace(QString("$mm"), QString("%1").arg(minutes, 2, 10, QChar('0')));
values[QString("cuptime")].replace(QString("$m"), QString("%1").arg(minutes)); values[QString("cuptime")].replace(QString("$m"), QString("%1").arg(minutes));
} else if (sourceName == QString("weather")) { } else if (sourceName == QString("weather")) {
for (int i=0; i<data.keys().count(); i++) { foreach(QString key, data.keys()) {
if (data.keys()[i].startsWith(QString("weatherId"))) if (key.startsWith(QString("weatherId")))
values[data.keys()[i]] = QString("%1").arg(data[data.keys()[i]].toInt()); values[key] = QString("%1").arg(data[key].toInt());
else if (data.keys()[i].startsWith(QString("weather"))) else if (key.startsWith(QString("weather")))
values[data.keys()[i]] = data[data.keys()[i]].toString(); values[key] = data[key].toString();
else if (data.keys()[i].startsWith(QString("humidity"))) else if (key.startsWith(QString("humidity")))
values[data.keys()[i]] = QString("%1").arg(data[data.keys()[i]].toInt(), 3); values[key] = QString("%1").arg(data[key].toInt(), 3);
else if (data.keys()[i].startsWith(QString("pressure"))) else if (key.startsWith(QString("pressure")))
values[data.keys()[i]] = QString("%1").arg(data[data.keys()[i]].toFloat(), 0, 'f', 1); values[key] = QString("%1").arg(data[key].toFloat(), 0, 'f', 1);
else if (data.keys()[i].startsWith(QString("temperature"))) else if (key.startsWith(QString("temperature")))
values[data.keys()[i]] = QString("%1").arg( values[key] = QString("%1").arg(
temperature(data[data.keys()[i]].toFloat(), params[QString("tempUnits")].toString()), 4, 'f', 1); temperature(data[key].toFloat(), params[QString("tempUnits")].toString()), 4, 'f', 1);
} }
} else { } else {
if (debug) qDebug() << PDEBUG << ":" << "Source" << sourceName << "not found"; if (debug) qDebug() << PDEBUG << ":" << "Source" << sourceName << "not found";
@ -688,9 +683,9 @@ QString AWKeys::infoByKey(QString key) const
key.remove(QRegExp(QString("^bar[0-9]{1,}"))); key.remove(QRegExp(QString("^bar[0-9]{1,}")));
if (key.startsWith(QString("custom"))) if (key.startsWith(QString("custom")))
for (int i=0; i<extScripts->items().count(); i++) { foreach(ExtScript *item, extScripts->items()) {
if (extScripts->items()[i]->tag(QString("custom")) != key) continue; if (item->tag(QString("custom")) != key) continue;
return extScripts->items()[i]->executable(); return item->executable();
} }
else if (key.contains(QRegExp(QString("^hdd[rw]")))) else if (key.contains(QRegExp(QString("^hdd[rw]"))))
return QString("%1").arg(diskDevices[key.remove(QRegExp(QString("hdd[rw]"))).toInt()]); 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]")))) else if (key.contains(QRegExp(QString("^(down|up)[0-9]"))))
return QString("%1").arg(networkDevices[key.remove(QRegExp(QString("^(down|up)"))).toInt()]); return QString("%1").arg(networkDevices[key.remove(QRegExp(QString("^(down|up)"))).toInt()]);
else if (key.startsWith(QString("pkgcount"))) else if (key.startsWith(QString("pkgcount")))
for (int i=0; i<extUpgrade->items().count(); i++) { foreach(ExtUpgrade *item, extUpgrade->items()) {
if (extUpgrade->items()[i]->tag(QString("pkgcount")) != key) continue; if (item->tag(QString("pkgcount")) != key) continue;
return extUpgrade->items()[i]->executable(); return item->executable();
} }
else if (key.contains(QRegExp(QString("(^|perc)(ask|bid|price)(chg|)")))) else if (key.contains(QRegExp(QString("(^|perc)(ask|bid|price)(chg|)"))))
for (int i=0; i<extQuotes->items().count(); i++) { foreach(ExtQuotes *item, extQuotes->items()) {
if (extQuotes->items()[i]->number() != key.remove(QRegExp(QString("(^|perc)(ask|bid|price)(chg|)"))).toInt()) continue; if (item->number() != key.remove(QRegExp(QString("(^|perc)(ask|bid|price)(chg|)"))).toInt()) continue;
return extQuotes->items()[i]->ticker(); return item->ticker();
} }
else if (key.startsWith(QString("temp"))) else if (key.startsWith(QString("temp")))
return QString("%1").arg(tempDevices[key.remove(QString("temp")).toInt()]); return QString("%1").arg(tempDevices[key.remove(QString("temp")).toInt()]);
@ -771,41 +766,35 @@ void AWKeys::loadKeysFromCache()
.arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation)); .arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation));
if (debug) qDebug() << PDEBUG << ":" << "Cache file" << fileName; if (debug) qDebug() << PDEBUG << ":" << "Cache file" << fileName;
QSettings cache(fileName, QSettings::IniFormat); QSettings cache(fileName, QSettings::IniFormat);
QStringList cachedKeys;
cache.beginGroup(QString("Disk")); cache.beginGroup(QString("Disk"));
diskDevices.clear(); diskDevices.clear();
cachedKeys = cache.allKeys(); foreach(QString key, cache.allKeys())
for (int i=0; i<cachedKeys.count(); i++) diskDevices.append(cache.value(key).toString());
diskDevices.append(cache.value(cachedKeys[i]).toString());
cache.endGroup(); cache.endGroup();
cache.beginGroup(QString("Hdd")); cache.beginGroup(QString("Hdd"));
hddDevices.clear(); hddDevices.clear();
cachedKeys = cache.allKeys(); foreach(QString key, cache.allKeys())
for (int i=0; i<cachedKeys.count(); i++) hddDevices.append(cache.value(key).toString());
hddDevices.append(cache.value(cachedKeys[i]).toString());
cache.endGroup(); cache.endGroup();
cache.beginGroup(QString("Mount")); cache.beginGroup(QString("Mount"));
mountDevices.clear(); mountDevices.clear();
cachedKeys = cache.allKeys(); foreach(QString key, cache.allKeys())
for (int i=0; i<cachedKeys.count(); i++) mountDevices.append(cache.value(key).toString());
mountDevices.append(cache.value(cachedKeys[i]).toString());
cache.endGroup(); cache.endGroup();
cache.beginGroup(QString("Network")); cache.beginGroup(QString("Network"));
networkDevices.clear(); networkDevices.clear();
cachedKeys = cache.allKeys(); foreach(QString key, cache.allKeys())
for (int i=0; i<cachedKeys.count(); i++) networkDevices.append(cache.value(key).toString());
networkDevices.append(cache.value(cachedKeys[i]).toString());
cache.endGroup(); cache.endGroup();
cache.beginGroup(QString("Temp")); cache.beginGroup(QString("Temp"));
tempDevices.clear(); tempDevices.clear();
cachedKeys = cache.allKeys(); foreach(QString key, cache.allKeys())
for (int i=0; i<cachedKeys.count(); i++) tempDevices.append(cache.value(key).toString());
tempDevices.append(cache.value(cachedKeys[i]).toString());
cache.endGroup(); cache.endGroup();
} }
@ -832,22 +821,22 @@ void AWKeys::addKeyToCache(const QString type, const QString key)
cache.beginGroup(type); cache.beginGroup(type);
QStringList cachedValues; QStringList cachedValues;
for (int i=0; i<cache.allKeys().count(); i++) foreach(QString key, cache.allKeys())
cachedValues.append(cache.value(cache.allKeys()[i]).toString()); cachedValues.append(cache.value(key).toString());
if (type == QString("Hdd")) { if (type == QString("Hdd")) {
QStringList allDevices = QDir(QString("/dev")).entryList(QDir::System, QDir::Name); QStringList allDevices = QDir(QString("/dev")).entryList(QDir::System, QDir::Name);
QStringList devices = allDevices.filter(QRegExp(QString("^[hms]d[a-z]$"))); QStringList devices = allDevices.filter(QRegExp(QString("^[hms]d[a-z]$")));
for (int i=0; i<devices.count(); i++) { foreach(QString dev, devices) {
QString device = QString("/dev/%1").arg(devices[i]); QString device = QString("/dev/%1").arg(dev);
if (cachedValues.contains(device)) continue; if (cachedValues.contains(device)) continue;
if (debug) qDebug() << PDEBUG << ":" << "Found new key" << device << "for type" << type; if (debug) qDebug() << PDEBUG << ":" << "Found new key" << device << "for type" << type;
cache.setValue(QString("%1").arg(cache.allKeys().count(), 3, 10, QChar('0')), device); cache.setValue(QString("%1").arg(cache.allKeys().count(), 3, 10, QChar('0')), device);
} }
} else if (type == QString("Network")) { } else if (type == QString("Network")) {
QList<QNetworkInterface> rawInterfaceList = QNetworkInterface::allInterfaces(); QList<QNetworkInterface> rawInterfaceList = QNetworkInterface::allInterfaces();
for (int i=0; i<rawInterfaceList.count(); i++) { foreach(QNetworkInterface interface, rawInterfaceList) {
QString device = rawInterfaceList[i].name(); QString device = interface.name();
if (cachedValues.contains(device)) continue; if (cachedValues.contains(device)) continue;
if (debug) qDebug() << PDEBUG << ":" << "Found new key" << device << "for type" << type; if (debug) qDebug() << PDEBUG << ":" << "Found new key" << device << "for type" << type;
cache.setValue(QString("%1").arg(cache.allKeys().count(), 3, 10, QChar('0')), device); cache.setValue(QString("%1").arg(cache.allKeys().count(), 3, 10, QChar('0')), device);
@ -914,15 +903,15 @@ QStringList AWKeys::findGraphicalItems() const
if (debug) qDebug() << PDEBUG; if (debug) qDebug() << PDEBUG;
QStringList orderedKeys; QStringList orderedKeys;
for (int i=0; i<graphicalItems->items().count(); i++) foreach(GraphicalItem *item, graphicalItems->items())
orderedKeys.append(graphicalItems->items()[i]->name() + graphicalItems->items()[i]->bar()); orderedKeys.append(item->name() + item->bar());
orderedKeys.sort(); orderedKeys.sort();
QStringList selectedKeys; QStringList selectedKeys;
for (int i=orderedKeys.count()-1; i>=0; i--) for (int i=orderedKeys.count()-1; i>=0; i--)
if (pattern.contains(QString("$%1").arg(orderedKeys[i]))) { if (pattern.contains(QString("$%1").arg(orderedKeys.at(i)))) {
if (debug) qDebug() << PDEBUG << ":" << "Found key" << orderedKeys[i]; if (debug) qDebug() << PDEBUG << ":" << "Found key" << orderedKeys.at(i);
selectedKeys.append(orderedKeys[i]); selectedKeys.append(orderedKeys.at(i));
} }
return selectedKeys; return selectedKeys;
@ -932,11 +921,11 @@ QStringList AWKeys::findGraphicalItems() const
QStringList AWKeys::findKeys() const QStringList AWKeys::findKeys() const
{ {
QStringList selectedKeys; QStringList selectedKeys;
for (int i=0; i<keys.count(); i++) { foreach(QString key, keys) {
if (keys[i].startsWith(QString("bar"))) continue; if (key.startsWith(QString("bar"))) continue;
if (pattern.contains(QString("$%1").arg(keys[i]))) { if (pattern.contains(QString("$%1").arg(key))) {
if (debug) qDebug() << PDEBUG << ":" << "Found key" << keys[i]; if (debug) qDebug() << PDEBUG << ":" << "Found key" << key;
selectedKeys.append(keys[i]); selectedKeys.append(key);
} }
} }
@ -949,9 +938,9 @@ GraphicalItem *AWKeys::getItemByTag(const QString tag) const
if (debug) qDebug() << PDEBUG; if (debug) qDebug() << PDEBUG;
GraphicalItem *item = nullptr; GraphicalItem *item = nullptr;
for (int i=0; i< graphicalItems->items().count(); i++) { foreach(GraphicalItem *gitem, graphicalItems->items()) {
if ((graphicalItems->items()[i]->name() + graphicalItems->items()[i]->bar()) != tag) continue; if ((gitem->name() + gitem->bar()) != tag) continue;
item = graphicalItems->items()[i]; item = gitem;
break; break;
} }

34
sources/awesome-widget/plugin/awtooltip.cpp
View File

@ -27,7 +27,7 @@
AWToolTip::AWToolTip(QObject *parent, QVariantMap settings) AWToolTip::AWToolTip(QObject *parent, QVariantMap settings)
: QObject(parent), : QObject(parent),
configuration(settings) configuration(qvariant_cast<QVariantHash>(settings))
{ {
// debug // debug
QProcessEnvironment environment = QProcessEnvironment::systemEnvironment(); QProcessEnvironment environment = QProcessEnvironment::systemEnvironment();
@ -137,26 +137,26 @@ QPixmap AWToolTip::image()
QBrush(Qt::NoBrush)); QBrush(Qt::NoBrush));
bool down = false; bool down = false;
for (int i=0; i<requiredKeys.count(); i++) { for (int i=0; i<requiredKeys.count(); i++) {
float normX = 100.0 / static_cast<float>(data[requiredKeys[i]].count()); float normX = 100.0 / static_cast<float>(data[requiredKeys.at(i)].count());
float normY = 100.0 / (1.5 * boundaries[requiredKeys[i]]); float normY = 100.0 / (1.5 * boundaries[requiredKeys.at(i)]);
if (requiredKeys[i] != QString("batTooltip")) if (requiredKeys.at(i) != QString("batTooltip"))
pen.setColor(QColor(configuration[QString("%1Color").arg(requiredKeys[i])].toString())); pen.setColor(QColor(configuration[QString("%1Color").arg(requiredKeys.at(i))].toString()));
float shift = i * 100.0; float shift = i * 100.0;
if (down) shift -= 100.0; if (down) shift -= 100.0;
for (int j=0; j<data[requiredKeys[i]].count()-1; j++) { for (int j=0; j<data[requiredKeys.at(i)].count()-1; j++) {
float x1 = j * normX + shift; float x1 = j * normX + shift;
float y1 = - fabs(data[requiredKeys[i]][j]) * normY + 5.0; float y1 = - fabs(data[requiredKeys.at(i)].at(j)) * normY + 5.0;
float x2 = (j + 1) * normX + shift; float x2 = (j + 1) * normX + shift;
float y2 = - fabs(data[requiredKeys[i]][j+1]) * normY + 5.0; float y2 = - fabs(data[requiredKeys.at(i)].at(j+1)) * normY + 5.0;
if (requiredKeys[i] == QString("batTooltip")) { if (requiredKeys.at(i) == QString("batTooltip")) {
if (data[requiredKeys[i]][j+1] > 0) if (data[requiredKeys.at(i)].at(j+1) > 0)
pen.setColor(QColor(configuration[QString("batTooltipColor")].toString())); pen.setColor(QColor(configuration[QString("batTooltipColor")].toString()));
else else
pen.setColor(QColor(configuration[QString("batInTooltipColor")].toString())); pen.setColor(QColor(configuration[QString("batInTooltipColor")].toString()));
} }
toolTipScene->addLine(x1, y1, x2, y2, pen); 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(); return toolTipView->grab();
@ -179,12 +179,12 @@ void AWToolTip::setData(const QString source, float value, const bool ac)
data[source].append(-value); data[source].append(-value);
if ((source == QString("downTooltip")) || (source == QString("upTooltip"))) { if ((source == QString("downTooltip")) || (source == QString("upTooltip"))) {
for (int i=0; i<data[QString("downTooltip")].count(); i++) foreach(float val, data[QString("downTooltip")])
if (boundaries[QString("downTooltip")] < data[QString("downTooltip")][i]) if (boundaries[QString("downTooltip")] < val)
boundaries[QString("downTooltip")] = data[QString("downTooltip")][i]; boundaries[QString("downTooltip")] = val;
for (int i=0; i<data[QString("upTooltip")].count(); i++) foreach(float val, data[QString("upTooltip")])
if (boundaries[QString("downTooltip")] < data[QString("upTooltip")][i]) if (boundaries[QString("downTooltip")] < val)
boundaries[QString("downTooltip")] = data[QString("upTooltip")][i]; boundaries[QString("downTooltip")] = val;
boundaries[QString("downTooltip")] *= 1.2; boundaries[QString("downTooltip")] *= 1.2;
boundaries[QString("upTooltip")] = boundaries[QString("downTooltip")]; boundaries[QString("upTooltip")] = boundaries[QString("downTooltip")];
} }

2
sources/awesome-widget/plugin/awtooltip.h
View File

@ -54,7 +54,7 @@ private:
// variables // variables
bool debug = false; bool debug = false;
int counts = 0; int counts = 0;
QVariantMap configuration; QVariantHash configuration;
QHash<QString, float> boundaries; QHash<QString, float> boundaries;
QHash<QString, QList<float>> data; QHash<QString, QList<float>> data;
QStringList requiredKeys; QStringList requiredKeys;

67
sources/desktop-panel/plugin/dpadds.cpp
View File

@ -110,8 +110,7 @@ QString DPAdds::toolTipImage(const int desktop) const
DesktopWindowsInfo info = getInfoByDesktop(desktop); DesktopWindowsInfo info = getInfoByDesktop(desktop);
if (tooltipType == QString("names")) { if (tooltipType == QString("names")) {
QStringList windowList; QStringList windowList;
for (int i=0; i<info.windowsData.count(); i++) foreach(WindowData data, info.windowsData) windowList.append(data.name);
windowList.append(info.windowsData[i].name);
return QString("<ul><li>%1</li></ul>").arg(windowList.join(QString("</li><li>"))); return QString("<ul><li>%1</li></ul>").arg(windowList.join(QString("</li><li>")));
} }
// init // init
@ -139,8 +138,8 @@ QString DPAdds::toolTipImage(const int desktop) const
QPen pen = QPen(); QPen pen = QPen();
pen.setWidthF(2.0 * info.desktop.width() / 400.0); pen.setWidthF(2.0 * info.desktop.width() / 400.0);
pen.setColor(QColor(tooltipColor)); pen.setColor(QColor(tooltipColor));
for (int i=0; i<info.windowsData.count(); i++) { foreach(WindowData data, info.windowsData) {
QRect rect = info.windowsData[i].rect; QRect rect = data.rect;
toolTipScene->addLine(rect.left() + margin, rect.bottom() + margin, toolTipScene->addLine(rect.left() + margin, rect.bottom() + margin,
rect.left() + margin, rect.top() + margin, pen); rect.left() + margin, rect.top() + margin, pen);
toolTipScene->addLine(rect.left() + margin, rect.top() + margin, toolTipScene->addLine(rect.left() + margin, rect.top() + margin,
@ -152,22 +151,19 @@ QString DPAdds::toolTipImage(const int desktop) const
} }
} else if (tooltipType == QString("clean")) { } else if (tooltipType == QString("clean")) {
QScreen *screen = QGuiApplication::primaryScreen(); QScreen *screen = QGuiApplication::primaryScreen();
for (int i=0; i<info.desktopsData.count(); i++) { foreach(WindowData data, info.desktopsData) {
QPixmap desktop = screen->grabWindow(info.desktopsData[i].id); QPixmap desktop = screen->grabWindow(data.id);
toolTipScene->addPixmap(desktop) toolTipScene->addPixmap(desktop)->setOffset(data.rect.left(), data.rect.top());
->setOffset(info.desktopsData[i].rect.left(), info.desktopsData[i].rect.top());
} }
} else if (tooltipType == QString("windows")) { } else if (tooltipType == QString("windows")) {
QScreen *screen = QGuiApplication::primaryScreen(); QScreen *screen = QGuiApplication::primaryScreen();
for (int i=0; i<info.desktopsData.count(); i++) { foreach(WindowData data, info.desktopsData) {
QPixmap desktop = screen->grabWindow(info.desktopsData[i].id); QPixmap desktop = screen->grabWindow(data.id);
toolTipScene->addPixmap(desktop) toolTipScene->addPixmap(desktop)->setOffset(data.rect.left(), data.rect.top());
->setOffset(info.desktopsData[i].rect.left(), info.desktopsData[i].rect.top());
} }
for (int i=0; i<info.windowsData.count(); i++) { foreach(WindowData data, info.windowsData) {
QPixmap window = screen->grabWindow(info.windowsData[i].id); QPixmap window = screen->grabWindow(data.id);
toolTipScene->addPixmap(window) toolTipScene->addPixmap(window)->setOffset(data.rect.left(), data.rect.top());
->setOffset(info.windowsData[i].rect.left(), info.windowsData[i].rect.top());
} }
} }
@ -188,10 +184,9 @@ QString DPAdds::parsePattern(const QString pattern, const int desktop) const
if (debug) qDebug() << PDEBUG; if (debug) qDebug() << PDEBUG;
QString parsed = pattern; QString parsed = pattern;
QStringList keys = dictKeys();
parsed.replace(QString("$$"), QString("$\\$\\")); parsed.replace(QString("$$"), QString("$\\$\\"));
for (int i=0; i<keys.count(); i++) foreach(QString key, dictKeys())
parsed.replace(QString("$%1").arg(keys[i]), valueByKey(keys[i], desktop)); parsed.replace(QString("$%1").arg(key), valueByKey(key, desktop));
parsed.replace(QString("$\\$\\"), QString("$$")); parsed.replace(QString("$\\$\\"), QString("$$"));
return parsed; return parsed;
@ -218,8 +213,8 @@ void DPAdds::setPanelsToControl(const QString newPanels)
for (int i=0; i<count; i++) for (int i=0; i<count; i++)
panelsToControl.append(i); panelsToControl.append(i);
} else } else
for (int i=0; i<newPanels.split(QChar(',')).count(); i++) foreach(QString panel, newPanels.split(QChar(',')))
panelsToControl.append(newPanels.split(QChar(','))[i].toInt()); panelsToControl.append(panel.toInt());
} }
@ -274,7 +269,7 @@ QString DPAdds::editPanelsToContol(const QString current)
// fill // fill
QList<Plasma::Containment *> panels = getPanels(); QList<Plasma::Containment *> panels = getPanels();
for (int i=0; i<panels.count(); i++) { for (int i=0; i<panels.count(); i++) {
QListWidgetItem *item = new QListWidgetItem(panelLocationToStr(panels[i]->location()), widget); QListWidgetItem *item = new QListWidgetItem(panelLocationToStr(panels.at(i)->location()), widget);
if ((current.split(QChar(',')).contains(QString::number(i))) || if ((current.split(QChar(',')).contains(QString::number(i))) ||
(current == QString("-1"))) (current == QString("-1")))
item->setCheckState(Qt::Checked); item->setCheckState(Qt::Checked);
@ -334,9 +329,9 @@ QString DPAdds::getAboutText(const QString type) const
QStringList trdPartyList = QString(TRDPARTY_LICENSE).split(QChar(';'), QString::SkipEmptyParts); QStringList trdPartyList = QString(TRDPARTY_LICENSE).split(QChar(';'), QString::SkipEmptyParts);
for (int i=0; i<trdPartyList.count(); i++) for (int i=0; i<trdPartyList.count(); i++)
trdPartyList[i] = QString("<a href=\"%3\">%1</a> (%2 license)") trdPartyList[i] = QString("<a href=\"%3\">%1</a> (%2 license)")
.arg(trdPartyList[i].split(QChar(','))[0]) .arg(trdPartyList.at(i).split(QChar(',')).at(0))
.arg(trdPartyList[i].split(QChar(','))[1]) .arg(trdPartyList.at(i).split(QChar(',')).at(1))
.arg(trdPartyList[i].split(QChar(','))[2]); .arg(trdPartyList.at(i).split(QChar(',')).at(2));
text = i18n("This software uses: %1", trdPartyList.join(QString(", "))); text = i18n("This software uses: %1", trdPartyList.join(QString(", ")));
} }
@ -370,16 +365,16 @@ void DPAdds::changePanelsState() const
// QList<Plasma::Containment *> panels = getPanels(); // QList<Plasma::Containment *> panels = getPanels();
// for (int i=0; i<panels.count(); i++) { // for (int i=0; i<panels.count(); i++) {
// if (!panelsToControl.contains(i)) continue; // if (!panelsToControl.contains(i)) continue;
// bool wasVisible = panels[i]->view()->isVisible(); // bool wasVisible = panels.at(i)->view()->isVisible();
// int winId = panels[i]->view()->winId(); // int winId = panels.at(i)->view()->winId();
// if (wasVisible) { // if (wasVisible) {
// if (debug) qDebug() << PDEBUG << ":" << "Hide panel"; // if (debug) qDebug() << PDEBUG << ":" << "Hide panel";
// KWindowInfo oldInfo = KWindowSystem::windowInfo(winId, NET::WMState); // KWindowInfo oldInfo = KWindowSystem::windowInfo(winId, NET::WMState);
// oldState = oldInfo.state(); // oldState = oldInfo.state();
// panels[i]->view()->setVisible(false); // panels.at(i)->view()->setVisible(false);
// } else { // } else {
// if (debug) qDebug() << PDEBUG << ":" << "Show panel"; // if (debug) qDebug() << PDEBUG << ":" << "Show panel";
// panels[i]->view()->setVisible(true); // panels.at(i)->view()->setVisible(true);
// KWindowSystem::clearState(winId, NET::KeepAbove); // KWindowSystem::clearState(winId, NET::KeepAbove);
// KWindowSystem::setState(winId, oldState | NET::StaysOnTop); // KWindowSystem::setState(winId, oldState | NET::StaysOnTop);
// KWindowSystem::setOnAllDesktops(winId, true); // KWindowSystem::setOnAllDesktops(winId, true);
@ -432,15 +427,14 @@ DPAdds::DesktopWindowsInfo DPAdds::getInfoByDesktop(const int desktop) const
DesktopWindowsInfo info; DesktopWindowsInfo info;
info.desktop = KWindowSystem::workArea(desktop); info.desktop = KWindowSystem::workArea(desktop);
QList<WId> windows = KWindowSystem::windows(); foreach(WId id, KWindowSystem::windows()) {
for (int i=0; i<windows.count(); i++) { KWindowInfo winInfo = KWindowInfo(id,
KWindowInfo winInfo = KWindowInfo(windows[i],
NET::Property::WMDesktop | NET::Property::WMGeometry | NET::Property::WMDesktop | NET::Property::WMGeometry |
NET::Property::WMState | NET::Property::WMWindowType | NET::Property::WMState | NET::Property::WMWindowType |
NET::Property::WMVisibleName); NET::Property::WMVisibleName);
if (!winInfo.isOnDesktop(desktop)) continue; if (!winInfo.isOnDesktop(desktop)) continue;
WindowData data; WindowData data;
data.id = windows[i]; data.id = id;
data.name = winInfo.visibleName(); data.name = winInfo.visibleName();
data.rect = winInfo.geometry(); data.rect = winInfo.geometry();
if (winInfo.windowType(NET::WindowTypeMask::NormalMask) == NET::WindowType::Normal) { if (winInfo.windowType(NET::WindowTypeMask::NormalMask) == NET::WindowType::Normal) {
@ -461,9 +455,10 @@ QList<Plasma::Containment *> DPAdds::getPanels() const
// Plasma::Corona *corona = new Plasma::Corona(this); // Plasma::Corona *corona = new Plasma::Corona(this);
QList<Plasma::Containment *> panels; QList<Plasma::Containment *> panels;
// for (int i=0; i<corona->containments().count(); i++) // foreach(Plasma::Containment *cont, corona->containments()) {
// if (corona->containments()[i]->containmentType() == Plasma::Types::ContainmentType::PanelContainment) // if (cont->containmentType() != Plasma::Types::ContainmentType::PanelContainment) continue
// panels.append(corona->containments()[i]); // panels.append(cont);
// }
// delete corona; // delete corona;
return panels; return panels;