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

add '$this' feature to lambda functions

Browse Source 
fix large size on startup
fix invalid key parsing
This commit is contained in:
arcan1s
2015-09-03 00:30:10 +03:00
parent 6689bea9a7
commit 7218defe19
9 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
sources/awesome-widget/plugin/awkeys.cpp
View File

@ -724,10 +724,11 @@ void AWKeys::editItem(const QString type)
}
void AWKeys::dataUpdate() const
void AWKeys::dataUpdate()
{
qCDebug(LOG_AW);
calculateLambdas();
emit(needTextToBeUpdated(parsePattern()));
if (toolTip != nullptr) emit(toolTip->updateData(values));
}
@ -877,17 +878,15 @@ void AWKeys::addKeyToCache(const QString type, const QString key)
}
QString AWKeys::parsePattern() const
void AWKeys::calculateLambdas()
{
qCDebug(LOG_AW);
QString parsed = pattern;
parsed.replace(QString("$$"), QString("$\\$\\"));
// lambdas
foreach(QString key, foundLambdas)
parsed.replace(QString("${{%1}}").arg(key), [this](QString key) {
values[key] = [this](QString key) {
QScriptEngine engine;
// apply $this values
key.replace(QString("$this"), values[key]);
foreach(QString lambdaKey, foundKeys)
key.replace(QString("$%1").arg(lambdaKey), values[lambdaKey]);
qCInfo(LOG_AW) << "Expression" << key;
@ -898,7 +897,20 @@ QString AWKeys::parsePattern() const
return QString();
} else
return result.toString();
}(key));
}(key);
}
QString AWKeys::parsePattern() const
{
qCDebug(LOG_AW);
QString parsed = pattern;
parsed.replace(QString("$$"), QString("$\\$\\"));
// lambdas
foreach(QString key, foundLambdas)
parsed.replace(QString("${{%1}}").arg(key), values[key]);
// main keys
foreach(QString key, foundKeys)

3
sources/awesome-widget/plugin/awkeys.h
View File

@ -70,13 +70,14 @@ signals:
void needToBeUpdated();
private slots:
void dataUpdate() const;
void dataUpdate();
void loadKeysFromCache();
void reinitKeys();
private:
// methods
void addKeyToCache(const QString type, const QString key = QString(""));
void calculateLambdas();
QString parsePattern() const;
float temperature(const float temp, const QString units) const;
// get methods

1
sources/awesome-widget/plugin/qmldir
View File

@ -1,3 +1,2 @@
module org.kde.plasma.private.awesomewidget
plugin awplugin