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

drop some legacy code

Browse Source
This commit is contained in:
Evgenii Alekseev 2016-08-29 15:02:34 +03:00
parent 7d8036b0e1
commit b17aeb88e3
4 changed files with 42 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
sources/awesome-widget/plugin/awkeyoperations.cpp
View File

@ -79,30 +79,24 @@ QStringList AWKeyOperations::dictKeys() const
{ {
QStringList allKeys; QStringList allKeys;
// weather // weather
for (int i = m_extWeather->activeItems().count() - 1; i >= 0; i--) { for (auto item : m_extWeather->activeItems()) {
allKeys.append( allKeys.append(item->tag(QString("weatherId")));
m_extWeather->activeItems().at(i)->tag(QString("weatherId"))); allKeys.append(item->tag(QString("weather")));
allKeys.append( allKeys.append(item->tag(QString("humidity")));
m_extWeather->activeItems().at(i)->tag(QString("weather"))); allKeys.append(item->tag(QString("pressure")));
allKeys.append( allKeys.append(item->tag(QString("temperature")));
m_extWeather->activeItems().at(i)->tag(QString("humidity"))); allKeys.append(item->tag(QString("timestamp")));
allKeys.append(
m_extWeather->activeItems().at(i)->tag(QString("pressure")));
allKeys.append(
m_extWeather->activeItems().at(i)->tag(QString("temperature")));
allKeys.append(
m_extWeather->activeItems().at(i)->tag(QString("timestamp")));
} }
// cpuclock & cpu // cpuclock & cpu
for (int i = QThread::idealThreadCount() - 1; i >= 0; i--) { for (int i = 0; i < QThread::idealThreadCount(); i++) {
allKeys.append(QString("cpucl%1").arg(i)); allKeys.append(QString("cpucl%1").arg(i));
allKeys.append(QString("cpu%1").arg(i)); allKeys.append(QString("cpu%1").arg(i));
} }
// temperature // temperature
for (int i = m_devices[QString("temp")].count() - 1; i >= 0; i--) for (int i = 0; i < m_devices[QString("temp")].count(); i++)
allKeys.append(QString("temp%1").arg(i)); allKeys.append(QString("temp%1").arg(i));
// hdd // hdd
for (int i = m_devices[QString("mount")].count() - 1; i >= 0; i--) { for (int i = 0; i < m_devices[QString("mount")].count(); i++) {
allKeys.append(QString("hddmb%1").arg(i)); allKeys.append(QString("hddmb%1").arg(i));
allKeys.append(QString("hddgb%1").arg(i)); allKeys.append(QString("hddgb%1").arg(i));
allKeys.append(QString("hddfreemb%1").arg(i)); allKeys.append(QString("hddfreemb%1").arg(i));
@ -112,15 +106,15 @@ QStringList AWKeyOperations::dictKeys() const
allKeys.append(QString("hdd%1").arg(i)); allKeys.append(QString("hdd%1").arg(i));
} }
// hdd speed // hdd speed
for (int i = m_devices[QString("disk")].count() - 1; i >= 0; i--) { for (int i = 0; i < m_devices[QString("disk")].count(); i++) {
allKeys.append(QString("hddr%1").arg(i)); allKeys.append(QString("hddr%1").arg(i));
allKeys.append(QString("hddw%1").arg(i)); allKeys.append(QString("hddw%1").arg(i));
} }
// hdd temp // hdd temp
for (int i = m_devices[QString("hdd")].count() - 1; i >= 0; i--) for (int i = 0; i < m_devices[QString("hdd")].count(); i++)
allKeys.append(QString("hddtemp%1").arg(i)); allKeys.append(QString("hddtemp%1").arg(i));
// network // network
for (int i = m_devices[QString("net")].count() - 1; i >= 0; i--) { for (int i = 0; i < m_devices[QString("net")].count(); i++) {
allKeys.append(QString("downunits%1").arg(i)); allKeys.append(QString("downunits%1").arg(i));
allKeys.append(QString("upunits%1").arg(i)); allKeys.append(QString("upunits%1").arg(i));
allKeys.append(QString("downtotalkb%1").arg(i)); allKeys.append(QString("downtotalkb%1").arg(i));
@ -137,38 +131,29 @@ QStringList AWKeyOperations::dictKeys() const
= QDir(QString("/sys/class/power_supply")) = QDir(QString("/sys/class/power_supply"))
.entryList(QStringList() << QString("BAT*"), .entryList(QStringList() << QString("BAT*"),
QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name); QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name);
for (int i = allBatteryDevices.count() - 1; i >= 0; i--) for (int i = 0; i < allBatteryDevices.count(); i++)
allKeys.append(QString("bat%1").arg(i)); allKeys.append(QString("bat%1").arg(i));
// package manager // package manager
for (int i = m_extUpgrade->activeItems().count() - 1; i >= 0; i--) for (auto item : m_extUpgrade->activeItems())
allKeys.append( allKeys.append(item->tag(QString("pkgcount")));
m_extUpgrade->activeItems().at(i)->tag(QString("pkgcount")));
// quotes // quotes
for (int i = m_extQuotes->activeItems().count() - 1; i >= 0; i--) { for (auto item : m_extQuotes->activeItems()) {
allKeys.append(m_extQuotes->activeItems().at(i)->tag(QString("ask"))); allKeys.append(item->tag(QString("ask")));
allKeys.append( allKeys.append(item->tag(QString("askchg")));
m_extQuotes->activeItems().at(i)->tag(QString("askchg"))); allKeys.append(item->tag(QString("percaskchg")));
allKeys.append( allKeys.append(item->tag(QString("bid")));
m_extQuotes->activeItems().at(i)->tag(QString("percaskchg"))); allKeys.append(item->tag(QString("bidchg")));
allKeys.append(m_extQuotes->activeItems().at(i)->tag(QString("bid"))); allKeys.append(item->tag(QString("percbidchg")));
allKeys.append( allKeys.append(item->tag(QString("price")));
m_extQuotes->activeItems().at(i)->tag(QString("bidchg"))); allKeys.append(item->tag(QString("pricechg")));
allKeys.append( allKeys.append(item->tag(QString("percpricechg")));
m_extQuotes->activeItems().at(i)->tag(QString("percbidchg")));
allKeys.append(m_extQuotes->activeItems().at(i)->tag(QString("price")));
allKeys.append(
m_extQuotes->activeItems().at(i)->tag(QString("pricechg")));
allKeys.append(
m_extQuotes->activeItems().at(i)->tag(QString("percpricechg")));
} }
// custom // custom
for (int i = m_extScripts->activeItems().count() - 1; i >= 0; i--) for (auto item : m_extScripts->activeItems())
allKeys.append( allKeys.append(item->tag(QString("custom")));
m_extScripts->activeItems().at(i)->tag(QString("custom")));
// bars // bars
for (int i = m_graphicalItems->activeItems().count() - 1; i >= 0; i--) for (auto item : m_graphicalItems->activeItems())
allKeys.append( allKeys.append(item->tag(QString("bar")));
m_graphicalItems->activeItems().at(i)->tag(QString("bar")));
// static keys // static keys
QStringList staticKeys = QString(STATIC_KEYS).split(QChar(',')); QStringList staticKeys = QString(STATIC_KEYS).split(QChar(','));
std::for_each(staticKeys.cbegin(), staticKeys.cend(), std::for_each(staticKeys.cbegin(), staticKeys.cend(),

4
sources/awesome-widget/plugin/awkeysaggregator.cpp
View File

@ -32,6 +32,10 @@ AWKeysAggregator::AWKeysAggregator(QObject *parent)
{ {
qCDebug(LOG_AW) << __PRETTY_FUNCTION__; qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
// sort time keys
m_timeKeys.sort();
std::reverse(m_timeKeys.begin(), m_timeKeys.end());
// default formatters // default formatters
// memory // memory
m_formatter[QString("mem")] = FormatterType::Float; m_formatter[QString("mem")] = FormatterType::Float;

2
sources/version.h.in
View File

@ -40,7 +40,7 @@
#define REQUEST_TIMEOUT 3000 #define REQUEST_TIMEOUT 3000
// available time keys // available time keys
#define TIME_KEYS \ #define TIME_KEYS \
"dddd,ddd,dd,d,MMMM,MMM,MM,M,yyyy,yy,hh,h,HH,H,mm,m,ss,s,t,ap,a,AP,A" "d,dd,ddd,dddd,M,MM,MMM,MMMM,yy,yyyy,h,hh,H,HH,m,mm,s,ss,t,a,ap,A,AP"
// static keys // static keys
#define STATIC_KEYS \ #define STATIC_KEYS \
"time,isotime,shorttime,longtime,tstime,ctime,uptime,cuptime,cpucl,cpu," \ "time,isotime,shorttime,longtime,tstime,ctime,uptime,cuptime,cpucl,cpu," \