From fdc6eec193f1bdf333a13c1bac56ba50ea76911e Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Sat, 16 Nov 2024 18:30:53 +0000 Subject: [PATCH 1/3] fix: gui images (#22) * fix: gui images image path for GUI is wrong * fix: gui images image path for GUI is wrong --- __init__.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/__init__.py b/__init__.py index 440bfb2..ba30339 100644 --- a/__init__.py +++ b/__init__.py @@ -37,10 +37,6 @@ def __init__(self, *args, **kwargs): self.settings["center_location"] = False if "iss_size" not in self.settings: self.settings["iss_size"] = 0.5 - if "iss_icon" not in self.settings: - self.settings["iss_icon"] = f"{self.root_dir}/ui/iss3.png" - if "iss_bg" not in self.settings: - self.settings["iss_bg"] = f"{self.root_dir}/ui/iss.png" if "dpi" not in self.settings: self.settings["dpi"] = 500 @@ -133,7 +129,7 @@ def generate_map(self, lat, lon): m.bluemarble() x, y = m(lon, lat) - iss = plt.imread(self.settings["iss_icon"]) + iss = plt.imread(self.settings.get("iss_icon", f"{self.root_dir}/gui/all/iss3.png")) im = OffsetImage(iss, zoom=self.settings["iss_size"]) ab = AnnotationBbox(im, (x, y), xycoords='data', frameon=False) @@ -150,7 +146,7 @@ def generate_map(self, lat, lon): @intent_handler("about.intent") def handle_about_iss_intent(self, message): utterance = self.dialog_renderer.render("about", {}) - self.gui.show_image(self.settings["iss_bg"], + self.gui.show_image(self.settings.get("iss_bg", "iss.png"), override_idle=True, fill='PreserveAspectFit', caption=utterance) From c590d6551d18b0c8a610212d2c84d1cc005e3743 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Sat, 16 Nov 2024 18:31:09 +0000 Subject: [PATCH 2/3] Increment Version to 0.2.4a1 --- version.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.py b/version.py index e39ffda..c1bb0da 100644 --- a/version.py +++ b/version.py @@ -1,6 +1,6 @@ # START_VERSION_BLOCK VERSION_MAJOR = 0 VERSION_MINOR = 2 -VERSION_BUILD = 3 -VERSION_ALPHA = 0 +VERSION_BUILD = 4 +VERSION_ALPHA = 1 # END_VERSION_BLOCK From 9428f3714af126205f4f4f8411a8b6ee5570d4ab Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Sat, 16 Nov 2024 18:31:30 +0000 Subject: [PATCH 3/3] Update Changelog --- CHANGELOG.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 384a9b3..4ffae35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,16 +1,16 @@ # Changelog -## [0.2.3a1](https://github.com/OpenVoiceOS/ovos-skill-iss-location/tree/0.2.3a1) (2024-11-16) +## [0.2.4a1](https://github.com/OpenVoiceOS/ovos-skill-iss-location/tree/0.2.4a1) (2024-11-16) -[Full Changelog](https://github.com/OpenVoiceOS/ovos-skill-iss-location/compare/V0.2.2...0.2.3a1) +[Full Changelog](https://github.com/OpenVoiceOS/ovos-skill-iss-location/compare/V0.2.3...0.2.4a1) **Merged pull requests:** -- fix: only register resting\_screen if GUI [\#20](https://github.com/OpenVoiceOS/ovos-skill-iss-location/pull/20) ([JarbasAl](https://github.com/JarbasAl)) +- fix: gui images [\#22](https://github.com/OpenVoiceOS/ovos-skill-iss-location/pull/22) ([JarbasAl](https://github.com/JarbasAl)) -## [V0.2.2](https://github.com/OpenVoiceOS/ovos-skill-iss-location/tree/V0.2.2) (2024-11-15) +## [V0.2.3](https://github.com/OpenVoiceOS/ovos-skill-iss-location/tree/V0.2.3) (2024-11-16) -[Full Changelog](https://github.com/OpenVoiceOS/ovos-skill-iss-location/compare/0.2.2...V0.2.2) +[Full Changelog](https://github.com/OpenVoiceOS/ovos-skill-iss-location/compare/0.2.3...V0.2.3)