ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improve lig view

Browse Source
This commit is contained in:
Michael Zanetti 2018-09-28 23:54:45 +02:00
parent e9ec00b56f
commit f194bb1bc2
13 changed files with 322 additions and 255 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
libnymea-app-core/models/logsmodel.cpp
View File

@ -132,6 +132,9 @@ void LogsModel::notificationReceived(const QVariantMap &data)
void LogsModel::update()
{
if (m_busy) {
return;
}
m_busy = true;
emit busyChanged();
@ -157,11 +160,40 @@ void LogsModel::update()
Engine::instance()->jsonRpcClient()->sendCommand("Logging.GetLogEntries", params, this, "logsReply");
}
void LogsModel::fetchEarlier(int hours)
{
if (m_busy) {
return;
}
m_busy = true;
emit busyChanged();
QVariantMap params;
if (!m_deviceId.isEmpty()) {
QVariantList deviceIds;
deviceIds.append(m_deviceId);
params.insert("deviceIds", deviceIds);
}
if (!m_typeIds.isEmpty()) {
QVariantList typeIds;
foreach (const QString &typeId, m_typeIds) {
typeIds.append(typeId);
}
params.insert("typeIds", typeIds);
}
QVariantList timeFilters;
QVariantMap timeFilter;
timeFilter.insert("endDate", m_startTime.toSecsSinceEpoch());
m_startTime = m_startTime.addSecs(-60*60*hours);
timeFilter.insert("startDate", m_startTime.toSecsSinceEpoch());
timeFilters.append(timeFilter);
params.insert("timeFilters", timeFilters);
Engine::instance()->jsonRpcClient()->sendCommand("Logging.GetLogEntries", params, this, "fetchEarlierReply");
}
void LogsModel::logsReply(const QVariantMap &data)
{
qDebug() << "logs reply";// << data;
m_busy = false;
emit busyChanged();
beginResetModel();
qDeleteAll(m_list);
m_list.clear();
@ -183,6 +215,38 @@ void LogsModel::logsReply(const QVariantMap &data)
endResetModel();
emit countChanged();
m_busy = false;
emit busyChanged();
}
void LogsModel::fetchEarlierReply(const QVariantMap &data)
{
qDebug() << "logs reply";// << data;
QList<QVariant> logEntries = data.value("params").toMap().value("logEntries").toList();
QList<LogEntry*> newEntries;
foreach (const QVariant &logEntryVariant, logEntries) {
QVariantMap entryMap = logEntryVariant.toMap();
QDateTime timeStamp = QDateTime::fromMSecsSinceEpoch(entryMap.value("timestamp").toLongLong());
QString deviceId = entryMap.value("deviceId").toString();
QString typeId = entryMap.value("typeId").toString();
QMetaEnum sourceEnum = QMetaEnum::fromType<LogEntry::LoggingSource>();
LogEntry::LoggingSource loggingSource = (LogEntry::LoggingSource)sourceEnum.keyToValue(entryMap.value("source").toByteArray());
QMetaEnum loggingEventTypeEnum = QMetaEnum::fromType<LogEntry::LoggingEventType>();
LogEntry::LoggingEventType loggingEventType = (LogEntry::LoggingEventType)loggingEventTypeEnum.keyToValue(entryMap.value("eventType").toByteArray());
QVariant value = loggingEventType == LogEntry::LoggingEventTypeActiveChange ? entryMap.value("active").toBool() : entryMap.value("value");
LogEntry *entry = new LogEntry(timeStamp, value, deviceId, typeId, loggingSource, loggingEventType, this);
newEntries.append(entry);
}
beginInsertRows(QModelIndex(), 0, newEntries.count() - 1);
newEntries.append(m_list);
m_list = newEntries;
endInsertRows();
emit countChanged();
m_busy = false;
emit busyChanged();
}
void LogsModel::newLogEntryReceived(const QVariantMap &data)

3
libnymea-app-core/models/logsmodel.h
View File

@ -64,9 +64,12 @@ signals:
public slots:
virtual void update();
virtual void fetchEarlier(int hours);
// virtual void fetchLater(int hours);
private slots:
virtual void logsReply(const QVariantMap &data);
virtual void fetchEarlierReply(const QVariantMap &data);
void newLogEntryReceived(const QVariantMap &data);
protected:

11
nymea-app/ui/customviews/GenericTypeLogView.qml
View File

