Pretty Multiworld options

gui/randomize/multiworld.py

@@ -1,25 +1,35 @@
-from tkinter import ttk, StringVar, Entry, Frame, Label, Spinbox, E, W, LEFT, RIGHT
+from tkinter import ttk, StringVar, Entry, Frame, Label, Spinbox, N, E, W, X, LEFT, RIGHT
+import gui.widgets as widgets
 
 def multiworld_page(parent,working_dirs):
+    # Multiworld
     self = ttk.Frame(parent)
 
-    # Multiworld
-    multiFrame = Frame(self)
+    # Multiworld options
+    self.multiworldWidgets = {}
+
     ## Number of Worlds
-    worldLabel = Label(multiFrame, text='Worlds')
-    self.worldVar = StringVar(value=working_dirs["multi.worlds"])
-    worldSpinbox = Spinbox(multiFrame, from_=1, to=100, width=5, textvariable=self.worldVar)
-    worldLabel.pack(side=LEFT)
-    worldSpinbox.pack(side=LEFT)
+    key = "worlds"
+    self.multiworldWidgets[key] = widgets.make_widget(
+      self,
+      "spinbox",
+      self,
+      "Worlds",
+      None,
+      {"label": {"side": LEFT}, "spinbox": {"side": RIGHT}}
+    )
+    self.multiworldWidgets[key].pack(side=LEFT, anchor=N)
+
     ## List of Player Names
-    namesLabel = Label(multiFrame, text='Player names')
+    namesFrame = Frame(self)
+    namesLabel = Label(namesFrame, text='Player names')
     self.namesVar = StringVar(value=working_dirs["multi.names"])
     def saveMultiNames(caller,_,mode):
         working_dirs["multi.names"] = self.namesVar.get()
     self.namesVar.trace_add("write",saveMultiNames)
-    namesEntry = Entry(multiFrame, textvariable=self.namesVar)
+    namesEntry = Entry(namesFrame, textvariable=self.namesVar)
     namesLabel.pack(side=LEFT)
-    namesEntry.pack(side=LEFT)
-    multiFrame.pack(anchor=W)
+    namesEntry.pack(side=LEFT, fill=X, expand=True)
+    namesFrame.pack(anchor=N, fill=X, expand=True)
 
     return self,working_dirs