some fixes inside extensions

* 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:
2016-07-06 14:23:01 +03:00
parent baf5085506
commit 085eec7a3d
13 changed files with 213 additions and 174 deletions

View File

@ -21,6 +21,8 @@
#include <KI18n/KLocalizedString>
#include <QSettings>
#include "awdebug.h"
@ -117,6 +119,23 @@ void AWListFormatter::setSorted(const bool _sorted)
}
void AWListFormatter::readConfiguration()
{
AWAbstractFormatter::readConfiguration();
QSettings settings(fileName(), QSettings::IniFormat);
settings.beginGroup(QString("Desktop Entry"));
setFilter(settings.value(QString("X-AW-Filter"), filter()).toString());
setSeparator(
settings.value(QString("X-AW-Separator"), separator()).toString());
setSorted(settings.value(QString("X-AW-Sort"), isSorted()).toBool());
settings.endGroup();
bumpApi(AWEFAPI);
}
int AWListFormatter::showConfiguration(const QVariant args)
{
Q_UNUSED(args)
@ -144,6 +163,23 @@ int AWListFormatter::showConfiguration(const QVariant args)
}
void AWListFormatter::writeConfiguration() const
{
AWAbstractFormatter::writeConfiguration();
QSettings settings(writtableConfig(), QSettings::IniFormat);
qCInfo(LOG_LIB) << "Configuration file" << settings.fileName();
settings.beginGroup(QString("Desktop Entry"));
settings.setValue(QString("X-AW-Filter"), filter());
settings.setValue(QString("X-AW-Separator"), separator());
settings.setValue(QString("X-AW-Sort"), isSorted());
settings.endGroup();
settings.sync();
}
void AWListFormatter::translate()
{
ui->label_name->setText(i18n("Name"));