@ -23,7 +23,7 @@ Item {
Layout.fillWidth: true
Layout.margins: app.margins
wrapMode: Text.WordWrap
text: root.text.arg(logsModel.count)
text: root.text.arg(logsModel.count).arg((logsModel.endTime.getTime() - logsModel.startTime.getTime())/ 1000 / 60 / 60 /24)
}
ThinDivider {}
@ -40,7 +40,14 @@ Item {
Layout.fillHeight: true
model: logsModel
clip: true
onCountChanged: positionViewAtEnd()
// onCountChanged: positionViewAtEnd()
onContentYChanged: {
if (!logsModel.busy && contentY - originY < 5 * height) {
logsModel.fetchEarlier(24)
}
}
delegate: SwipeDelegate {
id: logEntryDelegate
width: parent.width

2
nymea-app/ui/devicepages/ButtonDevicePage.qml
View File

@ -11,7 +11,7 @@ GenericDevicePage {
GenericTypeLogView {
anchors.fill: parent
text: qsTr("This button has been pressed %1 times in the last 24 hours.")
text: qsTr("This button has been pressed %1 times in the last %2 days.")
logsModel: LogsModel {
deviceId: root.device.id

2
nymea-app/ui/devicepages/InputTriggerDevicePage.qml
View File

@ -10,7 +10,7 @@ GenericDevicePage {
GenericTypeLogView {
anchors.fill: parent
text: qsTr("This event has appeared %1 times in the last 24 hours.")
text: qsTr("This event has appeared %1 times in the last %2 days.")
logsModel: LogsModel {
deviceId: root.device.id

2
nymea-app/ui/devicepages/NotificationsDevicePage.qml
View File

@ -74,7 +74,7 @@ DevicePageBase {
GenericTypeLogView {
Layout.fillHeight: true
Layout.fillWidth: true
text: qsTr("%1 notifications sent to this device in the last 24 hours.")
text: qsTr("%1 notifications sent to this device in the last %2 days.")
logsModel: LogsModel {
deviceId: root.device.id

2
nymea-app/ui/devicepages/StateLogPage.qml
View File

@ -72,7 +72,7 @@ Page {
id: logView
width: swipeView.width
height: swipeView.height
text: qsTr("%1, %2 has changed %3 times in the last 24h").arg(device.name).arg(stateType.displayName)
text: qsTr("%1, %2 has changed %3 times in the last %4 days").arg(device.name).arg(stateType.displayName)
logsModel: logsModel

86
nymea-app/ui/images/action-interface.svg
View File

@ -25,12 +25,12 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="14.049998"
inkscape:cx="69.993806"
inkscape:cy="44.483695"
inkscape:zoom="4.9674244"
inkscape:cx="-23.781836"
inkscape:cy="-1.5772636"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
showgrid="false"
showborder="true"
fit-margin-top="0"
fit-margin-left="0"
@ -151,59 +151,41 @@
width="96"
id="rect4782-637"
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:3.99999976;marker:none;enable-background:accumulate" />
<path
sodipodi:nodetypes="ccccc"
inkscape:connector-curvature="0"
id="rect4747-4"
d="m 18.142883,124.50503 1.000025,3.99998 h -32.999999 v -3.99998 z"
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#808080;fill-opacity:1;stroke:none;stroke-width:8.99999905;marker:none;enable-background:accumulate"
inkscape:transform-center-x="-26.500014" />
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:none;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999976;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="M 5.6230724,101.05661 C -4.6712646,90.767855 -20.167327,87.685805 -33.61715,93.253885 c -13.44979,5.56807 -22.23047,18.700765 -22.23047,33.251945 0,14.55118 8.78068,27.68194 22.23047,33.25002 13.449823,5.56804 28.9458854,2.48602 39.2402224,-7.80276 l -2.828107,-2.82811 c -9.158173,9.15322 -22.9166364,11.88745 -34.8828054,6.93358 -11.96618,-4.95383 -19.75979,-16.60879 -19.75979,-29.55273 0,-12.94393 7.79361,-24.60083 19.75979,-29.554705 11.966169,-4.95382 25.7246324,-2.2196 34.8828054,6.933635 z"
d="m -45.337483,101.05663 c 10.294337,-10.288755 25.790399,-13.370805 39.240222,-7.802725 13.44979,5.56807 22.23047,18.700765 22.23047,33.251945 0,14.55118 -8.78068,27.68194 -22.23047,33.25002 -13.449823,5.56804 -28.945885,2.48602 -39.240222,-7.80276 l 2.828107,-2.82811 c 9.158173,9.15322 22.916636,11.88745 34.882805,6.93358 11.96618,-4.95383 19.75979,-16.60879 19.75979,-29.55273 0,-12.94393 -7.79361,-24.60083 -19.75979,-29.554705 -11.966169,-4.95382 -25.724632,-2.2196 -34.882805,6.933635 z"
id="path4145"
inkscape:connector-curvature="0" />
<g
id="g836"
transform="translate(-53.000055,2.025e-5)">
<path
inkscape:transform-center-x="-26.500014"
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#808080;fill-opacity:1;stroke:none;stroke-width:8.99999905;marker:none;enable-background:accumulate"
d="m 18.142883,124.50503 1.000025,3.99998 h -32.999999 v -3.99998 z"
id="rect4747-4"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.99940658;marker:none;enable-background:accumulate"
d="m 5.1430854,114.50443 0.0076,24 c 3.6500406,-1.66873 7.3659206,-3.53593 11.1491896,-5.59872 3.747742,-2.06778 7.362822,-4.2005 10.84286,-6.40026 -3.480038,-2.15576 -7.095118,-4.26806 -10.84286,-6.33584 -3.785348,-2.06393 -7.503345,-3.95188 -11.1553126,-5.66518 z"
id="path5837"
inkscape:connector-curvature="0" />
</g>
<path
inkscape:connector-curvature="0"
id="path5837"
d="m 9.5430153,119.30443 0.00456,14.4 c 2.1900247,-1.00124 4.4195527,-2.12156 6.6895137,-3.35923 2.248645,-1.24067 4.417693,-2.5203 6.505716,-3.84016 -2.088023,-1.29345 -4.257071,-2.56083 -6.505716,-3.8015 -2.271209,-1.23836 -4.502007,-2.37113 -6.6931875,-3.39911 z"
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.79964399;marker:none;enable-background:accumulate" />
<rect
transform="scale(1,-1)"
y="-174.50505"
x="-67.857147"
height="96"
width="96.000008"
id="rect4782-0"
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:3.99920893;marker:none;enable-background:accumulate" />
<g
id="g1546">
<path
sodipodi:nodetypes="sccccccsccs"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:none;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999976;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="m -14.85739,128.50594 c 8.51248,0 14.61615,-1.67112 18.89488,-4.54103 4.27876,-2.86991 6.59021,-6.93883 7.55365,-11.13672 0.481728,-2.09895 0.627128,-6.33371 0.627128,-6.33371 l -4.0339524,0.0815 c 0,0 -0.096796,3.64414 -0.4900656,5.35769 -0.78655,3.42713 -2.47562,6.42067 -5.88438,8.70705 -3.40876,2.28635 -8.67972,3.86521 -16.66726,3.86521 H -47.858 v 4.00003 z"
id="path4116"
inkscape:connector-curvature="0" />
<path
inkscape:connector-curvature="0"
id="path1542"
d="m 1.9230841,111.7131 14.1821019,2.49562 c -0.605737,-2.33062 -1.321885,-4.72081 -2.146577,-7.17122 -0.831349,-2.42991 -1.714887,-4.78821 -2.652114,-7.073694 -1.6363806,1.831694 -3.2611572,3.747714 -4.8734519,5.746744 -1.6139397,2.02168 -3.1168728,4.02187 -4.50973,6.00126 z"
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.79964399;marker:none;enable-background:accumulate" />
</g>
<g
id="g1552"
transform="matrix(1,0,0,-1,8.54e-4,253.01099)">
<path
inkscape:connector-curvature="0"
id="path1548"
d="m -14.85739,128.50594 c 8.51248,0 14.61615,-1.67112 18.89488,-4.54103 4.27876,-2.86991 6.59021,-6.93883 7.55365,-11.13672 0.481728,-2.09895 0.627128,-6.33371 0.627128,-6.33371 l -4.0339524,0.0815 c 0,0 -0.096796,3.64414 -0.4900656,5.35769 -0.78655,3.42713 -2.47562,6.42067 -5.88438,8.70705 -3.40876,2.28635 -8.67972,3.86521 -16.66726,3.86521 H -47.858 v 4.00003 z"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:none;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999976;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
sodipodi:nodetypes="sccccccsccs" />
<path
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.79964399;marker:none;enable-background:accumulate"
d="m 1.9230841,111.7131 14.1821019,2.49562 c -0.605737,-2.33062 -1.321885,-4.72081 -2.146577,-7.17122 -0.831349,-2.42991 -1.714887,-4.78821 -2.652114,-7.073694 -1.6363806,1.831694 -3.2611572,3.747714 -4.8734519,5.746744 -1.6139397,2.02168 -3.1168728,4.02187 -4.50973,6.00126 z"
id="path1550"
inkscape:connector-curvature="0" />
</g>
id="path836"
d="m -45.337483,101.05663 c 10.294337,-10.288755 25.790399,-13.370805 39.240222,-7.802725 13.44979,5.56807 22.23047,18.700765 22.23047,33.251945 0,14.55118 -8.78068,27.68194 -22.23047,33.25002 -13.449823,5.56804 -28.945885,2.48602 -39.240222,-7.80276 l 2.828107,-2.82811 c 9.158173,9.15322 22.916636,11.88745 34.882805,6.93358 11.96618,-4.95383 19.75979,-16.60879 19.75979,-29.55273 0,-12.94393 -7.79361,-24.60083 -19.75979,-29.554705 -11.966169,-4.95382 -25.724632,-2.2196 -34.882805,6.933635 z"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:none;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999976;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:none;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999976;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="m -41.337483,93.05663 c 10.294337,-10.288755 25.790399,-13.370805 39.240222,-7.802725 13.44979,5.56807 22.23047,18.700765 22.23047,33.251945 0,14.55118 -8.78068,27.68194 -22.23047,33.25002 -13.449823,5.56804 -28.945885,2.48602 -39.240222,-7.80276 l 2.828107,-2.82811 c 9.158173,9.15322 22.916636,11.88745 34.882805,6.93358 11.96618,-4.95383 19.75979,-16.60879 19.75979,-29.55273 0,-12.94393 -7.79361,-24.60083 -19.75979,-29.554705 -11.966169,-4.95382 -25.724632,-2.2196 -34.882805,6.933635 z"
id="path838"
inkscape:connector-curvature="0" />
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:none;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999976;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="m -49.337483,109.05663 c 10.294337,-10.288755 25.790399,-13.370805 39.240222,-7.80272 13.44979,5.56807 22.23047,18.70076 22.23047,33.25194 0,14.55118 -8.78068,27.68194 -22.23047,33.25002 -13.449823,5.56804 -28.945885,2.48602 -39.240222,-7.80276 l 2.828107,-2.82811 c 9.158173,9.15322 22.916636,11.88745 34.882805,6.93358 11.96618,-4.95383 19.75979,-16.60879 19.75979,-29.55273 0,-12.94393 -7.79361,-24.60083 -19.75979,-29.5547 -11.966169,-4.953825 -25.724632,-2.2196 -34.882805,6.93363 z"
id="path840"
inkscape:connector-curvature="0" />
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

52
nymea-app/ui/images/action.svg
View File

@ -15,7 +15,7 @@
version="1.1"
inkscape:version="0.92.3 (2405546, 2018-03-11)"
viewBox="0 0 96 96.000001"
sodipodi:docname="action.svg">
sodipodi:docname="event.svg">
<defs
id="defs4876" />
<sodipodi:namedview
@ -25,9 +25,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="14.049998"
inkscape:cx="54.082123"
inkscape:cy="46.974137"
inkscape:zoom="28.099996"
inkscape:cx="22.257505"
inkscape:cy="41.601488"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
@ -134,7 +134,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
@ -151,22 +151,30 @@
width="96"
id="rect4782-637"
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:3.99999976;marker:none;enable-background:accumulate" />
<path
sodipodi:nodetypes="ccccc"
inkscape:connector-curvature="0"
id="rect4747-4"
d="m 18.142883,124.50503 1.000025,3.99998 h -32.999999 v -3.99998 z"
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#808080;fill-opacity:1;stroke:none;stroke-width:8.99999905;marker:none;enable-background:accumulate"
inkscape:transform-center-x="-26.500014" />
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:none;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999976;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="M 5.6230724,101.05661 C -4.6712646,90.767855 -20.167327,87.685805 -33.61715,93.253885 c -13.44979,5.56807 -22.23047,18.700765 -22.23047,33.251945 0,14.55118 8.78068,27.68194 22.23047,33.25002 13.449823,5.56804 28.9458854,2.48602 39.2402224,-7.80276 l -2.828107,-2.82811 c -9.158173,9.15322 -22.9166364,11.88745 -34.8828054,6.93358 -11.96618,-4.95383 -19.75979,-16.60879 -19.75979,-29.55273 0,-12.94393 7.79361,-24.60083 19.75979,-29.554705 11.966169,-4.95382 25.7246324,-2.2196 34.8828054,6.933635 z"
id="path4145"
inkscape:connector-curvature="0" />
<path
inkscape:connector-curvature="0"
id="path5837"
d="m 5.1430854,114.50443 0.0076,24 c 3.6500406,-1.66873 7.3659206,-3.53593 11.1491896,-5.59872 3.747742,-2.06778 7.362822,-4.2005 10.84286,-6.40026 -3.480038,-2.15576 -7.095118,-4.26806 -10.84286,-6.33584 -3.785348,-2.06393 -7.503345,-3.95188 -11.1553126,-5.66518 z"
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.99940658;marker:none;enable-background:accumulate" />
<g
id="g842"
transform="matrix(-1,0,0,1,-39.714411,2.025e-5)">
<path
inkscape:connector-curvature="0"
id="path4145"
d="M 5.6230724,101.05661 C -4.6712646,90.767855 -20.167327,87.685805 -33.61715,93.253885 c -13.44979,5.56807 -22.23047,18.700765 -22.23047,33.251945 0,14.55118 8.78068,27.68194 22.23047,33.25002 13.449823,5.56804 28.9458854,2.48602 39.2402224,-7.80276 l -2.828107,-2.82811 c -9.158173,9.15322 -22.9166364,11.88745 -34.8828054,6.93358 -11.96618,-4.95383 -19.75979,-16.60879 -19.75979,-29.55273 0,-12.94393 7.79361,-24.60083 19.75979,-29.554705 11.966169,-4.95382 25.7246324,-2.2196 34.8828054,6.933635 z"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:none;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999976;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
<g
transform="matrix(-1,0,0,1,13.285644,0)"
id="g836">
<path
sodipodi:nodetypes="ccccc"
inkscape:connector-curvature="0"
id="rect4747-4"
d="m 18.142883,124.50503 1.000025,3.99998 h -32.999999 v -3.99998 z"
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#808080;fill-opacity:1;stroke:none;stroke-width:8.99999905;marker:none;enable-background:accumulate"
inkscape:transform-center-x="-26.500014" />
<path
inkscape:connector-curvature="0"
id="path5837"
d="m 5.1430854,114.50443 0.0076,24 c 3.6500406,-1.66873 7.3659206,-3.53593 11.1491896,-5.59872 3.747742,-2.06778 7.362822,-4.2005 10.84286,-6.40026 -3.480038,-2.15576 -7.095118,-4.26806 -10.84286,-6.33584 -3.785348,-2.06393 -7.503345,-3.95188 -11.1553126,-5.66518 z"
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.99940658;marker:none;enable-background:accumulate" />
</g>
</g>
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 7.3 KiB

39
nymea-app/ui/images/event-interface.svg
View File

@ -25,9 +25,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="7.024999"
inkscape:cx="70.049325"
inkscape:cy="25.941564"
inkscape:zoom="2.4837122"
inkscape:cx="99.639249"
inkscape:cy="-59.079403"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
@ -134,7 +134,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
@ -151,27 +151,32 @@
width="96"
id="rect4782-637"
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:3.99999976;marker:none;enable-background:accumulate" />
<path
sodipodi:nodetypes="ccccc"
inkscape:connector-curvature="0"
id="rect4747-4"
d="m 18.142883,124.50503 1.000025,3.99998 h -32.999999 v -3.99998 z"
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#808080;fill-opacity:1;stroke:none;stroke-width:8.99999905;marker:none;enable-background:accumulate"
inkscape:transform-center-x="-26.500014" />
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:none;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999976;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="m -45.337483,101.05663 c 10.294337,-10.288755 25.790399,-13.370805 39.240222,-7.802725 13.44979,5.56807 22.23047,18.700765 22.23047,33.251945 0,14.55118 -8.78068,27.68194 -22.23047,33.25002 -13.449823,5.56804 -28.945885,2.48602 -39.240222,-7.80276 l 2.828107,-2.82811 c 9.158173,9.15322 22.916636,11.88745 34.882805,6.93358 11.96618,-4.95383 19.75979,-16.60879 19.75979,-29.55273 0,-12.94393 -7.79361,-24.60083 -19.75979,-29.554705 -11.966169,-4.95382 -25.724632,-2.2196 -34.882805,6.933635 z"
d="M 5.6230724,101.05661 C -4.6712646,90.767855 -20.167327,87.685805 -33.61715,93.253885 c -13.44979,5.56807 -22.23047,18.700765 -22.23047,33.251945 0,14.55118 8.78068,27.68194 22.23047,33.25002 13.449823,5.56804 28.9458854,2.48602 39.2402224,-7.80276 l -2.828107,-2.82811 c -9.158173,9.15322 -22.9166364,11.88745 -34.8828054,6.93358 -11.96618,-4.95383 -19.75979,-16.60879 -19.75979,-29.55273 0,-12.94393 7.79361,-24.60083 19.75979,-29.554705 11.966169,-4.95382 25.7246324,-2.2196 34.8828054,6.933635 z"
id="path4145"
inkscape:connector-curvature="0" />
<path
inkscape:connector-curvature="0"
id="path4116"
d="m -28.791428,128.51885 c -8.51248,0 -14.61615,-1.67112 -18.89488,-4.54103 -4.27876,-2.86991 -6.59021,-6.93884 -7.55365,-11.13672 -0.481727,-2.09895 -0.627128,-6.33371 -0.627128,-6.33371 l 4.033952,0.0815 c 0,0 0.0968,3.64414 0.490066,5.35769 0.78655,3.42713 2.47562,6.42066 5.88438,8.70705 3.40876,2.28635 8.67972,3.86521 16.66726,3.86521 h 5.00061 v 4.00003 z"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:none;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999976;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
sodipodi:nodetypes="sccccccsccs" />
id="path5837"
d="m 5.1430854,114.50443 0.0076,24 c 3.6500406,-1.66873 7.3659206,-3.53593 11.1491896,-5.59872 3.747742,-2.06778 7.362822,-4.2005 10.84286,-6.40026 -3.480038,-2.15576 -7.095118,-4.26806 -10.84286,-6.33584 -3.785348,-2.06393 -7.503345,-3.95188 -11.1553126,-5.66518 z"
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.99940658;marker:none;enable-background:accumulate" />
<path
inkscape:connector-curvature="0"
id="path4118"
d="m -55.867086,146.58106 c 0,0 0.145401,-4.23476 0.627128,-6.3337 0.96344,-4.19788 3.27489,-8.26488 7.55365,-11.13479 4.27873,-2.86987 10.3824,-4.54295 18.89488,-4.54295 h 6.00062 v 3.99998 h -6.00062 c -7.98754,0 -13.2585,1.5789 -16.66726,3.86525 -3.40876,2.28635 -5.09783,5.27993 -5.88438,8.70701 -0.39327,1.71356 -0.490066,5.35772 -0.490066,5.35772 z"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:none;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999976;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
sodipodi:nodetypes="cccsccssccc" />
id="path830"
d="M 1.6230724,109.05661 C -8.6712646,98.767855 -24.167327,95.685805 -37.61715,101.25388 c -13.44979,5.56808 -22.23047,18.70077 -22.23047,33.25195 0,14.55118 8.78068,27.68194 22.23047,33.25002 13.449823,5.56804 28.9458854,2.48602 39.2402224,-7.80276 l -2.828107,-2.82811 c -9.1581734,9.15322 -22.9166364,11.88745 -34.8828054,6.93358 -11.96618,-4.95383 -19.75979,-16.60879 -19.75979,-29.55273 0,-12.94393 7.79361,-24.60083 19.75979,-29.5547 11.966169,-4.953825 25.724632,-2.2196 34.8828054,6.93363 z"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:none;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999976;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
<path
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.99940658;marker:none;enable-background:accumulate"
d="m -31.791338,114.51796 0.008,24 c 3.65004,-1.66877 7.365923,-3.53593 11.149193,-5.59872 3.74774,-2.06778 7.36282,-4.20053 10.84286,-6.40029 -3.48004,-2.15573 -7.09512,-4.26804 -10.84286,-6.33581 -3.78535,-2.06393 -7.503353,-3.95192 -11.155363,-5.66518 z"
id="path5588-9-2-96-5"
inkscape:connector-curvature="0" />
inkscape:connector-curvature="0"
id="path832"
d="M 9.6230724,93.05661 C -0.6712646,82.767855 -16.167327,79.685805 -29.61715,85.253885 c -13.44979,5.56807 -22.23047,18.700765 -22.23047,33.251945 0,14.55118 8.78068,27.68194 22.23047,33.25002 13.449823,5.56804 28.9458854,2.48602 39.2402224,-7.80276 l -2.828107,-2.82811 c -9.1581734,9.15322 -22.9166364,11.88745 -34.8828054,6.93358 -11.96618,-4.95383 -19.75979,-16.60879 -19.75979,-29.55273 0,-12.94393 7.79361,-24.60083 19.75979,-29.554705 11.966169,-4.95382 25.724632,-2.2196 34.8828054,6.933635 z"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:none;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999976;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.9 KiB

After

Width:  |  Height:  |  Size: 10 KiB

52
nymea-app/ui/images/event.svg
View File

@ -15,7 +15,7 @@
version="1.1"
inkscape:version="0.92.3 (2405546, 2018-03-11)"
viewBox="0 0 96 96.000001"
sodipodi:docname="event.svg">
sodipodi:docname="action.svg">
<defs
id="defs4876" />
<sodipodi:namedview
@ -25,9 +25,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="28.099996"
inkscape:cx="22.257505"
inkscape:cy="41.601488"
inkscape:zoom="14.049998"
inkscape:cx="54.082123"
inkscape:cy="46.974137"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
@ -134,7 +134,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@ -151,30 +151,22 @@
width="96"
id="rect4782-637"
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:3.99999976;marker:none;enable-background:accumulate" />
<g
id="g842"
transform="matrix(-1,0,0,1,-39.714411,2.025e-5)">
<path
inkscape:connector-curvature="0"
id="path4145"
d="M 5.6230724,101.05661 C -4.6712646,90.767855 -20.167327,87.685805 -33.61715,93.253885 c -13.44979,5.56807 -22.23047,18.700765 -22.23047,33.251945 0,14.55118 8.78068,27.68194 22.23047,33.25002 13.449823,5.56804 28.9458854,2.48602 39.2402224,-7.80276 l -2.828107,-2.82811 c -9.158173,9.15322 -22.9166364,11.88745 -34.8828054,6.93358 -11.96618,-4.95383 -19.75979,-16.60879 -19.75979,-29.55273 0,-12.94393 7.79361,-24.60083 19.75979,-29.554705 11.966169,-4.95382 25.7246324,-2.2196 34.8828054,6.933635 z"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:none;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999976;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
<g
transform="matrix(-1,0,0,1,13.285644,0)"
id="g836">
<path
sodipodi:nodetypes="ccccc"
inkscape:connector-curvature="0"
id="rect4747-4"
d="m 18.142883,124.50503 1.000025,3.99998 h -32.999999 v -3.99998 z"
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#808080;fill-opacity:1;stroke:none;stroke-width:8.99999905;marker:none;enable-background:accumulate"
inkscape:transform-center-x="-26.500014" />
<path
inkscape:connector-curvature="0"
id="path5837"
d="m 5.1430854,114.50443 0.0076,24 c 3.6500406,-1.66873 7.3659206,-3.53593 11.1491896,-5.59872 3.747742,-2.06778 7.362822,-4.2005 10.84286,-6.40026 -3.480038,-2.15576 -7.095118,-4.26806 -10.84286,-6.33584 -3.785348,-2.06393 -7.503345,-3.95188 -11.1553126,-5.66518 z"
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.99940658;marker:none;enable-background:accumulate" />
</g>
</g>
<path
sodipodi:nodetypes="ccccc"
inkscape:connector-curvature="0"
id="rect4747-4"
d="m 18.142883,124.50503 1.000025,3.99998 h -32.999999 v -3.99998 z"
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#808080;fill-opacity:1;stroke:none;stroke-width:8.99999905;marker:none;enable-background:accumulate"
inkscape:transform-center-x="-26.500014" />
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:none;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999976;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="M 5.6230724,101.05661 C -4.6712646,90.767855 -20.167327,87.685805 -33.61715,93.253885 c -13.44979,5.56807 -22.23047,18.700765 -22.23047,33.251945 0,14.55118 8.78068,27.68194 22.23047,33.25002 13.449823,5.56804 28.9458854,2.48602 39.2402224,-7.80276 l -2.828107,-2.82811 c -9.158173,9.15322 -22.9166364,11.88745 -34.8828054,6.93358 -11.96618,-4.95383 -19.75979,-16.60879 -19.75979,-29.55273 0,-12.94393 7.79361,-24.60083 19.75979,-29.554705 11.966169,-4.95382 25.7246324,-2.2196 34.8828054,6.933635 z"
id="path4145"
inkscape:connector-curvature="0" />
<path
inkscape:connector-curvature="0"
id="path5837"
d="m 5.1430854,114.50443 0.0076,24 c 3.6500406,-1.66873 7.3659206,-3.53593 11.1491896,-5.59872 3.747742,-2.06778 7.362822,-4.2005 10.84286,-6.40026 -3.480038,-2.15576 -7.095118,-4.26806 -10.84286,-6.33584 -3.785348,-2.06393 -7.503345,-3.95188 -11.1553126,-5.66518 z"
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.99940658;marker:none;enable-background:accumulate" />
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 7.0 KiB

46
nymea-app/ui/images/state-interface.svg
View File

@ -17,7 +17,7 @@
sodipodi:docname="state-interface.svg"
inkscape:version="0.92.3 (2405546, 2018-03-11)">
<defs
id="defs1598" />
id="defs11" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@ -29,18 +29,18 @@
inkscape:pageshadow="2"
inkscape:window-width="2880"
inkscape:window-height="1698"
id="namedview1596"
id="namedview9"
showgrid="true"
inkscape:zoom="13.906433"
inkscape:cx="42.524831"
inkscape:cy="54.157101"
inkscape:zoom="3.4766083"
inkscape:cx="125.41617"
inkscape:cy="24.142198"
inkscape:window-x="0"
inkscape:window-y="44"
inkscape:window-maximized="1"
inkscape:current-layer="svg4874">
<inkscape:grid
type="xygrid"
id="grid2159" />
id="grid818" />
</sodipodi:namedview>
<metadata
id="metadata4879">
@ -65,27 +65,29 @@
<path
inkscape:connector-curvature="0"
style="color:#000000;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;text-transform:none;white-space:normal;shape-padding:0;isolation:auto;mix-blend-mode:normal;solid-color:#000000;fill:#808080;color-rendering:auto;image-rendering:auto;shape-rendering:auto"
d="m 27.988,19.999 -0.01134,0.002 c -5.0328,0.0582 -8.7136,-0.12019 -11.725,1.541 -1.5055,0.83062 -2.6968,2.2356 -3.3555,3.9902 -0.65866,1.7546 -0.89647,3.8364 -0.89647,6.4668 v 48.002 c 0,2.6304 0.23773,4.7122 0.89647,6.4668 0.65866,1.7546 1.85,3.1596 3.3555,3.9902 3.011,1.6613 6.6918,1.4848 11.725,1.543 h 0.01134 40.023 0.01134 c 5.0328,-0.0582 8.7136,0.1183 11.725,-1.543 1.5055,-0.83066 2.6968,-2.2356 3.3555,-3.9902 0.65866,-1.7546 0.8965,-3.8364 0.8965,-6.4668 V 31.999 c 0,-2.6304 -0.23773,-4.7122 -0.8965,-6.4668 -0.65866,-1.7547 -1.85,-3.1596 -3.3555,-3.9902 -3.011,-1.6613 -6.6918,-1.4829 -11.725,-1.5411 l -0.01134,-0.002 -12.012,0.002 v 4 l 11.977,-0.002 c 5.0542,0.0586 8.3726,0.23547 9.8398,1.0449 0.73364,0.40479 1.1527,0.85493 1.543,1.8945 0.39024,1.0396 0.64059,2.691 0.64059,5.0606 v 48.002 c 0,2.3695 -0.2502,4.0209 -0.64059,5.0605 -0.39027,1.0396 -0.80935,1.4898 -1.543,1.8945 -1.4645,0.80806 -4.7782,0.98615 -9.8164,1.0449 h -39.977 -0.02268 c -5.0383,-0.059 -8.3519,-0.23697 -9.8164,-1.0449 -0.73364,-0.40475 -1.1508,-0.85489 -1.541,-1.8945 -0.39027,-1.0396 -0.6426,-2.691 -0.6426,-5.0605 v -48.002 c 0,-2.3696 0.25247,-4.0209 0.6426,-5.0606 0.39024,-1.0396 0.80734,-1.4897 1.541,-1.8945 1.4645,-0.80807 4.7782,-0.98616 9.8164,-1.0449 l 12,0.002 v -4 z"
id="path4643-2" />
d="m 29.988,19.999 -0.01134,0.002 c -5.0328,0.0582 -8.7136,-0.12019 -11.725,1.541 -1.5055,0.83062 -2.6968,2.2356 -3.3555,3.9902 -0.65866,1.7546 -0.89647,3.8364 -0.89647,6.4668 v 44.002 c 0,2.6304 0.23773,4.7122 0.89647,6.4668 0.65866,1.7546 1.85,3.1596 3.3555,3.9902 3.011,1.6613 6.6918,1.4848 11.725,1.543 h 0.01134 36.023 0.01134 c 5.0328,-0.0582 8.7136,0.1183 11.725,-1.543 1.5055,-0.83066 2.6968,-2.2356 3.3555,-3.9902 0.65866,-1.7546 0.8965,-3.8364 0.8965,-6.4668 V 31.999 c 0,-2.6304 -0.23773,-4.7122 -0.8965,-6.4668 -0.65866,-1.7547 -1.85,-3.1596 -3.3555,-3.9902 -3.011,-1.6613 -6.6918,-1.4829 -11.725,-1.5411 l -0.01134,-0.002 -8.012,0.002 v 4 l 7.977,-0.002 c 5.0542,0.0586 8.3726,0.23547 9.8398,1.0449 0.73364,0.40479 1.1527,0.85493 1.543,1.8945 0.39024,1.0396 0.64059,2.691 0.64059,5.0606 v 44.002 c 0,2.3695 -0.2502,4.0209 -0.64059,5.0605 -0.39027,1.0396 -0.80935,1.4898 -1.543,1.8945 -1.4645,0.80806 -4.7782,0.98615 -9.8164,1.0449 h -35.977 -0.02268 c -5.0383,-0.059 -8.3519,-0.23697 -9.8164,-1.0449 -0.73364,-0.40475 -1.1508,-0.85489 -1.541,-1.8945 -0.39027,-1.0396 -0.6426,-2.691 -0.6426,-5.0605 v -44.002 c 0,-2.3696 0.25247,-4.0209 0.6426,-5.0606 0.39024,-1.0396 0.80734,-1.4897 1.541,-1.8945 1.4645,-0.80807 4.7782,-0.98616 9.8164,-1.0449 l 8,0.002 v -4 z"
id="path4643-2"
sodipodi:nodetypes="ccccssccccccccsscccccccccsscccccccsscccccc" />
<path
inkscape:connector-curvature="0"
style="fill:#808080"
d="m 45.999,4 v 50 h 4 V 4 Z"
id="path4237" />
<path
inkscape:connector-curvature="0"
style="color:#000000;fill:#808080"
d="m 59.9999,46.005 -24,0.008 c 1.6687,3.6501 3.5359,7.366 5.5987,11.149 2.0678,3.7477 4.2005,7.3628 6.4003,10.843 2.1557,-3.48 4.268,-7.0951 6.3358,-10.843 2.0639,-3.7854 3.9519,-7.5033 5.6652,-11.155 z"
id="path5588-9-2-96-04" />
<path
inkscape:connector-curvature="0"
id="path4116"
d="m 50.000025,30.99939 c 0,-8.51248 -1.671118,-14.61615 -4.541027,-18.89488 C 42.589089,7.82575 38.520163,5.5143 34.32228,4.55086 25.926475,2.62395 16.909393,5.58849 12.367195,7.10257 l 1.265612,3.79344 C 18.090646,9.41005 26.573531,6.87467 33.427741,8.44775 36.854866,9.2343 39.848403,10.92337 42.13479,14.33213 44.42114,17.74089 46,23.01185 46,30.99939 V 64 h 4.000025 z"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:none;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999976;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
<path
inkscape:connector-curvature="0"
id="path4118"
d="M 83.683627,7.10257 C 79.141429,5.58849 70.124308,2.62395 61.728541,4.55086 57.530658,5.5143 53.463659,7.82575 50.593751,12.10451 47.72388,16.38324 46.050796,22.48691 46.050796,30.99939 v 20.00062 h 3.999988 V 30.99939 c 0,-7.98754 1.578897,-13.2585 3.865247,-16.66726 2.28635,-3.40876 5.279924,-5.09783 8.707011,-5.88438 6.854249,-1.57308 15.337133,0.9623 19.794935,2.44826 z"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:none;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.99999976;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
sodipodi:nodetypes="cccsccssccc" />
<path
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.99940658;marker:none;enable-background:accumulate"
d="m 35.999143,45.99948 24,0.008 c -1.668775,3.65004 -3.535937,7.365923 -5.598728,11.149193 -2.067779,3.74774 -4.200529,7.36282 -6.400289,10.84286 -2.15573,-3.48004 -4.268032,-7.09512 -6.335811,-10.84286 C 39.60039,53.371323 37.712403,49.65332 35.999143,46.00131 Z"
id="path5588-9-2-96-5"
sodipodi:nodetypes="ccccssccccccccsscccccccccsscccccccsscccccc"
id="path828"
d="m 35.988,13.999 -0.01134,0.002 c -5.0328,0.0582 -8.7136,-0.12019 -11.725,1.541 -1.5055,0.83062 -2.6968,2.2356 -3.3555,3.9902 -0.65866,1.7546 -0.89647,3.8364 -0.89647,6.4668 v 44.002 c 0,2.6304 0.23773,4.7122 0.89647,6.4668 0.65866,1.7546 1.85,3.1596 3.3555,3.9902 3.011,1.6613 6.6918,1.4848 11.725,1.543 h 0.01134 36.023 0.01134 c 5.0328,-0.0582 8.7136,0.1183 11.725,-1.543 1.5055,-0.83066 2.6968,-2.2356 3.3555,-3.9902 0.65866,-1.7546 0.8965,-3.8364 0.8965,-6.4668 V 25.999 c 0,-2.6304 -0.23773,-4.7122 -0.8965,-6.4668 -0.65866,-1.7547 -1.85,-3.1596 -3.3555,-3.9902 -3.011,-1.6613 -6.6918,-1.4829 -11.725,-1.5411 l -0.01134,-0.002 -8.012,0.002 v 4 l 7.977,-0.002 c 5.0542,0.0586 8.3726,0.23547 9.8398,1.0449 0.73364,0.40479 1.1527,0.85493 1.543,1.8945 0.39024,1.0396 0.64059,2.691 0.64059,5.0606 v 44.002 c 0,2.3695 -0.2502,4.0209 -0.64059,5.0605 -0.39027,1.0396 -0.80935,1.4898 -1.543,1.8945 -1.4645,0.80806 -4.7782,0.98615 -9.8164,1.0449 h -35.977 -0.02268 c -5.0383,-0.059 -8.3519,-0.23697 -9.8164,-1.0449 -0.73364,-0.40475 -1.1508,-0.85489 -1.541,-1.8945 -0.39027,-1.0396 -0.6426,-2.691 -0.6426,-5.0605 v -44.002 c 0,-2.3696 0.25247,-4.0209 0.6426,-5.0606 0.39024,-1.0396 0.80734,-1.4897 1.541,-1.8945 1.4645,-0.80807 4.7782,-0.98616 9.8164,-1.0449 l 8,0.002 v -4 z"
style="color:#000000;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;text-transform:none;white-space:normal;shape-padding:0;isolation:auto;mix-blend-mode:normal;solid-color:#000000;fill:#808080;color-rendering:auto;image-rendering:auto;shape-rendering:auto"
inkscape:connector-curvature="0" />
<path
inkscape:connector-curvature="0"
style="color:#000000;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;text-transform:none;white-space:normal;shape-padding:0;isolation:auto;mix-blend-mode:normal;solid-color:#000000;fill:#808080;color-rendering:auto;image-rendering:auto;shape-rendering:auto"
d="m 23.988,25.999 -0.01134,0.002 c -5.0328,0.0582 -8.7136,-0.12019 -11.725,1.541 -1.5055,0.83062 -2.6968,2.2356 -3.3555,3.9902 -0.65866,1.7546 -0.89647,3.8364 -0.89647,6.4668 v 44.002 c 0,2.6304 0.23773,4.7122 0.89647,6.4668 0.65866,1.7546 1.85,3.1596 3.3555,3.9902 3.011,1.6613 6.6918,1.4848 11.725,1.543 h 0.01134 36.023 0.01134 c 5.0328,-0.0582 8.7136,0.1183 11.725,-1.543 1.5055,-0.83066 2.6968,-2.2356 3.3555,-3.9902 0.65866,-1.7546 0.8965,-3.8364 0.8965,-6.4668 V 37.999 c 0,-2.6304 -0.23773,-4.7122 -0.8965,-6.4668 -0.65866,-1.7547 -1.85,-3.1596 -3.3555,-3.9902 -3.011,-1.6613 -6.6918,-1.4829 -11.725,-1.5411 l -0.01134,-0.002 -8.012,0.002 v 4 l 7.977,-0.002 c 5.0542,0.0586 8.3726,0.23547 9.8398,1.0449 0.73364,0.40479 1.1527,0.85493 1.543,1.8945 0.39024,1.0396 0.64059,2.691 0.64059,5.0606 v 44.002 c 0,2.3695 -0.2502,4.0209 -0.64059,5.0605 -0.39027,1.0396 -0.80935,1.4898 -1.543,1.8945 -1.4645,0.80806 -4.7782,0.98615 -9.8164,1.0449 h -35.977 -0.02268 c -5.0383,-0.059 -8.3519,-0.23697 -9.8164,-1.0449 -0.73364,-0.40475 -1.1508,-0.85489 -1.541,-1.8945 -0.39027,-1.0396 -0.6426,-2.691 -0.6426,-5.0605 v -44.002 c 0,-2.3696 0.25247,-4.0209 0.6426,-5.0606 0.39024,-1.0396 0.80734,-1.4897 1.541,-1.8945 1.4645,-0.80807 4.7782,-0.98616 9.8164,-1.0449 l 8,0.002 v -4 z"
id="path830"
sodipodi:nodetypes="ccccssccccccccsscccccccccsscccccccsscccccc" />
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 7.8 KiB

212
nymea-app/ui/system/LogViewerPage.qml
View File

@ -14,7 +14,10 @@ Page {
HeaderButton {
imageSource: "../images/go-down.svg"
color: root.autoScroll ? app.accentColor : keyColor
onClicked: root.autoScroll = !root.autoScroll
onClicked: {
listView.positionViewAtEnd();
root.autoScroll = !root.autoScroll
}
}
}
@ -24,7 +27,7 @@ Page {
id: logsModel
startTime: {
var date = new Date();
date.setHours(new Date().getHours() - 1);
date.setHours(new Date().getHours() - 2);
return date;
}
endTime: new Date()
@ -49,117 +52,118 @@ Page {
clip: true
headerPositioning: ListView.OverlayHeader
property int column0Width: root.width / 10 * 2
property int column1Width: root.width / 10 * 1
property int column2Width: root.width / 10 * 3
property int column3Width: root.width / 10 * 3
property int column4Width: root.width / 10 * 1
header: Rectangle {
width: parent.width
height: app.margins * 3
color: Material.primary
z: 2
Row {
width: parent.width
anchors.verticalCenter: parent.verticalCenter
Label {
width: listView.column0Width
text: qsTr("Time")
}
Label {
text: qsTr("Type")
width: listView.column1Width
}
Label {
width: listView.column2Width
text: qsTr("Thing")
}
Label {
width: listView.column3Width
text: qsTr("Object")
}
Label {
width: listView.column4Width
text: qsTr("Value")
}
}
ThinDivider {
anchors { left: parent.left; bottom: parent.bottom; right: parent.right }
onDraggingChanged: {
if (dragging) {
root.autoScroll = false;
}
}
delegate: Row {
ScrollBar.vertical: ScrollBar {}
onContentYChanged: {
if (!logsModel.busy && contentY - originY < 5 * height) {
logsModel.fetchEarlier(1)
}
}
delegate: ItemDelegate {
id: delegate
width: parent.width
property var device: Engine.deviceManager.devices.getDevice(model.deviceId)
property var deviceClass: device ? Engine.deviceManager.deviceClasses.getDeviceClass(device.deviceClassId) : null
Label {
width: listView.column0Width
text: width > 130 ? Qt.formatDateTime(model.timestamp,"dd.MM.yy - hh:mm:ss") : Qt.formatDateTime(model.timestamp,"hh:mm:ss")
elide: Text.ElideRight
}
Label {
width: listView.column1Width
text: {
switch (model.source) {
case LogEntry.LoggingSourceStates:
return "SC";
case LogEntry.LoggingSourceSystem:
return "SYS";
case LogEntry.LoggingSourceActions:
return "AE";
case LogEntry.LoggingSourceEvents:
return "E";
case LogEntry.LoggingSourceRules:
return "R";
leftPadding: 0
rightPadding: 0
topPadding: 0
bottomPadding: 0
contentItem: RowLayout {
id: contentColumn
anchors { left: parent.left; right: parent.right; margins: app.margins / 2 }
ColorIcon {
Layout.preferredWidth: app.iconSize
Layout.preferredHeight: width
Layout.alignment: Qt.AlignVCenter
color: {
switch (model.source) {
case LogEntry.LoggingSourceStates:
case LogEntry.LoggingSourceSystem:
case LogEntry.LoggingSourceActions:
case LogEntry.LoggingSourceEvents:
return app.accentColor
case LogEntry.LoggingSourceRules:
if (model.loggingEventType === LogEntry.LoggingEventTypeActiveChange) {
return model.value === true ? "green" : keyColor
}
return app.accentColor
}
}
// switch (model.loggingEventType) {
// case LogEntry.LoggingEventTypeTrigger:
// return "T";
// case LogEntry.LoggingEventTypeExitActionsExecuted:
// return "A";
// case LogEntry.LoggingEventTypeActiveChange:
// return "R";
// case LogEntry.LoggingEventTypeExitActionsExecuted:
// return "EA";
// case LogEntry.LoggingEventTypeEnabledChange:
// return "E";
// }
return "N/A";
}
}
Label {
width: listView.column2Width
text: model.source === LogEntry.LoggingSourceSystem ? qsTr("%1 Server").arg(app.systemName) : delegate.device.name
elide: Text.ElideRight
}
Label {
width: listView.column3Width
text : {
switch (model.source) {
case LogEntry.LoggingSourceStates:
return delegate.deviceClass.stateTypes.getStateType(model.typeId).displayName;
case LogEntry.LoggingSourceSystem:
return model.loggingEventType === LogEntry.LoggingEventTypeActiveChange ? qsTr("Active changed") : "FIXME"
case LogEntry.LoggingSourceActions:
return delegate.deviceClass.actionTypes.getActionType(model.typeId).displayName;
case LogEntry.LoggingSourceEvents:
return delegate.deviceClass.eventTypes.getEventType(model.typeId).displayName;
case LogEntry.LoggingSourceRules:
return Engine.ruleManager.rules.getRule(model.typeId).name;
name: {
switch (model.source) {
case LogEntry.LoggingSourceStates:
return "../images/state.svg"
case LogEntry.LoggingSourceSystem:
return "../images/system-shutdown.svg"
case LogEntry.LoggingSourceActions:
return "../images/action.svg"
case LogEntry.LoggingSourceEvents:
return "../images/event.svg"
case LogEntry.LoggingSourceRules:
return "../images/magic.svg"
}
}
}
ColumnLayout {
RowLayout {
Label {
Layout.fillWidth: true
text: model.source === LogEntry.LoggingSourceSystem ?
qsTr("%1 Server").arg(app.systemName)
: model.source === LogEntry.LoggingSourceRules ?
Engine.ruleManager.rules.getRule(model.typeId).name
: delegate.device.name
elide: Text.ElideRight
}
Label {
text: Qt.formatDateTime(model.timestamp,"dd.MM.yy - hh:mm:ss")
elide: Text.ElideRight
font.pixelSize: app.smallFont
}
}
Label {
text : {
switch (model.source) {
case LogEntry.LoggingSourceStates:
return "%1 -> %2".arg(delegate.deviceClass.stateTypes.getStateType(model.typeId).displayName).arg(model.value);
case LogEntry.LoggingSourceSystem:
return model.loggingEventType === LogEntry.LoggingEventTypeActiveChange ? qsTr("System started") : "N/A"
case LogEntry.LoggingSourceActions:
return "%1 (%2)".arg(delegate.deviceClass.actionTypes.getActionType(model.typeId).displayName).arg(model.value);
case LogEntry.LoggingSourceEvents:
return "%1 (%2)".arg(delegate.deviceClass.eventTypes.getEventType(model.typeId).displayName).arg(model.value);
case LogEntry.LoggingSourceRules:
switch (model.loggingEventType) {
case LogEntry.LoggingEventTypeTrigger:
return qsTr("Rule triggered");
case LogEntry.LoggingEventTypeActionsExecuted:
return qsTr("Actions executed");
case LogEntry.LoggingEventTypeActiveChange:
return model.value === true ? qsTr("Rule active") : qsTr("Rule inactive")
case LogEntry.LoggingEventTypeExitActionsExecuted:
return qsTr("Exit actions executed");
case LogEntry.LoggingEventTypeEnabledChange:
return qsTr("Enabled changed");
default:
print("Unhandled logging event type", model.loggingEventType)
}
return "N/A"
default:
print("unhandled logging source:", model.source)
}
return "N/A";
}
elide: Text.ElideRight
font.pixelSize: app.smallFont
}
return "N/A";
}
elide: Text.ElideRight
}
Label {
width: listView.column4Width
text: model.value
elide: Text.ElideRight
}
}
}