Pretty Adjust options

gui/adjust/overview.py

@@ -2,20 +2,37 @@ from tkinter import ttk, filedialog, messagebox, IntVar, StringVar, Button, Chec
 from AdjusterMain import adjust
 from argparse import Namespace
 from classes.SpriteSelector import SpriteSelector
+import gui.widgets as widgets
 import logging
 
 def adjust_page(top,parent,working_dirs):
+    # Adjust page
     self = ttk.Frame(parent)
 
-    # Disable BGM
+    # Adjust options
-    self.disableMusicVar2 = IntVar()
+    self.adjustWidgets = {}
-    disableMusicCheckbutton2 = Checkbutton(self, text="Disable music", variable=self.disableMusicVar2)
-    disableMusicCheckbutton2.pack(anchor=W)
 
-    # L/R Quickswap
+    ## Disable BGM
-    self.quickSwapVar2 = IntVar()
+    key = "nobgm"
-    quickSwapCheckbutton2 = Checkbutton(self, text="L/R Quickswapping", variable=self.quickSwapVar2)
+    self.adjustWidgets[key] = widgets.make_widget(
-    quickSwapCheckbutton2.pack(anchor=W)
+      self,
+      "checkbox",
+      self,
+      "Disable Music & MSU-1",
+      None
+    )
+    self.adjustWidgets[key].pack(anchor=W)
+
+    ## L/R Quickswap
+    key = "quickswap"
+    self.adjustWidgets[key] = widgets.make_widget(
+      self,
+      "checkbox",
+      self,
+      "L/R Quickswapping",
+      None
+    )
+    self.adjustWidgets[key].pack(anchor=W)
 
     selectOptionsFrame = Frame(self)
     leftAdjustFrame = Frame(selectOptionsFrame)
@@ -26,25 +43,43 @@ def adjust_page(top,parent,working_dirs):
     rightAdjustFrame.pack(side=RIGHT)
     bottomAdjustFrame.pack(fill=X, expand=True)
 
-    # Heart Color
+    ## Heart Color
-    heartcolorFrame2 = Frame(leftAdjustFrame)
+    key = "heartcolor"
-    heartcolorLabel2 = Label(heartcolorFrame2, text='Heart color')
+    self.adjustWidgets[key] = widgets.make_widget(
-    heartcolorLabel2.pack(side=LEFT)
+      self,
-    self.heartcolorVar2 = StringVar()
+      "selectbox",
-    self.heartcolorVar2.set('red')
+      leftAdjustFrame,
-    heartcolorOptionMenu2 = OptionMenu(heartcolorFrame2, self.heartcolorVar2, 'red', 'blue', 'green', 'yellow', 'random')
+      "Heart Color",
-    heartcolorOptionMenu2.pack(side=RIGHT)
+      None,
-    heartcolorFrame2.pack(anchor=E)
+      {"label": {"side": LEFT}, "selectbox": {"side": RIGHT}},
+      {
+        "Red": "red",
+        "Blue": "blue",
+        "Green": "green",
+        "Yellow": "yellow",
+        "Random": "random"
+      }
+    )
+    self.adjustWidgets[key].pack(anchor=E)
 
-    # Heart Beep Speed
+    ## Heart Beep Speed
-    heartbeepFrame2 = Frame(leftAdjustFrame)
+    key = "heartbeep"
-    heartbeepLabel2 = Label(heartbeepFrame2, text='Heart Beep sound rate')
+    self.adjustWidgets[key] = widgets.make_widget(
-    heartbeepLabel2.pack(side=LEFT)
+      self,
-    self.heartbeepVar2 = StringVar()
+      "selectbox",
-    self.heartbeepVar2.set('normal')
+      leftAdjustFrame,
-    heartbeepOptionMenu2 = OptionMenu(heartbeepFrame2, self.heartbeepVar2, 'double', 'normal', 'half', 'quarter', 'off')
+      "Heart Beep sound rate",
-    heartbeepOptionMenu2.pack(side=RIGHT)
+      None,
-    heartbeepFrame2.pack(anchor=E)
+      {"label": {"side": LEFT}, "selectbox": {"side": RIGHT}, "default": "Normal"},
+      {
+        "Double": "double",
+        "Normal": "normal",
+        "Half": "half",
+        "Quarter": "quarter",
+        "Off": "off"
+      }
+    )
+    self.adjustWidgets[key].pack(anchor=W)
 
     # Sprite Selection
     self.spriteNameVar2 = StringVar()
@@ -71,33 +106,59 @@ def adjust_page(top,parent,working_dirs):
     spriteSelectButton2.pack(side=LEFT)
     spriteDialogFrame2.pack(anchor=E)
 
