Pretty Game Options options

gui/randomize/enemizer.py

@@ -59,7 +59,7 @@ def enemizer_page(parent,working_dirs):
         "Chaos": "chaos"
       }
     )
-    self.enemizerWidgets[key].pack(anchor=W)
+    self.enemizerWidgets[key].pack(anchor=E)
 
     ## Randomize Bosses
     key = "bossshuffle"
@@ -77,7 +77,7 @@ def enemizer_page(parent,working_dirs):
         "Chaos": "chaos"
       }
     )
-    self.enemizerWidgets[key].pack(anchor=W)
+    self.enemizerWidgets[key].pack(anchor=E)
 
     ## Enemy Damage
     key = "enemydamage"

gui/randomize/gameoptions.py

@@ -1,25 +1,46 @@
 from tkinter import ttk, IntVar, StringVar, Button, Checkbutton, Entry, Frame, Label, OptionMenu, E, W, LEFT, RIGHT
 from classes.SpriteSelector import SpriteSelector
+import gui.widgets as widgets
 
 def gameoptions_page(parent):
+    # Game Options
     self = ttk.Frame(parent)
 
     # Game Options options
+    self.gameOptionsWidgets = {}
+
     ## Hints: Useful/Not useful
-    self.hintsVar = IntVar()
-    self.hintsVar.set(1) #set default
-    hintsCheckbutton = Checkbutton(self, text="Include Helpful Hints", variable=self.hintsVar)
-    hintsCheckbutton.pack(anchor=W)
+    key = "hints"
+    self.gameOptionsWidgets[key] = widgets.make_widget(
+      self,
+      "checkbox",
+      self,
+      "Include Helpful Hints",
+      None
+    )
+    self.gameOptionsWidgets[key].pack(anchor=W)
 
     ## Disable BGM
-    self.disableMusicVar = IntVar()
-    disableMusicCheckbutton = Checkbutton(self, text="Disable music", variable=self.disableMusicVar)
-    disableMusicCheckbutton.pack(anchor=W)
+    key = "nobgm"
+    self.gameOptionsWidgets[key] = widgets.make_widget(
+      self,
+      "checkbox",
+      self,
+      "Disable Music & MSU-1",
+      None
+    )
+    self.gameOptionsWidgets[key].pack(anchor=W)
 
     ## L/R Quickswap
-    self.quickSwapVar = IntVar()
-    quickSwapCheckbutton = Checkbutton(self, text="L/R Quickswapping", variable=self.quickSwapVar)
-    quickSwapCheckbutton.pack(anchor=W)
+    key = "quickswap"
+    self.gameOptionsWidgets[key] = widgets.make_widget(
+      self,
+      "checkbox",
+      self,
+      "L/R Quickswapping",
+      None
+    )
+    self.gameOptionsWidgets[key].pack(anchor=W)
 
     leftRomOptionsFrame = Frame(self)
     rightRomOptionsFrame = Frame(self)
@@ -27,24 +48,42 @@ def gameoptions_page(parent):
     rightRomOptionsFrame.pack(side=RIGHT)
 
     ## Heart Color
-    heartcolorFrame = Frame(leftRomOptionsFrame)
-    heartcolorLabel = Label(heartcolorFrame, text='Heart color')
-    heartcolorLabel.pack(side=LEFT)
-    self.heartcolorVar = StringVar()
-    self.heartcolorVar.set('red')
-    heartcolorOptionMenu = OptionMenu(heartcolorFrame, self.heartcolorVar, 'red', 'blue', 'green', 'yellow', 'random')
-    heartcolorOptionMenu.pack(side=RIGHT)
-    heartcolorFrame.pack(anchor=E)
+    key = "heartcolor"
+    self.gameOptionsWidgets[key] = widgets.make_widget(
+      self,
+      "selectbox",
+      leftRomOptionsFrame,
+      "Heart Color",
+      None,
+      {"label": {"side": LEFT}, "selectbox": {"side": RIGHT}},
+      {
+        "Red": "red",
+        "Blue": "blue",
+        "Green": "green",
+        "Yellow": "yellow",
+        "Random": "random"
+      }
+    )
+    self.gameOptionsWidgets[key].pack(anchor=E)
 
     ## Heart Beep Speed
