remove/skillgui_patches (#18)

* fix/skillgui_patches * remove gui sync patch hey, wont work in mycroft-core but will in ovos-core, they are the ones who want to keep the bug around * remove all gui monkey patching * remove all resource file monkey patching authored-by: jarbasai <[email protected]>
OpenVoiceOS · Mar 3, 2022 · c1ef1e0 · c1ef1e0
1 parent 0d5efe0
commit c1ef1e0
Show file tree

Hide file tree

Showing 88 changed files with 0 additions and 4,869 deletions.
diff --git a/ovos_workshop/patches/base_skill.py b/ovos_workshop/patches/base_skill.py
@@ -14,7 +14,6 @@
 from mycroft.skills.skill_data import read_vocab_file, load_vocabulary, \
     load_regex
 from mycroft.dialog import load_dialogs
-from ovos_workshop.patches.skill_gui import SkillGUI
 
 
 def get_non_properties(obj):
@@ -45,10 +44,6 @@ def check_class(cls):
 class MycroftSkill(_MycroftSkill):
     monkey_patched = True
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.gui = SkillGUI(self)  # pull/2683
-
     # https://github.com/MycroftAI/mycroft-core/pull/1468
     def _deactivate_skill(self, message):
         skill_id = message.data.get("skill_id")
@@ -63,12 +58,6 @@ def handle_skill_deactivated(self, message=None):
 
     # https://github.com/MycroftAI/mycroft-core/pull/1468
     def bind(self, bus):
-        if bus and not isinstance(self.gui, SkillGUI):
-            # needs to be available before call to self.bind, if a skill is
-            # initialized with the bus argument it will miss the monkey-patch
-            # AFAIK this never happens in mycroft-core but i want the patch
-            # to work in non standard use cases
-            self.gui = SkillGUI(self)  # pull/2683
         super().bind(bus)
         if bus:
             ConverseTracker.connect_bus(self.bus)  # pull/1468

diff --git a/ovos_workshop/patches/settings_gui_generator.py b/ovos_workshop/patches/settings_gui_generator.py