add '$this' feature to lambda functions

fix large size on startup
fix invalid key parsing

sources/awesome-widget/package/contents/ui/main.qml

@@ -150,8 +150,6 @@ Item {
         font.pointSize: plasmoid.configuration.fontSize
         font.weight: general.fontWeight[plasmoid.configuration.fontWeight]
 
-        text: plasmoid.configuration.text
-
         PlasmaCore.ToolTipArea {
             height: tooltip.height
             width: tooltip.width
@@ -233,8 +231,6 @@ Item {
         awKeys.setPopupEnabled(plasmoid.configuration.notify)
         awKeys.setTranslateStrings(plasmoid.configuration.translateStrings)
         awKeys.setWrapNewLines(plasmoid.configuration.wrapNewLines)
-
-        needTextUpdate(plasmoid.configuration.text)
     }
 
     function action_checkUpdates() {

sources/awesome-widget/package/contents/ui/qmldir

@@ -1 +1 @@
-singleton general general.qml
+singleton general 1.0 general.qml

sources/awesome-widget/plugin/awkeys.cpp

@@ -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)

sources/awesome-widget/plugin/awkeys.h

@@ -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

sources/awesome-widget/plugin/qmldir

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

sources/awesomewidgets/extitemaggregator.h

@@ -174,6 +174,10 @@ private:
             }
         }
 
+        // sort items
+        std::sort(items.begin(), items.end(), [](const T *lhs, const T *rhs){
+            return lhs->number() < rhs->number();
+        });
         return items;
     };
 

sources/desktop-panel/package/contents/ui/qmldir

@@ -1 +1 @@
-singleton general general.qml
+singleton general 1.0 general.qml

sources/desktop-panel/plugin/qmldir

@@ -1,3 +1,2 @@
 module org.kde.plasma.private.desktoppanel
-
 plugin dpplugin

sources/extsysmon/extsysmon.cpp

@@ -533,7 +533,7 @@ QString ExtendedSysMon::buildString(const QString current, const QString value,
     qCDebug(LOG_ESM) << "Strip after" << s;
 
     int index = value.indexOf(current);
-    if ((index == -1) || ((index + s + 1) > value.count()))
+    if ((current.isEmpty()) || ((index + s + 1) > value.count()))
         return QString("%1").arg(value.left(s), s, QLatin1Char(' '));
     else
         return QString("%1").arg(value.mid(index + 1, s), s, QLatin1Char(' '));