h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-20 14:37:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improved screensaverAdvanced icon handling: option to load from iobroker object

Browse Source
This commit is contained in:
fre4242
2023-07-30 20:09:26 +02:00
parent 8850e1d8cb
commit 26cce9ac13
2 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ioBroker/NsPanelTs.ts
View File

@@ -6987,7 +6987,13 @@ function HandleScreensaverUpdate(): void {
let val = getState(config.leftScreensaverEntity[i].ScreensaverEntity).val; let val = getState(config.leftScreensaverEntity[i].ScreensaverEntity).val;
let iconColor = rgb_dec565(White); let iconColor = rgb_dec565(White);
let icon = Icons.GetIcon(config.leftScreensaverEntity[i].ScreensaverEntityIconOn); let icon;
if (existsObject(config.leftScreensaverEntity[i].ScreensaverEntityIconOn)) {
let iconName = getState(config.leftScreensaverEntity[i].ScreensaverEntityIconOn).val;
icon = Icons.GetIcon(iconName);
} else {
icon = Icons.GetIcon(config.leftScreensaverEntity[i].ScreensaverEntityIconOn);
}
if (typeof(val) == 'number') { if (typeof(val) == 'number') {
val = (val * config.leftScreensaverEntity[i].ScreensaverEntityFactor).toFixed(config.leftScreensaverEntity[i].ScreensaverEntityDecimalPlaces) + config.leftScreensaverEntity[i].ScreensaverEntityUnitText; val = (val * config.leftScreensaverEntity[i].ScreensaverEntityFactor).toFixed(config.leftScreensaverEntity[i].ScreensaverEntityDecimalPlaces) + config.leftScreensaverEntity[i].ScreensaverEntityUnitText;
@@ -7164,7 +7170,13 @@ function HandleScreensaverUpdate(): void {
let val = getState(config.bottomScreensaverEntity[i].ScreensaverEntity).val; let val = getState(config.bottomScreensaverEntity[i].ScreensaverEntity).val;
let iconColor = rgb_dec565(White); let iconColor = rgb_dec565(White);
let icon = Icons.GetIcon(config.bottomScreensaverEntity[i].ScreensaverEntityIconOn); let icon;
if (existsObject(config.bottomScreensaverEntity[i].ScreensaverEntityIconOn)) {
let iconName = getState(config.bottomScreensaverEntity[i].ScreensaverEntityIconOn).val;
icon = Icons.GetIcon(iconName);
} else {
icon = Icons.GetIcon(config.bottomScreensaverEntity[i].ScreensaverEntityIconOn);
}
if (typeof(val) == 'number') { if (typeof(val) == 'number') {
val = (val * config.bottomScreensaverEntity[i].ScreensaverEntityFactor).toFixed(config.bottomScreensaverEntity[i].ScreensaverEntityDecimalPlaces) + config.bottomScreensaverEntity[i].ScreensaverEntityUnitText; val = (val * config.bottomScreensaverEntity[i].ScreensaverEntityFactor).toFixed(config.bottomScreensaverEntity[i].ScreensaverEntityDecimalPlaces) + config.bottomScreensaverEntity[i].ScreensaverEntityUnitText;
@@ -7215,7 +7227,7 @@ function HandleScreensaverUpdate(): void {
let val = getState(config.indicatorScreensaverEntity[i].ScreensaverEntity).val; let val = getState(config.indicatorScreensaverEntity[i].ScreensaverEntity).val;
let iconColor = rgb_dec565(White); let iconColor = rgb_dec565(White);
let icon = null; let icon;
if (existsObject(config.indicatorScreensaverEntity[i].ScreensaverEntityIconOn)) { if (existsObject(config.indicatorScreensaverEntity[i].ScreensaverEntityIconOn)) {
let iconName = getState(config.indicatorScreensaverEntity[i].ScreensaverEntityIconOn).val; let iconName = getState(config.indicatorScreensaverEntity[i].ScreensaverEntityIconOn).val;
icon = Icons.GetIcon(iconName); icon = Icons.GetIcon(iconName);

18
ioBroker/NsPanelTs_without_Examples.ts
View File

@@ -6488,7 +6488,13 @@ function HandleScreensaverUpdate(): void {
let val = getState(config.leftScreensaverEntity[i].ScreensaverEntity).val; let val = getState(config.leftScreensaverEntity[i].ScreensaverEntity).val;
let iconColor = rgb_dec565(White); let iconColor = rgb_dec565(White);
let icon = Icons.GetIcon(config.leftScreensaverEntity[i].ScreensaverEntityIconOn); let icon;
if (existsObject(config.leftScreensaverEntity[i].ScreensaverEntityIconOn)) {
let iconName = getState(config.leftScreensaverEntity[i].ScreensaverEntityIconOn).val;
icon = Icons.GetIcon(iconName);
} else {
icon = Icons.GetIcon(config.leftScreensaverEntity[i].ScreensaverEntityIconOn);
}
if (typeof(val) == 'number') { if (typeof(val) == 'number') {
val = (val * config.leftScreensaverEntity[i].ScreensaverEntityFactor).toFixed(config.leftScreensaverEntity[i].ScreensaverEntityDecimalPlaces) + config.leftScreensaverEntity[i].ScreensaverEntityUnitText; val = (val * config.leftScreensaverEntity[i].ScreensaverEntityFactor).toFixed(config.leftScreensaverEntity[i].ScreensaverEntityDecimalPlaces) + config.leftScreensaverEntity[i].ScreensaverEntityUnitText;
@@ -6665,7 +6671,13 @@ function HandleScreensaverUpdate(): void {
let val = getState(config.bottomScreensaverEntity[i].ScreensaverEntity).val; let val = getState(config.bottomScreensaverEntity[i].ScreensaverEntity).val;
let iconColor = rgb_dec565(White); let iconColor = rgb_dec565(White);
let icon = Icons.GetIcon(config.bottomScreensaverEntity[i].ScreensaverEntityIconOn); let icon;
if (existsObject(config.bottomScreensaverEntity[i].ScreensaverEntityIconOn)) {
let iconName = getState(config.bottomScreensaverEntity[i].ScreensaverEntityIconOn).val;
icon = Icons.GetIcon(iconName);
} else {
icon = Icons.GetIcon(config.bottomScreensaverEntity[i].ScreensaverEntityIconOn);
}
if (typeof(val) == 'number') { if (typeof(val) == 'number') {
val = (val * config.bottomScreensaverEntity[i].ScreensaverEntityFactor).toFixed(config.bottomScreensaverEntity[i].ScreensaverEntityDecimalPlaces) + config.bottomScreensaverEntity[i].ScreensaverEntityUnitText; val = (val * config.bottomScreensaverEntity[i].ScreensaverEntityFactor).toFixed(config.bottomScreensaverEntity[i].ScreensaverEntityDecimalPlaces) + config.bottomScreensaverEntity[i].ScreensaverEntityUnitText;
@@ -6716,7 +6728,7 @@ function HandleScreensaverUpdate(): void {
let val = getState(config.indicatorScreensaverEntity[i].ScreensaverEntity).val; let val = getState(config.indicatorScreensaverEntity[i].ScreensaverEntity).val;
let iconColor = rgb_dec565(White); let iconColor = rgb_dec565(White);
let icon = null; let icon;
if (existsObject(config.indicatorScreensaverEntity[i].ScreensaverEntityIconOn)) { if (existsObject(config.indicatorScreensaverEntity[i].ScreensaverEntityIconOn)) {
let iconName = getState(config.indicatorScreensaverEntity[i].ScreensaverEntityIconOn).val; let iconName = getState(config.indicatorScreensaverEntity[i].ScreensaverEntityIconOn).val;
icon = Icons.GetIcon(iconName); icon = Icons.GetIcon(iconName);