From 61611ea6e2627441192a24066b92bd98610a2163 Mon Sep 17 00:00:00 2001 From: Aditya Date: Wed, 12 Aug 2020 21:29:49 +0530 Subject: [PATCH 1/2] allow override for platform skill animations --- mycroft/enclosure/gui.py | 50 +++++++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 14 deletions(-) diff --git a/mycroft/enclosure/gui.py b/mycroft/enclosure/gui.py index db5cb89848..3726eca9ae 100644 --- a/mycroft/enclosure/gui.py +++ b/mycroft/enclosure/gui.py @@ -125,7 +125,7 @@ class SkillGUI: "event_name": event_name, "params": params})) - def show_page(self, name, override_idle=None): + def show_page(self, name, override_idle=None, override_animations=False): """Begin showing the page in the GUI Arguments: @@ -134,10 +134,13 @@ class SkillGUI: True: Takes over the resting page indefinitely (int): Delays resting page for the specified number of seconds. + override_animations (boolean): + True: Disables showing all platform skill animations. + False: 'Default' always show animations. """ - self.show_pages([name], 0, override_idle) + self.show_pages([name], 0, override_idle, override_animations) - def show_pages(self, page_names, index=0, override_idle=None): + def show_pages(self, page_names, index=0, override_idle=None, override_animations=False): """Begin showing the list of pages in the GUI. Arguments: @@ -149,6 +152,9 @@ class SkillGUI: True: Takes over the resting page indefinitely (int): Delays resting page for the specified number of seconds. + override_animations (boolean): + True: Disables showing all platform skill animations. + False: 'Default' always show animations. """ if not isinstance(page_names, list): raise ValueError('page_names must be a list') @@ -182,7 +188,8 @@ class SkillGUI: {"page": page_urls, "index": index, "__from": self.skill.skill_id, - "__idle": override_idle})) + "__idle": override_idle, + "__animations": override_animations})) def remove_page(self, page): """Remove a single page from the GUI. @@ -215,7 +222,7 @@ class SkillGUI: {"page": page_urls, "__from": self.skill.skill_id})) - def show_text(self, text, title=None, override_idle=None): + def show_text(self, text, title=None, override_idle=None, override_animations=False): """Display a GUI page for viewing simple text. Arguments: @@ -225,15 +232,18 @@ class SkillGUI: True: Takes over the resting page indefinitely (int): Delays resting page for the specified number of seconds. + override_animations (boolean): + True: Disables showing all platform skill animations. + False: 'Default' always show animations. """ self.clear() self["text"] = text self["title"] = title - self.show_page("SYSTEM_TextFrame.qml", override_idle) + self.show_page("SYSTEM_TextFrame.qml", override_idle, override_animations) def show_image(self, url, caption=None, title=None, fill=None, - override_idle=None): + override_idle=None, override_animations=False): """Display a GUI page for viewing an image. Arguments: @@ -246,17 +256,20 @@ class SkillGUI: True: Takes over the resting page indefinitely (int): Delays resting page for the specified number of seconds. + override_animations (boolean): + True: Disables showing all platform skill animations. + False: 'Default' always show animations. """ self.clear() self["image"] = url self["title"] = title self["caption"] = caption self["fill"] = fill - self.show_page("SYSTEM_ImageFrame.qml", override_idle) + self.show_page("SYSTEM_ImageFrame.qml", override_idle, override_animations) def show_animated_image(self, url, caption=None, title=None, fill=None, - override_idle=None): + override_idle=None, override_animations=False): """Display a GUI page for viewing an image. Arguments: @@ -269,15 +282,18 @@ class SkillGUI: True: Takes over the resting page indefinitely (int): Delays resting page for the specified number of seconds. + override_animations (boolean): + True: Disables showing all platform skill animations. + False: 'Default' always show animations. """ self.clear() self["image"] = url self["title"] = title self["caption"] = caption self["fill"] = fill - self.show_page("SYSTEM_AnimatedImageFrame.qml", override_idle) + self.show_page("SYSTEM_AnimatedImageFrame.qml", override_idle, override_animations) - def show_html(self, html, resource_url=None, override_idle=None): + def show_html(self, html, resource_url=None, override_idle=None, override_animations=False): """Display an HTML page in the GUI. Arguments: @@ -287,13 +303,16 @@ class SkillGUI: True: Takes over the resting page indefinitely (int): Delays resting page for the specified number of seconds. + override_animations (boolean): + True: Disables showing all platform skill animations. + False: 'Default' always show animations. """ self.clear() self["html"] = html self["resourceLocation"] = resource_url - self.show_page("SYSTEM_HtmlFrame.qml", override_idle) + self.show_page("SYSTEM_HtmlFrame.qml", override_idle, override_animations) - def show_url(self, url, override_idle=None): + def show_url(self, url, override_idle=None, override_animations=False): """Display an HTML page in the GUI. Arguments: @@ -302,10 +321,13 @@ class SkillGUI: True: Takes over the resting page indefinitely (int): Delays resting page for the specified number of seconds. + override_animations (boolean): + True: Disables showing all platform skill animations. + False: 'Default' always show animations. """ self.clear() self["url"] = url - self.show_page("SYSTEM_UrlFrame.qml", override_idle) + self.show_page("SYSTEM_UrlFrame.qml", override_idle, override_animations) def shutdown(self): """Shutdown gui interface. From 4d8cd10b31a2cba4e96ef0e89ce5acd614920332 Mon Sep 17 00:00:00 2001 From: Aditya Date: Wed, 12 Aug 2020 22:03:38 +0530 Subject: [PATCH 2/2] fix pep8 errors --- mycroft/enclosure/gui.py | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/mycroft/enclosure/gui.py b/mycroft/enclosure/gui.py index 3726eca9ae..6a667cc538 100644 --- a/mycroft/enclosure/gui.py +++ b/mycroft/enclosure/gui.py @@ -125,7 +125,8 @@ class SkillGUI: "event_name": event_name, "params": params})) - def show_page(self, name, override_idle=None, override_animations=False): + def show_page(self, name, override_idle=None, + override_animations=False): """Begin showing the page in the GUI Arguments: @@ -140,7 +141,8 @@ class SkillGUI: """ self.show_pages([name], 0, override_idle, override_animations) - def show_pages(self, page_names, index=0, override_idle=None, override_animations=False): + def show_pages(self, page_names, index=0, override_idle=None, + override_animations=False): """Begin showing the list of pages in the GUI. Arguments: @@ -222,7 +224,8 @@ class SkillGUI: {"page": page_urls, "__from": self.skill.skill_id})) - def show_text(self, text, title=None, override_idle=None, override_animations=False): + def show_text(self, text, title=None, override_idle=None, + override_animations=False): """Display a GUI page for viewing simple text. Arguments: @@ -239,7 +242,8 @@ class SkillGUI: self.clear() self["text"] = text self["title"] = title - self.show_page("SYSTEM_TextFrame.qml", override_idle, override_animations) + self.show_page("SYSTEM_TextFrame.qml", override_idle, + override_animations) def show_image(self, url, caption=None, title=None, fill=None, @@ -265,7 +269,8 @@ class SkillGUI: self["title"] = title self["caption"] = caption self["fill"] = fill - self.show_page("SYSTEM_ImageFrame.qml", override_idle, override_animations) + self.show_page("SYSTEM_ImageFrame.qml", override_idle, + override_animations) def show_animated_image(self, url, caption=None, title=None, fill=None, @@ -291,9 +296,11 @@ class SkillGUI: self["title"] = title self["caption"] = caption self["fill"] = fill - self.show_page("SYSTEM_AnimatedImageFrame.qml", override_idle, override_animations) + self.show_page("SYSTEM_AnimatedImageFrame.qml", override_idle, + override_animations) - def show_html(self, html, resource_url=None, override_idle=None, override_animations=False): + def show_html(self, html, resource_url=None, override_idle=None, + override_animations=False): """Display an HTML page in the GUI. Arguments: @@ -310,9 +317,11 @@ class SkillGUI: self.clear() self["html"] = html self["resourceLocation"] = resource_url - self.show_page("SYSTEM_HtmlFrame.qml", override_idle, override_animations) + self.show_page("SYSTEM_HtmlFrame.qml", override_idle, + override_animations) - def show_url(self, url, override_idle=None, override_animations=False): + def show_url(self, url, override_idle=None, + override_animations=False): """Display an HTML page in the GUI. Arguments: @@ -327,7 +336,8 @@ class SkillGUI: """ self.clear() self["url"] = url - self.show_page("SYSTEM_UrlFrame.qml", override_idle, override_animations) + self.show_page("SYSTEM_UrlFrame.qml", override_idle, + override_animations) def shutdown(self): """Shutdown gui interface.