From 439eb9309a3ed4be454e328a4c9f23f5ba67c4cb Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Fri, 24 Nov 2023 18:11:04 +0100 Subject: [PATCH] . --- HMI/nspanel.tft | Bin 8372412 -> 8372752 bytes .../usr/bin/mqtt-manager/libs/icon_mapping.py | 14 +++++++------- .../usr/bin/mqtt-manager/panel_cards.py | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft index 20b4db960edefe179c909e0a6ce4a24029f482cb..581076236179fc9a282e6c2493893ec42726c382 100644 GIT binary patch delta 23989 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 A+W-In diff --git a/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/libs/icon_mapping.py b/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/libs/icon_mapping.py index 7282ce18..07870bfa 100644 --- a/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/libs/icon_mapping.py +++ b/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/libs/icon_mapping.py @@ -6904,16 +6904,16 @@ icons = { def get_icon_id(ma_name): if isinstance(ma_name, re.Match): ma_name = ma_name.group(0).replace('', '').replace('', '') + print(f"testxxxx {ma_name}") if "text:" in ma_name: return ma_name.replace("text:", "") - # if "ha:" in ma_name: - # splitted_string = ma_name.replace("ha:","").rpartition('}') - # template_string = f"{splitted_string[0]}{splitted_string[1]}" - # templates_result = apis.ha_api.render_template(template_string) - # if isinstance(templates_result, str): - # templates_result = re.sub(r".+?<\/I>", get_icon_id, templates_result) - # return f"{templates_result}{splitted_string[2]}" + if "" in ma_name and "" in ma_name: + print(f"testdddd {ma_name}") + if isinstance(ma_name, str): + ma_name = re.sub(r'.+?<\/I>', get_icon_id, ma_name) + print(f"test123d {ma_name}") + ma_name = ma_name.replace("mdi:", "") if ma_name in icons: diff --git a/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/panel_cards.py b/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/panel_cards.py index 0c21b898..54c4ed0b 100644 --- a/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/panel_cards.py +++ b/nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/panel_cards.py @@ -41,7 +41,7 @@ class Entity: self.font = font_mapping.get(config.get("font", ""), "") def render(self, cardType=""): - icon_char = self.icon_overwrite or "" + icon_char = self.icon_overwrite or "mdi:gesture-tap-button" color = rgb_dec565([68, 115, 158]) if self.color_overwrite: color = rgb_dec565(self.color_overwrite)