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

update additional files

Browse Source 
update translations
add "Add lambda" button to ui
This commit is contained in:
arcan1s
2015-08-22 00:40:14 +03:00
parent 835eb00f0d
commit 29b75e2b12
18 changed files with 839 additions and 1300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sources/awesome-widget/package/contents/ui/widget.qml
View File

@ -233,7 +233,7 @@ Item {
width: parent.width
QtControls.ComboBox {
id: tags
width: parent.width - addTagButton.width - showValueButton.width
width: parent.width - addTagButton.width - showValueButton.width - addLambdaButton.width
}
QtControls.Button {
id: addTagButton
@ -263,6 +263,19 @@ Item {
awActions.sendNotification("tag", message)
}
}
QtControls.Button {
id: addLambdaButton
text: i18n("Add lambda")
onClicked: {
if (debug) console.log("[widget::onClicked] : Lambda button")
var pos = textPattern.cursorPosition
var selected = textPattern.selectedText
textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
textPattern.insert(pos, selected + "${{}}")
}
}
}
Row {

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

@ -40,7 +40,6 @@
#include "extupgrade.h"
#include "extweather.h"
#include "graphicalitem.h"
#include "version.h"
AWKeys::AWKeys(QObject *parent)
@ -137,7 +136,8 @@ QString AWKeys::parsePattern() const
foreach(QString key, foundKeys)
parsed.replace(QString("$%1").arg(key), htmlValue(key));
foreach(QString bar, foundBars)
parsed.replace(QString("$%1").arg(bar), getItemByTag(bar)->image(valueByKey(bar).toFloat()));
parsed.replace(QString("$%1").arg(bar),
graphicalItems->itemByTag(bar)->image(valueByKey(bar).toFloat()));
parsed.replace(QString("$\\$\\"), QString("$$"));
// wrap new lines if required
if (wrapNewLines) parsed.replace(QString("\n"), QString("<br>"));
@ -637,7 +637,7 @@ void AWKeys::setDataBySource(const QString sourceName, const QVariantMap data,
values[QString("shorttime")] = data[QString("DateTime")].toDateTime().toString(Qt::SystemLocaleShortDate);
values[QString("longtime")] = data[QString("DateTime")].toDateTime().toString(Qt::SystemLocaleLongDate);
values[QString("ctime")] = params[QString("customTime")].toString();
foreach(QString key, getTimeKeys())
foreach(QString key, timeKeys)
values[QString("ctime")].replace(QString("$%1").arg(key),
data[QString("DateTime")].toDateTime().toString(key));
} else if (sourceName == QString("system/uptime")) {
@ -943,7 +943,7 @@ QStringList AWKeys::findGraphicalItems() const
QStringList orderedKeys;
foreach(GraphicalItem *item, graphicalItems->items())
orderedKeys.append(item->name() + item->bar());
orderedKeys.append(item->tag());
orderedKeys.sort();
QStringList selectedKeys;
@ -997,44 +997,3 @@ QStringList AWKeys::findLambdas() const
return selectedKeys;
}
GraphicalItem *AWKeys::getItemByTag(const QString tag) const
{
if (debug) qDebug() << PDEBUG;
GraphicalItem *item = nullptr;
foreach(GraphicalItem *gitem, graphicalItems->items()) {
if ((gitem->name() + gitem->bar()) != tag) continue;
item = gitem;
break;
}
return item;
}
QStringList AWKeys::getTimeKeys() const
{
if (debug) qDebug() << PDEBUG;
QStringList keys;
keys.append(QString("dddd"));
keys.append(QString("ddd"));
keys.append(QString("dd"));
keys.append(QString("d"));
keys.append(QString("MMMM"));
keys.append(QString("MMM"));
keys.append(QString("MM"));
keys.append(QString("M"));
keys.append(QString("yyyy"));
keys.append(QString("yy"));
keys.append(QString("hh"));
keys.append(QString("h"));
keys.append(QString("mm"));
keys.append(QString("m"));
keys.append(QString("ss"));
keys.append(QString("s"));
return keys;
}

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

@ -25,6 +25,7 @@
#include <QVariant>
#include "extitemaggregator.h"
#include "version.h"
class AWToolTip;
@ -84,8 +85,6 @@ private:
QStringList findKeys() const;
QStringList findLambdas() const;
// get methods
GraphicalItem *getItemByTag(const QString tag) const;
QStringList getTimeKeys() const;
AWToolTip *toolTip = nullptr;
bool debug = false;
bool enablePopup = false;
@ -97,6 +96,7 @@ private:
ExtItemAggregator<ExtWeather> *extWeather;
QString pattern;
QStringList foundBars, foundKeys, foundLambdas, keys;
QStringList timeKeys = QString(TIME_KEYS).split(QChar(','));
QHash<QString, QString> values;
QStringList diskDevices, hddDevices, mountDevices, networkDevices, tempDevices;
};