Pretty Entrando options

gui/randomize/entrando.py

@@ -1,27 +1,59 @@
 from tkinter import ttk, IntVar, StringVar, Checkbutton, Frame, Label, OptionMenu, E, W, LEFT, RIGHT
+import gui.widgets as widgets
 
 def entrando_page(parent):
     # Entrance Randomizer
     self = ttk.Frame(parent)
 
     # Entrance Randomizer options
+    self.entrandoWidgets = {}
+
     ## Pyramid pre-opened
-    self.openpyramidVar = IntVar()
-    openpyramidCheckbutton = Checkbutton(self, text="Pre-open Pyramid Hole", variable=self.openpyramidVar)
-    openpyramidCheckbutton.pack(anchor=W)
+    key = "openpyramid"
+    self.entrandoWidgets[key] = widgets.make_widget(
+      self,
+      "checkbox",
+      self,
+      "Pre-open Pyramid Hole",
+      None
+    )
+    self.entrandoWidgets[key].pack(anchor=W)
+
     ## Shuffle Ganon
-    self.shuffleGanonVar = IntVar()
-    self.shuffleGanonVar.set(1) #set default
-    shuffleGanonCheckbutton = Checkbutton(self, text="Include Ganon's Tower and Pyramid Hole in shuffle pool", variable=self.shuffleGanonVar)
-    shuffleGanonCheckbutton.pack(anchor=W)
+    key = "shuffleganon"
+    self.entrandoWidgets[key] = widgets.make_widget(
+      self,
+      "checkbox",
+      self,
+      "Include Ganon's Tower and Pyramid Hole in shuffle pool",
+      {"default": 1}
+    )
+    self.entrandoWidgets[key].pack(anchor=W)
+
     ## Entrance Shuffle
-    shuffleFrame = Frame(self)
-    self.shuffleVar = StringVar()
-    self.shuffleVar.set('vanilla')
-    shuffleOptionMenu = OptionMenu(shuffleFrame, self.shuffleVar, 'vanilla', 'simple', 'restricted', 'full', 'crossed', 'insanity', 'restricted_legacy', 'full_legacy', 'madness_legacy', 'insanity_legacy', 'dungeonsfull', 'dungeonssimple')
-    shuffleOptionMenu.pack(side=RIGHT)
-    shuffleLabel = Label(shuffleFrame, text='Entrance shuffle algorithm')
-    shuffleLabel.pack(side=LEFT)
-    shuffleFrame.pack(anchor=W)
+    key = "entranceshuffle"
+    self.entrandoWidgets[key] = widgets.make_widget(
+      self,
+      "selectbox",
+      self,
+      "Entrance Shuffle",
+      None,
+      {"label": {"side": LEFT}, "selectbox": {"side": RIGHT}},
+      {
+        "Vanilla": "vanilla",
+        "Simple": "simple",
+        "Restricted": "restricted",
+        "Full": "full",
+        "Crossed": "crossed",
+        "Insanity": "insanity",
+        "Restricted (Legacy)": "restricted_legacy",
+        "Full (Legacy)": "full_legacy",
+        "Madness (Legacy)": "madness_legacy",
+        "Insanity (Legacy)": "insanity_legacy",
+        "Dungeons + Full": "dungeonsfull",
+        "Dungeons + Simple": "dungeonssimple"
+      }
+    )
+    self.entrandoWidgets[key].pack(anchor=W)
 
     return self

gui/randomize/item.py

@@ -6,17 +6,18 @@ def item_page(parent):
     self = ttk.Frame(parent)
 
     # Item Randomizer options
-    ## Retro (eventually needs to become a World State)
     self.itemWidgets = {}
 
-    self.itemWidgets["retro"] = widgets.make_widget(
+    ## Retro (eventually needs to become a World State)
+    key = "retro"
+    self.itemWidgets[key] = widgets.make_widget(
       self,
       "checkbox",
       self,
       "Retro mode (universal keys)",
       None
     )
-    self.itemWidgets["retro"].pack(anchor=W)
+    self.itemWidgets[key].pack(anchor=W)
 
     leftItemFrame = Frame(self)
     rightItemFrame = Frame(self)
@@ -24,7 +25,7 @@ def item_page(parent):
     rightItemFrame.pack(side=RIGHT)
 
     ## World State
-    key = "worldState"
+    key = "worldstate"
     self.itemWidgets[key] = widgets.make_widget(
       self,
       "selectbox",
@@ -41,7 +42,7 @@ def item_page(parent):
     self.itemWidgets[key].pack(anchor=E)
 
     ## Logic Level
-    key = "logicLevel"
+    key = "logiclevel"
     self.itemWidgets[key] = widgets.make_widget(
       self,
       "selectbox",