JSONify Adjust options

gui/adjust/overview.py

@@ -3,8 +3,9 @@ from AdjusterMain import adjust
 from argparse import Namespace
 from classes.SpriteSelector import SpriteSelector
 import gui.widgets as widgets
+import json
 import logging
-
+import os
 
 def adjust_page(top, parent, settings):
     # Adjust page
@@ -13,22 +14,8 @@ def adjust_page(top, parent, settings):
     # Adjust options
     self.widgets = {}
 
-    myDict = {
+    with open(os.path.join("resources","app","gui","adjust","overview","checkboxes.json")) as checkboxes:
-      ## Disable BGM
+        myDict = json.load(checkboxes)
-      "nobgm": {
-        "type": "checkbox",
-        "label": {
-          "text": "Disable Music & MSU-1"
-        }
-      },
-      ## L/R Quickswap
-      "quickswap": {
-        "type": "checkbox",
-        "label": {
-          "text": "L/R Quickswapping"
-        }
-      }
-    }
         dictWidgets = widgets.make_widgets_from_dict(self, myDict, self)
         for key in dictWidgets:
             self.widgets[key] = dictWidgets[key]
@@ -43,45 +30,8 @@ def adjust_page(top, parent, settings):
     rightAdjustFrame.pack(side=RIGHT)
     bottomAdjustFrame.pack(fill=X, expand=True)
 
-    myDict = {
+    with open(os.path.join("resources","app","gui","adjust","overview","leftAdjustFrame.json")) as leftAdjustFrameItems:
-      ## Heart Color
+        myDict = json.load(leftAdjustFrameItems)
-      "heartcolor": {
-        "type": "selectbox",
-        "label": {
-          "text": "Heart Color"
-        },
-        "packAttrs": {
-          "label": { "side": LEFT },
-          "selectbox": { "side": RIGHT }
-        },
-        "options": {
-          "Red": "red",
-          "Blue": "blue",
-          "Green": "green",
-          "Yellow": "yellow",
-          "Random": "random"
-        }
-      },
-      ## Heart Beep speed
-      "heartbeep": {
-        "type": "selectbox",
-        "label": {
-          "text": "Heart Beep sound rate"
-        },
-        "packAttrs": {
-          "label": { "side": LEFT },
-          "selectbox": { "side": RIGHT},
-          "default": "Normal"
-        },
-        "options": {
-          "Double": "double",
-          "Normal": "normal",
-          "Half": "half",
-          "Quarter": "quarter",
-          "Off": "off"
-        }
-      }
-    }
         dictWidgets = widgets.make_widgets_from_dict(self, myDict, leftAdjustFrame)
         for key in dictWidgets:
             self.widgets[key] = dictWidgets[key]
@@ -113,60 +63,8 @@ def adjust_page(top, parent, settings):
     spriteSelectButton2.pack(side=LEFT)
     spriteDialogFrame2.pack(anchor=E)
 
-    myDict = {
+    with open(os.path.join("resources","app","gui","adjust","overview","rightAdjustFrame.json")) as rightAdjustFrameItems:
-      ## Menu Speed
+        myDict = json.load(rightAdjustFrameItems)
-      "menuspeed": {
-        "type": "selectbox",
-        "label": {
-          "text": "Menu Speed"
-        },
-        "packAttrs": {
-          "label": { "side": LEFT },
-          "selectbox": { "side": RIGHT },
-          "default": "Normal"
-        },
-        "options": {
-          "Instant": "instant",
-          "Quadruple": "quadruple",
-          "Triple": "triple",
-          "Double": "double",
-          "Normal": "normal",
-          "Half": "half"
-        }
-      },
-      ## Overworld Palettes (not Enemizer)
-      "owpalettes": {
-        "type": "selectbox",
-        "label": {
-          "text": "Overworld Palettes"
-        },
-        "packAttrs": {
-          "label": { "side": LEFT },
-          "selectbox": { "side": RIGHT }
-        },
-        "options": {
-          "Default": "default",
-          "Random": "random",
-          "Blackout": "blackout"
-        }
-      },
-      ## Underworld Palettes (not Enemizer)
-      "uwpalettes": {
-        "type": "selectbox",
-        "label": {
-          "text": "Underworld Palettes"
-        },
-        "packAttrs": {
-          "label": { "side": LEFT },
-          "selectbox": { "side": RIGHT }
-        },
-        "options": {
-          "Default": "default",
-          "Random": "random",
-          "Blackout": "blackout"
-        }
-      }
-    }
         dictWidgets = widgets.make_widgets_from_dict(self, myDict, rightAdjustFrame)
         for key in dictWidgets:
             self.widgets[key] = dictWidgets[key]

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

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

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

@@ -0,0 +1,45 @@
+{
+  "heartcolor": {
+    "type": "selectbox",
+    "label": {
+      "text": "Heart Color"
+    },
+    "packAttrs": {
+      "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"
+    },
+    "packAttrs": {
+      "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

@@ -0,0 +1,63 @@
+{
+  "menuspeed": {
+    "type": "selectbox",
+    "label": {
+      "text": "Menu Speed"
+    },
+    "packAttrs": {
+      "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"
+    },
+    "packAttrs": {
+      "label": {
+        "side": "left"
+      },
+      "selectbox": {
+        "side": "right"
+      }
+    },
+    "options": {
+      "Default": "default",
+      "Random": "random",
+      "Blackout": "blackout"
+    }
+  },
+  "uwpalettes": {
+    "type": "selectbox",
+    "label": {
+      "text": "Underworld Palettes"
+    },
+    "packAttrs": {
+      "label": {
+        "side": "left"
+      },
+      "selectbox": {
+        "side": "right"
+      }
+    },
+    "options": {
+      "Default": "default",
+      "Random": "random",
+      "Blackout": "blackout"
+    }
+  }
+}