From f28b1d15c66d9ca9a2436840ad825819b4f8c4e4 Mon Sep 17 00:00:00 2001 From: "Mike A. Trethewey" Date: Thu, 12 Mar 2020 16:47:39 -0700 Subject: [PATCH] Fix widget loader --- source/gui/randomize/dungeon.py | 2 ++ source/gui/randomize/generation.py | 2 ++ source/gui/randomize/multiworld.py | 1 + 3 files changed, 5 insertions(+) diff --git a/source/gui/randomize/dungeon.py b/source/gui/randomize/dungeon.py index 1d36c021..01985982 100644 --- a/source/gui/randomize/dungeon.py +++ b/source/gui/randomize/dungeon.py @@ -24,6 +24,7 @@ def dungeon_page(parent): # This first set goes in the Keysanity frame with open(os.path.join("resources","app","gui","randomize","dungeon","keysanity.json")) as keysanityItems: myDict = json.load(keysanityItems) + myDict = myDict["keysanity"] dictWidgets = widgets.make_widgets_from_dict(self, myDict, self.frames["keysanity"]) for key in dictWidgets: self.widgets[key] = dictWidgets[key] @@ -34,6 +35,7 @@ def dungeon_page(parent): self.frames["widgets"].pack(anchor=W) with open(os.path.join("resources","app","gui","randomize","dungeon","widgets.json")) as dungeonWidgets: myDict = json.load(dungeonWidgets) + myDict = myDict["widgets"] dictWidgets = widgets.make_widgets_from_dict(self, myDict, self.frames["widgets"]) for key in dictWidgets: self.widgets[key] = dictWidgets[key] diff --git a/source/gui/randomize/generation.py b/source/gui/randomize/generation.py index 7bdd5cd8..f358c864 100644 --- a/source/gui/randomize/generation.py +++ b/source/gui/randomize/generation.py @@ -20,6 +20,7 @@ def generation_page(parent,settings): # Defns include frame name, widget type, widget options, widget placement attributes with open(os.path.join("resources","app","gui","randomize","generation","checkboxes.json")) as checkboxes: myDict = json.load(checkboxes) + myDict = myDict["checkboxes"] dictWidgets = widgets.make_widgets_from_dict(self, myDict, self.frames["checkboxes"]) for key in dictWidgets: self.widgets[key] = dictWidgets[key] @@ -31,6 +32,7 @@ def generation_page(parent,settings): # Defns include frame name, widget type, widget options, widget placement attributes with open(os.path.join("resources","app","gui","randomize","generation","widgets.json")) as items: myDict = json.load(items) + myDict = myDict["widgets"] dictWidgets = widgets.make_widgets_from_dict(self, myDict, self.frames["widgets"]) for key in dictWidgets: self.widgets[key] = dictWidgets[key] diff --git a/source/gui/randomize/multiworld.py b/source/gui/randomize/multiworld.py index 369c1b6d..493f31b5 100644 --- a/source/gui/randomize/multiworld.py +++ b/source/gui/randomize/multiworld.py @@ -20,6 +20,7 @@ def multiworld_page(parent,settings): # Defns include frame name, widget type, widget options, widget placement attributes with open(os.path.join("resources","app","gui","randomize","multiworld","widgets.json")) as multiworldItems: myDict = json.load(multiworldItems) + myDict = myDict["widgets"] dictWidgets = widgets.make_widgets_from_dict(self, myDict, self.frames["widgets"]) for key in dictWidgets: self.widgets[key] = dictWidgets[key]