-    # Menu Speed
+    ## Menu Speed
-    fastMenuFrame2 = Frame(rightAdjustFrame)
+    key = "menuspeed"
-    fastMenuLabel2 = Label(fastMenuFrame2, text='Menu speed')
+    self.adjustWidgets[key] = widgets.make_widget(
-    fastMenuLabel2.pack(side=LEFT)
+      self,
-    self.fastMenuVar2 = StringVar()
+      "selectbox",
-    self.fastMenuVar2.set("normal")
+      rightAdjustFrame,
-    fastMenuOptionMenu2 = OptionMenu(fastMenuFrame2, self.fastMenuVar2, 'normal', 'instant', 'double', 'triple', 'quadruple', 'half')
+      "Menu Speed",
-    fastMenuOptionMenu2.pack(side=RIGHT)
+      None,
-    fastMenuFrame2.pack(anchor=E)
+      {"label": {"side": LEFT}, "selectbox": {"side": RIGHT}, "default": "Normal"},
+      {
+        "Instant": "instant",
+        "Quadruple": "quadruple",
+        "Triple": "triple",
+        "Double": "double",
+        "Normal": "normal",
+        "Half": "half"
+      }
+    )
+    self.adjustWidgets[key].pack(anchor=E)
 
-    owPalettesFrame2 = Frame(rightAdjustFrame)
+    ## Overworld Palettes (not Enemizer)
-    owPalettesLabel2 = Label(owPalettesFrame2, text='Overworld palettes')
+    key = "owpalettes"
-    owPalettesLabel2.pack(side=LEFT)
+    self.adjustWidgets[key] = widgets.make_widget(
-    self.owPalettesVar2 = StringVar()
+      self,
-    self.owPalettesVar2.set("default")
+      "selectbox",
-    owPalettesOptionMenu2 = OptionMenu(owPalettesFrame2, self.owPalettesVar2, 'default', 'random', 'blackout')
+      rightAdjustFrame,
-    owPalettesOptionMenu2.pack(side=RIGHT)
+      "Overworld Palettes",
-    owPalettesFrame2.pack(anchor=E)
+      None,
+      {"label": {"side": LEFT}, "selectbox": {"side": RIGHT}},
+      {
+        "Default": "default",
+        "Random": "random",
+        "Blackout": "blackout"
+      }
+    )
+    self.adjustWidgets[key].pack(anchor=E)
 
-    uwPalettesFrame2 = Frame(rightAdjustFrame)
+    ## Underworld Palettes (not Enemizer)
-    uwPalettesLabel2 = Label(uwPalettesFrame2, text='Dungeon palettes')
+    key = "uwpalettes"
-    uwPalettesLabel2.pack(side=LEFT)
+    self.adjustWidgets[key] = widgets.make_widget(
-    self.uwPalettesVar2 = StringVar()
+      self,
-    self.uwPalettesVar2.set("default")
+      "selectbox",
-    uwPalettesOptionMenu2 = OptionMenu(uwPalettesFrame2, self.uwPalettesVar2, 'default', 'random', 'blackout')
+      rightAdjustFrame,
-    uwPalettesOptionMenu2.pack(side=RIGHT)
+      "Underworld Palettes",
-    uwPalettesFrame2.pack(anchor=E)
+      None,
+      {"label": {"side": LEFT}, "selectbox": {"side": RIGHT}},
+      {
+        "Default": "default",
+        "Random": "random",
+        "Blackout": "blackout"
+      }
+    )
+    self.adjustWidgets[key].pack(anchor=E)
 
     adjustRomFrame = Frame(bottomAdjustFrame)
     adjustRomLabel = Label(adjustRomFrame, text='Rom to adjust: ')
@@ -118,13 +179,13 @@ def adjust_page(top,parent,working_dirs):
 
     def adjustRom():
         guiargs = Namespace()
-        guiargs.heartbeep = self.heartbeepVar2.get()
+        guiargs.heartbeep = self.adjustWidgets["heartbeep"].get()
-        guiargs.heartcolor = self.heartcolorVar2.get()
+        guiargs.heartcolor = self.adjustWidgets["heartcolor"].get()
-        guiargs.fastmenu = self.fastMenuVar2.get()
+        guiargs.fastmenu = self.adjustWidgets["menuspeed"].get()
-        guiargs.ow_palettes = self.owPalettesVar2.get()
+        guiargs.ow_palettes = self.adjustWidgets["owpalettes"].get()
-        guiargs.uw_palettes = self.uwPalettesVar2.get()
+        guiargs.uw_palettes = self.adjustWidgets["uwpalettes"].get()
-        guiargs.quickswap = bool(self.quickSwapVar2.get())
+        guiargs.quickswap = bool(self.adjustWidgets["quickswap"].get())
-        guiargs.disablemusic = bool(self.disableMusicVar2.get())
+        guiargs.disablemusic = bool(self.adjustWidgets["nobgm"].get())
         guiargs.rom = self.romVar2.get()
         guiargs.baserom = top.generationSetupWindow.romVar.get()
 #        guiargs.sprite = sprite