From 0df66f37d9506a28a9020f21e7a87bb4812b5631 Mon Sep 17 00:00:00 2001 From: "Mike A. Trethewey" Date: Sat, 15 Feb 2020 02:15:22 -0800 Subject: [PATCH] Bottom Widgets --- gui/bottom.py | 8 ++++---- gui/loadcliargs.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gui/bottom.py b/gui/bottom.py index f8a1eccf..4120242a 100644 --- a/gui/bottom.py +++ b/gui/bottom.py @@ -14,7 +14,7 @@ def bottom_frame(self, parent, args=None): self = ttk.Frame(parent) # Bottom Frame options - self.bottomWidgets = {} + self.widgets = {} seedCountFrame = Frame(self) seedCountFrame.pack() @@ -32,7 +32,7 @@ def bottom_frame(self, parent, args=None): ## Number of Generation attempts key = "generationcount" - self.bottomWidgets[key] = widgets.make_widget( + self.widgets[key] = widgets.make_widget( self, "spinbox", self, @@ -40,7 +40,7 @@ def bottom_frame(self, parent, args=None): None, {"label": {"side": LEFT}, "spinbox": {"side": RIGHT}} ) - self.bottomWidgets[key].pack(side=LEFT) + self.widgets[key].pack(side=LEFT) def generateRom(): guiargs = create_guiargs(parent) @@ -91,7 +91,7 @@ def create_guiargs(parent): guiargs.multi = int(parent.pages["randomizer"].pages["multiworld"].multiworldWidgets["worlds"].storageVar.get()) guiargs.names = parent.pages["randomizer"].pages["multiworld"].namesVar.get() guiargs.seed = int(parent.frames["bottom"].seedVar.get()) if parent.frames["bottom"].seedVar.get() else None - guiargs.count = int(parent.frames["bottom"].bottomWidgets["generationcount"].storageVar.get()) if parent.frames["bottom"].bottomWidgets["generationcount"].storageVar.get() != '1' else None + guiargs.count = int(parent.frames["bottom"].widgets["generationcount"].storageVar.get()) if parent.frames["bottom"].widgets["generationcount"].storageVar.get() != '1' else None guiargs.mode = parent.pages["randomizer"].pages["item"].itemWidgets["worldstate"].storageVar.get() guiargs.logic = parent.pages["randomizer"].pages["item"].itemWidgets["logiclevel"].storageVar.get() diff --git a/gui/loadcliargs.py b/gui/loadcliargs.py index eb6d3ebf..04027c72 100644 --- a/gui/loadcliargs.py +++ b/gui/loadcliargs.py @@ -22,7 +22,7 @@ def loadcliargs(gui, args): if args.multi: gui.pages["randomizer"].pages["multiworld"].multiworldWidgets["worlds"].storageVar.set(str(args.multi)) if args.count: - gui.frames["bottom"].bottomWidgets["generationcount"].storageVar.set(str(args.count)) + gui.frames["bottom"].widgets["generationcount"].storageVar.set(str(args.count)) if args.seed: gui.frames["bottom"].seedVar.set(str(args.seed)) gui.pages["randomizer"].pages["item"].itemWidgets["worldstate"].storageVar.set(args.mode)