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

some fixes inside extensions

Browse Source 
* do not use private variables if there are special methods
* change macro call from `aw_*` to `aw_macro_*`
* add forgotten configuration reading/writting for list formatter
This commit is contained in:
Evgenii Alekseev
2016-07-06 14:23:01 +03:00
parent baf5085506
commit 085eec7a3d
13 changed files with 213 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
sources/awesomewidgets/extupgrade.cpp
View File

@ -93,7 +93,7 @@ int ExtUpgrade::null() const
QString ExtUpgrade::uniq() const
{
return m_executable;
return executable();
}
@ -130,10 +130,10 @@ void ExtUpgrade::readConfiguration()
QSettings settings(fileName(), QSettings::IniFormat);
settings.beginGroup(QString("Desktop Entry"));
setExecutable(settings.value(QString("Exec"), m_executable).toString());
setNull(settings.value(QString("X-AW-Null"), m_null).toInt());
setExecutable(settings.value(QString("Exec"), executable()).toString());
setNull(settings.value(QString("X-AW-Null"), null()).toInt());
// api == 3
setFilter(settings.value(QString("X-AW-Filter"), m_filter).toString());
setFilter(settings.value(QString("X-AW-Filter"), filter()).toString());
settings.endGroup();
bumpApi(AWEUAPI);
@ -146,7 +146,7 @@ QVariantHash ExtUpgrade::run()
return value;
if ((times == 1) && (process->state() == QProcess::NotRunning)) {
QString cmd = QString("sh -c \"%1\"").arg(m_executable);
QString cmd = QString("sh -c \"%1\"").arg(executable());
qCInfo(LOG_LIB) << "Run cmd" << cmd;
process->start(cmd);
}
@ -167,11 +167,11 @@ int ExtUpgrade::showConfiguration(const QVariant args)
ui->lineEdit_name->setText(name());
ui->lineEdit_comment->setText(comment());
ui->label_numberValue->setText(QString("%1").arg(number()));
ui->lineEdit_command->setText(m_executable);
ui->lineEdit_filter->setText(m_filter);
ui->lineEdit_command->setText(executable());
ui->lineEdit_filter->setText(filter());
ui->checkBox_active->setCheckState(isActive() ? Qt::Checked
: Qt::Unchecked);
ui->spinBox_null->setValue(m_null);
ui->spinBox_null->setValue(null());
ui->spinBox_interval->setValue(interval());
int ret = exec();
@ -200,9 +200,9 @@ void ExtUpgrade::writeConfiguration() const
qCInfo(LOG_LIB) << "Configuration file" << settings.fileName();
settings.beginGroup(QString("Desktop Entry"));
settings.setValue(QString("Exec"), m_executable);
settings.setValue(QString("X-AW-Filter"), m_filter);
settings.setValue(QString("X-AW-Null"), m_null);
settings.setValue(QString("Exec"), executable());
settings.setValue(QString("X-AW-Filter"), filter());
settings.setValue(QString("X-AW-Null"), null());
settings.endGroup();
settings.sync();
@ -218,11 +218,11 @@ void ExtUpgrade::updateValue()
->toUnicode(process->readAllStandardOutput())
.trimmed();
value[tag(QString("pkgcount"))] = [this](QString output) {
return m_filter.isEmpty()
return filter().isEmpty()
? output.split(QChar('\n'), QString::SkipEmptyParts).count()
- m_null
- null()
: output.split(QChar('\n'), QString::SkipEmptyParts)
.filter(QRegExp(m_filter))
.filter(QRegExp(filter()))
.count();
}(qoutput);