arcanis/awesome-widgets
1
0
Fork 0
mirror of https://github.com/arcan1s/awesome-widgets.git synced 2025-08-29 03:39:57 +00:00
Code Issues Projects Releases Wiki Activity

changes in Extensions ABI

Browse Source 
* rewrite aggregator to normal qt ui
* use X-AW prefix for formatters options
* fix logging
* use nullptr in headers
This commit is contained in:
Evgenii Alekseev
2016-05-13 13:23:25 +03:00
parent 326c65528d
commit 51c7299ad0
25 changed files with 186 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
sources/awesomewidgets/awscriptformatter.cpp
View File

@ -32,7 +32,7 @@ AWScriptFormatter::AWScriptFormatter(QWidget *parent, const QString filePath)
: AWAbstractFormatter(parent, filePath)
, ui(new Ui::AWScriptFormatter)
{
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
readConfiguration();
ui->setupUi(this);
@ -45,7 +45,7 @@ AWScriptFormatter::AWScriptFormatter(const bool appendCode, const QString code,
: AWAbstractFormatter(parent)
, ui(new Ui::AWScriptFormatter)
{
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
setAppendCode(appendCode);
setCode(code);
@ -59,7 +59,7 @@ AWScriptFormatter::AWScriptFormatter(const bool appendCode, const QString code,
AWScriptFormatter::~AWScriptFormatter()
{
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
delete ui;
}
@ -67,7 +67,7 @@ AWScriptFormatter::~AWScriptFormatter()
QString AWScriptFormatter::convert(const QVariant &_value) const
{
qCDebug(LOG_AW) << "Convert value" << _value;
qCDebug(LOG_LIB) << "Convert value" << _value;
// init engine
QJSEngine engine;
@ -76,9 +76,9 @@ QString AWScriptFormatter::convert(const QVariant &_value) const
QJSValue result = fn.call(args);
if (result.isError()) {
qCWarning(LOG_AW) << "Uncaught exception at line"
<< result.property("lineNumber").toInt() << ":"
<< result.toString();
qCWarning(LOG_LIB) << "Uncaught exception at line"
<< result.property("lineNumber").toInt() << ":"
<< result.toString();
return QString();
} else {
return result.toString();
@ -129,7 +129,7 @@ QString AWScriptFormatter::program() const
void AWScriptFormatter::setAppendCode(const bool _appendCode)
{
qCDebug(LOG_AW) << "Set append code" << _appendCode;
qCDebug(LOG_LIB) << "Set append code" << _appendCode;
m_appendCode = _appendCode;
}
@ -137,7 +137,7 @@ void AWScriptFormatter::setAppendCode(const bool _appendCode)
void AWScriptFormatter::setCode(const QString _code)
{
qCDebug(LOG_AW) << "Set code" << _code;
qCDebug(LOG_LIB) << "Set code" << _code;
m_code = _code;
}
@ -145,7 +145,7 @@ void AWScriptFormatter::setCode(const QString _code)
void AWScriptFormatter::setHasReturn(const bool _hasReturn)
{
qCDebug(LOG_AW) << "Set has return" << _hasReturn;
qCDebug(LOG_LIB) << "Set has return" << _hasReturn;
m_hasReturn = _hasReturn;
}
@ -158,9 +158,11 @@ void AWScriptFormatter::readConfiguration()
QSettings settings(fileName(), QSettings::IniFormat);
settings.beginGroup(QString("Desktop Entry"));
setAppendCode(settings.value(QString("AppendCode"), m_appendCode).toBool());
setCode(settings.value(QString("Code"), m_code).toString());
setHasReturn(settings.value(QString("HasReturn"), m_hasReturn).toBool());
setAppendCode(
settings.value(QString("X-AW-AppendCode"), m_appendCode).toBool());
setCode(settings.value(QString("X-AW-Code"), m_code).toString());
setHasReturn(
settings.value(QString("X-AW-HasReturn"), m_hasReturn).toBool());
settings.endGroup();
initProgram();
@ -204,9 +206,9 @@ void AWScriptFormatter::writeConfiguration() const
qCInfo(LOG_LIB) << "Configuration file" << settings.fileName();
settings.beginGroup(QString("Desktop Entry"));
settings.setValue(QString("AppendCode"), m_appendCode);
settings.setValue(QString("Code"), m_code);
settings.setValue(QString("HasReturn"), m_hasReturn);
settings.setValue(QString("X-AW-AppendCode"), m_appendCode);
settings.setValue(QString("X-AW-Code"), m_code);
settings.setValue(QString("X-AW-HasReturn"), m_hasReturn);
settings.endGroup();
settings.sync();
@ -223,7 +225,7 @@ void AWScriptFormatter::initProgram()
else
m_program = m_code;
qCInfo(LOG_AW) << "Create JS engine with code" << m_program;
qCInfo(LOG_LIB) << "Create JS engine with code" << m_program;
}