arcanis/awesome-widgets
1
0
Fork 0
mirror of https://github.com/arcan1s/awesome-widgets.git synced 2025-07-18 08:09:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:arcan1s/awesome-widgets

Browse Source
This commit is contained in:
arcan1s
2014-11-20 03:18:53 +03:00
parent 179a97b01b ca60a85241
commit 543e39a7ac
6 changed files with 141 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
sources/awesome-widget/configuration.cpp
View File

@ -735,13 +735,14 @@ void AwesomeWidget::addBar()
i18n("File name"), QLineEdit::Normal,
QString(""), &ok);
if ((!ok) || (name.isEmpty())) return;
if (!name.endsWith(QString(".desktop"))) name += QString(".desktop");
QStringList bars;
bars.append(keys.filter((QRegExp(QString("cpu(?!cl).*")))));
bars.append(keys.filter((QRegExp(QString("gpu")))));
bars.append(keys.filter((QRegExp(QString("mem")))));
bars.append(keys.filter((QRegExp(QString("swap")))));
bars.append(keys.filter((QRegExp(QString("hdd[0-9].*")))));
bars.append(keys.filter((QRegExp(QString("bat.*")))));
bars.append(keys.filter((QRegExp(QString("^gpu$")))));
bars.append(keys.filter((QRegExp(QString("^mem$")))));
bars.append(keys.filter((QRegExp(QString("^swap$")))));
bars.append(keys.filter((QRegExp(QString("^hdd[0-9].*")))));
bars.append(keys.filter((QRegExp(QString("^bat.*")))));
GraphicalItem *item = new GraphicalItem(0, name, dirs, debug);
item->setName(QString("bar%1").arg(number));
@ -759,6 +760,7 @@ void AwesomeWidget::addCustomScript()
i18n("File name"), QLineEdit::Normal,
QString(""), &ok);
if ((!ok) || (name.isEmpty())) return;
if (!name.endsWith(QString(".desktop"))) name += QString(".desktop");
ExtScript *script = new ExtScript(0, name, dirs, debug);
script->showConfiguration();
@ -843,12 +845,12 @@ void AwesomeWidget::editBar(QListWidgetItem *item)
if (debug) qDebug() << PDEBUG;
QStringList bars;
bars.append(keys.filter((QRegExp(QString("cpu(?!cl).*")))));
bars.append(keys.filter((QRegExp(QString("gpu$")))));
bars.append(keys.filter((QRegExp(QString("mem$")))));
bars.append(keys.filter((QRegExp(QString("swap$")))));
bars.append(keys.filter((QRegExp(QString("hdd[0-9].*")))));
bars.append(keys.filter((QRegExp(QString("bat.*")))));
bars.append(keys.filter((QRegExp(QString("^cpu(?!cl).*")))));
bars.append(keys.filter((QRegExp(QString("^gpu$")))));
bars.append(keys.filter((QRegExp(QString("^mem$")))));
bars.append(keys.filter((QRegExp(QString("^swap$")))));
bars.append(keys.filter((QRegExp(QString("^hdd[0-9].*")))));
bars.append(keys.filter((QRegExp(QString("^bat.*")))));
for (int i=0; i<graphicalItems.count(); i++) {
if (graphicalItems[i]->getFileName() != item->text()) continue;