From 83d9398a19f3c18148c2f7dad26fa2ab6035464e Mon Sep 17 00:00:00 2001 From: "Mike A. Trethewey" Date: Tue, 10 Mar 2020 18:29:23 -0700 Subject: [PATCH] Reorder args --- resources/app/cli/args.json | 6 +++--- source/gui/widgets.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/app/cli/args.json b/resources/app/cli/args.json index fb54383d..f95f3a1d 100644 --- a/resources/app/cli/args.json +++ b/resources/app/cli/args.json @@ -80,10 +80,10 @@ }, "shuffle": { "choices": [ - "full", "vanilla", "simple", "restricted", + "full", "crossed", "insanity", "restricted_legacy", @@ -304,9 +304,9 @@ }, "saveonexit": { "choices": [ - "never", "ask", - "always" + "always", + "never" ] }, "outputname": {} diff --git a/source/gui/widgets.py b/source/gui/widgets.py index 7697328f..f5512c89 100644 --- a/source/gui/widgets.py +++ b/source/gui/widgets.py @@ -99,9 +99,9 @@ def make_selectbox(self, parent, label, options, storageVar, manager, managerAtt values = self.selectbox.options["values"] if default in values: idx = values.index(default) - default = labels[idx] - self.labelVar.set(default) - self.selectbox["menu"].entryconfigure(idx,label=default) + self.labelVar.set(labels[idx]) + self.storageVar.set(values[idx]) + self.selectbox["menu"].entryconfigure(idx,label=labels[idx]) if managerAttrs is not None and "selectbox" in managerAttrs: self.selectbox.pack(managerAttrs["selectbox"])