From afa96412d1c4f48df4d4e3f49ee1c2aefcadc9e2 Mon Sep 17 00:00:00 2001 From: "Mike A. Trethewey" Date: Sat, 15 Feb 2020 02:02:04 -0800 Subject: [PATCH] Arrayify Adjust --- Gui.py | 4 ++-- gui/loadcliargs.py | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Gui.py b/Gui.py index 470c41e5..4bbfa336 100755 --- a/Gui.py +++ b/Gui.py @@ -118,8 +118,8 @@ def guiMain(args=None): self.randomSprite = BooleanVar() # Adjuster Controls - self.adjustContent,self.settings = adjust_page(self, self.pages["adjust"], self.settings) - self.adjustContent.pack(side=TOP, fill=BOTH, expand=True) + self.pages["adjust"].content,self.settings = adjust_page(self, self.pages["adjust"], self.settings) + self.pages["adjust"].content.pack(side=TOP, fill=BOTH, expand=True) # Custom Controls self.customContent = custom_page(self,self.pages["custom"]) diff --git a/gui/loadcliargs.py b/gui/loadcliargs.py index 81d2bd74..eb6d3ebf 100644 --- a/gui/loadcliargs.py +++ b/gui/loadcliargs.py @@ -65,19 +65,19 @@ def loadcliargs(gui, args): spriteNameVar=gui.pages["randomizer"].pages["gameoptions"].gameOptionsWidgets["sprite"]["spriteNameVar"], randomSpriteVar=gui.randomSprite) - gui.adjustContent.adjustWidgets["nobgm"].storageVar.set(int(args.disablemusic)) - gui.adjustContent.adjustWidgets['quickswap'].storageVar.set(args.quickswap) - gui.adjustContent.adjustWidgets["heartcolor"].storageVar.set(args.heartcolor) - gui.adjustContent.adjustWidgets["heartbeep"].storageVar.set(args.heartbeep) - gui.adjustContent.adjustWidgets["menuspeed"].storageVar.set(args.fastmenu) - gui.adjustContent.adjustWidgets["owpalettes"].storageVar.set(args.ow_palettes) - gui.adjustContent.adjustWidgets["uwpalettes"].storageVar.set(args.uw_palettes) + gui.pages["adjust"].content.adjustWidgets["nobgm"].storageVar.set(int(args.disablemusic)) + gui.pages["adjust"].content.adjustWidgets['quickswap'].storageVar.set(args.quickswap) + gui.pages["adjust"].content.adjustWidgets["heartcolor"].storageVar.set(args.heartcolor) + gui.pages["adjust"].content.adjustWidgets["heartbeep"].storageVar.set(args.heartbeep) + gui.pages["adjust"].content.adjustWidgets["menuspeed"].storageVar.set(args.fastmenu) + gui.pages["adjust"].content.adjustWidgets["owpalettes"].storageVar.set(args.ow_palettes) + gui.pages["adjust"].content.adjustWidgets["uwpalettes"].storageVar.set(args.uw_palettes) def sprite_setter_adj(spriteObject): - gui.adjustContent.sprite = spriteObject + gui.pages["adjust"].content.sprite = spriteObject if args.sprite is not None: sprite_obj = args.sprite if isinstance(args.sprite, Sprite) else Sprite(args.sprite) r_sprite_flag = args.randomSprite if hasattr(args, 'randomSprite') else False set_sprite(sprite_obj, r_sprite_flag, spriteSetter=sprite_setter_adj, - spriteNameVar=gui.adjustContent.spriteNameVar2, + spriteNameVar=gui.pages["adjust"].content.spriteNameVar2, randomSpriteVar=gui.randomSprite)