From 89a07d05ab92063e932f2c6d481c66ed48b99fd8 Mon Sep 17 00:00:00 2001 From: Aditya Mehra Date: Fri, 18 Dec 2020 12:52:44 +0530 Subject: [PATCH] Add missing remove page implementation and show idle if all pages removed --- mycroft/client/enclosure/base.py | 4 ++++ mycroft/enclosure/gui.py | 10 ++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/mycroft/client/enclosure/base.py b/mycroft/client/enclosure/base.py index 7d32d00e23..9f977d627e 100644 --- a/mycroft/client/enclosure/base.py +++ b/mycroft/client/enclosure/base.py @@ -240,6 +240,10 @@ class Enclosure: }) # Remove the page from the local reprensentation as well. self.loaded[0].pages.pop(pos) + # Add a check to return to idle from position 0 + if pos == 0 and self.config.get("platform") == "mycroft_mark_2" and + len(self.loaded[0].pages) == 0: + self.bus.emit(Message("mycroft.mark2.reset_idle")) def __insert_new_namespace(self, namespace, pages): """ Insert new namespace and pages. diff --git a/mycroft/enclosure/gui.py b/mycroft/enclosure/gui.py index a83e8fb2da..bd5ad39e78 100644 --- a/mycroft/enclosure/gui.py +++ b/mycroft/enclosure/gui.py @@ -228,9 +228,15 @@ class SkillGUI: # Convert pages to full reference page_urls = [] for name in page_names: - page = self.skill.find_resource(name, 'ui') + if name.startswith("SYSTEM"): + page = resolve_resource_file(join('ui', name)) + else: + page = self.skill.find_resource(name, 'ui') if page: - page_urls.append("file://" + page) + if self.config.get('remote'): + page_urls.append(self.remote_url + "/" + page) + else: + page_urls.append("file://" + page) else: raise FileNotFoundError("Unable to find page: {}".format(name))