Merge branch 'DoorDev' into DoorDevUnstable

# Conflicts:
#	Main.py
#	RELEASENOTES.md
This commit is contained in:
randall.rupper
2021-03-05 10:43:05 -07:00
8 changed files with 103 additions and 89 deletions

View File

@@ -7,6 +7,8 @@ import json
import logging
import os
from Utils import output_path
def adjust_page(top, parent, settings):
# Adjust page
self = ttk.Frame(parent)
@@ -90,6 +92,8 @@ def adjust_page(top, parent, settings):
# These are the options to Adjust
def adjustRom():
if output_path.cached_path is None:
output_path.cached_path = top.settings["outputpath"]
options = {
"heartbeep": "heartbeep",
"heartcolor": "heartcolor",

View File

@@ -146,10 +146,13 @@ def bottom_frame(self, parent, args=None):
self.widgets[widget].pieces["button"].pack(side=LEFT)
def open_output():
if args and args.outputpath:
open_file(output_path(args.outputpath))
else:
open_file(output_path(parent.settings["outputpath"]))
if output_path.cached_path is None:
if args and args.outputpath:
output_path.cached_path = args.outputpath
else:
output_path.cached_path = parent.settings["outputpath"]
open_file(output_path('.'))
## Output Button
# widget ID