diff --git a/resources/app/gui/adjust/overview/widgets.json b/resources/app/gui/adjust/overview/widgets.json index 87d5421a..f56bfd08 100644 --- a/resources/app/gui/adjust/overview/widgets.json +++ b/resources/app/gui/adjust/overview/widgets.json @@ -16,9 +16,7 @@ }, "heartbeep": { "type": "selectbox", - "managerAttrs": { - "default": "Normal" - }, + "default": "Normal", "options": { "Double": "double", "Normal": "normal", @@ -31,9 +29,7 @@ "rightAdjustFrame": { "menuspeed": { "type": "selectbox", - "managerAttrs": { - "default": "Normal" - }, + "default": "Normal", "options": { "Instant": "instant", "Quadruple": "quadruple", diff --git a/resources/app/gui/custom/overview/widgets.json b/resources/app/gui/custom/overview/widgets.json index 24f9428e..ee7be421 100644 --- a/resources/app/gui/custom/overview/widgets.json +++ b/resources/app/gui/custom/overview/widgets.json @@ -6,9 +6,7 @@ "text": "Bow" }, "manager": "grid", - "managerAttrs": { - "default": 0 - } + "default": 0 }, "progressivebow": { "type": "textbox", @@ -16,9 +14,7 @@ "text": "Progressive Bow" }, "manager": "grid", - "managerAttrs": { - "default": 2 - } + "default": 2 }, "boomerang": { "type": "textbox", @@ -26,12 +22,7 @@ "text": "Blue Boomerang" }, "manager": "grid", - "managerAttrs": { - "label": { - "sticky": "w" - }, - "default": 1 - } + "default": 1 }, "redmerang": { "type": "textbox", @@ -39,9 +30,7 @@ "text": "Red Boomerang" }, "manager": "grid", - "managerAttrs": { - "default": 1 - } + "default": 1 }, "hookshot": { "type": "textbox", @@ -49,9 +38,7 @@ "text": "Hookshot" }, "manager": "grid", - "managerAttrs": { - "default": 1 - } + "default": 1 }, "mushroom": { "type": "textbox", @@ -59,9 +46,7 @@ "text": "Mushroom" }, "manager": "grid", - "managerAttrs": { - "default": 1 - } + "default": 1 }, "powder": { "type": "textbox", @@ -69,9 +54,7 @@ "text": "Magic Powder" }, "manager": "grid", - "managerAttrs": { - "default": 1 - } + "default": 1 }, "firerod": { "type": "textbox", @@ -79,9 +62,7 @@ "text": "Fire Rod" }, "manager": "grid", - "managerAttrs": { - "default": 1 - } + "default": 1 }, "icerod": { "type": "textbox", @@ -89,9 +70,7 @@ "text": "Ice Rod" }, "manager": "grid", - "managerAttrs": { - "default": 1 - } + "default": 1 }, "bombos": { "type": "textbox", @@ -99,9 +78,7 @@ "text": "Bombos" }, "manager": "grid", - "managerAttrs": { - "default": 1 - } + "default": 1 }, "ether": { "type": "textbox", @@ -109,9 +86,7 @@ "text": "Ether" }, "manager": "grid", - "managerAttrs": { - "default": 1 - } + "default": 1 }, "quake": { "type": "textbox", @@ -119,9 +94,7 @@ "text": "Quake" }, "manager": "grid", - "managerAttrs": { - "default": 1 - } + "default": 1 }, "lamp": { "type": "textbox", @@ -129,9 +102,7 @@ "text": "Lamp" }, "manager": "grid", - "managerAttrs": { - "default": 1 - } + "default": 1 }, "hammer": { "type": "textbox", @@ -139,9 +110,7 @@ "text": "Hammer" }, "manager": "grid", - "managerAttrs": { - "default": 1 - } + "default": 1 }, "shovel": { "type": "textbox", @@ -149,9 +118,7 @@ "text": "Shovel" }, "manager": "grid", - "managerAttrs": { - "default": 1 - } + "default": 1 } }, "itemList2": { @@ -161,9 +128,7 @@ "text": "Flute" }, "manager": "grid", - "managerAttrs": { - "default": 1 - } + "default": 1 }, "bugnet": { "type": "textbox", @@ -171,9 +136,7 @@ "text": "Bug Net" }, "manager": "grid", - "managerAttrs": { - "default": 1 - } + "default": 1 }, "book": { "type": "textbox", @@ -181,9 +144,7 @@ "text": "Book" }, "manager": "grid", - "managerAttrs": { - "default": 1 - } + "default": 1 }, "bottle": { "type": "textbox", @@ -191,9 +152,7 @@ "text": "Bottle" }, "manager": "grid", - "managerAttrs": { - "default": 4 - } + "default": 4 }, "somaria": { "type": "textbox", @@ -201,9 +160,7 @@ "text": "Cane of Somaria" }, "manager": "grid", - "managerAttrs": { - "default": 1 - } + "default": 1 }, "byrna": { "type": "textbox", @@ -211,9 +168,7 @@ "text": "Cane of Byrna" }, "manager": "grid", - "managerAttrs": { - "default": 1 - } + "default": 1 }, "cape": { "type": "textbox", @@ -221,9 +176,7 @@ "text": "Magic Cape" }, "manager": "grid", - "managerAttrs": { - "default": 1 - } + "default": 1 }, "mirror": { "type": "textbox", @@ -231,9 +184,7 @@ "text": "Magic Mirror" }, "manager": "grid", - "managerAttrs": { - "default": 1 - } + "default": 1 }, "boots": { "type": "textbox", @@ -241,9 +192,7 @@ "text": "Pegasus Boots" }, "manager": "grid", - "managerAttrs": { - "default": 1 - } + "default": 1 }, "powerglove": { "type": "textbox", @@ -251,9 +200,7 @@ "text": "Power Glove" }, "manager": "grid", - "managerAttrs": { - "default": 0 - } + "default": 0 }, "titansmitt": { "type": "textbox", @@ -261,9 +208,7 @@ "text": "Titan's Mitt" }, "manager": "grid", - "managerAttrs": { - "default": 0 - } + "default": 0 }, "progressiveglove": { "type": "textbox", @@ -271,9 +216,7 @@ "text": "Progressive Glove" }, "manager": "grid", - "managerAttrs": { - "default": 2 - } + "default": 2 }, "flippers": { "type": "textbox", @@ -281,9 +224,7 @@ "text": "Flippers" }, "manager": "grid", - "managerAttrs": { - "default": 1 - } + "default": 1 }, "pearl": { "type": "textbox", @@ -291,9 +232,7 @@ "text": "Moon Pearl" }, "manager": "grid", - "managerAttrs": { - "default": 1 - } + "default": 1 }, "heartpiece": { "type": "textbox", @@ -301,9 +240,7 @@ "text": "Piece of Heart" }, "manager": "grid", - "managerAttrs": { - "default": 24 - } + "default": 24 } }, "itemList3": { @@ -313,9 +250,7 @@ "text": "Heart Container" }, "manager": "grid", - "managerAttrs": { - "default": 10 - } + "default": 10 }, "sancheart": { "type": "textbox", @@ -323,9 +258,7 @@ "text": "Sanctuary Heart" }, "manager": "grid", - "managerAttrs": { - "default": 1 - } + "default": 1 }, "sword1": { "type": "textbox", @@ -333,9 +266,7 @@ "text": "Fighters' Sword" }, "manager": "grid", - "managerAttrs": { - "default": 0 - } + "default": 0 }, "sword2": { "type": "textbox", @@ -343,9 +274,7 @@ "text": "Master Sword" }, "manager": "grid", - "managerAttrs": { - "default": 0 - } + "default": 0 }, "sword3": { "type": "textbox", @@ -353,9 +282,7 @@ "text": "Tempered Sword" }, "manager": "grid", - "managerAttrs": { - "default": 0 - } + "default": 0 }, "sword4": { "type": "textbox", @@ -363,9 +290,7 @@ "text": "Golden Sword" }, "manager": "grid", - "managerAttrs": { - "default": 0 - } + "default": 0 }, "progressivesword": { "type": "textbox", @@ -373,9 +298,7 @@ "text": "Progressive Sword" }, "manager": "grid", - "managerAttrs": { - "default": 4 - } + "default": 4 }, "shield1": { "type": "textbox", @@ -383,9 +306,7 @@ "text": "Fighters' Shield" }, "manager": "grid", - "managerAttrs": { - "default": 0 - } + "default": 0 }, "shield2": { "type": "textbox", @@ -393,9 +314,7 @@ "text": "Fire Shield" }, "manager": "grid", - "managerAttrs": { - "default": 0 - } + "default": 0 }, "shield3": { "type": "textbox", @@ -403,9 +322,7 @@ "text": "Mirror Shield" }, "manager": "grid", - "managerAttrs": { - "default": 0 - } + "default": 0 }, "progressiveshield": { "type": "textbox", @@ -413,9 +330,7 @@ "text": "Progressive Shield" }, "manager": "grid", - "managerAttrs": { - "default": 3 - } + "default": 3 }, "mail2": { "type": "textbox", @@ -423,9 +338,7 @@ "text": "Blue Mail" }, "manager": "grid", - "managerAttrs": { - "default": 0 - } + "default": 0 }, "mail3": { "type": "textbox", @@ -433,9 +346,7 @@ "text": "Red Mail" }, "manager": "grid", - "managerAttrs": { - "default": 0 - } + "default": 0 }, "progressivemail": { "type": "textbox", @@ -443,9 +354,7 @@ "text": "Progressive Mail" }, "manager": "grid", - "managerAttrs": { - "default": 2 - } + "default": 2 }, "halfmagic": { "type": "textbox", @@ -453,9 +362,7 @@ "text": "Half Magic" }, "manager": "grid", - "managerAttrs": { - "default": 1 - } + "default": 1 } }, "itemList4": { @@ -465,9 +372,7 @@ "text": "Quarter Magic" }, "manager": "grid", - "managerAttrs": { - "default": 0 - } + "default": 0 }, "bombsplus5": { "type": "textbox", @@ -475,9 +380,7 @@ "text": "Bomb Cap +5" }, "manager": "grid", - "managerAttrs": { - "default": 0 - } + "default": 0 }, "bombsplus10": { "type": "textbox", @@ -485,9 +388,7 @@ "text": "Bomb Cap +10" }, "manager": "grid", - "managerAttrs": { - "default": 0 - } + "default": 0 }, "arrowsplus5": { "type": "textbox", @@ -495,9 +396,7 @@ "text": "Arrow Cap +5" }, "manager": "grid", - "managerAttrs": { - "default": 0 - } + "default": 0 }, "arrowsplus10": { "type": "textbox", @@ -505,9 +404,7 @@ "text": "Arrow Cap +10" }, "manager": "grid", - "managerAttrs": { - "default": 0 - } + "default": 0 }, "arrow1": { "type": "textbox", @@ -515,9 +412,7 @@ "text": "Arrow (1)" }, "manager": "grid", - "managerAttrs": { - "default": 1 - } + "default": 1 }, "arrow10": { "type": "textbox", @@ -525,9 +420,7 @@ "text": "Arrow (10)" }, "manager": "grid", - "managerAttrs": { - "default": 12 - } + "default": 12 }, "bomb1": { "type": "textbox", @@ -535,9 +428,7 @@ "text": "Bomb (1)" }, "manager": "grid", - "managerAttrs": { - "default": 0 - } + "default": 0 }, "bomb3": { "type": "textbox", @@ -545,9 +436,7 @@ "text": "Bomb (3)" }, "manager": "grid", - "managerAttrs": { - "default": 16 - } + "default": 16 }, "bomb10": { "type": "textbox", @@ -555,9 +444,7 @@ "text": "Bomb (10)" }, "manager": "grid", - "managerAttrs": { - "default": 1 - } + "default": 1 }, "rupee1": { "type": "textbox", @@ -565,9 +452,7 @@ "text": "Rupee (1)" }, "manager": "grid", - "managerAttrs": { - "default": 2 - } + "default": 2 }, "rupee5": { "type": "textbox", @@ -575,9 +460,7 @@ "text": "Rupee (5)" }, "manager": "grid", - "managerAttrs": { - "default": 4 - } + "default": 4 }, "rupee20": { "type": "textbox", @@ -585,9 +468,7 @@ "text": "Rupee (20)" }, "manager": "grid", - "managerAttrs": { - "default": 28 - } + "default": 28 }, "rupee50": { "type": "textbox", @@ -595,9 +476,7 @@ "text": "Rupee (50)" }, "manager": "grid", - "managerAttrs": { - "default": 7 - } + "default": 7 }, "rupee100": { "type": "textbox", @@ -605,9 +484,7 @@ "text": "Rupee (100)" }, "manager": "grid", - "managerAttrs": { - "default": 1 - } + "default": 1 } }, "itemList5": { @@ -617,9 +494,7 @@ "text": "Rupee (300)" }, "manager": "grid", - "managerAttrs": { - "default": 5 - } + "default": 5 }, "blueclock": { "type": "textbox", @@ -627,9 +502,7 @@ "text": "Blue Clock" }, "manager": "grid", - "managerAttrs": { - "default": 0 - } + "default": 0 }, "greenclock": { "type": "textbox", @@ -637,9 +510,7 @@ "text": "Green Clock" }, "manager": "grid", - "managerAttrs": { - "default": 0 - } + "default": 0 }, "redclock": { "type": "textbox", @@ -647,9 +518,7 @@ "text": "Red Clock" }, "manager": "grid", - "managerAttrs": { - "default": 0 - } + "default": 0 }, "silversupgrade": { "type": "textbox", @@ -657,9 +526,7 @@ "text": "Silver Arrows Upgrade" }, "manager": "grid", - "managerAttrs": { - "default": 0 - } + "default": 0 }, "generickeys": { "type": "textbox", @@ -667,9 +534,7 @@ "text": "Generic Keys" }, "manager": "grid", - "managerAttrs": { - "default": 0 - } + "default": 0 }, "triforcepieces": { "type": "textbox", @@ -677,9 +542,7 @@ "text": "Triforce Pieces" }, "manager": "grid", - "managerAttrs": { - "default": 0 - } + "default": 0 }, "triforcepiecesgoal": { "type": "textbox", @@ -687,9 +550,7 @@ "text": "Triforce Pieces Goal" }, "manager": "grid", - "managerAttrs": { - "default": 0 - } + "default": 0 }, "triforce": { "type": "textbox", @@ -697,9 +558,7 @@ "text": "Triforce (win game)" }, "manager": "grid", - "managerAttrs": { - "default": 0 - } + "default": 0 }, "rupoor": { "type": "textbox", @@ -707,9 +566,7 @@ "text": "Rupoor" }, "manager": "grid", - "managerAttrs": { - "default": 0 - } + "default": 0 }, "rupoorcost": { "type": "textbox", @@ -717,9 +574,7 @@ "text": "Rupoor Cost" }, "manager": "grid", - "managerAttrs": { - "default": 10 - } + "default": 10 } } -} \ No newline at end of file +} diff --git a/resources/app/gui/randomize/dungeon/widgets.json b/resources/app/gui/randomize/dungeon/widgets.json index 91ef1f3e..3cbd7962 100644 --- a/resources/app/gui/randomize/dungeon/widgets.json +++ b/resources/app/gui/randomize/dungeon/widgets.json @@ -1,9 +1,7 @@ { "dungeondoorshuffle": { "type": "selectbox", - "managerAttrs": { - "default": "basic" - }, + "default": "basic", "options": [ "vanilla", "basic", @@ -13,9 +11,7 @@ "experimental": { "type": "checkbox" }, "dungeon_counters": { "type": "selectbox", - "managerAttrs": { - "default": "default" - }, + "default": "default", "options": [ "default", "off", diff --git a/resources/app/gui/randomize/gameoptions/widgets.json b/resources/app/gui/randomize/gameoptions/widgets.json index ac187f86..815f72b1 100644 --- a/resources/app/gui/randomize/gameoptions/widgets.json +++ b/resources/app/gui/randomize/gameoptions/widgets.json @@ -20,9 +20,7 @@ }, "heartbeep": { "type": "selectbox", - "managerAttrs": { - "default": "normal" - }, + "default": "normal", "options": [ "double", "normal", @@ -35,9 +33,7 @@ "rightRomOptionsFrame": { "menuspeed": { "type": "selectbox", - "managerAttrs": { - "default": "normal" - }, + "default": "normal", "options": [ "instant", "quadruple", diff --git a/resources/app/gui/randomize/item/widgets.json b/resources/app/gui/randomize/item/widgets.json index 6a3ebbaa..d485cdb8 100644 --- a/resources/app/gui/randomize/item/widgets.json +++ b/resources/app/gui/randomize/item/widgets.json @@ -5,9 +5,7 @@ "leftItemFrame": { "worldstate": { "type": "selectbox", - "managerAttrs": { - "default": "open" - }, + "default": "open", "options": [ "standard", "open", @@ -103,9 +101,7 @@ }, "sortingalgo": { "type": "selectbox", - "managerAttrs": { - "default": "balanced" - }, + "default": "balanced", "options": [ "freshness", "flood", diff --git a/source/gui/widgets.py b/source/gui/widgets.py index 068bf076..d3915c6f 100644 --- a/source/gui/widgets.py +++ b/source/gui/widgets.py @@ -19,6 +19,12 @@ class mySpinbox(Spinbox): def make_checkbox(self, parent, label, storageVar, manager, managerAttrs): self = Frame(parent) self.storageVar = storageVar + if managerAttrs is not None and "default" in managerAttrs: + if managerAttrs["default"] == "true" or managerAttrs["default"] == True: + self.storageVar.set(True) + elif managerAttrs["default"] == "false" or managerAttrs["default"] == False: + self.storageVar.set(False) + del managerAttrs["default"] self.checkbox = Checkbutton(self, text=label, variable=self.storageVar) if managerAttrs is not None: self.checkbox.pack(managerAttrs) @@ -197,6 +203,12 @@ def make_widget_from_dict(self, defn, parent): manager = defn["manager"] if "manager" in defn else None managerAttrs = defn["managerAttrs"] if "managerAttrs" in defn else None options = defn["options"] if "options" in defn else None + + if managerAttrs is None and "default" in defn: + managerAttrs = {} + if "default" in defn: + managerAttrs["default"] = defn["default"] + widget = make_widget(self, type, parent, label, None, manager, managerAttrs, options) widget.type = type return widget