-    heartbeepFrame = Frame(leftRomOptionsFrame)
-    heartbeepLabel = Label(heartbeepFrame, text='Heart Beep sound rate')
-    heartbeepLabel.pack(side=LEFT)
-    self.heartbeepVar = StringVar()
-    self.heartbeepVar.set('normal')
-    heartbeepOptionMenu = OptionMenu(heartbeepFrame, self.heartbeepVar, 'double', 'normal', 'half', 'quarter', 'off')
-    heartbeepOptionMenu.pack(side=LEFT)
-    heartbeepFrame.pack(anchor=E)
+    key = "heartbeep"
+    self.gameOptionsWidgets[key] = widgets.make_widget(
+      self,
+      "selectbox",
+      leftRomOptionsFrame,
+      "Heart Beep sound rate",
+      None,
+      {"label": {"side": LEFT}, "selectbox": {"side": RIGHT}, "default": "Normal"},
+      {
+        "Double": "double",
+        "Normal": "normal",
+        "Half": "half",
+        "Quarter": "quarter",
+        "Off": "off"
+      }
+    )
+    self.gameOptionsWidgets[key].pack(anchor=W)
 
     ## Sprite selection
     spriteDialogFrame = Frame(leftRomOptionsFrame)
@@ -76,33 +115,57 @@ def gameoptions_page(parent):
     spriteDialogFrame.pack(anchor=E)
 
     ## Menu Speed
-    fastMenuFrame = Frame(rightRomOptionsFrame)
-    fastMenuLabel = Label(fastMenuFrame, text='Menu speed')
-    fastMenuLabel.pack(side=LEFT)
-    self.fastMenuVar = StringVar()
-    self.fastMenuVar.set('normal')
-    fastMenuOptionMenu = OptionMenu(fastMenuFrame, self.fastMenuVar, 'normal', 'instant', 'double', 'triple', 'quadruple', 'half')
-    fastMenuOptionMenu.pack(side=LEFT)
-    fastMenuFrame.pack(anchor=E)
+    key = "menuspeed"
+    self.gameOptionsWidgets[key] = widgets.make_widget(
+      self,
+      "selectbox",
+      rightRomOptionsFrame,
+      "Menu Speed",
+      None,
+      {"label": {"side": LEFT}, "selectbox": {"side": RIGHT}, "default": "Normal"},
+      {
+        "Instant": "instant",
+        "Quadruple": "quadruple",
+        "Triple": "triple",
+        "Double": "double",
+        "Normal": "normal",
+        "Half": "half"
+      }
+    )
+    self.gameOptionsWidgets[key].pack(anchor=E)
 
     ## Overworld Palettes (not Enemizer)
-    owPalettesFrame = Frame(rightRomOptionsFrame)
-    owPalettesLabel = Label(owPalettesFrame, text='Overworld palettes')
-    owPalettesLabel.pack(side=LEFT)
-    self.owPalettesVar = StringVar()
-    self.owPalettesVar.set('default')
-    owPalettesOptionMenu = OptionMenu(owPalettesFrame, self.owPalettesVar, 'default', 'random', 'blackout')
-    owPalettesOptionMenu.pack(side=LEFT)
-    owPalettesFrame.pack(anchor=E)
+    key = "owpalettes"
+    self.gameOptionsWidgets[key] = widgets.make_widget(
+      self,
+      "selectbox",
+      rightRomOptionsFrame,
+      "Overworld Palettes",
+      None,
+      {"label": {"side": LEFT}, "selectbox": {"side": RIGHT}},
+      {
+        "Default": "default",
+        "Random": "random",
+        "Blackout": "blackout"
+      }
+    )
+    self.gameOptionsWidgets[key].pack(anchor=E)
 
     ## Underworld Palettes (not Enemizer)
-    uwPalettesFrame = Frame(rightRomOptionsFrame)
-    uwPalettesLabel = Label(uwPalettesFrame, text='Dungeon palettes')
-    uwPalettesLabel.pack(side=LEFT)
-    self.uwPalettesVar = StringVar()
-    self.uwPalettesVar.set('default')
-    uwPalettesOptionMenu = OptionMenu(uwPalettesFrame, self.uwPalettesVar, 'default', 'random', 'blackout')
-    uwPalettesOptionMenu.pack(side=LEFT)
-    uwPalettesFrame.pack(anchor=E)
+    key = "uwpalettes"
+    self.gameOptionsWidgets[key] = widgets.make_widget(
+      self,
+      "selectbox",
+      rightRomOptionsFrame,
+      "Underworld Palettes",
+      None,
+      {"label": {"side": LEFT}, "selectbox": {"side": RIGHT}},
+      {
+        "Default": "default",
+        "Random": "random",
+        "Blackout": "blackout"
+      }
+    )
+    self.gameOptionsWidgets[key].pack(anchor=E)
 
     return self