From ad49e2cff788cc7357ff32e5ed81c397de1ac9b6 Mon Sep 17 00:00:00 2001
From: "Mike A. Trethewey" <miketrethewey@gmail.com>
Date: Sat, 22 Feb 2020 00:47:34 -0800
Subject: [PATCH] Standardize Entrando options

Was basically already condensed
---
 gui/randomize/entrando.py                     | 16 +++--
 .../app/gui/randomize/entrando/widgets.json   | 66 ++++++++++---------
 2 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/gui/randomize/entrando.py b/gui/randomize/entrando.py
index 4f42a383..3ad6bac4 100644
--- a/gui/randomize/entrando.py
+++ b/gui/randomize/entrando.py
@@ -15,11 +15,15 @@ def entrando_page(parent):
     self.frames["widgets"] = Frame(self)
     self.frames["widgets"].pack(anchor=W)
 
-    with open(os.path.join("resources","app","gui","randomize","entrando","widgets.json")) as myWidgets:
-        myDict = json.load(myWidgets)
-        dictWidgets = widgets.make_widgets_from_dict(self, myDict, self.frames["widgets"])
-        for key in dictWidgets:
-            self.widgets[key] = dictWidgets[key]
-            self.widgets[key].pack(anchor=W)
+    with open(os.path.join("resources","app","gui","randomize","entrando","widgets.json")) as widgetDefns:
+        myDict = json.load(widgetDefns)
+        for framename,theseWidgets in myDict.items():
+            dictWidgets = widgets.make_widgets_from_dict(self, theseWidgets, self.frames[framename])
+            for key in dictWidgets:
+                self.widgets[key] = dictWidgets[key]
+                packAttrs = {"anchor":E}
+                if self.widgets[key].type == "checkbox":
+                    packAttrs["anchor"] = W
+                self.widgets[key].pack(packAttrs)
 
     return self
diff --git a/resources/app/gui/randomize/entrando/widgets.json b/resources/app/gui/randomize/entrando/widgets.json
index ec1cc4c7..1a3ae127 100644
--- a/resources/app/gui/randomize/entrando/widgets.json
+++ b/resources/app/gui/randomize/entrando/widgets.json
@@ -1,38 +1,40 @@
 {
-  "openpyramid": {
-    "type": "checkbox",
-    "label": {
-      "text": "Pre-open Pyramid Hole"
-    }
-  },
-  "shuffleganon": {
-    "type": "checkbox",
-    "label": {
-      "text": "Include Ganon's Tower and Pyramid Hole in shuffle pool"
-    }
-  },
-  "entranceshuffle": {
-    "type": "selectbox",
-    "label": {
-      "text": "Entrance Shuffle"
+  "widgets": {
+    "openpyramid": {
+      "type": "checkbox",
+      "label": {
+        "text": "Pre-open Pyramid Hole"
+      }
     },
-    "managerAttrs": {
-      "label": { "side": "left" },
-      "selectbox": { "side": "right" }
+    "shuffleganon": {
+      "type": "checkbox",
+      "label": {
+        "text": "Include Ganon's Tower and Pyramid Hole in shuffle pool"
+      }
     },
-    "options": {
-      "Vanilla": "vanilla",
-      "Simple": "simple",
-      "Restricted": "restricted",
-      "Full": "full",
-      "Crossed": "crossed",
-      "Insanity": "insanity",
-      "Restricted (Legacy)": "restricted_legacy",
-      "Full (Legacy)": "full_legacy",
-      "Madness (Legacy)": "madness_legacy",
-      "Insanity (Legacy)": "insanity_legacy",
-      "Dungeons + Full": "dungeonsfull",
-      "Dungeons + Simple": "dungeonssimple"
+    "entranceshuffle": {
+      "type": "selectbox",
+      "label": {
+        "text": "Entrance Shuffle"
+      },
+      "managerAttrs": {
+        "label": { "side": "left" },
+        "selectbox": { "side": "right" }
+      },
+      "options": {
+        "Vanilla": "vanilla",
+        "Simple": "simple",
+        "Restricted": "restricted",
+        "Full": "full",
+        "Crossed": "crossed",
+        "Insanity": "insanity",
+        "Restricted (Legacy)": "restricted_legacy",
+        "Full (Legacy)": "full_legacy",
+        "Madness (Legacy)": "madness_legacy",
+        "Insanity (Legacy)": "insanity_legacy",
+        "Dungeons + Full": "dungeonsfull",
+        "Dungeons + Simple": "dungeonssimple"
+      }
     }
   }
 }