diff --git a/source/classes/ItemGfxSelector.py b/source/classes/ItemGfxSelector.py index 689ff626..ee5d528d 100644 --- a/source/classes/ItemGfxSelector.py +++ b/source/classes/ItemGfxSelector.py @@ -5,12 +5,13 @@ from Utils import local_path class ItemGfxSelector(object): - def __init__(self, parent, callback, valid_items=None): + def __init__(self, parent, callback, valid_items=None, adjuster=False): self.parent = parent self.window = Toplevel(parent) self.window.geometry("800x650") self.callback = callback self.valid_items = valid_items if valid_items else [] + self.adjuster = adjuster self.window.wm_title("Select Triforce Piece Graphics") self.window['padx'] = 5 @@ -38,6 +39,10 @@ class ItemGfxSelector(object): button = Button(frame, text="Default (Triforce)", command=self.use_default) button.pack(side=LEFT, padx=(0, 5)) + if adjuster: + button = Button(frame, text="Current triforce from rom", command=self.use_default_unchanged) + button.pack(side=LEFT, padx=(0, 5)) + set_icon(self.window) self.window.focus() @@ -116,6 +121,10 @@ class ItemGfxSelector(object): self.callback("Triforce") self.window.destroy() + def use_default_unchanged(self): + self.callback(None) + self.window.destroy() + def select_item(self, item_name): self.callback(item_name) self.window.destroy() diff --git a/source/gui/adjust/overview.py b/source/gui/adjust/overview.py index 55ce0ffd..2d062c8a 100644 --- a/source/gui/adjust/overview.py +++ b/source/gui/adjust/overview.py @@ -87,7 +87,7 @@ def adjust_page(top, parent, settings): def TriforceGfxSelectAdjuster(): from Tables import item_gfx_table valid_items = list(item_gfx_table.keys()) - ItemGfxSelector(parent, set_triforce_gfx, valid_items=valid_items) + ItemGfxSelector(parent, set_triforce_gfx, valid_items=valid_items, adjuster=True) triforceGfxSelectButton = Button(triforceGfxDialogFrame, text='...', command=TriforceGfxSelectAdjuster)