Condense Adjust options

gui/adjust/overview.py

@@ -19,13 +19,6 @@ def adjust_page(top, parent, settings):
     self.frames["checkboxes"] = Frame(self)
     self.frames["checkboxes"].pack(anchor=W)
 
-    with open(os.path.join("resources","app","gui","adjust","overview","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["selectOptionsFrame"] = Frame(self)
     self.frames["leftAdjustFrame"] = Frame(self.frames["selectOptionsFrame"])
     self.frames["rightAdjustFrame"] = Frame(self.frames["selectOptionsFrame"])
@@ -35,12 +28,16 @@ def adjust_page(top, parent, settings):
     self.frames["rightAdjustFrame"].pack(side=RIGHT)
     self.frames["bottomAdjustFrame"].pack(fill=X)
 
-    with open(os.path.join("resources","app","gui","adjust","overview","leftAdjustFrame.json")) as leftAdjustFrameItems:
+    with open(os.path.join("resources","app","gui","adjust","overview","widgets.json")) as widgetDefns:
-        myDict = json.load(leftAdjustFrameItems)
+        myDict = json.load(widgetDefns)
-        dictWidgets = widgets.make_widgets_from_dict(self, myDict, self.frames["leftAdjustFrame"])
+        for framename,theseWidgets in myDict.items():
-        for key in dictWidgets:
+            dictWidgets = widgets.make_widgets_from_dict(self, theseWidgets, self.frames[framename])
-            self.widgets[key] = dictWidgets[key]
+            for key in dictWidgets:
-            self.widgets[key].pack(anchor=E)
+                self.widgets[key] = dictWidgets[key]
+                packAttrs = {"anchor":E}
+                if self.widgets[key].type == "checkbox":
+                    packAttrs["anchor"] = W
+                self.widgets[key].pack(packAttrs)
 
     # Sprite Selection
     self.spriteNameVar2 = StringVar()
@@ -68,13 +65,6 @@ def adjust_page(top, parent, settings):
     spriteSelectButton2.pack(side=LEFT)
     spriteDialogFrame2.pack(anchor=E)
 
-    with open(os.path.join("resources","app","gui","adjust","overview","rightAdjustFrame.json")) as rightAdjustFrameItems:
-        myDict = json.load(rightAdjustFrameItems)
-        dictWidgets = widgets.make_widgets_from_dict(self, myDict, self.frames["rightAdjustFrame"])
-        for key in dictWidgets:
-            self.widgets[key] = dictWidgets[key]
-            self.widgets[key].pack(anchor=E)
-
     adjustRomFrame = Frame(self.frames["bottomAdjustFrame"])
     adjustRomLabel = Label(adjustRomFrame, text='Rom to adjust: ')
     self.romVar2 = StringVar(value=settings["rom"])

gui/widgets.py

@@ -126,6 +126,7 @@ def make_widget(self, type, parent, label, storageVar=None, manager=None, manage
         if thisStorageVar is None:
             thisStorageVar = StringVar()
         widget = make_textbox(self, parent, label, thisStorageVar, manager, managerAttrs)
+    widget.type = type
     return widget
 
 def make_widget_from_dict(self, defn, parent):

resources/app/gui/adjust/overview/checkboxes.json

@@ -1,14 +0,0 @@
-{
-  "nobgm": {
-    "type": "checkbox",
-    "label": {
-      "text": "Disable Music & MSU-1"
-    }
-  },
-  "quickswap": {
-    "type": "checkbox",
-    "label": {
-      "text": "L/R Quickswapping"
-    }
-  }
-}

resources/app/gui/adjust/overview/leftAdjustFrame.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/adjust/overview/rightAdjustFrame.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/adjust/overview/widgets.json

@@ -0,0 +1,124 @@
+{
+  "checkboxes": {
+    "nobgm": {
+      "type": "checkbox",
+      "label": {
+        "text": "Disable Music & MSU-1"
+      }
+    },
+    "quickswap": {
+      "type": "checkbox",
+      "label": {
+        "text": "L/R Quickswapping"
+      }
+    }
+  },
+  "leftAdjustFrame": {
+    "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"
+      }
+    }
+  },
+  "rightAdjustFrame": {
+    "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"
+      }
+    }
+  }
+}