From 0aa7750b978054b482be1914b57ca33a222fca09 Mon Sep 17 00:00:00 2001 From: "Mike A. Trethewey" Date: Sat, 22 Feb 2020 00:52:02 -0800 Subject: [PATCH] Condense Game Options --- gui/randomize/gameoptions.py | 30 ++-- .../gui/randomize/gameoptions/checkboxes.json | 21 --- .../gameoptions/leftRomOptionsFrame.json | 45 ------ .../gameoptions/rightRomOptionsFrame.json | 63 --------- .../gui/randomize/gameoptions/widgets.json | 131 ++++++++++++++++++ 5 files changed, 141 insertions(+), 149 deletions(-) delete mode 100644 resources/app/gui/randomize/gameoptions/checkboxes.json delete mode 100644 resources/app/gui/randomize/gameoptions/leftRomOptionsFrame.json delete mode 100644 resources/app/gui/randomize/gameoptions/rightRomOptionsFrame.json create mode 100644 resources/app/gui/randomize/gameoptions/widgets.json diff --git a/gui/randomize/gameoptions.py b/gui/randomize/gameoptions.py index dba9751a..eb107df4 100644 --- a/gui/randomize/gameoptions.py +++ b/gui/randomize/gameoptions.py @@ -17,24 +17,21 @@ def gameoptions_page(top, parent): self.frames["checkboxes"] = Frame(self) self.frames["checkboxes"].pack(anchor=W) - with open(os.path.join("resources","app","gui","randomize","gameoptions","checkboxes.json")) as checkboxes: - myDict = json.load(checkboxes) - dictWidgets = widgets.make_widgets_from_dict(self, myDict, self.frames["checkboxes"]) - for key in dictWidgets: - self.widgets[key] = dictWidgets[key] - self.widgets[key].pack(anchor=W) - self.frames["leftRomOptionsFrame"] = Frame(self) self.frames["rightRomOptionsFrame"] = Frame(self) self.frames["leftRomOptionsFrame"].pack(side=LEFT) self.frames["rightRomOptionsFrame"].pack(side=RIGHT) - with open(os.path.join("resources","app","gui","randomize","gameoptions","leftRomOptionsFrame.json")) as leftRomOptionsFrameItems: - myDict = json.load(leftRomOptionsFrameItems) - dictWidgets = widgets.make_widgets_from_dict(self, myDict, self.frames["leftRomOptionsFrame"]) - for key in dictWidgets: - self.widgets[key] = dictWidgets[key] - self.widgets[key].pack(anchor=E) + with open(os.path.join("resources","app","gui","randomize","gameoptions","widgets.json")) as widgetDefns: + myDict = json.load(widgetDefns) + for framename,theseWidgets in myDict.items(): + dictWidgets = widgets.make_widgets_from_dict(self, theseWidgets, self.frames[framename]) + for key in dictWidgets: + self.widgets[key] = dictWidgets[key] + packAttrs = {"anchor":E} + if self.widgets[key].type == "checkbox": + packAttrs["anchor"] = W + self.widgets[key].pack(packAttrs) ## Sprite selection spriteDialogFrame = Frame(self.frames["leftRomOptionsFrame"]) @@ -62,13 +59,6 @@ def gameoptions_page(top, parent): spriteSelectButton.pack(side=LEFT) spriteDialogFrame.pack(anchor=E) - with open(os.path.join("resources","app","gui","randomize","gameoptions","rightRomOptionsFrame.json")) as rightRomOptionsFrameItems: - myDict = json.load(rightRomOptionsFrameItems) - dictWidgets = widgets.make_widgets_from_dict(self, myDict, self.frames["rightRomOptionsFrame"]) - for key in dictWidgets: - self.widgets[key] = dictWidgets[key] - self.widgets[key].pack(anchor=E) - return self diff --git a/resources/app/gui/randomize/gameoptions/checkboxes.json b/resources/app/gui/randomize/gameoptions/checkboxes.json deleted file mode 100644 index ba7b0f9c..00000000 --- a/resources/app/gui/randomize/gameoptions/checkboxes.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "hints": { - "type": "checkbox", - "label": { - "text": "Include Helpful Hints" - }, - "default": "true" - }, - "nobgm": { - "type": "checkbox", - "label": { - "text": "Disable Music & MSU-1" - } - }, - "quickswap": { - "type": "checkbox", - "label": { - "text": "L/R Quickswapping" - } - } -} diff --git a/resources/app/gui/randomize/gameoptions/leftRomOptionsFrame.json b/resources/app/gui/randomize/gameoptions/leftRomOptionsFrame.json deleted file mode 100644 index ffa04198..00000000 --- a/resources/app/gui/randomize/gameoptions/leftRomOptionsFrame.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "heartcolor": { - "type": "selectbox", - "label": { - "text": "Heart Color" - }, - "managerAttrs": { - "label": { - "side": "left" - }, - "selectbox": { - "side": "right" - } - }, - "options": { - "Red": "red", - "Blue": "blue", - "Green": "green", - "Yellow": "yellow", - "Random": "random" - } - }, - "heartbeep": { - "type": "selectbox", - "label": { - "text": "Heart Beep sound rate" - }, - "managerAttrs": { - "label": { - "side": "left" - }, - "selectbox": { - "side": "right" - }, - "default": "Normal" - }, - "options": { - "Double": "double", - "Normal": "normal", - "Half": "half", - "Quarter": "quarter", - "Off": "off" - } - } -} diff --git a/resources/app/gui/randomize/gameoptions/rightRomOptionsFrame.json b/resources/app/gui/randomize/gameoptions/rightRomOptionsFrame.json deleted file mode 100644 index ba46ab97..00000000 --- a/resources/app/gui/randomize/gameoptions/rightRomOptionsFrame.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "menuspeed": { - "type": "selectbox", - "label": { - "text": "Menu Speed" - }, - "managerAttrs": { - "label": { - "side": "left" - }, - "selectbox": { - "side": "right" - }, - "default": "Normal" - }, - "options": { - "Instant": "instant", - "Quadruple": "quadruple", - "Triple": "triple", - "Double": "double", - "Normal": "normal", - "Half": "half" - } - }, - "owpalettes": { - "type": "selectbox", - "label": { - "text": "Overworld Palettes" - }, - "managerAttrs": { - "label": { - "side": "left" - }, - "selectbox": { - "side": "right" - } - }, - "options": { - "Default": "default", - "Random": "random", - "Blackout": "blackout" - } - }, - "uwpalettes": { - "type": "selectbox", - "label": { - "text": "Underworld Palettes" - }, - "managerAttrs": { - "label": { - "side": "left" - }, - "selectbox": { - "side": "right" - } - }, - "options": { - "Default": "default", - "Random": "random", - "Blackout": "blackout" - } - } -} diff --git a/resources/app/gui/randomize/gameoptions/widgets.json b/resources/app/gui/randomize/gameoptions/widgets.json new file mode 100644 index 00000000..0a0a11ce --- /dev/null +++ b/resources/app/gui/randomize/gameoptions/widgets.json @@ -0,0 +1,131 @@ +{ + "checkboxes": { + "hints": { + "type": "checkbox", + "label": { + "text": "Include Helpful Hints" + }, + "default": "true" + }, + "nobgm": { + "type": "checkbox", + "label": { + "text": "Disable Music & MSU-1" + } + }, + "quickswap": { + "type": "checkbox", + "label": { + "text": "L/R Quickswapping" + } + } + }, + "leftRomOptionsFrame": { + "heartcolor": { + "type": "selectbox", + "label": { + "text": "Heart Color" + }, + "managerAttrs": { + "label": { + "side": "left" + }, + "selectbox": { + "side": "right" + } + }, + "options": { + "Red": "red", + "Blue": "blue", + "Green": "green", + "Yellow": "yellow", + "Random": "random" + } + }, + "heartbeep": { + "type": "selectbox", + "label": { + "text": "Heart Beep sound rate" + }, + "managerAttrs": { + "label": { + "side": "left" + }, + "selectbox": { + "side": "right" + }, + "default": "Normal" + }, + "options": { + "Double": "double", + "Normal": "normal", + "Half": "half", + "Quarter": "quarter", + "Off": "off" + } + } + }, + "rightRomOptionsFrame": { + "menuspeed": { + "type": "selectbox", + "label": { + "text": "Menu Speed" + }, + "managerAttrs": { + "label": { + "side": "left" + }, + "selectbox": { + "side": "right" + }, + "default": "Normal" + }, + "options": { + "Instant": "instant", + "Quadruple": "quadruple", + "Triple": "triple", + "Double": "double", + "Normal": "normal", + "Half": "half" + } + }, + "owpalettes": { + "type": "selectbox", + "label": { + "text": "Overworld Palettes" + }, + "managerAttrs": { + "label": { + "side": "left" + }, + "selectbox": { + "side": "right" + } + }, + "options": { + "Default": "default", + "Random": "random", + "Blackout": "blackout" + } + }, + "uwpalettes": { + "type": "selectbox", + "label": { + "text": "Underworld Palettes" + }, + "managerAttrs": { + "label": { + "side": "left" + }, + "selectbox": { + "side": "right" + } + }, + "options": { + "Default": "default", + "Random": "random", + "Blackout": "blackout" + } + } + } +}