Condense Game Options

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
 
 

resources/app/gui/randomize/gameoptions/checkboxes.json

@@ -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"
-    }
-  }
-}

resources/app/gui/randomize/gameoptions/leftRomOptionsFrame.json

@@ -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"
-    }
-  }
-}

resources/app/gui/randomize/gameoptions/rightRomOptionsFrame.json

@@ -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"
-    }
-  }
-}

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"
+      }
+    }
+  }
+}