From 7c3c67ec138fd97af2e53fe2465cbac28d7fd667 Mon Sep 17 00:00:00 2001 From: "Mike A. Trethewey" Date: Wed, 19 Feb 2020 01:37:40 -0800 Subject: [PATCH] JSONify Generation options --- gui/randomize/generation.py | 35 +++++-------------- .../gui/randomize/generation/checkboxes.json | 20 +++++++++++ 2 files changed, 28 insertions(+), 27 deletions(-) create mode 100644 resources/app/gui/randomize/generation/checkboxes.json diff --git a/gui/randomize/generation.py b/gui/randomize/generation.py index 9659d63d..1f90b31e 100644 --- a/gui/randomize/generation.py +++ b/gui/randomize/generation.py @@ -1,6 +1,8 @@ import os from tkinter import ttk, filedialog, IntVar, StringVar, Button, Checkbutton, Entry, Frame, Label, E, W, LEFT, RIGHT, X import gui.widgets as widgets +import json +import os def generation_page(parent,settings): # Generation Setup @@ -9,33 +11,12 @@ def generation_page(parent,settings): # Generation Setup options self.widgets = {} - myDict = { - ## Generate Spoiler - "spoiler": { - "type": "checkbox", - "label": { - "text": "Create Spoiler Log" - } - }, - ## Don't make ROM - "suppressrom": { - "type": "checkbox", - "label": { - "text": "Do not create patched ROM" - } - }, - ## Use Custom Item Pool as defined in Custom tab - "usecustompool": { - "type": "checkbox", - "label": { - "text": "Use custom item pool" - } - } - } - dictWidgets = widgets.make_widgets_from_dict(self, myDict, self) - for key in dictWidgets: - self.widgets[key] = dictWidgets[key] - self.widgets[key].pack(anchor=W) + with open(os.path.join("resources","app","gui","randomize","generation","checkboxes.json")) as checkboxes: + myDict = json.load(checkboxes) + dictWidgets = widgets.make_widgets_from_dict(self, myDict, self) + for key in dictWidgets: + self.widgets[key] = dictWidgets[key] + self.widgets[key].pack(anchor=W) ## Locate base ROM baseRomFrame = Frame(self) diff --git a/resources/app/gui/randomize/generation/checkboxes.json b/resources/app/gui/randomize/generation/checkboxes.json new file mode 100644 index 00000000..ed208ec3 --- /dev/null +++ b/resources/app/gui/randomize/generation/checkboxes.json @@ -0,0 +1,20 @@ +{ + "spoiler": { + "type": "checkbox", + "label": { + "text": "Create Spoiler Log" + } + }, + "suppressrom": { + "type": "checkbox", + "label": { + "text": "Do not create patched ROM" + } + }, + "usecustompool": { + "type": "checkbox", + "label": { + "text": "Use custom item pool" + } + } +}